updated po files.

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

29 files changed, 4304 insertions, 4359 deletions

diff --git a/po/bg.po b/po/bg.po
index 54baee41..e2ffbc37 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+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"
@@ -678,12 +678,11 @@ msgstr ""
 "За нови съобщения ще бъде проверявано в този ред. Отметнете кутийките\n"
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Име"
 
@@ -817,13 +816,12 @@ msgstr "Потребителски аргумент на действието"
 msgid "Add Address to Book"
 msgstr "Добавяне на Адреса към Книгата"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Забележки"
 
@@ -831,29 +829,29 @@ msgstr "Забележки"
 msgid "Select Address Book Folder"
 msgstr "Изберете папка от адресната книга"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Файл"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Файл/Нова _Книга"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Файл/Нова _vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Файл/Нов _JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Файл/Нов _Сървър"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -861,96 +859,96 @@ msgstr "/_Файл/Нов _Сървър"
 msgid "/_File/---"
 msgstr "/_Файл/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Файл/_Редактиране"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Файл/_Изтриване"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_файл/_Запазване"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Редактиране"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Адрес"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Адрес/Нов _Адрес"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Адрес/Нова _Група"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Адрес/Нова _Папка"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Адрес/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Адрес/_Редактиране"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Инструменти"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Нов _Адрес"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Нова _Група"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -962,76 +960,81 @@ msgstr "/Нова _Папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Изтриване"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Копиране..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Име:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "До:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Bcc:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Изтриване"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Добавяне"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Справка"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "До:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Затваряне"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Изтриване на адрес(ите)"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Желаете ли изтриване на адрес(ите)?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1041,38 +1044,38 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "_Folder only"
 msgstr "Само папка"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Папка и Адреси"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Желаете ли изтриване на `%s' ?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Нов потребител, не можа да ce запази индексния файл."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Нов потребител, не можа да се запази файла на адресната книга"
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Старата адресна книга конвертирана успешно"
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1080,7 +1083,7 @@ msgstr ""
 "Старата адресна книга конвертирана,\n"
 "не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1088,7 +1091,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга,\n"
 "създадени са нови празни файлове на адресната книга."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1096,7 +1099,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1104,91 +1107,91 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Грешка на адресната книга"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Не може да се прочете адресния индекс"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старата адресна книга конвертирана, не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2597
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, създадени са нови празни файлове "
 "на адресната книга."
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2603
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, неуспя създаване на нови файлове "
 "на адресната книга."
 
-#: src/addressbook.c:2583
+#: src/addressbook.c:2609
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга и създаване на нови файлове на "
 "адресната книга."
 
-#: src/addressbook.c:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Лице"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "EMail Адрес"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "LDAP сървър"
 
@@ -1850,83 +1853,77 @@ msgstr "Заменяне"
 msgid "_Insert"
 msgstr "Вмъкване"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Редактиране на адрес"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Добавяне на Ново Лице"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Редактиране детайли за лице"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Трябва да бъде попълнен E-Mail адрес."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Име и Стойност трябва да бъдат попълнени."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Редактиране на данни за лице"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Екранно Име"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Фамилия"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Име"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Прякор"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "E-Mail адрес"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Псевдоним"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Местене нагоре"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Местене надолу"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Променяне"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Изчистване"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Стойност"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Основни данни"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Атрибути на потребител"
 
@@ -1963,56 +1960,58 @@ msgstr "Добавяне на нова Адресна Книга"
 msgid "A Group Name must be supplied."
 msgstr "Име на Група трябва да бъде попълнено."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Редактиране на данни за Група"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Име на Група"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Адреси в групата"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Налични адреси"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Налични адреси"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Адреси в групата"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Местене на E-Mail адреси до или от Група с бутоните със стрелки"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Редактиране на детайли за Група"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Добавяне на Нова Група"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Редактиране на папка"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Въведете новото име на папка:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Въведете име на нова папка:"
 
@@ -5558,14 +5557,6 @@ msgstr "Настройка на показваните заглавки част
 msgid "Available items"
 msgstr "Налични атрибути"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Показани атрибути"
@@ -6977,6 +6968,15 @@ msgstr "Изход"
 msgid "Sylpheed"
 msgstr "Стар Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Редактиране на адрес"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
@@ -7268,9 +7268,6 @@ msgstr "Стар Sylpheed"
 #~ msgid "OK"
 #~ msgstr "ОК"
 
-#~ msgid "Close"
-#~ msgstr "Затваряне"
-
 #~ msgid "Cancel"
 #~ msgstr "Отказ"
 
diff --git a/po/cs.po b/po/cs.po
index 98534f2e..8906dad9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+0900\n"
 "PO-Revision-Date: 2007-02-09 05:34+0100\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -687,12 +687,11 @@ msgstr ""
 "Nové zprávy budou kontrolovány v tomto 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:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Jméno"
 
@@ -824,13 +823,12 @@ msgstr "Argument uživatele pro akci"
 msgid "Add Address to Book"
 msgstr "Přidat adresu do adresáře"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Poznámky"
 
@@ -838,28 +836,28 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku adresáře"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Soubor"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Soubor/Nový _adresář"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Soubor/Nová _vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Soubor/Nový _JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_File/New _LDAP Server"
 msgstr "/_Soubor/Nový server _LDAP"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -867,96 +865,96 @@ msgstr "/_Soubor/Nový server _LDAP"
 msgid "/_File/---"
 msgstr "/_Soubor/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Soubor/Up_ravit"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Soubor/_Smazat"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Soubor/_Uložit"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Soubor/_Zavřít"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Úp_ravy"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/V_ložit"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _adresa"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _skupina"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nová s_ložka"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Adresa/--"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/U_pravit"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovat soubor _LDIF"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Nová _adresa"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Nová skup_ina"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -968,76 +966,81 @@ msgstr "/Nová s_ložka"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Smazat"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/Kopí_rovat..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Úp_ravy/V_ložit"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Adresář"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Jméno:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Příjemce:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Kopie:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Slepá kopie:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Přidat"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Vyhledat"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Příjemce:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Kopie:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Slepá kopie:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Barvy"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Smazat adresy"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Opravdu chcete smazat tyto adresy?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1046,36 +1049,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:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Smazat složku "
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "_Folder only"
 msgstr "Pouze složku"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "Folder and _addresses"
 msgstr "Složku a adresy"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Opravdu smazat \"%s\"?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Nový uživatel, nelze uložit soubor index."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Nový uživatel, nelze uložit soubory s adresářem."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Konverze starého adresáře proběhla úspěšně."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1083,7 +1086,7 @@ msgstr ""
 "Starý adresář převeden,\n"
 "ale nelze uložit nový soubor s indexem."
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1091,7 +1094,7 @@ msgstr ""
 "Konverze·adresáře nemohla být provedena,\n"
 "ale byly vytvořeny nové prázdné soubory adresáře."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1099,7 +1102,7 @@ msgstr ""
 "Nelze provést konverzi adresáře,\n"
 "nelze vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1107,86 +1110,86 @@ msgstr ""
 "Nelze provést konverzi adresáře\n"
 "a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Chyba při konverzi adresáře"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Konverze adresáře"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Chyba v adresáři"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Nelze načíst index adres"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Chyba při konverzi adresáře"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Konverze adresáře"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adresář"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Složka"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1811,83 +1814,77 @@ msgstr "Nahradit"
 msgid "_Insert"
 msgstr "Vložit"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Upravit adresu"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Přidat novou osobu"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Upravit detaily o osobě"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Nebyla zadána e-mailová adresa."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Nebylo zadáno jméno a hodnota."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Upravit data o osobě"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Zobrazené jméno"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Příjmení"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Křestní jméno"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Přezdívka"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "E-mailová adresa"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Alias"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Posunout nahoru"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Posunout dolů"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Změnit"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Vyčistit"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Hodnota"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Základní data"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Atributy uživatele"
 
@@ -1924,57 +1921,59 @@ msgstr "Přidat nový adresář"
 msgid "A Group Name must be supplied."
 msgstr "Musí být zadáno jméno skupiny."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Upravit data o skupině"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Jméno skupiny"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Adresy ve skupině"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Dostupné adresy"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Dostupné adresy"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Adresy ve skupině"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "E-mailové adresy lze přesunovat do a ze skupiny pomocí tlačítek se šipkami"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Upravit detaily o skupině"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Přidat novou skupinu"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Upravit složku"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Zadejte název složky:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Zadejte název nové složky:"
 
@@ -5438,14 +5437,6 @@ msgstr "Zobrazit nastavení položek"
 msgid "Available items"
 msgstr "Dostupné položky"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Zobrazené položky"
@@ -6802,5 +6793,14 @@ msgstr "Ukonči_t"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Upravit adresu"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
diff --git a/po/da.po b/po/da.po
index c3de3b58..50ed9294 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -682,12 +682,11 @@ 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:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Navn"
 
@@ -821,13 +820,12 @@ msgstr "Handlingens bruger parameter"
 msgid "Add Address to Book"
 msgstr "Tilføj adresse i adressebog"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Kommentar"
 
@@ -835,29 +833,29 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Vælg adressebog mappe"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Filer"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Filer/Ny _adressebog"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Filer/Ny _vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Filer/Ny _JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Filer/Ny _server"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -865,96 +863,96 @@ msgstr "/_Filer/Ny _server"
 msgid "/_File/---"
 msgstr "/_Filer/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Filer/_Redigér"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Filer/_Slet"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Filer/_Gem"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Filer/_Luk"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigér"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigér/K_opiere"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Ny _adresse"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Ny _gruppe"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Ny _mappe"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Redigér"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Funktioner"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Ny _adresse"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Ny _gruppe"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -966,76 +964,81 @@ msgstr "/Ny _mappe"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Slet"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopier..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Navn:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Til:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Bcc:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Slet"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Overblik"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Til:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Luk"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Slet adresse(r)"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Virklig slette adresse(r)?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1044,38 +1047,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:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Slet mappe"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ny mappe"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mappe og adresser"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Virklig slette `%s' ?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Ny bruger, kunne ikke gemme index fil."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Ny bruger, kunne ikke gemme adressebogs fil."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Gammel adressebog konverteret."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1083,7 +1086,7 @@ msgstr ""
 "Gammel adressebog konverteret,\n"
 "men kunne ikke gemme index filen"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1091,7 +1094,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "men nye og tomme filer blev oprettet."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1099,7 +1102,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1107,86 +1110,86 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Adressebog fejl"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Kunne ikke læse adressebog"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Brugerflade"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mappe"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1848,83 +1851,77 @@ msgstr "Erstat"
 msgid "_Insert"
 msgstr "Indæst"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Redigér adresse"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Tilføj ny person"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Redigér person detaljer"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "En e-post adresse skan indtastes"
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Et navn og en værdi skal indtastes."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Redigér person data"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Vis navn"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Efternavn"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Fornavn"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Alias"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "E-post adresse"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Alias"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Op"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Ned"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Ændre"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Tøm"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Værdi"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Grund data"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Bruger egenskaber"
 
@@ -1961,56 +1958,58 @@ msgstr "Tilføj ny adressebog"
 msgid "A Group Name must be supplied."
 msgstr " Et gruppe navn skal indtastes."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Redigér gruppendata"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Gruppe navn"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Adresser i gruppe"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Mulige adresser"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Mulige adresser"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Adresser i gruppe"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Flyt e-post adresse fra eller til gruppe med pil tasterne"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Redigér gruppendetaljer"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Tilføj gruppe"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Redigér mappe"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Indtast nyt gruppenavn:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Indtast ny mappes navn:"
 
@@ -5556,14 +5555,6 @@ msgstr "Hoved opsæt"
 msgid "Available items"
 msgstr "Mulige oplysninger"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Viste oplysninger"
@@ -6983,6 +6974,15 @@ msgstr "Afslut"
 msgid "Sylpheed"
 msgstr "Gl. Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Redigér adresse"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
@@ -7279,9 +7279,6 @@ msgstr "Gl. Sylpheed"
 #~ msgid "OK"
 #~ msgstr "OK"
 
-#~ msgid "Close"
-#~ msgstr "Luk"
-
 #~ msgid "Cancel"
 #~ msgstr "Afbryd"
 
diff --git a/po/de.po b/po/de.po
index 0dc96b02..f5a6cdf2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+0900\n"
 "PO-Revision-Date: 2006-12-09 08:22+0100\n"
 "Last-Translator: Fridtjof Busse <fridtjof@fbunet.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -684,12 +684,11 @@ msgstr ""
 "Schalter\n"
 "in der 'G'-Spalte, um den Nachrichten-Empfang bei 'Hole alle' einzuschalten."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Name"
 
@@ -821,13 +820,12 @@ msgstr "Aktionen Benutzer-Parameter"
 msgid "Add Address to Book"
 msgstr "Adresse in Adressbuch einfügen"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Kommentar"
 
@@ -835,28 +833,28 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Wähle Adressbuchablage"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datei"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Datei/Neues Adress_buch"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Datei/Neue _vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Datei/Neues _JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datei/Neuer _LDAP-Server"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -864,96 +862,96 @@ msgstr "/_Datei/Neuer _LDAP-Server"
 msgid "/_File/---"
 msgstr "/_Datei/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Datei/_Bearbeiten"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Datei/_Löschen"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Neue _Adresse"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Neue _Gruppe"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Neue Ab_lage"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Bearbeiten"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Werkzeug"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Neue _Adresse"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Neue _Gruppe"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -965,76 +963,81 @@ msgstr "/Neue Ab_lage"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Löschen"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopieren..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Name:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "An:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Bcc:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Vorschau"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "An:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Farben"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Adresse(n) löschen"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1044,36 +1047,36 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "_Folder only"
 msgstr "Nur Abla_ge"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "Folder and _addresses"
 msgstr "Ablage und _Adressen"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wirklich '%s' löschen ?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Neuer Benutzer, kann Index-Datei nicht speichern."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Neuer Benutzer, kann Adressbuch-Dateien nicht speichern."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Altes Adressbuch erfolgreich konvertiert."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1081,7 +1084,7 @@ msgstr ""
 "Altes Adressbuch konvertiert,\n"
 "kann neue Adress-Index-Datei nicht speichern"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1089,7 +1092,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "aber erstellte neue leere Adressbuch-Dateien."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1097,7 +1100,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "konnte neue Adressbuch-Dateien nicht erstellen."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1105,92 +1108,92 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren\n"
 "und konnte neue Adressbuch-Dateien erstellen."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Adressbuch-Konvertierungs-Fehler"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Adressbuch-Fehler"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Konnte Adress-Index nicht lesen"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Adressbuch-Konvertierungs-Fehler"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Ablage"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "LDAP-Server"
 
@@ -1813,83 +1816,77 @@ msgstr "E_rsetzen"
 msgid "_Insert"
 msgstr "_Einfügen"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Adresse bearbeiten"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Neue Person hinzufügen"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Personen-Details bearbeiten"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Eine E-Mail-Adresse muss angegeben werden."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Ein Name und ein Wert müssen angegeben werden."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Personen-Daten bearbeiten"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Namen anzeigen"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Nachname"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Vorname"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Spitzname"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "E-Mail Adresse"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Alias"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Auf"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Ab"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Ändern"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Leeren"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Wert"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Grunddaten"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Benutzer Eigenschaften"
 
@@ -1926,56 +1923,58 @@ msgstr "Neues Adressbuch hinzufügen"
 msgid "A Group Name must be supplied."
 msgstr "Ein Gruppenname muss angegeben werden."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Gruppendaten bearbeiten"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Gruppenname"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Adressen in Gruppe"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Vorhandene Adressen"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Vorhandene Adressen"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Adressen in Gruppe"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Bewege E-Mail-Adresse zu oder von einer Gruppe mit den Pfeiltasten"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Gruppendetails bearbeiten"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Neue Gruppe hinzufügen"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Ablage bearbeiten"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen der Ablage ein:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Neue Ablage"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen der neuen Ablage ein:"
 
@@ -5458,14 +5457,6 @@ msgstr "Kopfzeilen-Einstellungen"
 msgid "Available items"
 msgstr "Vorhandene Einträge"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Angezeigte Einträge"
@@ -6839,6 +6830,15 @@ msgstr "Be_enden"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Adresse bearbeiten"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
diff --git a/po/el.po b/po/el.po
index c535c0e5..902d3be1 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+0900\n"
 "PO-Revision-Date: 2001-10-08\n"
 "Last-Translator: Michalis Kabrianis <Michalis@bigfoot.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -692,12 +692,11 @@ msgid ""
 "on the `G' column to enable message retrieval by `Get all'."
 msgstr ""
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Όνομα"
 
