added menu 'Add to recipient/Cc/Bcc'.

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

32 files changed, 6214 insertions, 5376 deletions

diff --git a/ChangeLog b/ChangeLog
index af0cf68e..649a8d7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-22
+
+	* src/addressbook.c: added menu 'Add to recipient/Cc/Bcc'.
+
 2010-12-21
 
 	* libsylph/session.c
diff --git a/po/be.po b/po/be.po
index cf475bf1..d4ee7bc8 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2010-02-22 15:22+0300\n"
 "Last-Translator: Mikalai Udodau <crom-a@tut.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -685,8 +685,8 @@ msgstr ""
 "Новыя паведамленні будуць правераны ў гэтым парадку. Пазначце\n"
 "ў слупку `G' акаунты, якія задзейнічаюць атрыманне лістоў праз `Атр. усе'"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -821,12 +821,12 @@ msgstr "Карыстальніцкі аргумент дзеяння"
 msgid "Add Address to Book"
 msgstr "Дадаць Адрас у Кнігу"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Адрас"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Заўвагі"
@@ -835,32 +835,32 @@ msgstr "Заўвагі"
 msgid "Select Address Book Folder"
 msgstr "Выберыце каталог Адраснай кнігі"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 msgid "Auto-registered address"
 msgstr "Аўта-рэгістраваныя адрасы"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Ф_айл"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/Ф_айл/Новая Кн_іга"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/Ф_айл/Новы _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/Ф_айл/Новы _J-Pilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "/_File/New _LDAP Server"
 msgstr "/Ф_айл/Новы сервер _LDAP"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -868,190 +868,217 @@ msgstr "/Ф_айл/Новы сервер _LDAP"
 msgid "/_File/---"
 msgstr "/Ф_айл/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/Ф_айл/_Рэдагаваць"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/Ф_айл/_Сцерці"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/Ф_айл/За_пісаць"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Ф_айл/Закры_ць"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Праца"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Праца/Капірава_ць"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Праца/_Ўставіць"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Адрас"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Адрас/_Новы Адрас"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Адрас/Новая Гру_па"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Адрас/Новы К_аталог"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Адрас/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Адрас/Сц_ерці"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Адрас/_Рэдагаваць"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Адрас/_Рэдагаваць"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Адрас/_Рэдагаваць"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Адрас/Сц_ерці"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Прылады"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Прылады/Імпартаваць файл _LDIF"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Прылады/Імпартаваць файл _CSV"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Даведка"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Даведка/_Аб праграме"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/_Новы адрас"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Новая гру_па"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Новы к_аталог"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/Сц_ерці"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 msgid "/_Copy"
 msgstr "/_Капіраваць"
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 msgid "/_Paste"
 msgstr "/_Ўставіць"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адрасная кніга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Каталог"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "Адрас эл.пошты"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 msgid "Search:"
 msgstr "Пошук:"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Каму:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Скрытая копія:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Сцерці"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Дадаць"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Пошук"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 msgid "_Close"
 msgstr "Закры_ць"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Сцерці адрас(ы)"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Сапраўды сцерці гэты адрас(ы)?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1060,36 +1087,36 @@ msgstr ""
 "Ці сапраўды жадаеце сцерці каталог І ўсе адрасы ў `%s' ?\n"
 "Пры сціранні толькі каталога, адрасы будуць перанесены ў каталог-продак."
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Сцерці каталог"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "Толькі К_аталог"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "Каталог _і адрас(ы)"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Сапраўды сцерці `%s' ?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Новы карыстальнік, немагчыма запісаць індэксны файл."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Новы карыстальнік, немагчыма запісаць файлы адраснай кнігі."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Старая адрасная кніга паспяхова сканвертаваная."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1097,7 +1124,7 @@ msgstr ""
 "Старая адрасная кніга сканвертаваная,\n"
 "немагчыма запісаць новы індэксны файл адрасоў."
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1105,7 +1132,7 @@ msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу,\n"
 "створаны пусты файл новай адраснай кнігі."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1113,7 +1140,7 @@ msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу,\n"
 "немагчыма стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1121,15 +1148,15 @@ msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу\n"
 "і нельга стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 msgid "Address book conversion error"
 msgstr "Памылка канверсіі адраснай кнігі"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 msgid "Address book conversion"
 msgstr "Канверсія адраснай кнігі"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1140,76 +1167,76 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 msgid "Address Book Error"
 msgstr "Памылка адраснай кнігі"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старая адрасная кніга сканвертаваная, але нельга запісаць новы файл індэксу "
 "адрасоў."
 
-#: src/addressbook.c:3373
+#: src/addressbook.c:3406
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу, створаны файлы новай адраснай кнігі."
 
-#: src/addressbook.c:3379
+#: src/addressbook.c:3412
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу, немагчыма стварыць файлы новай "
 "адраснай кнігі."
 
-#: src/addressbook.c:3385
+#: src/addressbook.c:3418
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу і стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Немагчыма прачытаць індэкс адрасу"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 msgid "Address Book Conversion Error"
 msgstr "Памылка канверсіі Адраснай кнігі"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 msgid "Address Book Conversion"
 msgstr "Канверсія Адраснай кнігі"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Інтэрфейс"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адрасная Кніга"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Асоба"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "Адрас эл.пошты"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Група"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1221,7 +1248,7 @@ msgstr "Супольны адрас"
 msgid "Personal address"
 msgstr "Асабовы адрас"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Заўвага"
 
@@ -1565,107 +1592,107 @@ msgstr "/_Прылады/Правяраць правапі_с"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Прылады/_Наставіць мову правапісу"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існуе\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Нельга атрымаць частку тэкста\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Памылка фармату пазнакі цытаты."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Памылка фармату адказу/перасылкі паведамлення."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існуе\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Нельга атрымаць памер файла %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пусты."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Нельга прачытаць %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Паведамленне: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Нельга атрымаць частку складанага паведамлення."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Без Тэмы)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Напісанне%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Не указаны атрымальнік."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "Пустая тэма"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тэма не азначаная. Выслаць як ёсць?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 msgid "Attachment is missing"
 msgstr "Адсутнічаюць дадаткі"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Ліст не мае дадаткаў. Выслаць яго без дадаткаў?"
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr "Праверыць атрымальнікаў"
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 msgid "Really send this mail to the following addresses?"
 msgstr "Насамрэч даслаць гэты ліст на наступныя адрасы?"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Адпраўнік:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Тэма:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 msgid "_Send"
 msgstr "Адпра_віць"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "нельга атрымаць спіс рэспандэнтаў."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1673,38 +1700,38 @@ msgstr ""
 "Не указаны уліковы рахунак для адпраўкі пошты.\n"
 "Калі ласка, выберыце акаунт перад адпраўленнем."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Памылка пад час адпраўкі паведамлення да %s."
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Нельга запісаць паведамленне ў `Дасланыя'."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Не знойдзена ніводнага ключа, асацыяванага з выбраным ідэнтыфікатарам `%s'."
 
-#: src/compose.c:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 msgid "Can't sign the message."
 msgstr "Нельга падпісаць паведамленне."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 msgid "Can't encrypt the message."
 msgstr "Нельга зашыфраваць паведамленне."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 msgid "Can't encrypt or sign the message."
 msgstr "Нельга зашыфраваць ці падпісаць паведамленне."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "нельга змяніць рэжым файла\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1715,11 +1742,11 @@ msgstr ""
 "\n"
 "Выслаць у %s, як ёсць?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "Памылка канверсіі коду"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1732,15 +1759,15 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "Ліміт даўжыні радка"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr "Шыфраваць з `Bcc'"
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1754,101 +1781,101 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "нельга сцерці старое паведамленне\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "даданне паведамлення ў чаргу...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "не знойдзены каталог чаргі\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "нельга змясціць паведамленне ў чаргу\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не існуе."
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, c-format
 msgid "Can't open file %s."
 msgstr "Нельга адкрыць файл %s."
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "сгенераваны Message-ID: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Стварэнне вакна напісання...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "Подпіс PGP"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "Шыфр PGP"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Дата"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Памер"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Няправільны тып MIME."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існуе ці пусты."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Уласцівасці"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "тып MIME"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Кадаванне"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Назва файла"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: файл не існуе\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Адкрыццё выканальнага файла"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1859,12 +1886,12 @@ msgstr ""
 "Калі вы жадаеце запусціць яго, запішыце дзе-небудзь, і ўпэўніцеся, што гэта "
 "не вірус ці нешта кшталту шкодных праграм."
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Няправільны радок загаду для вонкавага рэдактара: `%s'\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1873,48 +1900,48 @@ msgstr ""
 "Вонкавы рэдактар яшчэ працуе.\n"
 "Скончыць працэс гвалтоўна (pid: %d)?\n"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "На_ставіць стужку прылад..."
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Нельга змясціць паведамленне ў чаргу."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "Выбраць файлы"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Выбраць файл"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "Запісаць паведамленне"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Гэта паведамленне было зменена. Запісаць у каталог чарнавікоў?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "Закры_ць без запісу"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Жадаеце ужыць шаблон `%s'?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Ужыць шаблон"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "_Замяніць"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "_Уставіць"
 
@@ -2594,7 +2621,7 @@ msgstr "Групы навін:"
 msgid "Creating header view...\n"
 msgstr "Стварэнне прагляду загалоўкаў...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Без Адпраўніка)"
@@ -2925,7 +2952,7 @@ msgstr "Злучэнне з POP3 серверам: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Нельга злучыцца з серверам POP3: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Аўтэнтыфікацыя..."
@@ -6586,7 +6613,7 @@ msgstr "Пошук %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Пошук %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Без Даты)"
 
@@ -6710,55 +6737,55 @@ msgstr ""
 "Памылка здарылася пад час сеансу POP3:\n"
 "%s"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Атрыманне загалоўкаў паведамлення (%d / %d) ..."
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 msgid "Getting the number of messages..."
 msgstr "Атрыманне колькасці паведамленняў ..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 msgid "No message"
 msgstr "Няма паведамленняў"
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, c-format
 msgid "Deleted %d messages"
 msgstr "Сцёрта %d паведамленняў"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Адлучэнне..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "Атрымана %d паведамленняў"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, c-format
 msgid "Opened message %d"
 msgstr "Адкрыта паведамленне %d"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "Атрымана %d загалоўкаў паведамленняў"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "Атрыманне паведамлення %d..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 msgid "Delete messages"
 msgstr "Сцерці паведамленні"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/bg.po b/po/bg.po
index 4b3e4840..76eca437 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2004-01-09 02:06+0200\n"
 "Last-Translator: Pavel Pyuter <pavel@unix-bg.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -688,8 +688,8 @@ msgstr ""
 "За нови съобщения ще бъде проверявано в този ред. Отметнете кутийките\n"
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -826,12 +826,12 @@ msgstr "Потребителски аргумент на действието"
 msgid "Add Address to Book"
 msgstr "Добавяне на Адреса към Книгата"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Забележки"
@@ -840,34 +840,34 @@ msgstr "Забележки"
 msgid "Select Address Book Folder"
 msgstr "Изберете папка от адресната книга"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Регистрирани правила"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Файл"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Файл/Нова _Книга"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Файл/Нова _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Файл/Нов _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Файл/Нов _Сървър"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -875,196 +875,223 @@ msgstr "/_Файл/Нов _Сървър"
 msgid "/_File/---"
 msgstr "/_Файл/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Файл/_Редактиране"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Файл/_Изтриване"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_файл/_Запазване"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Редактиране"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Адрес"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Адрес/Нов _Адрес"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Адрес/Нова _Група"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Адрес/Нова _Папка"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Адрес/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Адрес/_Изтриване"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Адрес/_Редактиране"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Адрес/_Редактиране"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Адрес/_Редактиране"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Инструменти"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Нов _Адрес"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Нова _Група"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Изтриване"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Копиране..."
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адресна книга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Търсене"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "До:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Изтриване"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Добавяне"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Търсене"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 #, fuzzy
 msgid "_Close"
 msgstr "Затваряне"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Изтриване на адрес(ите)"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Желаете ли изтриване на адрес(ите)?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1074,38 +1101,38 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "_Folder only"
 msgstr "Само папка"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Папка и Адреси"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Желаете ли изтриване на `%s' ?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Нов потребител, не можа да ce запази индексния файл."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Нов потребител, не можа да се запази файла на адресната книга"
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Старата адресна книга конвертирана успешно"
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1113,7 +1140,7 @@ msgstr ""
 "Старата адресна книга конвертирана,\n"
 "не може да се запази новия индексен файл"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1121,7 +1148,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга,\n"
 "създадени са нови празни файлове на адресната книга."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1129,7 +1156,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1137,17 +1164,17 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1155,80 +1182,80 @@ msgid ""
 "%s%c%s"
 msgstr "Не може да се прочете адресния индекс"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Грешка на адресната книга"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старата адресна книга конвертирана, не може да се запази новия индексен файл"
 
-#: src/addressbook.c:3373
+#: src/addressbook.c:3406
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, създадени са нови празни файлове "
 "на адресната книга."
 
-#: src/addressbook.c:3379
+#: src/addressbook.c:3412
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, неуспя създаване на нови файлове "
 "на адресната книга."
 
-#: src/addressbook.c:3385
+#: src/addressbook.c:3418
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга и създаване на нови файлове на "
 "адресната книга."
 
-#: src/addressbook.c:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Не може да се прочете адресния индекс"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Лице"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "EMail Адрес"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Група"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "LDAP сървър"
 
@@ -1240,7 +1267,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Забележка"
 
@@ -1625,111 +1652,111 @@ msgstr "/_Инструменти/_Изпълнение"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файлът не съществува\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Не може да се намери текстовата част\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Грешка в формата на цитат."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Грешка в reply/forward формата на съобщението."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не може да се намери големината на %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Файлът %s е празен."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Не може да се прочете %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Съобщение: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Съставяне на съобщение%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Не е указан получател"
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 #, fuzzy
 msgid "Empty subject"
 msgstr "Тема"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Празна тема. Изпращане така?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Притурки"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Автоматично установяване на следните адреси"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "Изпращане"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "не може да се получи списък с получатели."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1737,40 +1764,40 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Не може да се запази съобщението в изходящата кутия."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не можа да се намери бутон асоцииран с избрания `%s'."
 
-#: src/compose.c:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1781,12 +1808,12 @@ msgstr ""
 "%s към %s.\n"
 "Изпращане така?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1795,15 +1822,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1812,103 +1839,103 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Не може да се отвори файл %s\n"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерирано Message-ID: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Дата"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: файлът не съществува\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1916,12 +1943,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1931,52 +1958,52 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
@@ -2676,7 +2703,7 @@ msgstr "Новинарски групи:"
 msgid "Creating header view...\n"
 msgstr "Създаване изглед на заглавните блокове...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Няма От)"
@@ -3029,7 +3056,7 @@ msgstr "Свързване с POP3 сървър: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не може да се установи връзка с POP3 сървър: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Удостоверяване..."
@@ -6843,7 +6870,7 @@ msgstr "Филтриране..."
 msgid "Searching %s ..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Няма Дата)"
 
@@ -6977,58 +7004,58 @@ msgid ""
 "%s"
 msgstr "грешка при POP3 сесията\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Взимане на броят на нови съобщения (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "Няма нови съобщения."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Изтриване на съобщение(я)"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Прекъсване..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Получаване на нови съобщения"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Изпращане на съобщение"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Получаване на нови съобщения"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Получаване на съобщения от %s..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "Изтриване на съобщение(я)"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/cs.po b/po/cs.po
index 246c8175..51561d0a 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2010-08-08 21:02+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -693,8 +693,8 @@ msgstr ""
 "Nové zprávy budou kontrolovány v uvedeném pořadí. Pokud má být účet\n"
 "kontrolován při volbě \"Přijmout vše\", zaškrtněte políčko ve sloupci \"G\"."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -829,12 +829,12 @@ msgstr "Argument uživatele pro akci"
 msgid "Add Address to Book"
 msgstr "Přidat adresu do adresáře"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Poznámky"
@@ -843,32 +843,32 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku adresáře"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 msgid "Auto-registered address"
 msgstr "Automaticky registrované adresy"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Soubor"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Soubor/Nový _adresář"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Soubor/Nová _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Soubor/Nový _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "/_File/New _LDAP Server"
 msgstr "/_Soubor/Nový server _LDAP"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -876,190 +876,217 @@ msgstr "/_Soubor/Nový server _LDAP"
 msgid "/_File/---"
 msgstr "/_Soubor/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Soubor/Up_ravit"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Soubor/_Smazat"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Soubor/_Uložit"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Soubor/_Zavřít"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Úp_ravy"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/V_ložit"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _adresa"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _skupina"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nová s_ložka"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Adresa/--"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Adresa/S_mazat"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Adresa/U_pravit"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Adresa/U_pravit"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/U_pravit"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovat soubor _LDIF"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Nástroje/Importovat soubor _CSV"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Nová _adresa"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Nová skup_ina"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Smazat"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 msgid "/_Copy"
 msgstr "/_Kopírovat"
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 msgid "/_Paste"
 msgstr "/_Vložit"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresář"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Složka"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 msgid "Search:"
 msgstr "Hledat:"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Příjemce:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Přidat"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Hledat"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 msgid "_Close"
 msgstr "_Zavřít"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Smazat adresy"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Opravdu chcete smazat tyto adresy?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1068,36 +1095,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:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Smazat složku"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "Pouz_e složku"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "Složk_u a adresy"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Opravdu smazat \"%s\"?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Nový uživatel, nelze uložit soubor index."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Nový uživatel, nelze uložit soubory s adresářem."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Konverze starého adresáře proběhla úspěšně."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1105,7 +1132,7 @@ msgstr ""
 "Starý adresář převeden,\n"
 "ale nelze uložit nový soubor s indexem."
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1113,7 +1140,7 @@ msgstr ""
 "Konverze adresáře nemohla být provedena,\n"
 "ale byly vytvořeny nové prázdné soubory adresáře."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1121,7 +1148,7 @@ msgstr ""
 "Nelze provést konverzi adresáře,\n"
 "nelze vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1129,15 +1156,15 @@ msgstr ""
 "Nelze provést konverzi adresáře\n"
 "a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 msgid "Address book conversion error"
 msgstr "Chyba při konverzi adresáře"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 msgid "Address book conversion"
 msgstr "Konverze adresáře"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1148,72 +1175,72 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 msgid "Address Book Error"
 msgstr "Chyba v adresáři"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Nelze načíst index adres"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 msgid "Address Book Conversion Error"
 msgstr "Chyba při konverzi adresáře"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 msgid "Address Book Conversion"
 msgstr "Konverze adresáře"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresář"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Skupina"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1225,7 +1252,7 @@ msgstr "Obecné adresy"
 msgid "Personal address"
 msgstr "Osobní adresy"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -1569,107 +1596,107 @@ msgstr "/_Nástroje/Kontrolovat pravopi_s"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/_Nastavit jazyk pro kontrolu pravopisu"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: soubor neexistuje\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Nelze získat textovou část\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Chyba ve formátu uvozovek."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovědi/předání."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Soubor %s neexistuje\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nelze zjistit velikost souboru %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Nelze načíst %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Nelze získat část ze zprávy s více částmi."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Bez předmětu)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "Není uveden předmět"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Předmět je prázdný. Přesto odeslat?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 msgid "Attachment is missing"
 msgstr "Příloha není obsažena"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Není obsažena příloha. Odeslat bez příloh?"
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr "Zkontrolovat příjemce"
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 msgid "Really send this mail to the following addresses?"
 msgstr "Opravdu odeslat tuto zprávu na následující adresy?"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Odesílatel:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Předmět:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 msgid "_Send"
 msgstr "_Odeslat"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "nelze načíst seznam příjemců."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1677,38 +1704,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:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, 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:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Zprávu nelze uložit do odeslané pošty."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 msgid "Can't sign the message."
 msgstr "Zprávu nelze podepsat."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 msgid "Can't encrypt the message."
 msgstr "Zprávu nelze šifrovat."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 msgid "Can't encrypt or sign the message."
 msgstr "Zprávu nelze šifrovat nebo podepsat."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "nelze změnit práva souboru\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1719,11 +1746,11 @@ msgstr ""
 "\n"
 "Přesto odeslat jako %s?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "Chyba při konverzi kódu"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1736,15 +1763,15 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "Maximální délka řádku"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr "Šifrování s příjemci skryté kopie"
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1758,100 +1785,100 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "nelze odstranit starou zprávu\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "zařazování zprávy...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "nelze vyhledat složku pozdržených zpráv\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "zprávu nelze zařadit\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Soubor %s neexistuje."
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nelze otevřít soubor %s."
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vytváří se ID zprávy: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Vytváří se okno psaní zprávy...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "Podepsat PGP"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "Šifrovat PGP"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Datum"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "Typ MIME"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 msgid "File not exist."
 msgstr "Soubor neexistuje."
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Otevírá se spustitelný soubor"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1863,12 +1890,12 @@ msgstr ""
 "Pokud chcete soubor spustit, nejprve jej uložte a ujistěte se, že nejde o "
 "virus či nějaký nebezpečný program."
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Chybný příkaz pro externí editor: \"%s\"\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1877,48 +1904,48 @@ msgstr ""
 "Externí editor stále pracuje.\n"
 "Vynutit přerušení procesu (číslo procesu: %d)?\n"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "_Upravit nástrojovou lištu..."
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "Vybrat soubory"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "Uložit zprávu"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 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:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "Zavřít _bez uložení"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu \"%s\"?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "Na_hradit"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "V_ložit"
 
@@ -2596,7 +2623,7 @@ msgstr "Diskusní skupiny:"
 msgid "Creating header view...\n"
 msgstr "Vytváří se náhled záhlaví...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(není znám odesílatel)"
@@ -2926,7 +2953,7 @@ msgstr "Připojování k serveru POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nelze se spojit se serverem POP3: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentizace..."
@@ -6586,7 +6613,7 @@ msgstr "Prohledává se %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Prohledává se %s..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Bez data)"
 
@@ -6710,55 +6737,55 @@ msgstr ""
 "Během relace POP3 se vyskytla chyba:\n"
 "%s"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Přijímají se záhlaví zpráv (%d / %d)..."
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 msgid "Getting the number of messages..."
 msgstr "Zjišťuje se počet zpráv..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 msgid "No message"
 msgstr "Žádná zpráva"
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, c-format
 msgid "Deleted %d messages"
 msgstr "Smazaných zpráv %d"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Ukončování..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "Přijatých zpráv %d"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, c-format
 msgid "Opened message %d"
 msgstr "Otevřena zpráva %d"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "Přijatých záhlaví zpráv %d"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "Přijímá se zpráva %d..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 msgid "Delete messages"
 msgstr "Smazat zprávy"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/da.po b/po/da.po
index e127355c..c696fb37 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -692,8 +692,8 @@ msgstr ""
 "Nye meddelelser bliver testet i denne rækkefølge. Afmærk\n"
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -830,12 +830,12 @@ msgstr "Handlingens bruger parameter"
 msgid "Add Address to Book"
 msgstr "Tilføj adresse i adressebog"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Kommentar"
