po/POTFILES.in: translate plugin/attachment_tool/attachment_tool.c.

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

32 files changed, 3065 insertions, 2610 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index e116ca5a..f4d8ac66 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-07
+
+	* POTFILES.in: translate plugin/attachment_tool/attachment_tool.c.
+
 2012-01-31
 
 	* updated uk.po (thanks to Vladimir Smolyar) and be.po.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8e1eb5a6..da700a5c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -103,3 +103,4 @@ src/textview.c
 src/trayicon.c
 src/update_check.c
 src/vcard.c
+plugin/attachment_tool/attachment_tool.c
diff --git a/po/be.po b/po/be.po
index f2cf96d2..b2eb2f20 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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"
@@ -686,7 +686,7 @@ msgstr ""
 "Новыя паведамленні будуць правераны ў гэтым парадку. Пазначце\n"
 "ў слупку `G' акаунты, якія задзейнічаюць атрыманне лістоў праз `Атр. усе'"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -827,7 +827,7 @@ msgstr "Дадаць Адрас у Кнігу"
 msgid "Address"
 msgstr "Адрас"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Заўвагі"
@@ -836,32 +836,32 @@ msgstr "Заўвагі"
 msgid "Select Address Book Folder"
 msgstr "Выберыце каталог Адраснай кнігі"
 
-#: src/addressadd.c:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 msgid "Auto-registered address"
 msgstr "Аўта-рэгістраваныя адрасы"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Ф_айл"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/Ф_айл/Новая Кн_іга"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/Ф_айл/Новы _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/Ф_айл/Новы _J-Pilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/Ф_айл/Новы сервер _LDAP"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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
@@ -869,113 +869,113 @@ msgstr "/Ф_айл/Новы сервер _LDAP"
 msgid "/_File/---"
 msgstr "/Ф_айл/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/Ф_айл/_Рэдагаваць"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/Ф_айл/_Сцерці"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/Ф_айл/За_пісаць"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Ф_айл/Закры_ць"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Праца"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Праца/Капірава_ць"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Праца/_Уставіць"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Адрас"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Адрас/_Новы Адрас"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Адрас/Новая Гру_па"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Адрас/Новы К_аталог"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Адрас/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 msgid "/_Address/Add _to recipient"
 msgstr "/_Адрас/Дадаць да адрасатаў"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 msgid "/_Address/Add to _Cc"
 msgstr "/_Адрас/Дадаць да _Cc"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Адрас/Дадаць да _Bcc"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Адрас/_Рэдагаваць"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Адрас/Сц_ерці"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Прылады"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Прылады/Імпартаваць файл _LDIF"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Прылады/Імпартаваць файл _CSV"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Даведка"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Даведка/_Пра Sylpheed"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/_Новы адрас"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Новая гру_па"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Новы к_аталог"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -987,96 +987,96 @@ msgstr "/Новы к_аталог"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/Сц_ерці"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr "/Дадаць да адрасатаў"
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr "/Дадаць да _Cc"
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr "/Дадаць да _Bcc"
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 msgid "/_Copy"
 msgstr "/_Капіраваць"
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 msgid "/_Paste"
 msgstr "/_Уставіць"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адрасная кніга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Каталог"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "Адрас эл.пошты"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "Пошук:"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Скрытая копія:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Дадаць"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Пошук"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 msgid "_Close"
 msgstr "Закры_ць"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Сцерці адрас(ы)"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Сапраўды сцерці гэты адрас(ы)?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1085,36 +1085,36 @@ msgstr ""
 "Вы сапраўды жадаеце сцерці каталог І ўсе адрасы ў `%s' ?\n"
 "Пры сціранні толькі каталога, адрасы будуць перанесены ў каталог-продак."
 
-#: src/addressbook.c:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Сцерці каталог"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "Толькі К_аталог"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "Каталог _і адрас(ы)"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Сапраўды сцерці `%s' ?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Новы карыстальнік, немагчыма запісаць індэксны файл."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Новы карыстальнік, немагчыма запісаць файлы адраснай кнігі."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Старая адрасная кніга паспяхова канверсаваная."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1122,7 +1122,7 @@ msgstr ""
 "Старая адрасная кніга канверсаваная,\n"
 "немагчыма запісаць новы індэксны файл адрасоў."
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1130,7 +1130,7 @@ msgstr ""
 "Немагчыма канверсаваць адрасную кнігу,\n"
 "створаны пусты файл новай адраснай кнігі."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1138,7 +1138,7 @@ msgstr ""
 "Немагчыма канверсаваць адрасную кнігу,\n"
 "немагчыма стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1146,15 +1146,15 @@ msgstr ""
 "Немагчыма канверсаваць адрасную кнігу\n"
 "і нельга стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 msgid "Address book conversion error"
 msgstr "Памылка канверсіі адраснай кнігі"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 msgid "Address book conversion"
 msgstr "Канверсія адраснай кнігі"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1165,76 +1165,76 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 msgid "Address Book Error"
 msgstr "Памылка адраснай кнігі"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старая адрасная кніга канверсаваная, але нельга запісаць новы файл індэксу "
 "адрасоў."
 
-#: src/addressbook.c:3406
+#: src/addressbook.c:3462
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Немагчыма канверсаваць адрасную кнігу, створаны файлы новай адраснай кнігі."
 
-#: src/addressbook.c:3412
+#: src/addressbook.c:3468
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Немагчыма канверсаваць адрасную кнігу, немагчыма стварыць файлы новай "
 "адраснай кнігі."
 
-#: src/addressbook.c:3418
+#: src/addressbook.c:3474
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Немагчыма канверсаваць адрасную кнігу і стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Немагчыма прачытаць індэкс адрасу"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 msgid "Address Book Conversion Error"
 msgstr "Памылка канверсіі Адраснай кнігі"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 msgid "Address Book Conversion"
 msgstr "Канверсія Адраснай кнігі"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Інтэрфейс"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адрасная Кніга"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Асоба"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "Адрас эл.пошты"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Група"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1255,6 +1255,7 @@ msgid "Warning"
 msgstr "Папярэджанне"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Памылка"
 
@@ -7786,3 +7787,17 @@ msgstr "Усе плагіны Сілфіда ўжо найноўшай верс�
 #: src/update_check.c:688
 msgid "Couldn't get the version information of plug-ins."
 msgstr "Немагчыма атрымаць інфармацыю пра версію плагінаў."
+
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Мае дадаткі"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
diff --git a/po/bg.po b/po/bg.po
index abc3cd68..c1e32cb8 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +688,7 @@ msgstr ""
 "За нови съобщения ще бъде проверявано в този ред. Отметнете кутийките\n"
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -831,7 +831,7 @@ msgstr "Добавяне на Адреса към Книгата"
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Регистрирани правила"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Файл"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Файл/Нова _Книга"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Файл/Нова _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Файл/Нов _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Файл/Нов _Сървър"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,117 +875,117 @@ msgstr "/_Файл/Нов _Сървър"
 msgid "/_File/---"
 msgstr "/_Файл/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Файл/_Редактиране"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Файл/_Изтриване"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_файл/_Запазване"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Редактиране"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Адрес"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Адрес/Нов _Адрес"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Адрес/Нова _Група"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Адрес/Нова _Папка"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Адрес/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/_Адрес/_Редактиране"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Адрес/_Редактиране"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Адрес/_Редактиране"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Инструменти"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Нов _Адрес"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Нова _Група"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -997,101 +997,101 @@ msgstr "/Нова _Папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/_Изтриване"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Копиране..."
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адресна книга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Търсене"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Добавяне"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Търсене"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 #, fuzzy
 msgid "_Close"
 msgstr "Затваряне"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Изтриване на адрес(ите)"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Желаете ли изтриване на адрес(ите)?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1101,38 +1101,38 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "_Folder only"
 msgstr "Само папка"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Папка и Адреси"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Желаете ли изтриване на `%s' ?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Нов потребител, не можа да ce запази индексния файл."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Нов потребител, не можа да се запази файла на адресната книга"
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Старата адресна книга конвертирана успешно"
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1140,7 +1140,7 @@ msgstr ""
 "Старата адресна книга конвертирана,\n"
 "не може да се запази новия индексен файл"
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1148,7 +1148,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга,\n"
 "създадени са нови празни файлове на адресната книга."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1156,7 +1156,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1164,17 +1164,17 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1182,80 +1182,80 @@ msgid ""
 "%s%c%s"
 msgstr "Не може да се прочете адресния индекс"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Грешка на адресната книга"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старата адресна книга конвертирана, не може да се запази новия индексен файл"
 
-#: src/addressbook.c:3406
+#: src/addressbook.c:3462
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, създадени са нови празни файлове "
 "на адресната книга."
 
-#: src/addressbook.c:3412
+#: src/addressbook.c:3468
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, неуспя създаване на нови файлове "
 "на адресната книга."
 
-#: src/addressbook.c:3418
+#: src/addressbook.c:3474
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга и създаване на нови файлове на "
 "адресната книга."
 
-#: src/addressbook.c:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Не може да се прочете адресния индекс"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Лице"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "EMail Адрес"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Група"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "LDAP сървър"
 
@@ -1276,6 +1276,7 @@ msgid "Warning"
 msgstr "Предупреждение"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Грешка"
 
@@ -8088,6 +8089,20 @@ msgstr "друг Sylpheed е стартиран вече.\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Притурка"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME Тип"
 
diff --git a/po/cs.po b/po/cs.po
index c09b559c..e89c57af 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+0900\n"
 "PO-Revision-Date: 2011-01-23 01:42+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -693,7 +693,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -834,7 +834,7 @@ msgstr "Přidat adresu do adresáře"
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 msgid "Auto-registered address"
 msgstr "Automaticky registrované adresy"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Soubor"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Soubor/Nový _adresář"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Soubor/Nová _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Soubor/Nový _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/_Soubor/Nový server _LDAP"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,113 +876,113 @@ msgstr "/_Soubor/Nový server _LDAP"
 msgid "/_File/---"
 msgstr "/_Soubor/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Soubor/Up_ravit"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Soubor/_Smazat"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Soubor/_Uložit"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Soubor/_Zavřít"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Úp_ravy"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/V_ložit"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _adresa"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _skupina"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nová s_ložka"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Adresa/--"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 msgid "/_Address/Add _to recipient"
 msgstr "/_Adresa/Přida_t mezi příjemce"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 msgid "/_Address/Add to _Cc"
 msgstr "/_Adresa/Přidat mezi k_opie"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Adresa/Přidat mezi s_kryté kopie"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/U_pravit"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovat soubor _LDIF"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Nástroje/Importovat soubor _CSV"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 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:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Nová _adresa"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Nová skup_ina"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -994,96 +994,96 @@ msgstr "/Nová s_ložka"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/_Smazat"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr "/Přida_t mezi příjemce"
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr "/Přidat mezi k_opie"
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr "/Přidat mezi s_kryté kopie"
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 msgid "/_Copy"
 msgstr "/_Kopírovat"
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 msgid "/_Paste"
 msgstr "/_Vložit"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresář"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Složka"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "Hledat:"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Přidat"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Hledat"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 msgid "_Close"
 msgstr "_Zavřít"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Smazat adresy"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Opravdu chcete smazat tyto adresy?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1092,36 +1092,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:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Smazat složku"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "Pouz_e složku"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "Složk_u a adresy"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Opravdu smazat \"%s\"?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Nový uživatel, nelze uložit soubor index."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Nový uživatel, nelze uložit soubory s adresářem."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Konverze starého adresáře proběhla úspěšně."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1129,7 +1129,7 @@ msgstr ""
 "Starý adresář převeden,\n"
 "ale nelze uložit nový soubor s indexem."
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1137,7 +1137,7 @@ msgstr ""
 "Konverze adresáře nemohla být provedena,\n"
 "ale byly vytvořeny nové prázdné soubory adresáře."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1145,7 +1145,7 @@ msgstr ""
 "Nelze provést konverzi adresáře,\n"
 "nelze vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1153,15 +1153,15 @@ msgstr ""
 "Nelze provést konverzi adresáře\n"
 "a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 msgid "Address book conversion error"
 msgstr "Chyba při konverzi adresáře"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 msgid "Address book conversion"
 msgstr "Konverze adresáře"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1172,72 +1172,72 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 msgid "Address Book Error"
 msgstr "Chyba v adresáři"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Nelze načíst index adres"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 msgid "Address Book Conversion Error"
 msgstr "Chyba při konverzi adresáře"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 msgid "Address Book Conversion"
 msgstr "Konverze adresáře"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresář"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Skupina"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1258,6 +1258,7 @@ msgid "Warning"
 msgstr "Varování"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Chyba"
 
@@ -7780,3 +7781,17 @@ msgstr "Nejnovější verze všech zásuvných modulů jsou již nainstalovány.
 #: src/update_check.c:688
 msgid "Couldn't get the version information of plug-ins."
 msgstr "Nezdařilo se získání informace o verzi zásuvných modulů."