@@ -826,13 +825,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Προσθήκη διεύθυνσης στο βιβλίο"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Σχόλια"
 
@@ -840,31 +838,31 @@ msgstr "Σχόλια"
 msgid "Select Address Book Folder"
 msgstr "Επιλογή καταλόγου βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Αρχείο"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/Αρχείο/Νέο βιβλίο"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 #, fuzzy
 msgid "/_File/New _vCard"
 msgstr "/Αρχείο/Νέα _V-Card"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 #, fuzzy
 msgid "/_File/New _JPilot"
 msgstr "/Αρχείο/Νέο _J-Pilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/Αρχείο/Νέος εξυπηρετητής"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -872,98 +870,98 @@ msgstr "/Αρχείο/Νέος εξυπηρετητής"
 msgid "/_File/---"
 msgstr "/Αρχείο/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/Αρχείο/Επεξεργασία"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/Αρχείο/Διαγραφή"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/Αρχείο/Αποθήκευση"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Αρχείο/Κλείσιμο"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Επεξεργασία"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Επεξεργασία/Αντιγραφή"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/Επεξεργασία/Επικόλληση"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/Διεύθυνση"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/Διεύθυνση/Νέα διεύθυνση"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/Διεύθυνση/Νέα ομάδα"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/Διεύθυνση/Νέος κατάλογος"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/Διεύθυνση/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/Διεύθυνση/Επεξεργασία"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/Διεύθυνση/Διαγραφή"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 #, fuzzy
 msgid "/_Tools"
 msgstr "/Εργαλεία"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 #, fuzzy
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Αρχείο/Εισαγωγή αρχείου mbox..."
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Βοήθεια"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Βοήθεια/Σχετικά"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Νέα διεύθυνση"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Νέα ομάδα"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Νέος κατάλογος"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -975,76 +973,81 @@ msgstr "/Νέος κατάλογος"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/Διαγραφή"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/Αντιγραφή..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Επεξεργασία/Επικόλληση"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Όνομα:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Προς:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Κοινοποίηση:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr ""
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Αναζήτηση"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Προς:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Κοινοποίηση:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr ""
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Κλείσιμο"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Διαγραφή διεύθυνσης (διευθύνσεων)"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Σίγουρα να διαγράψω την (τις) διεύθυνση (διευθύνσεις);"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1054,38 +1057,38 @@ msgstr ""
 "Αν διαγράφετε τον κατάλογο μόνο, οι διευθύνσεις θα μετακινηθούν στον από "
 "πάνω κατάλογο"
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Διαγραφή καταλόγου"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "_Folder only"
 msgstr "Κατάλογος μόνο"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Κατάλογος και διευθύνσεις"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Σίγουρα να διαγραφεί το `%s' ;"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Νέος χρήστης, δεν μπόρεσα να σώσω το αρχείο δείκτη."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Νέος χρήστης, δεν μπόρεσα να σώσω τα αρχεία του βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1093,7 +1096,7 @@ msgstr ""
 "Το παλιό βιβλίο διευθύνσεων μετατράπηκε,\n"
 "δεν μπόρεσα να σώσω το νέο αρχείο δείκτη διευθύνσεων"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1101,7 +1104,7 @@ msgstr ""
 "Δεν μπόρεσα να μετατρέψω το βιβλίο διευθύνσεων,\n"
 "αλλά δημιούργησα νέα άδεια αρχεία βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1109,7 +1112,7 @@ msgstr ""
 "Δεν μπόρεσα να μετατρέψω το βιβλίο διευθύνσεων,\n"
 "δεν μπόρεσα να δημιουργήσω νέα αρχεία βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1117,86 +1120,86 @@ msgstr ""
 "Δεν μπόρεσα να μετατρέψω το βιβλίο διευθύνσεων,\n"
 "και δεν μπόρεσα να δημιουργήσω νέα αρχεία βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Σφάλμα μετατροπής βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Μετατροπή βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Σφάλμα βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Δεν μπόρεσα να διαβάσω το δείκτη της διεύθυνσης"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2597
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2603
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 
-#: src/addressbook.c:2583
+#: src/addressbook.c:2609
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 
-#: src/addressbook.c:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Σφάλμα μετατροπής βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Μετατροπή βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Βιβλίο διευθύνσεων"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Άτομο"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "ΝέαΟμάδα"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Κατάλογος"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 #, fuzzy
 msgid "vCard"
 msgstr "V-Card"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 #, fuzzy
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "Εξυπηρέτης LDAP"
 
@@ -1871,84 +1874,77 @@ msgstr "Απάντηση"
 msgid "_Insert"
 msgstr "Εισαγωγή"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-#, fuzzy
-msgid "Edit address"
-msgstr "Επεξεργασία βιβλίου διευθύνσεων"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Προσθήκη νέου ατόμου"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Επεξεργασία λεπτομερειών ατόμου"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Πρέπει να δοθεί μία διεύθυνση mail."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Πρέπει να δοθεί ένα όνομα και μία τιμή."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Επεξεργασία στοιχείων ατόμου"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Εμφανιζόμενο όνομα"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Επίθετο"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Όνομα"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Παρωνύμιο"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Ψευδώνυμο"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Μετακίνηση Πάνω"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Μετακίνηση Κάτω"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Τροποποίηση"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Εκκαθάριση"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Τιμή"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Βασικά Στοιχεία"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr ""
 
@@ -1985,58 +1981,60 @@ msgstr "Προσθήκη νέου βιβλίου διευθύνσεων"
 msgid "A Group Name must be supplied."
 msgstr "Πρέπει να δοθεί ένα όνομα ομάδας."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Επεξεργασία στοιχείων ομάδας"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Όνομα ομάδας"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Διευθύνσεις στην ομάδα"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Διαθέσιμες διευθύνσεις"
 
-#: src/editgroup.c:323
-msgid " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
 msgstr ""
 
-#: src/editgroup.c:350
-msgid " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
 msgstr ""
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Διαθέσιμες διευθύνσεις"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Διευθύνσεις στην ομάδα"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Μετακίνηση των διευθύνσεων E-Mail προς ή από ομάδες με τα κουμπιά με τα "
 "βελάκια"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Επεξεργασία λεπτομερειών ομάδας"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Προσθήκη Νέας Ομάδας"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Επεξεργασία καταλόγου"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Εισάγετε το νέο όνομα του καταλόγου:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Νέος κατάλογος"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Εισάγετε το όνομα του νέου καταλόγου:"
 
@@ -5687,14 +5685,6 @@ msgstr "Ορισμός εμφάνισης κεφαλίδας"
 msgid "Available items"
 msgstr "Διαθέσιμες διευθύνσεις"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr ""
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr ""
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 #, fuzzy
 msgid "Displayed items"
@@ -7147,6 +7137,10 @@ msgstr "Έξοδος"
 msgid "Sylpheed"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Edit address"
+#~ msgstr "Επεξεργασία βιβλίου διευθύνσεων"
+
 #~ msgid "#"
 #~ msgstr "αρ."
 
@@ -7371,9 +7365,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "OK"
 
-#~ msgid "Close"
-#~ msgstr "Κλείσιμο"
-
 #~ msgid "Cancel"
 #~ msgstr "Ακύρωση"
 
diff --git a/po/es.po b/po/es.po
index c1865be4..50aba7a4 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+0900\n"
 "PO-Revision-Date: 2006-12-02 13:12+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -682,12 +682,11 @@ 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:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Nombre"
 
@@ -819,13 +818,12 @@ msgstr "Parámetro de usuario de la acción"
 msgid "Add Address to Book"
 msgstr "Añadir dirección a la agenda"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Dirección"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Notas"
 
@@ -833,28 +831,28 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichero"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Fichero/Nueva _agenda"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Fichero/Nueva _vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Fichero/Nuevo _JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichero/Nuevo servidor _LDAP"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -862,96 +860,96 @@ msgstr "/_Fichero/Nuevo servidor _LDAP"
 msgid "/_File/---"
 msgstr "/_Fichero/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Fichero/_Editar"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Fichero/_Borrar"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Dirección"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Dirección/Nueva _dirección"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Dirección/Nuevo _grupo"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Dirección/Nueva _carpeta"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Dirección/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Dirección/_Editar"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Nueva _dirección"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Nuevo _grupo"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -963,76 +961,81 @@ msgstr "/Nueva _carpeta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Copiar..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nombre:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Para:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Bcc:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Añadir"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Buscar"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Para:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Colores"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1041,36 +1044,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:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "_Folder only"
 msgstr "Sólo la _carpeta"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "Folder and _addresses"
 msgstr "La carpeta y las _direcciones"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente «%s»?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se pudo guardar el fichero índice."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pudo guardar los ficheros de direcciones"
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1078,7 +1081,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se pudo guardar el nuevo fichero índice"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1086,7 +1089,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1094,7 +1097,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "no se pudieron crear los ficheros para la nueva."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1102,92 +1105,92 @@ msgstr ""
 "No se pudo convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para una nueva."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "No se pudo leer el índice de direcciones"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "Dirección de correo"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1807,83 +1810,77 @@ msgstr "_Reemplazar"
 msgid "_Insert"
 msgstr "_Insertar"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Editar dirección"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Añadir una persona nueva"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Editar detalles personales"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Debe especificarse una dirección de correo."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Debe especificarse un nombre y un valor"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Editar datos personales"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Nombre"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Apodo"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "Dirección de correo"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Alias"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Arriba"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Abajo"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Modificar"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Valor"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Datos básicos"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Atributos del usuario"
 
@@ -1920,56 +1917,58 @@ msgstr "Añadir nueva agenda"
 msgid "A Group Name must be supplied."
 msgstr "Debe proporcionar un nombre de grupo"
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Editar datos del grupo"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Nombre de grupo"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Direcciones en el grupo"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Direcciones disponibles"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Direcciones disponibles"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Direcciones en el grupo"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Mover las direcciones de correo desde/hacia el grupo con las flechas"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Editar detalles del grupo"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Añadir nuevo grupo"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Editar carpeta"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -5448,14 +5447,6 @@ msgstr "Ver propiedades de cabeceras"
 msgid "Available items"
 msgstr "Elementos disponibles"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Elementos visibles"
@@ -6810,6 +6801,15 @@ msgstr "_Salir"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Editar dirección"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "Nº"
 
diff --git a/po/et.po b/po/et.po
index 24ec5f05..d7960422 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+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"
@@ -686,12 +686,11 @@ 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:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Nimi"
 
@@ -823,13 +822,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Lisa aadress raamatusse"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Aadress"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Märkused"
 
@@ -837,29 +835,29 @@ msgstr "Märkused"
 msgid "Select Address Book Folder"
 msgstr "Vali aadressiraamatu kaust"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fail"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Fail/Uus raamat"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Fail/Uus _V-Kaart"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Fail/Uus _JPiloot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fail/Uus _Server"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -867,96 +865,96 @@ msgstr "/_Fail/Uus _Server"
 msgid "/_File/---"
 msgstr "/_Fail/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Fail/R_edigeeri"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Fail/Kustuta"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Fail/_Salvesta"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fail/Sul_ge"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/R_edaktor"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Aadress"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Aadress/Uus _Aadress"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Aadress/Uus _Grupp"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Aadress/Uus Kaust"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Aadress/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Aadress/R_edigeeri"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Tööriist"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Uus _Aadress"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Uus _Grupp"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -968,76 +966,81 @@ msgstr "/Uus Kaust"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/Kustuta"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/Kopeeri..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nimi:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Kellele:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Koopia:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Pimekoopia:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Kustuta"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Lisa"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Otsi"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Kellele:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Koopia:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Pimekoopia:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Sulge"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Kustuta aadress(id)"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Kas te tõesti soovite aadresse kustutada?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1046,38 +1049,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:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ainult kataloog"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Kaust ja aadressid"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Kas tõesti kustutada `%s' ?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Uus kasutaja, ei saanud salvestada indeksifaili."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Uus kasutaja, ei saanud salvestada aadressiraamatu faile."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Vana aadressiraamat uuendati edukalt."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1085,7 +1088,7 @@ msgstr ""
 "Vana aadressiraamat uuendati.\n"
 "ei saanud salvestada uut aadresside indeksifaili"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1093,7 +1096,7 @@ msgstr ""
 "Ei saanud uuendada aadressiraamatut,\n"
 "kuid loodi uued ja tühjad aadressiraamatu failid."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1101,7 +1104,7 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ei suutnud luua uusi aadressiraamatu faile."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1109,91 +1112,91 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ja ei suutnud luua uut aadressiraamatu faile."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Aadressiraamat viiakse uude formaati"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Aadressiraamatu viga"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Ei suutnud lugeda aadresside indeksit"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Aadressiraamatu uuendamine"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Kasutajaliides"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "EPosti Aadress"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Kaust"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "V-Kaart"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPiloot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1857,83 +1860,77 @@ msgstr "Asenda"
 msgid "_Insert"
 msgstr "Lisa"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Redigeeri aadressi"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Lisa uus persoon"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Muuda persooni detaile"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "E-Posti aadress tuleb lisada."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Nimi ja Väärtus tulevad lisada."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Muuda persooni andmeid"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Ekraani nimi"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Perekonnanimi"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Eesnii"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Hüüdnimi"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "E-Posti aadress"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Alias"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Liiguta ülesse"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Liiguta alla"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Muuda"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Kustuta"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Väärtus"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Baasandmed"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Kasutaja atribuudid"
 
@@ -1970,56 +1967,58 @@ msgstr "Lisa uus aadressiraamat"
 msgid "A Group Name must be supplied."
 msgstr "Grupi nimi peab olema antud."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Muuda grupi andmeid"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Grupi nimi"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Aadress grupis"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Olemasolevad aadressid"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Olemasolevad aadressid"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Aadress grupis"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Nihuta E-Posti aadressid gruppi või grupist kasutades nooleklahve"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Muuda grupi detaile"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Lisa uus grupp"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Redigeeri kausta"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Sisesta uus nimi või kaust:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Sisesta uue kausta nimi:"
 
@@ -5560,14 +5559,6 @@ msgstr "Päise näitamine"
 msgid "Available items"
 msgstr "Võimalikud elemendid"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Näidatud elemendid"
@@ -6984,6 +6975,15 @@ msgstr "Välju"
 msgid "Sylpheed"
 msgstr "Vana Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Redigeeri aadressi"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
@@ -7268,9 +7268,6 @@ msgstr "Vana Sylpheed"
 #~ msgid "OK"
 #~ msgstr "OLGU"
 
-#~ msgid "Close"
-#~ msgstr "Sulge"
-
 #~ msgid "Cancel"
 #~ msgstr "Loobu"
 
diff --git a/po/fr.po b/po/fr.po
index 301922f9..c25e761c 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+0900\n"
 "PO-Revision-Date: 2007-02-15 14:25+0100\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -696,12 +696,11 @@ msgstr ""
 "case dans la colonne G pour relever le courrier du compte \n"
 "correspondant lorsque « Tout relever » est activé"
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Nom"
 
@@ -833,13 +832,12 @@ msgstr "Argument de l'action"
 msgid "Add Address to Book"
 msgstr "Ajouter l'adresse au carnet"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Remarques"
 
@@ -847,28 +845,28 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Choisissez un dossier"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichier"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Fichier/Nouveau _carnet d'adresses"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Fichier/Nouveau carnet _vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Fichier/Nouveau carnet _JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -876,96 +874,96 @@ msgstr "/_Fichier/Nouveau _serveur LDAP"
 msgid "/_File/---"
 msgstr "/_Fichier/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Fichier/Édit_er"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Fichier/_Supprimer"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/É_dition"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/É_dition/Co_ller"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Nouvelle _adresse"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Nouveau _groupe"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Nouveau _dossier"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/Édit_er"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Outils"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Nouvelle _adresse"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Nouveau _groupe"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -977,74 +975,79 @@ msgstr "/Nouveau _dossier"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Supprimer"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 msgid "/_Copy"
 msgstr "/_Copier"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 msgid "/_Paste"
 msgstr "/Co_ller"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nom :"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "À :"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Copie :"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Copie discrète :"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Rechercher"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "À :"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Copie :"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Copie discrète :"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Couleurs"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Suppression d'adresse(s)"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Voulez-vous supprimer la(les) adresse(s) sélectionnée(s) ?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1054,37 +1057,37 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "_Folder only"
 msgstr "_Dossier uniquement"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "Folder and _addresses"
 msgstr "Dossier et _adresses"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Voulez-vous vraiment supprimer « %s » ?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur. Impossible d'enregistrer le fichier index."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr ""
 "Nouvel utilisateur, impossible d'enregistrer le fichier carnet d'adresses."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1092,7 +1095,7 @@ msgstr ""
 "Ancien carnet d'adresses converti,\n"
 "mais impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1100,7 +1103,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:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1108,7 +1111,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:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1116,92 +1119,92 @@ 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:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Erreur dans le carnet d'adresses"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Personne"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Groupe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Dossier"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "Serveur LDAP"
 
@@ -1827,83 +1830,77 @@ msgstr "_Remplacer"
 msgid "_Insert"
 msgstr "_Insérer"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Édition d'une adresse"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Ajouter une personne"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Édition des coordonnées d'une personne"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "L'adresse électronique est obligatoire."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Un nom et une valeur doivent être donnés."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Édition des coordonnées d'une personne"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Nom affiché"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Nom"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Prénom"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Surnom"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "Adresse électronique"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Alias"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Plus haut"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Plus bas"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Modifier"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Effacer"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Valeur"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Général"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Données supplémentaires"
 
@@ -1940,58 +1937,60 @@ msgstr "Nouveau carnet d'adresses"
 msgid "A Group Name must be supplied."
 msgstr "Donnez un nom de groupe."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Édition du groupe"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Nom du groupe"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Adresses dans le groupe"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Adresses disponibles"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Adresses disponibles"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Adresses dans le groupe"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Déplacer les adresses souhaitées depuis/vers le groupe avec les boutons "
 "fléchés"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Édition du groupe"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Nouveau groupe"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Édition du dossier"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Saisissez le nouveau nom du dossier :"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Saisissez le nom du nouveau dossier :"
 
@@ -5482,14 +5481,6 @@ msgstr "Options d'affichage des éléments"
 msgid "Available items"
 msgstr "Éléments disponibles"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Éléments affichés"
@@ -6851,6 +6842,15 @@ msgstr "_Quitter"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Édition d'une adresse"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
diff --git a/po/gl.po b/po/gl.po
index eb6a575e..3779ff60 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -684,12 +684,11 @@ 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:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Nome"
 
@@ -821,13 +820,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Engadir enderezo á axenda"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Enderezo"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Notas"
 
@@ -835,29 +833,29 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta da axenda"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Ficheiro"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Ficheiro/Nova _axenda"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Ficheiro/Nova _vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Ficheiro/Novo _JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -865,96 +863,96 @@ msgstr "/_Ficheiro/Novo _servidor"
 msgid "/_File/---"
 msgstr "/_Ficheiro/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Ficheiro/_Editar"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Ficheiro/_Borrar"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Ficheiro/_Pechar"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Enderezo"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Enderezo/Novo _enderezo"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "//_Enderezo/Novo _grupo"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Enderezo/Nova _carpeta"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Enderezo/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Enderezo/_Editar"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Novo _enderezo"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Novo _grupo"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -966,76 +964,81 @@ msgstr "/Nova _carpeta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Copiar..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Para:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Bcc:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Engadir"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Buscar"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Para:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Pechar"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Borrar enderezo(s)"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente o(s) enderezo(s)?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1044,38 +1047,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:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "_Folder only"
 msgstr "Carpeta só"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Carpeta e enderezos"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente `%s' ?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Novo usuario, non se puido gardar o ficheiro índice."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Novo usuario, non se puido gardar os ficheiros de enderezos"
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Antiga axenda de enderezos convertida con éxito"
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1083,7 +1086,7 @@ msgstr ""
 "Antiga axenda de enderezos convertida,\n"
 "non se puido gardar o novo ficheiro índice"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1091,7 +1094,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "pero crearonse novos ficheiros valeiros."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1099,7 +1102,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "Non se puideron crear os ficheiros para a nova."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1107,92 +1110,92 @@ msgstr ""
 "Non se puido convertir a antiga axenda\n"
 "e non se puideron crear ficheiros para unha nova."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Conversión da  axenda"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Error na axenda"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Non se puido ler o índice de enderezos"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Erro na conversión da axenda"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Conversión da axenda"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Persoa"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1855,83 +1858,77 @@ msgstr "Substituír"
 msgid "_Insert"
 msgstr "Inserir"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Editar enderezo"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Engadir nova persoa"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Editar detalles persoais"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Debe especificarse un enderezo de correo."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Debe especificarse un Nome e un Valor"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Editar datos persoais"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Nome mostrado"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Apelidos"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Nome"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Alcume"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "Enderezo e-mail"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Alias"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Arriba"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Abaixo"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Modificar"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Valor"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Datos básicos"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Atributos do usuario"
 