@@ -844,34 +844,34 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Vælg adressebog mappe"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrerede regler"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Filer"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Filer/Ny _adressebog"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Filer/Ny _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Filer/Ny _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Filer/Ny _server"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -879,196 +879,223 @@ msgstr "/_Filer/Ny _server"
 msgid "/_File/---"
 msgstr "/_Filer/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Filer/_Redigér"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Filer/_Slet"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Filer/_Gem"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Filer/_Luk"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigér"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigér/K_opiere"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Ny _adresse"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Ny _gruppe"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Ny _mappe"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Adresse/_Slet"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Adresse/_Redigér"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Adresse/_Redigér"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Redigér"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Funktioner"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Ny _adresse"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Ny _gruppe"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Slet"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopier..."
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressebog"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Mappe"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Søg"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Til:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Slet"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Søg"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 #, fuzzy
 msgid "_Close"
 msgstr "Luk"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Slet adresse(r)"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Virklig slette adresse(r)?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1077,38 +1104,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:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Slet mappe"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ny mappe"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mappe og adresser"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Virklig slette `%s' ?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Ny bruger, kunne ikke gemme index fil."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Ny bruger, kunne ikke gemme adressebogs fil."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Gammel adressebog konverteret."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1116,7 +1143,7 @@ msgstr ""
 "Gammel adressebog konverteret,\n"
 "men kunne ikke gemme index filen"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1124,7 +1151,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "men nye og tomme filer blev oprettet."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1132,7 +1159,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1140,17 +1167,17 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1158,75 +1185,75 @@ msgid ""
 "%s%c%s"
 msgstr "Kunne ikke læse adressebog"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adressebog fejl"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Kunne ikke læse adressebog"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Brugerflade"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1238,7 +1265,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Note"
 
@@ -1623,111 +1650,111 @@ msgstr "/_Funktioner/_Udfør"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Kan ikke læse tekst afsnit\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Citat markérings format fejl."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Meddelelses svar / videresend fejl."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan ikke læse størrelse på %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "kan ikke læse %s"
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelelse: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Ny meddelelse%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Mangler modtager"
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 #, fuzzy
 msgid "Empty subject"
 msgstr "Emne"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Emne er tom. Send alligevel?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Vedhæftet"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Udfyld automatisk følgende adresser"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Emne:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "Send"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1735,40 +1762,40 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Kan ikke gemme meddelelse i Sendt"
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1779,12 +1806,12 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1793,15 +1820,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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,103 +1837,103 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Kan ikke åbne filen %s\n"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Dato"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "MIME type"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1914,12 +1941,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1929,52 +1956,52 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
@@ -2675,7 +2702,7 @@ msgstr "Nyhedsgrupper:"
 msgid "Creating header view...\n"
 msgstr "Opretter hoved visning...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Ingen Fra)"
@@ -3027,7 +3054,7 @@ msgstr "Forbinder til POP3 server: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ingen forbindelse med POP3 server: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Godkender..."
@@ -6838,7 +6865,7 @@ msgstr "Filtrering..."
 msgid "Searching %s ..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Ingen dato)"
 
@@ -6973,58 +7000,58 @@ msgid ""
 "%s"
 msgstr "fejl under POP3 session\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Modtager antal nye meddelelser (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "Ingen nye meddelelser."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Slet meddelelse(er)"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Afslutter..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Modtager nu meddelelse"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Sende meddelelse"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Modtager nu meddelelse"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Modtager meddelelse fra %s..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "Slet meddelelse(er)"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/de.po b/po/de.po
index 55b93c6f..ea52a2a0 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2007-09-29 23:16+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: de\n"
@@ -693,8 +693,8 @@ msgstr ""
 "Schalter\n"
 "in der 'G'-Spalte, um den Nachrichten-Empfang bei 'Hole alle' einzuschalten."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -829,12 +829,12 @@ msgstr "Aktionen Benutzer-Parameter"
 msgid "Add Address to Book"
 msgstr "Adresse in Adressbuch einfügen"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Kommentar"
@@ -843,33 +843,33 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Wähle Adressbuchablage"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrierte Schablonen"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datei"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Datei/Neues Adress_buch"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Datei/Neue _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Datei/Neues _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datei/Neuer _LDAP-Server"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -877,190 +877,217 @@ msgstr "/_Datei/Neuer _LDAP-Server"
 msgid "/_File/---"
 msgstr "/_Datei/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Datei/_Bearbeiten"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Datei/_Löschen"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Neue _Adresse"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Neue _Gruppe"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Neue Ab_lage"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Adresse/_Löschen"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Adresse/_Bearbeiten"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Adresse/_Bearbeiten"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Bearbeiten"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Werkzeug"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Werkzeug/Importiere _CSV-Datei"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Neue _Adresse"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Neue _Gruppe"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Löschen"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 msgid "/_Copy"
 msgstr "/_Kopieren"
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 msgid "/_Paste"
 msgstr "/_Einfügen"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressbuch"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Ablage"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 msgid "Search:"
 msgstr "Suchen:"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "An:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Suchen"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 msgid "_Close"
 msgstr "_Schließen"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Adresse(n) löschen"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1070,36 +1097,36 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "Nur Abla_ge"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "Ablage und _Adressen"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wirklich '%s' löschen ?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Neuer Benutzer, kann Index-Datei nicht speichern."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Neuer Benutzer, kann Adressbuch-Dateien nicht speichern."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Altes Adressbuch erfolgreich konvertiert."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1107,7 +1134,7 @@ msgstr ""
 "Altes Adressbuch konvertiert,\n"
 "kann neue Adress-Index-Datei nicht speichern"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1115,7 +1142,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "aber erstellte neue leere Adressbuch-Dateien."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1123,7 +1150,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "konnte neue Adressbuch-Dateien nicht erstellen."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1131,15 +1158,15 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren\n"
 "und konnte neue Adressbuch-Dateien erstellen."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 msgid "Address book conversion error"
 msgstr "Adressbuch-Konvertierungsfehler"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 msgid "Address book conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1147,78 +1174,78 @@ msgid ""
 "%s%c%s"
 msgstr "Konnte Adress-Index nicht lesen"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 msgid "Address Book Error"
 msgstr "Adressbuch-Fehler"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Konnte Adress-Index nicht lesen"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 msgid "Address Book Conversion Error"
 msgstr "Adressbuch-Konvertierungsfehler"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 msgid "Address Book Conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "LDAP-Server"
 
@@ -1230,7 +1257,7 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Notiz"
 
@@ -1574,110 +1601,110 @@ msgstr "/_Werkzeuge/_Rechtschreibprüfung"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Werkzeug/_Sprache einstellen"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: Datei existiert nicht\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Kann Textabschnitt nicht lesen\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Zitatzeichen Formatfehler."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Formatfehler in Nachrichtenantwort oder -Weiterleitung."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datei %s existiert nicht\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kann Dateigröße von %s nicht ermitteln\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Verfassen%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Empfänger nicht angegeben"
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "Leerer Betreff"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem verschicken?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Anhänge"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Setze folgende Adressen automatisch"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "Senden"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1685,40 +1712,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:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Kann die Nachricht nicht in der Gesendet-Ablage speichern."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1729,11 +1756,11 @@ msgstr ""
 "\n"
 "Dennoch mit %s senden?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "Zeichensatz-Konvertierungs-Fehler"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1746,15 +1773,15 @@ msgstr ""
 "\n"
 "Dennoch senden?"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "maximale Zeilenlänge"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr "Mit Bcc verschlüsseln"
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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,101 +1795,101 @@ msgstr ""
 "\n"
 " Dennoch versenden? "
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Datei %s existiert nicht."
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, c-format
 msgid "Can't open file %s."
 msgstr "Kann Datei %s nicht öffnen."
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "PGP Unterschreiben"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "PGP Verschlüsseln"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Datum"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: Datei existiert nicht\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Öffne ausführbare Datei"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1874,12 +1901,12 @@ msgstr ""
 "Wenn Sie es starten möchten, speichern Sie es irgendwo und stellen Sie "
 "sicher,dass es sich nicht um einen Virus oder anderen Schadcode handelt."
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, 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:6738
+#: src/compose.c:6743
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1888,48 +1915,48 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess terminieren (pid: %d)?\n"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "_Werkzeugleiste anpassen"
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "Wähle Datei(en)"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "Speichern der Nachricht"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Speichern als Entwurf?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone '%s' übernehmen ?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "_Einfügen"
 
@@ -2619,7 +2646,7 @@ msgstr "Newsgroups:"
 msgid "Creating header view...\n"
 msgstr "Erzeuge Kopfzeilenansicht...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Kein Von)"
@@ -2963,7 +2990,7 @@ msgstr "Verbinde mit POP3-Server: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Beglaubigen..."
@@ -6665,7 +6692,7 @@ msgstr "Suche %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Suche %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
@@ -6793,58 +6820,58 @@ msgid ""
 "%s"
 msgstr "Fehler während einer POP3-Sitzung\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Hole Nachrichtenkopfzeilen (%d / %d bytes)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "Keine neuen Nachrichten."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Nachricht(en) löschen"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Beende..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Empfange neue Nachricht"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Sende Nachricht"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Empfange neue Nachricht"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Erhaltene Nachrichten von %s..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "Nachricht(en) löschen"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/el.po b/po/el.po
index 363c3fde..9fb0d116 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+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"
@@ -705,8 +705,8 @@ msgstr ""
 "στη στήλη 'G' για να ενεργοποιήσετε τη λήψη μηνυμάτων με την εντολή 'Λήψη "
 "όλων'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -842,12 +842,12 @@ msgstr "Παράμετρος ενέργειας χρήστη"
 msgid "Add Address to Book"
 msgstr "Προσθήκη διεύθυνσης στο ευρετήριο"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Σχόλια"
@@ -856,33 +856,33 @@ msgstr "Σχόλια"
 msgid "Select Address Book Folder"
 msgstr "Επιλογή φακέλου από το Ευρετήριο διευθύνσεων"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Αποθηκευμένα πρότυπα"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Αρχείο"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Αρχείο/Νέο ε_υρετήριο διευθύνσεων"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Αρχείο/Νέα _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Αρχείο/Νέο _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "/_File/New _LDAP Server"
 msgstr "/_Αρχείο/Προσθήκη νέου διακομιστή _LDAP"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -890,191 +890,218 @@ msgstr "/_Αρχείο/Προσθήκη νέου διακομιστή _LDAP"
 msgid "/_File/---"
 msgstr "/_Αρχείο/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Αρχείο/_Επεξεργασία"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Αρχείο/_Διαγραφή"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Αρχείο/_Αποθήκευση"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Αρχείο/_Κλείσιμο"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Επεξεργασία"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Επεξεργασία/_Αντιγραφή"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Επεξεργασία/Ε_πικόλληση"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Διεύθυνση"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Διεύθυνση/Νέα δ_ιεύθυνση"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Διεύθυνση/Νέα ο_μάδα"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Διεύθυνση/Νέος _φάκελος"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Διεύθυνση/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Διεύθυνση/_Διαγραφή"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Διεύθυνση/_Επεξεργασία"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Διεύθυνση/_Επεξεργασία"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Διεύθυνση/_Επεξεργασία"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Διεύθυνση/_Διαγραφή"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Εργαλεία"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Βοήθεια"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Βοήθεια/_Σχετικά"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Νέα δ_ιεύθυνση"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Νέα _ομάδα"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Νέος _φάκελος"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Διαγραφή"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 msgid "/_Copy"
 msgstr "/_Αντιγραφή"
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 msgid "/_Paste"
 msgstr "/Ε_πικόλληση"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Φάκελος"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 msgid "Search:"
 msgstr "Αναζήτηση:"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Προς:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Κρυφή κοινοποίηση:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Διαγραφή διεύθυνσης (διευθύνσεων)"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Θέλετε σίγουρα να διαγράψετε τις διευθύνσεις;"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1083,37 +1110,37 @@ msgstr ""
 "Θέλετε να διαγράψετε το '%s' ; Αν διαγράψετε μόνο το φάκελο, οι διευθύνσεις "
 "που περιέχει θα μετακινηθούν στον γονικό φάκελο."
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Διαγραφή φακέλου"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "_Φάκελος μόνο"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "Φάκελος και _διευθύνσεις"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Σίγουρα να διαγραφεί το '%s' ;"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Νέος χρήστης, δεν είναι δυνατή η αποθήκευση του ευρετηρίου."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr ""
 "Νέος χρήστης, δεν είναι δυνατή η αποθήκευση του ευρετηρίου διευθύνσεων."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Το παλιό ευρετήριο διευθύνσεων μετατράπηκε με επιτυχία."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 #, fuzzy
 msgid ""
 "Old address book converted,\n"
@@ -1122,7 +1149,7 @@ msgstr ""
 "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς,\n"
 "δεν είναι δυνατή η αποθήκευση του νέου ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1130,7 +1157,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του ευρετηρίου διευθύνσεων.\n"
 "Δημιουργήθηκε νέο, κενό αρχείο."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 #, fuzzy
 msgid ""
 "Could not convert address book,\n"
@@ -1139,7 +1166,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1147,17 +1174,17 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του ευρετηρίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Σφάλμα κατά τη μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Μετατροπή ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1165,19 +1192,19 @@ msgid ""
 "%s%c%s"
 msgstr "Δεν είναι δυνατή η ανάγνωση του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Σφάλμα ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 #, fuzzy
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς,\n"
 "δεν είναι δυνατή η αποθήκευση του νέου ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3373
+#: src/addressbook.c:3406
 #, fuzzy
 msgid ""
 "Could not convert address book, but created empty new address book files."
@@ -1185,7 +1212,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων.\n"
 "Δημιουργήθηκε νέο, κενό αρχείο."
 
-#: src/addressbook.c:3379
+#: src/addressbook.c:3412
 #, fuzzy
 msgid ""
 "Could not convert address book, could not create new address book files."
@@ -1193,7 +1220,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:3385
+#: src/addressbook.c:3418
 #, fuzzy
 msgid ""
 "Could not convert address book and could not create new address book files."
@@ -1201,51 +1228,51 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Δεν είναι δυνατή η ανάγνωση του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Σφάλμα κατά τη μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Ευρετήριο διευθύνσεων"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Άτομο"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Ομάδα"
 
 # Untrans.
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
 # Untans.
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "Διακομιστής LDAP"
 
@@ -1257,7 +1284,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -1604,110 +1631,110 @@ msgstr "/_Εργαλεία/Ορθογραφικός έλε_γχος"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Εργαλεία/Ορισμός _γλώσσας ορθογραφίας"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: το αρχείο δεν υπάρχει\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Δεν είναι δυνατή η λήψη του κειμένου\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Σφάλμα μορφοποίησης σημείωσης παράθεσης."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Σφάλμα στην απάντηση/προώθηση του μηνύματος."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Δεν είναι δυνατή η λήψη του μεγέθους του %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Το αρχείο %s είναι κενό."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Δεν είναι δυνατή η ανάγνωση του %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Μήνυμα: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Δεν είναι δυνατή η λήψη μέρους του πολυτμηματικού μηνύματος."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Χωρίς θέμα)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Δεν έχει οριστεί παραλήπτης."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "Κενό θέμα"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Το θέμα είναι κενό. Να γίνει η αποστολή;"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Συνημμένα"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Θέμα:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "Αποστολή"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "δεν είναι δυνατή η λήψη λίστας παραληπτών."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1715,43 +1742,43 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Δημιουργήθηκε σφάλμα κατά την αποστολή του μηνύματος στο %s ."
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Δεν είναι δυνατή η αποθήκεύσή του μηνύματος στα εξερχόμενα."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Δεν ήταν δυνατή η εύρεση του κλειδιού που σχετίζεται με το επιλεγμένο "
 "αναγνωριστικό `%s'."
 
-#: src/compose.c:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 #, fuzzy
 msgid "can't change file mode\n"
 msgstr "Η αλλαγή της κατάστασης του `%s' απέτυχε"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1762,11 +1789,11 @@ msgstr ""
 "του μηνύματος στο προσδιορισμένο σύνολο %s.\n"
 "Να αποσταλεί ως %s;"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "Σφάλμα μετατροπής κώδικα"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1779,15 +1806,15 @@ msgstr ""
 "\n"
 "Να γίνει αποστολή;"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "Όριο μήκους γραμμής"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr "Κρυπτογράφηση στους κρυφούς παραλήπτες"
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1801,102 +1828,102 @@ msgstr ""
 "\n"
 "Να γίνει η αποστολή;"
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "Δεν είναι δυνατή η διαγραφή του παλιού μηνύματος\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "προσθήκη στην ουρά...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "Δεν είναι δυνατή η εύρεση του πηγαίου φακέλου."
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Δεν είναι δυνατή η σημείωση του αρχείου.\n"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr ""
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Δημιουργία παραθύρου σύνθεσης...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "Υπογραφή PGP"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "Κρυπτογράφηση PGP"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Ημερομηνία"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει ή είναι άδειο."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διαδρομή"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: το αρχείο δεν υπάρχει\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Άνοιγμα εκτελέσιμου αρχείου"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1904,14 +1931,14 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, fuzzy, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr ""
 "Η εντολή εκτύπωσης είναι άκυρη:\n"
 "'%s'"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1921,49 +1948,49 @@ msgstr ""
 "Να επιβάλω τερματισμό της διεργασίας;\n"
 "process group id: %d"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "Προσαρμο_γή εργαλειοθήκης..."
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "Επιλογή αρχείων"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "Αποθήκευση μηνύματος"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Αυτό το μήνυμα έχει τροποποιηθεί. Θέλετε να το αποθηκεύσετε στα πρόχειρα;"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "Κλείσιμο _χωρίς αποθήκευση"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε να εφαρμόσετε το πρότυπο '%s' ;"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Εφαρμογή προτύπου"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "_Εισαγωγή"
 
@@ -2661,7 +2688,7 @@ msgstr "Ομάδες συζητήσεων:"
 msgid "Creating header view...\n"
 msgstr "Δημιουργία προβολής κεφαλίδων...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Χωρίς αποστολέα)"
@@ -3014,7 +3041,7 @@ msgstr "Σύνδεση με το διακομιστή POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον POP3 server: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Πιστοποίηση..."
@@ -6726,7 +6753,7 @@ msgstr "Αναζήτηση για %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Αναζήτηση για %s..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Χωρίς ημερομηνία)"
 
@@ -6857,58 +6884,58 @@ msgid ""
 "%s"
 msgstr "Προέκυψε σφάλμα στη συνεδρία POP3\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Εμφάνιση Όλων των _Κεφαλίδων"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Λήψη αριθμού νέων μηνυμάτων (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "Δεν υπάρχουν νέα μηνύματα."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Διαγραφή μηνύματος(ων)"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Εγκατάλειψη..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Λήψη νέων μηνυμάτων"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Αποστολή μηνύματος"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Λήψη νέων μηνυμάτων"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Λήψη μηνυμάτων από %s..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "Διαγραφή μηνύματος(ων)"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/es.po b/po/es.po
index 0bf797bb..1fa404b8 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2010-02-24 08:05+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -688,8 +688,8 @@ msgstr ""
 "El orden de comprobación de mensajes será éste. Marque las casillas\n"
 "en la columna «G» para habilitar la descarga mediante «Recibir todo»."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -824,12 +824,12 @@ msgstr "Parámetro de usuario de la acción"
 msgid "Add Address to Book"
 msgstr "Añadir dirección a la agenda"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Dirección"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Notas"
@@ -838,32 +838,32 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 msgid "Auto-registered address"
 msgstr "Direcciones auto-registradas"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichero"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Fichero/Nueva _agenda"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Fichero/Nueva _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Fichero/Nuevo _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichero/Nuevo servidor _LDAP"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -871,190 +871,217 @@ msgstr "/_Fichero/Nuevo servidor _LDAP"
 msgid "/_File/---"
 msgstr "/_Fichero/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Fichero/_Editar"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Fichero/_Borrar"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Dirección"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Dirección/Nueva _dirección"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Dirección/Nuevo _grupo"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Dirección/Nueva _carpeta"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Dirección/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Dirección/_Borrar"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Dirección/_Editar"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Dirección/_Editar"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Dirección/_Editar"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Herramientas/Importar fichero _CSV"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Nueva _dirección"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Nuevo _grupo"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 msgid "/_Copy"
 msgstr "/_Copiar"
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 msgid "/_Paste"
 msgstr "/_Pegar"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 msgid "Search:"
 msgstr "Buscar:"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Añadir"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Buscar"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 msgid "_Close"
 msgstr "_Cerrar"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1063,36 +1090,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:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "Sólo la _carpeta"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "La carpeta y las _direcciones"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente «%s»?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se pudo guardar el fichero índice."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pudo guardar los ficheros de direcciones"
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1100,7 +1127,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se pudo guardar el nuevo fichero índice"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1108,7 +1135,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1116,7 +1143,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "no se pudieron crear los ficheros para la nueva."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1124,15 +1151,15 @@ msgstr ""
 "No se pudo convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para una nueva."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 msgid "Address book conversion error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 msgid "Address book conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1143,78 +1170,78 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 msgid "Address Book Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "No se pudo leer el índice de direcciones"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 msgid "Address Book Conversion Error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 msgid "Address Book Conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "Dirección de correo"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Grupo"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1226,7 +1253,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1570,107 +1597,107 @@ msgstr "/_Herramientas/_Comprobar ortografía"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Herramientas/_Establecer idioma ortográfico"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: el fichero no existe\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "No se puede obtener la parte de texto\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Error en el formato de la marca de cita."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Error en el formato de responder/redirijir."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "No se puede obtener el tamaño de %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "No se puede leer %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componer%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "Asunto vacío"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 msgid "Attachment is missing"
 msgstr "Falta el adjunto"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr "No hay adjunto. ¿Enviarlo sin adjuntos?"
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr "Comprobar destinatarios"
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 msgid "Really send this mail to the following addresses?"
 msgstr "¿Enviar realmente este correo a las direcciones siguientes?"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1678,39 +1705,39 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta de correo antes de enviar."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "No se puede guardar el mensaje en Salida."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 msgid "Can't sign the message."
 msgstr "El mensaje no se puede firmar."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 msgid "Can't encrypt the message."
 msgstr "El mensaje no se puede cifrar."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 msgid "Can't encrypt or sign the message."
 msgstr "El mensaje no se puede cifrar o firmar."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1721,11 +1748,11 @@ msgstr ""
 "\n"
 "¿Enviarlo como %s de todas formas?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "Error en la conversión de códigos"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1738,15 +1765,15 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "Límite de longitud de línea"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr "Cifrando con copia oculta"
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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,101 +1787,101 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "El fichero %s no existe."
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, c-format
 msgid "Can't open file %s."
 msgstr "No se puede abrir el fichero %s."
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Fecha"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: el fichero no existe\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Abriendo fichero ejecutable"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1866,12 +1893,12 @@ msgstr ""
 "Si quiere lanzarlo, guárdelo en algún lugar y asegúrese de que no es un "
 "virus u otro tipo de software malintencionado."
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, 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:6738
+#: src/compose.c:6743
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1880,48 +1907,48 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "_Configurar barra de herramientas..."
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 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:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -2603,7 +2630,7 @@ msgstr "Grupos de noticias:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Sin remitente)"
@@ -2936,7 +2963,7 @@ msgstr "Conectando al servidor POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servidor POP3: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentificando..."
@@ -6602,7 +6629,7 @@ msgstr "Buscando %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Buscando %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
@@ -6726,55 +6753,55 @@ msgstr ""
 "Ocurrió un error en la sesión POP3:\n"
 "%s"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Obteniendo las cabeceras de mensaje (%d / %d) ..."
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 msgid "Getting the number of messages..."
 msgstr "Obteniendo el número de mensajes..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 msgid "No message"
 msgstr "No hay mensajes"
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, c-format
 msgid "Deleted %d messages"
 msgstr "Eliminados %d mensaje(s)"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Terminando..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "Recuperados %d mensajes"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, c-format
 msgid "Opened message %d"
 msgstr "Abierto mensaje %d"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "Recuperadas %d cabeceras de mensajes"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "Recuperando mensaje %d ..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 msgid "Delete messages"
 msgstr "Borrar mensajes"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/et.po b/po/et.po
index 077d7660..84dfece5 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2002-10-02 09:08+0300\n"
 "Last-Translator: Peeter Vois <Peeter.Vois@mail.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -696,8 +696,8 @@ msgstr ""
 "*Uusi teateid võetakse selles järjekorras. Märgi kastikesed\n"
 "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -832,12 +832,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Lisa aadress raamatusse"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Aadress"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Märkused"
@@ -846,34 +846,34 @@ msgstr "Märkused"
 msgid "Select Address Book Folder"
 msgstr "Vali aadressiraamatu kaust"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registreeritud reeglid"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fail"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Fail/Uus raamat"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Fail/Uus _V-Kaart"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Fail/Uus _JPiloot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fail/Uus _Server"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -881,196 +881,223 @@ msgstr "/_Fail/Uus _Server"
 msgid "/_File/---"
 msgstr "/_Fail/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Fail/R_edigeeri"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Fail/Kustuta"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Fail/_Salvesta"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fail/Sul_ge"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/R_edaktor"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Aadress"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Aadress/Uus _Aadress"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Aadress/Uus _Grupp"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Aadress/Uus Kaust"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Aadress/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Aadress/Kustuta"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Aadress/R_edigeeri"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Aadress/R_edigeeri"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Aadress/R_edigeeri"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Tööriist"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Uus _Aadress"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Uus _Grupp"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/Kustuta"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 #, fuzzy
 msgid "/_Copy"
 msgstr "/Kopeeri..."
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 #, fuzzy
 msgid "/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Aadressiraamat"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Kaust"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Otsi"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Kellele:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Kustuta"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Lisa"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Otsi"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 #, fuzzy
 msgid "_Close"
 msgstr "Sulge"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Kustuta aadress(id)"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Kas te tõesti soovite aadresse kustutada?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1079,38 +1106,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:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ainult kataloog"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Kaust ja aadressid"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Kas tõesti kustutada `%s' ?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Uus kasutaja, ei saanud salvestada indeksifaili."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Uus kasutaja, ei saanud salvestada aadressiraamatu faile."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Vana aadressiraamat uuendati edukalt."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1118,7 +1145,7 @@ msgstr ""
 "Vana aadressiraamat uuendati.\n"
 "ei saanud salvestada uut aadresside indeksifaili"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1126,7 +1153,7 @@ msgstr ""
 "Ei saanud uuendada aadressiraamatut,\n"
 "kuid loodi uued ja tühjad aadressiraamatu failid."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1134,7 +1161,7 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ei suutnud luua uusi aadressiraamatu faile."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1142,17 +1169,17 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ja ei suutnud luua uut aadressiraamatu faile."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Aadressiraamat viiakse uude formaati"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1160,80 +1187,80 @@ msgid ""
 "%s%c%s"
 msgstr "Ei suutnud lugeda aadresside indeksit"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Aadressiraamatu viga"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Ei suutnud lugeda aadresside indeksit"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Aadressiraamatu uuendamine"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Kasutajaliides"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "EPosti Aadress"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Grupp"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "V-Kaart"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPiloot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1245,7 +1272,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Märkus"
 
@@ -1631,111 +1658,111 @@ msgstr "/_Tööriist/Käivita"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Ei saa tekstiosa kätte\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "*Tsitaadimärgi formaadi viga."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Kirja vasta/edasta formaadi viga."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ei saanud failile %s suurust\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Fail %s on tühi."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "ei suuda lugeda %s-i"
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Kiri: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Kirjuta kiri%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Saaja pole määratud."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 #, fuzzy
 msgid "Empty subject"
 msgstr "Pealkiri"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Päälkiri on tühi. Kas saadame igal juhul?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Manused"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Säti järgmised aadressid automaatselt"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Pealkiri:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "Saada"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1743,41 +1770,41 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Kirja ei õnnestunud asetada väljunute kausta."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1787,12 +1814,12 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1801,15 +1828,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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,104 +1845,104 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ei suuda avada faili %s\n"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Kuupäev"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1923,12 +1950,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1938,52 +1965,52 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
@@ -2687,7 +2714,7 @@ msgstr "Uudistegrupid:"
 msgid "Creating header view...\n"
 msgstr "Loon päise vaadet...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Eikelleltki)"
@@ -3039,7 +3066,7 @@ msgstr "Ühendan POP3 serveriga: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ei suuda ühenduda POP3 serveriga %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Autoriseerin..."
@@ -6844,7 +6871,7 @@ msgstr "Filtreerin..."
 msgid "Searching %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Kuupäeva pole)"
 
@@ -6979,58 +7006,58 @@ msgid ""
 "%s"
 msgstr "autoriseerimisel tekkis viga\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "Uusi kirju ei ole."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Kustuta kirjad"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Väljun..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Võtan uusi kirju"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Saada kiri"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Võtan uusi kirju"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "Kustuta kirjad"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/fr.po b/po/fr.po
index e8e18649..5731981e 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2010-06-19 02:21+0200\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -702,8 +702,8 @@ msgstr ""
 "case dans la colonne G pour relever le courrier du compte \n"
 "correspondant lorsque « Tout relever » est activé"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -838,12 +838,12 @@ msgstr "Argument de l'action"
 msgid "Add Address to Book"
 msgstr "Ajouter l'adresse au carnet"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresses"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Remarques"
@@ -852,32 +852,32 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Choisissez un dossier"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 msgid "Auto-registered address"
 msgstr "Adresses enregistrées automatiquement"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichier"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Fichier/Nouveau _carnet d'adresses"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Fichier/Nouveau carnet _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Fichier/Nouveau carnet _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -885,190 +885,217 @@ msgstr "/_Fichier/Nouveau _serveur LDAP"
 msgid "/_File/---"
 msgstr "/_Fichier/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Fichier/Édit_er"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Fichier/_Supprimer"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/É_dition"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/É_dition/Co_ller"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Nouvelle _adresse"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Nouveau _groupe"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Nouveau _dossier"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Adresse/_Supprimer"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Adresse/Édit_er"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Adresse/Édit_er"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/Édit_er"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Outils"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Outils/Importer un fichier _CSV"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Nouvelle _adresse"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Nouveau _groupe"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Supprimer"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 msgid "/_Copy"
 msgstr "/_Copier"
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 msgid "/_Paste"
 msgstr "/Co_ller"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Dossier"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 msgid "Search:"
 msgstr "Rechercher :"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "À :"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Copie :"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Copie discrète :"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 msgid "_Close"
 msgstr "_Quitter"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Suppression d'adresse(s)"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Voulez-vous supprimer la(les) adresse(s) sélectionnée(s) ?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1078,37 +1105,37 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "_Dossier uniquement"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "Dossier et _adresses"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Voulez-vous vraiment supprimer « %s » ?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur. Impossible d'enregistrer le fichier index."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr ""
 "Nouvel utilisateur, impossible d'enregistrer le fichier carnet d'adresses."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1116,7 +1143,7 @@ msgstr ""
 "Ancien carnet d'adresses converti,\n"
 "mais impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1124,7 +1151,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:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1132,7 +1159,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:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1140,15 +1167,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:3252
+#: src/addressbook.c:3285
 msgid "Address book conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 msgid "Address book conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1159,78 +1186,78 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 msgid "Address Book Error"
 msgstr "Erreur dans le carnet d'adresses"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 msgid "Address Book Conversion Error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 msgid "Address Book Conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Personne"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Groupe"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "Serveur LDAP"
 
@@ -1242,7 +1269,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Information"
 
@@ -1586,109 +1613,109 @@ msgstr "/_Outils/_Vérifier l'orthographe"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Outils/_Définir la langue du message"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s : le fichier n'existe pas\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Impossible d'obtenir la partie texte\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Erreur du format de citation."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr ""
 "Erreur du format de citation d'un message lors d'une réponse ou d'un "
 "transfert."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossible d'obtenir la taille de %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Composition%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "Sujet absent"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Envoyer malgré cela ?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 msgid "Attachment is missing"
 msgstr "Pièce jointe absente"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Il n'y a pas de pièce jointe. Envoyer sans pièce jointe ?"
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr "Vérification des destinataires"
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 msgid "Really send this mail to the following addresses?"
 msgstr "Vraiment envoyer ce courrier aux adresses suivantes ?"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1696,37 +1723,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:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, 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:3569
+#: src/compose.c:3573
 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:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 msgid "Can't sign the message."
 msgstr "Impossible de signer le message."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 msgid "Can't encrypt the message."
 msgstr "Impossible de crypter le message."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 msgid "Can't encrypt or sign the message."
 msgstr "Impossible de crypter ou signer le message."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1737,11 +1764,11 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer avec %s ?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "Erreur de conversion de code"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1754,15 +1781,15 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "Longueur de ligne maximale"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr "Chiffrement avec « Copie discrète »"
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1776,100 +1803,100 @@ msgstr ""
 "\n"
 "Envoyer quand même ?"
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Le fichier %s n'existe pas."
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, c-format
 msgid "Can't open file %s."
 msgstr "Impossible d'ouvrir le fichier %s"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID créé : %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "Signature PGP"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Date"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 msgid "File not exist."
 msgstr "Le fichier n'existe pas."
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Ouverture du fichier exécutable"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1881,12 +1908,12 @@ msgstr ""
 "Vous pouvez l'enregistrer quelque part pour le lancer vous-même, mais prenez "
 "les précautions d'usage (anti-virus, etc.)."
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, 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:6738
+#: src/compose.c:6743
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1895,50 +1922,50 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d) ?\n"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "Personnaliser la _barre d'outils..."
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 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:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -2621,7 +2648,7 @@ msgstr "Groupe de discussion :"
 msgid "Creating header view...\n"
 msgstr "Création de la vue des en-têtes...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Pas d'expéditeur)"