+
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "S přílohou"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
diff --git a/po/da.po b/po/da.po
index 8158483e..89c4ac87 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -692,7 +692,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -835,7 +835,7 @@ msgstr "Tilføj adresse i adressebog"
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrerede regler"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Filer"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Filer/Ny _adressebog"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Filer/Ny _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Filer/Ny _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Filer/Ny _server"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,117 +879,117 @@ msgstr "/_Filer/Ny _server"
 msgid "/_File/---"
 msgstr "/_Filer/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Filer/_Redigér"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Filer/_Slet"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Filer/_Gem"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Filer/_Luk"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigér"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigér/K_opiere"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Ny _adresse"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Ny _gruppe"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Ny _mappe"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/_Adresse/_Redigér"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Adresse/_Redigér"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Redigér"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Funktioner"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Ny _adresse"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Ny _gruppe"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -1001,101 +1001,101 @@ msgstr "/Ny _mappe"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/_Slet"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopier..."
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressebog"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Mappe"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Søg"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Søg"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 #, fuzzy
 msgid "_Close"
 msgstr "Luk"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Slet adresse(r)"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Virklig slette adresse(r)?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1104,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:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Slet mappe"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ny mappe"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mappe og adresser"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Virklig slette `%s' ?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Ny bruger, kunne ikke gemme index fil."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Ny bruger, kunne ikke gemme adressebogs fil."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Gammel adressebog konverteret."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1143,7 +1143,7 @@ msgstr ""
 "Gammel adressebog konverteret,\n"
 "men kunne ikke gemme index filen"
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1151,7 +1151,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "men nye og tomme filer blev oprettet."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1159,7 +1159,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1167,17 +1167,17 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1185,75 +1185,75 @@ msgid ""
 "%s%c%s"
 msgstr "Kunne ikke læse adressebog"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adressebog fejl"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Kunne ikke læse adressebog"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Brugerflade"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1274,6 +1274,7 @@ msgid "Warning"
 msgstr "Advarsel"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Fejl"
 
@@ -8093,6 +8094,20 @@ msgstr "sylpheed kører allerede.\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Vedhæftet"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME type"
 
diff --git a/po/de.po b/po/de.po
index 48726e06..1b0a889c 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +693,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -834,7 +834,7 @@ msgstr "Adresse in Adressbuch einfügen"
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrierte Schablonen"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datei"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Datei/Neues Adress_buch"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Datei/Neue _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Datei/Neues _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datei/Neuer _LDAP-Server"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,116 +877,116 @@ msgstr "/_Datei/Neuer _LDAP-Server"
 msgid "/_File/---"
 msgstr "/_Datei/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Datei/_Bearbeiten"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Datei/_Löschen"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Neue _Adresse"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Neue _Gruppe"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Neue Ab_lage"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/_Adresse/_Bearbeiten"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Adresse/_Bearbeiten"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Bearbeiten"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Werkzeug"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Werkzeug/Importiere _CSV-Datei"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Neue _Adresse"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Neue _Gruppe"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -998,96 +998,96 @@ msgstr "/Neue Ab_lage"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/_Löschen"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 msgid "/_Copy"
 msgstr "/_Kopieren"
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 msgid "/_Paste"
 msgstr "/_Einfügen"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressbuch"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Ablage"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "Suchen:"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Suchen"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 msgid "_Close"
 msgstr "_Schließen"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Adresse(n) löschen"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1097,36 +1097,36 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "Nur Abla_ge"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "Ablage und _Adressen"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wirklich '%s' löschen ?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Neuer Benutzer, kann Index-Datei nicht speichern."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Neuer Benutzer, kann Adressbuch-Dateien nicht speichern."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Altes Adressbuch erfolgreich konvertiert."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1134,7 +1134,7 @@ msgstr ""
 "Altes Adressbuch konvertiert,\n"
 "kann neue Adress-Index-Datei nicht speichern"
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1142,7 +1142,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "aber erstellte neue leere Adressbuch-Dateien."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1150,7 +1150,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "konnte neue Adressbuch-Dateien nicht erstellen."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1158,15 +1158,15 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren\n"
 "und konnte neue Adressbuch-Dateien erstellen."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 msgid "Address book conversion error"
 msgstr "Adressbuch-Konvertierungsfehler"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 msgid "Address book conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1174,78 +1174,78 @@ msgid ""
 "%s%c%s"
 msgstr "Konnte Adress-Index nicht lesen"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 msgid "Address Book Error"
 msgstr "Adressbuch-Fehler"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Konnte Adress-Index nicht lesen"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 msgid "Address Book Conversion Error"
 msgstr "Adressbuch-Konvertierungsfehler"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 msgid "Address Book Conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "LDAP-Server"
 
@@ -1266,6 +1266,7 @@ msgid "Warning"
 msgstr "Warnung"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Fehler"
 
@@ -7917,6 +7918,20 @@ msgstr "Ein anderes Sylpheed läuft schon.\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Hat Anhang"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME Typ"
 
diff --git a/po/el.po b/po/el.po
index b8292a01..eac814ec 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +705,7 @@ msgstr ""
 "στη στήλη 'G' για να ενεργοποιήσετε τη λήψη μηνυμάτων με την εντολή 'Λήψη "
 "όλων'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -847,7 +847,7 @@ msgstr "Προσθήκη διεύθυνσης στο ευρετήριο"
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Αποθηκευμένα πρότυπα"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Αρχείο"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Αρχείο/Νέο ε_υρετήριο διευθύνσεων"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Αρχείο/Νέα _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Αρχείο/Νέο _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/_Αρχείο/Προσθήκη νέου διακομιστή _LDAP"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,117 +890,117 @@ msgstr "/_Αρχείο/Προσθήκη νέου διακομιστή _LDAP"
 msgid "/_File/---"
 msgstr "/_Αρχείο/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Αρχείο/_Επεξεργασία"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Αρχείο/_Διαγραφή"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Αρχείο/_Αποθήκευση"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Αρχείο/_Κλείσιμο"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Επεξεργασία"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Επεξεργασία/_Αντιγραφή"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Επεξεργασία/Ε_πικόλληση"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Διεύθυνση"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Διεύθυνση/Νέα δ_ιεύθυνση"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Διεύθυνση/Νέα ο_μάδα"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Διεύθυνση/Νέος _φάκελος"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Διεύθυνση/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/_Διεύθυνση/_Διαγραφή"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/_Διεύθυνση/_Επεξεργασία"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Διεύθυνση/_Επεξεργασία"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Διεύθυνση/_Επεξεργασία"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Διεύθυνση/_Διαγραφή"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Εργαλεία"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Βοήθεια"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Βοήθεια/_Σχετικά"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Νέα δ_ιεύθυνση"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Νέα _ομάδα"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Νέος _φάκελος"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -1012,96 +1012,96 @@ msgstr "/Νέος _φάκελος"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/_Διαγραφή"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 msgid "/_Copy"
 msgstr "/_Αντιγραφή"
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 msgid "/_Paste"
 msgstr "/Ε_πικόλληση"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Φάκελος"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "Αναζήτηση:"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Κρυφή κοινοποίηση:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Διαγραφή διεύθυνσης (διευθύνσεων)"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Θέλετε σίγουρα να διαγράψετε τις διευθύνσεις;"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1110,37 +1110,37 @@ msgstr ""
 "Θέλετε να διαγράψετε το '%s' ; Αν διαγράψετε μόνο το φάκελο, οι διευθύνσεις "
 "που περιέχει θα μετακινηθούν στον γονικό φάκελο."
 
-#: src/addressbook.c:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Διαγραφή φακέλου"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "_Φάκελος μόνο"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "Φάκελος και _διευθύνσεις"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Σίγουρα να διαγραφεί το '%s' ;"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Νέος χρήστης, δεν είναι δυνατή η αποθήκευση του ευρετηρίου."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr ""
 "Νέος χρήστης, δεν είναι δυνατή η αποθήκευση του ευρετηρίου διευθύνσεων."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Το παλιό ευρετήριο διευθύνσεων μετατράπηκε με επιτυχία."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 #, fuzzy
 msgid ""
 "Old address book converted,\n"
@@ -1149,7 +1149,7 @@ msgstr ""
 "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς,\n"
 "δεν είναι δυνατή η αποθήκευση του νέου ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1157,7 +1157,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του ευρετηρίου διευθύνσεων.\n"
 "Δημιουργήθηκε νέο, κενό αρχείο."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 #, fuzzy
 msgid ""
 "Could not convert address book,\n"
@@ -1166,7 +1166,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1174,17 +1174,17 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του ευρετηρίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Σφάλμα κατά τη μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Μετατροπή ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1192,19 +1192,19 @@ msgid ""
 "%s%c%s"
 msgstr "Δεν είναι δυνατή η ανάγνωση του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Σφάλμα ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 #, fuzzy
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς,\n"
 "δεν είναι δυνατή η αποθήκευση του νέου ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3406
+#: src/addressbook.c:3462
 #, fuzzy
 msgid ""
 "Could not convert address book, but created empty new address book files."
@@ -1212,7 +1212,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων.\n"
 "Δημιουργήθηκε νέο, κενό αρχείο."
 
-#: src/addressbook.c:3412
+#: src/addressbook.c:3468
 #, fuzzy
 msgid ""
 "Could not convert address book, could not create new address book files."
@@ -1220,7 +1220,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:3418
+#: src/addressbook.c:3474
 #, fuzzy
 msgid ""
 "Could not convert address book and could not create new address book files."
@@ -1228,51 +1228,51 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Δεν είναι δυνατή η ανάγνωση του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Σφάλμα κατά τη μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Ευρετήριο διευθύνσεων"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Άτομο"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Ομάδα"
 
 # Untrans.
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
 # Untans.
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "Διακομιστής LDAP"
 
@@ -1293,6 +1293,7 @@ msgid "Warning"
 msgstr "Προειδοποίηση"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -7966,6 +7967,20 @@ msgstr "Τρέχει ήδη ένα Sylpheed.\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Έχει συνημμένο"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "Τύπος MIME"
 
diff --git a/po/es.po b/po/es.po
index f0746639..f1a9b432 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+0900\n"
 "PO-Revision-Date: 2011-01-21 08:45+0200\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -689,7 +689,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -830,7 +830,7 @@ msgstr "Añadir dirección a la agenda"
 msgid "Address"
 msgstr "Dirección"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Notas"
@@ -839,32 +839,32 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressadd.c:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 msgid "Auto-registered address"
 msgstr "Direcciones auto-registradas"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichero"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Fichero/Nueva _agenda"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Fichero/Nueva _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Fichero/Nuevo _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichero/Nuevo servidor _LDAP"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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
@@ -872,113 +872,113 @@ msgstr "/_Fichero/Nuevo servidor _LDAP"
 msgid "/_File/---"
 msgstr "/_Fichero/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Fichero/_Editar"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Fichero/_Borrar"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Dirección"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Dirección/Nueva _dirección"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Dirección/Nuevo _grupo"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Dirección/Nueva _carpeta"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Dirección/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 msgid "/_Address/Add _to recipient"
 msgstr "/_Dirección/Añadir a _destinatario"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 msgid "/_Address/Add to _Cc"
 msgstr "/_Dirección/Añadir a _Cc"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Dirección/Añadir a _Bcc"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Dirección/_Editar"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Herramientas/Importar fichero _CSV"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Nueva _dirección"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Nuevo _grupo"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -990,96 +990,96 @@ msgstr "/Nueva _carpeta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr "/Añadir al des_tinatario"
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr "/Añadir a _Cc"
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr "/Añadir a _Bcc"
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 msgid "/_Copy"
 msgstr "/_Copiar"
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 msgid "/_Paste"
 msgstr "/_Pegar"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "Buscar:"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Añadir"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Buscar"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 msgid "_Close"
 msgstr "_Cerrar"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1088,36 +1088,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:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "Sólo la _carpeta"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "La carpeta y las _direcciones"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente «%s»?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se pudo guardar el fichero índice."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pudo guardar los ficheros de direcciones"
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1125,7 +1125,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se pudo guardar el nuevo fichero índice"
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1133,7 +1133,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1141,7 +1141,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "no se pudieron crear los ficheros para la nueva."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1149,15 +1149,15 @@ msgstr ""
 "No se pudo convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para una nueva."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 msgid "Address book conversion error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 msgid "Address book conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1168,78 +1168,78 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 msgid "Address Book Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "No se pudo leer el índice de direcciones"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 msgid "Address Book Conversion Error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 msgid "Address Book Conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "Dirección de correo"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Grupo"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1260,6 +1260,7 @@ msgid "Warning"
 msgstr "Aviso"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Error"
 
@@ -7786,3 +7787,17 @@ msgstr "Todos los módulos de Sylpheed están ya en la última versión."
 #: src/update_check.c:688
 msgid "Couldn't get the version information of plug-ins."
 msgstr "No se pudo obtener la información de la versión de los módulos."
+
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Tiene adjunto"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
diff --git a/po/et.po b/po/et.po
index f91cd5c0..fcf45894 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +696,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -837,7 +837,7 @@ msgstr "Lisa aadress raamatusse"
 msgid "Address"
 msgstr "Aadress"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registreeritud reeglid"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fail"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Fail/Uus raamat"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Fail/Uus _V-Kaart"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Fail/Uus _JPiloot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fail/Uus _Server"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,117 +881,117 @@ msgstr "/_Fail/Uus _Server"
 msgid "/_File/---"
 msgstr "/_Fail/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Fail/R_edigeeri"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Fail/Kustuta"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Fail/_Salvesta"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fail/Sul_ge"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/R_edaktor"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Aadress"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Aadress/Uus _Aadress"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Aadress/Uus _Grupp"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Aadress/Uus Kaust"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Aadress/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/_Aadress/R_edigeeri"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Aadress/R_edigeeri"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Aadress/R_edigeeri"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Tööriist"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Uus _Aadress"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Uus _Grupp"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -1003,101 +1003,101 @@ msgstr "/Uus Kaust"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/Kustuta"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 #, fuzzy
 msgid "/_Copy"
 msgstr "/Kopeeri..."
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 #, fuzzy
 msgid "/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Aadressiraamat"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Kaust"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Otsi"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Lisa"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Otsi"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 #, fuzzy
 msgid "_Close"
 msgstr "Sulge"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Kustuta aadress(id)"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Kas te tõesti soovite aadresse kustutada?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1106,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:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ainult kataloog"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Kaust ja aadressid"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Kas tõesti kustutada `%s' ?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Uus kasutaja, ei saanud salvestada indeksifaili."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Uus kasutaja, ei saanud salvestada aadressiraamatu faile."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Vana aadressiraamat uuendati edukalt."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1145,7 +1145,7 @@ msgstr ""
 "Vana aadressiraamat uuendati.\n"
 "ei saanud salvestada uut aadresside indeksifaili"
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1153,7 +1153,7 @@ msgstr ""
 "Ei saanud uuendada aadressiraamatut,\n"
 "kuid loodi uued ja tühjad aadressiraamatu failid."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1161,7 +1161,7 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ei suutnud luua uusi aadressiraamatu faile."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1169,17 +1169,17 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ja ei suutnud luua uut aadressiraamatu faile."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Aadressiraamat viiakse uude formaati"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1187,80 +1187,80 @@ msgid ""
 "%s%c%s"
 msgstr "Ei suutnud lugeda aadresside indeksit"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Aadressiraamatu viga"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Ei suutnud lugeda aadresside indeksit"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Aadressiraamatu uuendamine"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Kasutajaliides"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "EPosti Aadress"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Grupp"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "V-Kaart"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPiloot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1281,6 +1281,7 @@ msgid "Warning"
 msgstr "Hoiatus"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Viga"
 