@@ -1968,56 +1965,58 @@ msgstr "Engadir nova axenda"
 msgid "A Group Name must be supplied."
 msgstr "Debe proporcionar un nome de grupo"
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Editar datos do grupo"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Nome de grupo"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Enderezos no grupo"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Enderezos disponibles"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Enderezos disponibles"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Enderezos no grupo"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Mover os enderezos de correo dende/cara o grupo con as flechas"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Editar detalles do grupo"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Engadir novo grupo"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Editar carpeta"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Nome da nova carpeta:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nova carpeta"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Nome da nova carpeta:"
 
@@ -5560,14 +5559,6 @@ msgstr "Ver propiedades de cabeceiras"
 msgid "Available items"
 msgstr "Elementos disponibles"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Elementos visibles"
@@ -6981,6 +6972,15 @@ msgstr "Sair"
 msgid "Sylpheed"
 msgstr "Antigos de Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Editar enderezo"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "Nº"
 
@@ -7264,9 +7264,6 @@ msgstr "Antigos de Sylpheed"
 #~ msgid "OK"
 #~ msgstr "Aceptar"
 
-#~ msgid "Close"
-#~ msgstr "Pechar"
-
 #~ msgid "Cancel"
 #~ msgstr "Cancelar"
 
diff --git a/po/hr.po b/po/hr.po
index 3cbe990b..eb4135dd 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+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"
@@ -691,12 +691,11 @@ 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:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Ime"
 
@@ -825,13 +824,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Bilješke"
 
@@ -839,30 +837,30 @@ msgstr "Bilješke"
 msgid "Select Address Book Folder"
 msgstr "Odaberite spis adresara"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _V-kartica"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 #, fuzzy
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _J-Pilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _poslužitelj"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -870,96 +868,96 @@ msgstr "/_Datoteka/Novi _poslužitelj"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Uredi"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Uredi"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/U_baci"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _spis"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Uredi"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Novi _spis"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -971,76 +969,81 @@ msgstr "/Novi _spis"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiraj..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Uredi/U_baci"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Adresar"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Za:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Bcc:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Potraži"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Za:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Zatvori"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Uistinu obrisati adresu/e?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1049,38 +1052,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:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Obriši spis"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo spis"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Spis i adrese"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Uistinu obrisati `%s' ?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu spretmiti index datoteku."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu spremiti datoteke adresara."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspješno unešen."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1088,7 +1091,7 @@ msgstr ""
 "Stari adresar ne može biti unešen,\n"
 "ne mogu spremiti novu index datoteku adresara."
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1096,7 +1099,7 @@ msgstr ""
 "Ne mogu unjeti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1104,7 +1107,7 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1112,85 +1115,85 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "i ne mogu stvoriti nove datoteke adresara."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Sučelje"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Spis"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "V-kartica"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 #, fuzzy
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "LDAP Poslužitelj"
 
@@ -1865,83 +1868,77 @@ msgstr "Obrazac"
 msgid "_Insert"
 msgstr "Unesi"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Uredi adresu"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Dodaj novu osobu"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Uredi detalje osobe"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "E-mail adresa nije upisana."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Ime i iznos moraju biti upisani."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Uredi osobne podatke"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Prikaz imena"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Prezime"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Ime"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Nadimak"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "E-mail adresa"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Alias"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Pomakni gore"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Pomakni dolje"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Promjeni"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Počisti"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Iznos"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Osnovno"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Atributi korisnika"
 
@@ -1978,56 +1975,58 @@ msgstr "Dodaj Novi Adresar"
 msgid "A Group Name must be supplied."
 msgstr "Ime grupe mora biti unešeno."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Uredi grupu"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Ime grupe"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Adrese u grupi"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Dostupne adrese"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Dostupne adrese"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Adrese u grupi"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Pomaknite E-mail adrese prema ili od grupe sa strelicama"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Uredi detalje grupe"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Dodaj novu grupu"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Uredi spis"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog spisa:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Novi spis"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog spisa:"
 
@@ -5653,14 +5652,6 @@ msgstr "Prikaz postavki zaglavlja"
 msgid "Available items"
 msgstr "Dostupne pojedinosti"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Prikazane pojedinosti"
@@ -7094,6 +7085,15 @@ msgstr "Izlaz"
 msgid "Sylpheed"
 msgstr ""
 
+#~ msgid "Edit address"
+#~ msgstr "Uredi adresu"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
@@ -7329,9 +7329,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "U redu"
 
-#~ msgid "Close"
-#~ msgstr "Zatvori"
-
 #~ msgid "Cancel"
 #~ msgstr "Odustani"
 
diff --git a/po/hu.po b/po/hu.po
index 501214cc..4b9104bb 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+0900\n"
 "PO-Revision-Date: 2007-02-01 18:55+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: HUNGARIAN <NONE>\n"
@@ -685,12 +685,11 @@ msgstr ""
 "letöltése'\n"
 "funkció bekapcsolásához tegyen pipát a 'G' oszlopban levő négyzetbe!"
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Név"
 
@@ -823,13 +822,12 @@ msgstr "A művelet felhasználói paramétere"
 msgid "Add Address to Book"
 msgstr "Cím hozzáadása a címjegyzékhez"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Cím"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Megjegyzések"
 
@@ -837,28 +835,28 @@ msgstr "Megjegyzések"
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fájl"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Fájl/Új _Címjegyzék"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Fájl/Új _vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Fájl/Új _JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fájl/Új _LDAP Szerver"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -866,96 +864,96 @@ msgstr "/_Fájl/Új _LDAP Szerver"
 msgid "/_File/---"
 msgstr "/_Fájl/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Fájl/_Szerkesztés"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Fájl/_Törlés"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Fájl/_Mentés"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fájl/_Bezárás"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Szerkesztés"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Szerkesztés/_Másolás"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/_Szerkesztés/_Beillesztés"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Cím"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Cím/Új _cím"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Cím/Új cso_port"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Cím/Új _mappa"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Cím/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Cím/_Szerkesztés"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Eszközök"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Eszközök/_LDIF fájl importálása"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Új _cím"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Új cso_port"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -967,76 +965,81 @@ msgstr "/Ú_j Mappa"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Törlés"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Másolás..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Szerkesztés/_Beillesztés"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "Email cím"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Név:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Címzett:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Másolat:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Titkos másolat:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Előnézet"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Címzett:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Másolat:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Titkos másolat:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Színek"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Cím(ek) törlése"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Tényleg töröljem a cím(ek)et?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1045,36 +1048,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:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "_Folder only"
 msgstr "Cs_ak mappa"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "Folder and _addresses"
 msgstr "Mappa és _címek"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tényleg törli `%s' elemet?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Az új felhasználó nem tudja menteni az index fájlt."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 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:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "A régi címjegyzék konvertálása sikerült."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1082,7 +1085,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:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1090,7 +1093,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:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1098,7 +1101,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:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1106,88 +1109,88 @@ 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:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Címjegyzék konvertálási hiba"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Címjegyzék hiba"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Cím index olvasása nem sikerült"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Címjegyzék konverziós hiba"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Címjegyzék konverzió"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Illesztő"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Személy"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "Email cím"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Csoport"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mappa"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "LDAP Szerver"
 
@@ -1811,83 +1814,77 @@ msgstr "_Helyettesít"
 msgid "_Insert"
 msgstr "_Beszúrás"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Cím szerkesztése"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Új személy hozzáadása"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Személy tulajdonságainak szerkesztése"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Egy Email címet meg kell adnia."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Egy nevet és értéket meg kell adnia."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Személy adatainak szerkesztése"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Név kijelzése"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Vezetéknév"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Keresztnév"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Becenév"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "Email cím"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Álnév"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Mozgatás fel"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Mozgatás le"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Módosít"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Töröl"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Érték"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Alap adatok"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Felhasználó tulajdonságai"
 
@@ -1924,56 +1921,58 @@ msgstr "Új címjegyzék hozzáadása"
 msgid "A Group Name must be supplied."
 msgstr "Egy csoportnevet meg kell adnia."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Csoportadatok szerkesztése"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Csoportnév"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Címek a csoportban"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Elérhető címek"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Elérhető címek"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Címek a csoportban"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Email címek mozgatása csoportból vagy csoportba a nyilakkal"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Csoport tulajdonságainak szerkesztése"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Új csoport hozzáadása"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Mappa szerkesztése"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "A mappa új neve:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Új mappa"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Az új mappa neve:"
 
@@ -5443,14 +5442,6 @@ msgstr "Elembeállítások megjelenítése"
 msgid "Available items"
 msgstr "Elérhető elemek"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Megjelenített elemek"
@@ -6812,5 +6803,14 @@ msgstr "_Kilépés"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Cím szerkesztése"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
diff --git a/po/it.po b/po/it.po
index adc20179..7566980c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.2.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+0900\n"
 "PO-Revision-Date: 2006-10-14 11:32+0200\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -685,12 +685,11 @@ msgstr ""
 "colonna «G» per consentire il recupero dei messaggi attraverso «Ricevi "
 "tutti»."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Nome"
 
@@ -822,13 +821,12 @@ msgstr "Argomento dell'azione utente"
 msgid "Add Address to Book"
 msgstr "Aggiunta dell'indirizzo alla rubrica"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Indirizzo"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Note"
 
@@ -836,28 +834,28 @@ msgstr "Note"
 msgid "Select Address Book Folder"
 msgstr "Selezione della cartella della rubrica"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_File"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_File/Nuova _rubrica"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_File/Nuova _vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_File/Nuovo _JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_File/New _LDAP Server"
 msgstr "/_File/Nuovo server _LDAP"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -865,96 +863,96 @@ msgstr "/_File/Nuovo server _LDAP"
 msgid "/_File/---"
 msgstr "/_File/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_File/_Modifica"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_File/_Elimina"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_File/_Salva"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_File/_Chiudi"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Modifica"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/_Modifica/_Incolla"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Indirizzo"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Indirizzo/Nuovo _indirizzo"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Indirizzo/Nuovo _gruppo"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Indirizzo/Nuova _cartella"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Indirizzo/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Indirizzo/_Modifica"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/S_trumenti"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/S_trumenti/Importa file _LDIF"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Nuovo _indirizzo"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Nuovo _gruppo"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -966,76 +964,81 @@ msgstr "/Nuova _cartella"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/Eli_mina"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Copia..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Modifica/_Incolla"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "A:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Bcc:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr " Aggiungi "
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Cerca"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "A:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Colori"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Elimina l'indirizzo(i)"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Eliminare l'indirizzo(i)?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1045,36 +1048,36 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "_Folder only"
 msgstr "_Solo la cartella"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "Folder and _addresses"
 msgstr "Cartella e _indirizzi"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Eliminare «%s» ?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Nuovo utente, impossibile salvare il file indice."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Nuovo utente, impossibile salvare i file della rubrica."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "La vecchia rubrica è stata convertita con successo."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1082,7 +1085,7 @@ msgstr ""
 "Vecchia rubrica convertita,\n"
 "impossibile salvare il nuovo file indice dell'indirizzo"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1090,7 +1093,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "ma ho creato nuovi file vuoti della rubrica."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1098,7 +1101,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1106,92 +1109,92 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "e impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Errore nella rubrica"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Impossibile leggere l'indice dell'indirizzo"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "Indirizzo email"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Gruppo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Cartella"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1818,83 +1821,77 @@ msgstr "_Sostituisci"
 msgid "_Insert"
 msgstr "_Inserisci"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Modifica l'indirizzo"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Aggiunta di una nuova persona"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Modifica dei dettagli della persona"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Deve essere fornito un indirizzo e-mail."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Devono essere forniti un nome e un valore."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Modifica i dati della persona"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Nome da visualizzare"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Ultimo nome"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Primo nome"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Nick"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "Indirizzo e-mail"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Alias"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Sposta su"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Sposta giù"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Modifica"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Pulisci"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Valore"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Dati essenziali"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Attibuti user"
 