@@ -2956,7 +2983,7 @@ msgstr "Connexion au serveur POP3 : %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Authentification..."
@@ -6651,7 +6678,7 @@ msgstr "Recherche %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Recherche %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(aucune date)"
 
@@ -6775,55 +6802,55 @@ msgstr ""
 "Une erreur est survenue pendant la session POP3 :\n"
 "%s"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Réception des en-têtes de message (%d / %d) ..."
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 msgid "Getting the number of messages..."
 msgstr "Récupération du nombre de messages..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 msgid "No message"
 msgstr "Pas de message"
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, c-format
 msgid "Deleted %d messages"
 msgstr "Suppression de %d message(s)"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Fermeture..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "Récupération de %d messages"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, c-format
 msgid "Opened message %d"
 msgstr "Message ouverte %d"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "Récupération de %d en-têtes de message"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "Réception de messages %d ..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 msgid "Delete messages"
 msgstr "Suppression des messages"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/gl.po b/po/gl.po
index fab5726f..147ffca6 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -694,8 +694,8 @@ msgstr ""
 "A orde de comprobación de mensaxes será este. Marque as casilas\n"
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -830,12 +830,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Engadir enderezo á axenda"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Enderezo"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Notas"
@@ -844,34 +844,34 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta da axenda"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Regas rexistradas"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Ficheiro"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Ficheiro/Nova _axenda"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Ficheiro/Nova _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Ficheiro/Novo _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -879,196 +879,223 @@ msgstr "/_Ficheiro/Novo _servidor"
 msgid "/_File/---"
 msgstr "/_Ficheiro/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Ficheiro/_Editar"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Ficheiro/_Borrar"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Ficheiro/_Pechar"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Enderezo"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Enderezo/Novo _enderezo"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "//_Enderezo/Novo _grupo"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Enderezo/Nova _carpeta"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Enderezo/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Enderezo/_Borrar"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Enderezo/_Editar"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Enderezo/_Editar"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Enderezo/_Editar"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Novo _enderezo"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Novo _grupo"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Copiar..."
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Buscar"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Engadir"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Buscar"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 #, fuzzy
 msgid "_Close"
 msgstr "Pechar"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Borrar enderezo(s)"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente o(s) enderezo(s)?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1077,38 +1104,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:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "_Folder only"
 msgstr "Carpeta só"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Carpeta e enderezos"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente `%s' ?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Novo usuario, non se puido gardar o ficheiro índice."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Novo usuario, non se puido gardar os ficheiros de enderezos"
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Antiga axenda de enderezos convertida con éxito"
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1116,7 +1143,7 @@ msgstr ""
 "Antiga axenda de enderezos convertida,\n"
 "non se puido gardar o novo ficheiro índice"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1124,7 +1151,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "pero crearonse novos ficheiros valeiros."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1132,7 +1159,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "Non se puideron crear os ficheiros para a nova."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1140,17 +1167,17 @@ msgstr ""
 "Non se puido convertir a antiga axenda\n"
 "e non se puideron crear ficheiros para unha nova."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Conversión da  axenda"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1158,81 +1185,81 @@ msgid ""
 "%s%c%s"
 msgstr "Non se puido ler o índice de enderezos"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Error na axenda"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Non se puido ler o índice de enderezos"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Erro na conversión da axenda"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Conversión da axenda"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Persoa"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Grupo"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1244,7 +1271,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1629,112 +1656,112 @@ msgstr "/_Ferramentas/E_xecutar"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Non se pode obter o texto\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 #, fuzzy
 msgid "Quote mark format error."
 msgstr "Marca de cita para erro."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Erro no formato da mensaxe para respostar/redirixir "
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Non se pode obter o tamaño de %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "o Ficheiro %s esta valeiro."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Non poido ler %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaxe: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compoñer mensaxe%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 #, fuzzy
 msgid "Empty subject"
 msgstr "Asunto"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "o asunto esta valeiro. ¿Enviar de todas formas?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Adxuntos"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Establecer os seguintes enderezos automáticamente"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "Enviar"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1742,40 +1769,40 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Non se pode gardar a mensaxe en Saida."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1786,12 +1813,12 @@ msgstr ""
 "%s a %s.\n"
 "¿Envia-lo de todo xeito?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1800,15 +1827,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1817,103 +1844,103 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Non poido abrir %s\n"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Data"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1921,12 +1948,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, 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:6738
+#: src/compose.c:6743
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1936,52 +1963,52 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
@@ -2683,7 +2710,7 @@ msgstr "Grupos de novas:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceiras...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Sin remite)"
@@ -3036,7 +3063,7 @@ msgstr "Conectando ó servidor POP3: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Non se pode conectar ó servirdor POP3: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Autenticando..."
@@ -6843,7 +6870,7 @@ msgstr "Filtrando..."
 msgid "Searching %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Sin data)"
 
@@ -6977,58 +7004,58 @@ msgid ""
 "%s"
 msgstr "ocurriu algún erro na sesión POP3\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "Non hai mensaxes novas."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Borrar mensaxe(s)"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Terminando..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Obtendo novos mensaxes"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Enviar Mensaxe"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Obtendo novos mensaxes"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "Borrar mensaxe(s)"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/hr.po b/po/hr.po
index 3afe7386..3e801c32 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2001-09-17 13:22+0100\n"
 "Last-Translator: Ante Karamatić <ante@cdnet.com.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -701,8 +701,8 @@ msgstr ""
 "Nove poruke biti će provjerene ovim redom. Označite pod\n"
 "S one račune s kojih želite skinuti poštu sa `Primi sve'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -834,12 +834,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Bilješke"
@@ -848,35 +848,35 @@ msgstr "Bilješke"
 msgid "Select Address Book Folder"
 msgstr "Odaberite spis adresara"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrirana pravila"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _V-kartica"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 #, fuzzy
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _J-Pilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _poslužitelj"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -884,196 +884,223 @@ msgstr "/_Datoteka/Novi _poslužitelj"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Uredi"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Uredi"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/U_baci"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _spis"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Adresa/O_briši"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Adresa/_Uredi"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Adresa/_Uredi"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Uredi"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Novi _spis"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiraj..."
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Uredi/U_baci"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresar"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Spis"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Potraga"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Potraga"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 #, fuzzy
 msgid "_Close"
 msgstr "Zatvori"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Uistinu obrisati adresu/e?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1082,38 +1109,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:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Obriši spis"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo spis"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Spis i adrese"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Uistinu obrisati `%s' ?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu spretmiti index datoteku."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu spremiti datoteke adresara."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspješno unešen."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1121,7 +1148,7 @@ msgstr ""
 "Stari adresar ne može biti unešen,\n"
 "ne mogu spremiti novu index datoteku adresara."
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1129,7 +1156,7 @@ msgstr ""
 "Ne mogu unjeti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1137,7 +1164,7 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1145,17 +1172,17 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "i ne mogu stvoriti nove datoteke adresara."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1163,74 +1190,74 @@ msgid ""
 "%s%c%s"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Sučelje"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Grupa"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "V-kartica"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 #, fuzzy
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "LDAP Poslužitelj"
 
@@ -1242,7 +1269,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -1638,111 +1665,111 @@ msgstr "/_Izvrši"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti dio tekst\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Greška formata citata."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Greška poruke odgovori/proslijedi."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna\n"
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "ne mogu kreirati %s\n"
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Prilog"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatski postavi slijedeće adrese"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "Pošalji"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu primatelja."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1750,40 +1777,40 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, 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:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu snimiti poruku u spis poslano."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1791,12 +1818,12 @@ msgid ""
 "Send it as %s anyway?"
 msgstr "Ne mogu promjeniti charset poruke."
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1805,15 +1832,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1822,105 +1849,105 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Izvrši"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Datum"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1928,12 +1955,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, 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:6738
+#: src/compose.c:6743
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1943,53 +1970,53 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Replace"
 msgstr "Obrazac"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2698,7 +2725,7 @@ msgstr "News grupe:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Bez pošiljatelja)"
@@ -3062,7 +3089,7 @@ msgstr "Povezujem se na POP3 poslužitelj: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 poslužitelj: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
@@ -6934,7 +6961,7 @@ msgstr "Filtriranje..."
 msgid "Searching %s ..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
@@ -7069,58 +7096,58 @@ msgid ""
 "%s"
 msgstr "greška prilikom ovjeravanja\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Primam broj novih poruka (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "Nema nepročitanih poruka."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Obriši poruku/e"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Završavam..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Primam nove poruke"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Pošalji poruku"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Primam nove poruke"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "Obriši poruku/e"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/hu.po b/po/hu.po
index 3171aefc..fcfac2a9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2010-02-13 14:38+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@uhuklub.hu>\n"
 "Language-Team: Hungarian <NONE>\n"
@@ -692,8 +692,8 @@ msgstr ""
 "letöltése'\n"
 "funkció bekapcsolásához tegyen pipát a 'G' oszlopban levő négyzetbe!"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -829,12 +829,12 @@ msgstr "A művelet felhasználói paramétere"
 msgid "Add Address to Book"
 msgstr "Cím hozzáadása a címjegyzékhez"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Cím"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Megjegyzések"
@@ -843,32 +843,32 @@ msgstr "Megjegyzések"
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 msgid "Auto-registered address"
 msgstr "Auto-regisztrált cím"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fájl"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Fájl/Új _Címjegyzék"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Fájl/Új _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Fájl/Új _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fájl/Új _LDAP Szerver"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -876,190 +876,217 @@ msgstr "/_Fájl/Új _LDAP Szerver"
 msgid "/_File/---"
 msgstr "/_Fájl/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Fájl/_Szerkesztés"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Fájl/_Törlés"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Fájl/_Mentés"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fájl/_Bezárás"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/S_zerkesztés"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/S_zerkesztés/_Másolás"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/S_zerkesztés/_Beillesztés"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Cím"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Cím/Új _cím"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Cím/Új cso_port"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Cím/Új _mappa"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Cím/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Cím/_Törlés"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Cím/_Szerkesztés"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Cím/_Szerkesztés"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Cím/_Szerkesztés"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Eszközök"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Eszközök/_LDIF fájl importálása"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Eszközök/_CSV fájl importálása"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Új _cím"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Új cso_port"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Törlés"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 msgid "/_Copy"
 msgstr "/_Másolás"
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 msgid "/_Paste"
 msgstr "/_Beillesztés"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Címjegyzék"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Mappa"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "Email cím"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 msgid "Search:"
 msgstr "Keresés:"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Címzett:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Másolat:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Titkos másolat:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Keresés"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 msgid "_Close"
 msgstr "Be_zárás"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Cím(ek) törlése"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Tényleg töröljem a cím(ek)et?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1068,36 +1095,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:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "Cs_ak mappa"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "Mappa és _címek"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tényleg törli `%s' elemet?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Az új felhasználó nem tudja menteni az index fájlt."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 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:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "A régi címjegyzék konvertálása sikerült."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1105,7 +1132,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:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1113,7 +1140,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:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1121,7 +1148,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:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1129,15 +1156,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:3252
+#: src/addressbook.c:3285
 msgid "Address book conversion error"
 msgstr "Címjegyzék konvertálási hiba"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 msgid "Address book conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1148,74 +1175,74 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 msgid "Address Book Error"
 msgstr "Címjegyzék hiba"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "A címindex nem olvasható"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 msgid "Address Book Conversion Error"
 msgstr "Címjegyzék konvertálási hiba"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 msgid "Address Book Conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Illesztő"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Személy"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "Email cím"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Csoport"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "LDAP Szerver"
 
@@ -1227,7 +1254,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -1571,107 +1598,107 @@ msgstr "/_Eszközök/_Helyesírásellenőrzés"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Eszközök/Helyesírás _nyelvi beállítások"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fájl nem létezik\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Nem tudtam olvasni a szövegrészt\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Idézet jelölés formátum hiba."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Levél válasz/továbbítás formátumhiba."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s fájl nem létezik\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s mérete nem határozható meg\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "A(z) %s fájl üres."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvasható."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Levél: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Egy több részes levél egy darabja nem hozzáférhető."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Levél írása%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Nincs címzett megadva."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "Nincs tárgy"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "A levél tárgya üres. Ennek ellenére elküldi?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 msgid "Attachment is missing"
 msgstr "Nincs csatolva semmi"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Nincs csatolva semmi. Elküldi csatolások nélkül?"
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr "Címzettek ellenőrzése"
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 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:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tárgy:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 msgid "_Send"
 msgstr "_Küldés"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1679,39 +1706,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:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, 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:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "A levél nem menthető a kimenő mappába."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 msgid "Can't sign the message."
 msgstr "A levelet nem sikerült aláírni."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 msgid "Can't encrypt the message."
 msgstr "A levelet nem sikerült titkosítani."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 msgid "Can't encrypt or sign the message."
 msgstr "A levelet nem sikerült titkosítani vagy aláírni."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1722,11 +1749,11 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi, mint %s?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "Kód konvertálási hiba"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1739,15 +1766,15 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "Sorhossz határ"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr "Titkos másolat(ok) titkosítása"
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1762,101 +1789,101 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "a régi levelet nem lehet törölni\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "levél Várakozó sorba rakása...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "nem található a Várakozó sor mappája\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "A levelet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "A(z) %s fájl nem létezik."
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, c-format
 msgid "Can't open file %s."
 msgstr "A(z) %s fájlt nem lehet megnyitni."
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generált Message-ID: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "PGP Aláírás"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Dátum"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: fájl nem létezik\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Futtatható fájl megnyitása"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1868,12 +1895,12 @@ msgstr ""
 "Ha futtatni szeretné, mentse el valahová, és győződjön meg róla, hogy nem "
 "egy vírus vagy más kártékony program."
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1882,48 +1909,48 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "Eszközs_áv testreszabása..."
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "A levelet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "Levél mentése"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 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:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "_Beszúrás"
 
@@ -2603,7 +2630,7 @@ msgstr "Hírcsoportok:"
 msgid "Creating header view...\n"
 msgstr "Fejléc nézet létrehozása...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Nincs Feladó)"
@@ -2934,7 +2961,7 @@ msgstr "Kapcsolódás a(z) %s POP3 szerverhez ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nem sikerült kapcsolódni a POP3 szerverhez: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Azonosítás..."
@@ -6604,7 +6631,7 @@ msgstr "%s keresése (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "%s keresése..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Nincs Dátum)"
 
@@ -6728,55 +6755,55 @@ msgstr ""
 "Hiba történt a POP3-as munkamenet közben:\n"
 "%s"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Levélfejlécek letöltése (%d / %d) ..."
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 msgid "Getting the number of messages..."
 msgstr "Új levelek számának megszerzése..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 msgid "No message"
 msgstr "Nincs levél"
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, c-format
 msgid "Deleted %d messages"
 msgstr "%d levél törölve"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Kilépés..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "%d levél fogadva"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, c-format
 msgid "Opened message %d"
 msgstr "%d levél megnyitva"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "%d levélfejléc fogadva"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "%d levél fogadása ..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 msgid "Delete messages"
 msgstr "Levelek törlése"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/it.po b/po/it.po
index 067c6364..b895a850 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+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"
@@ -693,8 +693,8 @@ msgstr ""
 "nella\n"
 "colonna «G» per consentire il recupero dei messaggi attraverso «Ricevi tutti»."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -829,12 +829,12 @@ msgstr "Argomento dell'azione utente"
 msgid "Add Address to Book"
 msgstr "Aggiunta dell'indirizzo alla rubrica"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Indirizzo"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Note"
@@ -843,33 +843,33 @@ msgstr "Note"
 msgid "Select Address Book Folder"
 msgstr "Selezione della cartella della rubrica"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Modelli registrati"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_File"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_File/Nuova _rubrica"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_File/Nuova _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_File/Nuovo _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "/_File/New _LDAP Server"
 msgstr "/_File/Nuovo server _LDAP"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -877,190 +877,217 @@ msgstr "/_File/Nuovo server _LDAP"
 msgid "/_File/---"
 msgstr "/_File/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_File/_Modifica"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_File/_Elimina"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_File/_Salva"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_File/_Chiudi"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Modifica"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Modifica/_Incolla"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Indirizzo"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Indirizzo/Nuovo _indirizzo"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Indirizzo/Nuovo _gruppo"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Indirizzo/Nuova _cartella"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Indirizzo/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_indirizzo/_Elimina"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Indirizzo/_Modifica"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Indirizzo/_Modifica"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Indirizzo/_Modifica"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/S_trumenti"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/S_trumenti/Importa file _LDIF"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 msgid "/_Tools/Import _CSV file"
 msgstr "/S_trumenti/Importa file _CSV"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Nuovo _indirizzo"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Nuovo _gruppo"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/Eli_mina"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 msgid "/_Copy"
 msgstr "/_Copia"
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 msgid "/_Paste"
 msgstr "/_Incolla"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Rubrica"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Cartella"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 msgid "Search:"
 msgstr "Ricerca:"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "A:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr " Aggiungi "
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Cerca"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 msgid "_Close"
 msgstr "_Chiudi"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Elimina l'indirizzo(i)"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Eliminare l'indirizzo(i)?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1070,36 +1097,36 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "_Solo la cartella"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "Cartella e _indirizzi"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Eliminare «%s» ?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Nuovo utente, impossibile salvare il file indice."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Nuovo utente, impossibile salvare i file della rubrica."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "La vecchia rubrica è stata convertita con successo."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1107,7 +1134,7 @@ msgstr ""
 "Vecchia rubrica convertita,\n"
 "impossibile salvare il nuovo file indice dell'indirizzo"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1115,7 +1142,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "ma ho creato nuovi file vuoti della rubrica."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1123,7 +1150,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1131,15 +1158,15 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "e impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 msgid "Address book conversion error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 msgid "Address book conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1147,78 +1174,78 @@ msgid ""
 "%s%c%s"
 msgstr "Impossibile leggere l'indice dell'indirizzo"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 msgid "Address Book Error"
 msgstr "Errore rubrica"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Impossibile leggere l'indice dell'indirizzo"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 msgid "Address Book Conversion Error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 msgid "Address Book Conversion"
 msgstr "Errore rubrica"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "Indirizzo email"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Gruppo"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1230,7 +1257,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Avviso"
 