@@ -8092,6 +8093,20 @@ msgstr "üks teine Sylpheed juba töötab.\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Manus"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME Tüüp"
 
diff --git a/po/fr.po b/po/fr.po
index 56ce7933..425694fc 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+0900\n"
 "PO-Revision-Date: 2011-01-28 00:22+0100\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -702,7 +702,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -843,7 +843,7 @@ msgstr "Ajouter l'adresse au carnet"
 msgid "Address"
 msgstr "Adresses"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 msgid "Auto-registered address"
 msgstr "Adresses enregistrées automatiquement"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichier"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Fichier/Nouveau _carnet d'adresses"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Fichier/Nouveau carnet _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Fichier/Nouveau carnet _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,113 +885,113 @@ msgstr "/_Fichier/Nouveau _serveur LDAP"
 msgid "/_File/---"
 msgstr "/_Fichier/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Fichier/Édit_er"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Fichier/_Supprimer"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/É_dition"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/É_dition/Co_ller"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Nouvelle _adresse"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Nouveau _groupe"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Nouveau _dossier"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 msgid "/_Address/Add _to recipient"
 msgstr "/_Adresse//Ajouter comme d_estinataire"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 msgid "/_Address/Add to _Cc"
 msgstr "/_Adresse/Ajouter en c_opie"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Adresse/Ajouter en copie disc_rète"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/Édit_er"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Outils"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Outils/Importer un fichier _CSV"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Nouvelle _adresse"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Nouveau _groupe"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -1003,96 +1003,96 @@ msgstr "/Nouveau _dossier"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/_Supprimer"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr "/Ajouter comme d_estinataire"
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr "/Ajouter en c_opie"
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr "/Ajouter en copie disc_rète"
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 msgid "/_Copy"
 msgstr "/_Copier"
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 msgid "/_Paste"
 msgstr "/Co_ller"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Dossier"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "Rechercher :"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 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:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 msgid "_Close"
 msgstr "_Quitter"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Suppression d'adresse(s)"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Voulez-vous supprimer la(les) adresse(s) sélectionnée(s) ?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1102,37 +1102,37 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "_Dossier uniquement"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "Dossier et _adresses"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Voulez-vous vraiment supprimer « %s » ?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur. Impossible d'enregistrer le fichier index."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr ""
 "Nouvel utilisateur, impossible d'enregistrer le fichier carnet d'adresses."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1140,7 +1140,7 @@ msgstr ""
 "Ancien carnet d'adresses converti,\n"
 "mais impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1148,7 +1148,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:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1156,7 +1156,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:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1164,15 +1164,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:3285
+#: src/addressbook.c:3341
 msgid "Address book conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 msgid "Address book conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1183,78 +1183,78 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 msgid "Address Book Error"
 msgstr "Erreur dans le carnet d'adresses"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 msgid "Address Book Conversion Error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 msgid "Address Book Conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Personne"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Groupe"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "Serveur LDAP"
 
@@ -1275,6 +1275,7 @@ msgid "Warning"
 msgstr "Avertissement"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Erreur"
 
@@ -7845,6 +7846,20 @@ msgstr "Tous les plug-ins sont à jour."
 msgid "Couldn't get the version information of plug-ins."
 msgstr "Impossible de connaître les versions des plug-ins."
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Avec pièce(s) jointe(s)"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "Type MIME"
 
diff --git a/po/gl.po b/po/gl.po
index bbd37778..c1a08b19 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -694,7 +694,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -835,7 +835,7 @@ msgstr "Engadir enderezo á axenda"
 msgid "Address"
 msgstr "Enderezo"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Regas rexistradas"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Ficheiro"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Ficheiro/Nova _axenda"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Ficheiro/Nova _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Ficheiro/Novo _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,117 +879,117 @@ msgstr "/_Ficheiro/Novo _servidor"
 msgid "/_File/---"
 msgstr "/_Ficheiro/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Ficheiro/_Editar"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Ficheiro/_Borrar"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Ficheiro/_Pechar"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Enderezo"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Enderezo/Novo _enderezo"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "//_Enderezo/Novo _grupo"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Enderezo/Nova _carpeta"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Enderezo/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/_Enderezo/_Editar"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Enderezo/_Editar"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Enderezo/_Editar"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Novo _enderezo"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Novo _grupo"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -1001,101 +1001,101 @@ msgstr "/Nova _carpeta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Copiar..."
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Buscar"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Engadir"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Buscar"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 #, fuzzy
 msgid "_Close"
 msgstr "Pechar"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Borrar enderezo(s)"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente o(s) enderezo(s)?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1104,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:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "_Folder only"
 msgstr "Carpeta só"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Carpeta e enderezos"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente `%s' ?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Novo usuario, non se puido gardar o ficheiro índice."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Novo usuario, non se puido gardar os ficheiros de enderezos"
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Antiga axenda de enderezos convertida con éxito"
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1143,7 +1143,7 @@ msgstr ""
 "Antiga axenda de enderezos convertida,\n"
 "non se puido gardar o novo ficheiro índice"
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1151,7 +1151,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "pero crearonse novos ficheiros valeiros."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1159,7 +1159,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "Non se puideron crear os ficheiros para a nova."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1167,17 +1167,17 @@ msgstr ""
 "Non se puido convertir a antiga axenda\n"
 "e non se puideron crear ficheiros para unha nova."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Conversión da  axenda"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1185,81 +1185,81 @@ msgid ""
 "%s%c%s"
 msgstr "Non se puido ler o índice de enderezos"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Error na axenda"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Non se puido ler o índice de enderezos"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Erro na conversión da axenda"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Conversión da axenda"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Persoa"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Grupo"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1280,6 +1280,7 @@ msgid "Warning"
 msgstr "Aviso"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Erro"
 
@@ -8091,6 +8092,20 @@ msgstr "xa hai outro Sylpheed executándose.\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Adxunto"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "Tipo MIME"
 
diff --git a/po/hr.po b/po/hr.po
index ce7122a3..eaba1d68 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +701,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -839,7 +839,7 @@ msgstr "Dodaj adresu u adresar"
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrirana pravila"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _V-kartica"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 #, fuzzy
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _J-Pilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _poslužitelj"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,117 +884,117 @@ msgstr "/_Datoteka/Novi _poslužitelj"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Uredi"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Uredi"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/U_baci"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _spis"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/_Adresa/_Uredi"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Adresa/_Uredi"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Uredi"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Novi _spis"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -1006,101 +1006,101 @@ msgstr "/Novi _spis"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiraj..."
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Uredi/U_baci"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresar"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Spis"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Potraga"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Potraga"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 #, fuzzy
 msgid "_Close"
 msgstr "Zatvori"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Uistinu obrisati adresu/e?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1109,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:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Obriši spis"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo spis"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Spis i adrese"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Uistinu obrisati `%s' ?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu spretmiti index datoteku."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu spremiti datoteke adresara."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspješno unešen."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1148,7 +1148,7 @@ msgstr ""
 "Stari adresar ne može biti unešen,\n"
 "ne mogu spremiti novu index datoteku adresara."
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1156,7 +1156,7 @@ msgstr ""
 "Ne mogu unjeti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1164,7 +1164,7 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1172,17 +1172,17 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "i ne mogu stvoriti nove datoteke adresara."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1190,74 +1190,74 @@ msgid ""
 "%s%c%s"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Sučelje"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Grupa"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "V-kartica"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 #, fuzzy
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "LDAP Poslužitelj"
 
@@ -1278,6 +1278,7 @@ msgid "Warning"
 msgstr "Upozorenje"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Greška"
 
@@ -8194,6 +8195,20 @@ msgstr "drugi Sylpheed već radi.\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Prilog"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME tip"
 
diff --git a/po/hu.po b/po/hu.po
index d453d8e0..e76658db 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +692,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -834,7 +834,7 @@ msgstr "Cím hozzáadása a címjegyzékhez"
 msgid "Address"
 msgstr "Cím"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 msgid "Auto-registered address"
 msgstr "Auto-regisztrált cím"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fájl"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Fájl/Új _Címjegyzék"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Fájl/Új _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Fájl/Új _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fájl/Új _LDAP Szerver"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,116 +876,116 @@ msgstr "/_Fájl/Új _LDAP Szerver"
 msgid "/_File/---"
 msgstr "/_Fájl/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Fájl/_Szerkesztés"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Fájl/_Törlés"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Fájl/_Mentés"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fájl/_Bezárás"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/S_zerkesztés"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 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:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/S_zerkesztés/_Beillesztés"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Cím"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Cím/Új _cím"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Cím/Új cso_port"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Cím/Új _mappa"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Cím/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/_Cím/_Szerkesztés"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Cím/_Szerkesztés"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Cím/_Szerkesztés"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Eszközök"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Eszközök/_LDIF fájl importálása"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Eszközök/_CSV fájl importálása"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Új _cím"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Új cso_port"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -997,96 +997,96 @@ msgstr "/Ú_j Mappa"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/_Törlés"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 msgid "/_Copy"
 msgstr "/_Másolás"
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 msgid "/_Paste"
 msgstr "/_Beillesztés"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Címjegyzék"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Mappa"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "Email cím"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "Keresés:"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 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:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Keresés"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 msgid "_Close"
 msgstr "Be_zárás"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Cím(ek) törlése"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Tényleg töröljem a cím(ek)et?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1095,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:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "Cs_ak mappa"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "Mappa és _címek"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tényleg törli `%s' elemet?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Az új felhasználó nem tudja menteni az index fájlt."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 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:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "A régi címjegyzék konvertálása sikerült."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1132,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:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1140,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:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1148,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:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1156,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:3285
+#: src/addressbook.c:3341
 msgid "Address book conversion error"
 msgstr "Címjegyzék konvertálási hiba"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 msgid "Address book conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1175,74 +1175,74 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 msgid "Address Book Error"
 msgstr "Címjegyzék hiba"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "A címindex nem olvasható"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 msgid "Address Book Conversion Error"
 msgstr "Címjegyzék konvertálási hiba"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 msgid "Address Book Conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Illesztő"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Személy"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "Email cím"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Csoport"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "LDAP Szerver"
 
@@ -1263,6 +1263,7 @@ msgid "Warning"
 msgstr "Figyelmeztetés"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Hiba"
 