@@ -1931,57 +1928,59 @@ msgstr "Aggiunta di una nuova rubrica"
 msgid "A Group Name must be supplied."
 msgstr "Deve essere fornito un nome del gruppo."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Modifica i dati del gruppo"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Nome del gruppo"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Indirizzi nel gruppo"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Indirizzi disponibili"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Indirizzi disponibili"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Indirizzi nel gruppo"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Sposta gli indirizzi di e-mail da o in un gruppo con i pulsanti freccia"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Modifica i dettagli del gruppo"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Aggiunta di un nuovo gruppo"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Modifica la cartella"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Inserire il nuovo nome della cartella:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 
@@ -5470,14 +5469,6 @@ msgstr "Mostra l'impostazione dell'intestazione"
 msgid "Available items"
 msgstr "Voci disponibili"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Voci visualizzate"
@@ -6838,6 +6829,15 @@ msgstr "_Esci"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Modifica l'indirizzo"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "Tot."
 
diff --git a/po/ja.po b/po/ja.po
index 9370fec8..9de7f954 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+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"
@@ -682,12 +682,11 @@ msgstr ""
 "新着メッセージはこの順番でチェックされます。「全受信」によるメッセージ\n"
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "名前"
 
@@ -819,13 +818,12 @@ msgstr "アクションのユーザ引数"
 msgid "Add Address to Book"
 msgstr "アドレスをアドレス帳に追加"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "アドレス"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "備考"
 