@@ -1574,110 +1601,110 @@ msgstr "/S_trumenti/_Controllo ortografico"
 msgid "/_Tools/_Set spell language"
 msgstr "/S_trumenti/Impo_sta lingua"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Impossibile ricevere parte del testo\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Errore del formato del segno di citazione."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Errore del formato nel messaggio di risposta/inoltro."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Il file %s non esiste\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossibile ottenere la dimensione di %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossibile leggere %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componi%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Il destinatario non è specificato."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "Oggetto vuoto"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'oggetto è vuoto. Inviarlo comunque?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Allegati"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "Invia"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1685,42 +1712,42 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, 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:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Impossibile salvare il messaggio nella cartella «Inviata»."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1732,11 +1759,11 @@ msgstr ""
 "\n"
 "Spedirlo come %s comunque?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "Errore di conversione del codice"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1750,15 +1777,15 @@ msgstr ""
 "\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "Limite lunghezza linea"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr "Cifratura con Bcc"
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1772,101 +1799,101 @@ msgstr ""
 "\n"
 "Inviarlo comunque?"
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Il file %s non esiste."
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, c-format
 msgid "Can't open file %s."
 msgstr "Impossibile aprire il file %s."
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "Firma PGP"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Data"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Apertura file eseguibile"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1878,12 +1905,12 @@ msgstr ""
 "Se volete lanciarlo, salvatelo da qualche parte e assicuratevi che non sia "
 "un virus o qualcosa di simile a un programma malizioso."
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, 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:6738
+#: src/compose.c:6743
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1892,48 +1919,48 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "_Personalizza barra strumenti"
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -2626,7 +2653,7 @@ msgstr "Newsgroup:"
 msgid "Creating header view...\n"
 msgstr "Creazione della vista dell'intestazione...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Nessun mittente)"
@@ -2969,7 +2996,7 @@ msgstr "Connessione al server POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossibile connettersi al server POP3: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Autenticazione..."
@@ -6667,7 +6694,7 @@ msgstr "Ricerca in %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Ricerca in %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Nessuna Data)"
 
@@ -6796,58 +6823,58 @@ msgid ""
 "%s"
 msgstr "si è verificato un errore durante la sessione POP3\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Ricezione intestazioni del messaggio (%d / %d)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Ricezione del numero dei nuovi messaggi (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "Non esistono messaggi nuovi."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Elimina il(i) messaggio(i)"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Esco..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Recupero i nuovi messaggi"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Invia il messaggio"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Recupero i nuovi messaggi"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Ricezione dei messaggi da %s..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "Elimina il(i) messaggio(i)"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/ja.po b/po/ja.po
index 8cc4078f..dae5c740 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 1999-10-12\n"
 "Last-Translator: Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -688,8 +688,8 @@ msgstr ""
 "新着メッセージはこの順番でチェックされます。「全受信」によるメッセージ\n"
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -824,12 +824,12 @@ msgstr "アクションのユーザ引数"
 msgid "Add Address to Book"
 msgstr "アドレスをアドレス帳に追加"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "アドレス"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "備考"
@@ -838,32 +838,32 @@ msgstr "備考"
 msgid "Select Address Book Folder"
 msgstr "アドレス帳フォルダを選択"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 msgid "Auto-registered address"
 msgstr "自動登録アドレス"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/ファイル(_F)"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/ファイル(_F)/新規アドレス帳(_B)"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/ファイル(_F)/新規_vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/ファイル(_F)/新規_JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "/_File/New _LDAP Server"
 msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -871,190 +871,214 @@ msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 msgid "/_File/---"
 msgstr "/ファイル(_F)/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/ファイル(_F)/編集(_E)"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/ファイル(_F)/削除(_D)"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/ファイル(_F)/保存(_S)"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/ファイル(_F)/閉じる(_C)"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編集(_E)/コピー(_C)"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/編集(_E)/ペースト(_P)"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/アドレス(_A)"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/アドレス(_A)/新規アドレス(_A)"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/アドレス(_A)/新規グループ(_G)"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/アドレス(_A)/新規フォルダ(_F)"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/アドレス(_A)/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+msgid "/_Address/Add _to recipient"
+msgstr "/アドレス(_A)/宛先に追加(_T)"
+
+#: src/addressbook.c:425
+msgid "/_Address/Add to _Cc"
+msgstr "/アドレス(_A)/_Ccに追加"
+
+#: src/addressbook.c:427
+msgid "/_Address/_Add to _Bcc"
+msgstr "/アドレス(_A)/_Bccに追加"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/アドレス(_A)/編集(_E)"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/アドレス(_A)/削除(_D)"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/ツール(_T)"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/ツール(_T)/_LDIFファイルをインポート"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 msgid "/_Tools/Import _CSV file"
 msgstr "/ツール(_T)/_CSVファイルをインポート"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/新規アドレス(_A)"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/新規グループ(_G)"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/削除(_D)"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr "宛先に追加(_T)"
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr "_Ccに追加"
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr "_Bccに追加"
+
+#: src/addressbook.c:481
 msgid "/_Copy"
 msgstr "/コピー(_C)"
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 msgid "/_Paste"
 msgstr "/ペースト(_P)"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "アドレス帳"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "フォルダ"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 msgid "Search:"
 msgstr "検索:"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "宛先:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "削除"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "追加"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "検索"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 msgid "_Close"
 msgstr "閉じる(_C)"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "アドレスの削除"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "本当にこのアドレスを削除しますか?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1063,36 +1087,36 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "フォルダのみ(_F)"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "フォルダとアドレス(_A)"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "本当に `%s' を削除しますか?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "新規ユーザ、インデックスファイルを保存できません。"
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "新規ユーザ、アドレス帳ファイルを保存できません。"
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "旧形式のアドレス帳は正しく変換されました。"
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1100,7 +1124,7 @@ msgstr ""
 "旧形式のアドレス帳は変換されました。\n"
 "新規アドレスインデックスファイルに保存できません"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1108,7 +1132,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "しかし空の新規アドレス帳ファイルが作成されました。"
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1116,7 +1140,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1124,15 +1148,15 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 msgid "Address book conversion error"
 msgstr "アドレス帳の変換エラー"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 msgid "Address book conversion"
 msgstr "アドレス帳の変換"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1143,76 +1167,76 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 msgid "Address Book Error"
 msgstr "アドレス帳のエラー"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "旧形式のアドレス帳は変換されましたが、新規アドレスインデックスファイルを保存"
 "できません"
 
-#: src/addressbook.c:3373
+#: src/addressbook.c:3406
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "アドレス帳を変換できませんでしたが、空の新規アドレス帳ファイルが作成されまし"
 "た。"
 
-#: src/addressbook.c:3379
+#: src/addressbook.c:3412
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:3385
+#: src/addressbook.c:3418
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "アドレスインデックスを読み込めません"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 msgid "Address Book Conversion Error"
 msgstr "アドレス帳変換エラー"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 msgid "Address Book Conversion"
 msgstr "アドレス帳変換"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "インタフェース"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "人物"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "グループ"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "LDAPサーバ"
 
@@ -1224,7 +1248,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "注意"
 
@@ -1568,107 +1592,107 @@ msgstr "/ツール(_T)/スペルチェック(_C)"
 msgid "/_Tools/_Set spell language"
 msgstr "/ツール(_T)/スペルチェックの言語を指定(_S)"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: ファイルが存在しません\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "テキストパートを取得できません\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "引用符の書式が不正です。"
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "メッセージの返信/転送の書式が不正です。"
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "ファイル %s は存在しません\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "ファイル %s のサイズを取得できません\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "ファイル %s は空です。"
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "%s を読み込めません。"
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "メッセージ: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(件名なし)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 作成%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "宛先が指定されていません。"
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "空の件名"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "件名が空です。とにかく送信しますか?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 msgid "Attachment is missing"
 msgstr "添付ファイルがありません"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr "添付ファイルがありません。添付ファイルなしで送信しますか?"
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr "宛先の確認"
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 msgid "Really send this mail to the following addresses?"
 msgstr "このメールを以下のアドレスに送信してもよろしいですか?"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "差出人:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "件名:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 msgid "_Send"
 msgstr "送信(_S)"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "送信先のリストを取得できません。"
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1676,37 +1700,37 @@ msgstr ""
 "メールを送信するためのアカウントが指定されていません。\n"
 "送信する前にメールアカウントを選択してください。"
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "メッセージを送信控に保存できません。"
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "現在選択されている鍵ID `%s' に対応する鍵が見つかりませんでした。"
 
-#: src/compose.c:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 msgid "Can't sign the message."
 msgstr "メッセージに署名できません。"
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 msgid "Can't encrypt the message."
 msgstr "メッセージを暗号化できません。"
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 msgid "Can't encrypt or sign the message."
 msgstr "メッセージを暗号化または署名できません。"
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "ファイルモードを変更できません\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1717,11 +1741,11 @@ msgstr ""
 "\n"
 "%s のままとにかく送信しますか?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "文字コード変換エラー"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1734,15 +1758,15 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "行の長さの制限"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr "Bcc を伴う暗号化"
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1756,99 +1780,99 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "古いメッセージを削除できません\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "メッセージを送信待ちに入れています...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "送信待ちフォルダが見つかりません\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "メッセージを送信待機できません\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "ファイル %s は存在しません。"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, c-format
 msgid "Can't open file %s."
 msgstr "ファイル %s を開けません。"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成されたメッセージID: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "メッセージ作成ウィンドウを作成中...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "PGP署名"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "PGP暗号化"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 msgid "Data type"
 msgstr "データ形式"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "MIME タイプ"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 msgid "File not exist."
 msgstr "ファイルが存在しません。"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "実行可能ファイルを開こうとしています"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1860,12 +1884,12 @@ msgstr ""
 "起動したい場合は、ファイルを適当な場所に保存した後、それがウィルスやその他の"
 "悪意のあるプログラムでないことを確認してください。"
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1874,48 +1898,48 @@ msgstr ""
 "外部エディタが動作中です。\n"
 "プロセスを強制終了しますか(pid: %d)?\n"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "ツールバーをカスタマイズ(_C)..."
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "ファイルの選択"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "メッセージの保存"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "このメッセージは変更されています。草稿に保存しますか?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "挿入(_I)"
 
@@ -2592,7 +2616,7 @@ msgstr "ニュースグループ:"
 msgid "Creating header view...\n"
 msgstr "ヘッダビューを作成中...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(差出人不明)"
@@ -2924,7 +2948,7 @@ msgstr "POP3サーバ: %s に接続中..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3サーバ: %s:%d に接続できません\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "認証中..."
@@ -6567,7 +6591,7 @@ msgstr "%s を検索中 (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "%s を検索中..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(日付なし)"
 
@@ -6691,55 +6715,55 @@ msgstr ""
 "POP3 セッション中にエラーが発生しました:\n"
 "%s"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "メッセージのヘッダを取得中 (%d / %d) ..."
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 msgid "Getting the number of messages..."
 msgstr "メッセージの件数を取得中..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 msgid "No message"
 msgstr "メッセージがありません"
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, c-format
 msgid "Deleted %d messages"
 msgstr "%d 通のメッセージを削除しました"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "切断中..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "%d 通のメッセージを取得しました"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, c-format
 msgid "Opened message %d"
 msgstr "メッセージ %d を開きました"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "%d 件のメッセージのヘッダを取得しました"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "メッセージ %d を取得中..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 msgid "Delete messages"
 msgstr "メッセージの削除"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7734,9 +7758,3 @@ msgstr "すべての Sylpheed プラグインは最新バージョンです。"
 #: src/update_check.c:662
 msgid "Couldn't get the version information of plug-ins."
 msgstr "プラグインのバージョン情報を取得できませんでした。"
-
-#~ msgid "File type"
-#~ msgstr "ファイル形式"
-
-#~ msgid "MIME Type"
-#~ msgstr "MIME タイプ"
diff --git a/po/ko.po b/po/ko.po
index a09be1ee..329776fe 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2002-12-02 11:09+0900\n"
 "Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
 "Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -685,8 +685,8 @@ msgstr ""
 "새 메시지는 이 순서대로 확인될 것입니다. `모두 받기'로 메시지를\n"
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -821,12 +821,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "주소록에 추가"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "주소"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "메모"
@@ -835,34 +835,34 @@ msgstr "메모"
 msgid "Select Address Book Folder"
 msgstr "주소록 폴더 선택"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "등록된 규칙"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/파일(_F)"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/파일(_F)/새 주소록(_B)"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/파일(_F)/새 vCard(_v)"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/파일(_F)/새 JPilot(_J)"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -870,196 +870,223 @@ msgstr "/파일(_F)/새 서버(_S)"
 msgid "/_File/---"
 msgstr "/파일(_F)/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/파일(_F)/편집(_E)"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/파일(_F)/삭제(_D)"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/파일(_F)/닫기(_C)"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/주소(_A)"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/주소(_A)/새 주소(_A)"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/주소(_A)/새 그룹(_G)"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/주소(_A)/새 폴더(_F)"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/주소(_A)/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/주소(_A)/삭제(_D)"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/주소(_A)/편집(_E)"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/주소(_A)/편집(_E)"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/주소(_A)/편집(_E)"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/도구(_T)"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/새 주소(_A)"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/새 그룹(_G)"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/삭제(_D)"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 #, fuzzy
 msgid "/_Copy"
 msgstr "/복사(_C)..."
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 #, fuzzy
 msgid "/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "주소록"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "폴더"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "찾기"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "받는 사람:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "참조:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "숨은 참조:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "삭제"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "추가"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "찾기"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 #, fuzzy
 msgid "_Close"
 msgstr "닫기"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "주소를 삭제"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "정말로 주소를 삭제하시겠습니까?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1068,38 +1095,38 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "_Folder only"
 msgstr "폴더만"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "폴더와 주소"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "정말로 `%s'를 지우시겠습니까?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "새 사용자, 색인 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "새 사용자, 주소록 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "예전 주소록을 성공적으로 변환하였습니다."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1107,7 +1134,7 @@ msgstr ""
 "예전 주소록이 변환되었습니다,\n"
 "새 주소록의 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1115,7 +1142,7 @@ msgstr ""
 "주소록을 변환할 수 없습니다,\n"
 "대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1123,7 +1150,7 @@ msgstr ""
 "주소록을 변환하지 못했습니다,\n"
 "새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1131,17 +1158,17 @@ msgstr ""
 "주소록을 변환하지 못했고\n"
 "새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address book conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1149,74 +1176,74 @@ msgid ""
 "%s%c%s"
 msgstr "주소 색인을 읽을 수 없습니다"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 #, fuzzy
 msgid "Address Book Error"
 msgstr "주소록 에러"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 msgid "Old address book converted, could not save new address index file"
 msgstr "예전 주소록이 변환되었습니다, 새 주소록 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:3373
+#: src/addressbook.c:3406
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "주소록을 변환할 수 없습니다, 대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:3379
+#: src/addressbook.c:3412
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "주소록을 변환하지 못했습니다, 새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:3385
+#: src/addressbook.c:3418
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "주소록을 변환하지 못했고 새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "주소 색인을 읽을 수 없습니다"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "인터페이스"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "주소록"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "사람"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "그룹"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "LDAP 서버"
 
@@ -1228,7 +1255,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "알림"
 
@@ -1614,111 +1641,111 @@ msgstr "/도구(_T)/실행(_x)"
 msgid "/_Tools/_Set spell language"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 파일이 없습니다\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "텍스트 부분을 얻을 수가 없습니다\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "인용 부호 형식 에러."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "메시지 회신/전달 형식 에러."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s의 파일 크기를 알수가 없습니다\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "%s 파일이 빈 파일입니다."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "%s를 읽을 수가 없습니다."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "메시지: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 메시지 편집%s "
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 #, fuzzy
 msgid "Empty subject"
 msgstr "제목"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "제목이 비었습니다. 그래도 보낼까요?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "첨부"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "다음 주소를 자동적으로 정함"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "제목:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "메일 발송"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1726,40 +1753,40 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "메시지를 보낸 편지함에 저장할 수가 없습니다"
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "현재 선택된 키 ID `%s'에 연결된 어떤 키도 찾을 수 없습니다."
 
-#: src/compose.c:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1769,12 +1796,12 @@ msgstr ""
 "메시지의 문자셋을 변경할 수가 없습니다.\n"
 "그래도 보낼까요?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 #, fuzzy
 msgid "Code conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1783,15 +1810,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1800,104 +1827,104 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "%s 파일을 열 수가 없습니다\n"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "생성된 Message-ID: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "날짜"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: 파일이 없습니다\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1905,12 +1932,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1920,52 +1947,52 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
@@ -2666,7 +2693,7 @@ msgstr "뉴스그룹:"
 msgid "Creating header view...\n"
 msgstr "헤더 뷰를 생성합니다...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(???)"
@@ -3018,7 +3045,7 @@ msgstr "POP3 서버 %s에 연결합니다..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "%s:%d POP3 서버에 연결할 수가 없습니다\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "인증 중입니다..."
@@ -6787,7 +6814,7 @@ msgstr "필터링..."
 msgid "Searching %s ..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(날짜 없슴)"
 