@@ -7820,5 +7821,19 @@ msgstr "A Sylpheed jelenleg a legújabb verziójú."
 msgid "Couldn't get the version information of plug-ins."
 msgstr "A verzió adatok nem szerezhetők meg."
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Van csatolmánya"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME típus"
diff --git a/po/it.po b/po/it.po
index 2813a737..254c65cf 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +693,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -834,7 +834,7 @@ msgstr "Aggiunta dell'indirizzo alla rubrica"
 msgid "Address"
 msgstr "Indirizzo"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Modelli registrati"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_File"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_File/Nuova _rubrica"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_File/Nuova _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_File/Nuovo _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/_File/Nuovo server _LDAP"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,116 +877,116 @@ msgstr "/_File/Nuovo server _LDAP"
 msgid "/_File/---"
 msgstr "/_File/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_File/_Modifica"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_File/_Elimina"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_File/_Salva"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_File/_Chiudi"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Modifica"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Modifica/_Incolla"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Indirizzo"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Indirizzo/Nuovo _indirizzo"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Indirizzo/Nuovo _gruppo"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Indirizzo/Nuova _cartella"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Indirizzo/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/_Indirizzo/_Modifica"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Indirizzo/_Modifica"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Indirizzo/_Modifica"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/S_trumenti"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/S_trumenti/Importa file _LDIF"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 msgid "/_Tools/Import _CSV file"
 msgstr "/S_trumenti/Importa file _CSV"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Nuovo _indirizzo"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Nuovo _gruppo"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -998,96 +998,96 @@ msgstr "/Nuova _cartella"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/Eli_mina"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 msgid "/_Copy"
 msgstr "/_Copia"
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 msgid "/_Paste"
 msgstr "/_Incolla"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Rubrica"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Cartella"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "Ricerca:"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr " Aggiungi "
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Cerca"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 msgid "_Close"
 msgstr "_Chiudi"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Elimina l'indirizzo(i)"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Eliminare l'indirizzo(i)?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1097,36 +1097,36 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "_Solo la cartella"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "Cartella e _indirizzi"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Eliminare «%s» ?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Nuovo utente, impossibile salvare il file indice."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Nuovo utente, impossibile salvare i file della rubrica."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "La vecchia rubrica è stata convertita con successo."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1134,7 +1134,7 @@ msgstr ""
 "Vecchia rubrica convertita,\n"
 "impossibile salvare il nuovo file indice dell'indirizzo"
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1142,7 +1142,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "ma ho creato nuovi file vuoti della rubrica."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1150,7 +1150,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1158,15 +1158,15 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "e impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 msgid "Address book conversion error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 msgid "Address book conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1174,78 +1174,78 @@ msgid ""
 "%s%c%s"
 msgstr "Impossibile leggere l'indice dell'indirizzo"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 msgid "Address Book Error"
 msgstr "Errore rubrica"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Impossibile leggere l'indice dell'indirizzo"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 msgid "Address Book Conversion Error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 msgid "Address Book Conversion"
 msgstr "Errore rubrica"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "Indirizzo email"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Gruppo"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1266,6 +1266,7 @@ msgid "Warning"
 msgstr "Avvertimento"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Errore"
 
@@ -7908,6 +7909,20 @@ msgstr "un altro Sylpheed è già in esecuzione.\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Hanno l'allegato"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "Tipo MIME"
 
diff --git a/po/ja.po b/po/ja.po
index afab1997..cee32451 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +688,7 @@ msgstr ""
 "新着メッセージはこの順番でチェックされます。「全受信」によるメッセージ\n"
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -829,7 +829,7 @@ msgstr "アドレスをアドレス帳に追加"
 msgid "Address"
 msgstr "アドレス"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 msgid "Auto-registered address"
 msgstr "自動登録アドレス"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/ファイル(_F)"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/ファイル(_F)/新規アドレス帳(_B)"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/ファイル(_F)/新規_vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/ファイル(_F)/新規_JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,113 +871,113 @@ msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 msgid "/_File/---"
 msgstr "/ファイル(_F)/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/ファイル(_F)/編集(_E)"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/ファイル(_F)/削除(_D)"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/ファイル(_F)/保存(_S)"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/ファイル(_F)/閉じる(_C)"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編集(_E)/コピー(_C)"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/編集(_E)/ペースト(_P)"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/アドレス(_A)"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/アドレス(_A)/新規アドレス(_A)"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/アドレス(_A)/新規グループ(_G)"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/アドレス(_A)/新規フォルダ(_F)"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/アドレス(_A)/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 msgid "/_Address/Add _to recipient"
 msgstr "/アドレス(_A)/宛先に追加(_T)"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 msgid "/_Address/Add to _Cc"
 msgstr "/アドレス(_A)/_Ccに追加"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 msgid "/_Address/Add to _Bcc"
 msgstr "/アドレス(_A)/_Bccに追加"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/アドレス(_A)/編集(_E)"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/アドレス(_A)/削除(_D)"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/ツール(_T)"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/ツール(_T)/_LDIFファイルをインポート"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 msgid "/_Tools/Import _CSV file"
 msgstr "/ツール(_T)/_CSVファイルをインポート"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/新規アドレス(_A)"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/新規グループ(_G)"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -989,96 +989,96 @@ msgstr "/新規フォルダ(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/削除(_D)"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr "宛先に追加(_T)"
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr "_Ccに追加"
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr "_Bccに追加"
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 msgid "/_Copy"
 msgstr "/コピー(_C)"
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 msgid "/_Paste"
 msgstr "/ペースト(_P)"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "アドレス帳"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "フォルダ"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "検索:"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "追加"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "検索"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 msgid "_Close"
 msgstr "閉じる(_C)"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "アドレスの削除"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "本当にこのアドレスを削除しますか?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1087,36 +1087,36 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "フォルダのみ(_F)"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "フォルダとアドレス(_A)"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "本当に `%s' を削除しますか?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "新規ユーザ、インデックスファイルを保存できません。"
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "新規ユーザ、アドレス帳ファイルを保存できません。"
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "旧形式のアドレス帳は正しく変換されました。"
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1124,7 +1124,7 @@ msgstr ""
 "旧形式のアドレス帳は変換されました。\n"
 "新規アドレスインデックスファイルに保存できません"
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1132,7 +1132,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "しかし空の新規アドレス帳ファイルが作成されました。"
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1140,7 +1140,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1148,15 +1148,15 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 msgid "Address book conversion error"
 msgstr "アドレス帳の変換エラー"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 msgid "Address book conversion"
 msgstr "アドレス帳の変換"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1167,76 +1167,76 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 msgid "Address Book Error"
 msgstr "アドレス帳のエラー"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "旧形式のアドレス帳は変換されましたが、新規アドレスインデックスファイルを保存"
 "できません"
 
-#: src/addressbook.c:3406
+#: src/addressbook.c:3462
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "アドレス帳を変換できませんでしたが、空の新規アドレス帳ファイルが作成されまし"
 "た。"
 
-#: src/addressbook.c:3412
+#: src/addressbook.c:3468
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:3418
+#: src/addressbook.c:3474
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "アドレスインデックスを読み込めません"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 msgid "Address Book Conversion Error"
 msgstr "アドレス帳変換エラー"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 msgid "Address Book Conversion"
 msgstr "アドレス帳変換"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "インタフェース"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "人物"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "グループ"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "LDAPサーバ"
 
@@ -1257,6 +1257,7 @@ msgid "Warning"
 msgstr "警告"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "エラー"
 
@@ -7768,3 +7769,16 @@ msgstr "すべての Sylpheed プラグインは最新バージョンです。"
 #: src/update_check.c:688
 msgid "Couldn't get the version information of plug-ins."
 msgstr "プラグインのバージョン情報を取得できませんでした。"
+
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+msgid "Remove attachments"
+msgstr "添付ファイルを削除"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr "このツールはローカルフォルダでのみ利用可能です。"
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr "選択したメッセージから添付ファイルを削除してもよろしいですか?"
diff --git a/po/ko.po b/po/ko.po
index 6f2df957..65568278 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +685,7 @@ msgstr ""
 "새 메시지는 이 순서대로 확인될 것입니다. `모두 받기'로 메시지를\n"
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -826,7 +826,7 @@ msgstr "주소록에 추가"
 msgid "Address"
 msgstr "주소"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "등록된 규칙"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/파일(_F)"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/파일(_F)/새 주소록(_B)"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/파일(_F)/새 vCard(_v)"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/파일(_F)/새 JPilot(_J)"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,117 +870,117 @@ msgstr "/파일(_F)/새 서버(_S)"
 msgid "/_File/---"
 msgstr "/파일(_F)/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/파일(_F)/편집(_E)"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/파일(_F)/삭제(_D)"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/파일(_F)/닫기(_C)"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/주소(_A)"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/주소(_A)/새 주소(_A)"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/주소(_A)/새 그룹(_G)"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/주소(_A)/새 폴더(_F)"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/주소(_A)/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/주소(_A)/편집(_E)"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/주소(_A)/편집(_E)"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/주소(_A)/편집(_E)"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/도구(_T)"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/새 주소(_A)"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/새 그룹(_G)"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -992,101 +992,101 @@ msgstr "/새 폴더(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/삭제(_D)"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 #, fuzzy
 msgid "/_Copy"
 msgstr "/복사(_C)..."
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 #, fuzzy
 msgid "/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "주소록"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "폴더"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "찾기"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "숨은 참조:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "추가"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "찾기"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 #, fuzzy
 msgid "_Close"
 msgstr "닫기"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "주소를 삭제"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "정말로 주소를 삭제하시겠습니까?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1095,38 +1095,38 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "_Folder only"
 msgstr "폴더만"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "폴더와 주소"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "정말로 `%s'를 지우시겠습니까?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "새 사용자, 색인 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "새 사용자, 주소록 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "예전 주소록을 성공적으로 변환하였습니다."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1134,7 +1134,7 @@ msgstr ""
 "예전 주소록이 변환되었습니다,\n"
 "새 주소록의 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1142,7 +1142,7 @@ msgstr ""
 "주소록을 변환할 수 없습니다,\n"
 "대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1150,7 +1150,7 @@ msgstr ""
 "주소록을 변환하지 못했습니다,\n"
 "새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1158,17 +1158,17 @@ msgstr ""
 "주소록을 변환하지 못했고\n"
 "새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 #, fuzzy
 msgid "Address book conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1176,74 +1176,74 @@ msgid ""
 "%s%c%s"
 msgstr "주소 색인을 읽을 수 없습니다"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 #, fuzzy
 msgid "Address Book Error"
 msgstr "주소록 에러"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 msgid "Old address book converted, could not save new address index file"
 msgstr "예전 주소록이 변환되었습니다, 새 주소록 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:3406
+#: src/addressbook.c:3462
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "주소록을 변환할 수 없습니다, 대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:3412
+#: src/addressbook.c:3468
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "주소록을 변환하지 못했습니다, 새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:3418
+#: src/addressbook.c:3474
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "주소록을 변환하지 못했고 새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "주소 색인을 읽을 수 없습니다"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "인터페이스"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "주소록"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "사람"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "그룹"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "LDAP 서버"
 
@@ -1264,6 +1264,7 @@ msgid "Warning"
 msgstr "경고"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "에러"
 
@@ -8032,6 +8033,20 @@ msgstr "다른 Sylpheed가 이미 실행되고 있습니다.\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "첨부"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "마임 타입"
 
diff --git a/po/lt.po b/po/lt.po
index c70544e5..62e7ce0d 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +690,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -831,7 +831,7 @@ msgstr "Įdėti adresą į knygą"
 msgid "Address"
 msgstr "Adresai"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registruoti šablonai"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Failas"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Failas/Nauja _Knyga"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Failas/Nauja „_vCard“ kortelė"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Failas/Naujas _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/_Failas/Naujas _LDAP serveris"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,116 +874,116 @@ msgstr "/_Failas/Naujas _LDAP serveris"
 msgid "/_File/---"
 msgstr "/_Failas/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Failas/_Taisa"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Failas/Išt_rinti"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Failas/Iš_saugoti"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Failas/_Užverti"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Taisa"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Taisa/Kopi_juoti"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Taisa/Į_dėti"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Adresas"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Adresas/Naujas _adresas"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Adresas/Nauja _grupė"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Adresas/Naujas _katalogas"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Adresas/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/_Adresas/_Redaguoti"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Adresas/_Redaguoti"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Adresas/_Redaguoti"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Į_rankiai"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Į_rankiai/Importuoti _LDIF failą"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 msgid "/_Tools/Import _CSV file"
 msgstr "/Į_rankiai/Importuoti _CSV failą"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Naujas _adresas"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Nauja _grupė"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -995,96 +995,96 @@ msgstr "/Naujas _katalogas"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/_Ištrinti"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 msgid "/_Copy"
 msgstr "/_Kopijuoti"
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 msgid "/_Paste"
 msgstr "/Į_dėti"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresų knyga"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Katalogas"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "Ieškoti:"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Slapta kopija:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Pridėti"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Ieškoti"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 msgid "_Close"
 msgstr "Uždaryti"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Pašalinti adresą(-us)"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Ar tikrai pašalinti adresą(-us)?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1093,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:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "Tik _katalogą"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "Katalogą ir _adresus jame"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tikrai pašalinti „%s“?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Naujas vartotojas, negaliu išsaugoti „index“ failo."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Naujas vartotojas, negaliu išsaugoti adresų knygos failų."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Adresų knyga sėkmingai konvertuota"
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1130,7 +1130,7 @@ msgstr ""
 "Sena adresų knyga konvertuota,\n"
 "negaliu išsaugoti naujo adresų indekso failo"
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1138,7 +1138,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "bet sukūriau tuščius naujos knygos failus."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1146,7 +1146,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "negaliu sukurti naujos knygos failų."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1154,15 +1154,15 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "ir negaliu sukurti naujos knygos failų."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 msgid "Address book conversion error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 msgid "Address book conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1170,74 +1170,74 @@ msgid ""
 "%s%c%s"
 msgstr "Negaliu perskaityti adresų indekso"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 msgid "Address Book Error"
 msgstr "Adresų knygos klaida"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Negaliu perskaityti adresų indekso"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 msgid "Address Book Conversion Error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 msgid "Address Book Conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Sąsaja"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresų knyga"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Asmuo"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Grupė"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "LDAP serveris"
 