@@ -833,28 +831,28 @@ msgstr "備考"
 msgid "Select Address Book Folder"
 msgstr "アドレス帳フォルダを選択"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/ファイル(_F)"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/ファイル(_F)/新規アドレス帳(_B)"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/ファイル(_F)/新規_vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/ファイル(_F)/新規_JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_File/New _LDAP Server"
 msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -862,96 +860,96 @@ msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 msgid "/_File/---"
 msgstr "/ファイル(_F)/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/ファイル(_F)/編集(_E)"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/ファイル(_F)/削除(_D)"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/ファイル(_F)/保存(_S)"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/ファイル(_F)/閉じる(_C)"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編集(_E)/コピー(_C)"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/編集(_E)/ペースト(_P)"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/アドレス(_A)"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/アドレス(_A)/新規アドレス(_A)"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/アドレス(_A)/新規グループ(_G)"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/アドレス(_A)/新規フォルダ(_F)"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/アドレス(_A)/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/アドレス(_A)/編集(_E)"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/アドレス(_A)/削除(_D)"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/ツール(_T)"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/ツール(_T)/_LDIFファイルをインポート"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/新規アドレス(_A)"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/新規グループ(_G)"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -963,74 +961,78 @@ msgstr "/新規フォルダ(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/削除(_D)"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 msgid "/_Copy"
 msgstr "/コピー(_C)"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 msgid "/_Paste"
 msgstr "/ペースト(_P)"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "名前:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "宛先:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Bcc:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "削除"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "追加"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "検索"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "宛先:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/addressbook.c:705
+msgid "_Close"
+msgstr "閉じる(_C)"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "アドレスの削除"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "本当にこのアドレスを削除しますか?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1039,36 +1041,36 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "_Folder only"
 msgstr "フォルダのみ(_F)"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "Folder and _addresses"
 msgstr "フォルダとアドレス(_A)"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "本当に `%s' を削除しますか?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "新規ユーザ、インデックスファイルを保存できません。"
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "新規ユーザ、アドレス帳ファイルを保存できません。"
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "旧形式のアドレス帳は正しく変換されました。"
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1076,7 +1078,7 @@ msgstr ""
 "旧形式のアドレス帳は変換されました。\n"
 "新規アドレスインデックスファイルに保存できません"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1084,7 +1086,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "しかし空の新規アドレス帳ファイルが作成されました。"
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1092,7 +1094,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1100,90 +1102,90 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "アドレス帳の変換エラー"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "アドレス帳の変換"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "アドレス帳のエラー"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "アドレスインデックスを読み込めません"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "旧形式のアドレス帳は変換されましたが、新規アドレスインデックスファイルを保存"
 "できません"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2597
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "アドレス帳を変換できませんでしたが、空の新規アドレス帳ファイルが作成されまし"
 "た。"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2603
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:2583
+#: src/addressbook.c:2609
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "アドレス帳変換エラー"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "アドレス帳変換"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "インタフェース"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "人物"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "グループ"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "フォルダ"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "LDAPサーバ"
 
@@ -1805,83 +1807,77 @@ msgstr "置換(_R)"
 msgid "_Insert"
 msgstr "挿入(_I)"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "アドレスを編集"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "新しい人物を追加"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "人物の詳細を編集"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "メールアドレスを指定する必要があります。"
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "名前と値を指定する必要があります。"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "人物のデータを編集"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "表示名"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "姓"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "名"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "ニックネーム"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "電子メール アドレス"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "別名"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "上に移動"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "下に移動"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "変更"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "クリア"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "内容"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "基本データ"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "ユーザの属性"
 
@@ -1918,56 +1914,58 @@ msgstr "新規アドレス帳を追加"
 msgid "A Group Name must be supplied."
 msgstr "グループ名を指定する必要があります。"
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "グループデータの編集"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "グループ名"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "グループのアドレス"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "利用可能なアドレス"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " → "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  →  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " ← "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  ←  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "利用可能なアドレス"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "グループのアドレス"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "矢印ボタンで電子メールアドレスをグループに(から)移動"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "グループの詳細の編集"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "新規グループの追加"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "フォルダの編集"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "フォルダの新しい名前を入力してください:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "新規フォルダ"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "新規フォルダの名前を入力してください:"
 
@@ -5424,14 +5422,6 @@ msgstr "表示項目の設定"
 msgid "Available items"
 msgstr "利用可能な項目"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  →  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  ←  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "表示する項目"
diff --git a/po/ko.po b/po/ko.po
index 728ceada..d13220e7 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+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"
@@ -675,12 +675,11 @@ msgstr ""
 "새 메시지는 이 순서대로 확인될 것입니다. `모두 받기'로 메시지를\n"
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "이름"
 
@@ -812,13 +811,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "주소록에 추가"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "주소"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "메모"
 
@@ -826,29 +824,29 @@ msgstr "메모"
 msgid "Select Address Book Folder"
 msgstr "주소록 폴더 선택"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/파일(_F)"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/파일(_F)/새 주소록(_B)"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/파일(_F)/새 vCard(_v)"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/파일(_F)/새 JPilot(_J)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -856,96 +854,96 @@ msgstr "/파일(_F)/새 서버(_S)"
 msgid "/_File/---"
 msgstr "/파일(_F)/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/파일(_F)/편집(_E)"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/파일(_F)/삭제(_D)"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/파일(_F)/닫기(_C)"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/주소(_A)"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/주소(_A)/새 주소(_A)"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/주소(_A)/새 그룹(_G)"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/주소(_A)/새 폴더(_F)"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/주소(_A)/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/주소(_A)/편집(_E)"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/도구(_T)"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/새 주소(_A)"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/새 그룹(_G)"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -957,76 +955,81 @@ msgstr "/새 폴더(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/삭제(_D)"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/복사(_C)..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "주소록"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "이름:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "받는 사람:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "참조:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "숨은 참조:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "삭제"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "추가"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "찾기"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "받는 사람:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "참조:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "숨은 참조:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "닫기"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "주소를 삭제"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "정말로 주소를 삭제하시겠습니까?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1035,38 +1038,38 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "_Folder only"
 msgstr "폴더만"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "폴더와 주소"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "정말로 `%s'를 지우시겠습니까?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "새 사용자, 색인 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "새 사용자, 주소록 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "예전 주소록을 성공적으로 변환하였습니다."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1074,7 +1077,7 @@ msgstr ""
 "예전 주소록이 변환되었습니다,\n"
 "새 주소록의 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1082,7 +1085,7 @@ msgstr ""
 "주소록을 변환할 수 없습니다,\n"
 "대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1090,7 +1093,7 @@ msgstr ""
 "주소록을 변환하지 못했습니다,\n"
 "새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1098,85 +1101,85 @@ msgstr ""
 "주소록을 변환하지 못했고\n"
 "새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "주소록 에러"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "주소 색인을 읽을 수 없습니다"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 msgid "Old address book converted, could not save new address index file"
 msgstr "예전 주소록이 변환되었습니다, 새 주소록 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2597
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "주소록을 변환할 수 없습니다, 대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2603
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "주소록을 변환하지 못했습니다, 새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:2583
+#: src/addressbook.c:2609
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "주소록을 변환하지 못했고 새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "인터페이스"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "주소록"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "사람"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "그룹"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "폴더"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "LDAP 서버"
 
@@ -1839,83 +1842,77 @@ msgstr "대체"
 msgid "_Insert"
 msgstr "삽입"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "주소 편집"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "새 인물 추가"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "인물 상세내역 편집"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "메일 주소가 지정되지 않았습니다."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "이름과 값이 지정되지 않았습니다."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "인물 자료 편집"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "표시 명"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "마지막 이름"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "처음 이름"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "가명"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "이메일 주소"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "별명"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "위로 이동"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "아래로 이동"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "수정"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "지움"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "값"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "기본 자료"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "사용자 속성"
 
@@ -1952,56 +1949,58 @@ msgstr "새 주소록 추가"
 msgid "A Group Name must be supplied."
 msgstr "그룹명이 지정되지 않았습니다."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "그룹 자료 편집"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "그룹명"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "그룹의 주소"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "사용가능한 주소"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "사용가능한 주소"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "그룹의 주소"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "화살표 버튼으로 그룹에서 혹은 그룹으로 전자우편 주소 이동"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "그룹 상세내용 편집"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "새 그룹 추가"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "폴더 편집"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "새 폴더"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
@@ -5510,14 +5509,6 @@ msgstr "표시될 헤더 설정"
 msgid "Available items"
 msgstr "사용가능한 항목"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "표시될 항목"
@@ -6922,6 +6913,15 @@ msgstr "끝내기"
 msgid "Sylpheed"
 msgstr "예전 Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "주소 편집"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "전체"
 
@@ -7155,9 +7155,6 @@ msgstr "예전 Sylpheed"
 #~ msgid "OK"
 #~ msgstr "확인"
 
-#~ msgid "Close"
-#~ msgstr "닫기"
-
 #~ msgid "Cancel"
 #~ msgstr "취소"
 
diff --git a/po/lt.po b/po/lt.po
index ce04b933..bfce2f3f 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+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"
@@ -682,12 +682,11 @@ 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:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Vardas"
 
@@ -819,13 +818,12 @@ msgstr "Vartotojo veiksmo argumentas"
 msgid "Add Address to Book"
 msgstr "Įdėti adresą į knygą"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Adresas"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Pastabos"
 
@@ -833,28 +831,28 @@ msgstr "Pastabos"
 msgid "Select Address Book Folder"
 msgstr "Pažymėkite adresų knygos katalogą"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Failas"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Failas/Nauja _Knyga"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Failas/Nauja „_vCard“ kortelė"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Failas/Naujas _JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_File/New _LDAP Server"
 msgstr "/_Failas/Naujas _LDAP serveris"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -862,96 +860,96 @@ msgstr "/_Failas/Naujas _LDAP serveris"
 msgid "/_File/---"
 msgstr "/_Failas/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Failas/_Taisa"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Failas/Išt_rinti"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Failas/Iš_saugoti"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Failas/_Užverti"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Taisa"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Taisa/Kopi_juoti"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/_Taisa/Į_dėti"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Adresas"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Adresas/Naujas _adresas"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Adresas/Nauja _grupė"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Adresas/Naujas _katalogas"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Adresas/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Adresas/_Redaguoti"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Į_rankiai"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Į_rankiai/Importuoti _LDIF failą"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Naujas _adresas"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Nauja _grupė"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -963,76 +961,81 @@ msgstr "/Naujas _katalogas"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Ištrinti"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopijuoti..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Taisa/Į_dėti"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Adresų knyga"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Vardas:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Kam:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Kopija:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Slapta kopija:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Pridėti"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Ieškoti"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Kam:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Kopija:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Slapta kopija:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Spalvos"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Pašalinti adresą(-us)"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Ar tikrai pašalinti adresą(-us)?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1041,36 +1044,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:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "_Folder only"
 msgstr "Tik _katalogą"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "Folder and _addresses"
 msgstr "Katalogą ir _adresus jame"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tikrai pašalinti „%s“?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Naujas vartotojas, negaliu išsaugoti „index“ failo."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Naujas vartotojas, negaliu išsaugoti adresų knygos failų."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Adresų knyga sėkmingai konvertuota"
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1078,7 +1081,7 @@ msgstr ""
 "Sena adresų knyga konvertuota,\n"
 "negaliu išsaugoti naujo adresų indekso failo"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1086,7 +1089,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "bet sukūriau tuščius naujos knygos failus."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1094,7 +1097,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "negaliu sukurti naujos knygos failų."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1102,88 +1105,88 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "ir negaliu sukurti naujos knygos failų."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Adresų knygos klaida"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Negaliu perskaityti adresų indekso"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Sąsaja"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adresų knyga"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Asmuo"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Grupė"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Katalogas"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "LDAP serveris"
 
@@ -1802,83 +1805,77 @@ msgstr "_Pakeisti"
 msgid "_Insert"
 msgstr "Įterpt_i"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Redaguoti adresą"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Pridėti naują asmenį"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Redaguoti asmens detales"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Turi būti nurodytas el. pašto adresas"
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Pavadinimas ir reikšmė turi būti nurodyti."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Redaguoti asmens duomenis"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Rodomas vardas"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Pavardė"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Vardas"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Slapyvardis"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "El. pašto adresas"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Kitaip"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Aukštyn"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Žemyn"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Taisyti"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Išvalyti"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Reikšmė"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Duomenys"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Vartotojo atributai"
 
@@ -1915,56 +1912,58 @@ msgstr "Pridėti naują adresų knygą"
 msgid "A Group Name must be supplied."
 msgstr "Turi būti nurodytas grupės pavadinimas"
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Redaguoti grupės duomenis"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Grupės pavadinimas"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Adresai grupėje"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Prieinami adresai"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Prieinami adresai"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Adresai grupėje"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Perkelkite adresus iš vienos grupės į kitą rodyklėmis"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Redaguoti grupės detales"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Pridėti naują grupę"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Redaguoti katalogą"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Įveskite katalogo pavadinimą:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Naujas katalogas"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Įveskite naujo katalogo pavadinimą:"
 
@@ -5439,14 +5438,6 @@ msgstr "Sutrumpintų antraščių nustatymai"
 msgid "Available items"
 msgstr "Turimi laukai"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Rodomi laukai"
@@ -6804,6 +6795,15 @@ msgstr "Iš_eiti"
 msgid "Sylpheed"
 msgstr "„Sylpheed“"
 
+#~ msgid "Edit address"
+#~ msgstr "Redaguoti adresą"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
diff --git a/po/nl.po b/po/nl.po
index 065d9c1e..418e8bd8 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+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"
@@ -690,12 +690,11 @@ 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:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Naam"
 
@@ -827,13 +826,12 @@ msgstr "Gebruikersargumenten voor actie"
 msgid "Add Address to Book"
 msgstr "Adres toevoegen aan adresboek"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Opmerkingen"
 
@@ -841,28 +839,28 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Bestand"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Bestand/Nieuw _adresboek"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Bestand/Nieuwe _vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Bestand/Nieuwe _JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_File/New _LDAP Server"
 msgstr "/_Bestand/Nieuwe _LDAP-server"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -870,96 +868,96 @@ msgstr "/_Bestand/Nieuwe _LDAP-server"
 msgid "/_File/---"
 msgstr "/_Bestand/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Bestand/Aanpassen"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Bestand/_Verwijderen"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Bestand/_Sluiten"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Be_werken"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Be_werken/_Kopiëren"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/Be_werken/_Plakken"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Nieuw _adres"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Nieuwe _groep"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Nieuwe _map"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Bewerken"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Gereedschap"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Nieuw _adres"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Nieuwe _groep"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -971,76 +969,81 @@ msgstr "/Nieuwe _map"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/Ver_wijderen"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopieer..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Be_werken/_Plakken"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Naam:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Aan:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Bcc:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Zoeken"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Aan:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Kleuren"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Adres(sen) verwijderen"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Wilt u de adressen werkelijk verwijderen?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1050,36 +1053,36 @@ msgstr ""
 "Als u alleen de map verwijdert, dan zullen de adressen naar de \n"
 "hoger gelegen map verplaatst worden."
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "_Folder only"
 msgstr "Alleen _map"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "Folder and _addresses"
 msgstr "Map en _adressen"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wilt u '%s' werkelijk verwijderen?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Nieuwe gebruiker: Kon indexbestand niet opslaan."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Nieuwe gebruiker: Kon adresboekbestanden niet opslaan."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Oude adresboekgegevens succesvol omgezet."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1087,7 +1090,7 @@ msgstr ""
 "Oude adresboekgegevens omgezet.\n"
 "Kon het nieuwe adresboek indexbestand niet opslaan."
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1095,7 +1098,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Nieuw leeg adresboek is gemaakt."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1103,7 +1106,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon geen nieuwe adresboek bestanden aanmaken."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1111,90 +1114,90 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon ook geen nieuwe adresboekbestanden aanmaken."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Adresboek omzetting"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Adresboekprobleem"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Kon adresboek index niet lezen"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Adresboek Omzetting"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Groep"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Accounts"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1813,83 +1816,77 @@ msgstr "_Vervangen"
 msgid "_Insert"
 msgstr "_Invoegen"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Adres bewerken"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Nieuw persoon toevoegen"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Persoonsgegevens bewerken"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "E-mail adres is niet ingevoerd."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Een naam en waarde moeten worden gegeven."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Persoonsgegevens bewerken"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Naam in de lijst"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Achternaam"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Voornaam"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Alias"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "E-mail adres"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Alias"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Omhoog"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Omlaag"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Bewerken"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Legen"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Waarde"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Algemeen"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "User Attributes"
 
@@ -1926,57 +1923,59 @@ msgstr "Adresboek toevoegen"
 msgid "A Group Name must be supplied."
 msgstr "U moet wel een groepsnaam geven."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Groepsgegevens bewerken"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Groepsnaam"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Adressen in groep"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Beschikbare adressen"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " ->"
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->"
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <-"
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-"
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Beschikbare adressen"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Adressen in groep"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Verplaats e-mail adressen van en naar de nieuwe groep met de pijl-knoppen"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Groepsdetails bewerken"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Nieuwe groep toevoegen"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Map hernoemen"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Geef de nieuwe naam van de map:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
@@ -5471,14 +5470,6 @@ msgstr "Headerweergave instellingen"
 msgid "Available items"
 msgstr "Beschikbare items"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->"
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-"
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Weergegeven items"
@@ -6842,6 +6833,15 @@ msgstr "A_fsluiten"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Adres bewerken"
+
+#~ msgid " -> "
+#~ msgstr " ->"
+
+#~ msgid " <- "
+#~ msgstr " <-"
+
 #~ msgid "#"
 #~ msgstr "#"
 
diff --git a/po/pl.po b/po/pl.po
index d8e72f55..65a4dc35 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.9.8 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+0900\n"
 "PO-Revision-Date: 2005-03-05 18:57+0100\n"
 "Last-Translator: Wit Wilinski <madman at linux dot bydg dot org>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -679,12 +679,11 @@ 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:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Nazwa"
 
@@ -817,13 +816,12 @@ msgstr "Argumenty użytkownika dla akcji"
 msgid "Add Address to Book"
 msgstr "Dodaj do książki adresowej"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Uwagi"
 
@@ -831,29 +829,29 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog książki adresowej"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Plik"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Plik/Nowa _książka"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Plik/Nowy _vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Plik/Nowy _J-Pilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Plik/Nowy _Serwer"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -861,96 +859,96 @@ msgstr "/_Plik/Nowy _Serwer"
 msgid "/_File/---"
 msgstr "/_Plik/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Plik/_Edycja"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Plik/_Usuń"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Edycja"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/_Kopiuj"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/_Edycja/_Wstaw"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Plik/Nowy _adres"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Plik/Nowa _grupa"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Plik/Nowy _katalog"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Edycja"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Narzędzia"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Nowy _adres"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Nowa _grupa"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -962,76 +960,81 @@ msgstr "/Nowy _katalog"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Usuń"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiuj..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Edycja/_Wstaw"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nazwa:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Do:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Kopia:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Ukryta kopia:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Wyszukaj"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Do:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Kopia:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Ukryta kopia:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Kolory"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Usuń adres(y)"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Czy naprawdę chcesz usunąć ten adres(y)?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1041,38 +1044,38 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "_Folder only"
 msgstr "Tylko katalog"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Katalog i adresy"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Czy naprawdę usunąć \"%s\" ?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Nowy użytkownik, nie można było zapisać pliku indeksu."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 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:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Konwersja starej książki adresowej została zakończona pomyślnie."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1080,7 +1083,7 @@ msgstr ""
 "Stara książka adresowa została skonwertowana,\n"
 "nie można było zapisać nowego pliku indeksu adresów."
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1088,7 +1091,7 @@ msgstr ""
 "Nie można było skonwertować książki adresowej,\n"
 "utworzono puste pliki nowej książki adresowej."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1096,7 +1099,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:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1104,92 +1107,92 @@ msgstr ""
 "Nie można było skonwertować książki adresowej\n"
 "oraz utworzyć nowych plików książki adresowej."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Błąd książki adresowej"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Nie można odczytać książki adresowej"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Interfejs"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Katalog"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
@@ -1816,83 +1819,77 @@ msgstr "Zamień"
 msgid "_Insert"
 msgstr "Wstaw"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Edytuj adres"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Dodaj nową osobę"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Edytuj informacje osoby"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Należy podać adres e-mail."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Należy podać nazwę i wartość."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Edytuj dane osoby"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Wyświetlana nazwa"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Nazwisko"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Imię"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Pseudonim"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "Adres e-mail"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Zwany inaczej"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "W górę"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "W dół"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Zmień"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Wartość"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Dane podstawowe"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Atrybuty użytkownika"
 
@@ -1929,56 +1926,58 @@ msgstr "Dodaj nową książkę adresową"
 msgid "A Group Name must be supplied."
 msgstr "Należy podać nazwę grupy."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Edytuj dane grupy"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Nazwa grupy"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Adresy w grupie"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Dostępne adresy"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Dostępne adresy"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Adresy w grupie"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Przenieś przyciskami strzałek adresy email do lub z grupy"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Edytuj szczegóły grupy"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Dodaj nową grupę"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Edytuj katalog"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Podaj nową nazwę katalogu:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Podaj nazwę nowego katalogu:"
 
@@ -5466,14 +5465,6 @@ msgstr "Ustawienia wyświetlania nagłówka"
 msgid "Available items"
 msgstr "Dostępne elementy"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Wyświetlone elementy"
@@ -6877,6 +6868,15 @@ msgstr "Koniec programu"
 msgid "Sylpheed"
 msgstr "Dawny Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Edytuj adres"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1a29493e..4acb633e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+0900\n"
 "PO-Revision-Date: 2007-02-15 13:51-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -689,12 +689,11 @@ msgstr ""
 "Mensagens novas serão baixadas nessa ordem. Marque as caixas\n"
 "na coluna `G' para habilitar essa caixa no `Baixar tudo'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Nome"
 
@@ -826,13 +825,12 @@ msgstr "Argumento do usuário para a ação"
 msgid "Add Address to Book"
 msgstr "Adicionar ao Catálogo de Endereços"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Endereço"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Notas"
 
@@ -840,28 +838,28 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione Pasta do Catálogo de Endereços"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arquivo"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Arquivo/Novo _Livro"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Arquivo/Novo _vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Arquivo/Novo _JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arquivo/Novo Servidor _LDAP"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -869,96 +867,96 @@ msgstr "/_Arquivo/Novo Servidor _LDAP"
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Arquivo/_Editar"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Arquivo/_Apagar"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/Co_lar"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Endereço"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Endereço/Novo _Endereço"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Endereço/Novo _Grupo"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Endereço/Nova _Pasta"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Endereço/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Endereço/_Editar"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/_Apagar"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_juda"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_juda/_Sobre"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Novo _Endereço"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Novo _Grupo"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -970,74 +968,79 @@ msgstr "/Nova _Pasta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Apagar"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 msgid "/_Copy"
 msgstr "/_Copiar"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 msgid "/_Paste"
 msgstr "/Co_lar"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Para:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Cco:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Procurar"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Para:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Cco:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Cores"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Apagar endereço(s)"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Apagar realmente o(s) endereço(s)?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1046,36 +1049,36 @@ msgstr ""
 "Você quer apagar a pasta E todos os endereços em `%s' ?\n"
 "Caso apague somente a pasta, os endereços serão movidos para a pasta pai."
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "_Folder only"
 msgstr "_Pasta apenas"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "Folder and _addresses"
 msgstr "Pasta e _endereços"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Apagar realmente `%s' ?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Novo usuário, não foi possível salvar arquivos de livro de endereços."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Catálogo de endereços antigo convertido com sucesso."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1083,7 +1086,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:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1091,7 +1094,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:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1099,7 +1102,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:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1107,92 +1110,92 @@ 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:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Erro convertendo catálogo de endereços"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Conversão do catálogo de endereços"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Erro no Catálogo de Endereços"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice do endereço"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Catálogo de endereços antigo convertido, não foi possível salvar o arquivo "
 "de indíce do novo endereço"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Não foi possível converter o catálogo de endereços e não foi possível criar "
 "arquivos novos para o catálogo de endereços."
 
-#: src/addressbook.c:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Erro na conversão do catálogo de endereços"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Conversão do Catálogo de Endereços"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Catálogo de Endereços"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Pessoa"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Pasta"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1815,83 +1818,77 @@ msgstr "_Substituir"
 msgid "_Insert"
 msgstr "_Inserir"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Editar endereço"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Adicionar nova pessoa"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Editar detalhes da pessoa"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Endereço de e-mail não especificado."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Um Nome e um Valor devem ser informados"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Editar dados pessoais"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Exibir Nome"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Último Nome"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Primeiro Nome"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Apelido"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "Endereço de e-mail"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Apelido"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Mover para cima"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Mover para Baixo"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Modificar"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Valor"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Dados Básicos"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Atributos de Usuário"
 
@@ -1928,57 +1925,59 @@ msgstr "Adicionar Novo Catálogo de endereços"
 msgid "A Group Name must be supplied."
 msgstr "Um Nome de Grupo deve ser informado."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Editar Dados do Grupo"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Nome do Grupo"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Endereços no Grupo"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Endereços Disponíveis"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Endereços Disponíveis"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Endereços no Grupo"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Mover endreços de e-mail para ou a partir grupos com as setas dos botões"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Editar Detalhes de Grupo"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Adicionar Novo Grupo"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Editar pasta"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Nome da nova pasta:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -5448,14 +5447,6 @@ msgstr "Exibir configuração dos itens"
 msgid "Available items"
 msgstr "Itens disponíveis"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Itens mostrados"
@@ -6811,6 +6802,15 @@ msgstr "Sai_r"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Editar endereço"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
diff --git a/po/ro.po b/po/ro.po
index 123f40d8..a018461e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+0900\n"
 "PO-Revision-Date: 2007-02-09 09:49+0200\n"
 "Last-Translator: Cristian Secară <cristi@secarica.ro>\n"
 "Language-Team: \n"
@@ -695,12 +695,11 @@ msgstr ""
 "coloana 'G'\n"
 "pentru a activa recepționarea mesajelor la comanda 'Verifică tot'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Nume"
 
@@ -840,13 +839,12 @@ msgid "Add Address to Book"
 msgstr "Adăugare în agendă"
 
 # (în meniu la compunere)
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Agendă"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Observații"
 
@@ -854,28 +852,28 @@ msgstr "Observații"
 msgid "Select Address Book Folder"
 msgstr "Selectați folderul pentru agendă"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fișier"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Fișier/A_gendă nouă"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Fișier/_vCard nou"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Fișier/_JPilot nou"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fișier/Server _LDAP nou"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -883,97 +881,97 @@ msgstr "/_Fișier/Server _LDAP nou"
 msgid "/_File/---"
 msgstr "/_Fișier/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Fișier/_Editează"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Fișier/Ș_terge"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Fișier/_Salvează"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fișier/Î_nchide"
 
 # obs: comun și în main menu și în rmb agendă
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editare"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editare/_Copiază"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/_Editare/Li_pește"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/A_dresă"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/A_dresă/_Adresă nouă"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/A_dresă/_Grup nou"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/A_dresă/_Folder nou"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/A_dresă/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/A_dresă/_Editează"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/A_dresă/Ș_terge"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Unelte"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Unelte/Importă fișier _LDIF"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ajutor"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ajutor/_Despre"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/_Adresă nouă"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/_Grup nou"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/_Folder nou"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -986,76 +984,81 @@ msgid "/---"
 msgstr "/---"
 
 # obs: comun și la intrare în agendă și la rmb pe mesaj
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/Șter_ge"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Copiază..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Editare/Li_pește"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "Adresă e-mail"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Agendă"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr " Nume:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Către:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Bcc:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Șterge"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Adaugă"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Căutare"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Către:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Culori"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Șterge adresa (adresele)"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Sigur ștergeți adresa (adresele) ?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1064,36 +1067,36 @@ msgstr ""
 "Doriți să ștergeți folderul ȘI toate adresele din '%s' ?\n"
 "Dacă ștergeți doar folderul, adresele vor fi mutate în folderul părinte."
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Ștergere folder"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "_Folder only"
 msgstr "Doar _folder"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "Folder and _addresses"
 msgstr "Folder și _adrese"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Sigur ștergeți '%s' ?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Utilizator nou, fișierul index nu a putut fi salvat."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Utilizator nou, fișierele agendei nu au putut fi salvate."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Agenda veche a fost convertită cu succes."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1101,7 +1104,7 @@ msgstr ""
 "Agenda veche a fost convertită, iar\n"
 "fișierul index al noii agende nu a putut fi salvat."
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1109,7 +1112,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, dar\n"
 "au fost create fișierele noi de agendă goală."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1117,7 +1120,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, iar\n"
 "fișierele noi de agendă nu au putut fi create."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1125,92 +1128,92 @@ msgstr ""
 "Agenda nu a putut fi convertită\n"
 "și fișierele noi de agendă nu au putut fi create."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Eroare agendă"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Fișierul index al agendei nu a putut fi citit"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Interfață"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Agendă"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Persoană"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "Adresă e-mail"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Grupă"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Folder"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1838,83 +1841,77 @@ msgstr "Înl_ocuiește"
 msgid "_Insert"
 msgstr "_Inserează"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Editează adresă"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Adaugă persoană nouă"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Editează detalii persoană"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Trebuie furnizată o adresă e-mail."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Trebuiesc furnizate un nume și o valoare."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Editează date personale"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Nume afișat"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Nume"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Prenume"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Pseudonim"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "Adresă e-mail"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Alias"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Mută sus"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Mută jos"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Modifică"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Șterge"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Valoare"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Date de bază"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Atribute utilizator"
 
@@ -1952,56 +1949,58 @@ msgstr "Adăugă agendă nouă"
 msgid "A Group Name must be supplied."
 msgstr "Trebuie furnizat un nume de grup."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Editează date grup"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Nume grup"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Adrese în grup"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Adrese disponibile"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Adrese disponibile"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Adrese în grup"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Mută adresele e-mail din sau în grup cu ajutorul butoanelor săgeți"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Editează detalii grup"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Adaugă grup nou"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Editează folder"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Introduceți noul nume al folderului:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Folder nou"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Introduceți numele noului folder:"
 
@@ -5524,14 +5523,6 @@ msgstr "Stabilire elemente afișate"
 msgid "Available items"
 msgstr "Elemente disponibile"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Elemente afișate"
@@ -6899,5 +6890,14 @@ msgstr "_Ieșire"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Editează adresă"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
diff --git a/po/ru.po b/po/ru.po
index a29a09b8..f36e4f46 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+0900\n"
 "PO-Revision-Date: 2006-06-09 14:30+0400\n"
 "Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -687,12 +687,11 @@ msgstr ""
 "Пометьте в колонке \"G\" учётные записи, которые нужно проверять\n"
 "по команде \"Получить все\"."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Имя"
 
@@ -824,13 +823,12 @@ msgstr "Пользовательский параметр действия"
 msgid "Add Address to Book"
 msgstr "Добавление адреса в книгу"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Примечание"
 
@@ -838,28 +836,28 @@ msgstr "Примечание"
 msgid "Select Address Book Folder"
 msgstr "Выберите папку в адресной книге"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/Файл/Новая книга"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/Файл/Новый файл vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новый файл JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новый сервер LDAP"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -867,96 +865,96 @@ msgstr "/Файл/Новый сервер LDAP"
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/Файл/Правка"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/Файл/Удалить"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/Файл/Сохранить"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрыть"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Правка"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Правка/Копировать"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/Правка/Вставить"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/Адрес"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/Адрес/Новый адрес"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/Адрес/Новая группа"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/Адрес/Новая папка"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/Адрес/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/Адрес/Правка"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Инструменты"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Инструменты/Импорт файла LDIF"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Новый адрес"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Новая группа"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Новая папка"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -968,76 +966,81 @@ msgstr "/Новая папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/Удалить"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/Копировать"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Правка/Вставить"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Имя:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Кому:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Копия:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Скрытно:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Добавить"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Найти"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Кому:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Копия:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Скрытно:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Цвета"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Удалить адрес(а)"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Действительно удалить адрес(а)?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1046,36 +1049,36 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Удалить папку"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "_Folder only"
 msgstr "Только папку"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "Folder and _addresses"
 msgstr "Папку и адреса"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Действительно удалить \"%s\"?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Новый пользователь; не удалось сохранить индексный файл."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Новый пользователь; не удалось сохранить файлы адресной книги."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Старая адресная книга успешно преобразована."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1083,7 +1086,7 @@ msgstr ""
 "Старая адресная книга преобразована,\n"
 "не удалось сохранить новый индексный файл."
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1091,7 +1094,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "создана пустая адресная книга."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1099,7 +1102,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "ошибка при создании файлов адресной книги."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1107,91 +1110,91 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "кроме того, произошла ошибка при создании файлов новой адресной книги."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Ошибка при работе с адресной книгой"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Не удалось прочитать индекс адресов"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старая адресная книга преобразована, не удалось сохранить новый индексный "
 "файл"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2597
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, создана пустая адресная книга."
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2603
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, ошибка при создании новых файлов "
 "адресной книги"
 
-#: src/addressbook.c:2583
+#: src/addressbook.c:2609
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, кроме того, произошла ошибка при "
 "создании новых файлов адресной книги."
 
-#: src/addressbook.c:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Контакт"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Группа"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1811,83 +1814,77 @@ msgstr "Заменить"
 msgid "_Insert"
 msgstr "Вставить"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Редактирование адреса"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Новый контакт"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Редактирование сведений о контакте"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Необходимо указать адрес E-Mail."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Необходимо указать имя и значение."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Редактирование сведений о контакте"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Отображаемое имя"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Фамилия"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Имя"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Псевдоним"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "Адрес E-Mail"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Псевдоним"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Вверх"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Вниз"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Изменить"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Очистить"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Значение"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Основные сведения"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Пользовательские атрибуты"
 
@@ -1924,56 +1921,58 @@ msgstr "Добавление новой адресной книги"
 msgid "A Group Name must be supplied."
 msgstr "Необходимо указать название группы."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Изменение сведений о группе"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Название группы"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Адреса в группе"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Доступные адреса"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Доступные адреса"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Адреса в группе"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Используйте кнопки со стрелками для изменения списка адресов группы"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Изменение сведений о группе"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Добавление новой группы"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Изменить имя папки"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Введите новое имя папки:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Новая папка"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Введите имя новой папки:"
 
@@ -5460,14 +5459,6 @@ msgstr "Настройка отображения заголовков"
 msgid "Available items"
 msgstr "Доступные элементы"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Отображаемые элементы"
@@ -6827,6 +6818,15 @@ msgstr "Выход"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Редактирование адреса"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
diff --git a/po/sk.po b/po/sk.po
index 562719ac..d606123b 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+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"
@@ -680,12 +680,11 @@ 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:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Meno"
 
@@ -819,13 +818,12 @@ msgstr "Používateľský parameter pre akciu"
 msgid "Add Address to Book"
 msgstr "Pridať adresu do adresára"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Adresár"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Poznámky"
 
@@ -833,29 +831,29 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Súbor"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Súbor/Nový _Adresár"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Súbor/Nový _vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Súbor/Nový _JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Súbor/Nový _Server"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -863,96 +861,96 @@ msgstr "/_Súbor/Nový _Server"
 msgid "/_File/---"
 msgstr "/_Súbor/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Súbor/_Upraviť"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Súbor/Z_mazať"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _Adresa"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _Skupina"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nový _Priečinok"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Adresa/--- "
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Upraviť"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Nová _Adresa"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Nová _Skupina"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -964,76 +962,81 @@ msgstr "/Nový _Priečinok"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/Z_mazať"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopírovať..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Meno:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Komu:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Kópia:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Slepá kópia:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Zmazať"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Pridať"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Vyhľadať"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Komu:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Kópia:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Slepá kópia:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Zavrieť"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Zmazať adresu(y)"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Naozaj zmazať adresu(y)?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1042,38 +1045,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:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "_Folder only"
 msgstr "Len priečinok"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Priečinok aj adresy"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Naozaj zmazať '%s' ?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Nový uživateľ; nepodarilo sa uložiť indexový súbor."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Nový uživateľ; nedajú sa uložiť súbory adresára."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Konverzia starého adresára prebehla úspešne."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1081,7 +1084,7 @@ msgstr ""
 "Konverzia starého adresára prebehla,\n"
 "nedá sa uložiť indexový súbor nového adresára"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1089,7 +1092,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "ale boli vytvorené prázdne súbory nového adresára."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1097,7 +1100,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1105,92 +1108,92 @@ msgstr ""
 "Nedá sa konvertovať starý adresár\n"
 "a nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Chyba v adresári"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Nedá sa načítať zoznam adries"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Ovládanie"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adresár"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Priečinok"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1852,83 +1855,77 @@ msgstr "Nahradiť"
 msgid "_Insert"
 msgstr "Vložiť"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Upraviť adresu"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Pridať kontakt"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Upraviť údaje o kontakte"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Musíte zadať e-mailovú adresu."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Musíte zadať názov a hodnotu."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Upraviť údaje o kontakte"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Zobraziť meno"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Priezvisko"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Krstné meno"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Prezývka"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "E-mailová adresa"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Alias"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Posunúť nahor"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Posunúť nadol"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Zmeniť"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Vyčistiť"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Hodnota"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Základné údaje"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Atribúty uživateľa"
 
@@ -1965,57 +1962,59 @@ msgstr "Pridať nový adresár"
 msgid "A Group Name must be supplied."
 msgstr "Musíte zadať názov skupiny."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Upraviť údaje skupiny"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Názov skupiny"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Adresy v skupine"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Dostupné adresy"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Dostupné adresy"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Adresy v skupine"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "E-mailové adresy môžte presúvať z a do skupiny pomocou tlačítok so šípkami"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Upraviť detaily skupiny"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Pridať novú skupinu"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Upraviť priečinok"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nový priečinok"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 
@@ -5555,14 +5554,6 @@ msgstr "Zobrazované hlavičky"
 msgid "Available items"
 msgstr "Dostupné položky"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Zobrazené položky"
@@ -6975,6 +6966,15 @@ msgstr "Ukončiť"
 msgid "Sylpheed"
 msgstr "Starší Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Upraviť adresu"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
@@ -7273,9 +7273,6 @@ msgstr "Starší Sylpheed"
 #~ msgid "OK"
 #~ msgstr "OK"
 
-#~ msgid "Close"
-#~ msgstr "Zavrieť"
-
 #~ msgid "Cancel"
 #~ msgstr "Storno"
 
diff --git a/po/sl.po b/po/sl.po
index 02bc1bfa..4fd6fd2b 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+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"
@@ -688,12 +688,11 @@ 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:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Ime"
 
@@ -825,13 +824,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Naslov"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Opombe"
 
@@ -839,29 +837,29 @@ msgstr "Opombe"
 msgid "Select Address Book Folder"
 msgstr "Izberite mapo za adresar"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _Knjiga"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _v kartica"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Nov _JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -869,96 +867,96 @@ msgstr "/_Datoteka/Nov _strežnik"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Urejanje"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Brisanje"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Urejanje"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Naslov"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Naslov/Nov n_aslov"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Naslov/Nova _skupina"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Naslov/Nova _mapa"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Naslov/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Naslov/_Urejanje"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Nov n_aslov"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Nova _skupina"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -970,76 +968,81 @@ msgstr "/Nova _mapa"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Brisanje"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/Prepiš_i..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Za:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Kp:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Skp:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Izbriši"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Dodajanje"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Poišči"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Za:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Kp:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Skp:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Zapri"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Brisanje naslova"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Res želite izbrisati naslov(e)?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1048,38 +1051,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:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo mapa"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mapa in naslovi"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Res želite izbrisati '%s' ?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Nov uporabnik, ne morem shraniti indeksne datoteke."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Nov uporabnik, ne morem shraniti datotek z iminiki naslovov."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Star imenik naslovov je bil uspešno pretvorjen."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1087,7 +1090,7 @@ msgstr ""
 "Stari imenik naslovov pretvorjen,\n"
 "ne morem shraniti nove indeksne datoteke naslovov"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1095,7 +1098,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "sem pa naredil prazne nove datoteke imenikov naslovov."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1103,7 +1106,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "ne morem narediti novih datotek z imeniki naslovov."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1111,91 +1114,91 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov\n"
 "in ne morem narediti novih datotek z imeniki naslovov"
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Pretvarjam imenik naslovov"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Napaka v imeniku naslovov"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Ne morem prebrati indeksa naslovov"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Pretvorba imenika naslovov"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Oseba"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mapa"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "v-kartica"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "Strežnik LDAP"
 
@@ -1858,83 +1861,77 @@ msgstr "Zamenjaj"
 msgid "_Insert"
 msgstr "Vstavi"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Urejanje naslova"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Dodaj novo osebo"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Uredi podatke o osebi"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Elektronski naslov mora biti podan."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Ime in vrednost morata biti podana."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Urejanje podatkov o osebi"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Prikaži ime"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Priimek"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Ime"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Vzdevek"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "Elektronski Naslov"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Vzdevek"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Premakni navzgor"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Premakni navzdol"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Spremeni"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Počisti"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Vrednost"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Osnovni podatki"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Uporabniški atributi"
 
@@ -1971,56 +1968,58 @@ msgstr "Dodaj nov imenik naslovov"
 msgid "A Group Name must be supplied."
 msgstr "Ime skupine mora biti podano."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Urejanje podatkov o skupini"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Ime skupine"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Naslovi v skupini"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Razpoložljivi naslovi"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Razpoložljivi naslovi"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Naslovi v skupini"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Prestavljate naslove v ali iz skupine s klikanjem na puščice"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Urejanje podatkov o skupini"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Dodaj novo skupino"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Urejanje mape"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Vnesite novo ime mape:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Vnesite ime nove mape:"
 
@@ -5557,14 +5556,6 @@ msgstr "Nastavitev prikaza zaglavja"
 msgid "Available items"
 msgstr "Razpoložljivi deli"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Prikazani kosi"
@@ -6978,6 +6969,15 @@ msgstr "Končaj"
 msgid "Sylpheed"
 msgstr "Stari Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Urejanje naslova"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
@@ -7261,9 +7261,6 @@ msgstr "Stari Sylpheed"
 #~ msgid "OK"
 #~ msgstr "V redu"
 
-#~ msgid "Close"
-#~ msgstr "Zapri"
-
 #~ msgid "Cancel"
 #~ msgstr "Prekliči"
 
diff --git a/po/sr.po b/po/sr.po
index 9271de82..37e86dca 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -688,12 +688,11 @@ 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:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Ime"
 
@@ -825,13 +824,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Beleške"
 
@@ -839,29 +837,29 @@ msgstr "Beleške"
 msgid "Select Address Book Folder"
 msgstr "Odaberite direktorijum adresara"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _server"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -869,96 +867,96 @@ msgstr "/_Datoteka/Novi _server"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Izmeni"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _direktorijum"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Izmeni"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -970,76 +968,81 @@ msgstr "/Novi _direktorijum"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiranje..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Adresar"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Za:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Bcc:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Potraži"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Za:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Zatvori"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Zaista obrisati adresu/e?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1049,38 +1052,38 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo direktorijum"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Direktorijum i adrese"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Zaista obrisati `%s' ?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu sačuvati index datoteku."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu sačuvati datoteke adresara."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspešno prebačen."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1088,7 +1091,7 @@ msgstr ""
 "Stari adresar ne može biti prebačen,\n"
 "ne mogu sačuvati novu index datoteku adresara."
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1096,7 +1099,7 @@ msgstr ""
 "Ne mogu prebaciti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1104,7 +1107,7 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1112,84 +1115,84 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "i ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Prebacivanje adresara"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Izgled programa"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Direktorijum"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1853,83 +1856,77 @@ msgstr "Zameni"
 msgid "_Insert"
 msgstr "Unesi"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Izmeni adresu"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Dodaj novu osobu"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Izmeni detalje osobe"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Adresa e-pošte mora biti navedena."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Ime i iznos moraju biti navedeni."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Izmeni lične podatke"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Prikaz imena"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Prezime"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Ime"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Nadimak"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "Adresa e-pošte"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Alias"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Pomeri gore"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Pomeri dole"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Izmeni"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Očisti"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Iznos"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Osnovno"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Atributi korisnika"
 
@@ -1966,56 +1963,58 @@ msgstr "Dodaj Novi adresar"
 msgid "A Group Name must be supplied."
 msgstr "Ime grupe mora biti navedeno."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Izmeni podatke za grupu"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Ime grupe"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Adrese u grupi"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Dostupne adrese"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Dostupne adrese"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Adrese u grupi"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Pomerite adrese e-pošte u ili iz grupe sa strelicama"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Izmeni detalje grupe"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Dodaj novu grupu"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Izmeni direktorijum"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
@@ -5552,14 +5551,6 @@ msgstr "Prikaz podešavanje zaglavlja"
 msgid "Available items"
 msgstr "Dostupne pojedinosti"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Prikazane pojedinosti"
@@ -6976,6 +6967,15 @@ msgstr "Izlaz"
 msgid "Sylpheed"
 msgstr "Stari Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Izmeni adresu"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
@@ -7259,9 +7259,6 @@ msgstr "Stari Sylpheed"
 #~ msgid "OK"
 #~ msgstr "U redu"
 
-#~ msgid "Close"
-#~ msgstr "Zatvori"
-
 #~ msgid "Cancel"
 #~ msgstr "Odustani"
 
diff --git a/po/sv.po b/po/sv.po
index 99fa833f..6c3f0fe9 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+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"
@@ -685,12 +685,11 @@ msgstr ""
 "Markera rutorna i `G'-kolumnen för att aktivera meddelandehämtning\n"
 "via \"Hämta alla\""
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Namn"
 
@@ -822,13 +821,12 @@ msgstr "Åtgärdens användarargument"
 msgid "Add Address to Book"
 msgstr "Lägg till i adressbok"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Adress"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Kommentarer"
 
@@ -836,29 +834,29 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arkiv"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Arkiv/Ny _bok"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Arkiv/Nytt _vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Arkiv/Ny _JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arkiv/Ny _Server"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -866,96 +864,96 @@ msgstr "/_Arkiv/Ny _Server"
 msgid "/_File/---"
 msgstr "/_Arkiv/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Arkiv/_Redigera"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Arkiv/_Ta bort"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Arkiv/_Spara"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Arkiv/St_äng"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigera"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigera/_Kopiera"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/A_dress"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/A_dress/Ny _adress"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/A_dress/Ny _grupp"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/A_dress/Ny _mapp"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/A_dress/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/A_dress/_Redigera"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/V_erktyg"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Ny _adress"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Ny _grupp"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -967,76 +965,81 @@ msgstr "/Ny _mapp"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Ta bort"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiera..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Namn:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Till:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Kopia:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Dold kopia:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Slå upp"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Till:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Kopia:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Dold kopia:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Stäng"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Ta bort adress(er)"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Vill du verkligen ta bort adress(erna)?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1046,36 +1049,36 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "_Folder only"
 msgstr "_Endast mapp"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "Folder and _addresses"
 msgstr "Mapp och _adresser"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Vill du verkligen ta bort \"%s\" ?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Ny användare, kunde inte spara indexfil."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Ny användare, kunde inte spara adressboksfiler."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Den gamla adressboken är konverterad."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1083,7 +1086,7 @@ msgstr ""
 "Gammal adressbok konverterad,\n"
 "kunde inte spara ny adressindexfil"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1091,7 +1094,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1099,7 +1102,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1107,86 +1110,86 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Adressboksfel"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 msgid "Old address book converted, could not save new address index file"
 msgstr "Gammal adressbok konverterad, kunde inte skapa ny adressindexfil"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mapp"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
@@ -1812,83 +1815,77 @@ msgstr "_Ersätt"
 msgid "_Insert"
 msgstr "_Infoga"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Redigera adress"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Lägg till ny person"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Redigera persondetaljer"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "En e-postadress måste anges."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Namn och Värde måste anges."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Redigera persondata"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Visat namn"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Efternamn"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Förnamn"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Smeknamn"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "E-postadress"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Alias"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Flytta upp"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Flytta ner"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Ändra"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Töm"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Värde"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Grundläggande data"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Användarattribut"
 
@@ -1925,56 +1922,58 @@ msgstr "Lägg till ny adressbok"
 msgid "A Group Name must be supplied."
 msgstr "Ett gruppnamn måste anges."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Redigera gruppdata"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Gruppnamn"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Adresser i grupp"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Tillgängliga adresser"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Tillgängliga adresser"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Adresser i grupp"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Flytta e-postadresser till eller från grupp med pilknapparna"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Redigera gruppdetaljer"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Lägg till ny grupp"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Redigera mapp"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Skriv in det nya namnet på mappen:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -5455,14 +5454,6 @@ msgstr "Brevhuvudsinställning"
 msgid "Available items"
 msgstr "Tillgängliga poster"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Visade poster"
@@ -6841,6 +6832,15 @@ msgstr "Avsluta"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Redigera adress"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
@@ -7141,9 +7141,6 @@ msgstr "Sylpheed"
 #~ msgid "OK"
 #~ msgstr "OK"
 
-#~ msgid "Close"
-#~ msgstr "Stäng"
-
 #~ msgid "Cancel"
 #~ msgstr "Avbryt"
 
diff --git a/po/tr.po b/po/tr.po
index 4b1df2e4..2b71c18a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+0900\n"
 "PO-Revision-Date: 2004-12-03 11:44+0200\n"
 "Last-Translator: Arman Aksoy <armish@linux-sevenler.org>\n"
 "Language-Team:  <gnome-turk@gnome.org>\n"
@@ -683,12 +683,11 @@ msgstr ""
 "kutucukları tıklanarak bu hesaplar için `Hepsini al' seçeneğini \n"
 "etkin duruma getirilebilir."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "İsim"
 
@@ -822,13 +821,12 @@ msgstr "Eylemin kullanıcı argümanı"
 msgid "Add Address to Book"
 msgstr "Adres Defterine Ekle"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Notlar"
 
@@ -836,29 +834,29 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Dosya"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Dosya/Yeni _Defter"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Dosya/Yeni _vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Dosya/Yeni _JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Dosya/Yeni _Sunucu"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -866,96 +864,96 @@ msgstr "/_Dosya/Yeni _Sunucu"
 msgid "/_File/---"
 msgstr "/_Dosya/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Dosya/_Düzenle"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Dosya/_Sil"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Dosya/_Kaydet"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Dosya/K_apat"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Dü_zenle/K_opyala"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Yeni _Adres"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Yeni _Grup"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Yeni _Dizin"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/_Adres/Dü_zenle"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/A_raçlar"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Yeni _Adres"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Yeni _Grup"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -967,76 +965,81 @@ msgstr "/Yeni _Dizin"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Sil"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopyala..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Adres defteri"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "İsim:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Kime:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Bcc:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Sil"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Ekle"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Ara"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Kime:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Kapat"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Adres(ler)i sil"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Adres(ler) silinsin mi?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1046,38 +1049,38 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Dizini sil"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "_Folder only"
 msgstr "Sadece dizin"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Dizin ve Adresler"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "`%s' silinsin mi?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Yeni kullanıcı, indeks dosyası kaydedilemedi."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Yeni kullanıcı, adres defteri dosyaları kaydedilemedi."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Eski adres defteri başarıyla çevrildi."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1085,7 +1088,7 @@ msgstr ""
 "Eski adres defteri çevrildi,\n"
 "yeni adres indeks dosyası kaydedilemedi"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1093,7 +1096,7 @@ msgstr ""
 "Adres defteri çevrilemedi,\n"
 "ancak boş bir adres defteri dosyası oluşturuldu."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1101,7 +1104,7 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1109,89 +1112,89 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Adres defteri çevrimi"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Adres Defteri Hatası"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Adres indeksi okunamadı"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Adres Defteri Çevrim Hatası"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Adres Defteri Çevrimi"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Arayüz"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adres Defteri"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Kişi"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "İleti Adresi"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Grup"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Dizin"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "LDAP Sunucu"
 
@@ -1845,83 +1848,77 @@ msgstr "Değiştir"
 msgid "_Insert"
 msgstr "İçer"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Adresi Düzenle"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Yeni Kişi Ekle"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Kişi Ayrıntılarını Düzenle"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Bir e-posta adresi girilmelidir."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Bir isim ve değer girilmelidir."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Kişi Verilerini Düzenle"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Görüntülenecek İsim"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Soyadı"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Adı"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Lakabı"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "E-posta Adresi"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Takma isim"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Yukarı"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Aşağı"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Düzenle"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Temizle"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Değer"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Temel Veriler"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Kullanıcı Öznitelikleri"
 
@@ -1958,57 +1955,59 @@ msgstr "Yeni Adres Defteri Ekle"
 msgid "A Group Name must be supplied."
 msgstr "Bir Grup Adı verilmelidir."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Grup Bilgisini Düzenle"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Grup Adı"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Gruptaki Adresler"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Kullanılabilir Adresler"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Kullanılabilir Adresler"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Gruptaki Adresler"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "E-posta adresini yön tuşlarını kullanarak gruba yerleştirin veya kaldırın"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Grup Ayrıntılarını Düzenle"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Yeni Grup Ekle"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Dizini düzenle"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Dizinin yeni adıni girin:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Yeni dizin"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin adını verin:"
 
@@ -5527,14 +5526,6 @@ msgstr "Görüntü başlığı ayarları"
 msgid "Available items"
 msgstr "Kullanılabilir öğeler"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Görüntülenen öğeler"
@@ -6926,6 +6917,15 @@ msgstr "Çık"
 msgid "Sylpheed"
 msgstr "Eski Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Adresi Düzenle"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
@@ -7220,9 +7220,6 @@ msgstr "Eski Sylpheed"
 #~ msgid "OK"
 #~ msgstr "Tamam"
 
-#~ msgid "Close"
-#~ msgstr "Kapat"
-
 #~ msgid "Cancel"
 #~ msgstr "İptal"
 
diff --git a/po/uk.po b/po/uk.po
index 84d87c34..0f8b06e6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+0900\n"
 "PO-Revision-Date: 2007-01-05 13:58+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -689,12 +689,11 @@ msgstr ""
 "Порядок перевірки нових листів. Позначте в колонці `G'\n"
 "account'и, які поповнюються через `Отримати всі'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Ім'я"
 
@@ -826,13 +825,12 @@ msgstr "Аргумент користувача"
 msgid "Add Address to Book"
 msgstr "Додати адресу до книги"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Адреса"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Нотатки"
 
@@ -840,28 +838,28 @@ msgstr "Нотатки"
 msgid "Select Address Book Folder"
 msgstr "Обрати папку адресної книги"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/Файл/Нова книга"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/Файл/Нова vCard"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новий JPilot"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новий сервер LDAP"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -869,96 +867,96 @@ msgstr "/Файл/Новий сервер LDAP"
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/Файл/Редагувати"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/Файл/Видалити"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/Файл/Зберегти"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Редагувати"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Редагувати/Копіювати"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/Редагувати/Вставити"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/Адреса"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/Адреса/Нова адреса"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/Адреса/Нова група"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/Адреса/Нова папка"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/Адреса/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/Адреса/Редагувати"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Інструменти"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Інструменти/Імпортувати файл LDIF"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Нова адреса"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/Нова група"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Нова папка"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -970,76 +968,81 @@ msgstr "/Нова папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/Видалити"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/Копіювати"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Редагувати/Вставити"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ім'я:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Кому:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Копія:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Приховано:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Видалити"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Додати"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Пошук"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Кому:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Копія:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Приховано:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Кольори"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Видалити адресу(и)"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Дійсно видалити адресу(и)?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1048,36 +1051,36 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Видалити папку"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "_Folder only"
 msgstr "Тільки папку"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "Folder and _addresses"
 msgstr "Папку та адреси"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Дійсно видалити `%s' ?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "Новий користувач, не вдалось зберегти покажчик."
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "Новий користувач, не вдалось зберегти адресну книгу."
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Стару адресну книгу успішно конвертовано."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1085,7 +1088,7 @@ msgstr ""
 "Стару адресну книгу конвертовано,\n"
 "не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1093,7 +1096,7 @@ msgstr ""
 "Не вдалось конвертувати адресну книгу,\n"
 "але створено нову (порожню)."
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1101,7 +1104,7 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1109,85 +1112,85 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Помилка в адресній книзі"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Не вдалось прочитати покажчик адрес"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Стару адресну книгу конвертовано, не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2597
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Не вдалось конвертувати адресну книгу, але створено нову (порожню)."
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2603
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:2583
+#: src/addressbook.c:2609
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Інтерфейс"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Особа"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1810,83 +1813,77 @@ msgstr "Замінити"
 msgid "_Insert"
 msgstr "Вставити"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Редагувати адресу"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Додати нову особу"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Редагувати подробиці про особу"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Адреса e-mail обов'язкова."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Потрібно надати ім'я та значення."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Редагувати особисті дані"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Ім'я для списку"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Прізвище"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Ім'я"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Прізвисько"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "Адреса e-mail"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Синонім"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Вгору"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Вниз"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Змінити"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Очистити"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Значення"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Основні дані"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Атрибути користувача"
 
@@ -1923,56 +1920,58 @@ msgstr "Додати нову адресну книгу"
 msgid "A Group Name must be supplied."
 msgstr "Потрібно вказати назву групи."
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Редагувати дані групи"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Назва групи"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Адреси в групі"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Наявні адреси"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Наявні адреси"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Адреси в групі"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Перемістити адреси e-mail з чи в групу кнопкою з стрілкою"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Редагувати подробиці про групу"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Додати нову групу"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Редагувати папку"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Введіть нову назву папки:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Введіть назву нової папки:"
 
@@ -5436,14 +5435,6 @@ msgstr "Налаштування відображення заголовка"
 msgid "Available items"
 msgstr "Можливі поля"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Показані поля"
@@ -6807,6 +6798,15 @@ msgstr "Вихід"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Редагувати адресу"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
diff --git a/po/vi.po b/po/vi.po
index fe619c8f..062df509 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+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"
@@ -667,12 +667,11 @@ 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:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "Tên"
 
@@ -804,13 +803,12 @@ msgstr "Đối số người dùng của hành động"
 msgid "Add Address to Book"
 msgstr "Thêm địa chỉ vào sổ"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "Ghi chú"
 
@@ -818,28 +816,28 @@ msgstr "Ghi chú"
 msgid "Select Address Book Folder"
 msgstr "Chọn thư mục sổ địa chỉ"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Tập tin"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/_Tập tin/_Sổ mới"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/_Tập tin/_vCard mới"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/_Tập tin/_JPilot mới"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_File/New _LDAP Server"
 msgstr "/_Tập tin/_Máy chủ LDAP mới"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -847,96 +845,96 @@ msgstr "/_Tập tin/_Máy chủ LDAP mới"
 msgid "/_File/---"
 msgstr "/_Tập tin/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/_Tập tin/Soạ_n"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/_Tập tin/_Xoá"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/_Tập tin/_Lưu"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Tập tin/Đón_g"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Soạn"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Soạn/_Sao chép"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/_Soạn/_Dán"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/Đị_a chỉ"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/Đị_a chỉ/Địa chỉ _mới"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/Đị_a chỉ/_Nhóm mới"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/Đị_a chỉ/_Thư mục mới"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/Đị_a chỉ/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/Đị_a chỉ/_Soạn"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/Đị_a chỉ/_Xoá"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Công cụ"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hỗ trợ"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hỗ trợ/_Giới thiệu"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/Địa chỉ _mới"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/_Nhóm mới"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/Thư _mục mới"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -948,76 +946,81 @@ msgstr "/Thư _mục mới"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Xoá"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Sao chép"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Soạn/_Dán"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Sổ địa chỉ"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Tên:"
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "Người nhận:"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "Bcc:"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "Xoá"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "Thêm"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "Tra cứu"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "Người nhận:"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "Màu sắc"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "Xoá địa chỉ"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "Thực sự muốn xoá (các) địa chỉ này?"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1026,36 +1029,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:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Xoá thư mục"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "_Folder only"
 msgstr "_Chỉ thư mục"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "Folder and _addresses"
 msgstr "Thư mục và địa c_hỉ"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Thực sự muốn xoá `%s' ?"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 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:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 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:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "Sổ địa chỉ cũ đã được chuyển đổi thành công."
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1063,7 +1066,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:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1071,7 +1074,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:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1079,7 +1082,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:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1087,89 +1090,89 @@ 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:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "Lỗi sổ địa chỉ"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "Không thể đọc mục lục địa chỉ"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 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:2571
+#: src/addressbook.c:2597
 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:2577
+#: src/addressbook.c:2603
 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:2583
+#: src/addressbook.c:2609
 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:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Giao diện"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "Sổ địa chỉ"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "Cá nhân"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "Nhóm"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Thư mục"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "Máy chủ LDAP"
 
@@ -1788,83 +1791,77 @@ msgstr "_Thay thế"
 msgid "_Insert"
 msgstr "_Chèn"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "Sửa địa chỉ"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "Thêm người mới"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "Soạn thông tin về cá nhân"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "Phải cung cấp một địa chỉ email."
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "Phải cung cấp một Tên và Giá trị."
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "Soạn dữ liệu về cá nhân"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "Họ"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "Tên"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "Biệt danh"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "Địa chỉ email"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "Bí danh"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "Chuyển lên"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "Chuyển xuống"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "Thay đổi"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "Xoá"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Giá trị"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "Dữ liệu cơ bản"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "Các thuộc tính người dùng"
 
@@ -1901,56 +1898,58 @@ msgstr "Thêm Sổ địa chỉ mới"
 msgid "A Group Name must be supplied."
 msgstr "Phải cung cấp một tên nhóm"
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "Soạn dữ liệu cho nhóm"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "Tên nhóm"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "Các địa chỉ trong nhóm"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "Các địa chỉ hiện có"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "Các địa chỉ hiện có"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "Các địa chỉ trong nhóm"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Chuyển địa chỉ email tới hoặc từ nhóm với nút mũi tên"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "Soạn thông tin về nhóm"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "Thêm nhóm mới"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "Sửa thư mục"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "Đặt tên mới cho thư mục:"
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "Thư mục mới"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Đặt tên cho thư mục mới:"
 
@@ -5423,14 +5422,6 @@ msgstr "Hiển thị thiết lập header"
 msgid "Available items"
 msgstr "Các mục hiện có"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "Các mục đã hiển thị"
@@ -6787,6 +6778,15 @@ msgstr "_Thoát"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "Sửa địa chỉ"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 364372ed..698779ba 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+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"
@@ -677,12 +677,11 @@ msgstr ""
 "按照该顺序检查新邮件。选中“G”列的复选框，在“全部接收”\n"
 "时会检查新邮件。"
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "名称"
 
@@ -816,13 +815,12 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "注释"
 
@@ -830,29 +828,29 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/文件(_F)/新建地址簿(_B)"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/文件(_F)/新建 vCard(_V)"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/文件(_F)/新建 JPilot(_J)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -860,96 +858,96 @@ msgstr "/文件(_F)/新建服务器(_S)"
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/文件(_F)/编辑(_E)"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/文件(_F)/删除(_D)"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新建地址(_A)"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新建组(_G)"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新建文件夹(_F)"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/新建地址(_A)"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/新建组(_G)"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -961,76 +959,81 @@ msgstr "/新建文件夹(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/复制(_C)..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "地址簿"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "姓名："
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "收件人："
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "抄送："
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "密件抄送："
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "删除"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "添加"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "查找"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "收件人："
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "抄送："
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "密件抄送："
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "关闭"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "删除地址"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "真的要删除地址？"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1039,38 +1042,38 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "删除文件夹"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "_Folder only"
 msgstr "仅文件夹"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "文件夹和地址"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "真的要删除“%s”？"
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "新建用户，无法保存索引文件。"
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "新建用户，无法保存地址簿文件。"
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr "成功转换旧的地址簿。"
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1078,7 +1081,7 @@ msgstr ""
 "已经转换旧的地址簿，\n"
 "无法保存新的地址索引文件"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1086,7 +1089,7 @@ msgstr ""
 "无法转换地址簿，\n"
 "但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1094,90 +1097,90 @@ msgstr ""
 "无法转换地址簿，\n"
 "无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "地址簿错误"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 msgid "Old address book converted, could not save new address index file"
 msgstr "已经转换旧的地址簿，无法保存新的地址索引文件"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2597
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "无法转换地址簿，但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2603
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "无法转换地址簿，无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2583
+#: src/addressbook.c:2609
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "地址簿"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "个人"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "群组"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "文件夹"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 
@@ -1808,83 +1811,77 @@ msgstr "替换"
 msgid "_Insert"
 msgstr "插入"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "编辑地址"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "添加新联系人"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "编辑联系人详细信息"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "必须输入电子邮件地址。"
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "必须输入名字和值。"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "编辑联系人信息"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "显示姓名"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "姓氏"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "名字"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "昵称"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "电子邮件地址"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "别名"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "上移"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "下移"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "修改"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "清除"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "值"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "基本信息"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "用户属性"
 
@@ -1921,56 +1918,58 @@ msgstr "添加新地址簿"
 msgid "A Group Name must be supplied."
 msgstr "必须提供群组名。"
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "编辑群组信息"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "群组名"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "群组中的地址"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "可用邮件地址"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " -> "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  ->  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " <- "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  <-  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "可用邮件地址"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "群组中的地址"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "用箭头按钮将电子邮件地址移入和移出群组"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "编辑群组细节"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "添加新群组"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "编辑文件夹"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "输入文件夹的新名字："
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名字："
 
@@ -5460,14 +5459,6 @@ msgstr "邮件头显示设置"
 msgid "Available items"
 msgstr "可用项目"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  ->  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  <-  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "显示的项目"
@@ -6855,6 +6846,15 @@ msgstr "退出"
 msgid "Sylpheed"
 msgstr "旧式的Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "编辑地址"
+
+#~ msgid " -> "
+#~ msgstr " -> "
+
+#~ msgid " <- "
+#~ msgstr " <- "
+
 #~ msgid "#"
 #~ msgstr "#"
 
@@ -7148,9 +7148,6 @@ msgstr "旧式的Sylpheed"
 #~ msgid "OK"
 #~ msgstr "确定"
 
-#~ msgid "Close"
-#~ msgstr "关闭"
-
 #~ msgid "Cancel"
 #~ msgstr "取消"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8fc92d2f..aec610b0 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: 2007-02-15 16:42+0900\n"
+"POT-Creation-Date: 2007-02-21 13:37+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"
@@ -682,12 +682,11 @@ msgstr ""
 "檢查新郵件時將會依照下面的順序。您可以勾選 G 欄位中的方塊，\n"
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:512
-#: src/compose.c:4470 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:268
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:208 src/prefs_filter.c:257 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/compose.c:4470 src/editaddress.c:776 src/editaddress.c:824
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
+#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "名稱"
 
@@ -819,13 +818,12 @@ msgstr "使用者設定之命令參數"
 msgid "Add Address to Book"
 msgstr "將地址加入通訊錄"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:81
-#: src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
+#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/editaddress.c:694 src/editgroup.c:274
 msgid "Remarks"
 msgstr "備註"
 
@@ -833,29 +831,29 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇通訊錄資料夾"
 
-#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/檔案(_F)"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:350
 msgid "/_File/New _Book"
 msgstr "/檔案(_F)/新增通訊錄(_B)"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/New _vCard"
 msgstr "/檔案(_F)/新增vCard(_V)"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _JPilot"
 msgstr "/檔案(_F)/新增J-Pilot(_J)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
-#: src/addressbook.c:356 src/addressbook.c:359 src/compose.c:549
+#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
 #: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
 #: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
 #: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
@@ -863,96 +861,96 @@ msgstr "/檔案(_F)/新增伺服器(_S)"
 msgid "/_File/---"
 msgstr "/檔案(_F)/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_File/_Edit"
 msgstr "/檔案(_F)/編輯(_E)"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:360
 msgid "/_File/_Delete"
 msgstr "/檔案(_F)/刪除(_D)"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:363 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
-#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
 #: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
-#: src/addressbook.c:364 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
 
-#: src/addressbook.c:365 src/compose.c:569
+#: src/addressbook.c:367 src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:369
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:370
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新增地址(_A)"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新增群組(_G)"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新增資料夾(_F)"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/編輯(_E)"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/刪除(_D)"
 
-#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:378
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
 
-#: src/addressbook.c:398 src/addressbook.c:408
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Address"
 msgstr "/新增地址(_A)"
 
-#: src/addressbook.c:399 src/addressbook.c:409
+#: src/addressbook.c:401 src/addressbook.c:411
 msgid "/New _Group"
 msgstr "/新增群組(_G)"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:402 src/addressbook.c:412
 msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
-#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
 #: src/compose.c:538 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -964,76 +962,81 @@ msgstr "/新增資料夾(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
+#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/刪除(_D)"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:417
 #, fuzzy
 msgid "/_Copy"
 msgstr "/複製(_C)..."
 
-#: src/addressbook.c:416
+#: src/addressbook.c:418
 #, fuzzy
 msgid "/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "E-Mail 地址"
 
-#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:624 src/prefs_filter_edit.c:249
+#: src/addressbook.c:631 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "姓名："
 
+#: src/addressbook.c:667 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/prefs_template.c:179
+msgid "To:"
+msgstr "收件人"
+
+#: src/addressbook.c:671 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/prefs_template.c:181
+msgid "Cc:"
+msgstr "副本"
+
+#: src/addressbook.c:675 src/prefs_folder_item.c:367 src/prefs_template.c:183
+msgid "Bcc:"
+msgstr "密件副本"
+
 #. Buttons
-#: src/addressbook.c:655 src/addressbook.c:1639 src/editaddress.c:884
-#: src/editaddress.c:1017 src/prefs_actions.c:266
+#: src/addressbook.c:696 src/addressbook.c:1665 src/editaddress.c:718
+#: src/editaddress.c:851 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "刪除"
 
-#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:699 src/editaddress.c:724 src/editaddress.c:857
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1553
 msgid "Add"
 msgstr "新增"
 
-#: src/addressbook.c:661
+#: src/addressbook.c:702
 msgid "Lookup"
 msgstr "尋找"
 
-#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:179
-msgid "To:"
-msgstr "收件人"
-
-#: src/addressbook.c:677 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:181
-msgid "Cc:"
-msgstr "副本"
-
-#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
-msgid "Bcc:"
-msgstr "密件副本"
+#: src/addressbook.c:705
+#, fuzzy
+msgid "_Close"
+msgstr "顏色"
 
 #. Confirm deletion
-#: src/addressbook.c:849
+#: src/addressbook.c:875
 msgid "Delete address(es)"
 msgstr "刪除通訊紀錄"
 
-#: src/addressbook.c:850
+#: src/addressbook.c:876
 msgid "Really delete the address(es)?"
 msgstr "您確定要刪除這些紀錄嗎？"
 
-#: src/addressbook.c:1630
+#: src/addressbook.c:1656
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1042,38 +1045,38 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1633 src/folderview.c:2433
+#: src/addressbook.c:1659 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "_Folder only"
 msgstr "只刪除資料夾(_F)"
 
-#: src/addressbook.c:1633
+#: src/addressbook.c:1659
 msgid "Folder and _addresses"
 msgstr "全部刪除(_A)"
 
-#: src/addressbook.c:1638
+#: src/addressbook.c:1664
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "您確定要刪除「%s」? "
 
-#: src/addressbook.c:2405 src/addressbook.c:2538
+#: src/addressbook.c:2431 src/addressbook.c:2564
 msgid "New user, could not save index file."
 msgstr "無法儲存索引檔案。"
 
-#: src/addressbook.c:2409 src/addressbook.c:2542
+#: src/addressbook.c:2435 src/addressbook.c:2568
 msgid "New user, could not save address book files."
 msgstr "無法儲存通訊錄檔案。"
 
-#: src/addressbook.c:2419 src/addressbook.c:2552
+#: src/addressbook.c:2445 src/addressbook.c:2578
 msgid "Old address book converted successfully."
 msgstr ""
 "轉換舊通訊錄格式完成。\n"
 "您可以開始使用新的通訊錄。"
 
-#: src/addressbook.c:2424
+#: src/addressbook.c:2450
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1081,7 +1084,7 @@ msgstr ""
 "舊通訊錄格式已轉換，\n"
 "但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2437
+#: src/addressbook.c:2463
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1089,7 +1092,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "但已產生空的新通訊錄。"
 
-#: src/addressbook.c:2443
+#: src/addressbook.c:2469
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1097,7 +1100,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2448
+#: src/addressbook.c:2474
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1105,84 +1108,84 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2455
+#: src/addressbook.c:2481
 msgid "Addressbook conversion error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:2459
+#: src/addressbook.c:2485
 msgid "Addressbook conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:2494
+#: src/addressbook.c:2520
 msgid "Addressbook Error"
 msgstr "通訊錄發生錯誤"
 
-#: src/addressbook.c:2495 src/addressbook.c:2595
+#: src/addressbook.c:2521 src/addressbook.c:2621
 msgid "Could not read address index"
 msgstr "無法讀取通訊錄索引"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2583
 msgid "Old address book converted, could not save new address index file"
 msgstr "舊通訊錄格式已轉換，但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2597
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "無法轉換通訊錄格式，但已產生空的新通訊錄。"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2603
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2583
+#: src/addressbook.c:2609
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2601
+#: src/addressbook.c:2627
 msgid "Addressbook Conversion Error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2633
 msgid "Addressbook Conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:3122 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3153 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "介面"
 
-#: src/addressbook.c:3138 src/importldif.c:515
+#: src/addressbook.c:3169 src/importldif.c:515
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:3154
+#: src/addressbook.c:3185
 msgid "Person"
 msgstr "人名"
 
-#: src/addressbook.c:3170
+#: src/addressbook.c:3201
 msgid "EMail Address"
 msgstr "電子郵件信箱"
 
-#: src/addressbook.c:3186
+#: src/addressbook.c:3217
 msgid "Group"
 msgstr "群組"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3202 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3233 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "資料夾"
 
-#: src/addressbook.c:3218
+#: src/addressbook.c:3249
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3234 src/addressbook.c:3250
+#: src/addressbook.c:3265 src/addressbook.c:3281
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3266
+#: src/addressbook.c:3297
 msgid "LDAP Server"
 msgstr "LDAP 伺服器"
 
@@ -1806,83 +1809,77 @@ msgstr "置換(_R)"
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-#: src/editaddress.c:182
-msgid "Edit address"
-msgstr "編輯通訊紀錄"
-
-#: src/editaddress.c:326
+#: src/editaddress.c:161
 msgid "Add New Person"
 msgstr "新增人物通訊紀錄"
 
-#: src/editaddress.c:327
+#: src/editaddress.c:162
 msgid "Edit Person Details"
 msgstr "編輯人物詳細資料"
 
-#: src/editaddress.c:468
+#: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
 msgstr "未輸入電子郵件信箱。"
 
-#: src/editaddress.c:587
+#: src/editaddress.c:422
 msgid "A Name and Value must be supplied."
 msgstr "未輸入名稱與值。"
 
-#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-#: src/editaddress.c:645
+#: src/editaddress.c:479
 msgid "Edit Person Data"
 msgstr "編輯人物資料"
 
-#: src/editaddress.c:744
+#: src/editaddress.c:578
 msgid "Display Name"
 msgstr "顯示名稱"
 
-#: src/editaddress.c:750 src/editaddress.c:754
+#: src/editaddress.c:584 src/editaddress.c:588
 msgid "Last Name"
 msgstr "姓"
 
-#: src/editaddress.c:751 src/editaddress.c:753
+#: src/editaddress.c:585 src/editaddress.c:587
 msgid "First Name"
 msgstr "名"
 
-#: src/editaddress.c:756
+#: src/editaddress.c:590
 msgid "Nick Name"
 msgstr "暱稱"
 
-#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:269
+#: src/editaddress.c:627 src/editaddress.c:676 src/editaddress.c:885
+#: src/editgroup.c:273
 msgid "E-Mail Address"
 msgstr "E-Mail 地址"
 
-#: src/editaddress.c:794 src/editaddress.c:851
+#: src/editaddress.c:628 src/editaddress.c:685
 msgid "Alias"
 msgstr "別名"
 
 #. Buttons
-#: src/editaddress.c:878
+#: src/editaddress.c:712
 msgid "Move Up"
 msgstr "向上移"
 
-#: src/editaddress.c:881
+#: src/editaddress.c:715
 msgid "Move Down"
 msgstr "向下移"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
+#: src/editaddress.c:721 src/editaddress.c:854 src/importldif.c:643
 msgid "Modify"
 msgstr "變更"
 
-#: src/editaddress.c:893 src/editaddress.c:1026
+#: src/editaddress.c:727 src/editaddress.c:860
 msgid "Clear"
 msgstr "清除"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
+#: src/editaddress.c:777 src/editaddress.c:833 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "值"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:884
 msgid "Basic Data"
 msgstr "基本資料"
 
-#: src/editaddress.c:1052
+#: src/editaddress.c:886
 msgid "User Attributes"
 msgstr "人物屬性"
 
@@ -1919,56 +1916,58 @@ msgstr "新增通訊錄"
 msgid "A Group Name must be supplied."
 msgstr "未指定群組名稱"
 
-#: src/editgroup.c:275
+#: src/editgroup.c:278
 msgid "Edit Group Data"
 msgstr "編輯群組資料"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:308
 msgid "Group Name"
 msgstr "群組名稱"
 
-#: src/editgroup.c:321
-msgid "Addresses in Group"
-msgstr "群組內地址"
+#: src/editgroup.c:325
+msgid "Available Addresses"
+msgstr "可使用之電子郵件地址"
 
-#: src/editgroup.c:323
-msgid " -> "
-msgstr " → "
+#: src/editgroup.c:352 src/prefs_display_items.c:183
+#: src/prefs_summary_column.c:241
+msgid "  ->  "
+msgstr "  →  "
 
-#: src/editgroup.c:350
-msgid " <- "
-msgstr " ← "
+#: src/editgroup.c:355 src/prefs_display_items.c:187
+#: src/prefs_summary_column.c:245
+msgid "  <-  "
+msgstr "  ←  "
 
-#: src/editgroup.c:352
-msgid "Available Addresses"
-msgstr "可使用之電子郵件地址"
+#: src/editgroup.c:364
+msgid "Addresses in Group"
+msgstr "群組內地址"
 
-#: src/editgroup.c:418
+#: src/editgroup.c:433
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "請使用箭頭指標將電子郵件地址加入或移除該群組"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:485
 msgid "Edit Group Details"
 msgstr "編輯群組詳細資料"
 
-#: src/editgroup.c:473
+#: src/editgroup.c:488
 msgid "Add New Group"
 msgstr "新增群組"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Edit folder"
 msgstr "編輯資料夾"
 
-#: src/editgroup.c:526
+#: src/editgroup.c:541
 msgid "Input the new name of folder:"
 msgstr "請輸入新的資料夾名稱："
 
-#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/editgroup.c:544 src/foldersel.c:546 src/folderview.c:2182
 #: src/folderview.c:2188
 msgid "New folder"
 msgstr "新資料夾"
 
-#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:545 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "請輸入新資料夾的名稱："
 
@@ -5424,14 +5423,6 @@ msgstr "顯示標頭設定"
 msgid "Available items"
 msgstr "可使用之項目"
 
-#: src/prefs_display_items.c:183 src/prefs_summary_column.c:241
-msgid "  ->  "
-msgstr "  →  "
-
-#: src/prefs_display_items.c:187 src/prefs_summary_column.c:245
-msgid "  <-  "
-msgstr "  ←  "
-
 #: src/prefs_display_items.c:208 src/prefs_summary_column.c:266
 msgid "Displayed items"
 msgstr "指定顯示項目"
@@ -6808,6 +6799,15 @@ msgstr "離開"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Edit address"
+#~ msgstr "編輯通訊紀錄"
+
+#~ msgid " -> "
+#~ msgstr " → "
+
+#~ msgid " <- "
+#~ msgstr " ← "
+
 #~ msgid "#"
 #~ msgstr "#"