@@ -6921,58 +6948,58 @@ msgid ""
 "%s"
 msgstr "인증 도중 에러 발생\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "새 메시지의 갯수를 얻는 중 (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "새 메시지가 없습니다."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "메시지를 지웁니다"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "끝마치는 중..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "새 메시지를 가져옴"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "메시지 보내기"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "새 메시지를 가져옴"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "메시지를 지웁니다"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/lt.po b/po/lt.po
index 34ab299d..08b50308 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2005-06-09 13:51+0300\n"
 "Last-Translator: Vitalijus Valantiejus <vitalijus@users.sf.net>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -690,8 +690,8 @@ msgstr ""
 "Nauji laiškai bus tikrinami šia tvarka. Pažymėkite laukelį\n"
 "skulpelyje „G“ jei norite gauti laiškus pasirinkę „Gauti visus“."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -826,12 +826,12 @@ msgstr "Vartotojo veiksmo argumentas"
 msgid "Add Address to Book"
 msgstr "Įdėti adresą į knygą"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresai"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Pastabos"
@@ -840,33 +840,33 @@ msgstr "Pastabos"
 msgid "Select Address Book Folder"
 msgstr "Pažymėkite adresų knygos katalogą"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registruoti šablonai"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Failas"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Failas/Nauja _Knyga"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Failas/Nauja „_vCard“ kortelė"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Failas/Naujas _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "/_File/New _LDAP Server"
 msgstr "/_Failas/Naujas _LDAP serveris"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -874,190 +874,217 @@ msgstr "/_Failas/Naujas _LDAP serveris"
 msgid "/_File/---"
 msgstr "/_Failas/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Failas/_Taisa"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Failas/Išt_rinti"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Failas/Iš_saugoti"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Failas/_Užverti"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Taisa"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Taisa/Kopi_juoti"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Taisa/Į_dėti"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Adresas"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Adresas/Naujas _adresas"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Adresas/Nauja _grupė"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Adresas/Naujas _katalogas"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Adresas/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Adresas/Išt_rinti"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Adresas/_Redaguoti"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Adresas/_Redaguoti"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Adresas/_Redaguoti"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Į_rankiai"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Į_rankiai/Importuoti _LDIF failą"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 msgid "/_Tools/Import _CSV file"
 msgstr "/Į_rankiai/Importuoti _CSV failą"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Naujas _adresas"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Nauja _grupė"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Ištrinti"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 msgid "/_Copy"
 msgstr "/_Kopijuoti"
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 msgid "/_Paste"
 msgstr "/Į_dėti"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresų knyga"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Katalogas"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 msgid "Search:"
 msgstr "Ieškoti:"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Kam:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kopija:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Slapta kopija:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Pridėti"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Ieškoti"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 msgid "_Close"
 msgstr "Uždaryti"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Pašalinti adresą(-us)"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Ar tikrai pašalinti adresą(-us)?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1066,36 +1093,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:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "Tik _katalogą"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "Katalogą ir _adresus jame"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tikrai pašalinti „%s“?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Naujas vartotojas, negaliu išsaugoti „index“ failo."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Naujas vartotojas, negaliu išsaugoti adresų knygos failų."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Adresų knyga sėkmingai konvertuota"
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1103,7 +1130,7 @@ msgstr ""
 "Sena adresų knyga konvertuota,\n"
 "negaliu išsaugoti naujo adresų indekso failo"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1111,7 +1138,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "bet sukūriau tuščius naujos knygos failus."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1119,7 +1146,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "negaliu sukurti naujos knygos failų."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1127,15 +1154,15 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "ir negaliu sukurti naujos knygos failų."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 msgid "Address book conversion error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 msgid "Address book conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1143,74 +1170,74 @@ msgid ""
 "%s%c%s"
 msgstr "Negaliu perskaityti adresų indekso"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 msgid "Address Book Error"
 msgstr "Adresų knygos klaida"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Negaliu perskaityti adresų indekso"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 msgid "Address Book Conversion Error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 msgid "Address Book Conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Sąsaja"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresų knyga"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Asmuo"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Grupė"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "LDAP serveris"
 
@@ -1222,7 +1249,7 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Pranešimas"
 
@@ -1566,110 +1593,110 @@ msgstr "/Į_rankiai/_Tikrinti rašybą"
 msgid "/_Tools/_Set spell language"
 msgstr "/Į_rankiai/_Nustatyti kalbą"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: failas neegzistuoja\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Negaliu gauti dalies teksto\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Formato klaida."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Atsakymo/persiuntimo formato klaida."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Negaliu gauti failo „%s“ dydžio\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Failas %s yra tuščias"
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Negaliu perskaityti %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Laiškas: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės laiško dalies"
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Rašyti laišką%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Nenurodytas gavėjas."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "Nėra temos"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Nenurodyta laiško tema (subject). Siųsti?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Priedai"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatiškai nustatyti šiuos adresus"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Nuo:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "Siųsti"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "Negaliu gauti gavėjų sąrašo."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1677,40 +1704,40 @@ msgstr ""
 "Nenurodyta sąskaita pašto siuntimui.\n"
 "Prieš siųsdami pažymėkitę norimą sąskaitą."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Klaida siunčiant laišką %s ."
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Negaliu išsaugoti laiško „outbox“."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "negaliu pakeisti failo rėžimo\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1721,11 +1748,11 @@ msgstr ""
 "\n"
 "Ar siųsti kaip %s?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "Kodo konvertavimo klaida"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1738,15 +1765,15 @@ msgstr ""
 "\n"
 "Ar tikrai norite ją išsiųsti?"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "Eilutės ilgio limitas"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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,101 +1782,101 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "Negaliu pašalinti seno laiško\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "Laiškas dedamas į eilę...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "Negaliu rasti eilės (queue) katalogo\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "Negaliu įdėti laiško į eilę\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Negaliu atidaryti žymų failo.\n"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "sugeneruotas Message-ID: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Sukuriamas laiško kūrimo langas...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "PGP parašas"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Data"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Failas neegzistuoja arba yra tuščias."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "MIME tipas"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Failo vardas"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: failas neegzistuoja\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Atveriamas vykdomasis failas"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1860,12 +1887,12 @@ msgstr ""
 "Jei norite jį paleisti, išsaugokite jį ir įsitikinkite ar tai ne virusas ar "
 "panaši kenkėjiška programa."
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1874,48 +1901,48 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "_Derinti įrankių juostą..."
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "Žymėti failus"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Žymėti failą"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "Išsaugoti laišką"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Laiškas buvo redaguotas. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "Įterpt_i"
 
@@ -2605,7 +2632,7 @@ msgstr "Naujienų grupės"
 msgid "Creating header view...\n"
 msgstr "Sukuria antraščių peržiūra...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Nėra gavėjo)"
@@ -2948,7 +2975,7 @@ msgstr "Jungiuosi prie POP3 serverio: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie POP3 serverio: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Patvirtinamas autentiškumas..."
@@ -6626,7 +6653,7 @@ msgstr "Ieškoma %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Ieškoma „%s“..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Be datos)"
 
@@ -6755,58 +6782,58 @@ msgid ""
 "%s"
 msgstr "klaida POP3 sesijoje\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Gaunamos laiškų antraštės (%d / %d)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Gaunamas naujų laiškų skaičius (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "Nėra naujų laiškų."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Ištrinti laišką(-us)"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Išeinu..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Gaunami nauji laiškai"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Siųsti laišką"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Gaunami nauji laiškai"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Gaunami laiškai iš %s..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "Ištrinti laišką(-us)"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/nl.po b/po/nl.po
index bce3eb85..cce60407 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2006-04-30 01:11+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -700,8 +700,8 @@ msgstr ""
 "Zet een vinkje in de 'G' kolom om berichten binnen te halen wanneer\n"
 "u op de knop 'Alles ophalen' klikt."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -836,12 +836,12 @@ msgstr "Gebruikersargumenten voor actie"
 msgid "Add Address to Book"
 msgstr "Adres toevoegen aan adresboek"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Opmerkingen"
@@ -850,33 +850,33 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Gebruikte sjablonen"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Bestand"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Bestand/Nieuw _adresboek"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Bestand/Nieuwe _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Bestand/Nieuwe _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "/_File/New _LDAP Server"
 msgstr "/_Bestand/Nieuwe _LDAP-server"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -884,195 +884,222 @@ msgstr "/_Bestand/Nieuwe _LDAP-server"
 msgid "/_File/---"
 msgstr "/_Bestand/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Bestand/Aanpassen"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Bestand/_Verwijderen"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Bestand/_Sluiten"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Be_werken"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Be_werken/_Kopiëren"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Be_werken/_Plakken"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Nieuw _adres"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Nieuwe _groep"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Nieuwe _map"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Adres/_Verwijderen"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Adres/_Bewerken"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Adres/_Bewerken"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Bewerken"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Gereedschap"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Nieuw _adres"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Nieuwe _groep"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/Ver_wijderen"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopieer..."
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Be_werken/_Plakken"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresboek"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Accounts"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 msgid "Search:"
 msgstr "Zoeken:"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Aan:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Zoeken:"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 #, fuzzy
 msgid "_Close"
 msgstr "Kleuren"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Adres(sen) verwijderen"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Wilt u de adressen werkelijk verwijderen?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1082,36 +1109,36 @@ msgstr ""
 "Als u alleen de map verwijdert, dan zullen de adressen naar de \n"
 "hoger gelegen map verplaatst worden."
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "Alleen _map"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "Map en _adressen"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wilt u '%s' werkelijk verwijderen?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Nieuwe gebruiker: Kon indexbestand niet opslaan."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Nieuwe gebruiker: Kon adresboekbestanden niet opslaan."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Oude adresboekgegevens succesvol omgezet."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1119,7 +1146,7 @@ msgstr ""
 "Oude adresboekgegevens omgezet.\n"
 "Kon het nieuwe adresboek indexbestand niet opslaan."
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1127,7 +1154,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Nieuw leeg adresboek is gemaakt."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1135,7 +1162,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon geen nieuwe adresboek bestanden aanmaken."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1143,17 +1170,17 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon ook geen nieuwe adresboekbestanden aanmaken."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adresboek omzetting"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1161,79 +1188,79 @@ msgid ""
 "%s%c%s"
 msgstr "Kon adresboek index niet lezen"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adresboekprobleem"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Kon adresboek index niet lezen"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adresboek Omzetting"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Groep"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1245,7 +1272,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Bericht"
 
@@ -1593,110 +1620,110 @@ msgstr "/_Gereedschap/_Spellingscontrole"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Gereedschap/_Taal instellen"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: bestand bestaat niet\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Kan tekstgedeelte niet ophalen\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Citeerteken opmaakfout."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Bericht beantwoorden/doorsturen opmaakfout."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg"
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet inlezen."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Bericht opstellen%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "Geen onderwerp"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "U heeft geen onderwerp ingevuld. Toch versturen?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Bijlagen"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Stel automatisch de volgende adressen in"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "Verzenden"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1704,40 +1731,40 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, 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:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Het bericht kan niet opgeslagen worden in de outbox."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1748,11 +1775,11 @@ msgstr ""
 "\n"
 "Toch versturen als %s?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "Fout bij coderingsconversie"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1765,15 +1792,15 @@ msgstr ""
 "\n"
 "Toch versturen?"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "Maximale regellengte"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1782,101 +1809,101 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "Ondertekenen met PGP"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "Coderen met PGP"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Datum"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "MIME-type"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: bestand bestaat niet\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Openen van uitvoerbaar bestand"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1888,12 +1915,12 @@ msgstr ""
 "Als u het wilt uitvoeren, dient u het bestand ergens op te slaan en te "
 "controleren om virussen geen kans te geven."
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, 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:6738
+#: src/compose.c:6743
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1902,48 +1929,48 @@ msgstr ""
 "Het andere programma is nog steeds actief.\n"
 "Zal ik het programma afbreken (pid: %d?\n"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "Selecteer bestanden"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "Bericht opslaan"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. Opslaan als Klad?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "Sluiten _zonder opslaan"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "_Invoegen"
 
@@ -2640,7 +2667,7 @@ msgstr "Nieuwsgroepen:"
 msgid "Creating header view...\n"
 msgstr "Header view wordt aangemaakt...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Geen afzender)"
@@ -2993,7 +3020,7 @@ msgstr "Verbinden met POP3-server: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan niet verbinden met POP3 server: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Bezig met identificatie..."
@@ -6731,7 +6758,7 @@ msgstr "Doorzoeken van %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Doorzoeken van %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
@@ -6860,58 +6887,58 @@ msgid ""
 "%s"
 msgstr "er is een fout opgetreden tijdens de POP3-sessie\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Ophalen van berichtkoppen (%d / %d)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "Geen nieuwe berichten."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Verwijder bericht(en)"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Bezig met afsluiten..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Verzend bericht"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Berichten ophalen van %s..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "Verwijder bericht(en)"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/pl.po b/po/pl.po
index b165380e..9d10e59d 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+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"
@@ -684,8 +684,8 @@ msgstr ""
 "Nowe wiadomości zostaną sprawdzone w tej kolejności. Zaznacz\n"
 "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -820,12 +820,12 @@ msgstr "Argumenty użytkownika dla akcji"
 msgid "Add Address to Book"
 msgstr "Dodaj do książki adresowej"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Uwagi"
@@ -834,33 +834,33 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog książki adresowej"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Zarejestrowane szablony"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Plik"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Plik/Nowa _książka"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Plik/Nowy _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Plik/Nowy _J-Pilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "/_File/New _LDAP Server"
 msgstr "/_Plik/Nowy serwer _LDAP"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -868,192 +868,219 @@ msgstr "/_Plik/Nowy serwer _LDAP"
 msgid "/_File/---"
 msgstr "/_Plik/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Plik/_Edycja"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Plik/_Usuń"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Edycja"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/_Kopiuj"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Edycja/_Wstaw"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Plik/Nowy _adres"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Plik/Nowa _grupa"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Plik/Nowy _katalog"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Adres/_Usuń"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Adres/_Edycja"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Adres/_Edycja"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Edycja"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Narzędzia"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Narzędzia/Importuj plik _CSV"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Nowy _adres"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Nowa _grupa"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Usuń"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 msgid "/_Copy"
 msgstr "/_Kopiuj"
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 msgid "/_Paste"
 msgstr "/_Wklej"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Książka adresowa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Katalog"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr " Szukaj "
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Do:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Ukryta kopia:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr " Szukaj "
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 msgid "_Close"
 msgstr "_Zamknij"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Usuń adres(y)"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Czy naprawdę chcesz usunąć ten adres(y)?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1063,36 +1090,36 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "_Tylko katalog"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "Katalog i _adresy"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Czy naprawdę usunąć \"%s\" ?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Nowy użytkownik, nie można było zapisać pliku indeksu."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 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:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Konwersja starej książki adresowej została zakończona pomyślnie."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1100,7 +1127,7 @@ msgstr ""
 "Stara książka adresowa została skonwertowana,\n"
 "nie można było zapisać nowego pliku indeksu adresów."
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1108,7 +1135,7 @@ msgstr ""
 "Nie można było skonwertować książki adresowej,\n"
 "utworzono puste pliki nowej książki adresowej."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1116,7 +1143,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:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1124,15 +1151,15 @@ msgstr ""
 "Nie można było skonwertować książki adresowej\n"
 "oraz utworzyć nowych plików książki adresowej."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 msgid "Address book conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 msgid "Address book conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1140,78 +1167,78 @@ msgid ""
 "%s%c%s"
 msgstr "Nie można odczytać książki adresowej"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 msgid "Address Book Error"
 msgstr "Błąd książki adresowej"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Nie można odczytać książki adresowej"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 msgid "Address Book Conversion Error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 msgid "Address Book Conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Interfejs"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Grupa"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
@@ -1223,7 +1250,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Notatka"
 
@@ -1568,107 +1595,107 @@ msgstr "/_Narzędzia/_Sprawdź pisownię"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Narzędzia/_Zmień język sprawdzania pisowni"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: brak pliku\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Nie mogę pobrać części tekstu\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Błąd formatu znacznika cytatu."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Błąd formatu odpowiedz/przekaż wiadomość."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nie można odczytać wielkości pliku %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Nie można odczytać %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomość: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Tworzenie wiadomości%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "Pusty temat"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Wiadomość nie posiada tematu. Czy wysłać ją mimo tego ?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 msgid "Attachment is missing"
 msgstr "Brak załącznika"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Nie ma załączników. Wysłać bez załącznika?"
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr "Sprawdź odbiorców"
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 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:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Temat:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 msgid "_Send"
 msgstr "_Wyślij"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1676,38 +1703,38 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Nie można zapisać wiadomości do outbox."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 msgid "Can't sign the message."
 msgstr "Nie można podpisać wiadomości."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 msgid "Can't encrypt the message."
 msgstr "Nie można zaszyfrować wiadomości."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 msgid "Can't encrypt or sign the message."
 msgstr "Nie można zaszyfrować lub podpisać wiadomości."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1717,11 +1744,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:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr ""
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1730,16 +1757,16 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "Limit długości linii"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 #, fuzzy
 msgid "Encrypting with Bcc"
 msgstr "Szyfrowanie z odbiorcami ukrytej kopii"
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 #, fuzzy
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
@@ -1755,101 +1782,101 @@ msgstr ""
 "\n"
 "Wysłać mimo to?"
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "Nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Plik %s nie istnieje."
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nie można otworzyć pliku %s."
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Data"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: brak pliku\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Otwieranie pliku wykonywalnego"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1861,12 +1888,12 @@ msgstr ""
 "Aby go uruchomić, zapisz go gdzieś i upewnij się, że nie jest to wirus bądź "
 "inny niepożądany program."
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1875,48 +1902,48 @@ msgstr ""
 "Zewnętrzny edytor wciąż pracuje.\n"
 "Czy wymusić zakończenie procesu (pid: %d)?\n"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "_Dostosuj pasek narzędzi..."
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "Zapisz wiadomość"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 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:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "Zamknij _bez zapisywania"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "_Zamień"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "_Wstaw"
 
@@ -2606,7 +2633,7 @@ msgstr "Grupy dyskusyjne:"
 msgid "Creating header view...\n"
 msgstr "Tworzenie widoku nagłówków...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Bez Od)"
@@ -2951,7 +2978,7 @@ msgstr "Nawiązywanie połączenia z serwerem POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nie można nawiązać połączenia z serwerem POP3: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
@@ -6692,7 +6719,7 @@ msgstr "Filtowanie..."
 msgid "Searching %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Bez daty)"
 
@@ -6826,58 +6853,58 @@ msgid ""
 "%s"
 msgstr "wystąpił błąd podczas sesji POP3\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Pobieranie nagłówków wiadomości (%d/%d)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Pobieranie liczby nowych wiadomości (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "Brak nowych wiadomości"
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Usuń wiadomość"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Wychodzenie..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Pobieranie nowych wiadomości"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Wyślij wiadomość"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Pobieranie nowych wiadomości"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "Usuń wiadomość"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 80acc9f5..50803e86 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2010-08-27 00:20-0300\n"
 "Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n"
 "Language-Team: Portuguese/Brazil <(none)>\n"
@@ -698,8 +698,8 @@ msgstr ""
 "Mensagens novas serão baixadas nessa ordem. Marque as caixas\n"
 "na coluna \"G\" para habilitar essa caixa no comando \"Receber todas\"."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -834,12 +834,12 @@ msgstr "Argumento de usuário para a ação"
 msgid "Add Address to Book"
 msgstr "Adicionar ao Catálogo de Endereços"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Endereço"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Notas"
@@ -848,32 +848,32 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione pasta do Catálogo de Endereços"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 msgid "Auto-registered address"
 msgstr "Endereços registrados automaticamente"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arquivo"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Arquivo/Novo _Catálogo de Endereços"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Arquivo/Novo _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Arquivo/Novo _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arquivo/Novo Servidor _LDAP"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -881,190 +881,217 @@ msgstr "/_Arquivo/Novo Servidor _LDAP"
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Arquivo/_Editar"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Arquivo/E_xcluir"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/Co_lar"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Endereço"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Endereço/Nova _Entrada"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Endereço/Novo _Grupo"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Endereço/Nova _Pasta"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Endereço/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Endereço/E_xcluir"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Endereço/E_ditar"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Endereço/E_ditar"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Endereço/E_ditar"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/E_xcluir"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar arquivo _CSV"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_juda"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_juda/_Sobre"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Novo _Endereço"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Novo _Grupo"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/E_xcluir"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 msgid "/_Copy"
 msgstr "/_Copiar"
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 msgid "/_Paste"
 msgstr "/Co_lar"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Pasta"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 msgid "Search:"
 msgstr "Procurar:"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Cco:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Procurar"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 msgid "_Close"
 msgstr "_Fechar"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Excluir endereço(s)"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Você realmente deseja excluir o(s) endereço(s)?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1074,37 +1101,37 @@ msgstr ""
 "Caso você exclua somente a pasta, os endereços serão movidos para a pasta "
 "pai."
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Excluir pasta"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "Apenas a_pasta"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "Pasta e _endereços"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Você realmente deseja excluir \"%s\"?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 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:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Catálogo de endereços antigo convertido com sucesso."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1112,7 +1139,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:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1120,7 +1147,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:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1128,7 +1155,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:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1136,15 +1163,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:3252
+#: src/addressbook.c:3285
 msgid "Address book conversion error"
 msgstr "Erro ao converter o catálogo de endereços"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 msgid "Address book conversion"
 msgstr "Conversão do catálogo de endereços"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1155,78 +1182,78 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 msgid "Address Book Error"
 msgstr "Erro no Catálogo de Endereços"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "O catálogo de endereços antigo foi convertido, mas não foi possível salvar o "
 "arquivo de índice do novo"
 
-#: src/addressbook.c:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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 para o novo catálogo de endereços."
 
-#: src/addressbook.c:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice do endereço"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 msgid "Address Book Conversion Error"
 msgstr "Erro na conversão do catálogo de endereços"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 msgid "Address Book Conversion"
 msgstr "Conversão do Catálogo de Endereços"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Catálogo de Endereços"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Pessoa"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Grupo"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1238,7 +1265,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Notificação"
 
@@ -1582,108 +1609,108 @@ msgstr "/_Ferramentas/_Verificar ortografia"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Definir _idioma do verificador ortográfico"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o arquivo não existe\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Não foi possível receber o texto\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Erro no formato de marca de citação."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Erro no formato de mensagem de resposta/encaminhada."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "O arquivo %s não existe\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Não foi possível obter o tamanho de %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Não foi possível obter alguma(s) parte(s) desta mensagem."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Editando%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Destinatário não especificado."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "Sem assunto"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "O assunto está em branco. Enviar mesmo assim?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 msgid "Attachment is missing"
 msgstr "Anexo faltante"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Não há anexos. Enviar assim mesmo?"
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr "Verificar destinatários"
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 msgid "Really send this mail to the following addresses?"
 msgstr ""
 "Você realmente deseja enviar este e-mail para os seguintes destinatários?"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "Não foi possível  obter a lista de destinatários."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1691,37 +1718,37 @@ msgstr ""
 "A conta para envio de mensagem não foi especificada.\n"
 "Por favor selecione uma conta de e-mail antes de enviar."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Erro ao postar a mensagem para %s ."
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 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:3612
+#: src/compose.c:3616
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Não foi possível localizar a chave para \"%s\"."
 
-#: src/compose.c:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 msgid "Can't sign the message."
 msgstr "Não foi possível assinar a mensagem."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 msgid "Can't encrypt the message."
 msgstr "Não foi possível cripografar a mensagem."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 msgid "Can't encrypt or sign the message."
 msgstr "Não foi possível assinar ou criptografar a mensagem."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "não foi possível modificar as permissões do arquivo\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1733,11 +1760,11 @@ msgstr ""
 "\n"
 "Enviar como %s mesmo assim?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "Erro ao converter a codificação"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1750,15 +1777,15 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "Limite de comprimento da linha"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr "Criptografando com Bcc"
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1772,100 +1799,100 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "não foi possível remover a mensagem antiga\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "enfileirando mensagem...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "não foi possível enfileirar a mensagem\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "O arquivo %s não existe."
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, c-format
 msgid "Can't open file %s."
 msgstr "Não foi possível abrir o arquivo %s."
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "Assinar com PGP"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "Criptografar com PGP"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Data"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 msgid "File not exist."
 msgstr "O arquivo não existe."
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Abrindo arquivo executável"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1877,12 +1904,12 @@ msgstr ""
 "Se você deseja executá-lo, salve-o em algum diretório e certifique-se de que "
 "não seja um vírus ou programa malicioso."
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, 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:6738
+#: src/compose.c:6743
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1891,49 +1918,49 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "_Personalizar a barra de ferramentas..."
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Esta mensagem foi modificada.  Você deseja salvá-la na pasta de rascunhos?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Você deseja aplicar o modelo \"%s\"?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -2612,7 +2639,7 @@ msgstr "Grupos de notícias:"
 msgid "Creating header view...\n"
 msgstr "Criando visualizador de cabeçalhos...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Sem remetente)"
@@ -2944,7 +2971,7 @@ msgstr "Conectando ao servidor POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Não foi possível se conectar ao servidor POP3: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Autenticando..."
@@ -6608,7 +6635,7 @@ msgstr "Procurando %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Procurando %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Sem data)"
 
@@ -6732,55 +6759,55 @@ msgstr ""
 "Erro na sessão POP3:\n"
 "%s"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Recebendo cabeçalhos das mensagens (%d / %d) ..."
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 msgid "Getting the number of messages..."
 msgstr "Recebendo o número de novas mensagens..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 msgid "No message"
 msgstr "Não há mensagens"
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, c-format
 msgid "Deleted %d messages"
 msgstr "%d mensagem(s) excluídas"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Saindo..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "%d mensagem(s) recebidas"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, c-format
 msgid "Opened message %d"
 msgstr "Mensagem %d aberta"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "%d cabeçalho(s) recebidos"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "Recebendo mensagem %d ..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 msgid "Delete messages"
 msgstr "Excluir mensagens"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/ro.po b/po/ro.po
index 68a247cd..3011f2ee 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2010-09-07 15:36+0200\n"
 "Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
 "Language-Team: Gnome Romanian Team <gnomero-list@lists.sourceforge.net>\n"
@@ -702,8 +702,8 @@ msgstr ""
 "coloana „G”\n"
 "pentru a activa recepționarea mesajelor la comanda „Verifică tot”."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -847,12 +847,12 @@ msgid "Add Address to Book"
 msgstr "Adăugare în agendă"
 
 # în meniu la compunere
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Agendă"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Observații"
@@ -861,32 +861,32 @@ msgstr "Observații"
 msgid "Select Address Book Folder"
 msgstr "Selectați dosarul pentru agendă"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 msgid "Auto-registered address"
 msgstr "Adrese înregistrate automat"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fișier"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Fișier/A_gendă nouă"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Fișier/_vCard nou"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Fișier/_JPilot nou"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fișier/Server _LDAP nou"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -894,193 +894,220 @@ msgstr "/_Fișier/Server _LDAP nou"
 msgid "/_File/---"
 msgstr "/_Fișier/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Fișier/_Editează"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Fișier/Ș_terge"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Fișier/_Salvează"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fișier/În_chide"
 
 # comun și în main menu și în rmb agendă
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editare"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editare/_Copiază"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Editare/Li_pește"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/A_dresă"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/A_dresă/_Adresă nouă"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/A_dresă/_Grup nou"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/A_dresă/_Dosar nou"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/A_dresă/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/A_dresă/Ș_terge"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/A_dresă/_Editează"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/A_dresă/_Editează"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/A_dresă/_Editează"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/A_dresă/Ș_terge"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Unelte"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Unelte/Importă un fișier _LDIF"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Unelte/Importă un fișier _CSV"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ajutor"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ajutor/_Despre"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/_Adresă nouă"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/_Grup nou"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/_Dosar nou"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
 # comun și la intrare în agendă și la rmb pe mesaj
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/Șter_ge"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 msgid "/_Copy"
 msgstr "/_Copiază"
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 msgid "/_Paste"
 msgstr "/Li_pește"
 
 # tooltip peste butonul Agendă
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Agendă"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Dosar"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "Adresă de e-mail"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 msgid "Search:"
 msgstr "Caută:"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Către:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Șterge"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Adaugă"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Caută"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 msgid "_Close"
 msgstr "În_chide"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Ștergere adresă (adrese)"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Sigur doriți să ștergeți adresa (adresele) ?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1089,36 +1116,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:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Ștergere dosar"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "Doar _dosar"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "Dosar și _adrese"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Sigur doriți să ștergeți „%s” ?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Utilizator nou, fișierul index nu a putut fi salvat."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Utilizator nou, fișierele agendei nu au putut fi salvate."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Agenda veche a fost convertită cu succes."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1126,7 +1153,7 @@ msgstr ""
 "Agenda veche a fost convertită, dar\n"
 "fișierul index al noii agende nu a putut fi salvat."
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1134,7 +1161,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, dar\n"
 "au fost create fișierele noi de agendă goală."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1142,7 +1169,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, iar\n"
 "fișierele noi de agendă nu au putut fi create."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1150,15 +1177,15 @@ msgstr ""
 "Agenda nu a putut fi convertită\n"
 "și fișierele noi de agendă nu au putut fi create."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 msgid "Address book conversion error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 msgid "Address book conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1169,78 +1196,78 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 msgid "Address Book Error"
 msgstr "Eroare agendă"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Fișierul index al agendei nu a putut fi citit"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 msgid "Address Book Conversion Error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 msgid "Address Book Conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Interfață"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Agendă"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Persoană"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "Adresă de e-mail"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Grupă"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1252,7 +1279,7 @@ msgstr "Adrese comune"
 msgid "Personal address"
 msgstr "Adrese personale"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Notificare"
 
@@ -1601,109 +1628,109 @@ msgstr "/_Unelte/Verifi_că ortografia"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Unelte/_Selectați limba ortografiei"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fișier inexistent\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Nu se poate obține partea de text\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Eroare de formatare a citației."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Eroare de format al mesajului de răspuns sau înaintat."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Fișierul %s nu există\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nu se poate obține dimensiunea fișierului %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Fișierul %s este gol."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Nu se poate citi %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaj: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Nu se poate obține o parte a mesajului multiparte."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compune%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Destinatarul nu este specificat."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "Subiect gol"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Subiectul este gol. Trimiteți mesajul oricum ?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 msgid "Attachment is missing"
 msgstr "Lipsă atașament"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Nu este atașat niciun fișier. Trimiteți fără atașamente ?"
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr "Confirmare destinatari"
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 msgid "Really send this mail to the following addresses?"
 msgstr "Sigur trimiteți acest mesaj către următoarele adrese ?"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Subiect:"
 
 # butonul de la confirmarea cui se trimite
-#: src/compose.c:3347
+#: src/compose.c:3351
 msgid "_Send"
 msgstr "_Trimite"
 
 # hm ?
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "nu se poate obține lista destinatarilor."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1711,38 +1738,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:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, 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:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Nu se poate salva mesajul în „Trimise”."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 msgid "Can't sign the message."
 msgstr "Nu se poate semna mesajul."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 msgid "Can't encrypt the message."
 msgstr "Nu se poate cripta mesajul."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 msgid "Can't encrypt or sign the message."
 msgstr "Nu se poate cripta sau semna mesajul."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "nu se pot schimba permisiunile fișierului\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1754,11 +1781,11 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ca %s ?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "Eroare conversie cod"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1771,15 +1798,15 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "Limită lungime linie"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr "Criptare cu Bcc"
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1793,100 +1820,100 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "nu se poate șterge mesajul vechi\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "punere mesaj în coada de așteptare...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "nu se poate găsi dosarul de coadă\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "nu se poate pune mesajului în coada de așteptare\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Fișierul %s nu există."
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nu se poate deschide fișierul %s."
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID creat: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Creare fereastră de compunere...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "Semnătură PGP"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Dată"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Tipul MIME nu este valid."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Fișierul nu există sau este gol."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Proprietăți"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Nume fișier"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 msgid "File not exist."
 msgstr "Fișierul nu există."
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Deschidere fișier executabil"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1898,12 +1925,12 @@ msgstr ""
 "Dacă vreți să îl lansați în execuție, salvați-l undeva și asigurați-vă că nu "
 "este un virus sau un alt tip de program malițios."
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, 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:6738
+#: src/compose.c:6743
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1912,49 +1939,49 @@ msgstr ""
 "Editorul extern este încă în funcțiune.\n"
 "Forțați terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "_Personalizează bara de unelte..."
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Nu se poate pune mesajul în coada de așteptare."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "Selectați fișierele"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Selectați fișierul"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "Salvare mesaj"
 
 # !!! dependent de traducerea lui draft !!!
-#: src/compose.c:7394
+#: src/compose.c:7399
 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:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "Închide _fără salvare"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vreți să aplicați șablonul „%s” ?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Aplică șablon"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "Înl_ocuiește"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "_Inserează"
 
@@ -2644,7 +2671,7 @@ msgstr "Grupuri de știri:"
 msgid "Creating header view...\n"
 msgstr "Creare vizualizare antet...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Fără expeditor)"
@@ -2982,7 +3009,7 @@ msgstr "Conectare la serverul POP3: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nu se poate efectua conexiunea la serverul POP3: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentificare..."
@@ -6696,7 +6723,7 @@ msgstr "Căutare %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Căutare %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Fără Dată)"
 
@@ -6829,55 +6856,55 @@ msgstr ""
 "A apărut o eroare în timpul sesiunii POP3:\n"
 "%s"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Recepționare anteturi mesaje (%d / %d) ..."
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 msgid "Getting the number of messages..."
 msgstr "Obținerea numărului de mesaje..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 msgid "No message"
 msgstr "Nu sunt mesaje"
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, c-format
 msgid "Deleted %d messages"
 msgstr "A(u) fost șters(e) %d mesaj(e)"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Părăsire..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "A(u) fost recepționat(e) %d mesaj(e)"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, c-format
 msgid "Opened message %d"
 msgstr "A fost deschis mesajul %d"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "A(u) fost recepționat(e) %d antet(uri) de mesaj"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "Recepționare mesaj %d..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 msgid "Delete messages"
 msgstr "Ștergere mesaje"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/ru.po b/po/ru.po
index bda3420a..9b1530ca 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2010-06-15 15:18+0400\n"
 "Last-Translator: \n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -697,8 +697,8 @@ msgstr ""
 "Пометьте в колонке \"G\" учётные записи, которые нужно проверять\n"
 "по команде \"Получить все\"."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -833,12 +833,12 @@ msgstr "Пользовательский параметр действия"
 msgid "Add Address to Book"
 msgstr "Добавление адреса в книгу"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Примечание"
@@ -847,33 +847,33 @@ msgstr "Примечание"
 msgid "Select Address Book Folder"
 msgstr "Выберите папку в адресной книге"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Зарегистрированные шаблоны"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/Файл/Новая книга"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/Файл/Новый файл vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новый файл JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новый сервер LDAP"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -881,190 +881,217 @@ msgstr "/Файл/Новый сервер LDAP"
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/Файл/Правка"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/Файл/Удалить"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/Файл/Сохранить"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрыть"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Правка"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Правка/Копировать"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Правка/Вставить"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/Адрес"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/Адрес/Новый адрес"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/Адрес/Новая группа"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/Адрес/Новая папка"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/Адрес/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/Адрес/Удалить"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/Адрес/Правка"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/Адрес/Правка"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/Адрес/Правка"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Инструменты"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Инструменты/Импорт файла LDIF"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 msgid "/_Tools/Import _CSV file"
 msgstr "/Инструменты/Импорт файла CSV"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Новый адрес"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Новая группа"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Новая папка"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/Удалить"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 msgid "/_Copy"
 msgstr "/Копировать"
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 msgid "/_Paste"
 msgstr "/Вставить"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адресная книга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 msgid "Search:"
 msgstr "Поиск:"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Копия:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Скрытно:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Добавить"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Поиск"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 msgid "_Close"
 msgstr "Закрыть"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Удалить адрес(а)"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Действительно удалить адрес(а)?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1073,36 +1100,36 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Удалить папку"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "Только папку"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "Папку и адреса"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Действительно удалить \"%s\"?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Новый пользователь; не удалось сохранить индексный файл."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Новый пользователь; не удалось сохранить файлы адресной книги."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Старая адресная книга успешно преобразована."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1110,7 +1137,7 @@ msgstr ""
 "Старая адресная книга преобразована,\n"
 "не удалось сохранить новый индексный файл."
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1118,7 +1145,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "создана пустая адресная книга."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1126,7 +1153,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "ошибка при создании файлов адресной книги."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1134,15 +1161,15 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "кроме того, произошла ошибка при создании файлов новой адресной книги."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 msgid "Address book conversion error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 msgid "Address book conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1153,77 +1180,77 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 msgid "Address Book Error"
 msgstr "Ошибка при работе с адресной книгой"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старая адресная книга преобразована, не удалось сохранить новый индексный "
 "файл"
 
-#: src/addressbook.c:3373
+#: src/addressbook.c:3406
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, создана пустая адресная книга."
 
-#: src/addressbook.c:3379
+#: src/addressbook.c:3412
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, ошибка при создании новых файлов "
 "адресной книги"
 
-#: src/addressbook.c:3385
+#: src/addressbook.c:3418
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, кроме того, произошла ошибка при "
 "создании новых файлов адресной книги."
 
-#: src/addressbook.c:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Не удалось прочитать индекс адресов"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 msgid "Address Book Conversion Error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 msgid "Address Book Conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Контакт"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Группа"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1235,7 +1262,7 @@ msgstr "Общие адреса"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -1579,107 +1606,107 @@ msgstr "/Инструменты/Проверить орфографию"
 msgid "/_Tools/_Set spell language"
 msgstr "/Инструменты/Язык для проверки орфографии"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не существует\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Ошибка получения части текста\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Неверный формат метки цитирования."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Неверный формат шаблона ответа или пересылки."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не найден\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ошибка определения размера файла %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пустой."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Невозможно прочитать %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Подготовка сообщения%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Получатель сообщения не указан."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "Тема не указана"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема сообщения не указана. Отправить без темы?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 msgid "Attachment is missing"
 msgstr "Вложения отсутствуют"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Вложения отсутствуют. Отправить без вложений?"
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr "Проверить получателей"
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 msgid "Really send this mail to the following addresses?"
 msgstr "Отправить сообщения по следующим адресам?"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 msgid "_Send"
 msgstr "Отправить"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "ошибка определения списка получателей."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1687,37 +1714,37 @@ msgstr ""
 "Учётная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите её перед отправкой."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Ошибка сохранения сообщения в папке отправленных."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не найден ключ, соответствующий выбранному идентификатору \"%s\"."
 
-#: src/compose.c:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 msgid "Can't sign the message."
 msgstr "Невозможно подписать сообщение."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 msgid "Can't encrypt the message."
 msgstr "Невозможно зашифровать сообщение."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 msgid "Can't encrypt or sign the message."
 msgstr "Невозможно зашифровать или подписать сообщение."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "не удалось изменить свойства файла\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1728,11 +1755,11 @@ msgstr ""
 "\n"
 "Отправить его в кодировке %s?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "Ошибка преобразования кодировки"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1745,15 +1772,15 @@ msgstr ""
 "\n"
 "Отправить сообщение?"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "Слишком длинная строка"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr "Зашифровать с Bcc"
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1766,100 +1793,100 @@ msgstr ""
 "\n"
 "Отправлять?"
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не найден"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, c-format
 msgid "Can't open file %s."
 msgstr "Не удалось открыть файл %s."
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "создан Message-ID: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "Подписать PGP"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "Шифровать PGP"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Дата"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 msgid "File not exist."
 msgstr "Файл не существует."
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Открытие исполняемого файла"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1871,12 +1898,12 @@ msgstr ""
 "Если вы всё же хотите запустить этот файл, сохраните его на диске и "
 "убедитесь, что файл не содержит вирусов и других опасных программ."
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: \"%s\"\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1886,48 +1913,48 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d\n"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "Настроить панель инструментов"
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "Выбор файлов"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "Сохранить сообщение"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Это сообщение изменено. Сохранить его в папке черновиков?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "Закрыть без сохранения"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон \"%s\"?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "Заменить"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "Вставить"
 
@@ -2608,7 +2635,7 @@ msgstr "Группы новостей:"
 msgid "Creating header view...\n"
 msgstr "Создание области просмотра заголовков...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Без отправителя)"
@@ -2939,7 +2966,7 @@ msgstr "Соединение с сервером POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не удалось соединиться с сервером POP3: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Аутентификация..."
@@ -6607,7 +6634,7 @@ msgstr "Поиск в папке \"%s\" (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Поиск в папке \"%s\"..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Нет даты)"
 
@@ -6731,55 +6758,55 @@ msgstr ""
 "Ошибка сеанса POP3:\n"
 "%s"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Получение заголовков сообщений (%d / %d)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 msgid "Getting the number of messages..."
 msgstr "Получение количества новых сообщений (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 msgid "No message"
 msgstr "Нет новых сообщений."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, c-format
 msgid "Deleted %d messages"
 msgstr "Удалено %d сообщений"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Завершение..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "Получено %d сообщений"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, c-format
 msgid "Opened message %d"
 msgstr "Открыть сообщение %d"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "Получено %d заголовков сообщений"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "Получение сообщений с %d..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 msgid "Delete messages"
 msgstr "Удаление сообщений"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/sk.po b/po/sk.po
index 63ce015e..bdd2e2d8 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2004-01-22 17:46+0100\n"
 "Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -690,8 +690,8 @@ msgstr ""
 "Nové správy budú kontrolované v tomto poradí. Ak má byť konto kontrolované\n"
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -828,12 +828,12 @@ msgstr "Používateľský parameter pre akciu"
 msgid "Add Address to Book"
 msgstr "Pridať adresu do adresára"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresár"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Poznámky"
@@ -842,34 +842,34 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrované pravidlá"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Súbor"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Súbor/Nový _Adresár"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Súbor/Nový _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Súbor/Nový _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Súbor/Nový _Server"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -877,196 +877,223 @@ msgstr "/_Súbor/Nový _Server"
 msgid "/_File/---"
 msgstr "/_Súbor/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Súbor/_Upraviť"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Súbor/Z_mazať"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _Adresa"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _Skupina"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nový _Priečinok"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Adresa/--- "
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Adresa/Z_mazať"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Adresa/_Upraviť"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Adresa/_Upraviť"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Upraviť"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Nová _Adresa"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Nová _Skupina"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/Z_mazať"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopírovať..."
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Priečinok"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Hľadať"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Komu:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Zmazať"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Pridať"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Hľadať"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 #, fuzzy
 msgid "_Close"
 msgstr "Zavrieť"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Zmazať adresu(y)"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Naozaj zmazať adresu(y)?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1075,38 +1102,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:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "_Folder only"
 msgstr "Len priečinok"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Priečinok aj adresy"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Naozaj zmazať '%s' ?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Nový uživateľ; nepodarilo sa uložiť indexový súbor."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Nový uživateľ; nedajú sa uložiť súbory adresára."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Konverzia starého adresára prebehla úspešne."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1114,7 +1141,7 @@ msgstr ""
 "Konverzia starého adresára prebehla,\n"
 "nedá sa uložiť indexový súbor nového adresára"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1122,7 +1149,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "ale boli vytvorené prázdne súbory nového adresára."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1130,7 +1157,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1138,17 +1165,17 @@ msgstr ""
 "Nedá sa konvertovať starý adresár\n"
 "a nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1156,81 +1183,81 @@ msgid ""
 "%s%c%s"
 msgstr "Nedá sa načítať zoznam adries"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Chyba v adresári"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Nedá sa načítať zoznam adries"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Ovládanie"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresár"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Skupina"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1242,7 +1269,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -1627,111 +1654,111 @@ msgstr "/_Nástroje/V_ykonať"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: súbor neexistuje\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Nedá sa získať časť textu\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovede/preposielania."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nedá sa zistiť dĺžka súboru %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 #, fuzzy
 msgid "Empty subject"
 msgstr "Predmet"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Prílohy"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "Odoslať"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1739,40 +1766,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:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Správa sa nedá uložiť medzi odoslané správy."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1783,12 +1810,12 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1797,15 +1824,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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,103 +1841,103 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Nemôžem otvoriť súbor %s\n"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovaný Message-ID: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Dátum"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: súbor neexistuje\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1918,12 +1945,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1933,52 +1960,52 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
@@ -2680,7 +2707,7 @@ msgstr "Diskusné skupiny:"
 msgid "Creating header view...\n"
 msgstr "Vytváram náhľad hlavičky...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(nie je známy odosielateľ)"
@@ -3033,7 +3060,7 @@ msgstr "Pripájam sa k serveru POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentizácia..."
@@ -6841,7 +6868,7 @@ msgstr "Filtrujem..."
 msgid "Searching %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(bez dátumu)"
 
@@ -6975,58 +7002,58 @@ msgid ""
 "%s"
 msgstr "vyskytla sa chyba pri POP3 spojení\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "Žiadne nové správy."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Zmazať správy"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Odpájam sa..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Prijímam nové správy"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Odoslať správu"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Prijímam nové správy"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Prijímam správy z %s..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "Zmazať správy"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/sl.po b/po/sl.po
index 7f77e547..078a13a1 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2003-01-24 20:39CET\n"
 "Last-Translator: Jernej Kovacic <jkovacic@email.si>\n"
 "Language-Team: Slovenian <translator-team-sl@lists.sourceforge.net>\n"
@@ -698,8 +698,8 @@ msgstr ""
 "Nova sporočila bodo iskana v tem vrstnem redu. Označite izbirnike\n"
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -834,12 +834,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Naslov"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Opombe"
@@ -848,34 +848,34 @@ msgstr "Opombe"
 msgid "Select Address Book Folder"
 msgstr "Izberite mapo za adresar"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrirana pravila"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _Knjiga"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _v kartica"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Nov _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -883,196 +883,223 @@ msgstr "/_Datoteka/Nov _strežnik"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Urejanje"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Brisanje"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Urejanje"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Naslov"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Naslov/Nov n_aslov"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Naslov/Nova _skupina"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Naslov/Nova _mapa"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Naslov/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Naslov/_Brisanje"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Naslov/_Urejanje"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Naslov/_Urejanje"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Naslov/_Urejanje"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Nov n_aslov"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Nova _skupina"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Brisanje"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 #, fuzzy
 msgid "/_Copy"
 msgstr "/Prepiš_i..."
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Imenik naslovov"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Mapa"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Iskanje"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kp:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Skp:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Izbriši"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Dodajanje"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Iskanje"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 #, fuzzy
 msgid "_Close"
 msgstr "Zapri"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Brisanje naslova"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Res želite izbrisati naslov(e)?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1081,38 +1108,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:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo mapa"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mapa in naslovi"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Res želite izbrisati '%s' ?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Nov uporabnik, ne morem shraniti indeksne datoteke."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Nov uporabnik, ne morem shraniti datotek z iminiki naslovov."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Star imenik naslovov je bil uspešno pretvorjen."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1120,7 +1147,7 @@ msgstr ""
 "Stari imenik naslovov pretvorjen,\n"
 "ne morem shraniti nove indeksne datoteke naslovov"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1128,7 +1155,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "sem pa naredil prazne nove datoteke imenikov naslovov."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1136,7 +1163,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "ne morem narediti novih datotek z imeniki naslovov."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1144,17 +1171,17 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov\n"
 "in ne morem narediti novih datotek z imeniki naslovov"
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Pretvarjam imenik naslovov"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1162,80 +1189,80 @@ msgid ""
 "%s%c%s"
 msgstr "Ne morem prebrati indeksa naslovov"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Napaka v imeniku naslovov"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Ne morem prebrati indeksa naslovov"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Pretvorba imenika naslovov"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Oseba"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Skupina"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "v-kartica"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "Strežnik LDAP"
 
@@ -1247,7 +1274,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Opomba"
 
@@ -1633,111 +1660,111 @@ msgstr "/_Orodja/_Izvrši"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Ne morem dobiti tekstovnega dela\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Napaka pri oblikovanju znaka za citiranje."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Napaka pri oblikovanju odgovora/posredovanja sporočila."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne morem prebrati %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Sporočilo: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Sestavi sporočilo%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 #, fuzzy
 msgid "Empty subject"
 msgstr "Zadeva"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporočila je prazna. Naj kljub temu pošljem?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Priloge"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Samodejno nastavi sledeče naslove"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "Pošlji"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1745,40 +1772,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:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, 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:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Ne morem shraniti sporočila v imenik Outbox."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1788,12 +1815,12 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1802,15 +1829,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1819,104 +1846,104 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne morem odpreti datoteke %s\n"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Datum"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1924,12 +1951,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1939,52 +1966,52 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 #, 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:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
@@ -2685,7 +2712,7 @@ msgstr "Novičarske skupine:"
 msgid "Creating header view...\n"
 msgstr "Delam gledanje zaglavja...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Brez pošiljatelja)"
@@ -3038,7 +3065,7 @@ msgstr "Povezujem se s strežnikom POP: %s"
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne morem se povezati s strežnikom POP: %s%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Overovljam..."
@@ -6841,7 +6868,7 @@ msgstr "Filtriram..."
 msgid "Searching %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Brez datuma)"
 
@@ -6975,58 +7002,58 @@ msgid ""
 "%s"
 msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Ugotavljam število novih sporočil (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "Ni novih sporočil."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Izbriši sporočilo/a"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Zapuščam..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Prenašam nova sporočila"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Pošlji sporočilo"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Prenašam nova sporočila"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "Izbriši sporočilo/a"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/sr.po b/po/sr.po
index f7953d83..11f6ee11 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -698,8 +698,8 @@ msgstr ""
 "Nove poruke biti će proveravane ovim redom. Označite pod\n"
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -834,12 +834,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Beleške"
@@ -848,34 +848,34 @@ msgstr "Beleške"
 msgid "Select Address Book Folder"
 msgstr "Odaberite direktorijum adresara"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Zabeležena pravila"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _server"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -883,196 +883,223 @@ msgstr "/_Datoteka/Novi _server"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Izmeni"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _direktorijum"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Adresa/O_briši"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Adresa/_Izmeni"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Adresa/_Izmeni"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Izmeni"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiranje..."
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresar"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Direktorijum"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Pretraga"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Pretraga"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 #, fuzzy
 msgid "_Close"
 msgstr "Zatvori"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Zaista obrisati adresu/e?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1082,38 +1109,38 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo direktorijum"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Direktorijum i adrese"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Zaista obrisati `%s' ?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu sačuvati index datoteku."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu sačuvati datoteke adresara."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspešno prebačen."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1121,7 +1148,7 @@ msgstr ""
 "Stari adresar ne može biti prebačen,\n"
 "ne mogu sačuvati novu index datoteku adresara."
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1129,7 +1156,7 @@ msgstr ""
 "Ne mogu prebaciti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1137,7 +1164,7 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1145,17 +1172,17 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "i ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Prebacivanje adresara"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1163,73 +1190,73 @@ msgid ""
 "%s%c%s"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Izgled programa"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Grupa"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1241,7 +1268,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -1627,111 +1654,111 @@ msgstr "/_Alati/_Izvrši"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti deo teksta\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Greška u formatu citata."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Greška u poruci odgovori/prosledi."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne mogu pročitati %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tema je prazna. Ipak poslati?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Dodatak"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatski postavi sledeće adrese"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "Pošalji"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1739,41 +1766,41 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, 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:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1783,12 +1810,12 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak pošaljem?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1797,15 +1824,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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,104 +1841,104 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Datum"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1919,12 +1946,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1934,52 +1961,52 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2680,7 +2707,7 @@ msgstr "News grupe:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Bez pošiljaoca)"
@@ -3032,7 +3059,7 @@ msgstr "Povezujem se na POP3 server: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 server: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
@@ -6835,7 +6862,7 @@ msgstr "Filtriranje..."
 msgid "Searching %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
@@ -6970,58 +6997,58 @@ msgid ""
 "%s"
 msgstr "greška prilikom provere identiteta\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Preuzimam broj novih poruka (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "Nema novih poruka."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Obriši poruku/e"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Završavnje..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Primam nove poruke"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Pošalji poruku"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Primam nove poruke"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "Obriši poruku/e"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/sv.po b/po/sv.po
index b2e50b55..d6817501 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -695,8 +695,8 @@ msgstr ""
 "Markera rutorna i `G'-kolumnen för att aktivera meddelandehämtning\n"
 "via \"Hämta alla\""
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -831,12 +831,12 @@ msgstr "Åtgärdens användarargument"
 msgid "Add Address to Book"
 msgstr "Lägg till i adressbok"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adress"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Kommentarer"
@@ -845,34 +845,34 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrerade mallar"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arkiv"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Arkiv/Ny _bok"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Arkiv/Nytt _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Arkiv/Ny _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arkiv/Ny _Server"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -880,196 +880,223 @@ msgstr "/_Arkiv/Ny _Server"
 msgid "/_File/---"
 msgstr "/_Arkiv/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Arkiv/_Redigera"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Arkiv/_Ta bort"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Arkiv/_Spara"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Arkiv/St_äng"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigera"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigera/_Kopiera"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/A_dress"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/A_dress/Ny _adress"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/A_dress/Ny _grupp"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/A_dress/Ny _mapp"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/A_dress/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_A_dress/_Ta bort"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/A_dress/_Redigera"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/A_dress/_Redigera"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/A_dress/_Redigera"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/V_erktyg"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Ny _adress"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Ny _grupp"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Ta bort"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiera..."
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressbok"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Mapp"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Sök"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Till:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Dold kopia:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Sök"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 #, fuzzy
 msgid "_Close"
 msgstr "Stäng"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Ta bort adress(er)"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Vill du verkligen ta bort adress(erna)?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1079,36 +1106,36 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "_Endast mapp"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "Mapp och _adresser"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Vill du verkligen ta bort \"%s\" ?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Ny användare, kunde inte spara indexfil."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Ny användare, kunde inte spara adressboksfiler."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Den gamla adressboken är konverterad."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1116,7 +1143,7 @@ msgstr ""
 "Gammal adressbok konverterad,\n"
 "kunde inte spara ny adressindexfil"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1124,7 +1151,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1132,7 +1159,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1140,17 +1167,17 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1158,75 +1185,75 @@ msgid ""
 "%s%c%s"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adressboksfel"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 msgid "Old address book converted, could not save new address index file"
 msgstr "Gammal adressbok konverterad, kunde inte skapa ny adressindexfil"
 
-#: src/addressbook.c:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Grupp"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
@@ -1238,7 +1265,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Notera"
 
@@ -1591,110 +1618,110 @@ msgstr "/V_erktyg/Utför _köade åtgärder"
 msgid "/_Tools/_Set spell language"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Kan inte läsa textdel\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Citationsteckensformatfel."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Formatfel vid meddelandesvar eller -vidarebefordran"
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan inte läsa filstorlek på %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "kan inte läsa %s"
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Skriv%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Mottagare är inte angiven."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "Tomt ämne"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Ämnesraden är tom. Skicka ändå?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Bilagor"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Sätt automatiskt följande adresser"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "Skicka"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "kan inte läsa mottagarlista"
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1702,41 +1729,41 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod när meddelandet skulle skickas till %s."
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Kan inte spara meddelande i kö-mappen."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1747,11 +1774,11 @@ msgstr ""
 "\n"
 "Skicka det som %s ändå?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "Fel vid konvertering av kod"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1764,15 +1791,15 @@ msgstr ""
 "\n"
 "Sänd det ändå?"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "Radlängdsbegränsning"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1781,101 +1808,101 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Kan inte öppna markeringsfil.\n"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "PGP Tecken"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "PGP Kryptera"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Datum"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Öppnande av körbar fil"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1887,12 +1914,12 @@ msgstr ""
 "Om du vil köra den, spara den någonstans och kolla att det inte är ett virus "
 "eller något illasinnat program."
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1902,48 +1929,48 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "Välj filer"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "Spara meddelande"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Spara det till utkastmappen?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "Stäng _utan att spara"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -2640,7 +2667,7 @@ msgstr "Diskussionsgrupper:"
 msgid "Creating header view...\n"
 msgstr "Skapar brevhuvudvy...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Inget Från)"
@@ -2992,7 +3019,7 @@ msgstr "Ansluter till POP3-server: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan inte ansluta till POP3-server: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentiserar..."
@@ -6716,7 +6743,7 @@ msgstr "Filtrerar..."
 msgid "Searching %s ..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Inget datum)"
 
@@ -6850,58 +6877,58 @@ msgid ""
 "%s"
 msgstr "fel uppstod vid POP3-session\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Hämtar meddelandehuvuden (%d / %d)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Tar emot meddelandenas antal (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "Inga nya meddelanden."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Ta bort meddelande(n)"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Avslutar..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Hämtar nya meddelanden"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Skicka meddelande"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Hämtar nya meddelanden"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Hämtar meddelanden från %s..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "Ta bort meddelande(n)"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/tr.po b/po/tr.po
index a8c5e9bf..fed129e1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2010-02-20 16:54+0200\n"
 "Last-Translator: Doruk Fisek <dfisek@fisek.com.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -696,8 +696,8 @@ msgstr ""
 "kutucukları tıklanarak bu hesaplar için `Hepsini al' seçeneğini \n"
 "etkin duruma getirilebilir."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -834,12 +834,12 @@ msgstr "Eylemin kullanıcı argümanı"
 msgid "Add Address to Book"
 msgstr "Adres Defterine Ekle"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Notlar"
@@ -848,34 +848,34 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Kayıtlı şablonlar"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Dosya"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Dosya/Yeni _Defter"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Dosya/Yeni _vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Dosya/Yeni _JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Dosya/Yeni _Sunucu"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -883,196 +883,223 @@ msgstr "/_Dosya/Yeni _Sunucu"
 msgid "/_File/---"
 msgstr "/_Dosya/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Dosya/_Düzenle"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Dosya/_Sil"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Dosya/_Kaydet"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Dosya/K_apat"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Dü_zenle/K_opyala"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Yeni _Adres"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Yeni _Grup"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Yeni _Dizin"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/_Adres/_Sil"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/_Adres/Dü_zenle"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/_Adres/Dü_zenle"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/_Adres/Dü_zenle"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/A_raçlar"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Yeni _Adres"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Yeni _Grup"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Sil"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopyala..."
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adres defteri"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Dizin"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Ara"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Kime:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Sil"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Ekle"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Ara"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 #, fuzzy
 msgid "_Close"
 msgstr "Kapat"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Adres(ler)i sil"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Adres(ler) silinsin mi?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1082,38 +1109,38 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Dizini sil"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "_Folder only"
 msgstr "Sadece dizin"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Dizin ve Adresler"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "`%s' silinsin mi?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Yeni kullanıcı, indeks dosyası kaydedilemedi."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Yeni kullanıcı, adres defteri dosyaları kaydedilemedi."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Eski adres defteri başarıyla çevrildi."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1121,7 +1148,7 @@ msgstr ""
 "Eski adres defteri çevrildi,\n"
 "yeni adres indeks dosyası kaydedilemedi"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1129,7 +1156,7 @@ msgstr ""
 "Adres defteri çevrilemedi,\n"
 "ancak boş bir adres defteri dosyası oluşturuldu."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1137,7 +1164,7 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1145,17 +1172,17 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adres defteri çevrimi"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1163,78 +1190,78 @@ msgid ""
 "%s%c%s"
 msgstr "Adres indeksi okunamadı"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adres Defteri Hatası"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Adres indeksi okunamadı"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Adres Defteri Çevrim Hatası"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adres Defteri Çevrimi"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Arayüz"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adres Defteri"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Kişi"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "İleti Adresi"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Grup"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "LDAP Sunucu"
 
@@ -1246,7 +1273,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Not"
 
@@ -1623,111 +1650,111 @@ msgstr "/A_raçlar/Ç_alıştır"
 msgid "/_Tools/_Set spell language"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: dosya bulunamadı\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Metin bölümü alınamadı\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Alıntı formatı hatası."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Posta cevapla/ilet formatı hatası"
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s dosyasının boyu bulunamadı\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "%s okunamadı."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "İleti: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - İleti düzenle (%s)"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 #, fuzzy
 msgid "Empty subject"
 msgstr "Konu"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Konuyu boş bıraktınız. Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Ekler"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Hiç ek yok. Yine de eksiz göndermek istiyor musunuz?"
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr "Alıcıları kontrol et"
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Aşağıdaki adresleri otomatik olarak tanımla"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Konu:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "Gönder"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "alıcı listesi alınamadı."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1735,40 +1762,40 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "İleti, %s adresine gönderilirken bir hata oluştu."
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "İleti, giden kutusuna kaydedilemiyor."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1779,12 +1806,12 @@ msgstr ""
 "%s / %s\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1797,15 +1824,15 @@ msgstr ""
 "\n"
 "Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "Satır uzunlık sınırı"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr "Bcc ile Şifreleme"
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1819,103 +1846,103 @@ msgstr ""
 "\n"
 "Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "işaretli dosya açılamadı.\n"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "İleti numarası oluşturuldu: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Tarih"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: dosya bulunamadı\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1923,12 +1950,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, 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:6738
+#: src/compose.c:6743
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1938,52 +1965,52 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya seç"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 #, fuzzy
 msgid "Save message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Replace"
 msgstr "Değiştir"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Insert"
 msgstr "İçer"
@@ -2682,7 +2709,7 @@ msgstr "Haber grupları:"
 msgid "Creating header view...\n"
 msgstr "Başlık görünümü oluşturuluyor...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Kimden satırı yok)"
@@ -3034,7 +3061,7 @@ msgstr "POP3 sunucusuna bağlantı kuruluyor: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yapılıyor..."
@@ -6789,7 +6816,7 @@ msgstr "Arıyor %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Arıyor %s..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Tarih Yok)"
 
@@ -6919,57 +6946,57 @@ msgstr ""
 "POP3 oturumunda hata oluştu:\n"
 "%s"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "İleti başlıkları alınıyor (%d / %d) ..."
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Mesaj sayısı alınıyor..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "Yeni ileti yok."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "%d mesaj silindi"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Çıkılıyor..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "%d ileti alınıdı"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "İletiyi gönder"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "%d mesaj başlığı alındı"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "İleti alınıyor %d ..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 msgid "Delete messages"
 msgstr "İletileri sil"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 #, fuzzy
 msgid ""
 "Really delete selected messages from server?\n"
diff --git a/po/uk.po b/po/uk.po
index bd1c01b1..303119ed 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2010-03-01 22:30+0300\n"
 "Last-Translator: O.R. Nykyforchyn <oleh.nyk@gmail.com>\n"
 "Language-Team: Ukrainian\n"
@@ -695,8 +695,8 @@ msgstr ""
 "Порядок перевірки нових листів. Позначте в колонці `G'\n"
 "account'и, які поповнюються через `Отримати всі'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -831,12 +831,12 @@ msgstr "Аргумент користувача"
 msgid "Add Address to Book"
 msgstr "Додати адресу до книги"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Адреса"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Нотатки"
@@ -845,32 +845,32 @@ msgstr "Нотатки"
 msgid "Select Address Book Folder"
 msgstr "Обрати папку адресної книги"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 msgid "Auto-registered address"
 msgstr "Адреса, зареєстрована автоматично"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/Файл/Нова книга"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/Файл/Нова vCard"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новий JPilot"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новий сервер LDAP"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -878,190 +878,217 @@ msgstr "/Файл/Новий сервер LDAP"
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/Файл/Редагувати"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/Файл/Видалити"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/Файл/Зберегти"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Редагувати"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Редагувати/Копіювати"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Редагувати/Вставити"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/Адреса"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/Адреса/Нова адреса"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/Адреса/Нова група"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/Адреса/Нова папка"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/Адреса/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/Адреса/Видалити"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/Адреса/Редагувати"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/Адреса/Редагувати"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/Адреса/Редагувати"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Інструменти"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Інструменти/Імпортувати файл LDIF"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 msgid "/_Tools/Import _CSV file"
 msgstr "/Інструменти/Імпортувати файл CSV"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Нова адреса"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/Нова група"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Нова папка"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/Видалити"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 msgid "/_Copy"
 msgstr "/Копіювати"
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 msgid "/_Paste"
 msgstr "/Вставити"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адресна книга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 msgid "Search:"
 msgstr "Пошук:"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Приховано:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Видалити"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Додати"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Пошук"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 msgid "_Close"
 msgstr "Закрити"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Видалити адресу(и)"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Дійсно видалити адресу(и)?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1070,36 +1097,36 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Видалити папку"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "Тільки папку"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "Папку та адреси"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Дійсно видалити `%s' ?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "Новий користувач, не вдалось зберегти покажчик."
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "Новий користувач, не вдалось зберегти адресну книгу."
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Стару адресну книгу успішно конвертовано."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1107,7 +1134,7 @@ msgstr ""
 "Стару адресну книгу конвертовано,\n"
 "не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1115,7 +1142,7 @@ msgstr ""
 "Не вдалось конвертувати адресну книгу,\n"
 "але створено нову (порожню)."
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1123,7 +1150,7 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1131,15 +1158,15 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 msgid "Address book conversion error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 msgid "Address book conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1150,71 +1177,71 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 msgid "Address Book Error"
 msgstr "Помилка в адресній книзі"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Стару адресну книгу конвертовано, не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:3373
+#: src/addressbook.c:3406
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Не вдалось конвертувати адресну книгу, але створено нову (порожню)."
 
-#: src/addressbook.c:3379
+#: src/addressbook.c:3412
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:3385
+#: src/addressbook.c:3418
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Не вдалось прочитати покажчик адрес"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 msgid "Address Book Conversion Error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 msgid "Address Book Conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Інтерфейс"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Особа"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Група"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1226,7 +1253,7 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Примітка"
 
@@ -1570,107 +1597,107 @@ msgstr "/Інструменти/Перевірка правопису"
 msgid "/_Tools/_Set spell language"
 msgstr "/Інструменти/Обрати мову для перевірки правопису"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існує\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Не вдалось отримати текстову частину\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Помилка у форматі цитування."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Помилка у форматі message reply/forward."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існує\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не вдалось отримати розмір %s\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s порожній."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Не вдалось прочитати %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Лист: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Створити лист%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Не вказано отримувача."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "Порожня тема"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Поле Subject порожнє. Все ж послати?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 msgid "Attachment is missing"
 msgstr "Бракує вкладення"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Вкладення немає. Послати без вкладень?"
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr "Перевірити отримувачів"
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 msgid "Really send this mail to the following addresses?"
 msgstr "Дійсно послати цю пошту на наступні адреси?"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 msgid "_Send"
 msgstr "Послати"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "не вдалось отримати список отримувачів."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1678,37 +1705,37 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь-ласка, запис перед відправкою."
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилась помилка при відсиланні листа до %s ."
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "Не вдалось зберегти лист в outbox."
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не вдалось знайти ключа, відповідного обраному ідентифікатору `%s'."
 
-#: src/compose.c:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 msgid "Can't sign the message."
 msgstr "Не вдалось підписати лист."
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 msgid "Can't encrypt the message."
 msgstr "Не вдалось зашифрувати лист."
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 msgid "Can't encrypt or sign the message."
 msgstr "Не вдалось зашифрувати чи підписати лист."
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "не вдалось змінити права доступу файла\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1719,11 +1746,11 @@ msgstr ""
 "%s на %s.\n"
 "Все ж послати як %s?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "Помилка при перетворенні кодування"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1736,15 +1763,15 @@ msgstr ""
 "\n"
 "Все ж відіслати?"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "Максимальна довжина рядка"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr "Шифрувати з прихованими адресатами"
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1758,101 +1785,101 @@ msgstr ""
 "\n"
 "Все ж послати?"
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "не вдалось видалити старий лист\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "лист в чергу...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "не вдалось знайти папку черги\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "не вдалось поставити лист в чергу\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не існує."
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, c-format
 msgid "Can't open file %s."
 msgstr "Не вдалось відкрити файл %s."
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерований Message-ID: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Відкриваємо вікно створення листа...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "Підпис PGP"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Дата"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: файл не існує\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Відкриваємо виконуваний файл"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1864,12 +1891,12 @@ msgstr ""
 "Якщо бажаєте запустити цей файл, збережіть його і переконайтесь, що це не "
 "вірус чи щось шкідливе."
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1878,48 +1905,48 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово обірвати процес (pid: %d)?\n"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "Налаштувати панель інструментів..."
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "Обрати файли"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "Зберегти лист"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Зберегти в папці чернеток?"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "Закрити без збереження"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "Вставити"
 
@@ -2599,7 +2626,7 @@ msgstr "Конференції:"
 msgid "Creating header view...\n"
 msgstr "Створюємо область перегляду заголовка...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Без відправника)"
@@ -2930,7 +2957,7 @@ msgstr "З'єднуємось з сервером POP3: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не вдалось з'єднатись з сервером POP3: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Автентифікація..."
@@ -6590,7 +6617,7 @@ msgstr "Шукаємо %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Шукаємо %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Без дати)"
 
@@ -6714,55 +6741,55 @@ msgstr ""
 "Трапилась помилка під час сесії POP3:\n"
 ".%s"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Отримуємо заголовки листів (%d / %d) ..."
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 msgid "Getting the number of messages..."
 msgstr "Отримуємо кількість листів..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 msgid "No message"
 msgstr "Немає листа"
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, c-format
 msgid "Deleted %d messages"
 msgstr "Видалено %d листів"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Виходимо..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "Отримано %d листів"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, c-format
 msgid "Opened message %d"
 msgstr "Відкрито лист %d"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "Отримано %d заголовків листів"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "Отримуємо лист %d..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 msgid "Delete messages"
 msgstr "Видалити листи"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/vi.po b/po/vi.po
index ad16a4c4..0cea2791 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2006-04-16 22:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -677,8 +677,8 @@ msgstr ""
 "Các thư mới sẽ được kiểm tra theo thứ tự này. Đánh dấu các hộp\n"
 "trên cột `G' để cho phép lấy thư về bằng `Lấy tất cả'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -813,12 +813,12 @@ msgstr "Đối số người dùng của hành động"
 msgid "Add Address to Book"
 msgstr "Thêm địa chỉ vào sổ"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Ghi chú"
@@ -827,33 +827,33 @@ msgstr "Ghi chú"
 msgid "Select Address Book Folder"
 msgstr "Chọn thư mục sổ địa chỉ"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Các mẫu đã đăng kí"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Tập tin"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/_Tập tin/_Sổ mới"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/_Tập tin/_vCard mới"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/_Tập tin/_JPilot mới"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "/_File/New _LDAP Server"
 msgstr "/_Tập tin/_Máy chủ LDAP mới"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -861,195 +861,222 @@ msgstr "/_Tập tin/_Máy chủ LDAP mới"
 msgid "/_File/---"
 msgstr "/_Tập tin/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/_Tập tin/Soạ_n"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/_Tập tin/_Xoá"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/_Tập tin/_Lưu"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Tập tin/Đón_g"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Soạn"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Soạn/_Sao chép"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Soạn/_Dán"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/Đị_a chỉ"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/Đị_a chỉ/Địa chỉ _mới"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/Đị_a chỉ/_Nhóm mới"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/Đị_a chỉ/_Thư mục mới"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/Đị_a chỉ/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/Đị_a chỉ/_Xoá"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/Đị_a chỉ/_Soạn"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/Đị_a chỉ/_Soạn"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/Đị_a chỉ/_Soạn"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/Đị_a chỉ/_Xoá"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Công cụ"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hỗ trợ"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hỗ trợ/_Giới thiệu"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/Địa chỉ _mới"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/_Nhóm mới"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/Thư _mục mới"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Xoá"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Sao chép"
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Soạn/_Dán"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Sổ địa chỉ"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "Thư mục"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 msgid "Search:"
 msgstr "Tìm kiếm:"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Người nhận:"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Xoá"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Thêm"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Tìm kiếm:"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 #, fuzzy
 msgid "_Close"
 msgstr "Màu sắc"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "Xoá địa chỉ"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "Thực sự muốn xoá (các) địa chỉ này?"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1058,36 +1085,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:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "Xoá thư mục"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "_Chỉ thư mục"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "Thư mục và địa c_hỉ"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Thực sự muốn xoá `%s' ?"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 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:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 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:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "Sổ địa chỉ cũ đã được chuyển đổi thành công."
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1095,7 +1122,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:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1103,7 +1130,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:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1111,7 +1138,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:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1119,17 +1146,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:3252
+#: src/addressbook.c:3285
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1137,78 +1164,78 @@ msgid ""
 "%s%c%s"
 msgstr "Không thể đọc mục lục địa chỉ"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Lỗi sổ địa chỉ"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 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:3373
+#: src/addressbook.c:3406
 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:3379
+#: src/addressbook.c:3412
 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:3385
+#: src/addressbook.c:3418
 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:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "Không thể đọc mục lục địa chỉ"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "Giao diện"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Sổ địa chỉ"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "Cá nhân"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "Nhóm"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "Máy chủ LDAP"
 
@@ -1220,7 +1247,7 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "Chú ý"
 
@@ -1568,110 +1595,110 @@ msgstr "/_Công cụ/Kiểm tra _chính tả"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Công cụ/Chọn ngôn ngữ để _kiểm tra chính tả"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: tập tin không tồn tại\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "Không thể lấy phần văn bản\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "Lỗi định dạng đánh dấu trích dẫn."
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "Lỗi định dạng trả lời/chuyển tiếp thư."
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 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:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "%s là tập tin trống."
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "Không thể đọc %s."
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "Thư: %s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Không thể lấy thành phần cho thư nhiều thành phần."
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Viết thư%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "Chưa chỉ định người nhận."
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "Tiêu đề bị bỏ trống"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tiêu đề bị bỏ trống. Vẫn gửi đi?"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Đính kèm"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Tự động đặt địa chỉ sau"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "Người gửi:"
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tiêu đề:"
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "Gửi"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "không lấy được danh sách người nhận."
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1679,40 +1706,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:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, 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:3569
+#: src/compose.c:3573
 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:3612
+#: src/compose.c:3616
 #, 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:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "không thể đổi chế độ tập tin\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1723,11 +1750,11 @@ msgstr ""
 "\n"
 "Vẫn gửi ở dạng %s?"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "Lỗi chuyển mã"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1740,15 +1767,15 @@ msgstr ""
 "\n"
 "Vẫn gửi đi?"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "Giới hạn độ dài của dòng"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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,101 +1784,101 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "không thể xoá thư cũ\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "đang xếp hàng thư...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "không thấy thư mục đợi\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "không thể xếp hàng thư\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Không thể mở tập tin đánh đấu.\n"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "đã tạo ID của thư: %s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "Đang tạo cửa sổ soạn thảo...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "Chữ kí PGP"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "Mã hoá PGP"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Thời gian"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "Kiểu MIME không hợp lệ"
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 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:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "Kiểu MIME"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: tập tin không tồn tại\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Đang mở tập tin chạy"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1862,12 +1889,12 @@ msgstr ""
 "Nếu bạn muốn chạy tập tin, lưu nó vào đâu đó và đảm bảo nó không bị nhiễm vi-"
 "rút hay là chương trình có hại."
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, 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:6738
+#: src/compose.c:6743
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1876,48 +1903,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:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "Lưu thư"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 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:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "_Không lưu"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, 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:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "Dùng mẫu"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -2612,7 +2639,7 @@ msgstr "Nhóm tin:"
 msgid "Creating header view...\n"
 msgstr "Đang tạo khung xem header...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Không rõ người gửi)"
@@ -2964,7 +2991,7 @@ msgstr "Đang kết nối tới máy chủ POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Không thể kết nối tới máy thủ POP3: %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Đang xác thực..."
@@ -6678,7 +6705,7 @@ msgstr "Đang tìm %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Đang tìm %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Không ngày tháng)"
 
@@ -6807,58 +6834,58 @@ msgid ""
 "%s"
 msgstr "có lỗi trong phiên làm việc POP3\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Đang lấy header của thư (%d / %d)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Đang xác định số lượng thư mới (STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "Không có thư mới."
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Xoá thư"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "Đang thoát..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Đang tải về thư mới"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Gửi thư"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Đang tải về thư mới"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Đang lấy thư trên %s..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "Xoá thư"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b84f6e74..dc98809c 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -687,8 +687,8 @@ msgstr ""
 "按照该顺序检查新邮件。选中“G”列的复选框，在“全部接收”\n"
 "时会检查新邮件。"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -825,12 +825,12 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "注释"
@@ -839,34 +839,34 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "已注册的规则"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/文件(_F)/新建地址簿(_B)"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/文件(_F)/新建 vCard(_V)"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/文件(_F)/新建 JPilot(_J)"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -874,196 +874,223 @@ msgstr "/文件(_F)/新建服务器(_S)"
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/文件(_F)/编辑(_E)"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/文件(_F)/删除(_D)"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新建地址(_A)"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新建组(_G)"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新建文件夹(_F)"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/地址(_A)/删除(_D)"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/地址(_A)/编辑(_E)"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/地址(_A)/编辑(_E)"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/新建地址(_A)"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/新建组(_G)"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 #, fuzzy
 msgid "/_Copy"
 msgstr "/复制(_C)..."
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 #, fuzzy
 msgid "/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "地址簿"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "文件夹"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "搜索"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "收件人："
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "抄送："
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "密件抄送："
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "删除"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "添加"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "搜索"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 #, fuzzy
 msgid "_Close"
 msgstr "关闭"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "删除地址"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "真的要删除地址？"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1072,38 +1099,38 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "删除文件夹"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "_Folder only"
 msgstr "仅文件夹"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "文件夹和地址"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "真的要删除“%s”？"
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "新建用户，无法保存索引文件。"
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "新建用户，无法保存地址簿文件。"
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr "成功转换旧的地址簿。"
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1111,7 +1138,7 @@ msgstr ""
 "已经转换旧的地址簿，\n"
 "无法保存新的地址索引文件"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1119,7 +1146,7 @@ msgstr ""
 "无法转换地址簿，\n"
 "但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1127,23 +1154,23 @@ msgstr ""
 "无法转换地址簿，\n"
 "无法创建新的地址簿文件。"
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address book conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1151,73 +1178,73 @@ msgid ""
 "%s%c%s"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 #, fuzzy
 msgid "Address Book Error"
 msgstr "地址簿错误"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 msgid "Old address book converted, could not save new address index file"
 msgstr "已经转换旧的地址簿，无法保存新的地址索引文件"
 
-#: src/addressbook.c:3373
+#: src/addressbook.c:3406
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "无法转换地址簿，但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:3379
+#: src/addressbook.c:3412
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "无法转换地址簿，无法创建新的地址簿文件。"
 
-#: src/addressbook.c:3385
+#: src/addressbook.c:3418
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "地址簿"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "个人"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "群组"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 
@@ -1229,7 +1256,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "注意"
 
@@ -1585,111 +1612,111 @@ msgstr "/工具(_T)/执行(_X)"
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "无法得到文本分块\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 #, fuzzy
 msgid "Empty subject"
 msgstr "主题"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "附件"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "自动设置以下地址"
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "标题："
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "发送"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1697,40 +1724,40 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1740,12 +1767,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1754,15 +1781,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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,103 +1798,103 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "无法打开文件 %s\n"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "日期"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1875,12 +1902,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1890,51 +1917,51 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -2632,7 +2659,7 @@ msgstr "新闻组："
 msgid "Creating header view...\n"
 msgstr "正在创建标题视图...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(没有发件人)"
@@ -2983,7 +3010,7 @@ msgstr "正在连接POP3服务器：%s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "正在验证..."
@@ -6718,7 +6745,7 @@ msgstr "正在过滤..."
 msgid "Searching %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(没有日期)"
 
@@ -6852,58 +6879,58 @@ msgid ""
 "%s"
 msgstr "POP3 会话发生错误\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "没有新邮件"
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "删除邮件"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "正在退出..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "正在获取新邮件"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "立即发送邮件"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "正在获取新邮件"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "正在从 %s 获取邮件..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "删除邮件"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fffeaa00..89f2e636 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-12-20 14:54+0900\n"
+"POT-Creation-Date: 2010-12-22 11:06+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -692,8 +692,8 @@ msgstr ""
 "檢查新郵件時將會依照下面的順序。您可以勾選 G 欄位中的方塊，\n"
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5325 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/compose.c:5329 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
@@ -828,12 +828,12 @@ msgstr "使用者設定之命令參數"
 msgid "Add Address to Book"
 msgstr "將地址加入通訊錄"
 
-#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "備註"
@@ -842,34 +842,34 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇通訊錄資料夾"
 
-#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3456
+#: src/addressadd.c:311 src/addressbook.c:1045 src/addressbook.c:3489
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "已紀錄之郵件樣板符號"
 
-#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/檔案(_F)"
 
-#: src/addressbook.c:396
+#: src/addressbook.c:399
 msgid "/_File/New _Book"
 msgstr "/檔案(_F)/新增通訊錄(_B)"
 
-#: src/addressbook.c:397
+#: src/addressbook.c:400
 msgid "/_File/New _vCard"
 msgstr "/檔案(_F)/新增vCard(_V)"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:402
 msgid "/_File/New _JPilot"
 msgstr "/檔案(_F)/新增J-Pilot(_J)"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
-#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
+#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
 #: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
@@ -877,196 +877,223 @@ msgstr "/檔案(_F)/新增伺服器(_S)"
 msgid "/_File/---"
 msgstr "/檔案(_F)/---"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:408
 msgid "/_File/_Edit"
 msgstr "/檔案(_F)/編輯(_E)"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:409
 msgid "/_File/_Delete"
 msgstr "/檔案(_F)/刪除(_D)"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:411
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
-#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
+#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
-#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
 
-#: src/addressbook.c:413 src/compose.c:603
+#: src/addressbook.c:416 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:419
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新增地址(_A)"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新增群組(_G)"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新增資料夾(_F)"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:422 src/addressbook.c:429
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/Add _to recipient"
+msgstr "/地址(_A)/刪除(_D)"
+
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/Add to _Cc"
+msgstr "/地址(_A)/編輯(_E)"
+
+#: src/addressbook.c:427
+#, fuzzy
+msgid "/_Address/_Add to _Bcc"
+msgstr "/地址(_A)/編輯(_E)"
+
+#: src/addressbook.c:430
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/編輯(_E)"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:431
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/刪除(_D)"
 
-#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:434
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:435
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
 
-#: src/addressbook.c:447 src/addressbook.c:457
+#: src/addressbook.c:457 src/addressbook.c:467
 msgid "/New _Address"
 msgstr "/新增地址(_A)"
 
-#: src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:458 src/addressbook.c:468
 msgid "/New _Group"
 msgstr "/新增群組(_G)"
 
-#: src/addressbook.c:449 src/addressbook.c:459
+#: src/addressbook.c:459 src/addressbook.c:469
 msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
-#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
-#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
-#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
-#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
-#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
-#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
-#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
-#: src/summaryview.c:470 src/summaryview.c:476
+#: src/addressbook.c:460 src/addressbook.c:470 src/addressbook.c:477
+#: src/addressbook.c:480 src/compose.c:569 src/compose.c:572
+#: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
+#: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
+#: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
+#: src/folderview.c:309 src/folderview.c:311 src/folderview.c:315
+#: src/folderview.c:317 src/mimeview.c:141 src/mimeview.c:151
+#: src/summaryview.c:432 src/summaryview.c:436 src/summaryview.c:439
+#: src/summaryview.c:451 src/summaryview.c:453 src/summaryview.c:456
+#: src/summaryview.c:458 src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
+#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/刪除(_D)"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:471
+msgid "/Add _to recipient"
+msgstr ""
+
+#: src/addressbook.c:473
+msgid "/Add t_o Cc"
+msgstr ""
+
+#: src/addressbook.c:475
+msgid "/Add to _Bcc"
+msgstr ""
+
+#: src/addressbook.c:481
 #, fuzzy
 msgid "/_Copy"
 msgstr "/複製(_C)..."
 
-#: src/addressbook.c:465
+#: src/addressbook.c:482
 #, fuzzy
 msgid "/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/addressbook.c:590 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
+#: src/addressbook.c:607 src/prefs_common_dialog.c:2581 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "通訊錄"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:664 src/addressbook.c:4159 src/folderview.c:395
+#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:400
 msgid "Folder"
 msgstr "資料夾"
 
-#: src/addressbook.c:778
+#: src/addressbook.c:795
 msgid "E-Mail address"
 msgstr "E-Mail 地址"
 
-#: src/addressbook.c:829 src/quick_search.c:128
+#: src/addressbook.c:846 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "尋找"
 
-#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
+#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "收件人"
 
-#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
+#: src/addressbook.c:888 src/compose.c:3308 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "副本"
 
-#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
+#: src/addressbook.c:892 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "密件副本"
 
 #. Buttons
-#: src/addressbook.c:896 src/addressbook.c:2245 src/editaddress.c:719
+#: src/addressbook.c:913 src/addressbook.c:2273 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:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "刪除"
 
-#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:916 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "新增"
 
-#: src/addressbook.c:902 src/prefs_toolbar.c:80
+#: src/addressbook.c:919 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "尋找"
 
-#: src/addressbook.c:905
+#: src/addressbook.c:922
 #, fuzzy
 msgid "_Close"
 msgstr "顏色"
 
 #. Confirm deletion
-#: src/addressbook.c:1101
+#: src/addressbook.c:1118
 msgid "Delete address(es)"
 msgstr "刪除通訊紀錄"
 
-#: src/addressbook.c:1102
+#: src/addressbook.c:1119
 msgid "Really delete the address(es)?"
 msgstr "您確定要刪除這些紀錄嗎？"
 
-#: src/addressbook.c:2236
+#: src/addressbook.c:2264
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1075,38 +1102,38 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:2239 src/folderview.c:2686
+#: src/addressbook.c:2267 src/folderview.c:2686
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "_Folder only"
 msgstr "只刪除資料夾(_F)"
 
-#: src/addressbook.c:2239
+#: src/addressbook.c:2267
 msgid "Folder and _addresses"
 msgstr "全部刪除(_A)"
 
-#: src/addressbook.c:2244
+#: src/addressbook.c:2272
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "您確定要刪除「%s」? "
 
-#: src/addressbook.c:3202 src/addressbook.c:3340
+#: src/addressbook.c:3235 src/addressbook.c:3373
 msgid "New user, could not save index file."
 msgstr "無法儲存索引檔案。"
 
-#: src/addressbook.c:3206 src/addressbook.c:3344
+#: src/addressbook.c:3239 src/addressbook.c:3377
 msgid "New user, could not save address book files."
 msgstr "無法儲存通訊錄檔案。"
 
-#: src/addressbook.c:3216 src/addressbook.c:3354
+#: src/addressbook.c:3249 src/addressbook.c:3387
 msgid "Old address book converted successfully."
 msgstr ""
 "轉換舊通訊錄格式完成。\n"
 "您可以開始使用新的通訊錄。"
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3254
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1114,7 +1141,7 @@ msgstr ""
 "舊通訊錄格式已轉換，\n"
 "但無法儲存新的索引檔。"
 
-#: src/addressbook.c:3234
+#: src/addressbook.c:3267
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1122,7 +1149,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "但已產生空的新通訊錄。"
 
-#: src/addressbook.c:3240
+#: src/addressbook.c:3273
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1130,7 +1157,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:3245
+#: src/addressbook.c:3278
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1138,17 +1165,17 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:3252
+#: src/addressbook.c:3285
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address book conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:3295
+#: src/addressbook.c:3328
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1156,73 +1183,73 @@ msgid ""
 "%s%c%s"
 msgstr "無法讀取通訊錄索引"
 
-#: src/addressbook.c:3298
+#: src/addressbook.c:3331
 #, fuzzy
 msgid "Address Book Error"
 msgstr "通訊錄發生錯誤"
 
-#: src/addressbook.c:3359
+#: src/addressbook.c:3392
 msgid "Old address book converted, could not save new address index file"
 msgstr "舊通訊錄格式已轉換，但無法儲存新的索引檔。"
 
-#: src/addressbook.c:3373
+#: src/addressbook.c:3406
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "無法轉換通訊錄格式，但已產生空的新通訊錄。"
 
-#: src/addressbook.c:3379
+#: src/addressbook.c:3412
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:3385
+#: src/addressbook.c:3418
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:3397
+#: src/addressbook.c:3430
 msgid "Could not read address index"
 msgstr "無法讀取通訊錄索引"
 
-#: src/addressbook.c:3403
+#: src/addressbook.c:3436
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:3409
+#: src/addressbook.c:3442
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:4089 src/prefs_common_dialog.c:2379
+#: src/addressbook.c:4122 src/prefs_common_dialog.c:2379
 msgid "Interface"
 msgstr "介面"
 
-#: src/addressbook.c:4103 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4150
 msgid "Person"
 msgstr "人名"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4164
 msgid "EMail Address"
 msgstr "電子郵件信箱"
 
-#: src/addressbook.c:4145
+#: src/addressbook.c:4178
 msgid "Group"
 msgstr "群組"
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4187 src/addressbook.c:4201
+#: src/addressbook.c:4220 src/addressbook.c:4234
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4215
+#: src/addressbook.c:4248
 msgid "LDAP Server"
 msgstr "LDAP 伺服器"
 
@@ -1234,7 +1261,7 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:6741 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
 msgid "Notice"
 msgstr "注意"
 
@@ -1587,110 +1614,110 @@ msgstr "/工具(_T)/執行(_X)"
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/套用郵件樣板(_T)"
 
-#: src/compose.c:1019
+#: src/compose.c:1021
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 檔案不存在\n"
 
-#: src/compose.c:1125 src/compose.c:1202
+#: src/compose.c:1128 src/compose.c:1205
 msgid "Can't get text part\n"
 msgstr "沒有文字部份\n"
 
-#: src/compose.c:1747
+#: src/compose.c:1751
 msgid "Quote mark format error."
 msgstr "引言格式錯誤。"
 
-#: src/compose.c:1759
+#: src/compose.c:1763
 msgid "Message reply/forward format error."
 msgstr "回覆/轉寄郵件格式錯誤。"
 
-#: src/compose.c:2269
+#: src/compose.c:2273
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "檔案 %s 不存在\n"
 
-#: src/compose.c:2273
+#: src/compose.c:2277
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "無法取得檔案 %s 的大小\n"
 
-#: src/compose.c:2277 src/compose.c:4401
+#: src/compose.c:2281 src/compose.c:4405
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空的。"
 
-#: src/compose.c:2281
+#: src/compose.c:2285
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s。"
 
-#: src/compose.c:2314
+#: src/compose.c:2318
 #, c-format
 msgid "Message: %s"
 msgstr "郵件：%s"
 
-#: src/compose.c:2374 src/mimeview.c:586
+#: src/compose.c:2378 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
-#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:674 src/summaryview.c:2416
+#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:790
+#: src/rpop3.c:675 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
-#: src/compose.c:2867
+#: src/compose.c:2871
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 編寫郵件%s"
 
-#: src/compose.c:2982
+#: src/compose.c:2986
 msgid "Recipient is not specified."
 msgstr "沒有指定收件人。"
 
-#: src/compose.c:2990
+#: src/compose.c:2994
 msgid "Empty subject"
 msgstr "主旨空白"
 
-#: src/compose.c:2991
+#: src/compose.c:2995
 msgid "Subject is empty. Send it anyway?"
 msgstr "沒有主旨。確定要送出？"
 
-#: src/compose.c:3055
+#: src/compose.c:3059
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "附加檔"
 
-#: src/compose.c:3056
+#: src/compose.c:3060
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3173 src/compose.c:3199
+#: src/compose.c:3177 src/compose.c:3203
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3219
+#: src/compose.c:3223
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "在相關欄位上自動加入下列電子郵件信箱："
 
-#: src/compose.c:3232 src/compose.c:5191 src/headerview.c:54
+#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
 msgid "From:"
 msgstr "來源："
 
-#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "主旨："
 
-#: src/compose.c:3347
+#: src/compose.c:3351
 #, fuzzy
 msgid "_Send"
 msgstr "送出"
 
-#: src/compose.c:3485
+#: src/compose.c:3489
 msgid "can't get recipient list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/compose.c:3505
+#: src/compose.c:3509
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1698,40 +1725,40 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:3519 src/send_message.c:316
+#: src/compose.c:3523 src/send_message.c:316
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
 
-#: src/compose.c:3569
+#: src/compose.c:3573
 msgid "Can't save the message to outbox."
 msgstr "無法將郵件送至寄件夾中。"
 
-#: src/compose.c:3612
+#: src/compose.c:3616
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "無法找到任何與目前選取之金鑰「%s」相關的金鑰。"
 
-#: src/compose.c:3639 src/compose.c:4024
+#: src/compose.c:3643 src/compose.c:4028
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:3666 src/compose.c:4067
+#: src/compose.c:3670 src/compose.c:4071
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:3701 src/compose.c:4062
+#: src/compose.c:3705 src/compose.c:4066
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:3747 src/compose.c:4095 src/compose.c:4158 src/compose.c:4278
+#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態\n"
 
-#: src/compose.c:3780
+#: src/compose.c:3784
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1741,11 +1768,11 @@ msgstr ""
 "無法將郵件內文的編碼設定由 %s 轉換為 %s。\n"
 "仍舊要以 %s 傳送嗎？"
 
-#: src/compose.c:3786
+#: src/compose.c:3790
 msgid "Code conversion error"
 msgstr "轉換編碼時發生錯誤"
 
-#: src/compose.c:3872
+#: src/compose.c:3876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1758,15 +1785,15 @@ msgstr ""
 "\n"
 "無論如何都要傳送嗎？"
 
-#: src/compose.c:3876
+#: src/compose.c:3880
 msgid "Line length limit"
 msgstr "列長度限制"
 
-#: src/compose.c:4042
+#: src/compose.c:4046
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4043
+#: src/compose.c:4047
 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 "
@@ -1775,101 +1802,101 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4238
+#: src/compose.c:4242
 msgid "can't remove the old message\n"
 msgstr "無法移除原有的舊郵件\n"
 
-#: src/compose.c:4256
+#: src/compose.c:4260
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:4344
+#: src/compose.c:4348
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾\n"
 
-#: src/compose.c:4351
+#: src/compose.c:4355
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾\n"
 
-#: src/compose.c:4396
+#: src/compose.c:4400
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "檔案 %s 不存在\n"
 
-#: src/compose.c:4405
+#: src/compose.c:4409
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "無法開啟標記的檔案。\n"
 
-#: src/compose.c:5025
+#: src/compose.c:5029
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "產生郵件的編號：%s\n"
 
-#: src/compose.c:5140
+#: src/compose.c:5144
 msgid "Creating compose window...\n"
 msgstr "正在建立編寫視窗...\n"
 
-#: src/compose.c:5265
+#: src/compose.c:5269
 msgid "PGP Sign"
 msgstr "PGP 簽章"
 
-#: src/compose.c:5268
+#: src/compose.c:5272
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:5306 src/mimeview.c:209
+#: src/compose.c:5310 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "日期"
 
 #. S_COL_DATE
-#: src/compose.c:5315 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5279
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:6403
+#: src/compose.c:6408
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態。"
 
-#: src/compose.c:6421
+#: src/compose.c:6426
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或者是空的。"
 
-#: src/compose.c:6490
+#: src/compose.c:6495
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:6508
+#: src/compose.c:6513
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. Encoding
-#: src/compose.c:6510 src/prefs_common_dialog.c:1029
+#: src/compose.c:6515 src/prefs_common_dialog.c:1029
 #: src/prefs_common_dialog.c:1690
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:6533 src/prefs_folder_item.c:202
+#: src/compose.c:6538 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:6534
+#: src/compose.c:6539
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:6623
+#: src/compose.c:6628
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: 檔案不存在\n"
 
-#: src/compose.c:6633 src/mimeview.c:1220
+#: src/compose.c:6638 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "正在開啟可執行的檔案"
 
-#: src/compose.c:6634 src/mimeview.c:1221
+#: src/compose.c:6639 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1880,12 +1907,12 @@ msgstr ""
 "如果您要執行它，請將它存於其他地方並且確定它並非是病毒或者某種心懷不軌的程"
 "式。"
 
-#: src/compose.c:6676
+#: src/compose.c:6681
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部編輯器的命令是錯誤的：「%s」\n"
 
-#: src/compose.c:6738
+#: src/compose.c:6743
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1895,48 +1922,48 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:7075 src/mainwindow.c:3059
+#: src/compose.c:7080 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7209 src/compose.c:7214 src/compose.c:7220
+#: src/compose.c:7214 src/compose.c:7219 src/compose.c:7225
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:7319
+#: src/compose.c:7324
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:7342 src/inputdialog.c:372
+#: src/compose.c:7347 src/inputdialog.c:372
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:7393
+#: src/compose.c:7398
 msgid "Save message"
 msgstr "儲存郵件"
 
-#: src/compose.c:7394
+#: src/compose.c:7399
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "郵件已被修改過。將它儲存到草稿資料夾嗎？"
 
-#: src/compose.c:7396 src/compose.c:7400
+#: src/compose.c:7401 src/compose.c:7405
 msgid "Close _without saving"
 msgstr "關閉但不儲存(_W)"
 
-#: src/compose.c:7447
+#: src/compose.c:7452
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用「%s」這個郵件樣板嗎？"
 
-#: src/compose.c:7449
+#: src/compose.c:7454
 msgid "Apply template"
 msgstr "套用郵件樣板"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -2633,7 +2660,7 @@ msgstr "新聞群組："
 msgid "Creating header view...\n"
 msgstr "產生標頭視窗...\n"
 
-#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:675
+#: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:676
 #: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "（沒有來源）"
@@ -2985,7 +3012,7 @@ msgstr "連線到 POP3 伺服器 %s 中..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線到 POP3 伺服器：%s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:834 src/send_message.c:833
+#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "認證"
@@ -6685,7 +6712,7 @@ msgstr "過濾中..."
 msgid "Searching %s ..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:683 src/summaryview.c:2340
+#: src/query_search.c:799 src/rpop3.c:684 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(沒有日期)"
 
@@ -6819,58 +6846,58 @@ msgid ""
 "%s"
 msgstr "使用 POP3 通訊協定時發生錯誤\n"
 
-#: src/rpop3.c:697
+#: src/rpop3.c:698
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "擷取郵件表頭 (%d / %d)"
 
-#: src/rpop3.c:860
+#: src/rpop3.c:861
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "取得新郵件的數量中"
 
-#: src/rpop3.c:869 src/rpop3.c:882
+#: src/rpop3.c:870 src/rpop3.c:883
 #, fuzzy
 msgid "No message"
 msgstr "沒有新郵件。"
 
-#: src/rpop3.c:915
+#: src/rpop3.c:916
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "刪除郵件"
 
-#: src/rpop3.c:958 src/rpop3.c:970 src/rpop3.c:1028 src/rpop3.c:1226
+#: src/rpop3.c:959 src/rpop3.c:971 src/rpop3.c:1029 src/rpop3.c:1227
 #: src/send_message.c:850
 #, c-format
 msgid "Quitting..."
 msgstr "離開中..."
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1014
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "取得新郵件中"
 
-#: src/rpop3.c:1020
+#: src/rpop3.c:1021
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "送出郵件"
 
-#: src/rpop3.c:1036
+#: src/rpop3.c:1037
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "取得新郵件中"
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1153
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "從 %s 中取得郵件中..."
 
-#: src/rpop3.c:1178
+#: src/rpop3.c:1179
 #, fuzzy
 msgid "Delete messages"
 msgstr "刪除郵件"
 
-#: src/rpop3.c:1179
+#: src/rpop3.c:1180
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/src/addressbook.c b/src/addressbook.c
index 94f97426..03e3ead1 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -249,6 +249,9 @@ static void addressbook_change_node_name	(GtkTreeIter	*iter,
 static void addressbook_new_address_cb		(gpointer	 data,
 						 guint		 action,
 						 GtkWidget	*widget);
+static void addressbook_compose_to_cb		(gpointer	 data,
+						 guint		 action,
+						 GtkWidget	*widget);
 static void addressbook_edit_address_cb		(gpointer	 data,
 						 guint		 action,
 						 GtkWidget	*widget);
@@ -417,6 +420,13 @@ static GtkItemFactoryEntry addressbook_entries[] =
 	{N_("/_Address/New _Group"),	"<control>G",	addressbook_new_group_cb,       0, NULL},
 	{N_("/_Address/New _Folder"),	"<control>F",	addressbook_new_folder_cb,      0, NULL},
 	{N_("/_Address/---"),		NULL,		NULL, 0, "<Separator>"},
+	{N_("/_Address/Add _to recipient"),
+					"<control>M",	addressbook_compose_to_cb, COMPOSE_ENTRY_TO, NULL},
+	{N_("/_Address/Add to _Cc"),
+					NULL,		addressbook_compose_to_cb, COMPOSE_ENTRY_CC, NULL},
+	{N_("/_Address/_Add to _Bcc"),
+					NULL,		addressbook_compose_to_cb, COMPOSE_ENTRY_BCC, NULL},
+	{N_("/_Address/---"),		NULL,		NULL, 0, "<Separator>"},
 	{N_("/_Address/_Edit"),		"<control>Return",	addressbook_edit_address_cb,    0, NULL},
 	{N_("/_Address/_Delete"),	"Delete",	addressbook_delete_address_cb,  0, NULL},
 
@@ -458,6 +468,13 @@ static GtkItemFactoryEntry addressbook_list_popup_entries[] =
 	{N_("/New _Group"),	NULL, addressbook_new_group_cb,    0, NULL},
 	{N_("/New _Folder"),	NULL, addressbook_new_folder_cb,   0, NULL},
 	{N_("/---"),		NULL, NULL, 0, "<Separator>"},
+	{N_("/Add _to recipient"),
+				NULL, addressbook_compose_to_cb, COMPOSE_ENTRY_TO, NULL},
+	{N_("/Add t_o Cc"),
+				NULL, addressbook_compose_to_cb, COMPOSE_ENTRY_CC, NULL},
+	{N_("/Add to _Bcc"),
+				NULL, addressbook_compose_to_cb, COMPOSE_ENTRY_BCC, NULL},
+	{N_("/---"),		NULL, NULL, 0, "<Separator>"},
 	{N_("/_Edit"),		NULL, addressbook_edit_address_cb,   0, NULL},
 	{N_("/_Delete"),	NULL, addressbook_delete_address_cb, 0, NULL},
 	{N_("/---"),		NULL, NULL, 0, "<Separator>"},
@@ -1292,6 +1309,7 @@ static void addressbook_menuitem_set_sensitive(void)
 	gboolean canLookup = FALSE;
 	gboolean canCopy = FALSE;
 	gboolean canPaste = FALSE;
+	gboolean hasListSelection = _addressListSelection_ != NULL;
 	AddressTypeControlItem *atci = NULL;
 	AddressDataSource *ds = NULL;
 	AddressInterface *iface = NULL;
@@ -1401,6 +1419,10 @@ static void addressbook_menuitem_set_sensitive(void)
 	menu_set_sensitive(addrbook.menu_factory, "/Address/New Folder", canAdd);
 	menu_set_sensitive(addrbook.menu_factory, "/Address/New Group", canAdd);
 
+	menu_set_sensitive(addrbook.menu_factory, "/Address/Add to recipient", hasListSelection);
+	menu_set_sensitive(addrbook.menu_factory, "/Address/Add to Cc", hasListSelection);
+	menu_set_sensitive(addrbook.menu_factory, "/Address/Add to Bcc", hasListSelection);
+
 	/* Enable edit */
 	menu_set_sensitive(addrbook.menu_factory, "/Address/Edit", canEditAddress);
 	menu_set_sensitive(addrbook.menu_factory, "/Address/Delete", canDelete);
@@ -1421,12 +1443,18 @@ static void addressbook_menuitem_set_sensitive(void)
 	menu_set_sensitive(addrbook.list_factory, "/New Address", canAdd);
 	menu_set_sensitive(addrbook.list_factory, "/New Folder", canAdd);
 	menu_set_sensitive(addrbook.list_factory, "/New Group", canAdd);
+	menu_set_sensitive(addrbook.list_factory, "/Add to recipient", hasListSelection);
+	menu_set_sensitive(addrbook.list_factory, "/Add to Cc", hasListSelection);
+	menu_set_sensitive(addrbook.list_factory, "/Add to Bcc", hasListSelection);
 	menu_set_sensitive(addrbook.list_factory, "/Edit", canEditAddress);
 	menu_set_sensitive(addrbook.list_factory, "/Delete", canDelete);
 	menu_set_sensitive(addrbook.list_factory, "/Copy", canCopy);
 	menu_set_sensitive(addrbook.list_factory, "/Paste", canPaste);
 
 	/* Buttons */
+	gtk_widget_set_sensitive(addrbook.to_btn, hasListSelection);
+	gtk_widget_set_sensitive(addrbook.cc_btn, hasListSelection);
+	gtk_widget_set_sensitive(addrbook.bcc_btn, hasListSelection);
 	gtk_widget_set_sensitive(addrbook.reg_btn, canAdd);
 	gtk_widget_set_sensitive(addrbook.del_btn, canDelete);
 	gtk_widget_set_sensitive(addrbook.lup_btn, canLookup);
@@ -2373,6 +2401,11 @@ static void addressbook_new_address_cb(gpointer data, guint action, GtkWidget *w
 	}
 }
 
+static void addressbook_compose_to_cb(gpointer data, guint action, GtkWidget *widget)
+{
+	addressbook_to_clicked(NULL, GINT_TO_POINTER(action));
+}
+
 /*
 * Search for specified group in address index tree.
 */