@@ -1258,6 +1258,7 @@ msgid "Warning"
 msgstr "Įspėjimas"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Klaida"
 
@@ -7855,6 +7856,20 @@ msgstr "Sylpheed jau paleistas.\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Su priedu"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME tipas"
 
diff --git a/po/nl.po b/po/nl.po
index b8f02ffc..4a47c3f0 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +700,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -841,7 +841,7 @@ msgstr "Adres toevoegen aan adresboek"
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Gebruikte sjablonen"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Bestand"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Bestand/Nieuw _adresboek"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Bestand/Nieuwe _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Bestand/Nieuwe _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/_Bestand/Nieuwe _LDAP-server"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,117 +884,117 @@ msgstr "/_Bestand/Nieuwe _LDAP-server"
 msgid "/_File/---"
 msgstr "/_Bestand/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Bestand/Aanpassen"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Bestand/_Verwijderen"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Bestand/_Sluiten"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Be_werken"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Be_werken/_Kopiëren"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Be_werken/_Plakken"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Nieuw _adres"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Nieuwe _groep"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Nieuwe _map"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/_Adres/_Bewerken"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Adres/_Bewerken"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Bewerken"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Gereedschap"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Nieuw _adres"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Nieuwe _groep"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -1006,100 +1006,100 @@ msgstr "/Nieuwe _map"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/Ver_wijderen"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopieer..."
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Be_werken/_Plakken"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresboek"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Accounts"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "Zoeken:"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Zoeken:"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 #, fuzzy
 msgid "_Close"
 msgstr "Kleuren"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Adres(sen) verwijderen"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Wilt u de adressen werkelijk verwijderen?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1109,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:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "Alleen _map"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "Map en _adressen"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wilt u '%s' werkelijk verwijderen?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Nieuwe gebruiker: Kon indexbestand niet opslaan."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Nieuwe gebruiker: Kon adresboekbestanden niet opslaan."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Oude adresboekgegevens succesvol omgezet."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1146,7 +1146,7 @@ msgstr ""
 "Oude adresboekgegevens omgezet.\n"
 "Kon het nieuwe adresboek indexbestand niet opslaan."
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1154,7 +1154,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Nieuw leeg adresboek is gemaakt."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1162,7 +1162,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon geen nieuwe adresboek bestanden aanmaken."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1170,17 +1170,17 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon ook geen nieuwe adresboekbestanden aanmaken."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adresboek omzetting"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1188,79 +1188,79 @@ msgid ""
 "%s%c%s"
 msgstr "Kon adresboek index niet lezen"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adresboekprobleem"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Kon adresboek index niet lezen"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adresboek Omzetting"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Groep"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1281,6 +1281,7 @@ msgid "Warning"
 msgstr "Waarschuwing"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Fout"
 
@@ -7965,6 +7966,20 @@ msgstr "er draait al een Sylpheed.\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Heeft bijlage"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME type"
 
diff --git a/po/pl.po b/po/pl.po
index 434bbba7..fa262d5a 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+0900\n"
 "PO-Revision-Date: 2011-01-07 12:00+0100\n"
 "Last-Translator: Jan Stępień <jstepien@users.sourceforge.net>\n"
 "Language-Team: Jan Stępień <jstepien@users.sourceforge.net>\n"
@@ -681,7 +681,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -822,7 +822,7 @@ msgstr "Dodaj do książki adresowej"
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Uwagi"
@@ -831,32 +831,32 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog książki adresowej"
 
-#: src/addressadd.c:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 msgid "Auto-registered address"
 msgstr "Adresy zebrane automatycznie"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Plik"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Plik/Nowa _książka"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Plik/Nowy _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Plik/Nowy _J-Pilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/_Plik/Nowy serwer _LDAP"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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
@@ -864,116 +864,116 @@ msgstr "/_Plik/Nowy serwer _LDAP"
 msgid "/_File/---"
 msgstr "/_Plik/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Plik/_Edycja"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Plik/_Usuń"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Edycja"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/_Kopiuj"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Edycja/_Wstaw"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Plik/Nowy _adres"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Plik/Nowa _grupa"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Plik/Nowy _katalog"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/_Adres/_Edycja"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Adres/_Edycja"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Edycja"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Narzędzia"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Narzędzia/Importuj plik _CSV"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Nowy _adres"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Nowa _grupa"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -985,96 +985,96 @@ msgstr "/Nowy _katalog"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/_Usuń"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 msgid "/_Copy"
 msgstr "/_Kopiuj"
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 msgid "/_Paste"
 msgstr "/_Wklej"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Książka adresowa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Katalog"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "Szukaj: "
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Ukryta kopia:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Szukaj"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 msgid "_Close"
 msgstr "_Zamknij"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Usuń adres(y)"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Czy naprawdę chcesz usunąć ten adres(y)?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1084,36 +1084,36 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "_Tylko katalog"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "Katalog i _adresy"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Czy naprawdę usunąć \"%s\" ?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Nowy użytkownik, nie można było zapisać pliku indeksu."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 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:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Konwersja starej książki adresowej została zakończona pomyślnie."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1121,7 +1121,7 @@ msgstr ""
 "Stara książka adresowa została skonwertowana,\n"
 "nie można było zapisać nowego pliku indeksu adresów."
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1129,7 +1129,7 @@ msgstr ""
 "Nie można było skonwertować książki adresowej,\n"
 "utworzono puste pliki nowej książki adresowej."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1137,7 +1137,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:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1145,15 +1145,15 @@ msgstr ""
 "Nie można było skonwertować książki adresowej\n"
 "oraz utworzyć nowych plików książki adresowej."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 msgid "Address book conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 msgid "Address book conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1161,78 +1161,78 @@ msgid ""
 "%s%c%s"
 msgstr "Nie można odczytać książki adresowej"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 msgid "Address Book Error"
 msgstr "Błąd książki adresowej"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Nie można odczytać książki adresowej"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 msgid "Address Book Conversion Error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 msgid "Address Book Conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Interfejs"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Grupa"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
@@ -1253,6 +1253,7 @@ msgid "Warning"
 msgstr "Ostrzeżenie"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Błąd"
 
@@ -7946,6 +7947,20 @@ msgstr "Wszystkie wtyczki są w najnowszej wersji."
 msgid "Couldn't get the version information of plug-ins."
 msgstr "Nie udało się pobrać informacji o wersjach wtyczek."
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Załącznik"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "Typ MIME "
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 666e9d69..9921c1a0 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+0900\n"
 "PO-Revision-Date: 2011-01-21 07:33-0200\n"
 "Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n"
 "Language-Team: Portuguese/Brazil <(none)>\n"
@@ -698,7 +698,7 @@ msgstr ""
 "Mensagens novas serão baixadas nesta 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -839,7 +839,7 @@ msgstr "Adicionar ao Catálogo de Endereços"
 msgid "Address"
 msgstr "Endereço"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 msgid "Auto-registered address"
 msgstr "Endereços registrados automaticamente"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arquivo"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Arquivo/Novo _Catálogo de Endereços"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Arquivo/Novo _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Arquivo/Novo _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arquivo/Novo Servidor _LDAP"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,113 +881,113 @@ msgstr "/_Arquivo/Novo Servidor _LDAP"
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Arquivo/_Editar"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Arquivo/E_xcluir"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/Co_lar"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Endereço"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Endereço/Nova _Entrada"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Endereço/Novo _Grupo"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Endereço/Nova _Pasta"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Endereço/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 msgid "/_Address/Add _to recipient"
 msgstr "/_Endereço/Adicionar ao destina_tário"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 msgid "/_Address/Add to _Cc"
 msgstr "/_Endereço/Adicionar ao \"com _cópia\""
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Endereço/_Adicionar ao \"com cópia oculta\""
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Endereço/E_ditar"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/E_xcluir"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar arquivo _CSV"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_juda"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_juda/_Sobre"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Novo _Endereço"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Novo _Grupo"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -999,96 +999,96 @@ msgstr "/Nova _Pasta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/E_xcluir"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr "/Adicionar ao des_tinatário"
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr "/Adici_onar ao \"com cópia\""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr "/Adicionar ao \"com cópia ocul_ta\""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 msgid "/_Copy"
 msgstr "/_Copiar"
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 msgid "/_Paste"
 msgstr "/Co_lar"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 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:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Pasta"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "Procurar:"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Cco:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Procurar"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 msgid "_Close"
 msgstr "_Fechar"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Excluir endereço(s)"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Você realmente deseja excluir o(s) endereço(s)?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1098,37 +1098,37 @@ msgstr ""
 "Caso você exclua somente a pasta, os endereços serão movidos para a pasta "
 "pai."
 
-#: src/addressbook.c:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Excluir pasta"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "Apenas a_pasta"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "Pasta e _endereços"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Você realmente deseja excluir \"%s\"?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 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:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Catálogo de endereços antigo convertido com sucesso."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1136,7 +1136,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:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1144,7 +1144,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:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1152,7 +1152,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:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1160,15 +1160,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:3285
+#: src/addressbook.c:3341
 msgid "Address book conversion error"
 msgstr "Erro ao converter o catálogo de endereços"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 msgid "Address book conversion"
 msgstr "Conversão do catálogo de endereços"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1179,78 +1179,78 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 msgid "Address Book Error"
 msgstr "Erro no Catálogo de Endereços"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice do endereço"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 msgid "Address Book Conversion Error"
 msgstr "Erro na conversão do catálogo de endereços"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 msgid "Address Book Conversion"
 msgstr "Conversão do Catálogo de Endereços"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Catálogo de Endereços"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Pessoa"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Grupo"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1271,6 +1271,7 @@ msgid "Warning"
 msgstr "Aviso"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Erro"
 
@@ -7802,6 +7803,20 @@ msgstr "Todos os plugins do Sylpheed já estão atualizados."
 msgid "Couldn't get the version information of plug-ins."
 msgstr "Não foi possível obter a informações de versão dos plugins."
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Com anexo"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "Tipo MIME"
 
diff --git a/po/ro.po b/po/ro.po
index 50b17810..b11860cf 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +702,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -852,7 +852,7 @@ msgstr "Adăugare în agendă"
 msgid "Address"
 msgstr "Agendă"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 msgid "Auto-registered address"
 msgstr "Adrese înregistrate automat"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fișier"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Fișier/A_gendă nouă"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Fișier/_vCard nou"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Fișier/_JPilot nou"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fișier/Server _LDAP nou"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,117 +894,117 @@ msgstr "/_Fișier/Server _LDAP nou"
 msgid "/_File/---"
 msgstr "/_Fișier/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Fișier/_Editează"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Fișier/Ș_terge"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Fișier/_Salvează"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 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:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editare"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editare/_Copiază"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Editare/Li_pește"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/A_dresă"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/A_dresă/_Adresă nouă"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/A_dresă/_Grup nou"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/A_dresă/_Dosar nou"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/A_dresă/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/A_dresă/Ș_terge"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/A_dresă/_Editează"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/A_dresă/_Editează"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/A_dresă/_Editează"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/A_dresă/Ș_terge"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Unelte"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Unelte/Importă un fișier _LDIF"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Unelte/Importă un fișier _CSV"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ajutor"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ajutor/_Despre"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/_Adresă nouă"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/_Grup nou"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/_Dosar nou"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -1017,97 +1017,97 @@ msgid "/---"
 msgstr "/---"
 
 # comun și la intrare în agendă și la rmb pe mesaj
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/Șter_ge"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 msgid "/_Copy"
 msgstr "/_Copiază"
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 msgid "/_Paste"
 msgstr "/Li_pește"
 
 # tooltip peste butonul Agendă
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Agendă"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Dosar"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "Adresă de e-mail"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "Caută:"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Adaugă"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Caută"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 msgid "_Close"
 msgstr "În_chide"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Ștergere adresă (adrese)"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Sigur doriți să ștergeți adresa (adresele) ?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1116,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:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Ștergere dosar"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "Doar _dosar"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "Dosar și _adrese"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Sigur doriți să ștergeți „%s” ?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Utilizator nou, fișierul index nu a putut fi salvat."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Utilizator nou, fișierele agendei nu au putut fi salvate."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Agenda veche a fost convertită cu succes."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1153,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:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1161,7 +1161,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, dar\n"
 "au fost create fișierele noi de agendă goală."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1169,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:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1177,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:3285
+#: src/addressbook.c:3341
 msgid "Address book conversion error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 msgid "Address book conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1196,78 +1196,78 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 msgid "Address Book Error"
 msgstr "Eroare agendă"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Fișierul index al agendei nu a putut fi citit"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 msgid "Address Book Conversion Error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 msgid "Address Book Conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Interfață"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Agendă"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Persoană"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "Adresă de e-mail"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Grupă"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1288,6 +1288,7 @@ msgid "Warning"
 msgstr "Avertisment"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Eroare"
 
@@ -7926,6 +7927,21 @@ msgstr "Sylpheed este deja la versiunea cea mai recentă."
 msgid "Couldn't get the version information of plug-ins."
 msgstr "Nu s-a putut obține informația despre versiune."
 
+# dropdown la căutarea rapidă
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Cu atașament"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "Tip MIME"
 
diff --git a/po/ru.po b/po/ru.po
index fb730fe9..838699b7 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +697,7 @@ msgstr ""
 "Пометьте в колонке \"G\" учётные записи, которые нужно проверять\n"
 "по команде \"Получить все\"."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -838,7 +838,7 @@ msgstr "Добавление адреса в книгу"
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Зарегистрированные шаблоны"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/Файл/Новая книга"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/Файл/Новый файл vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новый файл JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новый сервер LDAP"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,116 +881,116 @@ msgstr "/Файл/Новый сервер LDAP"
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/Файл/Правка"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/Файл/Удалить"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/Файл/Сохранить"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрыть"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Правка"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Правка/Копировать"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Правка/Вставить"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/Адрес"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/Адрес/Новый адрес"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/Адрес/Новая группа"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/Адрес/Новая папка"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/Адрес/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/Адрес/Правка"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/Адрес/Правка"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/Адрес/Правка"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Инструменты"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Инструменты/Импорт файла LDIF"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 msgid "/_Tools/Import _CSV file"
 msgstr "/Инструменты/Импорт файла CSV"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Новый адрес"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Новая группа"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Новая папка"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -1002,96 +1002,96 @@ msgstr "/Новая папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/Удалить"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 msgid "/_Copy"
 msgstr "/Копировать"
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 msgid "/_Paste"
 msgstr "/Вставить"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адресная книга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "Поиск:"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Скрытно:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Добавить"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Поиск"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 msgid "_Close"
 msgstr "Закрыть"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Удалить адрес(а)"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Действительно удалить адрес(а)?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1100,36 +1100,36 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Удалить папку"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "Только папку"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "Папку и адреса"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Действительно удалить \"%s\"?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Новый пользователь; не удалось сохранить индексный файл."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Новый пользователь; не удалось сохранить файлы адресной книги."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Старая адресная книга успешно преобразована."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1137,7 +1137,7 @@ msgstr ""
 "Старая адресная книга преобразована,\n"
 "не удалось сохранить новый индексный файл."
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1145,7 +1145,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "создана пустая адресная книга."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1153,7 +1153,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "ошибка при создании файлов адресной книги."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1161,15 +1161,15 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "кроме того, произошла ошибка при создании файлов новой адресной книги."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 msgid "Address book conversion error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 msgid "Address book conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1180,77 +1180,77 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 msgid "Address Book Error"
 msgstr "Ошибка при работе с адресной книгой"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старая адресная книга преобразована, не удалось сохранить новый индексный "
 "файл"
 
-#: src/addressbook.c:3406
+#: src/addressbook.c:3462
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, создана пустая адресная книга."
 
-#: src/addressbook.c:3412
+#: src/addressbook.c:3468
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, ошибка при создании новых файлов "
 "адресной книги"
 
-#: src/addressbook.c:3418
+#: src/addressbook.c:3474
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, кроме того, произошла ошибка при "
 "создании новых файлов адресной книги."
 
-#: src/addressbook.c:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Не удалось прочитать индекс адресов"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 msgid "Address Book Conversion Error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 msgid "Address Book Conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Контакт"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Группа"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1271,6 +1271,7 @@ msgid "Warning"
 msgstr "Предупреждение"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Ошибка"
 
@@ -7822,6 +7823,20 @@ msgstr "Используется последняя версия Sylpheed."
 msgid "Couldn't get the version information of plug-ins."
 msgstr "Невозможно получить информацию о версии."
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "С вложениями"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "Тип MIME"
 
diff --git a/po/sk.po b/po/sk.po
index fa18342c..2f1129d4 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +690,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -833,7 +833,7 @@ msgstr "Pridať adresu do adresára"
 msgid "Address"
 msgstr "Adresár"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrované pravidlá"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Súbor"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Súbor/Nový _Adresár"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Súbor/Nový _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Súbor/Nový _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Súbor/Nový _Server"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,117 +877,117 @@ msgstr "/_Súbor/Nový _Server"
 msgid "/_File/---"
 msgstr "/_Súbor/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Súbor/_Upraviť"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Súbor/Z_mazať"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _Adresa"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _Skupina"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nový _Priečinok"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Adresa/--- "
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/_Adresa/_Upraviť"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Adresa/_Upraviť"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Upraviť"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Nová _Adresa"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Nová _Skupina"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -999,101 +999,101 @@ msgstr "/Nový _Priečinok"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/Z_mazať"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopírovať..."
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Priečinok"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Hľadať"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 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:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Pridať"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Hľadať"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 #, fuzzy
 msgid "_Close"
 msgstr "Zavrieť"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Zmazať adresu(y)"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Naozaj zmazať adresu(y)?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1102,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:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "_Folder only"
 msgstr "Len priečinok"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Priečinok aj adresy"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Naozaj zmazať '%s' ?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Nový uživateľ; nepodarilo sa uložiť indexový súbor."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Nový uživateľ; nedajú sa uložiť súbory adresára."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Konverzia starého adresára prebehla úspešne."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1141,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:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1149,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:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1157,7 +1157,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1165,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:3285
+#: src/addressbook.c:3341
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1183,81 +1183,81 @@ msgid ""
 "%s%c%s"
 msgstr "Nedá sa načítať zoznam adries"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Chyba v adresári"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Nedá sa načítať zoznam adries"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Ovládanie"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresár"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Skupina"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1278,6 +1278,7 @@ msgid "Warning"
 msgstr "Varovanie"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Chyba"
 
@@ -8087,6 +8088,20 @@ msgstr "už beží iná kópia Sylpheedu.\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Príloha"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME typ"
 
diff --git a/po/sl.po b/po/sl.po
index 2f64bde4..0e8b3991 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +698,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -839,7 +839,7 @@ msgstr "Dodaj naslov v adresar"
 msgid "Address"
 msgstr "Naslov"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrirana pravila"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _Knjiga"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _v kartica"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Nov _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,117 +883,117 @@ msgstr "/_Datoteka/Nov _strežnik"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Urejanje"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Brisanje"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Urejanje"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Naslov"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Naslov/Nov n_aslov"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Naslov/Nova _skupina"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Naslov/Nova _mapa"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Naslov/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/_Naslov/_Urejanje"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Naslov/_Urejanje"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Naslov/_Urejanje"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Nov n_aslov"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Nova _skupina"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -1005,101 +1005,101 @@ msgstr "/Nova _mapa"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/_Brisanje"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 #, fuzzy
 msgid "/_Copy"
 msgstr "/Prepiš_i..."
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Imenik naslovov"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Mapa"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Iskanje"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Skp:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Dodajanje"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Iskanje"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 #, fuzzy
 msgid "_Close"
 msgstr "Zapri"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Brisanje naslova"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Res želite izbrisati naslov(e)?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1108,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:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo mapa"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mapa in naslovi"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Res želite izbrisati '%s' ?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Nov uporabnik, ne morem shraniti indeksne datoteke."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Nov uporabnik, ne morem shraniti datotek z iminiki naslovov."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Star imenik naslovov je bil uspešno pretvorjen."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1147,7 +1147,7 @@ msgstr ""
 "Stari imenik naslovov pretvorjen,\n"
 "ne morem shraniti nove indeksne datoteke naslovov"
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1155,7 +1155,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "sem pa naredil prazne nove datoteke imenikov naslovov."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1163,7 +1163,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "ne morem narediti novih datotek z imeniki naslovov."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1171,17 +1171,17 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov\n"
 "in ne morem narediti novih datotek z imeniki naslovov"
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Pretvarjam imenik naslovov"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1189,80 +1189,80 @@ msgid ""
 "%s%c%s"
 msgstr "Ne morem prebrati indeksa naslovov"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Napaka v imeniku naslovov"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Ne morem prebrati indeksa naslovov"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Pretvorba imenika naslovov"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Oseba"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Skupina"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "v-kartica"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "Strežnik LDAP"
 
@@ -1283,6 +1283,7 @@ msgid "Warning"
 msgstr "Opozorilo"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Napaka"
 
@@ -8088,6 +8089,20 @@ msgstr "Sylpheed že teče.\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Priloga"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "Tip MIME"
 
diff --git a/po/sr.po b/po/sr.po
index 04242576..23775ffe 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -698,7 +698,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -839,7 +839,7 @@ msgstr "Dodaj adresu u adresar"
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Zabeležena pravila"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _server"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,117 +883,117 @@ msgstr "/_Datoteka/Novi _server"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Izmeni"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _direktorijum"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/_Adresa/_Izmeni"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Adresa/_Izmeni"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Izmeni"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -1005,101 +1005,101 @@ msgstr "/Novi _direktorijum"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiranje..."
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresar"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Direktorijum"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Pretraga"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Pretraga"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 #, fuzzy
 msgid "_Close"
 msgstr "Zatvori"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Zaista obrisati adresu/e?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1109,38 +1109,38 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo direktorijum"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Direktorijum i adrese"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Zaista obrisati `%s' ?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu sačuvati index datoteku."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu sačuvati datoteke adresara."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspešno prebačen."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1148,7 +1148,7 @@ msgstr ""
 "Stari adresar ne može biti prebačen,\n"
 "ne mogu sačuvati novu index datoteku adresara."
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1156,7 +1156,7 @@ msgstr ""
 "Ne mogu prebaciti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1164,7 +1164,7 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1172,17 +1172,17 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "i ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Prebacivanje adresara"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1190,73 +1190,73 @@ msgid ""
 "%s%c%s"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Izgled programa"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Grupa"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1277,6 +1277,7 @@ msgid "Warning"
 msgstr "Upozorenje"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Greška"
 
@@ -8083,6 +8084,20 @@ msgstr "drugi Sylpheed već radi.\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Dodatak"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME tip"
 
diff --git a/po/sv.po b/po/sv.po
index fd700393..c5d074ab 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +695,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -836,7 +836,7 @@ msgstr "Lägg till i adressbok"
 msgid "Address"
 msgstr "Adress"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrerade mallar"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arkiv"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Arkiv/Ny _bok"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Arkiv/Nytt _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Arkiv/Ny _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arkiv/Ny _Server"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,117 +880,117 @@ msgstr "/_Arkiv/Ny _Server"
 msgid "/_File/---"
 msgstr "/_Arkiv/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Arkiv/_Redigera"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Arkiv/_Ta bort"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Arkiv/_Spara"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Arkiv/St_äng"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigera"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigera/_Kopiera"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/A_dress"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/A_dress/Ny _adress"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/A_dress/Ny _grupp"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/A_dress/Ny _mapp"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/A_dress/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/A_dress/_Redigera"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/A_dress/_Redigera"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/A_dress/_Redigera"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/V_erktyg"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Ny _adress"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Ny _grupp"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -1002,101 +1002,101 @@ msgstr "/Ny _mapp"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/_Ta bort"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiera..."
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressbok"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Mapp"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Sök"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Dold kopia:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Sök"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 #, fuzzy
 msgid "_Close"
 msgstr "Stäng"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Ta bort adress(er)"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Vill du verkligen ta bort adress(erna)?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1106,36 +1106,36 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "_Endast mapp"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "Mapp och _adresser"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Vill du verkligen ta bort \"%s\" ?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Ny användare, kunde inte spara indexfil."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Ny användare, kunde inte spara adressboksfiler."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Den gamla adressboken är konverterad."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1143,7 +1143,7 @@ msgstr ""
 "Gammal adressbok konverterad,\n"
 "kunde inte spara ny adressindexfil"
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1151,7 +1151,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1159,7 +1159,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1167,17 +1167,17 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1185,75 +1185,75 @@ msgid ""
 "%s%c%s"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adressboksfel"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 msgid "Old address book converted, could not save new address index file"
 msgstr "Gammal adressbok konverterad, kunde inte skapa ny adressindexfil"
 
-#: src/addressbook.c:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Grupp"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
@@ -1274,6 +1274,7 @@ msgid "Warning"
 msgstr "Varning"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Fel"
 
@@ -7959,6 +7960,20 @@ msgstr "en annan instans av Sylpheed är redan igång.\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Bilaga"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME-typ"
 
diff --git a/po/tr.po b/po/tr.po
index cc461544..fcee1585 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+0900\n"
 "PO-Revision-Date: 2011-01-27 09:56+0200\n"
 "Last-Translator: Doruk Fisek <dfisek@fisek.com.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -692,7 +692,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -833,7 +833,7 @@ msgstr "Adres Defterine Ekle"
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Notlar"
@@ -842,32 +842,32 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressadd.c:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 msgid "Auto-registered address"
 msgstr "Otomatik-kaydedilmiş adres"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Dosya"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Dosya/Yeni _Defter"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Dosya/Yeni _vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Dosya/Yeni _JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/_Dosya/Yeni _LDAP Sunucu"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,113 +875,113 @@ msgstr "/_Dosya/Yeni _LDAP Sunucu"
 msgid "/_File/---"
 msgstr "/_Dosya/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Dosya/_Düzenle"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Dosya/_Sil"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Dosya/_Kaydet"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Dosya/K_apat"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Dü_zenle/K_opyala"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Yeni _Adres"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Yeni _Grup"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Yeni _Dizin"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 msgid "/_Address/Add _to recipient"
 msgstr "/_Adres/Alı_cılara ekle"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 msgid "/_Address/Add to _Cc"
 msgstr "/_Adres/_Cc satırına ekle"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 msgid "/_Address/Add to _Bcc"
 msgstr "/_Adres/_Bcc satırına ekle"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/_Adres/Dü_zenle"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/A_raçlar"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/A_raçlar/_LDIF dosyasını içe aktar"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 msgid "/_Tools/Import _CSV file"
 msgstr "/A_raçlar/_CSV dosyasını içe aktar"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Yeni _Adres"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Yeni _Grup"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -993,96 +993,96 @@ msgstr "/Yeni _Dizin"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/_Sil"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr "/Alıcıya e_kleyin"
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr "/Cc satı_rına ekleyin"
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr "Bcc satırına ekleyi_n"
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 msgid "/_Copy"
 msgstr "/_Kopyala"
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 msgid "/_Paste"
 msgstr "/_Yapıştır"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adres defteri"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Dizin"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "E-posta adresi"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "Ara:"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Ekle"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Ara"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 msgid "_Close"
 msgstr "_Kapat"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Adres(ler)i sil"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Adres(ler) silinsin mi?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1091,36 +1091,36 @@ msgstr ""
 "`%s' dizinini VE içindeki tüm adresleri silmek istiyor musunuz?\n"
 "Eğer yalnız dizini silerseniz, içindeki adresler bir üst dizine taşınacaktır."
 
-#: src/addressbook.c:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Dizin sil"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "Yalnız _dizin"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "Dizin ve _adresler"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "`%s' silinsin mi?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Yeni kullanıcı, indeks dosyası kaydedilemedi."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Yeni kullanıcı, adres defteri dosyaları kaydedilemedi."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Eski adres defteri başarıyla çevrildi."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1128,7 +1128,7 @@ msgstr ""
 "Eski adres defteri çevrildi,\n"
 "yeni adres indeks dosyası kaydedilemedi"
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1136,7 +1136,7 @@ msgstr ""
 "Adres defteri çevrilemedi,\n"
 "ancak boş bir adres defteri dosyası oluşturuldu."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1144,7 +1144,7 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1152,15 +1152,15 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 msgid "Address book conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 msgid "Address book conversion"
 msgstr "Adres defteri çevrimi"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1171,75 +1171,75 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 msgid "Address Book Error"
 msgstr "Adres Defteri Hatası"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Adres indeksi okunamadı"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 msgid "Address Book Conversion Error"
 msgstr "Adres Defteri Çevrim Hatası"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 msgid "Address Book Conversion"
 msgstr "Adres Defteri Çevrimi"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Arayüz"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adres Defteri"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Kişi"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "İleti Adresi"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Grup"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "LDAP Sunucu"
 
@@ -1260,6 +1260,7 @@ msgid "Warning"
 msgstr "Uyarı"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Hata"
 
@@ -7775,3 +7776,17 @@ msgstr "Tüm Sylpheed eklentileri zaten son sürümlerinde."
 #: src/update_check.c:688
 msgid "Couldn't get the version information of plug-ins."
 msgstr "Eklentilerin sürüm bilgisi alınamadı."
+
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Ek dosyası olan"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 1c6c3174..c4fbd9cc 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+0900\n"
 "PO-Revision-Date: 2011-01-28 01:43+0300\n"
 "Last-Translator: Vladimir Smolyar <v_2e@ukr.net>\n"
 "Language-Team: Ukrainian\n"
@@ -694,7 +694,7 @@ msgstr ""
 "Порядок перевірки нових листів. Позначте в колонці \"G\"\n"
 "записи, які перевірятимуться через \"Отримати всі\"."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -835,7 +835,7 @@ msgstr "Додання адреси до Книги"
 msgid "Address"
 msgstr "Адреса"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Нотатки"
@@ -844,32 +844,32 @@ msgstr "Нотатки"
 msgid "Select Address Book Folder"
 msgstr "Обeріть теку Адресної Книги"
 
-#: src/addressadd.c:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 msgid "Auto-registered address"
 msgstr "Адреса, зареєстрована автоматично"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/Файл/Нова Книга"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/Файл/Нова vCard"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новий JPilot"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новий сервер LDAP"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,113 +877,113 @@ msgstr "/Файл/Новий сервер LDAP"
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/Файл/Редагувати"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/Файл/Видалити"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/Файл/Зберегти"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Редагувати"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Редагувати/Копіювати"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Редагувати/Вставити"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/Адреса"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/Адреса/Нова адреса"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/Адреса/Нова група"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/Адреса/Нова тека"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/Адреса/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 msgid "/_Address/Add _to recipient"
 msgstr "/Адреса/Додати до поля \"Кому\""
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 msgid "/_Address/Add to _Cc"
 msgstr "/Адреса/Додати до поля \"Копія\""
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 msgid "/_Address/Add to _Bcc"
 msgstr "/Адреса/Додати до поля \"Приховано\""
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/Адреса/Редагувати"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Інструменти"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Інструменти/Імпортувати файл LDIF"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 msgid "/_Tools/Import _CSV file"
 msgstr "/Інструменти/Імпортувати файл CSV"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Нова адреса"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/Нова група"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Нова тека"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -995,96 +995,96 @@ msgstr "/Нова тека"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/Видалити"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr "/Додати до поля \"Кому\""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr "/Додати до поля \"Копія\""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr "/Додати до поля \"Приховано\""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 msgid "/_Copy"
 msgstr "/Копіювати"
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 msgid "/_Paste"
 msgstr "/Вставити"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr " Адресна книга "
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr " Теки "
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "Пошук:"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Приховано:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Додати"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Пошук"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 msgid "_Close"
 msgstr "Закрити"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Видалити адресу(и)"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Дійсно видалити адресу(и)?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1093,36 +1093,36 @@ msgstr ""
 "Чи бажаєте видалити теку ТА усі адреси в \"%s\" ? \n"
 "Якщо видалити тільки теку, адреси буде перенесено в охоплюючу теку."
 
-#: src/addressbook.c:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Видалення теки"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "Тільки теку"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "Теку та адреси"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Дійсно видалити \"%s\" ?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "Новий користувач, не вдалося зберегти файл покажчика."
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "Новий користувач, не вдалося зберегти адресну книгу."
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Стару адресну книгу успішно конвертовано."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1130,7 +1130,7 @@ msgstr ""
 "Стару адресну книгу конвертовано,\n"
 "не вдалося зберегти новий покажчик адрес"
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1138,7 +1138,7 @@ msgstr ""
 "Не вдалося конвертувати адресну книгу,\n"
 "але створено нову (порожню)."
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1146,7 +1146,7 @@ msgstr ""
 "Не вдалося ані конвертувати адресну книгу,\n"
 "ані створити нові файли адресної книги."
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1154,15 +1154,15 @@ msgstr ""
 "Не вдалося ані конвертувати адресну книгу,\n"
 "ані створити нові файли адресної книги."
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 msgid "Address book conversion error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 msgid "Address book conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1173,72 +1173,72 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 msgid "Address Book Error"
 msgstr "Помилка в адресній книзі"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Стару адресну книгу конвертовано, не вдалося зберегти новий файл покажчика "
 "адрес"
 
-#: src/addressbook.c:3406
+#: src/addressbook.c:3462
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Не вдалося конвертувати адресну книгу, але створено нову (порожню)."
 
-#: src/addressbook.c:3412
+#: src/addressbook.c:3468
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Не вдалося ані конвертувати адресну книгу, ані створити нову."
 
-#: src/addressbook.c:3418
+#: src/addressbook.c:3474
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Не вдалося ані конвертувати адресну книгу, ані створити нову."
 
-#: src/addressbook.c:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Не вдалося прочитати покажчик адрес"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 msgid "Address Book Conversion Error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 msgid "Address Book Conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Інтерфейс"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Особа"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Група"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1259,6 +1259,7 @@ msgid "Warning"
 msgstr "Попередження"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Помилка"
 
@@ -7777,6 +7778,20 @@ msgstr "Усі плагіни Sylpheed вже останньої версії."
 msgid "Couldn't get the version information of plug-ins."
 msgstr "Не вдалося отримати інформацію про версію плагінів."
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Мають вкладення"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "Тип MIME"
 
diff --git a/po/vi.po b/po/vi.po
index 65f4c9bc..72608c1f 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +677,7 @@ 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:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -818,7 +818,7 @@ msgstr "Thêm địa chỉ vào sổ"
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Các mẫu đã đăng kí"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Tập tin"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/_Tập tin/_Sổ mới"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/_Tập tin/_vCard mới"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/_Tập tin/_JPilot mới"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 msgid "/_File/New _LDAP Server"
 msgstr "/_Tập tin/_Máy chủ LDAP mới"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,117 +861,117 @@ msgstr "/_Tập tin/_Máy chủ LDAP mới"
 msgid "/_File/---"
 msgstr "/_Tập tin/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/_Tập tin/Soạ_n"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/_Tập tin/_Xoá"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/_Tập tin/_Lưu"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Tập tin/Đón_g"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Soạn"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Soạn/_Sao chép"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Soạn/_Dán"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/Đị_a chỉ"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/Đị_a chỉ/Địa chỉ _mới"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/Đị_a chỉ/_Nhóm mới"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/Đị_a chỉ/_Thư mục mới"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/Đị_a chỉ/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/Đị_a chỉ/_Xoá"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/Đị_a chỉ/_Soạn"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/Đị_a chỉ/_Soạn"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/Đị_a chỉ/_Soạn"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/Đị_a chỉ/_Xoá"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Công cụ"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hỗ trợ"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 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:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/Địa chỉ _mới"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/_Nhóm mới"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/Thư _mục mới"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -983,100 +983,100 @@ msgstr "/Thư _mục mới"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/_Xoá"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Sao chép"
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Soạn/_Dán"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Sổ địa chỉ"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "Thư mục"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 msgid "Search:"
 msgstr "Tìm kiếm:"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "Thêm"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Tìm kiếm:"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 #, fuzzy
 msgid "_Close"
 msgstr "Màu sắc"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "Xoá địa chỉ"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "Thực sự muốn xoá (các) địa chỉ này?"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1085,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:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "Xoá thư mục"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "_Chỉ thư mục"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "Thư mục và địa c_hỉ"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Thực sự muốn xoá `%s' ?"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 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:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 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:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "Sổ địa chỉ cũ đã được chuyển đổi thành công."
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1122,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:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1130,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:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1138,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:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1146,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:3285
+#: src/addressbook.c:3341
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1164,78 +1164,78 @@ msgid ""
 "%s%c%s"
 msgstr "Không thể đọc mục lục địa chỉ"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Lỗi sổ địa chỉ"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 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:3406
+#: src/addressbook.c:3462
 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:3412
+#: src/addressbook.c:3468
 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:3418
+#: src/addressbook.c:3474
 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:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "Không thể đọc mục lục địa chỉ"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "Giao diện"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Sổ địa chỉ"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "Cá nhân"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "Nhóm"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "Máy chủ LDAP"
 
@@ -1256,6 +1256,7 @@ msgid "Warning"
 msgstr "Cảnh báo"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "Lỗi"
 
@@ -7911,6 +7912,20 @@ msgstr "một tiến trình Sylpheed khác đang chạy.\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Có đính kèm"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "Kiểu MIME"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 016c39b2..a1509e61 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +687,7 @@ msgstr ""
 "按照该顺序检查新邮件。选中“G”列的复选框，在“全部接收”\n"
 "时会检查新邮件。"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -830,7 +830,7 @@ msgstr "将地址添加到地址簿"
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "已注册的规则"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/文件(_F)/新建地址簿(_B)"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/文件(_F)/新建 vCard(_V)"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/文件(_F)/新建 JPilot(_J)"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,117 +874,117 @@ msgstr "/文件(_F)/新建服务器(_S)"
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/文件(_F)/编辑(_E)"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/文件(_F)/删除(_D)"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新建地址(_A)"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新建组(_G)"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新建文件夹(_F)"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/地址(_A)/编辑(_E)"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/地址(_A)/编辑(_E)"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/新建地址(_A)"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/新建组(_G)"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -996,101 +996,101 @@ msgstr "/新建文件夹(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 #, fuzzy
 msgid "/_Copy"
 msgstr "/复制(_C)..."
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 #, fuzzy
 msgid "/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "地址簿"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "文件夹"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "搜索"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "密件抄送："
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "添加"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "搜索"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 #, fuzzy
 msgid "_Close"
 msgstr "关闭"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "删除地址"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "真的要删除地址？"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1099,38 +1099,38 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "删除文件夹"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "_Folder only"
 msgstr "仅文件夹"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "文件夹和地址"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "真的要删除“%s”？"
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "新建用户，无法保存索引文件。"
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "新建用户，无法保存地址簿文件。"
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr "成功转换旧的地址簿。"
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1138,7 +1138,7 @@ msgstr ""
 "已经转换旧的地址簿，\n"
 "无法保存新的地址索引文件"
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1146,7 +1146,7 @@ msgstr ""
 "无法转换地址簿，\n"
 "但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1154,23 +1154,23 @@ msgstr ""
 "无法转换地址簿，\n"
 "无法创建新的地址簿文件。"
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 #, fuzzy
 msgid "Address book conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1178,73 +1178,73 @@ msgid ""
 "%s%c%s"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 #, fuzzy
 msgid "Address Book Error"
 msgstr "地址簿错误"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 msgid "Old address book converted, could not save new address index file"
 msgstr "已经转换旧的地址簿，无法保存新的地址索引文件"
 
-#: src/addressbook.c:3406
+#: src/addressbook.c:3462
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "无法转换地址簿，但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:3412
+#: src/addressbook.c:3468
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "无法转换地址簿，无法创建新的地址簿文件。"
 
-#: src/addressbook.c:3418
+#: src/addressbook.c:3474
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "地址簿"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "个人"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "群组"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 
@@ -1265,6 +1265,7 @@ msgid "Warning"
 msgstr "警告"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "错误"
 
@@ -7968,6 +7969,20 @@ msgstr "另外一个 Sylpheed 正在运行。\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "附件"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME类型"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 67e9ca74..d89d85af 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: 2011-01-25 11:47+0900\n"
+"POT-Creation-Date: 2011-02-07 17:20+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,7 +692,7 @@ msgstr ""
 "檢查新郵件時將會依照下面的順序。您可以勾選 G 欄位中的方塊，\n"
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:766
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
 #: 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
@@ -833,7 +833,7 @@ msgstr "將地址加入通訊錄"
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:198 src/addressbook.c:809 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:826 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:313 src/addressbook.c:1045 src/addressbook.c:3489
+#: src/addressadd.c:313 src/addressbook.c:1065 src/addressbook.c:3545
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "已紀錄之郵件樣板符號"
 
-#: src/addressbook.c:398 src/compose.c:578 src/mainwindow.c:550
+#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/檔案(_F)"
 
-#: src/addressbook.c:399
+#: src/addressbook.c:406
 msgid "/_File/New _Book"
 msgstr "/檔案(_F)/新增通訊錄(_B)"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:407
 msgid "/_File/New _vCard"
 msgstr "/檔案(_F)/新增vCard(_V)"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:409
 msgid "/_File/New _JPilot"
 msgstr "/檔案(_F)/新增J-Pilot(_J)"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:412
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
-#: src/addressbook.c:407 src/addressbook.c:410 src/compose.c:583
+#: src/addressbook.c:414 src/addressbook.c:417 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,117 +877,117 @@ msgstr "/檔案(_F)/新增伺服器(_S)"
 msgid "/_File/---"
 msgstr "/檔案(_F)/---"
 
-#: src/addressbook.c:408
+#: src/addressbook.c:415
 msgid "/_File/_Edit"
 msgstr "/檔案(_F)/編輯(_E)"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:416
 msgid "/_File/_Delete"
 msgstr "/檔案(_F)/刪除(_D)"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:418
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:412 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
-#: src/addressbook.c:414 src/addressbook.c:461 src/addressbook.c:478
+#: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
 #: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
-#: src/addressbook.c:415 src/compose.c:602 src/mainwindow.c:587
+#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
 
-#: src/addressbook.c:416 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:425
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:426
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新增地址(_A)"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:427
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新增群組(_G)"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:428
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新增資料夾(_F)"
 
-#: src/addressbook.c:422 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:436
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430
 #, fuzzy
 msgid "/_Address/Add _to recipient"
 msgstr "/地址(_A)/刪除(_D)"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:432
 #, fuzzy
 msgid "/_Address/Add to _Cc"
 msgstr "/地址(_A)/編輯(_E)"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:434
 #, fuzzy
 msgid "/_Address/Add to _Bcc"
 msgstr "/地址(_A)/編輯(_E)"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:437
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/編輯(_E)"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:438
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/刪除(_D)"
 
-#: src/addressbook.c:433 src/compose.c:713 src/mainwindow.c:834
+#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:434
+#: src/addressbook.c:441
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:435
+#: src/addressbook.c:442
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:437 src/compose.c:737 src/mainwindow.c:892
+#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:438 src/compose.c:738 src/mainwindow.c:912
+#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
 
-#: src/addressbook.c:457 src/addressbook.c:467
+#: src/addressbook.c:464 src/addressbook.c:474
 msgid "/New _Address"
 msgstr "/新增地址(_A)"
 
-#: src/addressbook.c:458 src/addressbook.c:468
+#: src/addressbook.c:465 src/addressbook.c:475
 msgid "/New _Group"
 msgstr "/新增群組(_G)"
 
-#: src/addressbook.c:459 src/addressbook.c:469
+#: src/addressbook.c:466 src/addressbook.c:476
 msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
-#: 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/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
+#: src/addressbook.c:487 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
@@ -999,101 +999,101 @@ msgstr "/新增資料夾(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:462 src/addressbook.c:479 src/summaryview.c:457
+#: src/addressbook.c:469 src/addressbook.c:486 src/summaryview.c:457
 msgid "/_Delete"
 msgstr "/刪除(_D)"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:478
 msgid "/Add _to recipient"
 msgstr ""
 
-#: src/addressbook.c:473
+#: src/addressbook.c:480
 msgid "/Add t_o Cc"
 msgstr ""
 
-#: src/addressbook.c:475
+#: src/addressbook.c:482
 msgid "/Add to _Bcc"
 msgstr ""
 
-#: src/addressbook.c:481
+#: src/addressbook.c:488
 #, fuzzy
 msgid "/_Copy"
 msgstr "/複製(_C)..."
 
-#: src/addressbook.c:482
+#: src/addressbook.c:489
 #, fuzzy
 msgid "/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/addressbook.c:607 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
+#: src/addressbook.c:614 src/prefs_common_dialog.c:2588 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "通訊錄"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:681 src/addressbook.c:4192 src/folderview.c:395
+#: src/addressbook.c:687 src/addressbook.c:4248 src/folderview.c:395
 #: src/prefs_account_dialog.c:1989 src/query_search.c:401
 msgid "Folder"
 msgstr "資料夾"
 
-#: src/addressbook.c:795
+#: src/addressbook.c:808
 msgid "E-Mail address"
 msgstr "E-Mail 地址"
 
-#: src/addressbook.c:846 src/quick_search.c:128
+#: src/addressbook.c:866 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "尋找"
 
-#: src/addressbook.c:884 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 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:888 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 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:892 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "密件副本"
 
 #. Buttons
-#: src/addressbook.c:913 src/addressbook.c:2273 src/editaddress.c:719
+#: src/addressbook.c:933 src/addressbook.c:2329 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:916 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:936 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:1604
 msgid "Add"
 msgstr "新增"
 
-#: src/addressbook.c:919 src/prefs_toolbar.c:80
+#: src/addressbook.c:939 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "尋找"
 
-#: src/addressbook.c:922
+#: src/addressbook.c:942
 #, fuzzy
 msgid "_Close"
 msgstr "顏色"
 
 #. Confirm deletion
-#: src/addressbook.c:1118
+#: src/addressbook.c:1138
 msgid "Delete address(es)"
 msgstr "刪除通訊紀錄"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1139
 msgid "Really delete the address(es)?"
 msgstr "您確定要刪除這些紀錄嗎？"
 
-#: src/addressbook.c:2264
+#: src/addressbook.c:2320
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1102,38 +1102,38 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:2267 src/folderview.c:2695
+#: src/addressbook.c:2323 src/folderview.c:2695
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "_Folder only"
 msgstr "只刪除資料夾(_F)"
 
-#: src/addressbook.c:2267
+#: src/addressbook.c:2323
 msgid "Folder and _addresses"
 msgstr "全部刪除(_A)"
 
-#: src/addressbook.c:2272
+#: src/addressbook.c:2328
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "您確定要刪除「%s」? "
 
-#: src/addressbook.c:3235 src/addressbook.c:3373
+#: src/addressbook.c:3291 src/addressbook.c:3429
 msgid "New user, could not save index file."
 msgstr "無法儲存索引檔案。"
 
-#: src/addressbook.c:3239 src/addressbook.c:3377
+#: src/addressbook.c:3295 src/addressbook.c:3433
 msgid "New user, could not save address book files."
 msgstr "無法儲存通訊錄檔案。"
 
-#: src/addressbook.c:3249 src/addressbook.c:3387
+#: src/addressbook.c:3305 src/addressbook.c:3443
 msgid "Old address book converted successfully."
 msgstr ""
 "轉換舊通訊錄格式完成。\n"
 "您可以開始使用新的通訊錄。"
 
-#: src/addressbook.c:3254
+#: src/addressbook.c:3310
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1141,7 +1141,7 @@ msgstr ""
 "舊通訊錄格式已轉換，\n"
 "但無法儲存新的索引檔。"
 
-#: src/addressbook.c:3267
+#: src/addressbook.c:3323
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1149,7 +1149,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "但已產生空的新通訊錄。"
 
-#: src/addressbook.c:3273
+#: src/addressbook.c:3329
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1157,7 +1157,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:3278
+#: src/addressbook.c:3334
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1165,17 +1165,17 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:3285
+#: src/addressbook.c:3341
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:3289
+#: src/addressbook.c:3345
 #, fuzzy
 msgid "Address book conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:3328
+#: src/addressbook.c:3384
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1183,73 +1183,73 @@ msgid ""
 "%s%c%s"
 msgstr "無法讀取通訊錄索引"
 
-#: src/addressbook.c:3331
+#: src/addressbook.c:3387
 #, fuzzy
 msgid "Address Book Error"
 msgstr "通訊錄發生錯誤"
 
-#: src/addressbook.c:3392
+#: src/addressbook.c:3448
 msgid "Old address book converted, could not save new address index file"
 msgstr "舊通訊錄格式已轉換，但無法儲存新的索引檔。"
 
-#: src/addressbook.c:3406
+#: src/addressbook.c:3462
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "無法轉換通訊錄格式，但已產生空的新通訊錄。"
 
-#: src/addressbook.c:3412
+#: src/addressbook.c:3468
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:3418
+#: src/addressbook.c:3474
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:3430
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "無法讀取通訊錄索引"
 
-#: src/addressbook.c:3436
+#: src/addressbook.c:3492
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:3442
+#: src/addressbook.c:3498
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:4122 src/prefs_common_dialog.c:2387
+#: src/addressbook.c:4178 src/prefs_common_dialog.c:2387
 msgid "Interface"
 msgstr "介面"
 
-#: src/addressbook.c:4136 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4192 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4206
 msgid "Person"
 msgstr "人名"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4220
 msgid "EMail Address"
 msgstr "電子郵件信箱"
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4234
 msgid "Group"
 msgstr "群組"
 
-#: src/addressbook.c:4206
+#: src/addressbook.c:4262
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4220 src/addressbook.c:4234
+#: src/addressbook.c:4276 src/addressbook.c:4290
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4248
+#: src/addressbook.c:4304
 msgid "LDAP Server"
 msgstr "LDAP 伺服器"
 
@@ -1270,6 +1270,7 @@ msgid "Warning"
 msgstr "警告"
 
 #: src/alertpanel.c:168 src/inc.c:775
+#: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "錯誤"
 
@@ -7928,6 +7929,20 @@ msgstr "已經有 Sylpheed 程式正在執行中。\n"
 msgid "Couldn't get the version information of plug-ins."
 msgstr ""
 
+#: plugin/attachment_tool/attachment_tool.c:50
+#: plugin/attachment_tool/attachment_tool.c:271
+#, fuzzy
+msgid "Remove attachments"
+msgstr "附加檔案"
+
+#: plugin/attachment_tool/attachment_tool.c:263
+msgid "This tool is available on local folders only."
+msgstr ""
+
+#: plugin/attachment_tool/attachment_tool.c:272
+msgid "Do you really remove attached files from the selected messages?"
+msgstr ""
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME 型態"