updated po files and NEWS.

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

31 files changed, 7276 insertions, 8134 deletions

diff --git a/NEWS b/NEWS
index e4679cb9..75a6979c 100644
--- a/NEWS
+++ b/NEWS
@@ -7,11 +7,11 @@ Changes of Sylpheed
       - The menu sensitivity of the address book became accurate.
       - When deleting addresses from a group, they are just removed from the
         group (not from person) now.
-    * Junk mails are not filtered when importing an mbox file now.
     * The checking of remote folders doesn't abort with non-fatal errors now
       except for network failure.
     * The problem that the width of the folder view was not saved when the
       main window was maximized was fixed.
+    * The coloring of message number columns in the folder view was enabled.
     * Win32: In Windows Vista, the problem that the selected menu items were
       not visible was fixed.
 
diff --git a/po/ChangeLog b/po/ChangeLog
index b1965352..0f4e8154 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-15
+
+	* updated fr.po and pt_BR.po.
+	* updated cs.po (thanks to Petr Kovar).
+	* updated ro.po.
+
 2006-02-06
 
 	* updated hu.po and ro.po.
diff --git a/po/bg.po b/po/bg.po
index 8ae0c4b9..bb827a31 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -214,82 +214,82 @@ msgstr "iconv не може да преобразува UTF-7 до %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може да преобразува %s до UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "не може да се запише във временен файл\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Получаване на съобщения от %s във %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "не може да се прочете mbox файл.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "невалиден mbox формат: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "деформиран mbox: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "не може да се отвори временен файл\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
 "%s"
 msgstr ""
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d намерени съобщения.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "не може да се създаде заключващ файл %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "използвайте 'flock' вместо 'file' ако е възможно.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "не може да се създаде %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "кутията се притежава от друг процес, изчакване...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "не може да се заключи %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "невалиден тип заключване\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "не може да се отключи %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "пощенската кутия не може да се съкрати до нула.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Изнасяне на съобщения от %s във %s...\n"
@@ -678,9 +678,9 @@ msgstr ""
 "За нови съобщения ще бъде проверявано в този ред. Отметнете кутийките\n"
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:491
+#: 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:265
+#: 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
@@ -822,8 +822,8 @@ msgstr "Добавяне на Адреса към Книгата"
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Забележки"
 
@@ -831,29 +831,29 @@ msgstr "Забележки"
 msgid "Select Address Book Folder"
 msgstr "Изберете папка от адресната книга"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Файл"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Файл/Нова _Книга"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Файл/Нова _vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Файл/Нов _JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Файл/Нов _Сървър"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +861,177 @@ msgstr "/_Файл/Нов _Сървър"
 msgid "/_File/---"
 msgstr "/_Файл/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Файл/_Редактиране"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Файл/_Изтриване"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_файл/_Запазване"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/_Редактиране/_Копиране"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/_Редактиране/_Вмъкване"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Адрес"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Адрес/Нов _Адрес"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Адрес/Нова _Група"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Адрес/Нова _Папка"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Адрес/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Адрес/_Редактиране"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Инструменти"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Нов _Адрес"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Нова _Група"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/_Редактиране"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Изтриване"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Копиране..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/_Редактиране/_Вмъкване"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Име:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Справка"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Изтриване на адрес(ите)"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Желаете ли изтриване на адрес(ите)?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1022,38 +1041,38 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "_Folder only"
 msgstr "Само папка"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Папка и Адреси"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Желаете ли изтриване на `%s' ?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Нов потребител, не можа да ce запази индексния файл."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Нов потребител, не можа да се запази файла на адресната книга"
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Старата адресна книга конвертирана успешно"
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1061,7 +1080,7 @@ msgstr ""
 "Старата адресна книга конвертирана,\n"
 "не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1069,7 +1088,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга,\n"
 "създадени са нови празни файлове на адресната книга."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1077,7 +1096,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1085,91 +1104,91 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Грешка на адресната книга"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Не може да се прочете адресния индекс"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старата адресна книга конвертирана, не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2529
+#: src/addressbook.c:2576
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, създадени са нови празни файлове "
 "на адресната книга."
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2582
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, неуспя създаване на нови файлове "
 "на адресната книга."
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2588
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга и създаване на нови файлове на "
 "адресната книга."
 
-#: src/addressbook.c:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Лице"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "EMail Адрес"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "LDAP сървър"
 
@@ -1303,14 +1322,6 @@ msgstr "/_Редактиране/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Редактиране/_Отрязване"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/_Редактиране/_Копиране"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/_Редактиране/_Вмъкване"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Редактиране/Вмъкване като _цитат"
@@ -1789,7 +1800,7 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1882,7 +1893,7 @@ msgid "Nick Name"
 msgstr "Прякор"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "E-Mail адрес"
 
@@ -1952,56 +1963,56 @@ msgstr "Добавяне на нова Адресна Книга"
 msgid "A Group Name must be supplied."
 msgstr "Име на Група трябва да бъде попълнено."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Редактиране на данни за Група"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Име на Група"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Адреси в групата"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Налични адреси"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Местене на E-Mail адреси до или от Група с бутоните със стрелки"
 
-#: src/editgroup.c:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Редактиране на детайли за Група"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Добавяне на Нова Група"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Редактиране на папка"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Въведете новото име на папка:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Въведете име на нова папка:"
 
@@ -2169,42 +2180,42 @@ msgstr "Директория на спула"
 msgid "Select folder"
 msgstr "Избор на папка"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Входящи"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Изпратени"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Опашка"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Кошче"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Чернови"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може да бъде включено в име на папка"
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папката `%s' вече съществува"
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Папката `%s' не може да бъде създадена."
@@ -2279,73 +2290,73 @@ msgid "New"
 msgstr "Нови"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Непрочетени"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Установяване информация за папка...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Възобновяване дървото на папката"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дървото на папката ще бъде възобновено. Продължане?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Възобновяване дървото на папката..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "Възобновяване на дървото на папката провалено."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Проверяване за нови съобщения във всички папки..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s е избрана\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Изпращане на съобшение..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2355,26 +2366,26 @@ msgstr ""
 "(ако желаете да създадете папка за съхраняване на подпапки,\n"
 " добавете `/' на края на името)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Въведете ново име за `%s'"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Преименуване на папка"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2383,12 +2394,12 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Изтриване на папка"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2399,21 +2410,21 @@ msgstr ""
 "Всички папки и съобщения под `%s' ше бъдат изтрити.\n"
 "Наистина ли желаете изтриване?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2422,34 +2433,34 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Премахване на пощенска кутия"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Желаете ли изтриване на IMAP4 акаунт `%s'?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Изтриване на IMAP4 акаунт"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Желаете ли изтриване на новинарска група `%s'?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Изтриване на новинарска група"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Желаете ли изтриване на новинарски акаунт `%s'?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Изтриване на новинарски акаунт"
 
@@ -3607,29 +3618,29 @@ msgstr "липсва"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Промяна на разделението на прозореца от %d до %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "Без достъп до мрежа"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "Работите без достъп до мрежа. Желаете ли да включите мрежата?"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Изчистване на кошчето"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Добавяне на пощенска кутия"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3640,16 +3651,16 @@ msgstr ""
 "Ако е указана съществуваща кутия, тя ще бъде\n"
 "сканирана автоматично."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Вече съществува пощенска кутия `%s'."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Пощенска кутия"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3658,72 +3669,72 @@ msgstr ""
 "Създаването на пощенска кутия се провали.\n"
 "Вече съществуват някакви файлове, или нямате права за запис."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Изглед на папките"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Изглед на съобщенията"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Отговор"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Отговор _до/_подател"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Отговор _до/пощенски _списък"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Препращане"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Пр_епращане като притурка"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/П_ренасочване"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr "Работите без достъп до мрежа. Щракнете иконата за да включите мрежата."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "Работите с достъп до мрежа. Щракнете иконата за да изключите мрежата."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Изход"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Желаете ли изход от програмата?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 #, fuzzy
 msgid "Command line options"
 msgstr "Не е въведен команден ред."
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Употреба: %s [ОПЦИЯ]...\n"
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3739,7 +3750,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6966,6 +6977,9 @@ msgstr "Изход"
 msgid "Sylpheed"
 msgstr "Стар Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/cs.po b/po/cs.po
index 55175995..5f2f16ea 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,96 +1,98 @@
 # Czech translation of Sylpheed
 # Copyright (C) 2000 Free Software Foundation, Inc.
+# This file is distributed under the same license as the sylpheed package.
 # Jan Mura <jan_mura@altavista.com>, 2000.
-#
+# .
+# Additional translators:
+# Radek Vybíral <Radek.Vybiral@vsb.cz>, 2002, 2003.
+# Petr Kovar <pknbe@volny.cz>, 2007.
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 17:07+0900\n"
-"PO-Revision-Date: 2003-05-30 13:31GMT+0100\n"
-"Last-Translator: Radek Vybíral <Radek.Vybiral@vsb.cz>\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.6\n"
 
 #: libsylph/account.c:56
 msgid "Reading all config for each account...\n"
-msgstr "Načítám nastavení pro všechny účty...\n"
+msgstr "Načítá se nastavení všech účtů...\n"
 
 #: libsylph/imap.c:469
-#, fuzzy, c-format
+#, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "IMAP4 spojení s %s:%d bylo rozpojeno. Obnovuji spojení...\n"
+msgstr "Spojení přes IMAP4 s %s bylo rozpojeno. Obnovuje se spojení...\n"
 
 #: libsylph/imap.c:524 libsylph/imap.c:530
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
-msgstr "adresář pro IMAP server"
+msgstr "Server IMAP4 vypnul LOGIN.\n"
 
 #: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "vytvářím spojení IMAP4 s %s:%d ...\n"
+msgstr "vytváří se spojení přes IMAP4 s %s:%d ...\n"
 
 #: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
-msgstr "Nelze spustit TLS sezení.\n"
+msgstr "Nelze spustit relaci TLS.\n"
 
 #: libsylph/imap.c:1159
-#, fuzzy, c-format
+#, c-format
 msgid "Getting message %d"
-msgstr "Vymazávám zprávu %d"
+msgstr "Přijímá se zpráva %d"
 
 #: libsylph/imap.c:1275
-#, fuzzy, c-format
+#, c-format
 msgid "Appending messages to %s (%d / %d)"
-msgstr "Posílám zprávu (%d / %d bytů)"
+msgstr "Připojování zprávy k %s (%d / %d)"
 
 #: libsylph/imap.c:1367
-#, fuzzy, c-format
+#, c-format
 msgid "Moving messages %s to %s ..."
-msgstr "Přesouvám zprávu %s%c%d do %s...\n"
+msgstr "Přesouvají se zprávy %s do %s·..."
 
 #: libsylph/imap.c:1373
-#, fuzzy, c-format
+#, c-format
 msgid "Copying messages %s to %s ..."
-msgstr "Kopíruji zprávu %s%c%d do %s...\n"
+msgstr "Kopírují se zprávy %s to %s..."
 
 #: libsylph/imap.c:1512
-#, fuzzy, c-format
+#, c-format
 msgid "Removing messages %s"
-msgstr "Získávám zprávy z %s do %s...\n"
+msgstr "Odstraňují se zprávy %s"
 
 #: libsylph/imap.c:1518
-#, fuzzy, c-format
+#, c-format
 msgid "can't set deleted flags: %s\n"
-msgstr "nelze nastavit příznak smazání: %d\n"
+msgstr "nelze nastavit příznak smazání: %s\n"
 
 #: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "nelze odstranit\n"
 
 #: libsylph/imap.c:1609
-#, fuzzy, c-format
+#, c-format
 msgid "Removing all messages in %s"
-msgstr "Získávám zprávy z %s do %s...\n"
+msgstr "Odstraňují se všechny zprávy v %s"
 
 #: libsylph/imap.c:1615
-#, fuzzy
 msgid "can't set deleted flags: 1:*\n"
-msgstr "nelze nastavit příznak smazané: 1: %d\n"
+msgstr "nelze nastavit příznak smazané: 1:*\n"
 
 #: libsylph/imap.c:1663
-#, fuzzy
 msgid "can't close folder\n"
-msgstr "nelze vybrat složku: %s\n"
+msgstr "nelze zavřít složku\n"
 
 #: libsylph/imap.c:1741
-#, fuzzy, c-format
+#, c-format
 msgid "root folder %s not exist\n"
-msgstr "Označený soubor nebyl nalezen.\n"
+msgstr "kořenová složka %s neexistuje\n"
 
 #: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
@@ -99,12 +101,12 @@ msgstr "Během příkazu LIST se vyskytla chyba.\n"
 #: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
-msgstr "Nemohu vytvořit '%s'\n"
+msgstr "Nelze vytvořit \"%s\"\n"
 
 #: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
-msgstr "Nemohu vytvořit '%s' v Doručené poště\n"
+msgstr "Nelze vytvořit \"%s\" v doručené poště\n"
 
 #: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
@@ -125,12 +127,12 @@ msgstr "nelze smazat poštovní schránku\n"
 
 #: libsylph/imap.c:2366
 msgid "can't get envelope\n"
-msgstr "Nemohu načíst obálku\n"
+msgstr "nelze načíst obálku\n"
 
 #: libsylph/imap.c:2379
-#, fuzzy, c-format
+#, c-format
 msgid "Getting message headers (%d / %d)"
-msgstr "Posílám zprávu (%d / %d bytů)"
+msgstr "Přijímá se záhlaví zprávy (%d·/·%d)"
 
 #: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
@@ -139,12 +141,12 @@ msgstr "Během načítání obálky se vyskytla chyba.\n"
 #: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
-msgstr "Nemohu analyzovat obálku: %s\n"
+msgstr "nelze analyzovat obálku: %s\n"
 
 #: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Nemohu se spojit s IMAP4 serverem: %s:%d\n"
+msgstr "Nelze se spojit se serverem IMAP4: %s:%d\n"
 
 #: libsylph/imap.c:2542
 #, c-format
@@ -153,7 +155,7 @@ msgstr "Nelze navázat relaci s IMAP4 serverem: %s:%d\n"
 
 #: libsylph/imap.c:2617
 msgid "can't get namespace\n"
-msgstr "nemohu najít obálku\n"
+msgstr "nelze vyhledat obálku\n"
 
 #: libsylph/imap.c:3150
 #, c-format
@@ -161,14 +163,12 @@ msgid "can't select folder: %s\n"
 msgstr "nelze vybrat složku: %s\n"
 
 #: libsylph/imap.c:3185
-#, fuzzy
 msgid "error on imap command: STATUS\n"
-msgstr "chyba příkazu služby imap: EXPUNGE\n"
+msgstr "chyba příkazu služby IMAP: STATUS\n"
 
 #: libsylph/imap.c:3308 libsylph/imap.c:3343
-#, fuzzy
 msgid "IMAP4 authentication failed.\n"
-msgstr "Autentikace selhala."
+msgstr "Autentizace IMAP4 selhala.\n"
 
 #: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
@@ -177,134 +177,135 @@ msgstr "Neúspěšné přihlášení k IMAP4.\n"
 #: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
-msgstr "Nemohu přidat %s do %s\n"
+msgstr "nelze přpojit %s do %s\n"
 
 #: libsylph/imap.c:3736
 msgid "(sending file...)"
-msgstr "(posílám soubor...)"
+msgstr "(posílání souboru...)"
 
 #: libsylph/imap.c:3765
-#, fuzzy, c-format
+#, c-format
 msgid "can't append message to %s\n"
-msgstr "nelze přidat zprávu %s\n"
+msgstr "nelze připojit zprávu %s\n"
 
 #: libsylph/imap.c:3797
-#, fuzzy, c-format
+#, c-format
 msgid "can't copy %s to %s\n"
-msgstr "nelze kopírovat %d na %s\n"
+msgstr "nelze kopírovat %s na %s\n"
 
 #: libsylph/imap.c:3821
-#, fuzzy, c-format
+#, c-format
 msgid "error while imap command: STORE %s %s\n"
-msgstr "chyba příkazu služby imap: STORE %d %d %s\n"
+msgstr "chyba příkazu služby IMAP: STORE %s %s\n"
 
 #: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
-msgstr "chyba příkazu služby imap: EXPUNGE\n"
+msgstr "chyba příkazu služby IMAP: EXPUNGE\n"
 
 #: libsylph/imap.c:3848
-#, fuzzy
 msgid "error while imap command: CLOSE\n"
-msgstr "chyba příkazu služby imap: EXPUNGE\n"
+msgstr "chyba příkazu služby IMAP: CLOSE\n"
 
 #: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv nemůže konvertovat UTF-7 na %s\n"
+msgstr "iconv nemůže konvertovat z UTF-7 na %s\n"
 
 #: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv nemůže konvertovat %s na UTF-7\n"
+msgstr "iconv nemůže konvertovat z %s na UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
-msgstr "Nemohu zapisovat do dočasného souboru\n"
+msgstr "nelze zapisovat do dočasného souboru\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
-msgstr "Získávám zprávy z %s do %s...\n"
+msgstr "Získávají se zprávy z %s do %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
-msgstr "Nemohu přečíst soubor s poštovní schránkou.\n"
+msgstr "nelze přečíst soubor s poštovní schránkou.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "Neplatný formát poštovní schránky: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
-msgstr "Selhání poštovní schránky: %s\n"
+msgstr "selhání poštovní schránky: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
-msgstr "Nemohu otevřít dočasný soubor\n"
+msgstr "nelze otevřít dočasný soubor\n"
 
-#: libsylph/mbox.c:168
-#, c-format
+#: libsylph/mbox.c:171
+#, fuzzy, c-format
 msgid ""
 "unescaped From found:\n"
 "%s"
 msgstr ""
+"nalezeno nezměněné záhlaví From:\n"
+"%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d zpráv nalezeno.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
-msgstr "Nemohu vytvořit uzamčený soubor %s\n"
+msgstr "nelze vytvořit uzamčený soubor %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
-msgstr "pokud to jde, použijte 'flock' místo 'file'.\n"
+msgstr "pokud to jde, použijte \"flock\" namísto \"file\".\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
-msgstr "Nemohu vytvořit %s\n"
+msgstr "nelze vytvořit %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "poštovní schránka je vlastněna jiným procesem, čekejte...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
-msgstr "Nemohu uzamknout %s\n"
+msgstr "nelze uzamknout %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
-msgstr "Neplatný typ zámku\n"
+msgstr "neplatný typ zámku\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
-msgstr "Nemohu odemknout %s\n"
+msgstr "nelze odemknout %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
-msgstr "nemůžu smazat poštovní schránku.\n"
+msgstr "nelze smazat poštovní schránku.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
-msgstr "Exportuji zprávy z %s do %s...\n"
+msgstr "Exportování zprávy z %s do %s...\n"
 
 #: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
-msgstr "Nemohu zkopírovat zprávu %s do %s\n"
+msgstr "nelze zkopírovat zprávu %s do %s\n"
 
 #: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
-msgstr "Nemohu otevřít označený soubor.\n"
+msgstr "Nelze otevřít označený soubor.\n"
 
 #: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
@@ -313,7 +314,7 @@ msgstr "zdrojová složka je stejná jako cílová.\n"
 #: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Kopíruji zprávu %s%c%d do %s...\n"
+msgstr "Kopírování zprávy %s%c%d do %s...\n"
 
 #: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
@@ -321,8 +322,8 @@ msgid ""
 "File `%s' already exists.\n"
 "Can't create folder."
 msgstr ""
-"Soubor '%s' už existuje.\n"
-"Nemohu vytvořit složku."
+"Soubor \"%s\" už existuje.\n"
+"Nelze vytvořit složku."
 
 #: libsylph/mh.c:1536
 #, c-format
@@ -335,16 +336,23 @@ msgid ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
+"Název adresáře\n"
+"\"%s\"·není platným řetězcem UTF-8.\n"
+"Je možné, že v názvu souboru je použito znakové sady lokalizace libc.\n"
+"V tom případě je nutné nastavit následující proměnou prostředí\n"
+"(podrobnosti viz·README):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
 
 #: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "Vytvářím NNTP spojení s %s:%d ...\n"
+msgstr "Vytvářím spojení přes NNTP s %s:%d ...\n"
 
 #: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "NNTP spojení %s:%d bylo přerušeno. Obnovuji spojení...\n"
+msgstr "Spojení přes NNTP %s:%d bylo přerušeno. Obnovuje se spojení...\n"
 
 #: libsylph/news.c:378
 #, c-format
@@ -354,26 +362,26 @@ msgstr "příspěvek %d už byl v mezipaměti.\n"
 #: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
-msgstr "Získávám příspěvek %d...\n"
+msgstr "získává se příspěvek %d...\n"
 
 #: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
-msgstr "Nemohu číst příspěvek %d\n"
+msgstr "nelze číst příspěvek %d\n"
 
 #: libsylph/news.c:677
 msgid "can't post article.\n"
-msgstr "Nemohu odeslat příspěvek.\n"
+msgstr "nelze odeslat příspěvek.\n"
 
 #: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
-msgstr "Nemohu načíst příspěvek %d\n"
+msgstr "nelze načíst příspěvek %d\n"
 
 #: libsylph/news.c:760
-#, fuzzy, c-format
+#, c-format
 msgid "can't select group: %s\n"
-msgstr "Nemohu vybrat skupinu: %s\n"
+msgstr "nelze vybrat skupinu: %s\n"
 
 #: libsylph/news.c:797
 #, c-format
@@ -387,7 +395,7 @@ msgstr "Žádný nový příspěvek.\n"
 #: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
-msgstr "získávám xover %d - %d v %s...\n"
+msgstr "získává se xover %d - %d v %s...\n"
 
 #: libsylph/news.c:824
 msgid "can't get xover\n"
@@ -400,7 +408,7 @@ msgstr "Během získávání xover se vyskytla chyba.\n"
 #: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
-msgstr "Neplatná xover řádka: %s\n"
+msgstr "Neplatná řádka xover: %s\n"
 
 #: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
@@ -408,30 +416,29 @@ msgstr "nelze získat xhdr\n"
 
 #: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
-msgstr "Během získávání xhdr se vyskytla chyba .\n"
+msgstr "Během získávání xhdr se vyskytla chyba.\n"
 
 #: libsylph/nntp.c:68
 #, c-format
 msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Nemohu se spojit s NNTP serverem: %s:%d\n"
+msgstr "Nelze se spojit se serverem NNTP: %s:%d\n"
 
 #: libsylph/nntp.c:164 libsylph/nntp.c:227
 #, c-format
 msgid "protocol error: %s\n"
-msgstr "Chyba protokolu: %s\n"
+msgstr "chyba protokolu: %s\n"
 
 #: libsylph/nntp.c:187 libsylph/nntp.c:233
 msgid "protocol error\n"
-msgstr "Chyba protokolu\n"
+msgstr "chyba protokolu\n"
 
 #: libsylph/nntp.c:283
 msgid "Error occurred while posting\n"
-msgstr "Během odesílání se vyskytla chyba\n"
+msgstr "Vyskytla se chyba během odesílání\n"
 
 #: libsylph/nntp.c:363
-#, fuzzy
 msgid "Error occurred while sending command\n"
-msgstr "Během odesílání pošty se vyskytla chyba ."
+msgstr "Vyskytla se chyba během posílání příkazu\n"
 
 #: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
@@ -439,26 +446,26 @@ msgstr "V pozdravu nebyla nalezena APOP časová značka\n"
 
 #: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
-msgstr "Chyba syntaxe pro časovou značku při pozdravu\n"
+msgstr "Chyba syntaxe časové značky při pozdravu\n"
 
 #: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "Chyba protokolu POP3\n"
 
 #: libsylph/pop.c:264
-#, fuzzy, c-format
+#, c-format
 msgid "invalid UIDL response: %s\n"
-msgstr "Neplatná xover řádka: %s\n"
+msgstr "neplatná odpověď UIDL: %s\n"
 
 #: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Vymazávám starou zprávu %d\n"
+msgstr "POP3: Vymazávání staré zprávy %d\n"
 
 #: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Přeskakuji zprávu %d (%d bytů)\n"
+msgstr "POP3: Přeskakuje se zpráva %d (%d bajtů)\n"
 
 #: libsylph/pop.c:667
 msgid "mailbox is locked\n"
@@ -470,25 +477,25 @@ msgstr "vypršel čas relace\n"
 
 #: libsylph/pop.c:676 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
-msgstr "Nelze spustit TLS relaci\n"
+msgstr "nelze spustit relaci TLS\n"
 
 #: libsylph/pop.c:683 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
-msgstr "Vyskytla se chyba v autentizaci\n"
+msgstr "vyskytla se chyba v autentizaci\n"
 
 #: libsylph/pop.c:688
 msgid "command not supported\n"
-msgstr "Příkaz není podporován\n"
+msgstr "příkaz není podporován\n"
 
 #: libsylph/pop.c:692
 msgid "error occurred on POP3 session\n"
-msgstr "v POP3 relaci se vyskytla\n"
+msgstr "v relaci POP3 se vyskytla chyba\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
 #: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
-msgstr "Selhání při zápisu konfigurace do souboru\n"
+msgstr "selhání při zápisu konfigurace do souboru\n"
 
 #: libsylph/prefs.c:239
 #, c-format
@@ -500,14 +507,12 @@ msgid "Configuration is saved.\n"
 msgstr "Konfigurace je uložena.\n"
 
 #: libsylph/prefs_common.c:518
-#, fuzzy
 msgid "Junk mail filter (manual)"
-msgstr "Složka"
+msgstr "Filtr nevyžádané pošty (ruční)"
 
 #: libsylph/prefs_common.c:521
-#, fuzzy
 msgid "Junk mail filter"
-msgstr "Složka"
+msgstr "Filtr nevyžádané pošty"
 
 #: libsylph/procmime.c:1129
 msgid "procmime_get_text_content(): Code conversion failed.\n"
@@ -525,7 +530,7 @@ msgstr "nelze načíst zprávu %d\n"
 #: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
-msgstr "Neplatný příkazový řádek tisku: '%s'\n"
+msgstr "Neplatný příkaz k tisku: \"%s\"\n"
 
 #: libsylph/recv.c:140
 msgid "error occurred while retrieving data.\n"
@@ -533,7 +538,7 @@ msgstr "Během obnovy dat se vyskytla chyba.\n"
 
 #: libsylph/recv.c:182 libsylph/recv.c:214 libsylph/recv.c:229
 msgid "Can't write to file.\n"
-msgstr "Nemohu zapisovat do souboru.\n"
+msgstr "Nelze zapisovat do souboru.\n"
 
 #: libsylph/smtp.c:157
 msgid "SMTP AUTH not available\n"
@@ -545,7 +550,7 @@ msgstr "špatná odpověď od SMTP\n"
 
 #: libsylph/smtp.c:487 libsylph/smtp.c:505 libsylph/smtp.c:602
 msgid "error occurred on SMTP session\n"
-msgstr "v SMTP relaci se vyskytla chyba\n"
+msgstr "v relaci SMTP se vyskytla chyba\n"
 
 #: libsylph/ssl.c:128
 msgid "SSLv23 not available\n"
@@ -565,21 +570,21 @@ msgstr "TLSv1 je dostupná\n"
 
 #: libsylph/ssl.c:196 libsylph/ssl.c:203
 msgid "SSL method not available\n"
-msgstr "SSL metoda je nedostupná\n"
+msgstr "metoda SSL je nedostupná\n"
 
 #: libsylph/ssl.c:209
 msgid "Unknown SSL method *PROGRAM BUG*\n"
-msgstr "Neznámá SSL metoda *PROGRAM BUG*\n"
+msgstr "Neznámá metoda SSL *PROGRAM BUG*\n"
 
 #: libsylph/ssl.c:215
 msgid "Error creating ssl context\n"
-msgstr "Chyba při vytváření ssl kontextu\n"
+msgstr "Chyba při vytváření ssl context\n"
 
 #. Get the cipher
 #: libsylph/ssl.c:234
 #, c-format
 msgid "SSL connection using %s\n"
-msgstr "SSL spojení používá %s\n"
+msgstr "Spojení SSL používá %s\n"
 
 #: libsylph/ssl.c:243
 msgid "Server certificate:\n"
@@ -614,7 +619,7 @@ msgid ""
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>\n"
 "\n"
 msgstr ""
-"Na GPGME má copyright od 2001 Werner Koch <dd9jn@gnu.org>\n"
+"GPGME copyright (C) 2001 Werner Koch <dd9jn@gnu.org>.\n"
 "\n"
 
 #: src/about.c:230
@@ -625,10 +630,10 @@ msgid ""
 "version.\n"
 "\n"
 msgstr ""
-"Tento program je volně šiřitelný, můžete jej redistribuovat a/nebo měnit tak "
-"jak to popisuje GNU General Public License publikovaný Free Software "
-"Foundation a to ve verzi 2, nebo (podle vašeho uvážení) v jakékoliv pozdější "
-"verzi.\n"
+"Tento program je svobodný software; můžete jej šířit a modifikovat podle "
+"ustanovení GNU General Public License, vydávané Free Software Foundation; a "
+"to buď verze 2 této licence anebo (podle vašeho uvážení) kterékoli pozdější "
+"verze.\n"
 "\n"
 
 #: src/about.c:236
@@ -639,8 +644,9 @@ msgid ""
 "more details.\n"
 "\n"
 msgstr ""
-"Tento program je šířen v dobré víře v jeho užitečnost, ale BEZ JAKÉKOLIV "
-"ZÁRUKY. Více detailů naleznete v GNU General Public License.\n"
+"Tento program je rozšiřován v naději, že bude užitečný, avšak BEZ JAKÉKOLI "
+"ZÁRUKY; neposkytují se ani odvozené záruky PRODEJNOSTI anebo VHODNOSTI PRO "
+"URČITÝ ÚČEL. Další podrobnosti hledejte ve GNU General Public License.\n"
 "\n"
 
 #: src/about.c:242
@@ -649,9 +655,9 @@ msgid ""
 "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
-"Kopii GNU General Public License by jste měli obdržet společně s tímto "
-"programem, pokud ne, napište na adresu Free Software Foundation, Inc., 59 "
-"Temple Place - Suite 330, Boston, MA 02111-1307, USA."
+"Kopii GNU General Public License jste měli obdržet spolu s tímto programem; "
+"pokud se tak nestalo, napište o ni Free Software Foundation, Inc., 59 Temple "
+"Place - Suite 330, Boston, MA 02111-1307, USA."
 
 #: src/account_dialog.c:137
 msgid ""
@@ -663,11 +669,11 @@ msgstr ""
 
 #: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
-msgstr "Otevírám okno pro úpravu účtu...\n"
+msgstr "Otevírá se okno úpravy účtu...\n"
 
 #: src/account_dialog.c:288
 msgid "Creating account edit window...\n"
-msgstr "Vytvářím okno pro úpravu účtu...\n"
+msgstr "Vytvářím okno úpravy účtu...\n"
 
 #: src/account_dialog.c:293
 msgid "Edit accounts"
@@ -679,11 +685,11 @@ msgid ""
 "on the `G' column to enable message retrieval by `Get all'."
 msgstr ""
 "Nové zprávy budou kontrolovány v tomto pořadí. Pokud má být účet\n"
-"kontrolován při volbě 'Stáhnout vše, zaškrtněte políčko ve sloupci 'G'."
+"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:491
+#: 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:265
+#: 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
@@ -703,19 +709,17 @@ msgid "Edit"
 msgstr "Upravit"
 
 #: src/account_dialog.c:436
-#, fuzzy
 msgid " _Set as default account "
-msgstr " Nastavit účet jako výchozí "
+msgstr " N_astavit účet jako výchozí "
 
 #: src/account_dialog.c:489
-#, fuzzy, c-format
+#, c-format
 msgid "Do you really want to delete the account '%s'?"
-msgstr "Opravdu chcete tento účet smazat?"
+msgstr "Opravdu chcete smazat účet \"%s\"?"
 
 #: src/account_dialog.c:491 src/prefs_filter.c:687
-#, fuzzy
 msgid "(Untitled)"
-msgstr "Neoznačený"
+msgstr "(Neoznačený)"
 
 #: src/account_dialog.c:492
 msgid "Delete account"
@@ -732,7 +736,7 @@ msgstr "Nelze načíst část zprávy."
 
 #: src/action.c:379
 msgid "Can't get part of multipart message"
-msgstr "Nemohu získat část z mnohačásťové zprávy"
+msgstr "Nelze získat část ze zprávy s více částmi"
 
 #: src/action.c:472
 #, c-format
@@ -740,7 +744,7 @@ msgid ""
 "The selected action cannot be used in the compose window\n"
 "because it contains %%f, %%F or %%p."
 msgstr ""
-"V okně pro psaní zprávy nelze vybranou akci použít\n"
+"V okně psaní zprávy nelze použít vybranou akci,\n"
 "protože obsahuje %%f, %%F nebo %%p."
 
 #: src/action.c:711
@@ -760,19 +764,19 @@ msgid ""
 "%s\n"
 "%s"
 msgstr ""
-"Nelze provést fork pro spuštění následujícího příkazu:\n"
+"Nelze vytvořit proces kvůli vykonání následujícího příkazu:\n"
 "%s\n"
 "%s"
 
 #: src/action.c:1035
 #, c-format
 msgid "--- Running: %s\n"
-msgstr "--- Spuštěn: %s\n"
+msgstr "--- Spuštěno: %s\n"
 
 #: src/action.c:1039
 #, c-format
 msgid "--- Ended: %s\n"
-msgstr "--- Ukončen: %s\n"
+msgstr "--- Ukončeno: %s\n"
 
 #: src/action.c:1071
 msgid "Action's input/output"
@@ -794,7 +798,7 @@ msgid ""
 "  %s"
 msgstr ""
 "Vložte argument pro následující akci:\n"
-"('%%h' bude nahrazeno argumentem)\n"
+"(`%%h' bude nahrazeno argumentem)\n"
 "  %s"
 
 #: src/action.c:1320
@@ -809,7 +813,7 @@ msgid ""
 "  %s"
 msgstr ""
 "Vložte argument pro následující akci:\n"
-"('%%u' bude nahrazeno argumentem)\n"
+"(`%%u' bude nahrazeno argumentem)\n"
 "  %s"
 
 #: src/action.c:1329
@@ -818,45 +822,44 @@ msgstr "Argument uživatele pro akci"
 
 #: src/addressadd.c:155
 msgid "Add Address to Book"
-msgstr "Přidat adresu do databáze"
+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
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Poznámky"
 
 #: src/addressadd.c:219
 msgid "Select Address Book Folder"
-msgstr "Vybrat složku pro databázi adres"
+msgstr "Vybrat složku adresáře"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Soubor"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
-msgstr "/_Soubor/Nová _databáze"
+msgstr "/_Soubor/Nový _adresář"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Soubor/Nová _vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Soubor/Nový _JPilot"
 
-#: src/addressbook.c:344
-#, fuzzy
+#: src/addressbook.c:354
 msgid "/_File/New _LDAP Server"
-msgstr "/_Soubor/Nový _server"
+msgstr "/_Soubor/Nový server _LDAP"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,323 +867,336 @@ msgstr "/_Soubor/Nový _server"
 msgid "/_File/---"
 msgstr "/_Soubor/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Soubor/Up_ravit"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Soubor/_Smazat"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Soubor/_Uložit"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Soubor/_Zavřít"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/Úp_ravy/_Kopírovat"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/Úp_ravy/V_ložit"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _adresa"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _skupina"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nová s_ložka"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Adresa/--"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/U_pravit"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
-msgstr "/_Nástroje/Importovat _LDIF soubor"
+msgstr "/_Nástroje/Importovat soubor _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 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:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Nová _adresa"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
-msgstr "/Nová _skupina"
+msgstr "/Nová skup_ina"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/Úp_ravy"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Smazat"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/Kopí_rovat..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/Úp_ravy/V_ložit"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
-msgstr "E-mail adresa"
+msgstr "E-mailová adresa"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
-msgstr "Databáze adres"
+msgstr "Adresář"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Jméno:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
-msgstr "Hledat"
+msgstr "Vyhledat"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:673 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:179
 msgid "To:"
-msgstr "Komu:"
+msgstr "Příjemce:"
 
-#: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Slepá kopie:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
-msgstr "Smazat adresu(y)"
+msgstr "Smazat adresy"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
-msgstr "Opravdu chcete smazat tuto adresu(y)?"
+msgstr "Opravdu chcete smazat tyto adresy?"
 
-#: src/addressbook.c:1669
-#, fuzzy, c-format
+#: src/addressbook.c:1635
+#, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
 "If deleting the folder only, addresses will be moved into parent folder."
 msgstr ""
-"Chcete smazat složku '%s' A TAKÉ všechny adresy v ní? \n"
+"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:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Smazat složku "
 
-#: src/addressbook.c:1672
-#, fuzzy
+#: src/addressbook.c:1638
 msgid "_Folder only"
 msgstr "Pouze složku"
 
-#: src/addressbook.c:1672
-#, fuzzy
+#: src/addressbook.c:1638
 msgid "Folder and _addresses"
 msgstr "Složku a adresy"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
-msgstr "Opravdu smazat '%s' ?"
+msgstr "Opravdu smazat \"%s\"?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
-msgstr "Nový uživatel, nelze uložit index soubor."
+msgstr "Nový uživatel, nelze uložit soubor index."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
-msgstr "Nový uživatel, nelze uložit soubory s databází adres."
+msgstr "Nový uživatel, nelze uložit soubory s adresářem."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
-msgstr "Konverze staré databáze adres proběhla úspěšně."
+msgstr "Konverze starého adresáře proběhla úspěšně."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
 msgstr ""
-"Stará databáze adres převedena,\n"
-"nelze uložit nový soubor s indexem"
+"Starý adresář převeden,\n"
+"ale nelze uložit nový soubor s indexem."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgstr ""
-"Nelze provést konverzi databáze adres,\n"
-"ale byl vytvořen nový soubor pro databázi adres."
+"Konverze·adresáře nemohla být provedena,\n"
+"ale byly vytvořeny nové prázdné soubory adresáře."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
 msgstr ""
-"Nelze provést konverzi databáze adres,\n"
-"nelze ani vytvořit nové soubory databáze adres."
+"Nelze provést konverzi adresáře,\n"
+"nelze vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr ""
-"Nelze provést konverzi databáze adres\n"
-"a nelze ani vytvořit nové soubory databáze adres."
+"Nelze provést konverzi adresáře\n"
+"a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
-msgstr "Chyba při konverzi databáze adres"
+msgstr "Chyba při konverzi adresáře"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
-msgstr "Konverze databáze adres"
+msgstr "Konverze adresáře"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
-msgstr "Chyba v databázi adres"
+msgstr "Chyba v adresáři"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Nelze načíst index adres"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 msgid "Old address book converted, could not save new address index file"
-msgstr "Stará databáze adres převedena, nelze uložit nový soubor s indexem"
+msgstr "Starý adresář převeden, ale nelze uložit nový soubor index s adresářem"
 
-#: src/addressbook.c:2529
+#: src/addressbook.c:2576
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
-"Nelze provést konverzi databázi adres, byl vytvořen nový soubor pro databázi "
-"adres."
+"Konverze adresáře nemohla·být·provedena, ale byly vytvořeny nové prázdné "
+"soubory adresáře."
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2582
 msgid ""
 "Could not convert address book, could not create new address book files."
-msgstr ""
-"Nelze provést konverzi databáze adres, nelze ani vytvořit nové soubory "
-"databáze."
+msgstr "Nelze provést konverzi adresáře a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2588
 msgid ""
 "Could not convert address book and could not create new address book files."
-msgstr ""
-"Nelze provést konverzi databáze adres a nelze ani vytvořit nové soubory pro "
-"databázi."
+msgstr "Nelze provést konverzi adresáře a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
-msgstr "Chyba při konverzi databáze adres"
+msgstr "Chyba při konverzi adresáře"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
-msgstr "Konverze databáze adres"
+msgstr "Konverze adresáře"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
-msgstr "Databáze adres"
+msgstr "Adresář"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
-msgstr "Email adresa"
+msgstr "E-mailová adresa"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Složka"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
-msgstr "LDAP server"
+msgstr "Server LDAP"
 
 #: src/addrindex.c:95 src/addrindex.c:99 src/addrindex.c:106
 msgid "Common address"
-msgstr "Společná adresa"
+msgstr "Společné adresy"
 
 #: src/addrindex.c:96 src/addrindex.c:100 src/addrindex.c:107
 msgid "Personal address"
-msgstr "Osobní adresa"
+msgstr "Osobní adresy"
 
 #: src/alertpanel.c:142 src/compose.c:5727 src/main.c:638
 msgid "Notice"
@@ -1200,7 +1216,7 @@ msgstr "Vytvářím dialog pro varování...\n"
 
 #: src/alertpanel.c:318
 msgid "Show this message next time"
-msgstr "Zobrazovat příště tuto zprávu"
+msgstr "Zobrazit příště tuto zprávu"
 
 #: src/colorlabel.c:46
 msgid "Orange"
@@ -1251,28 +1267,24 @@ msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
 #: src/compose.c:545
-#, fuzzy
 msgid "/_File/_Send"
-msgstr "/_Soubor/_Uložit"
+msgstr "/_Soubor/_Odeslat"
 
 #: src/compose.c:547
-#, fuzzy
 msgid "/_File/Send _later"
-msgstr "/_Zpráva/Poslat p_ozději"
+msgstr "/_Soubor/Odesla_t později"
 
 #: src/compose.c:550
-#, fuzzy
 msgid "/_File/Save to _draft folder"
-msgstr "/_Zpráva/Uložit jako _koncept"
+msgstr "/_Soubor/Uložit do složky _konceptů"
 
 #: src/compose.c:552
-#, fuzzy
 msgid "/_File/Save and _keep editing"
-msgstr "/_Zpráva/Uložit a pok_račovat v editaci"
+msgstr "/_Soubor/Uložit a pok_račovat v editaci"
 
 #: src/compose.c:555
 msgid "/_File/_Attach file"
-msgstr "/_Soubor/_Připojit soubor"
+msgstr "/_Soubor/_Přiložit soubor"
 
 #: src/compose.c:556
 msgid "/_File/_Insert file"
@@ -1280,12 +1292,11 @@ msgstr "/_Soubor/_Vložit soubor"
 
 #: src/compose.c:558
 msgid "/_File/Insert si_gnature"
-msgstr "/_Soubor/Vložit p_odpis"
+msgstr "/_Soubor/Vložit podpi_s"
 
 #: src/compose.c:559
-#, fuzzy
 msgid "/_File/A_ppend signature"
-msgstr "/_Soubor/Vložit p_odpis"
+msgstr "/_Soubor/Připo_jit podpis"
 
 #: src/compose.c:564
 msgid "/_Edit/_Undo"
@@ -1293,7 +1304,7 @@ msgstr "/Úp_ravy/_Zpět"
 
 #: src/compose.c:565
 msgid "/_Edit/_Redo"
-msgstr "/Úp_ravy/Z_nova"
+msgstr "/Úp_ravy/Z_novu"
 
 #: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
 #: src/messageview.c:162
@@ -1304,14 +1315,6 @@ msgstr "/Úp_ravy/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vyjmout"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/Úp_ravy/_Kopírovat"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/Úp_ravy/V_ložit"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Vložit jako _citaci"
@@ -1322,16 +1325,15 @@ msgstr "/Úp_ravy/Vybr_at vše"
 
 #: src/compose.c:574
 msgid "/_Edit/_Wrap current paragraph"
-msgstr "/Úp_ravy/_Zarovnat aktuální odstavec"
+msgstr "/Úp_ravy/Za_rovnat aktuální odstavec"
 
 #: src/compose.c:576
 msgid "/_Edit/Wrap all long _lines"
-msgstr "/Úp_ravy/Zarovnat _všechny dlouhá řádky"
+msgstr "/Úp_ravy/Zar_ovnat všechny dlouhé řádky"
 
 #: src/compose.c:578
-#, fuzzy
 msgid "/_Edit/Aut_o wrapping"
-msgstr "/Úp_ravy/_Kopírovat"
+msgstr "/Úp_ravy/A_utomatické zarovnání"
 
 #: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
 #: src/summaryview.c:463
@@ -1340,19 +1342,19 @@ msgstr "/Z_obrazit"
 
 #: src/compose.c:580
 msgid "/_View/_To"
-msgstr "/Z_obrazit/_Komu"
+msgstr "/Z_obrazit/_Příjemce"
 
 #: src/compose.c:581
 msgid "/_View/_Cc"
-msgstr "/Z_obrazit/K_opie"
+msgstr "/Z_obrazit/_Odesílatel"
 
 #: src/compose.c:582
 msgid "/_View/_Bcc"
-msgstr "/Z_obrazit/_Slepá kopie"
+msgstr "/Z_obrazit/S_lepá kopie"
 
 #: src/compose.c:583
 msgid "/_View/_Reply to"
-msgstr "/Z_obrazit/_Odpověď komu "
+msgstr "/Z_obrazit/_Adresa pro odpovědi"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
 #: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
@@ -1363,7 +1365,7 @@ msgstr "/Z_obrazit/---"
 
 #: src/compose.c:585
 msgid "/_View/_Followup to"
-msgstr "/Z_obrazit/_Předat"
+msgstr "/Z_obrazit/Pře_dat"
 
 #: src/compose.c:587
 msgid "/_View/R_uler"
@@ -1374,156 +1376,128 @@ msgid "/_View/_Attachment"
 msgstr "/Z_obrazit/Přílo_ha"
 
 #: src/compose.c:591
-#, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
-msgstr "/Z_obrazit/_Přejít/Do _jiné složky"
+msgstr "/Z_obrazit/Up_ravit nástrojovou lištu"
 
 #: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
-#, fuzzy
 msgid "/_View/Character _encoding"
-msgstr "/Z_obrazit/Setříd_it/Sestupně"
+msgstr "/Z_obrazit/Znaková _sada"
 
 #: src/compose.c:600
 msgid "/_View/Character _encoding/_Automatic"
-msgstr ""
+msgstr "/Z_obrazit/Znaková·_sada/_Automaticky rozpoznat"
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
 #: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
 #: src/messageview.c:169
-#, fuzzy
 msgid "/_View/Character _encoding/---"
-msgstr "/Z_obrazit/Setříd_it/Sestupně"
+msgstr "/Z_obrazit/Znaková _sada/---"
 
 #: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
-#, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
-msgstr "/Z_obrazit/_Znaková sada/7bitová ascii (US-ASC_II)"
+msgstr "/Z_obrazit/Znaková _sada/7bitový ASCII (US-ASC_II)"
 
 #: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
-#, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
-msgstr "/Z_obrazit/_Znaková sada/Unicode (_UTF-8)"
+msgstr "/Z_obrazit/Znaková _sada/Unicode (_UTF-8)"
 
 #: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
-#, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
-msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-_1)"
+msgstr "/Z_obrazit/Znaková _sada/Západoevropské jazyky (ISO-8859-_1)"
 
 #: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
-#, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
-msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-15)"
+msgstr "/Z_obrazit/Znaková _sada/Západoevropské jazyky (ISO-8859-15)"
 
 #: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
-#, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
-msgstr "/Z_obrazit/_Znaková sada/Střední Evropa (ISO-8859-_2)"
+msgstr "/Z_obrazit/Znaková _sada/Středoevropské jazyky (ISO-8859-_2)"
 
 #: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
-#, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
-msgstr "/Z_obrazit/_Znaková sada/_Baltská (ISO-8859-13)"
+msgstr "/Z_obrazit/Znaková _sada/Pobaltské jazyky (ISO-8859-13)"
 
 #: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
-#, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
-msgstr "/Z_obrazit/_Znaková sada/Baltská (ISO-8859-_4)"
+msgstr "/Z_obrazit/Znaková _sada/Pobaltské jazyky (ISO-8859-_4)"
 
 #: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
-#, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
-msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
+msgstr "/Z_obrazit/Znaková _sada/Pobaltské jazyky (Windows-1257)"
 
 #: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
-#, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
-msgstr "/Z_obrazit/_Znaková sada/Řecká (ISO-8859-_7)"
+msgstr "/Z_obrazit/Znaková _sada/Řečtina (ISO-8859-_7)"
 
 #: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
-#, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
-msgstr "/Z_obrazit/_Znaková sada/Baltská (ISO-8859-_4)"
+msgstr "/Z_obrazit/Znaková _sada/Arabština (ISO-8859-_6)"
 
 #: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
-#, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
-msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
+msgstr "/Z_obrazit/Znaková _sada/Arabština (Windows-1256)"
 
 #: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
-#, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
-msgstr "/Z_obrazit/_Znaková sada/Řecká (ISO-8859-_7)"
+msgstr "/Z_obrazit/Znaková _sada/Hebrejština (ISO-8859-_8)"
 
 #: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
-#, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
-msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
+msgstr "/Z_obrazit/Znaková _sada/Hebrejština (Windows-1255)"
 
 #: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
-#, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
-msgstr "/Z_obrazit/_Znaková sada/Turecká (ISO-8859-_9)"
+msgstr "/Z_obrazit/Znaková _sada/Turečtina (ISO-8859-_9)"
 
 #: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
-#, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
-msgstr "/Z_obrazit/_Znaková sada/Azbuka (ISO-8859-_5)"
+msgstr "/Z_obrazit/Znaková _sada/Cyrilice (ISO-8859-_5)"
 
 #: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
-#, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
-msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
+msgstr "/Z_obrazit/Znaková _sada/Cyrilice (KOI8-_R)"
 
 #: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
-#, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
-msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
+msgstr "/Z_obrazit/Znaková _sada/Cyrilice (KOI8-_U)"
 
 #: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
-#, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
-msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
+msgstr "/Z_obrazit/Znaková _sada/Cyrilice (Windows-1251)"
 
 #: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
-#, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
-msgstr "/Z_obrazit/_Znaková sada/Japonská (ISO-2022-_JP)"
+msgstr "/Z_obrazit/Znaková _sada/Japonština (ISO-2022-_JP)"
 
 #: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
-#, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
-msgstr "/Z_obrazit/_Znaková sada/Zjednodušená čínská (_GB2312)"
+msgstr "/Z_obrazit/Znaková·_sada/Zjednodušená čínština (_GB2312)"
 
 #: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
-#, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
-msgstr "/Z_obrazit/_Znaková sada/Zjednodušená čínská (_GB2312)"
+msgstr "/Z_obrazit/Znaková·_sada/Zjednodušená čínština (GBK)"
 
 #: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
-#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
-msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (_Big5)"
+msgstr "/Z_obrazit/Znaková·_sada/Tradiční čínština (_Big5)"
 
 #: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
-#, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
-msgstr "/Z_obrazit/_Znaková sada/Korejská (EUC-_KR)"
+msgstr "/Z_obrazit/Znaková·_sada/Korejština (EUC-_KR)"
 
 #: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
-#, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
-msgstr "/Z_obrazit/_Znaková sada/Thajská (TIS-620)"
+msgstr "/Z_obrazit/Znaková·_sada/Thajština (TIS-620)"
 
 #: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
-#, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
-msgstr "/Z_obrazit/_Znaková sada/Thajská (Windows-874)"
+msgstr "/Z_obrazit/Znaková·_sada/Thajština (Windows-874)"
 
 #: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
 msgid "/_Tools/_Address book"
-msgstr "/_Nástroje/_Databáze adres"
+msgstr "/_Nástroje/Adresá_ř"
 
 #: src/compose.c:681
 msgid "/_Tools/_Template"
@@ -1541,29 +1515,24 @@ msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
 #: src/compose.c:686
-#, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
-msgstr "/Úp_ravy/Upravit pomocí e_xterního editoru"
+msgstr "/_Nástroje/Upravit pomocí e_xterního editoru"
 
 #: src/compose.c:690
-#, fuzzy
 msgid "/_Tools/PGP Si_gn"
-msgstr "/_Nástroje/_Akce"
+msgstr "/_Nástroje/Podepsat P_GP"
 
 #: src/compose.c:691
-#, fuzzy
 msgid "/_Tools/PGP _Encrypt"
-msgstr "/_Zpráva/Zaši_frovat"
+msgstr "/_Nástroje/Ši_frovat PGP"
 
 #: src/compose.c:696
-#, fuzzy
 msgid "/_Tools/_Check spell"
-msgstr "/_Nástroje/S_pustit"
+msgstr "/_Nástroje/Zkontrolovat pravopi_s"
 
 #: src/compose.c:697
-#, fuzzy
 msgid "/_Tools/_Set spell language"
-msgstr "/_Nástroje/Ša_blona"
+msgstr "/_Nástroje/_Nastavit jazyk pro kontrolu pravopisu"
 
 #: src/compose.c:946
 #, c-format
@@ -1572,7 +1541,7 @@ msgstr "%s: soubor neexistuje\n"
 
 #: src/compose.c:1050 src/compose.c:1123
 msgid "Can't get text part\n"
-msgstr "Nelze získat část textu\n"
+msgstr "Nelze získat textovou část\n"
 
 #: src/compose.c:1544
 msgid "Quote mark format error."
@@ -1590,7 +1559,7 @@ msgstr "Soubor %s neexistuje\n"
 #: src/compose.c:2045
 #, c-format
 msgid "Can't get file size of %s\n"
-msgstr "Nemohu zjistit délku souboru %s\n"
+msgstr "Nelze zjistit délku souboru %s\n"
 
 #: src/compose.c:2049
 #, c-format
@@ -1600,7 +1569,7 @@ msgstr "Soubor %s je prázdný."
 #: src/compose.c:2053
 #, c-format
 msgid "Can't read %s."
-msgstr "Nemohu načíst %s."
+msgstr "Nelze načíst %s."
 
 #: src/compose.c:2086
 #, c-format
@@ -1609,7 +1578,7 @@ msgstr "Zpráva: %s"
 
 #: src/compose.c:2146 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
-msgstr "Nemohu získat část z mnohačásťové zprávy."
+msgstr "Nelze získat část ze zprávy s více částmi."
 
 #: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
@@ -1617,7 +1586,7 @@ msgid "(No Subject)"
 msgstr "(Žádný předmět)"
 
 #: src/compose.c:2633
-#, fuzzy, c-format
+#, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Psaní zprávy%s"
 
@@ -1626,13 +1595,12 @@ msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
 #: src/compose.c:2756
-#, fuzzy
 msgid "Empty subject"
-msgstr "Předmět"
+msgstr "Není uveden předmět"
 
 #: src/compose.c:2757
 msgid "Subject is empty. Send it anyway?"
-msgstr "Předmět je prázdný. Přesto mám zprávu odeslat?"
+msgstr "Předmět je prázdný. Přesto odeslat?"
 
 #: src/compose.c:2816
 msgid "can't get recipient list."
@@ -1658,23 +1626,23 @@ msgstr "Zprávu nelze uložit do odeslané pošty."
 #: src/compose.c:2930
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
-msgstr "Nemohu najít žádný klíč asociovaný s aktuálně vybraným id klíče '%s'."
+msgstr ""
+"Nelze vyhledat žádný klíč asociovaný s aktuálně vybraným id klíče \"%s\"."
 
 #: src/compose.c:3027
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
 "\n"
 "Send it as %s anyway?"
 msgstr ""
-"Nelze převést znakovou sadu zprávy z\n"
-"%s na %s.\n"
-"Přesto poslat?"
+"Nelze převést znakovou sadu těla zprávy z %s na %s.\n"
+"\n"
+"Přesto odeslat jako %s?"
 
 #: src/compose.c:3033
-#, fuzzy
 msgid "Code conversion error"
-msgstr "Chyba při konverzi databáze adres"
+msgstr "Chyba při konverzi adresáře"
 
 #: src/compose.c:3112
 #, c-format
@@ -1684,16 +1652,22 @@ msgid ""
 "\n"
 "Send it anyway?"
 msgstr ""
+"Řádek %d překračuje svou maximální možnou délku·(998·bajtů).\n"
+"Obsah zprávy může být během přenosu poškozen.\n"
+"\n"
+"Přesto odeslat?"
 
 #: src/compose.c:3116
 msgid "Line length limit"
-msgstr ""
+msgstr "Maximální délka řádku"
 
 #: src/compose.c:3245
+#, fuzzy
 msgid "Encrypting with Bcc"
-msgstr ""
+msgstr "Šifrování s příjemci slepé kopie"
 
 #: src/compose.c:3246
+#, fuzzy
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1701,6 +1675,11 @@ msgid ""
 "\n"
 "Send it anyway?"
 msgstr ""
+"Tato zpráva má příjemce slepé kopie. Pokud má být šifrována, všichni "
+"příjemci slepé kopie budou viditelní skrze seznam šifrovacího klíče, čímž "
+"dojde k jejich odkrytí.\n"
+"\n"
+"Přesto odeslat?"
 
 #: src/compose.c:3429
 msgid "can't remove the old message\n"
@@ -1708,42 +1687,40 @@ msgstr "nelze smazat staré zprávy\n"
 
 #: src/compose.c:3447
 msgid "queueing message...\n"
-msgstr "zařazuji zprávu...\n"
+msgstr "zařazování zprávy...\n"
 
 #: src/compose.c:3529
 msgid "can't find queue folder\n"
-msgstr "nelze najít složku s frontou zpráv\n"
+msgstr "nelze vyhledat složku s frontou zpráv\n"
 
 #: src/compose.c:3536
 msgid "can't queue the message\n"
-msgstr "Zprávu nelze zařadit\n"
+msgstr "zprávu nelze zařadit\n"
 
 #: src/compose.c:4168
 #, c-format
 msgid "generated Message-ID: %s\n"
-msgstr "vytvářím číslo zprávy: %s\n"
+msgstr "vytvářím ID zprávy: %s\n"
 
 #: src/compose.c:4283
 msgid "Creating compose window...\n"
-msgstr "Vytvářím okno pro psaní...\n"
+msgstr "Vytvářím okno psaní zprávy...\n"
 
 #: src/compose.c:4336 src/headerview.c:54
 msgid "From:"
-msgstr "Od:"
+msgstr "Odesílatel:"
 
 #: src/compose.c:4410
-#, fuzzy
 msgid "PGP Sign"
-msgstr "/_Nástroje/_Akce"
+msgstr "Podepsat PGP"
 
 #: src/compose.c:4413
-#, fuzzy
 msgid "PGP Encrypt"
-msgstr "/_Zpráva/Zaši_frovat"
+msgstr "Šifrovat PGP"
 
 #: src/compose.c:4451 src/compose.c:5553
 msgid "MIME type"
-msgstr "MIME typ"
+msgstr "Typ MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
@@ -1753,7 +1730,7 @@ msgstr "Délka"
 
 #: src/compose.c:5449
 msgid "Invalid MIME type."
-msgstr "Neplatný MIME typ."
+msgstr "Neplatný typ MIME."
 
 #: src/compose.c:5467
 msgid "File doesn't exist or is empty."
@@ -1769,7 +1746,7 @@ msgstr "Kódování"
 
 #: src/compose.c:5578 src/prefs_folder_item.c:202
 msgid "Path"
-msgstr "Cesta k souboru"
+msgstr "Cesta"
 
 #: src/compose.c:5579
 msgid "File name"
@@ -1778,65 +1755,59 @@ msgstr "Název souboru"
 #: src/compose.c:5669
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
-msgstr "Špatný příkaz v externím editoru: '%s'\n"
+msgstr "Špatný příkaz v externím editoru: \"%s\"\n"
 
 #: src/compose.c:5724
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process (pid: %d)?\n"
 msgstr ""
 "Externí editor stále pracuje.\n"
-"Mám přerušit proces?\n"
-"číslo procesu: %d"
+"Vynutit přerušení procesu (číslo·procesu:·%d)?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
-msgstr ""
+msgstr "_Upravit nástrojovou lištu..."
 
 #: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
 #: src/compose.c:6278
-#, fuzzy
 msgid "Select files"
-msgstr "Vybrat soubor"
+msgstr "Vybrat soubory"
 
 #: src/compose.c:6301
 msgid "Select file"
 msgstr "Vybrat soubor"
 
 #: src/compose.c:6336
-#, fuzzy
 msgid "Save message"
-msgstr "Odešle zprávu"
+msgstr "Uložit zprávu"
 
 #: src/compose.c:6337
-#, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
-msgstr "Obsah zprávy se změnil. Chcete ji stornovat?"
+msgstr "Obsah zprávy se změnil. Uložit do složky konceptů?"
 
 #: src/compose.c:6339
 msgid "Close _without saving"
-msgstr ""
+msgstr "Zavřít _bez uložení"
 
 #: src/compose.c:6381
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
-msgstr "Opravdu chcete použít šablonu '%s' ?"
+msgstr "Opravdu chcete použít šablonu \"%s\"?"
 
 #: src/compose.c:6383
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
 #: src/compose.c:6384
-#, fuzzy
 msgid "_Replace"
 msgstr "Nahradit"
 
 #: src/compose.c:6384
-#, fuzzy
 msgid "_Insert"
 msgstr "Vložit"
 
@@ -1855,11 +1826,11 @@ msgstr "Upravit detaily o osobě"
 
 #: src/editaddress.c:468
 msgid "An E-Mail address must be supplied."
-msgstr "Nebyla zadána e-mail adresa."
+msgstr "Nebyla zadána e-mailová adresa."
 
 #: src/editaddress.c:587
 msgid "A Name and Value must be supplied."
-msgstr "Musí být zadáno jméno a hodnota."
+msgstr "Nebylo zadáno jméno a hodnota."
 
 #. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
 #: src/editaddress.c:645
@@ -1868,7 +1839,7 @@ msgstr "Upravit data o osobě"
 
 #: src/editaddress.c:744
 msgid "Display Name"
-msgstr "Zobrazit jméno"
+msgstr "Zobrazené jméno"
 
 #: src/editaddress.c:750 src/editaddress.c:754
 msgid "Last Name"
@@ -1883,9 +1854,9 @@ msgid "Nick Name"
 msgstr "Přezdívka"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
-msgstr "E-mail adresa"
+msgstr "E-mailová adresa"
 
 #: src/editaddress.c:794 src/editaddress.c:851
 msgid "Alias"
@@ -1922,11 +1893,11 @@ msgstr "Atributy uživatele"
 
 #: src/editbook.c:120
 msgid "File appears to be Ok."
-msgstr "Soubor je OK."
+msgstr "Soubor se zdá být v pořádku."
 
 #: src/editbook.c:123
 msgid "File does not appear to be a valid address book format."
-msgstr "Soubor není ve formátu pro databázi adres."
+msgstr "Soubor není ve formátu adresáře."
 
 #: src/editbook.c:126 src/editjpilot.c:204 src/editvcard.c:108
 msgid "Could not read file."
@@ -1934,7 +1905,7 @@ msgstr "Nelze načíst soubor."
 
 #: src/editbook.c:174 src/editbook.c:288
 msgid "Edit Addressbook"
-msgstr "Upravit databázi adres"
+msgstr "Upravit adresář"
 
 #: src/editbook.c:203 src/editjpilot.c:278 src/editvcard.c:191
 msgid " Check File "
@@ -1947,77 +1918,77 @@ msgstr "Soubor"
 
 #: src/editbook.c:307
 msgid "Add New Addressbook"
-msgstr "Přidat novou databázi adres"
+msgstr "Přidat nový adresář"
 
 #: src/editgroup.c:113
 msgid "A Group Name must be supplied."
 msgstr "Musí být zadáno jméno skupiny."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Upravit data o skupině"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Jméno skupiny"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Adresy ve skupině"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Dostupné adresy"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
-"E-mail adresy lze přesunovat do a ze skupiny pomocí tlačítek se šipkami"
+"E-mailové adresy lze přesunovat do a ze skupiny pomocí tlačítek se šipkami"
 
-#: src/editgroup.c:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Upravit detaily o skupině"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Přidat novou skupinu"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Upravit složku"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Zadejte název složky:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
-msgstr "Zadejte název složky:"
+msgstr "Zadejte název nové složky:"
 
 #: src/editjpilot.c:201
 msgid "File does not appear to be JPilot format."
-msgstr "Soubor není ve formátu pro JPilot."
+msgstr "Soubor není ve formátu JPilot."
 
 #: src/editjpilot.c:213
 msgid "Select JPilot File"
-msgstr "Vybrat JPilot soubor"
+msgstr "Vybrat soubor JPilot"
 
 #: src/editjpilot.c:249 src/editjpilot.c:381
 msgid "Edit JPilot Entry"
-msgstr "Upravit JPilot soubor"
+msgstr "Upravit záznam JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:535 src/prefs_account_dialog.c:1799
@@ -2027,11 +1998,11 @@ msgstr " ... "
 
 #: src/editjpilot.c:295
 msgid "Additional e-Mail address item(s)"
-msgstr "Další položka(y) e-mail adresy"
+msgstr "Další položky e-mailové adresy"
 
 #: src/editjpilot.c:388
 msgid "Add New JPilot Entry"
-msgstr "Přidat nový JPilot záznam"
+msgstr "Přidat nový záznam JPilot"
 
 #: src/editldap.c:171
 msgid "Connected successfully to server"
@@ -2039,11 +2010,11 @@ msgstr "Úspěšně připojeno k serveru"
 
 #: src/editldap.c:174 src/editldap_basedn.c:299
 msgid "Could not connect to server"
-msgstr "Nemohu se spojit se serverem"
+msgstr "Nelze se spojit se serverem"
 
 #: src/editldap.c:222 src/editldap.c:546
 msgid "Edit LDAP Server"
-msgstr "Upravit LDAP server"
+msgstr "Upravit server LDAP"
 
 #: src/editldap.c:316 src/editldap_basedn.c:168
 msgid "Hostname"
@@ -2055,7 +2026,7 @@ msgstr "Port"
 
 #: src/editldap.c:337
 msgid " Check Server "
-msgstr " Zjistit server "
+msgstr " Otestovat server "
 
 #: src/editldap.c:342 src/editldap_basedn.c:188
 msgid "Search Base"
@@ -2075,11 +2046,11 @@ msgstr "Bind DN"
 
 #: src/editldap.c:420
 msgid "Bind Password"
-msgstr "Bind Heslo"
+msgstr "Heslo Bind"
 
 #: src/editldap.c:430
 msgid "Timeout (secs)"
-msgstr "Timeout (vteřin)"
+msgstr "Čas vypršení (sekund)"
 
 #: src/editldap.c:444
 msgid "Maximum Entries"
@@ -2095,7 +2066,7 @@ msgstr "Rozšíření"
 
 #: src/editldap.c:558
 msgid "Add New LDAP Server"
-msgstr "Přidat nový LDAP server"
+msgstr "Přidat nový server LDAP"
 
 #: src/editldap_basedn.c:148
 msgid "Edit LDAP - Select Search Base"
@@ -2103,7 +2074,7 @@ msgstr "Editace LDAP - Vyberte bázi pro hledání"
 
 #: src/editldap_basedn.c:209
 msgid "Available Search Base(s)"
-msgstr "Dostupná(é) báze pro hledání"
+msgstr "Dostupné báze pro hledání"
 
 #: src/editldap_basedn.c:295
 msgid "Could not read Search Base(s) from server - please set manually"
@@ -2115,15 +2086,15 @@ msgstr "Soubor není ve formátu vCard."
 
 #: src/editvcard.c:117
 msgid "Select vCard File"
-msgstr "Vybrat vCard soubor"
+msgstr "Vybrat soubor vCard"
 
 #: src/editvcard.c:162 src/editvcard.c:270
 msgid "Edit vCard Entry"
-msgstr "Upravit vCard záznam"
+msgstr "Upravit záznam vCard"
 
 #: src/editvcard.c:275
 msgid "Add New vCard Entry"
-msgstr "Přidat nový vCard záznam"
+msgstr "Přidat nový záznam vCard"
 
 #: src/export.c:149
 msgid "Export"
@@ -2131,11 +2102,11 @@ msgstr "Export"
 
 #: src/export.c:168
 msgid "Specify target folder and mbox file."
-msgstr "Zadejte cílovou složku a soubor mbox."
+msgstr "Zadejte zdrojovou složku a cílový soubor mbox."
 
 #: src/export.c:178
 msgid "Source dir:"
-msgstr "Zdrojový adresář:"
+msgstr "Zdrojová složka:"
 
 #: src/export.c:183
 msgid "Exporting file:"
@@ -2148,7 +2119,7 @@ msgstr " Vybrat... "
 
 #: src/export.c:240
 msgid "Select exporting file"
-msgstr "Vyberte soubor pro export"
+msgstr "Vyberte soubor k exportu"
 
 #: src/filesel.c:136
 msgid "Save as"
@@ -2163,75 +2134,72 @@ msgid "Overwrite existing file?"
 msgstr "Přepsat existující soubor?"
 
 #: src/filesel.c:159
-#, fuzzy
 msgid "Select directory"
-msgstr "Spool adresář"
+msgstr "Vybrat adresář"
 
 #: src/foldersel.c:230
 msgid "Select folder"
 msgstr "Vybrat složku"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Odeslaná pošta"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Fronta"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Koš"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "Nová složka"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
-msgstr "%c nemůže být obsaženo ve jméně složky."
+msgstr "\"%c\" nemůže být obsaženo ve jméně složky."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
-msgstr "Složka '%s' už existuje."
+msgstr "Složka \"%s\" už existuje."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
-msgstr "Nemohu vytvořit složku '%s'."
+msgstr "Nelze vytvořit složku \"%s\"."
 
 #: src/folderview.c:247 src/folderview.c:269
 msgid "/Create _new folder..."
-msgstr "/_Vytvořit novou složku..."
+msgstr "/Vy_tvořit novou složku..."
 
 #: src/folderview.c:248 src/folderview.c:270 src/folderview.c:296
 msgid "/_Rename folder..."
 msgstr "/Přej_menovat složku..."
 
 #: src/folderview.c:249 src/folderview.c:271
-#, fuzzy
 msgid "/_Move folder..."
-msgstr "/Přej_menovat složku..."
+msgstr "/Přes_unout složku..."
 
 #: src/folderview.c:250 src/folderview.c:272 src/folderview.c:297
 msgid "/_Delete folder"
 msgstr "/_Smazat složku"
 
 #: src/folderview.c:252 src/folderview.c:274
-#, fuzzy
 msgid "/Empty _trash"
-msgstr "Vyprázdnit koš"
+msgstr "/V_yprázdnit koš"
 
 #: src/folderview.c:254 src/folderview.c:278 src/folderview.c:301
 msgid "/_Check for new messages"
@@ -2242,14 +2210,12 @@ msgid "/R_ebuild folder tree"
 msgstr "/O_bnovit strom složek"
 
 #: src/folderview.c:257 src/folderview.c:281 src/folderview.c:303
-#, fuzzy
 msgid "/_Update summary"
-msgstr "/Z_obrazit/_Aktualizace souhrnu"
+msgstr "/Aktualizace sou_hrnu"
 
 #: src/folderview.c:259 src/folderview.c:283 src/folderview.c:305
-#, fuzzy
 msgid "/Mar_k all read"
-msgstr "/_Označit/Označit jako př_ečtené"
+msgstr "/Označit vše jako př_ečtené"
 
 #: src/folderview.c:261 src/folderview.c:285 src/folderview.c:307
 msgid "/_Search messages..."
@@ -2257,16 +2223,15 @@ msgstr "/Na_jít zprávy..."
 
 #: src/folderview.c:262 src/folderview.c:286 src/folderview.c:308
 msgid "/Ed_it search condition..."
-msgstr ""
+msgstr "/Uprav_it·možnosti hledání..."
 
 #: src/folderview.c:276 src/folderview.c:299
-#, fuzzy
 msgid "/Down_load"
-msgstr "Žádné nepřečtené zprávy."
+msgstr "/Stáhn_out"
 
 #: src/folderview.c:293
 msgid "/Su_bscribe to newsgroup..."
-msgstr "/Při_hlásit diskusní skupinu..."
+msgstr "/Ode_bírat diskusní skupinu..."
 
 #: src/folderview.c:295
 msgid "/_Remove newsgroup"
@@ -2274,187 +2239,186 @@ msgstr "/Smazat d_iskusní skupinu"
 
 #: src/folderview.c:331
 msgid "Creating folder view...\n"
-msgstr "Vytvářím náhled pro složku...\n"
+msgstr "Vytváří se strom složek...\n"
 
 #: src/folderview.c:408
 msgid "New"
 msgstr "Nová"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Nepřečtené"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
-msgstr "Nastavuji informace o složce...\n"
+msgstr "Nastavování informace o složce...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
-msgstr "Nastavuji informace o složce..."
+msgstr "Nastavování informace o složce..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
-msgstr "Prohledávám složku %s%c%s ..."
+msgstr "Prohledává se složka %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
-msgstr "Prohledávám složku %s ..."
+msgstr "Prohledává se složka %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Obnovit strom složek"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
-msgstr ""
+msgstr "Strom složek bude obnoven. Pokračovat?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
-msgstr "Provádím obnovu stromu složek..."
+msgstr "Provádí se obnova stromu složek..."
 
-#: src/folderview.c:931
-#, fuzzy
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
-msgstr "Provádím obnovu stromu složek..."
+msgstr "Provádí se obnova stromu složek..."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
-msgstr "Zjišťuji nové zprávy ve všech složkách..."
+msgstr "Zjišťují se nové zprávy ve všech složkách..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
-msgstr ""
+msgstr "Nevyžádaná pošta"
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Je vybrána složka %s\n"
 
-#: src/folderview.c:2059
-#, fuzzy, c-format
+#: src/folderview.c:2066
+#, c-format
 msgid "Downloading messages in %s ..."
-msgstr "Posílám zprávu"
+msgstr "Stahují se zprávy v %s ..."
 
-#: src/folderview.c:2096
-#, fuzzy, c-format
+#: src/folderview.c:2103
+#, c-format
 msgid "Error occurred while downloading messages in `%s'."
-msgstr "Vyskytla se chyba při posílání zprávy na %s ."
+msgstr "Vyskytla se chyba při stahování zpráv v \"%s\"."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
 " append `/' at the end of the name)"
 msgstr ""
-"Zadejte název pro novou složku:\n"
+"Zadejte název nové složky:\n"
 "(Pokud chcete vytvořit složku, která bude mít další\n"
-"podsložky, přidejte nakonec názvu '/')"
+"podsložky, přidejte na konec názvu \"/\".)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
-msgstr "Zadejte nové jméno pro '%s' :"
+msgstr "Zadejte nové jméno pro \"%s\":"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
-#: src/folderview.c:2272 src/folderview.c:2280
-#, fuzzy, c-format
+#: src/folderview.c:2279 src/folderview.c:2287
+#, c-format
 msgid "Can't rename the folder '%s'."
-msgstr "Nemohu odstranit složku '%s'."
+msgstr "Nelze přejmenovat složku \"%s\"."
 
-#: src/folderview.c:2350
-#, fuzzy, c-format
+#: src/folderview.c:2357
+#, c-format
 msgid "Can't move the folder `%s'."
-msgstr "Nemohu odstranit složku '%s'."
+msgstr "Nelze odstranit složku \"%s\"."
 
-#: src/folderview.c:2416
-#, fuzzy, c-format
+#: src/folderview.c:2423
+#, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
 "The real messages are not deleted."
 msgstr ""
-"Opravdu odebrat poštovní schránku '%s'?\n"
-"(Zprávy NEBUDOU smazány z disku)"
+"Opravdu odebrat složku hledání \"%s\"?\n"
+"Skutečné zprávy nebudou smazány."
 
-#: src/folderview.c:2418
-#, fuzzy
+#: src/folderview.c:2425
 msgid "Delete search folder"
-msgstr "Smazat složku "
+msgstr "Smazat složku hledání"
 
-#: src/folderview.c:2423
-#, fuzzy, c-format
+#: src/folderview.c:2430
+#, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
 msgstr ""
-"Všechny složky a zprávy v '%s' budou vymazány.\n"
-"Chcete je opravdu smazat ?"
+"Všechny složky a zprávy v \"%s\" budou definitivně vymazány.\n"
+"Obnovení nebude možné.\n"
+"\n"
+"Chcete je opravdu vymazat?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
-#, fuzzy, c-format
+#: src/folderview.c:2462 src/folderview.c:2468
+#, c-format
 msgid "Can't remove the folder '%s'."
-msgstr "Nemohu odstranit složku '%s'."
+msgstr "Nelze odstranit složku \"%s\"."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:2498
-#, fuzzy
+#: src/folderview.c:2505
 msgid "Delete all messages in the trash folder?"
-msgstr "Vyprázdnit všechny zprávy v koši?"
+msgstr "Smazat všechny zprávy v koši?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
 "(The messages are NOT deleted from the disk)"
 msgstr ""
-"Opravdu odebrat poštovní schránku '%s'?\n"
-"(Zprávy NEBUDOU smazány z disku)"
+"Opravdu odebrat poštovní schránku \"%s\"?\n"
+"(Zprávy NEBUDOU smazány z disku.)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Odstranit poštovní schránku"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
-msgstr "Opravdu smazat IMAP4 účet '%s'?"
+msgstr "Opravdu smazat účet IMAP4 \"%s\"?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
-msgstr "Smazat IMAP4 účet"
+msgstr "Smazat účet IMAP4"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
-msgstr "Opravdu chcete smazat diskusní skupinu '%s' ?"
+msgstr "Opravdu chcete smazat diskusní skupinu \"%s\"?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Smazat diskusní skupinu"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
-msgstr "Opravdu smazat účet pro diskusní skupinu '%s'?"
+msgstr "Opravdu smazat účet diskusních skupin \"%s\"?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
-msgstr "Smazat účet pro diskuzní skupinu"
+msgstr "Smazat účet diskusních skupin"
 
 #: src/headerview.c:57
 msgid "Newsgroups:"
@@ -2466,7 +2430,7 @@ msgstr "Předmět:"
 
 #: src/headerview.c:90
 msgid "Creating header view...\n"
-msgstr "Vytvářím náhled na záhlaví...\n"
+msgstr "Vytvářím náhled záhlaví...\n"
 
 #: src/headerview.c:212 src/query_search.c:667 src/summaryview.c:2240
 msgid "(No From)"
@@ -2474,11 +2438,11 @@ msgstr "(není znám odesílatel)"
 
 #: src/imageview.c:55
 msgid "Creating image view...\n"
-msgstr "Vytvářím náhled na obrázek...\n"
+msgstr "Vytvářím náhled obrázku...\n"
 
 #: src/imageview.c:109
 msgid "Can't load the image."
-msgstr "Nemohu nahrát obrázek."
+msgstr "Nelze nahrát obrázek."
 
 #: src/import.c:155
 msgid "Import"
@@ -2486,7 +2450,7 @@ msgstr "Import"
 
 #: src/import.c:174
 msgid "Specify target mbox file and destination folder."
-msgstr "Zadejte cílový mbox soubor a cílovou složku."
+msgstr "Zadejte zdrojový soubor mbox a cílovou složku."
 
 #: src/import.c:184
 msgid "Importing file:"
@@ -2494,19 +2458,19 @@ msgstr "Importovaný soubor :"
 
 #: src/import.c:189
 msgid "Destination dir:"
-msgstr "Cílový adresář:"
+msgstr "Cílová složka:"
 
 #: src/import.c:246
 msgid "Select importing file"
-msgstr "Vybrat soubor pro import"
+msgstr "Vybrat soubor k importu"
 
 #: src/importldif.c:125
 msgid "Please specify address book name and file to import."
-msgstr "Zadejte prosím název databáze adres a soubor pro import."
+msgstr "Zadejte prosím název adresáře a soubor k importu."
 
 #: src/importldif.c:128
 msgid "Select and rename LDIF field names to import."
-msgstr "Vyberte a přejmenujte názvy LDIF polí pro import."
+msgstr "Vyberte a přejmenujte názvy polí LDIF k importu."
 
 #: src/importldif.c:131
 msgid "File imported."
@@ -2518,19 +2482,19 @@ msgstr "Vyberte prosím soubor."
 
 #: src/importldif.c:326
 msgid "Address book name must be supplied."
-msgstr "Musí být zadán název databáze adres."
+msgstr "Musí být zadán název adresáře."
 
 #: src/importldif.c:341
 msgid "Error reading LDIF fields."
-msgstr "Chyba při čtení LDIF položek."
+msgstr "Chyba při čtení položek LDIF."
 
 #: src/importldif.c:364
 msgid "LDIF file imported successfully."
-msgstr "Import LDIF soubor byl úspěšný."
+msgstr "Import souboru LDIF byl úspěšný."
 
 #: src/importldif.c:450
 msgid "Select LDIF File"
-msgstr "Výběr LDIF souboru"
+msgstr "Výběr souboru LDIF"
 
 #: src/importldif.c:526
 msgid "File Name"
@@ -2558,19 +2522,19 @@ msgstr "Vybrat"
 
 #: src/importldif.c:689
 msgid "Address Book :"
-msgstr "Databáze adres :"
+msgstr "Adresář:"
 
 #: src/importldif.c:699
 msgid "File Name :"
-msgstr "Název souboru :"
+msgstr "Název souboru:"
 
 #: src/importldif.c:709
 msgid "Records :"
-msgstr "Záznamů :"
+msgstr "Záznamů:"
 
 #: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
-msgstr "Importovat LDIF soubor do databáze adres"
+msgstr "Importovat soubor LDIF do adresáře"
 
 #. Button panel
 #: src/importldif.c:768 src/prefs_toolbar.c:72
@@ -2579,7 +2543,7 @@ msgstr "Předchozí"
 
 #: src/importldif.c:769 src/prefs_toolbar.c:69
 msgid "Next"
-msgstr "Další"
+msgstr "Následující"
 
 #: src/importldif.c:798
 msgid "File Info"
@@ -2591,21 +2555,20 @@ msgstr "Atributy"
 
 #: src/importldif.c:800
 msgid "Finish"
-msgstr "Konec"
+msgstr "Dokončit"
 
 #: src/inc.c:160
-#, fuzzy, c-format
+#, c-format
 msgid "Sylpheed: %d new messages"
-msgstr "Dokončeno (%d nová(é) zpráva(y))"
+msgstr "Sylpheed: %d nových zpráv"
 
 #: src/inc.c:433
-#, fuzzy
 msgid "Authenticating with POP3"
-msgstr "Autentizuji"
+msgstr "Autentizace přes POP3"
 
 #: src/inc.c:459
 msgid "Retrieving new messages"
-msgstr "Načítám nové zprávy"
+msgstr "Přijímají se nové zprávy"
 
 #: src/inc.c:502
 msgid "Standby"
@@ -2617,16 +2580,16 @@ msgstr "Zrušeno"
 
 #: src/inc.c:647
 msgid "Retrieving"
-msgstr "Načítám"
+msgstr "Přijímá se"
 
 #: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
-msgstr "Hotovo (%d zpráv(a) (%s) přijato)"
+msgstr "Hotovo (%d zpráv (%s) přijato)"
 
 #: src/inc.c:660
 msgid "Done (no new messages)"
-msgstr "Hotovo (Nejsou žádné nové zprávy)"
+msgstr "Hotovo (nejsou žádné nové zprávy)"
 
 #: src/inc.c:666
 msgid "Connection failed"
@@ -2641,14 +2604,13 @@ msgid "Locked"
 msgstr "Zamknuto"
 
 #: src/inc.c:682
-#, fuzzy
 msgid "Timeout"
-msgstr "Timeout (vteřin)"
+msgstr "Čas vypršení"
 
 #: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
-msgstr "Dokončeno (%d nová(é) zpráva(y))"
+msgstr "Dokončeno (%d nových zpráv)"
 
 #: src/inc.c:735
 msgid "Finished (no new messages)"
@@ -2661,80 +2623,79 @@ msgstr "Během načítání zpráv se vyskytly chyby."
 #: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
-msgstr "Získávám nové zprávy z účtu %s ...\n"
+msgstr "získávájí se nové zprávy z účtu %s ...\n"
 
 #: src/inc.c:784
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Authenticating with POP3"
-msgstr "Autentizuji"
+msgstr "%s: Autentizace přes POP3"
 
 #: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
-msgstr "%s : Načítám nové zprávy"
+msgstr "%s: Přijímají se nové zprávy"
 
 #: src/inc.c:806
-#, fuzzy, c-format
+#, c-format
 msgid "Connecting to POP3 server: %s..."
-msgstr "Připojuji se na POP3 server: %s ..."
+msgstr "Připojování k serveru POP3: %s ..."
 
 #: src/inc.c:817
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
-msgstr "Nemohu se spojit s POP3 serverem: %s:%d\n"
+msgstr "Nelze se spojit se serverem POP3: %s:%d\n"
 
 #: src/inc.c:896 src/send_message.c:649
 msgid "Authenticating..."
-msgstr "Autentizuji..."
+msgstr "Autentizace..."
 
 #: src/inc.c:897
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieving messages from %s..."
-msgstr "Získávám zprávy z %s do %s...\n"
+msgstr "Přijímají se zprávy z %s..."
 
 #: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
-msgstr "Zjišťuji počet nových zpráv (STAT)..."
+msgstr "Zjišťuje se počet nových zpráv (STAT)..."
 
 #: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
-msgstr "Zjišťuji počet nových zpráv (LAST)..."
+msgstr "Zjišťuje se počet nových zpráv (LAST)..."
 
 #: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
-msgstr "Zjišťuji počet nových zpráv (UIDL)..."
+msgstr "Zjišťuje se počet nových zpráv (UIDL)..."
 
 #: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
-msgstr "Zjišťuji počet zpráv (LIST)..."
+msgstr "Zjišťuje se počet zpráv (LIST)..."
 
 #: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
-msgstr "Vymazávám zprávu %d"
+msgstr "Vymazávání zprávy %d"
 
 #: src/inc.c:931 src/send_message.c:667
 msgid "Quitting"
-msgstr "Ukončuji"
+msgstr "Ukončování"
 
 #: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
-msgstr "Načítám zprávu (%d / %d) (%s / %s)"
+msgstr "Načítá se zpráva (%d / %d) (%s / %s)"
 
 #: src/inc.c:977
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
-msgstr "Hotovo (%d zpráv(a) (%s) přijato)"
+msgstr "Přijímá se (%d zpráv (%s) přijato)"
 
 #: src/inc.c:1222
-#, fuzzy
 msgid "Connection failed."
-msgstr "Spojení selhalo"
+msgstr "Spojení selhalo."
 
 #: src/inc.c:1228
 msgid "Error occurred while processing mail."
-msgstr "Během zpracovávání pošty se vyskytla chyba ."
+msgstr "Během zpracovávání pošty se vyskytla chyba."
 
 #: src/inc.c:1233
 #, c-format
@@ -2747,11 +2708,11 @@ msgstr ""
 
 #: src/inc.c:1239
 msgid "No disk space left."
-msgstr "Nezbylo žádné místo na disku."
+msgstr "Žádné volné místo na disku."
 
 #: src/inc.c:1244
 msgid "Can't write file."
-msgstr "Nemohu zapisovat do souboru."
+msgstr "Nelze zapisovat do souboru."
 
 #: src/inc.c:1249
 msgid "Socket error."
@@ -2760,7 +2721,7 @@ msgstr "Chyba soketu."
 #. consider EOF right after QUIT successful
 #: src/inc.c:1255 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
-msgstr ""
+msgstr "Spojení ukončeno vzdáleným hostitelem."
 
 #: src/inc.c:1261
 msgid "Mailbox is locked."
@@ -2777,7 +2738,7 @@ msgstr ""
 
 #: src/inc.c:1271 src/send_message.c:778
 msgid "Authentication failed."
-msgstr "Autentikace selhala."
+msgstr "Autentizace selhala."
 
 #: src/inc.c:1276 src/send_message.c:781
 #, c-format
@@ -2785,13 +2746,12 @@ msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr ""
-"Autentikace selhala:\n"
+"Autentizace selhala:\n"
 "%s"
 
 #: src/inc.c:1281 src/send_message.c:797
-#, fuzzy
 msgid "Session timed out."
-msgstr "vypršel čas relace\n"
+msgstr "Vypršel čas relace."
 
 #: src/inc.c:1317
 msgid "Incorporation cancelled\n"
@@ -2800,7 +2760,7 @@ msgstr "Začleňování zrušeno\n"
 #: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
-msgstr "Načítám nové zprávy z %s do %s...\n"
+msgstr "Získávají se nové zprávy z %s do %s...\n"
 
 #: src/inputdialog.c:146
 #, c-format
@@ -2826,7 +2786,7 @@ msgstr "Použití: %s [VOLBY]...\n"
 
 #: src/main.c:427
 msgid "  --compose [address]    open composition window"
-msgstr "  --compose [adresa]     otevře okno pro psaní nové zprávy"
+msgstr "  --compose [adresa]     otevře okno psaní nové zprávy"
 
 #: src/main.c:428
 msgid ""
@@ -2835,8 +2795,8 @@ msgid ""
 "                         attached"
 msgstr ""
 "  --attach soubor1 [soubor2]...\n"
-"                           otevře okno pro psaní zprávy s připojeným\n"
-"                           souborem(y)"
+"                           otevře okno psaní zprávy se zvolenými\n"
+"                           soubory jako přílohou"
 
 #: src/main.c:431
 msgid "  --receive              receive new messages"
@@ -2851,30 +2811,30 @@ msgid "  --send                 send all queued messages"
 msgstr "  --send              pošle všechny pozdržené zprávy"
 
 #: src/main.c:434
-#, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
-msgstr "  --status             vypíše celkový počet zpráv"
+msgstr "  --status·[folder]...   vypíše celkový počet zpráv"
 
 #: src/main.c:435
-#, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
-msgstr "  --status             vypíše celkový počet zpráv"
+msgstr ""
+"  --status-full [folder]...\n"
+"·························zobrazit stav každé ze složek"
 
 #: src/main.c:437
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
+"  --configdir·dirname    zvolit adresář se soubory uživatelských předvoleb"
 
 #: src/main.c:438
-#, fuzzy
 msgid "  --exit                 exit Sylpheed"
-msgstr "  --debug              režim trasování"
+msgstr "  --exit·················ukončit Sylpheed"
 
 #: src/main.c:439
 msgid "  --debug                debug mode"
-msgstr "  --debug              režim trasování"
+msgstr "  --debug              režim ladění"
 
 #: src/main.c:440
 msgid "  --help                 display this help and exit"
@@ -2885,16 +2845,12 @@ msgid "  --version              output version information and exit"
 msgstr "  --version             vypíše informace o verzi a skončí"
 
 #: src/main.c:445
-#, fuzzy
 msgid "Press any key..."
-msgstr ""
-"nebo stiskněte klávesu 'y'.\n"
-"\n"
+msgstr "Stiskněte libovolnou klávesu..."
 
 #: src/main.c:582
-#, fuzzy
 msgid "Filename encoding"
-msgstr "Výstupní znaková sada"
+msgstr "Kódování názvu souboru"
 
 #: src/main.c:583
 msgid ""
@@ -2909,10 +2865,20 @@ msgid ""
 "\n"
 "Continue?"
 msgstr ""
+"Znaková sada lokalizace libc není UTF-8,·přitom proměnná prostředí "
+"·G_FILENAME_ENCODING·není nastavena.\n"
+"V případě, že je znaková sada lokalizace libc použita v názvu souboru či "
+"adresáře, nebude zajištěna správná funkce.\n"
+"V tom případě je nutné nastavit následující proměnnou prostředí (podrobnosti "
+"viz·README):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+"\n"
+"Pokračovat?"
 
 #: src/main.c:639
 msgid "Composing message exists. Really quit?"
-msgstr "Právě se vytváří zpráva. Opravdu skončit?"
+msgstr "Je rozepsána zpráva. Opravdu skončit?"
 
 #: src/main.c:650
 msgid "Queued messages"
@@ -2920,14 +2886,14 @@ msgstr "Pozdržené zprávy"
 
 #: src/main.c:651
 msgid "Some unsent messages are queued. Exit now?"
-msgstr "Ve frontě jsou neodeslaně zprávy. Skončit nyní?"
+msgstr "Ve frontě jsou neodeslané zprávy. Skončit nyní?"
 
 #: src/main.c:751
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
 msgstr ""
-"GnuPG není korektně instalováno, nebo je verze příliš stará.\n"
+"GnuPG není korektně instalováno nebo je verze příliš stará.\n"
 "Podpora pro OpenPGP je zakázána."
 
 #. remote command mode
@@ -2936,15 +2902,16 @@ msgid "another Sylpheed is already running.\n"
 msgstr "aplikace Sylpheed je již spuštěna.\n"
 
 #: src/main.c:1158
-#, fuzzy
 msgid "Migration of configuration"
-msgstr "Nastavení akcí"
+msgstr "Přenesení uživatelských předvoleb"
 
 #: src/main.c:1159
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
+"Bylo nalezeno dřívější uživatelské nastavení.\n"
+"Chcete ho přenést?"
 
 #: src/mainwindow.c:516
 msgid "/_File/_Folder"
@@ -2959,48 +2926,42 @@ msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Soubor/_Složka/_Přejmenovat složku..."
 
 #: src/mainwindow.c:520
-#, fuzzy
 msgid "/_File/_Folder/_Move folder..."
-msgstr "/_Soubor/_Složka/_Přejmenovat složku..."
+msgstr "/_Soubor/_Složka/Př_esunout složku..."
 
 #: src/mainwindow.c:521
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Soubor/_Složka/_Smazat složku"
 
 #: src/mainwindow.c:522
-#, fuzzy
 msgid "/_File/_Mailbox"
-msgstr "/_Soubor/Při_dat poštovní schránku...."
+msgstr "/_Soubor/_Poštovní schránka"
 
 #: src/mainwindow.c:523
-#, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
-msgstr "/_Soubor/Při_dat poštovní schránku...."
+msgstr "/_Soubor/_Poštovní schránka/Při_dat poštovní schránku...."
 
 #: src/mainwindow.c:524
-#, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
-msgstr "/Odebrat _poštovní schránku"
+msgstr "/_Soubor/_Poštovní·schránka/Odebrat _poštovní schránku"
 
 #: src/mainwindow.c:525 src/mainwindow.c:530
-#, fuzzy
 msgid "/_File/_Mailbox/---"
-msgstr "/_Soubor/_Složka/---"
+msgstr "/_Soubor/_Poštovní·schránka/---"
 
 #: src/mainwindow.c:526
-#, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
-msgstr "/_Zkontrolovat nové zprávy"
+msgstr "/_Soubor/_Poštovní·schránka/_Zkontrolovat nové zprávy"
 
 #: src/mainwindow.c:528
-#, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
-msgstr "/_Soubor/_Složka/_Zkontrolovat nové zprávy ve všech složkách"
+msgstr ""
+"/_Soubor/_Poštovní·schránka/Z_kontrolovat nové zprávy ve všech poštovních "
+"schránkách"
 
 #: src/mainwindow.c:531
-#, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
-msgstr "/O_bnovit strom složek"
+msgstr "/_Soubor/_Poštovní·schránka/O_bnovit strom složek"
 
 #: src/mainwindow.c:534
 msgid "/_File/_Import mbox file..."
@@ -3008,35 +2969,32 @@ msgstr "/_Soubor/_Importovat soubor mbox..."
 
 #: src/mainwindow.c:535
 msgid "/_File/_Export to mbox file..."
-msgstr "/_Soubor/E_xportovat do mbox souboru..."
+msgstr "/_Soubor/E_xportovat do souboru mbox..."
 
 #: src/mainwindow.c:537
-#, fuzzy
 msgid "/_File/Empty all _trash"
-msgstr "/_Soubor/_Vyprázdnit koš"
+msgstr "/_Soubor/V_yprázdnit všechny koše"
 
 #: src/mainwindow.c:539 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Soubor/Uložit j_ako..."
 
 #: src/mainwindow.c:542 src/messageview.c:153
-#, fuzzy
 msgid "/_File/Page set_up..."
-msgstr "/_Soubor/Uložit j_ako..."
+msgstr "/_Soubor/Vzhled stránky..."
 
 #: src/mainwindow.c:544 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Soubor/_Tisk..."
 
 #: src/mainwindow.c:546
-#, fuzzy
 msgid "/_File/_Work offline"
-msgstr "/_Soubor/_Vložit soubor"
+msgstr "/_Soubor/Pracovat o_ffline"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
 #: src/mainwindow.c:549
 msgid "/_File/E_xit"
-msgstr "/_Soubor/_Konec"
+msgstr "/_Soubor/U_končit"
 
 #: src/mainwindow.c:554
 msgid "/_Edit/Select _thread"
@@ -3044,11 +3002,11 @@ msgstr "/Úp_ravy/Vybrat _vlákno"
 
 #: src/mainwindow.c:556 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
-msgstr "/Ú_pravy/_Najít v aktuální zprávě..."
+msgstr "/Ú_pravy/_Hledat v aktuální zprávě..."
 
 #: src/mainwindow.c:558
 msgid "/_Edit/_Search messages..."
-msgstr "/Ú_pravy/Na_jít zprávy..."
+msgstr "/Ú_pravy/Hledat zpráv_y..."
 
 #: src/mainwindow.c:561
 msgid "/_View/Show or hi_de"
@@ -3060,7 +3018,7 @@ msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Strom složek "
 
 #: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Message view"
-msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Ná_hled na zprávu"
+msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Zobra_zení zpráv"
 
 #: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Toolbar"
@@ -3071,9 +3029,9 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/Ikony _a text"
 
 #: src/mainwindow.c:570
-#, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
-msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Ikony"
+msgstr ""
+"/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/Text naprav_o od ikon"
 
 #: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
@@ -3085,30 +3043,27 @@ msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Text"
 
 #: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_None"
-msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Nic"
+msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Nezobrazovat"
 
 #: src/mainwindow.c:578
-#, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
-msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Stavová _lišta"
+msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Lišta _hledání"
 
 #: src/mainwindow.c:580
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Stavová _lišta"
 
 #: src/mainwindow.c:582
-#, fuzzy
 msgid "/_View/_Customize toolbar..."
-msgstr "/Z_obrazit/_Přejít/Do _jiné složky"
+msgstr "/Z_obrazit/_Upravit nástrojovou lištu..."
 
 #: src/mainwindow.c:584
 msgid "/_View/Separate f_older tree"
 msgstr "/Z_obrazit/Samostatný s_trom složek "
 
 #: src/mainwindow.c:585
-#, fuzzy
 msgid "/_View/Separate _message view"
-msgstr "/Z_obrazit/Samostatné pro_hlédnutí zprávy"
+msgstr "/Z_obrazit/Samostatné zo_brazení zpráv"
 
 #: src/mainwindow.c:587
 msgid "/_View/_Sort"
@@ -3116,48 +3071,47 @@ msgstr "/Z_obrazit/Setříd_it"
 
 #: src/mainwindow.c:588
 msgid "/_View/_Sort/by _number"
-msgstr "/Z_obrazit/Setříd_it/podle čí_sla"
+msgstr "/Z_obrazit/Setříd_it/Podle čí_sla"
 
 #: src/mainwindow.c:589
 msgid "/_View/_Sort/by s_ize"
-msgstr "/Z_obrazit/Setříd_it/podle _velikosti"
+msgstr "/Z_obrazit/Setříd_it/Podle _velikosti"
 
 #: src/mainwindow.c:590
 msgid "/_View/_Sort/by _date"
-msgstr "/Z_obrazit/Setříd_it/podle _data"
+msgstr "/Z_obrazit/Setříd_it/Podle _data"
 
 #: src/mainwindow.c:591
-#, fuzzy
 msgid "/_View/_Sort/by t_hread date"
-msgstr "/Z_obrazit/Setříd_it/podle _data"
+msgstr "/Z_obrazit/Setříd_it/Podle stáří vlákna"
 
 #: src/mainwindow.c:592
 msgid "/_View/_Sort/by _from"
-msgstr "/Z_obrazit/Setříd_it/podle _od koho"
+msgstr "/Z_obrazit/Setříd_it/Podle _odesílatele"
 
 #: src/mainwindow.c:593
 msgid "/_View/_Sort/by _recipient"
-msgstr "/Z_obrazit/Setříd_it/podle odesí_latele"
+msgstr "/Z_obrazit/Setříd_it/Podle pří_jemce"
 
 #: src/mainwindow.c:594
 msgid "/_View/_Sort/by _subject"
-msgstr "/Z_obrazit/Setříd_it/podle př_edmětu"
+msgstr "/Z_obrazit/Setříd_it/Podle př_edmětu"
 
 #: src/mainwindow.c:595
 msgid "/_View/_Sort/by _color label"
-msgstr "/Z_obrazit/Setříd_it/podle _barevné značky"
+msgstr "/Z_obrazit/Setříd_it/Podle _barevného návěští"
 
 #: src/mainwindow.c:597
 msgid "/_View/_Sort/by _mark"
-msgstr "/Z_obrazit/Setříd_it/podle o_značení"
+msgstr "/Z_obrazit/Setříd_it/Podle o_značení"
 
 #: src/mainwindow.c:598
 msgid "/_View/_Sort/by _unread"
-msgstr "/Z_obrazit/Setříd_it/podle ne_přečtených"
+msgstr "/Z_obrazit/Setříd_it/Podle ne_přečtených"
 
 #: src/mainwindow.c:599
 msgid "/_View/_Sort/by a_ttachment"
-msgstr "/Z_obrazit/Setříd_it/podle připo_jených souborů"
+msgstr "/Z_obrazit/Setříd_it/Podle příloh_y"
 
 #: src/mainwindow.c:601
 msgid "/_View/_Sort/D_on't sort"
@@ -3189,7 +3143,7 @@ msgstr "/Z_obrazit/Rozbalit vše_chna vlákna"
 
 #: src/mainwindow.c:610
 msgid "/_View/Co_llapse all threads"
-msgstr "/Z_obrazit/_Sbalit všechna vlákna"
+msgstr "/Z_obrazit/Sbalit všechna vlákna"
 
 #: src/mainwindow.c:611
 msgid "/_View/Set display _item..."
@@ -3205,7 +3159,7 @@ msgstr "/Z_obrazit/_Přejít/Př_edchozí zpráva"
 
 #: src/mainwindow.c:616
 msgid "/_View/_Go to/_Next message"
-msgstr "/Z_obrazit/_Přejít/_Další zpráva"
+msgstr "/Z_obrazit/_Přejít/Následující zpráva"
 
 #: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
 #: src/mainwindow.c:630 src/mainwindow.c:635
@@ -3218,7 +3172,7 @@ msgstr "/Z_obrazit/_Přejít/Předchozí nepřečtená zp_ráva"
 
 #: src/mainwindow.c:620
 msgid "/_View/_Go to/N_ext unread message"
-msgstr "/Z_obrazit/_Přejít/Další nepřeč_tená zpráva"
+msgstr "/Z_obrazit/_Přejít/Následující nepřeč_tená zpráva"
 
 #: src/mainwindow.c:623
 msgid "/_View/_Go to/Prev ne_w message"
@@ -3226,7 +3180,7 @@ msgstr "/Z_obrazit/_Přejít/_Předchozí nová zpráva"
 
 #: src/mainwindow.c:624
 msgid "/_View/_Go to/Ne_xt new message"
-msgstr "/Z_obrazit/_Přejít/Další n_ová zpráva"
+msgstr "/Z_obrazit/_Přejít/Následující n_ová zpráva"
 
 #: src/mainwindow.c:626
 msgid "/_View/_Go to/Prev _marked message"
@@ -3234,7 +3188,7 @@ msgstr "/Z_obrazit/_Přejít/Před_chozí označená zpráva"
 
 #: src/mainwindow.c:628
 msgid "/_View/_Go to/Next m_arked message"
-msgstr "/Z_obrazit/_Přejít/Další oz_načená zpráva"
+msgstr "/Z_obrazit/_Přejít/Následující oz_načená zpráva"
 
 #: src/mainwindow.c:631
 msgid "/_View/_Go to/Prev _labeled message"
@@ -3242,51 +3196,43 @@ msgstr "/Z_obrazit/_Přejít/Předchozí _zpráva s návěštím"
 
 #: src/mainwindow.c:633
 msgid "/_View/_Go to/Next la_beled message"
-msgstr "/Z_obrazit/_Přejít/Da_lší zpráva s návěštím"
+msgstr "/Z_obrazit/_Přejít/Nás_ledující zpráva s návěštím"
 
 #: src/mainwindow.c:636
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Z_obrazit/_Přejít/Do _jiné složky"
 
 #: src/mainwindow.c:645 src/messageview.c:174
-#, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
-msgstr "/Z_obrazit/_Znaková sada/_Autodetekce "
+msgstr "/Z_obrazit/_Znaková sada/_Automaticky rozpoznat"
 
 #: src/mainwindow.c:658 src/messageview.c:187
-#, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
-msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-15)"
+msgstr "/Z_obrazit/_Znaková sada/Západoevropské jazyky (Windows-1252)"
 
 #: src/mainwindow.c:706 src/messageview.c:227
-#, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
-msgstr "/Z_obrazit/_Znaková sada/Japonská (ISO-2022-JP-2)"
+msgstr "/Z_obrazit/_Znaková sada/Japonština (ISO-2022-JP-2)"
 
 #: src/mainwindow.c:708 src/messageview.c:229
-#, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
-msgstr "/Z_obrazit/_Znaková sada/Japonská (_EUC-JP)"
+msgstr "/Z_obrazit/_Znaková sada/Japonština (_EUC-JP)"
 
 #: src/mainwindow.c:710 src/messageview.c:231
-#, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
-msgstr "/Z_obrazit/_Znaková sada/Japonská (_Shift__JIS)"
+msgstr "/Z_obrazit/_Znaková sada/Japonština (_Shift__JIS)"
 
 #: src/mainwindow.c:720 src/messageview.c:240
-#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
-msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (EUC-_TW)"
+msgstr "/Z_obrazit/_Znaková sada/Tradiční čínština (EUC-_TW)"
 
 #: src/mainwindow.c:722 src/messageview.c:242
-#, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
-msgstr "/Z_obrazit/_Znaková sada/Čínská (ISO-2022-_CN)"
+msgstr "/Z_obrazit/_Znaková sada/Čínština (ISO-2022-_CN)"
 
 #: src/mainwindow.c:728 src/messageview.c:247
-#, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
-msgstr "/Z_obrazit/_Znaková sada/Korejská (ISO-2022-KR)"
+msgstr "/Z_obrazit/_Znaková sada/Korejština (ISO-2022-KR)"
 
 #: src/mainwindow.c:741 src/summaryview.c:464
 msgid "/_View/Open in new _window"
@@ -3297,9 +3243,8 @@ msgid "/_View/Mess_age source"
 msgstr "/Z_obrazit/Zd_roj zprávy"
 
 #: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
-#, fuzzy
 msgid "/_View/All _headers"
-msgstr "/_Zobrazit/Všechna zá_hlaví"
+msgstr "/Z_obrazit/Všechna zá_hlaví"
 
 #: src/mainwindow.c:745
 msgid "/_View/_Update summary"
@@ -3310,29 +3255,24 @@ msgid "/_Message"
 msgstr "/_Zpráva"
 
 #: src/mainwindow.c:748
-#, fuzzy
 msgid "/_Message/Recei_ve"
-msgstr "/_Zpráva/Znov_u editovat"
+msgstr "/_Zpráva/Přijmo_ut"
 
 #: src/mainwindow.c:749
-#, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
-msgstr "/_Zpráva/Přijmout _ze všech účtů"
+msgstr "/_Zpráva/Přijmo_ut/Přijmout _z aktuálního účtu"
 
 #: src/mainwindow.c:751
-#, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
-msgstr "/_Zpráva/Přijmout _ze všech účtů"
+msgstr "/_Zpráva/Přijmo_ut/Přijmout z_e všech účtů"
 
 #: src/mainwindow.c:753
-#, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
-msgstr "/_Zpráva/Přerušit pří_jem zpráv"
+msgstr "/_Zpráva/Přijmo_ut/Přerušit pří_jem zpráv"
 
 #: src/mainwindow.c:755
-#, fuzzy
 msgid "/_Message/Recei_ve/---"
-msgstr "/_Zpráva/Znov_u editovat"
+msgstr "/_Zpráva/Přijmo_ut/---"
 
 #: src/mainwindow.c:756
 msgid "/_Message/_Send queued messages"
@@ -3359,15 +3299,15 @@ msgstr "/_Zpráva/Odpo_vědět komu"
 
 #: src/mainwindow.c:762 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
-msgstr "/_Zpráva/Odpo_vědět komu/_všem"
+msgstr "/_Zpráva/Odpo_vědět komu/_Všem"
 
 #: src/mainwindow.c:763 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
-msgstr "/_Zpráva/Odpo_vědět komu/_odesílateli"
+msgstr "/_Zpráva/Odpo_vědět komu/_Odesílateli"
 
 #: src/mainwindow.c:764 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
-msgstr "/_Zpráva/Odpo_vědět komu/do _diskusního listu"
+msgstr "/_Zpráva/Odpo_vědět komu/Do _elektronické konference"
 
 #: src/mainwindow.c:767 src/messageview.c:275
 msgid "/_Message/_Forward"
@@ -3375,7 +3315,7 @@ msgstr "/_Zpráva/Předat dá_l"
 
 #: src/mainwindow.c:768 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
-msgstr "/_Zpráva/Přeposlat _jako přílohu"
+msgstr "/_Zpráva/Předat dál _jako přílohu"
 
 #: src/mainwindow.c:770 src/messageview.c:278
 msgid "/_Message/Redirec_t"
@@ -3411,49 +3351,43 @@ msgstr "/_Zpráva/Označ_it/Označit jako _nepřečtené"
 
 #: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark as rea_d"
-msgstr "/_Zpráva/Označ_it/Označit jako _přečtenou"
+msgstr "/_Zpráva/Označ_it/Označit jako _přečtené"
 
 #: src/mainwindow.c:782
-#, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
-msgstr "/_Zpráva/Označ_it/Označit jako _přečtenou"
+msgstr "/_Zpráva/Označ_it/Označit _vlákno jako přečtené"
 
 #: src/mainwindow.c:784
 msgid "/_Message/_Mark/Mark all _read"
-msgstr "/_Zpráva/Označ_it/Označit _všechny jako přečtené"
+msgstr "/_Zpráva/Označ_it/Označit vš_e jako přečtené"
 
 #: src/mainwindow.c:786
 msgid "/_Message/_Delete"
 msgstr "/_Zpráva/S_mazat"
 
 #: src/mainwindow.c:788
-#, fuzzy
 msgid "/_Message/Set as _junk mail"
-msgstr "/_Zpráva/_Příjem nové pošty"
+msgstr "/_Zpráva/Označi_t jako nevyžádanou poštu"
 
 #: src/mainwindow.c:789
-#, fuzzy
 msgid "/_Message/Set as not j_unk mail"
-msgstr "/_Zpráva/_Příjem nové pošty"
+msgstr "/_Zpráva/Označit jako _vyžádanou poštu"
 
 #: src/mainwindow.c:791 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Zpráva/Znov_u editovat"
 
 #: src/mainwindow.c:795
-#, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
-msgstr "/_Nástroje/Přidat odesílatele do a_dresáře"
+msgstr "/_Nástroje/Př_idat odesílatele do adresáře"
 
 #: src/mainwindow.c:798
-#, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
-msgstr "/_Nástroje/_Filtr zpráv "
+msgstr "/_Nástroje/Filtrovat všechny z_právy ve složce"
 
 #: src/mainwindow.c:800
-#, fuzzy
 msgid "/_Tools/Filter _selected messages"
-msgstr "/_Nástroje/_Filtr zpráv "
+msgstr "/_Nástroje/_Filtrovat vybrané zprávy"
 
 #: src/mainwindow.c:802 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
@@ -3465,38 +3399,35 @@ msgstr "/_Nástroje/_Vytvoření filtru/_Automaticky"
 
 #: src/mainwindow.c:805 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
-msgstr "/_Nástroje/_Vytvoření filtru/podle _Od"
+msgstr "/_Nástroje/_Vytvoření filtru/Podle _odesílatele"
 
 #: src/mainwindow.c:807 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
-msgstr "/_Nástroje/_Vytvoření filtru/podle _Komu"
+msgstr "/_Nástroje/_Vytvoření filtru/Podle pří_jemce"
 
 #: src/mainwindow.c:809 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
-msgstr "/_Nástroje/_Vytvoření filtru/podle _Předmětu"
+msgstr "/_Nástroje/_Vytvoření filtru/Podle _předmětu"
 
 #: src/mainwindow.c:812
-#, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
-msgstr "/_Nástroje/_Filtr zpráv "
+msgstr "/_Nástroje/Fi_ltrovat nevyžádanou poštu ve složce"
 
 #: src/mainwindow.c:814
-#, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
-msgstr "/_Nástroje/_Filtr zpráv "
+msgstr "/_Nástroje/Filtrovat nevyžádano_u poštu mezi vybranými zprávami"
 
 #: src/mainwindow.c:821
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/_Smazat duplikované zprávy"
 
 #: src/mainwindow.c:824
-#, fuzzy
 msgid "/_Tools/E_xecute marked process"
-msgstr "Provést označený proces "
+msgstr "/_Nástroje/Spustit označený pro_ces"
 
 #: src/mainwindow.c:826
 msgid "/_Tools/_Log window"
-msgstr "/_Nástroje/Okno _záznamů "
+msgstr "/_Nástroje/_Záznamový protokol"
 
 #: src/mainwindow.c:828
 msgid "/_Configuration"
@@ -3552,32 +3483,31 @@ msgstr "/Nápo_věda/_Manuál/_Japonsky"
 
 #: src/mainwindow.c:851
 msgid "/_Help/_FAQ"
-msgstr "/Nápo_věda/_FAQ"
+msgstr "/Nápo_věda/Č_asto kladené otázky"
 
 #: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_English"
-msgstr "/Nápo_věda/_FAQ/_Anglicky"
+msgstr "/Nápo_věda/Č_asto·kladené·otázky/_Anglicky"
 
 #: src/mainwindow.c:853
 msgid "/_Help/_FAQ/_German"
-msgstr "/Nápo_věda/_FAQ/_Německy"
+msgstr "/Nápo_věda/Č_asto·kladené·otázky/_Německy"
 
 #: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_Spanish"
-msgstr "/Nápo_věda/_FAQ/Š_panělsky"
+msgstr "/Nápo_věda/Č_asto·kladené·otázky/Š_panělsky"
 
 #: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_French"
-msgstr "/Nápo_věda/_FAQ/_Francouzsky"
+msgstr "/Nápo_věda/Č_asto·kladené·otázky/_Francouzsky"
 
 #: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Italian"
-msgstr "/Nápo_věda/_FAQ/_Italsky"
+msgstr "/Nápo_věda/Č_asto·kladené·otázky/_Italsky"
 
 #: src/mainwindow.c:857
-#, fuzzy
 msgid "/_Help/_Command line options"
-msgstr "Není nastavena příkazová řádka."
+msgstr "/Nápo_věda/Přepínače pří_kazové řádky"
 
 #: src/mainwindow.c:858
 msgid "/_Help/---"
@@ -3585,7 +3515,7 @@ msgstr "/Nápo_věda/---"
 
 #: src/mainwindow.c:901
 msgid "Creating main window...\n"
-msgstr "Vytvářím hlavní okno...\n"
+msgstr "Vytváří se hlavní okno...\n"
 
 #: src/mainwindow.c:1077
 #, c-format
@@ -3610,49 +3540,46 @@ msgstr "žádný"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Měním typ oddělovače oken z %d na %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
-msgstr ""
+msgstr "Offline"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
-msgstr ""
+msgstr "Jste v režimu offline. Přejít do režimu online?"
 
-#: src/mainwindow.c:1691
-#, fuzzy
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
-msgstr "Vyprázdnit koš"
+msgstr "Vyprázdnit všechny koše"
 
-#: src/mainwindow.c:1692
-#, fuzzy
+#: src/mainwindow.c:1695
 msgid "Delete all messages in trash folders?"
-msgstr "Vyprázdnit všechny zprávy v koši?"
+msgstr "Smazat všechny zprávy v koši?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Přidat poštovní schránku"
 
-#: src/mainwindow.c:1723
-#, fuzzy
+#: src/mainwindow.c:1726
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
-"Zadejte umístění pro poštovní schránku.\n"
-"Pokud je zadán existující, bude automaticky\n"
-"prohledán."
+"Zadejte umístění poštovní schránky.\n"
+"Pokud je zadána již existující, bude automaticky\n"
+"prohledána."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
-msgstr "Poštovní schránka '%s' již existuje."
+msgstr "Poštovní schránka \"%s\" již existuje."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Poštovní schránka"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3662,72 +3589,67 @@ msgstr ""
 "Může to být tím, že schránka již existuje, nebo nemáte dostatečná práva\n"
 "pro zápis."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
-msgstr "Sylpheed - Zobrazení složky"
+msgstr "Sylpheed - Strom složek"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazení zprávy"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Odpovědět"
 
-#: src/mainwindow.c:2401
-#, fuzzy
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
-msgstr "Odpovídá všem"
+msgstr "/Odpovědět všem"
 
-#: src/mainwindow.c:2402
-#, fuzzy
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
-msgstr "/Odpovědět _komu/_odesílateli"
+msgstr "/Odpovědět _odesílateli"
 
-#: src/mainwindow.c:2403
-#, fuzzy
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
-msgstr "/Odpovědět _komu/do _diskusního listu"
+msgstr "/Odpovědět do _elektronické konference"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Př_edat dál"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
-msgstr "/Přeposlat _jako přílohu"
+msgstr "/Předat dál _jako přílohu"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Přes_měrovat"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
-msgstr ""
+msgstr "Jste v režimu offline. Kliknutím na ikonu přejdete do režimu online."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
-msgstr ""
+msgstr "Jste v režimu online. Kliknutím na ikonu přejdete do režimu offline."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
-msgstr "Ukončení programu"
+msgstr "Ukončit"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
-msgstr "Chcete ukončit tento program?"
+msgstr "Opravdu ukončit tento program?"
 
-#: src/mainwindow.c:3712
-#, fuzzy
+#: src/mainwindow.c:3715
 msgid "Command line options"
-msgstr "Není nastavena příkazová řádka."
+msgstr "Přepínače příkazové řádky"
 
-#: src/mainwindow.c:3725
-#, fuzzy
+#: src/mainwindow.c:3728
 msgid "Usage: sylpheed [OPTION]..."
-msgstr "Použití: %s [VOLBY]...\n"
+msgstr "Použití: sylpheed [VOLBY]..."
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3742,8 +3664,20 @@ msgid ""
 "--help\n"
 "--version"
 msgstr ""
+"--compose [adresa]\n"
+"--attach soubor1 [soubor2]...\n"
+"--receive\n"
+"--receive-all\n"
+"--send\n"
+"--status [složka]...\n"
+"--status-full [složka]...\n"
+"--configdir adresář\n"
+"--exit\n"
+"--debug\n"
+"--help\n"
+"--version"
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3758,6 +3692,18 @@ msgid ""
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
+"otevřít okno psaní zprávy\n"
+"otevřít okno psaní zprávy se zadanými soubory jako přílohou\n"
+"přijmout nové zprávy\n"
+"přijmout nové zprávy ze všech účtů\n"
+"odeslat všechny zprávy ve frontě\n"
+"zobrazit celkový počet zpráv\n"
+"zobrazit stav každé složky\n"
+"určit adresář se soubory uživatelského nastavení\n"
+"ukončit Sylpheed\n"
+"režim ladění\n"
+"zobrazit tuto nápovědu a skončit\n"
+"vypsat informaci o verzi a skončit"
 
 #: src/message_search.c:120
 msgid "Find in current message"
@@ -3765,7 +3711,7 @@ msgstr "Hledat v aktuální zprávě"
 
 #: src/message_search.c:138
 msgid "Find text:"
-msgstr "Najít text:"
+msgstr "Vyhledat text:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
 #: src/query_search.c:343
@@ -3798,7 +3744,7 @@ msgstr "/_Nástroje/Přidat odesílatele do a_dresáře"
 
 #: src/messageview.c:316
 msgid "Creating message view...\n"
-msgstr "Vyvolávám zobrazení zprávy...\n"
+msgstr "Připravuje se zobrazení zprávy...\n"
 
 #: src/messageview.c:341
 msgid "Text"
@@ -3810,12 +3756,12 @@ msgstr "Přílohy"
 
 #: src/messageview.c:397
 msgid "Message View - Sylpheed"
-msgstr ""
+msgstr "Zobrazení zprávy - Sylpheed"
 
 #: src/messageview.c:756 src/summaryview.c:3565
 #, c-format
 msgid "Can't save the file `%s'."
-msgstr "Nemohu uložit soubor '%s'."
+msgstr "Nelze uložit soubor \"%s\"."
 
 #: src/mimeview.c:129
 msgid "/_Open"
@@ -3834,9 +3780,8 @@ msgid "/_Save as..."
 msgstr "/_Uložit jako..."
 
 #: src/mimeview.c:133
-#, fuzzy
 msgid "/Save _all..."
-msgstr "/_Uložit jako..."
+msgstr "/U_ložit vše..."
 
 #: src/mimeview.c:134 src/summaryview.c:469
 msgid "/_Print..."
@@ -3848,56 +3793,52 @@ msgstr "/Z_kontrolovat podpis"
 
 #: src/mimeview.c:162
 msgid "Creating MIME view...\n"
-msgstr "Vyvolávám zobrazení MIME...\n"
+msgstr "Vyvolává se zobrazení MIME...\n"
 
 #: src/mimeview.c:191
 msgid "MIME Type"
-msgstr "MIME Typ"
+msgstr "Typ MIME"
 
 #: src/mimeview.c:304
 msgid "Select \"Check signature\" to check"
-msgstr "Vyberte \"Zkontrolovat podpis\" pro ověření"
+msgstr "Vyberte \"Zkontrolovat podpis\" k ověření"
 
 #: src/mimeview.c:616
 msgid "Select an action for the attached file:\n"
-msgstr ""
+msgstr "Vyberte akci s přiloženým souborem:\n"
 
 #: src/mimeview.c:638
-#, fuzzy
 msgid "Open _with..."
-msgstr "/Ot_evřít čím..."
+msgstr "Ot_evřít čím..."
 
 #: src/mimeview.c:642
-#, fuzzy
 msgid "_Display as text"
-msgstr "/_Zobrazit jako text"
+msgstr "_Zobrazit jako text"
 
 #: src/mimeview.c:646
-#, fuzzy
 msgid "_Save as..."
-msgstr "/_Uložit jako..."
+msgstr "_Uložit jako..."
 
 #: src/mimeview.c:692
-#, fuzzy
 msgid ""
 "This signature has not been checked yet.\n"
 "\n"
-msgstr "Tento podpis nebyl zatím kontrolován.\n"
+msgstr ""
+"Tento podpis zatím nebyl zkontrolován.\n"
+"\n"
 
 #: src/mimeview.c:697
-#, fuzzy
 msgid "_Check signature"
-msgstr "/Z_kontrolovat podpis"
+msgstr "Zkontrolovat po_dpis"
 
 #: src/mimeview.c:977 src/mimeview.c:1044 src/mimeview.c:1080
 #: src/mimeview.c:1113 src/mimeview.c:1136
 msgid "Can't save the part of multipart message."
-msgstr "Nemohu uložit část z mnohačásťové zprávy."
+msgstr "Nelze uložit část ze zprávy s více částmi."
 
 #: src/mimeview.c:1057
-#, fuzzy
 msgid "Can't save the attachments."
-msgstr "Nemohu uložit soubor '%s'."
+msgstr "Nelze uložit přílohy."
 
 #: src/mimeview.c:1146
 msgid "Open with"
@@ -3909,12 +3850,12 @@ msgid ""
 "Enter the command line to open file:\n"
 "(`%s' will be replaced with file name)"
 msgstr ""
-"Vložte příkazovou řádku pro otevření souboru:\n"
-"('%s' bude nahrazeno jménem souboru)"
+"Zadejte příkaz k otevření souboru:\n"
+"(`%s' bude nahrazeno jménem souboru)"
 
 #: src/mimeview.c:1178
 msgid "Opening executable file"
-msgstr ""
+msgstr "Otevírá se spustitelný soubor"
 
 #: src/mimeview.c:1179
 msgid ""
@@ -3923,10 +3864,14 @@ msgid ""
 "If you want to launch it, save it to somewhere and make sure it is not an "
 "virus or something like a malicious program."
 msgstr ""
+"Toto je spustitelný soubor.·Otevření spustitelného souboru je z "
+"bezpečnostních důvodů omezeno.\n"
+"Pokud chcete soubor spustit, nejprve jej uložte a ujistěte se, že nejde o "
+"virus či nějaký nebezpečný program."
 
 #: src/passphrase.c:96
 msgid "Passphrase"
-msgstr "Passphrase"
+msgstr "Heslo (fráze)"
 
 #: src/passphrase.c:248
 msgid "[no user id]"
@@ -3940,7 +3885,7 @@ msgid ""
 "  %.*s  \n"
 "(%.*s)\n"
 msgstr ""
-"%s Zadejte prosím passphrase pro:\n"
+"%s Zadejte prosím heslo (frázi) pro:\n"
 "\n"
 "  %.*s  \n"
 "(%.*s)\n"
@@ -3950,7 +3895,7 @@ msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
 msgstr ""
-"Špatná passphrase! Zkuste to znovu...\n"
+"Špatné heslo (fráze)! Zkuste to znovu...\n"
 "\n"
 
 #: src/prefs_account_dialog.c:441
@@ -3964,7 +3909,7 @@ msgstr "Účet%d"
 
 #: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
-msgstr "Nastavení pro nový účet"
+msgstr "Nastavení nového účtu"
 
 #: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
 msgid "Account preferences"
@@ -3972,7 +3917,7 @@ msgstr "Nastavení účtu"
 
 #: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
-msgstr "Vyvolání okna pro nastavení účtu...\n"
+msgstr "Vyvolává se okno nastavení účtu...\n"
 
 #: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
@@ -3998,7 +3943,7 @@ msgstr "SSL"
 
 #: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
-msgstr "Rozšíření"
+msgstr "Rozšířené"
 
 #: src/prefs_account_dialog.c:624
 msgid "Name of this account"
@@ -4018,7 +3963,7 @@ msgstr "Celé jméno"
 
 #: src/prefs_account_dialog.c:652
 msgid "Mail address"
-msgstr "Poštovní adresa"
+msgstr "E-mailová adresa"
 
 #: src/prefs_account_dialog.c:658
 msgid "Organization"
@@ -4052,7 +3997,7 @@ msgstr "Tento server vyžaduje autentizaci"
 
 #: src/prefs_account_dialog.c:761
 msgid "News server"
-msgstr "News server"
+msgstr "Server news"
 
 #: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
@@ -4060,7 +4005,7 @@ msgstr "Server pro příjem"
 
 #: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
-msgstr "SMTP server (odesílání)"
+msgstr "Server SMTP (odesílání)"
 
 #: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
@@ -4071,9 +4016,8 @@ msgid "Password"
 msgstr "Heslo"
 
 #: src/prefs_account_dialog.c:868
-#, fuzzy
 msgid "Use secure authentication (APOP)"
-msgstr "Tento server vyžaduje autentizaci"
+msgstr "Použít bezpečnou autentizaci (APOP)"
 
 #: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
@@ -4088,14 +4032,12 @@ msgid "days"
 msgstr "dnech"
 
 #: src/prefs_account_dialog.c:908
-#, fuzzy
 msgid "0 days: remove immediately"
-msgstr "(0 dnů: odstranit ihned)"
+msgstr "0 dnů: odstranit ihned"
 
 #: src/prefs_account_dialog.c:918
-#, fuzzy
 msgid "Download all messages (including already received) on server"
-msgstr "Přijmout všechny zprávy ze serveru"
+msgstr "Přijmout všechny zprávy ze serveru (včetně již přijatých)"
 
 #: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
@@ -4108,16 +4050,15 @@ msgstr "KB"
 
 #: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
-msgstr "Filtr zpráv pro příjem"
+msgstr "Filtrovat zprávy při příjmu"
 
 #: src/prefs_account_dialog.c:946
 msgid "Default inbox"
-msgstr "Výchozí inbox"
+msgstr "Výchozí doručená pošta"
 
 #: src/prefs_account_dialog.c:966
-#, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
-msgstr "(Nefiltrované zprávy budou uloženy v této složce)"
+msgstr "Nefiltrované zprávy budou uloženy v této složce."
 
 #: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
@@ -4126,36 +4067,31 @@ msgstr "Metoda autentizace"
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
-msgstr "Automaticky"
+msgstr "Automaticky rozpoznat"
 
 #: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
-msgstr ""
+msgstr "Při příjmu zkontrolovat pouze složku doručené pošty"
 
 #: src/prefs_account_dialog.c:999
-#, fuzzy
 msgid "Filter new messages in INBOX on receiving"
-msgstr "Filtr zpráv pro příjem"
+msgstr "Filtrovat zprávy v doručené poště při příjetí"
 
 #: src/prefs_account_dialog.c:1001
 msgid "News"
-msgstr "Diskuzní skupiny"
+msgstr "Diskusní skupiny"
 
 #: src/prefs_account_dialog.c:1013
-#, fuzzy
 msgid "Maximum number of articles to download"
-msgstr ""
-"Maximální počet příspěvků pro stažení\n"
-"(0 pro neomezený počet)"
+msgstr "Maximální počet příspěvků ke stažení"
 
 #: src/prefs_account_dialog.c:1030
-#, fuzzy
 msgid "No limit if 0 is specified."
-msgstr "Není uveden příjemce."
+msgstr "Neomezeně, pokud je zvoleno 0."
 
 #: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
-msgstr "Při volbě 'Stáhnout vše' zjistit nové zprávy"
+msgstr "Při volbě \"Přijmout vše\" zjistit, zda jsou nové zprávy"
 
 #: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
@@ -4163,11 +4099,11 @@ msgstr "Záhlaví"
 
 #: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
-msgstr "Přidat do záhlaví pole s datumem"
+msgstr "Přidat do záhlaví pole s datem"
 
 #: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
-msgstr "Generovat číslo zprávy"
+msgstr "Generovat ID zprávy"
 
 #: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
@@ -4184,20 +4120,19 @@ msgstr "Autentizace"
 
 #: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP autentizace (SMTP AUTH)"
+msgstr "Autentizace SMTP (SMTP AUTH)"
 
 #: src/prefs_account_dialog.c:1199
-#, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
-"Pokud necháte tyto položky prázdné, bude\n"
-"použito stejné jméno uživatele a heslo."
+"Pokud necháte tyto položky prázdné, bude použito uživatelské jméno a heslo "
+"pro příjem zpráv."
 
 #: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
-msgstr "Autentizace s POP3 před posláním"
+msgstr "Autentizace s POP3 před odesláním"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
@@ -4207,7 +4142,7 @@ msgstr "Podpis"
 
 #: src/prefs_account_dialog.c:1258
 msgid "Direct input"
-msgstr ""
+msgstr "Přímý vstup"
 
 #: src/prefs_account_dialog.c:1292
 msgid "Command output"
@@ -4227,25 +4162,23 @@ msgstr "Slepá kopie"
 
 #: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
-msgstr "Odpovědět komu"
+msgstr "Adresa pro odpovědi"
 
 #: src/prefs_account_dialog.c:1403
-#, fuzzy
 msgid "PGP sign message by default"
-msgstr "Vždy přidat podpis"
+msgstr "Vždy přidat podpis PGP"
 
 #: src/prefs_account_dialog.c:1405
-#, fuzzy
 msgid "PGP encrypt message by default"
-msgstr "Vždy zašifrovat zprávu"
+msgstr "Vždy šifrovat zprávu"
 
 #: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
-msgstr ""
+msgstr "Šifrovat při odpovědi na šifrovanou zprávu"
 
 #: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
-msgstr "Použít formát ASCII-armored pro zašifrování"
+msgstr "Při šifrování použít formát ASCII-armored"
 
 #: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
@@ -4257,11 +4190,11 @@ msgstr "Klíč pro podpis"
 
 #: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
-msgstr "Použít výchozí GnuPG klíč"
+msgstr "Použít výchozí klíč GnuPG"
 
 #: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
-msgstr "Vybrat klíč podle email adresy"
+msgstr "Vybrat klíč podle e-mailové adresy"
 
 #: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
@@ -4278,16 +4211,16 @@ msgstr "Nepoužívat SSL"
 
 #: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
-msgstr "Použít SSL pro POP3 spojení"
+msgstr "Použít SSL při spojení přes POP3"
 
 #: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
 #: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
-msgstr "Použít příkaz STARTTLS pro spuštění SSL relace"
+msgstr "Použít příkaz STARTTLS ke spuštění relace SSL"
 
 #: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
-msgstr "Použít SSL pro IMAP4 spojení"
+msgstr "Použít SSL při spojení přes IMAP4"
 
 #: src/prefs_account_dialog.c:1578
 msgid "NNTP"
@@ -4295,7 +4228,7 @@ msgstr "NNTP"
 
 #: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
-msgstr "Použít SSL pro NNTP připojení"
+msgstr "Použít SSL při spojení přes NNTP"
 
 #: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
@@ -4303,48 +4236,47 @@ msgstr "Odesílání (SMTP)"
 
 #: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
-msgstr "Použít SSL pro SMTP připojení"
+msgstr "Použít SSL při spojení přes SMTP"
 
 #: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
-msgstr ""
+msgstr "Použít neblokující SSL"
 
 #: src/prefs_account_dialog.c:1620
 msgid "Turn this off if you have problems in SSL connection."
-msgstr ""
+msgstr "Zrušte tuto volbu v případě problémů se spojením SSL."
 
 #: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
-msgstr "Určete SMTP port"
+msgstr "Určit port SMTP"
 
 #: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
-msgstr "Určete POP3 port"
+msgstr "Určit port POP3"
 
 #: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
-msgstr "Určete IMAP4 port"
+msgstr "Určit port IMAP4"
 
 #: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
-msgstr "Určete NNTP port"
+msgstr "Určit port NNTP"
 
 #: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
-msgstr "Určete název domény"
+msgstr "Určit název domény"
 
 #: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
-msgstr "adresář pro IMAP server"
+msgstr "adresář pro server IMAP"
 
 #: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
-msgstr ""
+msgstr "Budou zobrazeny pouze podsložky tohoto adresáře."
 
 #: src/prefs_account_dialog.c:1767
-#, fuzzy
 msgid "Clear all message caches on exit"
-msgstr "Přijmout všechny zprávy ze serveru"
+msgstr "Při ukončení vymazat veškerou mezipaměť zpráv"
 
 #: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
@@ -4355,9 +4287,8 @@ msgid "Put draft messages in"
 msgstr "Ukládat koncepty do"
 
 #: src/prefs_account_dialog.c:1816
-#, fuzzy
 msgid "Put queued messages in"
-msgstr "Ukládat smazané zprávy do"
+msgstr "Umístit pozdržené zprávy do"
 
 #: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
@@ -4369,31 +4300,31 @@ msgstr "Nebylo zadáno jméno účtu."
 
 #: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
-msgstr "Nebyla zadána poštovní adresa."
+msgstr "Nebyla zadána e-mailová adresa."
 
 #: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
-msgstr "Nebyl zadán SMTP server."
+msgstr "Nebyl zadán server SMTP."
 
 #: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
-msgstr "Nebylo zadáno uživatelské číslo."
+msgstr "Nebylo zadáno uživatelské jméno."
 
 #: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
-msgstr "Nebyl zadán POP3 server."
+msgstr "Nebyl zadán server POP3."
 
 #: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
-msgstr "Nebyl zadán IMAP4 server."
+msgstr "Nebyl zadán server IMAP4."
 
 #: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
-msgstr "Nebyl zadán NNTP server."
+msgstr "Nebyl zadán server NNTP."
 
 #: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
-msgstr ""
+msgstr "Zvolená složka není složkou s pozdrženými zprávami."
 
 #: src/prefs_account_dialog.c:2047
 msgid ""
@@ -4401,9 +4332,9 @@ msgid ""
 "mode for encrypted messages. It doesn't comply with the\n"
 "RFC 3156 - MIME Security with OpenPGP."
 msgstr ""
-"Není doporučeno používat starší styl šifrování zpráv\n"
-"ASCII-armored. Nevyhovuje totiž specifikaci\n"
-"RFC 3156 - MIME Security s OpenPGP."
+"Užití staršího způsobu šifrování zpráv ASCII-armored\n"
+"není doporučeno. Nevyhovuje totiž specifikaci\n"
+"\"RFC 3156 - MIME Security with OpenPGP\"."
 
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
@@ -4467,7 +4398,7 @@ msgstr " Nápověda k syntaxi "
 
 #: src/prefs_actions.c:291
 msgid "Registered actions"
-msgstr "Registrované akce"
+msgstr "Přidané akce"
 
 #: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_display_items.c:237
@@ -4491,7 +4422,7 @@ msgstr "Není nastaven název nabídky."
 
 #: src/prefs_actions.c:473
 msgid "Colon ':' is not allowed in the menu name."
-msgstr "V názvu nabídky není povolena dvojtečka ':'."
+msgstr "V názvu nabídky není povolena dvojtečka \":\"."
 
 #: src/prefs_actions.c:483
 msgid "Menu name is too long."
@@ -4499,7 +4430,7 @@ msgstr "Název nabídky je příliš dlouhý."
 
 #: src/prefs_actions.c:492
 msgid "Command line not set."
-msgstr "Není nastavena příkazová řádka."
+msgstr "Není nastaven příkaz."
 
 #: src/prefs_actions.c:497
 msgid "Menu name and command are too long."
@@ -4526,7 +4457,7 @@ msgstr "Opravdu chcete smazat tuto akci?"
 
 #: src/prefs_common_dialog.c:662
 msgid "Creating common preferences window...\n"
-msgstr "Vytvářím okno hlavního nastavení...\n"
+msgstr "Vytváří se okno společných nastavení...\n"
 
 #: src/prefs_common_dialog.c:666
 msgid "Common Preferences"
@@ -4537,13 +4468,12 @@ msgid "Display"
 msgstr "Zobrazení"
 
 #: src/prefs_common_dialog.c:690
-#, fuzzy
 msgid "Junk mail"
-msgstr "Složka"
+msgstr "Nevyžádaná pošta"
 
 #: src/prefs_common_dialog.c:696
 msgid "Details"
-msgstr ""
+msgstr "Detaily"
 
 #: src/prefs_common_dialog.c:750
 msgid "Auto-check new mail"
@@ -4555,7 +4485,7 @@ msgstr "každých"
 
 #: src/prefs_common_dialog.c:764 src/prefs_common_dialog.c:1139
 msgid "minute(s)"
-msgstr "minut(y)"
+msgstr "minut"
 
 #: src/prefs_common_dialog.c:773
 msgid "Check new mail on startup"
@@ -4563,12 +4493,11 @@ msgstr "Kontrola nové pošty při spuštění"
 
 #: src/prefs_common_dialog.c:775
 msgid "Update all local folders after incorporation"
-msgstr "Po začlenění aktualizovat všechny lokální složky"
+msgstr "Po přijmutí aktualizovat všechny lokální složky"
 
 #: src/prefs_common_dialog.c:780
-#, fuzzy
 msgid "Execute command when new messages arrived"
-msgstr "Vykonat ihned při přesunu nebo mazání zpráv"
+msgstr "Vykonat příkaz ihned při přijmutí nových zpráv"
 
 #: src/prefs_common_dialog.c:792 src/prefs_common_dialog.c:2435
 #: src/prefs_common_dialog.c:2457 src/prefs_common_dialog.c:2479
@@ -4576,22 +4505,21 @@ msgid "Command"
 msgstr "Příkaz"
 
 #: src/prefs_common_dialog.c:803
-#, fuzzy, c-format
+#, c-format
 msgid "`%d' will be replaced with the number of new messages."
-msgstr "Zjišťuji počet nových zpráv (STAT)..."
+msgstr "`%d' bude nahrazeno počtem nových zpráv."
 
 #: src/prefs_common_dialog.c:807
-#, fuzzy
 msgid "Incorporate from local spool"
-msgstr "Začlenit ze spoolu"
+msgstr "Začlenit z místního SPOOL"
 
 #: src/prefs_common_dialog.c:820
 msgid "Filter on incorporation"
-msgstr "Filtr na začlenění"
+msgstr "Filtrovat při začlenění"
 
 #: src/prefs_common_dialog.c:826
 msgid "Spool path"
-msgstr ""
+msgstr "Cesta ke SPOOL"
 
 #: src/prefs_common_dialog.c:877
 msgid "Save sent messages to outbox"
@@ -4599,30 +4527,27 @@ msgstr "Uložit odeslané zprávy do složky Odeslaná pošta"
 
 #: src/prefs_common_dialog.c:879
 msgid "Apply filter rules to sent messages"
-msgstr ""
+msgstr "Použít pravidla filtrů na odeslané zprávy"
 
 #: src/prefs_common_dialog.c:886
 msgid "Transfer encoding"
 msgstr "Kódování přenosu"
 
 #: src/prefs_common_dialog.c:909
-#, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
-"Určuje jak v jaké znakové sadě bude zpráva\n"
-"poslána když obsahuje ne-ASCII znaky."
+"Určí, jaké kódování přenosu bude použito, obsahuje-li tělo zprávy znaky mimo "
+"rozsah ASCII."
 
 #: src/prefs_common_dialog.c:916
-#, fuzzy
 msgid "MIME filename encoding"
-msgstr "Výstupní znaková sada"
+msgstr "Kódování názvu souboru MIME"
 
 #: src/prefs_common_dialog.c:927
-#, fuzzy
 msgid "MIME header"
-msgstr "Výstupní znaková sada"
+msgstr "Záhlaví MIME"
 
 #: src/prefs_common_dialog.c:937
 msgid ""
@@ -4630,6 +4555,9 @@ msgid ""
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
+"Určí metodu kódování názvu souboru MIME se znaky mimo rozsah ASCII.\n"
+"Hlavička MIME: nejpoužívanější, ale porušuje RFC 2047.\n"
+"RFC 2231: vyhovuje standardům, ale nepoužívané."
 
 #: src/prefs_common_dialog.c:1005 src/prefs_common_dialog.c:1394
 #: src/prefs_folder_item.c:139
@@ -4658,11 +4586,11 @@ msgstr "Citovat zprávy při odpovídání"
 
 #: src/prefs_common_dialog.c:1043
 msgid "Reply button invokes mailing list reply"
-msgstr "Tlačítko s odpovědí zvolí odpověď do diskusního listu"
+msgstr "Tlačítko s odpovědí zvolí odpověď do elektronické konference"
 
 #: src/prefs_common_dialog.c:1045
 msgid "Inherit recipients on reply to self messages"
-msgstr ""
+msgstr "Dědit příjemce při odpovědi na vlastní zprávy"
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
@@ -4692,21 +4620,19 @@ msgstr "Zalomit citaci"
 
 #: src/prefs_common_dialog.c:1114
 msgid "Wrap on input"
-msgstr "Zalomit při přijmutí"
+msgstr "Zalomit při vkládání"
 
 #: src/prefs_common_dialog.c:1123
-#, fuzzy
 msgid "Auto-save to draft"
-msgstr "Uloží koncept do složky"
+msgstr "Automaticky uložit do složky konceptů"
 
 #: src/prefs_common_dialog.c:1148
-#, fuzzy
 msgid "Format"
-msgstr "Normální"
+msgstr "Formát"
 
 #: src/prefs_common_dialog.c:1153
 msgid "Spell checking"
-msgstr ""
+msgstr "Kontrola pravopisu"
 
 #. reply
 #: src/prefs_common_dialog.c:1205
@@ -4715,7 +4641,7 @@ msgstr "Formát odpovědi"
 
 #: src/prefs_common_dialog.c:1220 src/prefs_common_dialog.c:1262
 msgid "Quotation mark"
-msgstr "Značka pro citaci"
+msgstr "Uvozovka"
 
 #. forward
 #: src/prefs_common_dialog.c:1247
@@ -4728,40 +4654,36 @@ msgstr " Popis symbolů "
 
 #: src/prefs_common_dialog.c:1323
 msgid "Enable Spell checking"
-msgstr ""
+msgstr "Zapnout kontrolu pravopisu"
 
 #: src/prefs_common_dialog.c:1335
-#, fuzzy
 msgid "Default language:"
-msgstr "Výchozí podpisový klíč"
+msgstr "Výchozí jazyk:"
 
 #: src/prefs_common_dialog.c:1402
-#, fuzzy
 msgid "Text font"
-msgstr "Text"
+msgstr "Font textu"
 
 #. ---- Folder View ----
 #: src/prefs_common_dialog.c:1414
-#, fuzzy
 msgid "Folder View"
-msgstr "Složka"
+msgstr "Strom složek"
 
 #: src/prefs_common_dialog.c:1422
 msgid "Display unread number next to folder name"
 msgstr "Zobrazit počet nepřečtených za názvem složky"
 
 #: src/prefs_common_dialog.c:1424
-#, fuzzy
 msgid "Display message number columns in the folder view"
-msgstr "Zobrazit počet nepřečtených za názvem složky"
+msgstr "Zobrazit sloupce s počtem zpráv ve stromu složek"
 
 #: src/prefs_common_dialog.c:1433
 msgid "Abbreviate newsgroups longer than"
-msgstr "Zkrátit názvy diskuzních skupin delší než"
+msgstr "Zkrátit názvy diskusních skupin delší než"
 
 #: src/prefs_common_dialog.c:1448
 msgid "letters"
-msgstr "dopisy(ů)"
+msgstr "znaků"
 
 #. ---- Summary ----
 #: src/prefs_common_dialog.c:1454
@@ -4770,7 +4692,8 @@ msgstr "Souhrnný pohled"
 
 #: src/prefs_common_dialog.c:1463
 msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Zobrazit příjemce ve sloupci 'Od', jestliže odesílatel jste vy sám"
+msgstr ""
+"Zobrazit příjemce ve sloupci \"Odesílatel\", jestliže jste odesílatel vy sám"
 
 #: src/prefs_common_dialog.c:1465
 msgid "Expand threads"
@@ -4779,7 +4702,7 @@ msgstr "Rozbalit vlákna"
 #: src/prefs_common_dialog.c:1473 src/prefs_common_dialog.c:2822
 #: src/prefs_common_dialog.c:2860
 msgid "Date format"
-msgstr "Formát datumu"
+msgstr "Formát data"
 
 #: src/prefs_common_dialog.c:1494
 msgid " Set display item of summary... "
@@ -4790,43 +4713,40 @@ msgid "Message"
 msgstr "Zpráva"
 
 #: src/prefs_common_dialog.c:1510
-#, fuzzy
 msgid "Default character encoding"
-msgstr "/Z_obrazit/Setříd_it/Sestupně"
+msgstr "Výchozí znaková sada"
 
 #: src/prefs_common_dialog.c:1524
 msgid "This is used when displaying messages with missing character encoding."
-msgstr ""
+msgstr "Použije se při zobrazení zpráv bez určené znakové sady."
 
 #: src/prefs_common_dialog.c:1530
-#, fuzzy
 msgid "Outgoing character encoding"
-msgstr "/Z_obrazit/Setříd_it/Sestupně"
+msgstr "Znaková sada při odesílání"
 
 #: src/prefs_common_dialog.c:1544
-#, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
 msgstr ""
-"Pokud je zvoleno 'Automatická', bude použita\n"
-"znaková sada podle locale."
+"Pokud je zvoleno \"Automatická\", bude použita nejvhodnější\n"
+"znaková sada pro lokalizaci libc."
 
 #: src/prefs_common_dialog.c:1605
 msgid "Enable coloration of message"
-msgstr "Povolit zabarvení zpráv"
+msgstr "Povolit obarvení textu ve zprávách"
 
 #: src/prefs_common_dialog.c:1620
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr ""
-"Zobrazit více-bytovou abecedu a číslice\n"
-"jako ASCII znaky (pouze pro Japonsko)"
+"Zobrazit více-bajtovou abecedu a číslice\n"
+"jako znaky ASCII (pouze pro japonštinu)"
 
 #: src/prefs_common_dialog.c:1627
 msgid "Display header pane above message view"
-msgstr "Zobrazit okno se záhlavím nad zprávou"
+msgstr "Zobrazit pole se záhlavím nad zprávou"
 
 #: src/prefs_common_dialog.c:1634
 msgid "Display short headers on message view"
@@ -4834,12 +4754,11 @@ msgstr "Zobrazit krátké záhlaví při zobrazení zprávy"
 
 #: src/prefs_common_dialog.c:1646
 msgid "Render HTML messages as text"
-msgstr ""
+msgstr "Zobrazit HTML jako prostý text"
 
 #: src/prefs_common_dialog.c:1650
-#, fuzzy
 msgid "Display cursor in message view"
-msgstr "Zobrazit krátké záhlaví při zobrazení zprávy"
+msgstr "Ukázat kurzor při zobrazení zpráv"
 
 #: src/prefs_common_dialog.c:1663
 msgid "Line space"
@@ -4847,7 +4766,7 @@ msgstr "Prázdná řádka"
 
 #: src/prefs_common_dialog.c:1677 src/prefs_common_dialog.c:1715
 msgid "pixel(s)"
-msgstr "pixel(y)"
+msgstr "pixelů"
 
 #: src/prefs_common_dialog.c:1682
 msgid "Scroll"
@@ -4867,76 +4786,67 @@ msgstr "Krok"
 
 #: src/prefs_common_dialog.c:1721
 msgid "Images"
-msgstr ""
+msgstr "Obrázky"
 
 #: src/prefs_common_dialog.c:1729
-#, fuzzy
 msgid "Resize attached large images to fit in the window"
-msgstr "Změnit velikost připojených obrázků"
+msgstr "Změnit velikost přiložených obrázků tak, aby se vešly do okna"
 
 #: src/prefs_common_dialog.c:1731
-#, fuzzy
 msgid "Display images as inline"
-msgstr "Zobrazit nastavení záhlaví"
+msgstr "Zobrazit obrázky v těle zprávy"
 
 #: src/prefs_common_dialog.c:1816
-#, fuzzy
 msgid "Enable Junk mail control"
-msgstr "Složka"
+msgstr "Zapnout kontrolu nevyžádané pošty"
 
 #: src/prefs_common_dialog.c:1828
-#, fuzzy
 msgid "Learning command:"
-msgstr "Provést"
+msgstr "Učit se příkazem:"
 
 #: src/prefs_common_dialog.c:1837
-#, fuzzy
 msgid "(Select preset)"
-msgstr "Vybrat klíče"
+msgstr "(Vybrat přednastavení)"
 
 #: src/prefs_common_dialog.c:1862
 msgid "Not Junk"
-msgstr ""
+msgstr "Vyžádaná pošta"
 
 #: src/prefs_common_dialog.c:1877
-#, fuzzy
 msgid "Classifying command"
-msgstr "Provést"
+msgstr "Příkaz k třídění"
 
 #: src/prefs_common_dialog.c:1888
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
+"Aby mohla být nevyžádaná pošta automaticky rozpoznána, musí být v určitém "
+"rozsahu ručně zpracovány zprávy nevyžádané i vyžádané."
 
 #: src/prefs_common_dialog.c:1898
-#, fuzzy
 msgid "Junk folder"
-msgstr "Složka"
+msgstr "Složka nevyžádané pošty"
 
 #: src/prefs_common_dialog.c:1916
-#, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr "(Nefiltrované zprávy budou uloženy v této složce)"
+msgstr "Zprávy označené jako nevyžádaná pošta budou přesunuty do této složky."
 
 #: src/prefs_common_dialog.c:1927
-#, fuzzy
 msgid "Filter messages classified as junk on receiving"
-msgstr "Filtr zpráv pro příjem"
+msgstr "Filtrovat zprávy vyhodnocené jako nevyžádané při přijmutí"
 
 #: src/prefs_common_dialog.c:1930
-#, fuzzy
 msgid "Filter junk mails before normal filtering"
-msgstr "Odebrat diskusní server"
+msgstr "Filtrovat nevyžádanou poštu před běžným filtrováním"
 
 #: src/prefs_common_dialog.c:1933
-#, fuzzy
 msgid "Delete junk mails from server on receiving"
-msgstr "Odebrat diskusní server"
+msgstr "Vymazat nevyžádanou poštu ze serveru při příjmu"
 
 #: src/prefs_common_dialog.c:1938
 msgid "Mark filtered junk mails as read"
-msgstr ""
+msgstr "Označit rozpoznanou nevyžádanou poštu jako přečtenou"
 
 #: src/prefs_common_dialog.c:1980
 msgid "Automatically check signatures"
@@ -4944,11 +4854,11 @@ msgstr "Automaticky zkontrolovat podpis"
 
 #: src/prefs_common_dialog.c:1983
 msgid "Show signature check result in a popup window"
-msgstr "Zobrazit výsledek testování podpisu v popup okně"
+msgstr "Zobrazit výsledek testování podpisu ve vyskakovacím okně"
 
 #: src/prefs_common_dialog.c:1986
 msgid "Store passphrase in memory temporarily"
-msgstr "Uložit passphrase dočasně v paměti"
+msgstr "Uložit heslo (frázi) dočasně v paměti"
 
 #: src/prefs_common_dialog.c:2001
 msgid "Expired after"
@@ -4956,78 +4866,68 @@ msgstr "Vyprší za"
 
 #: src/prefs_common_dialog.c:2014
 msgid "minute(s) "
-msgstr "minut(y) "
+msgstr "minut "
 
 #: src/prefs_common_dialog.c:2028
-#, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-"(Nastavení na '0' uloží passphrase\n"
-" pro celou relaci)"
+msgstr "Nastavení na \"0\" uloží heslo (frázi) během celé relace."
 
 #: src/prefs_common_dialog.c:2037
+#, fuzzy
 msgid "Grab input while entering a passphrase"
-msgstr ""
+msgstr "Uchopit vkládané při zadávání hesla (fráze)"
 
 #: src/prefs_common_dialog.c:2042
 msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Zobrazit varování pokud GnuPG nefunguje"
+msgstr "Zobrazit varování, pokud GnuPG není funkční"
 
 #: src/prefs_common_dialog.c:2111
 msgid "Always open messages in summary when selected"
-msgstr "Vybrané zprávy vždy otvírat v přehledu"
+msgstr "Vybrané zprávy vždy otevírat v souhrnu"
 
 #: src/prefs_common_dialog.c:2115
-#, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Při vstupu do složky otevřít první nepřečtenou zprávu"
 
 #: src/prefs_common_dialog.c:2122
-#, fuzzy
 msgid "Remember last selected message"
-msgstr "Nejsou již žádné zprávy s návěštím"
+msgstr "Pamatovat si poslední vybranou zprávu"
 
 #: src/prefs_common_dialog.c:2126
 msgid "Only mark message as read when opened in new window"
-msgstr "Označit zprávu za přečtěnou pouze při otevření v novém okně"
+msgstr "Označit zprávu jako přečtěnou pouze při otevření v novém okně"
 
 #: src/prefs_common_dialog.c:2130
-#, fuzzy
 msgid "Open inbox after receiving new mail"
-msgstr "Po přijetí nových zpráv přejít na Doručenou poštu"
+msgstr "Po přijetí nových zpráv přejít na doručenou poštu"
 
 #: src/prefs_common_dialog.c:2132
-#, fuzzy
 msgid "Open inbox on startup"
-msgstr "Kontrola nové pošty při spuštění"
+msgstr "Otevřít doručenou poštu při spuštění"
 
 #: src/prefs_common_dialog.c:2140
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Vykonat ihned při přesunu nebo mazání zpráv"
 
 #: src/prefs_common_dialog.c:2152
-#, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"(Pokud je tato volba vypnuta,\n"
-"zprávy budou označeny až do vykonání)"
+msgstr "Pokud je tato volba vypnuta, zprávy budou označeny až do vykonání."
 
 #: src/prefs_common_dialog.c:2161
 msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
+msgstr "Pořadí tlačítek vyhovující GNOME HIG."
 
 #: src/prefs_common_dialog.c:2164
-#, fuzzy
 msgid "Display tray icon"
-msgstr "Zobrazit jméno"
+msgstr "Zobrazit ikonu v oznamovací oblasti"
 
 #: src/prefs_common_dialog.c:2166
 msgid "Minimize to tray icon"
-msgstr ""
+msgstr "Minimalizovat do oznamovací oblasti"
 
 #: src/prefs_common_dialog.c:2168
 msgid "Toggle window on trayicon click"
-msgstr ""
+msgstr "Vyvolat okno kliknutím na ikonu v oznamovací oblasti"
 
 #: src/prefs_common_dialog.c:2178
 msgid " Set key bindings... "
@@ -5038,17 +4938,16 @@ msgid "Other"
 msgstr "Ostatní"
 
 #: src/prefs_common_dialog.c:2188
-#, fuzzy
 msgid "External commands"
-msgstr "Provést"
+msgstr "Externí příkazy"
 
 #: src/prefs_common_dialog.c:2241
 msgid "Receive dialog"
-msgstr "Dialog o přijetí"
+msgstr "Dialog o příjmu"
 
 #: src/prefs_common_dialog.c:2251
 msgid "Show receive dialog"
-msgstr "Zobrazit dialog o přijetí"
+msgstr "Zobrazit dialog o příjmu"
 
 #: src/prefs_common_dialog.c:2261
 msgid "Always"
@@ -5056,7 +4955,7 @@ msgstr "Vždy"
 
 #: src/prefs_common_dialog.c:2262
 msgid "Only on manual receiving"
-msgstr ""
+msgstr "Pouze při ručním příjmu"
 
 #: src/prefs_common_dialog.c:2264
 msgid "Never"
@@ -5064,11 +4963,11 @@ msgstr "Nikdy"
 
 #: src/prefs_common_dialog.c:2269
 msgid "Don't popup error dialog on receive error"
-msgstr "Při příjmu chyby nezobrazovat popup dialog"
+msgstr "Při příjmu chyby nezobrazovat dialog o chybě"
 
 #: src/prefs_common_dialog.c:2272
 msgid "Close receive dialog when finished"
-msgstr "Zavřít dialog o přijetí po dokončení"
+msgstr "Zavřít dialog o příjmu po dokončení"
 
 #: src/prefs_common_dialog.c:2283
 msgid "Add address to destination when double-clicked"
@@ -5084,7 +4983,7 @@ msgstr "Potvrdit ukončení"
 
 #: src/prefs_common_dialog.c:2300
 msgid "Empty trash on exit"
-msgstr "Při ukončení vyprázdnit koš"
+msgstr "Vyprázdnit koš"
 
 #: src/prefs_common_dialog.c:2302
 msgid "Ask before emptying"
@@ -5092,40 +4991,37 @@ msgstr "Potvrdit vyprázdnění"
 
 #: src/prefs_common_dialog.c:2306
 msgid "Warn if there are queued messages"
-msgstr "Varovat pokud jsou zprávy ve frontě"
+msgstr "Varovat, pokud jsou zprávy ve frontě"
 
 #: src/prefs_common_dialog.c:2361
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Externí příkaz (%s bude nahrazen jménem souboru / URI)"
+msgstr "Externí příkaz (%s bude nahrazeno jménem souboru nebo URI)"
 
 #: src/prefs_common_dialog.c:2370
 msgid "Web browser"
-msgstr "Webový prohlížeč"
+msgstr "Internetový prohlížeč"
 
 #: src/prefs_common_dialog.c:2382 src/prefs_common_dialog.c:3827
 #: src/prefs_common_dialog.c:3848
-#, fuzzy
 msgid "(Default browser)"
-msgstr "Výchozí inbox"
+msgstr "(Výchozí prohlížeč)"
 
 #: src/prefs_common_dialog.c:2423
-#, fuzzy
 msgid "Use external program for printing"
-msgstr "Použít externí program pro posílání"
+msgstr "Použít externí program při tisku"
 
 #: src/prefs_common_dialog.c:2445
 msgid "Use external program for incorporation"
-msgstr "Použít externí program k začlenění"
+msgstr "Použít externí program při začlenění"
 
 #: src/prefs_common_dialog.c:2467
 msgid "Use external program for sending"
-msgstr "Použít externí program pro posílání"
+msgstr "Použít externí program při odesílání"
 
 #: src/prefs_common_dialog.c:2526
-#, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Zapisuji celkovou mezipaměť (%s)..."
+msgstr "Zapnout striktní kontrolu integrity mezipaměti souhrnu"
 
 #: src/prefs_common_dialog.c:2529
 msgid ""
@@ -5133,14 +5029,16 @@ msgid ""
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
+"Použijte tuto volbu, pokud mohou jiné aplikace měnit obsah složek.\n"
+"Tato volba sníží rychlost zobrazování souhrnů."
 
 #: src/prefs_common_dialog.c:2536
 msgid "Socket I/O timeout:"
-msgstr "Čas vypršení pro I/O:"
+msgstr "Čas vypršení V/V operací se soketem:"
 
 #: src/prefs_common_dialog.c:2549
 msgid "second(s)"
-msgstr "sekund(a)"
+msgstr "sekund"
 
 #: src/prefs_common_dialog.c:2577
 msgid "Automatic (Recommended)"
@@ -5148,7 +5046,7 @@ msgstr "Automatická (doporučeno)"
 
 #: src/prefs_common_dialog.c:2582
 msgid "7bit ascii (US-ASCII)"
-msgstr "7bitový ascii (US-ASCII)"
+msgstr "7bitový ASCII (US-ASCII)"
 
 #: src/prefs_common_dialog.c:2584
 msgid "Unicode (UTF-8)"
@@ -5156,126 +5054,119 @@ msgstr "Unicode (UTF-8)"
 
 #: src/prefs_common_dialog.c:2586
 msgid "Western European (ISO-8859-1)"
-msgstr "Západní Evropa (ISO-8859-1)"
+msgstr "Západoevropské jazyky (ISO-8859-1)"
 
 #: src/prefs_common_dialog.c:2587
 msgid "Western European (ISO-8859-15)"
-msgstr "Západní Evropa(ISO-8859-15)"
+msgstr "Západoevropské jazyky (ISO-8859-15)"
 
 #: src/prefs_common_dialog.c:2589
-#, fuzzy
 msgid "Western European (Windows-1252)"
-msgstr "Západní Evropa(ISO-8859-15)"
+msgstr "Západoevropské jazyky (Windows-1252)"
 
 #: src/prefs_common_dialog.c:2593
 msgid "Central European (ISO-8859-2)"
-msgstr "Středoevropská (ISO-8859-2)"
+msgstr "Středoevropské jazyky (ISO-8859-2)"
 
 #: src/prefs_common_dialog.c:2595
 msgid "Baltic (ISO-8859-13)"
-msgstr "Baltická (ISO-8859-13)"
+msgstr "Pobaltské jazyky (ISO-8859-13)"
 
 #: src/prefs_common_dialog.c:2596
 msgid "Baltic (ISO-8859-4)"
-msgstr "Baltická (ISO-8859-4)"
+msgstr "Pobaltské jazyky (ISO-8859-4)"
 
 #: src/prefs_common_dialog.c:2597
-#, fuzzy
 msgid "Baltic (Windows-1257)"
-msgstr "Azbuka (Windows-1251)"
+msgstr "Pobaltské jazyky (Windows-1257)"
 
 #: src/prefs_common_dialog.c:2599
 msgid "Greek (ISO-8859-7)"
-msgstr "Řecká (ISO-8859-7)"
+msgstr "Řečtina (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2601
-#, fuzzy
 msgid "Arabic (ISO-8859-6)"
-msgstr "Baltická (ISO-8859-4)"
+msgstr "Arabština (ISO-8859-6)"
 
 #: src/prefs_common_dialog.c:2602
-#, fuzzy
 msgid "Arabic (Windows-1256)"
-msgstr "Azbuka (Windows-1251)"
+msgstr "Arabština (Windows-1256)"
 
 #: src/prefs_common_dialog.c:2604
-#, fuzzy
 msgid "Hebrew (ISO-8859-8)"
-msgstr "Řecká (ISO-8859-7)"
+msgstr "Hebrejština (ISO-8859-8)"
 
 #: src/prefs_common_dialog.c:2605
-#, fuzzy
 msgid "Hebrew (Windows-1255)"
-msgstr "Azbuka (Windows-1251)"
+msgstr "Hebrejština (Windows-1255)"
 
 #: src/prefs_common_dialog.c:2607
 msgid "Turkish (ISO-8859-9)"
-msgstr "Turecká (ISO-8859-9)"
+msgstr "Turečtina (ISO-8859-9)"
 
 #: src/prefs_common_dialog.c:2609
 msgid "Cyrillic (ISO-8859-5)"
-msgstr "Azbuka (ISO-8859-5)"
+msgstr "Cyrilice (ISO-8859-5)"
 
 #: src/prefs_common_dialog.c:2610
 msgid "Cyrillic (KOI8-R)"
-msgstr "Azbuka (KOI8-R)"
+msgstr "Cyrilice (KOI8-R)"
 
 #: src/prefs_common_dialog.c:2611
 msgid "Cyrillic (KOI8-U)"
-msgstr "Azbuka (KOI8-U)"
+msgstr "Cyrilice (KOI8-U)"
 
 #: src/prefs_common_dialog.c:2612
 msgid "Cyrillic (Windows-1251)"
-msgstr "Azbuka (Windows-1251)"
+msgstr "Cyrilice (Windows-1251)"
 
 #: src/prefs_common_dialog.c:2614
 msgid "Japanese (ISO-2022-JP)"
-msgstr "Japonská (ISO-2022-JP)"
+msgstr "Japonština (ISO-2022-JP)"
 
 #: src/prefs_common_dialog.c:2616
 msgid "Japanese (EUC-JP)"
-msgstr "Japonská (EUC-JP)"
+msgstr "Japonština (EUC-JP)"
 
 #: src/prefs_common_dialog.c:2617
 msgid "Japanese (Shift_JIS)"
-msgstr "Japonská (Shift_JIS)"
+msgstr "Japonština (Shift_JIS)"
 
 #: src/prefs_common_dialog.c:2620
 msgid "Simplified Chinese (GB2312)"
-msgstr "Zjednodušená čínská (GB2312)"
+msgstr "Zjednodušená čínština (GB2312)"
 
 #: src/prefs_common_dialog.c:2621
-#, fuzzy
 msgid "Simplified Chinese (GBK)"
-msgstr "Zjednodušená čínská (GB2312)"
+msgstr "Zjednodušená čínština (GBK)"
 
 #: src/prefs_common_dialog.c:2622
 msgid "Traditional Chinese (Big5)"
-msgstr "Tradiční čínská (Big5)"
+msgstr "Tradiční čínština (Big5)"
 
 #: src/prefs_common_dialog.c:2624
 msgid "Traditional Chinese (EUC-TW)"
-msgstr "Tradiční čínská (EUC-TW)"
+msgstr "Tradiční čínština (EUC-TW)"
 
 #: src/prefs_common_dialog.c:2625
 msgid "Chinese (ISO-2022-CN)"
-msgstr "Čínská (ISO-2022-CN)"
+msgstr "Čínština (ISO-2022-CN)"
 
 #: src/prefs_common_dialog.c:2628
 msgid "Korean (EUC-KR)"
-msgstr "Korejská (EUC-KR)"
+msgstr "Korejština (EUC-KR)"
 
 #: src/prefs_common_dialog.c:2630
 msgid "Thai (TIS-620)"
-msgstr "Thajská (TIS-620)"
+msgstr "Thajština (TIS-620)"
 
 #: src/prefs_common_dialog.c:2631
 msgid "Thai (Windows-874)"
-msgstr "Thajská (Windows-874)"
+msgstr "Thajština (Windows-874)"
 
 #: src/prefs_common_dialog.c:2798
 msgid "the full abbreviated weekday name"
-msgstr "zkratky pro názvy dnů v týdnu"
+msgstr "zkratky názvů dnů v týdnu"
 
 #: src/prefs_common_dialog.c:2799
 msgid "the full weekday name"
@@ -5283,7 +5174,7 @@ msgstr "plný název dne v týdnu"
 
 #: src/prefs_common_dialog.c:2800
 msgid "the abbreviated month name"
-msgstr "zkratka pro měsíc"
+msgstr "zkratka měsíce"
 
 #: src/prefs_common_dialog.c:2801
 msgid "the full month name"
@@ -5291,7 +5182,7 @@ msgstr "plný název měsíce"
 
 #: src/prefs_common_dialog.c:2802
 msgid "the preferred date and time for the current locale"
-msgstr "preferované datum a čas podle aktuálního locale"
+msgstr "datum a čas preferované aktuální lokalizací libc"
 
 #: src/prefs_common_dialog.c:2803
 msgid "the century number (year/100)"
@@ -5303,15 +5194,15 @@ msgstr "den v měsíci číselně"
 
 #: src/prefs_common_dialog.c:2805
 msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "hodiny číselně s 24 hodinových cyklem"
+msgstr "hodiny číselně s 24hodinových cyklem"
 
 #: src/prefs_common_dialog.c:2806
 msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "hodiny číselně s 12 hodinových cyklem"
+msgstr "hodiny číselně s 12hodinových cyklem"
 
 #: src/prefs_common_dialog.c:2807
 msgid "the day of the year as a decimal number"
-msgstr "rok číselně"
+msgstr "den v roce číselně"
 
 #: src/prefs_common_dialog.c:2808
 msgid "the month as a decimal number"
@@ -5323,11 +5214,11 @@ msgstr "minuty číselně"
 
 #: src/prefs_common_dialog.c:2810
 msgid "either AM or PM"
-msgstr "AM nebo PM"
+msgstr "dopoledne nebo odpoledne"
 
 #: src/prefs_common_dialog.c:2811
 msgid "the second as a decimal number"
-msgstr "vteřiny číselně"
+msgstr "sekundy číselně"
 
 #: src/prefs_common_dialog.c:2812
 msgid "the day of the week as a decimal number"
@@ -5335,7 +5226,7 @@ msgstr "den v týdnu číselně"
 
 #: src/prefs_common_dialog.c:2813
 msgid "the preferred date for the current locale"
-msgstr "preferovaný datum pro aktuální locale"
+msgstr "datum preferované aktuální lokalizací libc"
 
 #: src/prefs_common_dialog.c:2814
 msgid "the last two digits of a year"
@@ -5363,7 +5254,7 @@ msgstr "Příklad"
 
 #: src/prefs_common_dialog.c:2959
 msgid "Set message colors"
-msgstr "Nastavení barev pro zprávy"
+msgstr "Nastavení barev ve zprávách"
 
 #: src/prefs_common_dialog.c:2967
 msgid "Colors"
@@ -5371,19 +5262,19 @@ msgstr "Barvy"
 
 #: src/prefs_common_dialog.c:3001
 msgid "Quoted Text - First Level"
-msgstr "Citovaný text - První úroveň"
+msgstr "Citovaný text - první úroveň"
 
 #: src/prefs_common_dialog.c:3007
 msgid "Quoted Text - Second Level"
-msgstr "Citovaný text - Druhá úroveň"
+msgstr "Citovaný text - druhá úroveň"
 
 #: src/prefs_common_dialog.c:3013
 msgid "Quoted Text - Third Level"
-msgstr "Citovaný text - Třetí úroveň"
+msgstr "Citovaný text - třetí úroveň"
 
 #: src/prefs_common_dialog.c:3019
 msgid "URI link"
-msgstr "URI odkaz"
+msgstr "Odkaz URI"
 
 #: src/prefs_common_dialog.c:3026
 msgid "Recycle quote colors"
@@ -5391,19 +5282,19 @@ msgstr "Rotovat barvy citací"
 
 #: src/prefs_common_dialog.c:3093
 msgid "Pick color for quotation level 1"
-msgstr "Zvolte barvu pro 1 úroveň citace"
+msgstr "Zvolte barvu první úrovně citace"
 
 #: src/prefs_common_dialog.c:3096
 msgid "Pick color for quotation level 2"
-msgstr "Zvolte barvu pro 2 úroveň citace"
+msgstr "Zvolte barvu druhé úrovně citace"
 
 #: src/prefs_common_dialog.c:3099
 msgid "Pick color for quotation level 3"
-msgstr "Zvolte barvu pro 3 úroveň citace"
+msgstr "Zvolte barvu třetí úrovně citace"
 
 #: src/prefs_common_dialog.c:3102
 msgid "Pick color for URI"
-msgstr "Získat barvu z URI"
+msgstr "Zvolte barvu URI"
 
 #: src/prefs_common_dialog.c:3242
 msgid "Description of symbols"
@@ -5423,19 +5314,19 @@ msgid ""
 "Message-ID"
 msgstr ""
 "Datum\n"
-"Od\n"
+"Odesílatel\n"
 "Celé jméno odesílatele\n"
 "Křestní jméno odesílatele\n"
 "Iniciály odesílatele\n"
 "Předmět\n"
-"Komu\n"
+"Příjemce\n"
 "Kopie\n"
-"Diskuzní skupina\n"
+"Diskusní skupiny\n"
 "Číslo zprávy"
 
 #: src/prefs_common_dialog.c:3311
 msgid "If x is set, displays expr"
-msgstr ""
+msgstr "Pokud je zvoleno x, zobrazí se expr"
 
 #: src/prefs_common_dialog.c:3315
 msgid ""
@@ -5449,7 +5340,7 @@ msgstr ""
 "Citované tělo zprávy\n"
 "Tělo zprávy bez podpisu\n"
 "Citované tělo zprávy bez podpisu\n"
-"Znak %"
+"Znak procento"
 
 #: src/prefs_common_dialog.c:3323
 msgid ""
@@ -5468,9 +5359,8 @@ msgid "Key bindings"
 msgstr "Klávesové zkratky"
 
 #: src/prefs_common_dialog.c:3382
-#, fuzzy
 msgid "Select the preset of key bindings."
-msgstr " Nastavit klávesové zkratky... "
+msgstr "Vyberte si přednastavení klávesových zkratek."
 
 #: src/prefs_common_dialog.c:3392 src/prefs_common_dialog.c:3716
 msgid "Default"
@@ -5506,11 +5396,11 @@ msgstr "Opravdu chcete smazat toto záhlaví?"
 
 #: src/prefs_display_header.c:179
 msgid "Creating display header setting window...\n"
-msgstr "Vytvářím okno pro zobrazení nastavení záhlaví...\n"
+msgstr "Vytvářím okno nastavení zobrazeného záhlaví...\n"
 
 #: src/prefs_display_header.c:203
 msgid "Display header setting"
-msgstr "Zobrazit nastavení záhlaví"
+msgstr "Nastavení zobrazeného záhlaví"
 
 #: src/prefs_display_header.c:223
 msgid "Header name"
@@ -5526,24 +5416,23 @@ msgstr "Skryté záhlaví"
 
 #: src/prefs_display_header.c:342
 msgid "Show all unspecified headers"
-msgstr "Zobrazit všechny nespecifikovaná záhlaví"
+msgstr "Zobrazit všechna nespecifikovaná záhlaví"
 
 #: src/prefs_display_header.c:369
 msgid "Reading configuration for displaying headers...\n"
-msgstr "Načítám konfiguraci zobrazovaného záhlaví...\n"
+msgstr "Načítají se předvolby zobrazovaného záhlaví...\n"
 
 #: src/prefs_display_header.c:407
 msgid "Writing configuration for displaying headers...\n"
-msgstr "Zapisuji konfiguraci zobrazovaného záhlaví...\n"
+msgstr "Zapisují se předvolby zobrazovaného záhlaví...\n"
 
 #: src/prefs_display_header.c:539
 msgid "This header is already in the list."
 msgstr "Toto záhlaví je již v seznamu."
 
 #: src/prefs_display_items.c:125
-#, fuzzy
 msgid "Display items setting"
-msgstr "Zobrazit nastavení záhlaví"
+msgstr "Zobrazit nastavení položek"
 
 #: src/prefs_display_items.c:165 src/prefs_summary_column.c:223
 msgid "Available items"
@@ -5563,264 +5452,233 @@ msgstr "Zobrazené položky"
 
 #: src/prefs_display_items.c:258 src/prefs_summary_column.c:309
 msgid " Revert to default "
-msgstr " Návrat k výchozí "
+msgstr " Výchozí "
 
 #: src/prefs_filter.c:208
 msgid "Filter setting"
-msgstr "Nastavení filtru"
+msgstr "Nastavení filtrů"
 
 #: src/prefs_filter.c:252
 msgid "Enabled"
-msgstr ""
+msgstr "Zapnuto"
 
 #: src/prefs_filter.c:686
-#, fuzzy, c-format
+#, c-format
 msgid "Do you really want to delete the rule '%s'?"
-msgstr "Opravdu chcete smazat toto pravidlo?"
+msgstr "Opravdu chcete smazat pravidlo \"%s\"?"
 
 #: src/prefs_filter.c:688
 msgid "Delete rule"
 msgstr "Smazat pravidlo"
 
 #: src/prefs_filter_edit.c:234
-#, fuzzy
 msgid "Filter rule"
-msgstr "Smazat pravidlo"
+msgstr "Pravidla filtru"
 
 #: src/prefs_filter_edit.c:268
 msgid "If any of the following condition matches"
-msgstr ""
+msgstr "Pokud některá z následujících podmínek vyhovuje"
 
 #: src/prefs_filter_edit.c:270
 msgid "If all of the following conditions match"
-msgstr ""
+msgstr "Pokud všechny z následujících podmínek vyhovují"
 
 #: src/prefs_filter_edit.c:291
 msgid "Perform the following actions:"
-msgstr ""
+msgstr "Provést následující akce:"
 
 #: src/prefs_filter_edit.c:490
 msgid "To or Cc"
-msgstr ""
+msgstr "Příjemce nebo příjemce kopie"
 
 #: src/prefs_filter_edit.c:491
-#, fuzzy
 msgid "Any header"
-msgstr "Všechna záhlaví"
+msgstr "Jakékoliv záhlaví"
 
 #: src/prefs_filter_edit.c:492
-#, fuzzy
 msgid "Edit header..."
-msgstr "Záhlaví"
+msgstr "Upravit záhlaví..."
 
 #: src/prefs_filter_edit.c:495
-#, fuzzy
 msgid "Message body"
-msgstr "Zpráva"
+msgstr "Tělo zprávy"
 
 #: src/prefs_filter_edit.c:496
 msgid "Result of command"
-msgstr ""
+msgstr "Výsledek příkazu"
 
 #: src/prefs_filter_edit.c:498
 msgid "Age"
-msgstr ""
+msgstr "Stáří"
 
 #: src/prefs_filter_edit.c:502 src/summaryview.c:528
-#, fuzzy
 msgid "Marked"
-msgstr "Označit"
+msgstr "Označené"
 
 #: src/prefs_filter_edit.c:503
-#, fuzzy
 msgid "Has color label"
-msgstr "/_Barevné označení"
+msgstr "S barevným návěštím"
 
 #: src/prefs_filter_edit.c:504
-#, fuzzy
 msgid "Has attachment"
-msgstr "Příloha"
+msgstr "S přílohou"
 
 #: src/prefs_filter_edit.c:517
 msgid "contains"
 msgstr "obsahuje"
 
 #: src/prefs_filter_edit.c:519
-#, fuzzy
 msgid "doesn't contain"
 msgstr "neobsahuje"
 
 #: src/prefs_filter_edit.c:521
 msgid "is"
-msgstr ""
+msgstr "je"
 
 #: src/prefs_filter_edit.c:523
 msgid "is not"
-msgstr ""
+msgstr "není"
 
 #: src/prefs_filter_edit.c:526
 msgid "match to regex"
-msgstr ""
+msgstr "vyhovuje regulárnímu výrazu"
 
 #: src/prefs_filter_edit.c:528
 msgid "doesn't match to regex"
-msgstr ""
+msgstr "nevyhovuje regulárnímu výrazu"
 
 #: src/prefs_filter_edit.c:539
 msgid "is larger than"
-msgstr ""
+msgstr "je větší než"
 
 #: src/prefs_filter_edit.c:540
 msgid "is smaller than"
-msgstr ""
+msgstr "je menší než"
 
 #: src/prefs_filter_edit.c:549
 msgid "is longer than"
-msgstr ""
+msgstr "je větší než"
 
 #: src/prefs_filter_edit.c:550
 msgid "is shorter than"
-msgstr ""
+msgstr "je menší než"
 
 #: src/prefs_filter_edit.c:560
 msgid "matches to status"
-msgstr ""
+msgstr "vyhovuje stavu"
 
 #: src/prefs_filter_edit.c:561
-#, fuzzy
 msgid "doesn't match to status"
-msgstr "neobsahuje"
+msgstr "nevyhovuje stavu"
 
 #: src/prefs_filter_edit.c:663
-#, fuzzy
 msgid "Move to"
-msgstr "Posunout dolů"
+msgstr "Přesunout..."
 
 #: src/prefs_filter_edit.c:664
-#, fuzzy
 msgid "Copy to"
-msgstr "/_Kopírovat..."
+msgstr "Kopírovat..."
 
 #: src/prefs_filter_edit.c:665
 msgid "Don't receive"
 msgstr "Nedoručit"
 
 #: src/prefs_filter_edit.c:666
-#, fuzzy
 msgid "Delete from server"
-msgstr "Odebrat diskusní server"
+msgstr "Smazat ze serveru"
 
 #: src/prefs_filter_edit.c:669
-#, fuzzy
 msgid "Set mark"
-msgstr "Poznámky"
+msgstr "Nastavit označení"
 
 #: src/prefs_filter_edit.c:670
-#, fuzzy
 msgid "Set color"
-msgstr "Nastavení barev pro zprávy"
+msgstr "Nastavit barvu"
 
 #: src/prefs_filter_edit.c:671
-#, fuzzy
 msgid "Mark as read"
-msgstr "/_Označit/Označit jako př_ečtené"
+msgstr "Označit jako přečtené"
 
 #: src/prefs_filter_edit.c:675 src/prefs_toolbar.c:57
 msgid "Forward"
-msgstr "Poslat dál"
+msgstr "Předat dál"
 
 #: src/prefs_filter_edit.c:676
-#, fuzzy
 msgid "Forward as attachment"
-msgstr "/Přeposlat _jako přílohu"
+msgstr "Předat dál jako přílohu"
 
 #: src/prefs_filter_edit.c:677
-#, fuzzy
 msgid "Redirect"
-msgstr "/Přes_měrovat"
+msgstr "Přesměrovat"
 
 #: src/prefs_filter_edit.c:681
-#, fuzzy
 msgid "Execute command"
-msgstr "Provést"
+msgstr "Vykonat příkaz"
 
 #: src/prefs_filter_edit.c:684
 msgid "Stop rule evaluation"
-msgstr ""
+msgstr "Zastavit provádění pravidla"
 
 #: src/prefs_filter_edit.c:690 src/prefs_filter_edit.c:1053
-#, fuzzy
 msgid "folder:"
-msgstr "Složka"
+msgstr "složka:"
 
 #: src/prefs_filter_edit.c:1014
-#, fuzzy
 msgid "day(s)"
-msgstr "dnech"
+msgstr "dnů"
 
 #: src/prefs_filter_edit.c:1093
-#, fuzzy
 msgid "address:"
-msgstr "Adresa"
+msgstr "adresa:"
 
 #: src/prefs_filter_edit.c:1510
-#, fuzzy
 msgid "Edit header list"
-msgstr "Záhlaví"
+msgstr "Upravit seznam záhlaví"
 
 #: src/prefs_filter_edit.c:1533
-#, fuzzy
 msgid "Headers"
 msgstr "Záhlaví"
 
 #: src/prefs_filter_edit.c:1544
-#, fuzzy
 msgid "Header:"
-msgstr "Záhlaví"
+msgstr "Záhlaví:"
 
 #: src/prefs_filter_edit.c:1731 src/prefs_filter_edit.c:1829
 #: src/prefs_filter_edit.c:1836
-#, fuzzy
 msgid "Command is not specified."
-msgstr "Není nastavena příkazová řádka."
+msgstr "Není uveden příkaz."
 
 #: src/prefs_filter_edit.c:1809 src/prefs_filter_edit.c:1816
-#, fuzzy
 msgid "Destination folder is not specified."
-msgstr "Místo určení není nastavené."
+msgstr "Není zadáno místo určení."
 
 #: src/prefs_filter_edit.c:1886
 msgid "Invalid condition exists."
-msgstr ""
+msgstr "Neplatné podmínky."
 
 #: src/prefs_filter_edit.c:1909
-#, fuzzy
 msgid "Rule name is not specified."
-msgstr "Není uveden příjemce."
+msgstr "Není zadáno jméno pravidla."
 
 #: src/prefs_filter_edit.c:1935
-#, fuzzy
 msgid "Invalid action exists."
-msgstr "Nesprávný měsíc\n"
+msgstr "Existuje neplatná akce."
 
 #: src/prefs_filter_edit.c:1944
-#, fuzzy
 msgid "Condition not exist."
-msgstr "Není nastavena příkazová řádka."
+msgstr "Podmínka neexistuje."
 
 #: src/prefs_filter_edit.c:1946
-#, fuzzy
 msgid "Action not exist."
-msgstr "%s: soubor neexistuje\n"
+msgstr "Akce neexistuje."
 
 #: src/prefs_folder_item.c:118
 msgid "Folder properties"
 msgstr "Vlastnosti složky"
 
 #: src/prefs_folder_item.c:186
-#, fuzzy
 msgid "Identifier"
-msgstr "Specifikátor"
+msgstr "Identifikátor"
 
 #: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
@@ -5832,7 +5690,7 @@ msgstr "Normální"
 
 #: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
-msgstr "Nezobrazovat  v přehledu na začátku předmětu [...] nebo (...)"
+msgstr "Nezobrazovat v souhrnu na začátku předmětu [...] nebo (...)"
 
 #: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
@@ -5853,31 +5711,28 @@ msgstr "použít také při odpovědi"
 
 #: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
-msgstr "Odpovědět komu:"
+msgstr "Adresa pro odpovědi:"
 
 #: src/prefs_search_folder.c:164
 #, c-format
 msgid "%s - Edit search condition"
-msgstr ""
+msgstr "%s·-·Upravit možnosti hledání"
 
 #: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
-msgstr ""
+msgstr "Vyhovuje některé z následujících"
 
 #: src/prefs_search_folder.c:211 src/query_search.c:276
-#, fuzzy
 msgid "Match all of the following"
-msgstr "Automaticky nastavit následující adresy"
+msgstr "Vyhovuje všem z následujících"
 
 #: src/prefs_search_folder.c:231 src/query_search.c:320
-#, fuzzy
 msgid "Folder:"
-msgstr "Složka"
+msgstr "Složka:"
 
 #: src/prefs_search_folder.c:248 src/query_search.c:338
-#, fuzzy
 msgid "Search subfolders"
-msgstr "Vyhledání složky"
+msgstr "Hledání v podsložkách"
 
 #: src/prefs_summary_column.c:70
 msgid "Mark"
@@ -5896,7 +5751,7 @@ msgstr "Předmět"
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:5015
 msgid "From"
-msgstr "Od"
+msgstr "Odesílatel"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5017
@@ -5910,20 +5765,19 @@ msgstr "Číslo"
 
 #: src/prefs_summary_column.c:172
 msgid "Creating summary column setting window...\n"
-msgstr "Vytvářím okno pro nastavení sloupců pro přehled...\n"
+msgstr "Vytváří se okno nastavení sloupců v souhrnu...\n"
 
 #: src/prefs_summary_column.c:181
 msgid "Summary display item setting"
-msgstr "Nastavení položky v přehledu"
+msgstr "Nastavení položek v souhrnu"
 
 #: src/prefs_summary_column.c:196
-#, fuzzy
 msgid ""
 "Select items to be displayed on the summary view. You can modify\n"
 "the order by using the Up / Down button."
 msgstr ""
-"Vyberte položky, které chcete zobrazit v celkovém pohledu. Můžete změnit\n"
-"pořadí pomocí tlačítek Nahoru / Dolů nebo přetažením položek."
+"Vyberte položky, které chcete zobrazit v souhrnném pohledu. Můžete změnit\n"
+"pořadí pomocí tlačítek Nahoru nebo Dolů."
 
 #: src/prefs_template.c:164
 msgid "Template name"
@@ -5931,7 +5785,7 @@ msgstr "Název šablony"
 
 #: src/prefs_template.c:227
 msgid "Register"
-msgstr "Registrovat"
+msgstr "Přidat"
 
 #: src/prefs_template.c:233
 msgid " Substitute "
@@ -5943,7 +5797,7 @@ msgstr " Symboly "
 
 #: src/prefs_template.c:259
 msgid "Registered templates"
-msgstr "Registrované šablony"
+msgstr "Přidané šablony"
 
 #: src/prefs_template.c:280
 msgid "Templates"
@@ -5966,81 +5820,76 @@ msgid "Do you really want to delete this template?"
 msgstr "Opravdu chcete smazat tuto šablonu?"
 
 #: src/prefs_toolbar.c:37
-#, fuzzy
 msgid "---- Separator ----"
-msgstr "Obsluha"
+msgstr "---- Oddělovač ----"
 
 #: src/prefs_toolbar.c:39
 msgid "Get"
-msgstr "Stáhnout"
+msgstr "Přijmout"
 
 #: src/prefs_toolbar.c:40
 msgid "Incorporate new mail"
-msgstr "Začlenit novou poštu"
+msgstr "Přijme novou poštu"
 
 #: src/prefs_toolbar.c:42
 msgid "Get all"
-msgstr "Stáhnout vše"
+msgstr "Přijmout vše"
 
 #: src/prefs_toolbar.c:43
 msgid "Incorporate new mail of all accounts"
-msgstr "Začlení novou poštu ze všech účtů"
+msgstr "Přijme novou poštu ze všech účtů"
 
 #: src/prefs_toolbar.c:46
 msgid "Send queued message(s)"
-msgstr "Odešle pozdrženou zprávu(y)"
+msgstr "Odešle pozdržené zprávy"
 
 #: src/prefs_toolbar.c:49
 msgid "Compose new message"
-msgstr "Vytváří novou zprávu"
+msgstr "Vytvoří novou zprávu"
 
 #: src/prefs_toolbar.c:52
 msgid "Reply to the message"
-msgstr "Odpovídá na zprávu"
+msgstr "Odpoví na zprávu"
 
 #: src/prefs_toolbar.c:54
 msgid "Reply all"
-msgstr "Odpov. všem"
+msgstr "Odp. všem"
 
 #: src/prefs_toolbar.c:55
 msgid "Reply to all"
-msgstr "Odpovídá všem"
+msgstr "Odpoví všem"
 
 #: src/prefs_toolbar.c:58
 msgid "Forward the message"
-msgstr "Předává zprávu dál"
+msgstr "Předá zprávu dál"
 
 #: src/prefs_toolbar.c:61
 msgid "Delete the message"
-msgstr "Smazat zprávu"
+msgstr "Vymaže zprávu"
 
 #: src/prefs_toolbar.c:64
-#, fuzzy
 msgid "Set as junk mail"
-msgstr "Nastavit jako výchozí"
+msgstr "Označí jako nevyžádanou poštu"
 
 #: src/prefs_toolbar.c:66
 msgid "Not junk"
-msgstr ""
+msgstr "Vyžádaná pošta"
 
 #: src/prefs_toolbar.c:67
-#, fuzzy
 msgid "Set as not junk mail"
-msgstr "Nastavit jako výchozí"
+msgstr "Označí jako vyžádanou poštu"
 
 #: src/prefs_toolbar.c:70
 msgid "Next unread message"
-msgstr "Další nepřečtenou zprávu"
+msgstr "Zobrazí následující nepřečtenou zprávu"
 
 #: src/prefs_toolbar.c:73
-#, fuzzy
 msgid "Previous unread message"
-msgstr "Další nepřečtenou zprávu"
+msgstr "Zobrazí předchozí nepřečtenou zprávu"
 
 #: src/prefs_toolbar.c:75
-#, fuzzy
 msgid "Search"
-msgstr "Vyhledat"
+msgstr "Hledat"
 
 #: src/prefs_toolbar.c:76 src/query_search.c:251
 msgid "Search messages"
@@ -6051,17 +5900,16 @@ msgid "Print"
 msgstr "Tisk"
 
 #: src/prefs_toolbar.c:79
-#, fuzzy
 msgid "Print message"
-msgstr "Odešle zprávu"
+msgstr "Vytiskne zprávu"
 
 #: src/prefs_toolbar.c:84
 msgid "Execute"
-msgstr "Provést"
+msgstr "Vykonat"
 
 #: src/prefs_toolbar.c:85
 msgid "Execute marked process"
-msgstr "Provést označený proces "
+msgstr "Spustí označený proces"
 
 #: src/prefs_toolbar.c:87
 msgid "Prefs"
@@ -6077,7 +5925,7 @@ msgstr "Odešle zprávu"
 
 #: src/prefs_toolbar.c:97
 msgid "Send later"
-msgstr "Poslat později"
+msgstr "Odeslat později"
 
 #: src/prefs_toolbar.c:98
 msgid "Put into queue folder and send later"
@@ -6089,7 +5937,7 @@ msgstr "Koncept"
 
 #: src/prefs_toolbar.c:101
 msgid "Save to draft folder"
-msgstr "Uloží koncept do složky"
+msgstr "Uloží do složky konceptů"
 
 #: src/prefs_toolbar.c:103
 msgid "Insert"
@@ -6105,16 +5953,15 @@ msgstr "Příloha"
 
 #: src/prefs_toolbar.c:107
 msgid "Attach file"
-msgstr "Připojí soubor"
+msgstr "Přiloží soubor"
 
 #: src/prefs_toolbar.c:110
-#, fuzzy
 msgid "Append signature"
-msgstr "ŠPATNÝ podpis"
+msgstr "Připojí podpis"
 
 #: src/prefs_toolbar.c:113
 msgid "Edit with external editor"
-msgstr "Úprava externím editorem"
+msgstr "Upraví externím editorem"
 
 #: src/prefs_toolbar.c:119
 msgid "Linewrap"
@@ -6122,30 +5969,27 @@ msgstr "Zarovnání"
 
 #: src/prefs_toolbar.c:120
 msgid "Wrap all long lines"
-msgstr "Zarovnání dlouhých řádků"
+msgstr "Zarovná dlouhé řádky"
 
 #: src/prefs_toolbar.c:217
-#, fuzzy
 msgid "Customize toolbar"
-msgstr "/Z_obrazit/_Přejít/Do _jiné složky"
+msgstr "Upravit nástrojovou lištu"
 
 #: src/prefs_toolbar.c:219
-#, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
 "the order by using the Up / Down button."
 msgstr ""
-"Vyberte položky, které chcete zobrazit v celkovém pohledu. Můžete změnit\n"
-"pořadí pomocí tlačítek Nahoru / Dolů nebo přetažením položek."
+"Vyberte položky, které chcete zobrazit na nástrojové liště. Můžete\n"
+"změnit pořadí pomocí tlačítek Nahoru nebo Dolů."
 
 #: src/printing.c:515
 msgid "The message will be printed with the following command:"
-msgstr ""
+msgstr "Tato zpráva bude vytisknuta následujícím příkazem:"
 
 #: src/printing.c:516
-#, fuzzy
 msgid "(Default print command)"
-msgstr "Provést"
+msgstr "(Výchozí tiskový příkaz)"
 
 #: src/printing.c:526
 #, c-format
@@ -6154,81 +5998,77 @@ msgid ""
 "`%s'"
 msgstr ""
 "Příkazová řádka pro tisk je neplatná:\n"
-"'%s'"
+"\"%s\""
 
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
-msgstr "Vytvářím dialog procesu...\n"
+msgstr "Vytváří se dialog procesu...\n"
 
 #: src/progressdialog.c:136
 msgid "Status"
 msgstr "Stav"
 
 #: src/query_search.c:423
-#, fuzzy
 msgid "_Save as search folder"
-msgstr "Vyhledání složky"
+msgstr "Uložit _jako složku hledání"
 
 #: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:910
 msgid "Done."
 msgstr "Hotovo."
 
 #: src/query_search.c:566
-#, fuzzy, c-format
+#, c-format
 msgid "Searching %s ..."
-msgstr "Prohledávám složku %s ..."
+msgstr "Prohledává se %s ..."
 
 #: src/query_search.c:594
-#, fuzzy, c-format
+#, c-format
 msgid "Searching %s (%d / %d)..."
-msgstr "Filtruji..."
+msgstr "Prohledává se·%s·(%d·/·%d)..."
 
 #: src/query_search.c:675 src/summaryview.c:2164
 msgid "(No Date)"
 msgstr "(Žádné datum)"
 
 #: src/query_search.c:869
-#, fuzzy
 msgid "Save as search folder"
-msgstr "Vyhledání složky"
+msgstr "Uložit jako složku hledání"
 
 #: src/query_search.c:890
-#, fuzzy
 msgid "Location:"
-msgstr "Přerušení akcí"
+msgstr "Umístění:"
 
 #: src/query_search.c:905
-#, fuzzy
 msgid "Folder name:"
-msgstr "Název souboru"
+msgstr "Název složky:"
 
 #: src/rfc2015.c:144
 msgid "Cannot find user ID for this key."
-msgstr "Nemohu najít ID uživatele pro tento klíč."
+msgstr "Pro tento klíč nelze vyhledat ID uživatele."
 
 #: src/rfc2015.c:156
-#, c-format
+#, fuzzy, c-format
 msgid "\t\taka \"%s\"\n"
-msgstr ""
+msgstr "\t\taka \"%s\"\n"
 
 #: src/rfc2015.c:184
 #, c-format
 msgid "Signature made at %s\n"
-msgstr "Podpis vyrobil %s\n"
+msgstr "Podpis vytvořen v %s\n"
 
 #: src/rfc2015.c:306 src/sigstatus.c:266
 msgid "Error verifying the signature"
-msgstr "Chyba při verifikaci podpisu"
+msgstr "Chyba při ověřování podpisu"
 
 #: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
-msgstr "Vyberte prosím klíč pro '%s'"
+msgstr "Vyberte prosím klíč pro \"%s\""
 
 #: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
-msgstr "Získávám info pro '%s'... %c"
+msgstr "Získávají se informace o \"%s\"... %c"
 
 #: src/select-keys.c:291
 msgid "Select Keys"
@@ -6248,11 +6088,12 @@ msgstr "Přidat klíč"
 
 #: src/select-keys.c:469
 msgid "Enter another user or key ID:"
-msgstr "Zadejte dalšího uživatele nebo klíčové ID:"
+msgstr "Zadejte dalšího uživatele nebo ID klíče:"
 
 #: src/select-keys.c:485
+#, fuzzy
 msgid "Trust key"
-msgstr ""
+msgstr "Důvěryhodný klíč"
 
 #: src/select-keys.c:486
 msgid ""
@@ -6261,55 +6102,58 @@ msgid ""
 "know for sure that it will go to the person you mean it to.\n"
 "Do you trust it enough to use it anyway?"
 msgstr ""
+"Zvolený klíč není zcela důvěryhodný. Pokud budete chtít šifrovat\n"
+"tuto zprávu s tímto klíčem, nebudete si moci být jisti, zda určený\n"
+"příjemce bude tou osobou, která zprávu skutečně dostane.\n"
+"Důvěřujete klíči natolik, aby mohl být i přesto použit?"
 
 #: src/send_message.c:184
 msgid "Queued message header is broken.\n"
-msgstr "Fronta hlaviček zpráv je poškozená.\n"
+msgstr "Hlavička pozdržené zprávy je poškozená.\n"
 
 #: src/send_message.c:403
-#, fuzzy, c-format
+#, c-format
 msgid "Sending message using command: %s\n"
-msgstr "Posílám zprávu (%d / %d bytů)"
+msgstr "Posílá se zpráva příkazem: %s\n"
 
 #: src/send_message.c:412
-#, fuzzy, c-format
+#, c-format
 msgid "Can't execute command: %s"
-msgstr "Nelze spustit externí příkaz: %s\n"
+msgstr "Nelze vykonat externí příkaz: %s"
 
 #: src/send_message.c:447
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while executing command: %s"
-msgstr "Během odesílání pošty se vyskytla chyba ."
+msgstr "Během odesílání pošty se vyskytla chyba: %s"
 
 #: src/send_message.c:564
 msgid "Connecting"
-msgstr "Připojení"
+msgstr "Připojování"
 
 #: src/send_message.c:566
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
-msgstr "Připojuji se na SMTP server: %s ..."
+msgstr "Připojování k serveru SMTP: %s ..."
 
 #: src/send_message.c:639
 msgid "Sending HELO..."
-msgstr "Posílám HELO..."
+msgstr "Posílá se HELO..."
 
 #: src/send_message.c:640 src/send_message.c:645 src/send_message.c:650
 msgid "Authenticating"
-msgstr "Autentizuji"
+msgstr "Autentizace"
 
 #: src/send_message.c:641 src/send_message.c:646
-#, fuzzy
 msgid "Sending message..."
-msgstr "Posílám zprávu"
+msgstr "Posílá se zpráva..."
 
 #: src/send_message.c:644
 msgid "Sending EHLO..."
-msgstr "Posílám EHLO..."
+msgstr "Posílá se EHLO..."
 
 #: src/send_message.c:653
 msgid "Sending MAIL FROM..."
-msgstr "Posílám MAIL FROM..."
+msgstr "Posílá se MAIL FROM..."
 
 #: src/send_message.c:654 src/send_message.c:658 src/send_message.c:663
 msgid "Sending"
@@ -6317,24 +6161,24 @@ msgstr "Odesílání"
 
 #: src/send_message.c:657
 msgid "Sending RCPT TO..."
-msgstr "Posílám RCPT TO..."
+msgstr "Posílá se RCPT TO..."
 
 #: src/send_message.c:662
 msgid "Sending DATA..."
-msgstr "Posílám DATA..."
+msgstr "Posílá se DATA..."
 
 #: src/send_message.c:666
 msgid "Quitting..."
-msgstr "Ukončuji..."
+msgstr "Ukončování..."
 
 #: src/send_message.c:694
 #, c-format
 msgid "Sending message (%d / %d bytes)"
-msgstr "Posílám zprávu (%d / %d bytů)"
+msgstr "Posílá se zpráva (%d / %d bajtů)"
 
 #: src/send_message.c:725
 msgid "Sending message"
-msgstr "Posílám zprávu"
+msgstr "Posílá se zpráva"
 
 #: src/send_message.c:769 src/send_message.c:789
 msgid "Error occurred while sending the message."
@@ -6354,23 +6198,20 @@ msgid "Mailbox setting"
 msgstr "Nastavení poštovní schránky"
 
 #: src/setup.c:44
-#, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
 "If you are unsure, just select OK."
 msgstr ""
-"Zadejte umístění pro poštovní schránku.\n"
-"Pokud je zadán existující, bude automaticky\n"
-"prohledán."
+"Zadejte umístění poštovní schránky.\n"
+"Pokud si nejste jisti, jednoduše zvolte Budiž."
 
 #: src/sigstatus.c:116
-#, fuzzy
 msgid "Signature check result"
-msgstr "Zobrazit výsledek testování podpisu v popup okně"
+msgstr "Zobrazit výsledek ověřování podpisu"
 
 #: src/sigstatus.c:135
 msgid "Checking signature"
-msgstr "Zkontrolovat podpis"
+msgstr "Kontrola podpisu"
 
 #: src/sigstatus.c:205
 #, c-format
@@ -6393,39 +6234,38 @@ msgstr "Správný podpis"
 #: src/sigstatus.c:241
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
-msgstr ""
+msgstr "Platný podpis, ale klíč·\"%s\"·není důvěryhodný"
 
 #: src/sigstatus.c:242 src/textview.c:766
 msgid "Valid signature (untrusted key)"
-msgstr ""
+msgstr "Platný podpis (nedůvěryhodný klíč)"
 
 #: src/sigstatus.c:247
 #, c-format
 msgid "Signature valid but expired for \"%s\""
-msgstr ""
+msgstr "Platný podpis, ale vypršela platnost \"%s\""
 
 #: src/sigstatus.c:248
-#, fuzzy
 msgid "Signature valid but expired"
-msgstr "Podpis vyrobil %s\n"
+msgstr "Platný podpis, ale již vypršel"
 
 #: src/sigstatus.c:251
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
-msgstr ""
+msgstr "Platný podpis, ale podepisujícímu klíči \"%s\"·vypršela platnost"
 
 #: src/sigstatus.c:252
 msgid "Signature valid but the signing key has expired"
-msgstr ""
+msgstr "Platný podpis, ale podepisujícímu klíči vypršela platnost"
 
 #: src/sigstatus.c:255
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
-msgstr ""
+msgstr "Platný podpis, ale podepisující klíč pro \"%s\" byl odvolán"
 
 #: src/sigstatus.c:256
 msgid "Signature valid but the signing key has been revoked"
-msgstr ""
+msgstr "Platný podpis, ale podepisující klíč byl odvolán"
 
 #: src/sigstatus.c:259
 #, c-format
@@ -6438,11 +6278,11 @@ msgstr "ŠPATNÝ podpis"
 
 #: src/sigstatus.c:263
 msgid "No public key to verify the signature"
-msgstr "Nelze najít veřejný klíč pro podpis"
+msgstr "Nelze vyhledat veřejný klíč k ověření podpisu"
 
 #: src/sourcewindow.c:65
 msgid "Creating source window...\n"
-msgstr "Vytvářím zdrojové okno...\n"
+msgstr "Vytváří se okno se zdrojem...\n"
 
 #: src/sourcewindow.c:69
 msgid "Source of the message"
@@ -6451,17 +6291,16 @@ msgstr "Zdroj zprávy"
 #: src/sourcewindow.c:146
 #, c-format
 msgid "Displaying the source of %s ...\n"
-msgstr "Zobrazuji zdroj pro %s ...\n"
+msgstr "Zobrazování zdroje %s...\n"
 
 #: src/sourcewindow.c:148
 #, c-format
 msgid "%s - Source"
-msgstr "%s - Zdroj"
+msgstr "%s - Zdroj zprávy"
 
 #: src/sslmanager.c:59
-#, fuzzy
 msgid "SSL certificate verify failed"
-msgstr "SSL spojení selhalo"
+msgstr "Ověřování certifikátu SSL selhalo"
 
 #: src/sslmanager.c:65
 #, c-format
@@ -6475,22 +6314,30 @@ msgid ""
 "\n"
 "Do you accept this certificate?"
 msgstr ""
+"Certifikát SSL %s nemůže být ověřen z následujícího důvodu:\n"
+"  %s\n"
+"\n"
+"Server·certificate:\n"
+"  Subject:·%s\n"
+"  Issuer:·%s\n"
+"\n"
+"Přijmete tento certifikát?"
 
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
-msgstr "Připojit diskuzní skupinu"
+msgstr "Odebírat diskusní skupinu"
 
 #: src/subscribedialog.c:219
 msgid "Select newsgroups to subscribe."
-msgstr "Vybere diskuzní skupinu pro přihlášení."
+msgstr "Vybrat diskusní skupiny k odběru."
 
 #: src/subscribedialog.c:225
 msgid "Find groups:"
-msgstr "Najít skupiny:"
+msgstr "Vyhledat skupiny:"
 
 #: src/subscribedialog.c:233
 msgid " Search "
-msgstr " Vyhledat "
+msgstr " Hledat "
 
 #: src/subscribedialog.c:283
 msgid "Newsgroup name"
@@ -6502,7 +6349,7 @@ msgstr "Zprávy"
 
 #: src/subscribedialog.c:426
 msgid "moderated"
-msgstr "moderovaný"
+msgstr "moderovaná"
 
 #: src/subscribedialog.c:428
 msgid "readonly"
@@ -6510,21 +6357,20 @@ msgstr "pouze pro čtení"
 
 #: src/subscribedialog.c:430
 msgid "unknown"
-msgstr "neznámý"
+msgstr "neznámá"
 
 #: src/subscribedialog.c:481
-#, fuzzy
 msgid "Getting newsgroup list..."
-msgstr "vymazávám diskusní skupinu %s ...\n"
+msgstr "Přijímá se seznam diskusních skupin..."
 
 #: src/subscribedialog.c:489
 msgid "Can't retrieve newsgroup list."
-msgstr "Nemohu načíst seznam diskuzních skupin."
+msgstr "Nelze načíst seznam diskusních skupin."
 
 #: src/subscribedialog.c:556
 #, c-format
 msgid "%d newsgroups received (%s read)"
-msgstr "%d diskuzních skupin přijato (%s čteno)"
+msgstr "%d diskusních skupin přijato (%s přečteno)"
 
 #: src/summaryview.c:419
 msgid "/Repl_y to"
@@ -6532,15 +6378,15 @@ msgstr "/Odpovědět _komu"
 
 #: src/summaryview.c:420
 msgid "/Repl_y to/_all"
-msgstr "/Odpovědět _komu/_všem"
+msgstr "/Odpovědět _komu/_Všem"
 
 #: src/summaryview.c:421
 msgid "/Repl_y to/_sender"
-msgstr "/Odpovědět _komu/_odesílateli"
+msgstr "/Odpovědět _komu/_Odesílateli"
 
 #: src/summaryview.c:422
 msgid "/Repl_y to/mailing _list"
-msgstr "/Odpovědět _komu/do _diskusního listu"
+msgstr "/Odpovědět _komu/Do _elektronické konference"
 
 #: src/summaryview.c:429
 msgid "/M_ove..."
@@ -6548,11 +6394,11 @@ msgstr "/_Přesunout..."
 
 #: src/summaryview.c:430
 msgid "/_Copy..."
-msgstr "/_Kopírovat..."
+msgstr "/Kopí_rovat..."
 
 #: src/summaryview.c:432
 msgid "/_Mark"
-msgstr "/_Označit"
+msgstr "/Označ_it"
 
 #: src/summaryview.c:433
 msgid "/_Mark/_Mark"
@@ -6568,16 +6414,15 @@ msgstr "/_Označit/---"
 
 #: src/summaryview.c:436
 msgid "/_Mark/Mark as unr_ead"
-msgstr "/_Označit/Označit jak_o nepřečtené"
+msgstr "/_Označit/Označit jako _nepřečtené"
 
 #: src/summaryview.c:437
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Označit/Označit jako př_ečtené"
 
 #: src/summaryview.c:439
-#, fuzzy
 msgid "/_Mark/Mark _thread as read"
-msgstr "/_Označit/Označit jako př_ečtené"
+msgstr "/_Označit/Označit _vlákno jako přečtené"
 
 #: src/summaryview.c:441
 msgid "/_Mark/Mark all _read"
@@ -6585,26 +6430,23 @@ msgstr "/_Označit/Označit všechny jako _přečtené"
 
 #: src/summaryview.c:442
 msgid "/Color la_bel"
-msgstr "/_Barevné označení"
+msgstr "/_Barevné návěští"
 
 #: src/summaryview.c:446
-#, fuzzy
 msgid "/Set as _junk mail"
-msgstr "Nastavit jako výchozí"
+msgstr "/Označit jako _nevyžádanou poštu"
 
 #: src/summaryview.c:447
-#, fuzzy
 msgid "/Set as not j_unk mail"
-msgstr "Nastavit jako výchozí"
+msgstr "/Označit jako vyžádanou po_štu"
 
 #: src/summaryview.c:449
 msgid "/Re-_edit"
 msgstr "/Z_novu upravit"
 
 #: src/summaryview.c:451
-#, fuzzy
 msgid "/Add sender to address boo_k..."
-msgstr "/Přidat odesílatele do data_báze adres"
+msgstr "/Přidat odesílatele do adresá_ře..."
 
 #: src/summaryview.c:453
 msgid "/Create f_ilter rule"
@@ -6616,42 +6458,39 @@ msgstr "/_Vytvořit filtr/_Automaticky"
 
 #: src/summaryview.c:456
 msgid "/Create f_ilter rule/by _From"
-msgstr "/_Vytvořit filtr/podle _Od"
+msgstr "/_Vytvořit filtr/Podle _odesílatele"
 
 #: src/summaryview.c:458
 msgid "/Create f_ilter rule/by _To"
-msgstr "/_Vytvořit filtr/podle _Komu"
+msgstr "/_Vytvořit filtr/Podle pří_jemce"
 
 #: src/summaryview.c:460
 msgid "/Create f_ilter rule/by _Subject"
-msgstr "/_Vytvořit filtr/podle _Předmětu"
+msgstr "/_Vytvořit filtr/Podle _předmětu"
 
 #: src/summaryview.c:504
 msgid "Creating summary view...\n"
-msgstr "Vytvářím celkový pohled...\n"
+msgstr "Vytváří se souhrnný pohled...\n"
 
 #: src/summaryview.c:526
 msgid "All"
-msgstr ""
+msgstr "Vše"
 
 #: src/summaryview.c:529
-#, fuzzy
 msgid "Have color label"
-msgstr "/_Barevné označení"
+msgstr "S barevným návěštím"
 
 #: src/summaryview.c:530
-#, fuzzy
 msgid "Have attachment"
-msgstr "Příloha"
+msgstr "S přílohou"
 
 #: src/summaryview.c:539
-#, fuzzy
 msgid "Search:"
-msgstr "Vyhledat"
+msgstr "Vyhledat:"
 
 #: src/summaryview.c:557
 msgid "Search for Subject or From"
-msgstr ""
+msgstr "Hledat předmět nebo odesílatele"
 
 #: src/summaryview.c:762
 msgid "Process mark"
@@ -6664,12 +6503,11 @@ msgstr "Zbyly nějaké označené. Zpracovat je?"
 #: src/summaryview.c:809
 #, c-format
 msgid "Scanning folder (%s)..."
-msgstr "Prohledávám složku (%s)..."
+msgstr "Prohledává se složka (%s)..."
 
 #: src/summaryview.c:1391
-#, fuzzy
 msgid "_Search again"
-msgstr "Hledat znova"
+msgstr "Hledat znovu"
 
 #: src/summaryview.c:1412 src/summaryview.c:1421
 msgid "No more unread messages"
@@ -6685,7 +6523,7 @@ msgstr "Žádné nepřečtené zprávy."
 
 #: src/summaryview.c:1422
 msgid "No unread message found. Go to next folder?"
-msgstr "Nebyla nalezena žádná nepřečtená zpráva. Chcete jít do další složky?"
+msgstr "Nebyla nalezena žádná nepřečtená zpráva. Přejít do další složky?"
 
 #: src/summaryview.c:1430 src/summaryview.c:1439
 msgid "No more new messages"
@@ -6701,7 +6539,7 @@ msgstr "Žádné nové zprávy."
 
 #: src/summaryview.c:1440
 msgid "No new message found. Go to next folder?"
-msgstr "Nebyla nalezena žádná nová zpráva. Chcete jít do další složky?"
+msgstr "Nebyla nalezena žádná nová zpráva. Přejít do další složky?"
 
 #: src/summaryview.c:1448 src/summaryview.c:1457
 msgid "No more marked messages"
@@ -6709,15 +6547,15 @@ msgstr "Nejsou již žádné označené zprávy"
 
 #: src/summaryview.c:1449
 msgid "No marked message found. Search from the end?"
-msgstr "Nebyla nalezena žádná nepřečtená zpráva. Hledat od konce?"
+msgstr "Nebyla nalezena žádná označená zpráva. Hledat od konce?"
 
 #: src/summaryview.c:1451 src/summaryview.c:1460
 msgid "No marked messages."
-msgstr "Žádná neoznačená zpráva."
+msgstr "Žádná označená zpráva."
 
 #: src/summaryview.c:1458
 msgid "No marked message found. Search from the beginning?"
-msgstr "Nebyla nalezena žádná neoznačená zpráva. Hledat od začátku?"
+msgstr "Nebyla nalezena žádná označená zpráva. Hledat od začátku?"
 
 #: src/summaryview.c:1466 src/summaryview.c:1475
 msgid "No more labeled messages"
@@ -6737,7 +6575,7 @@ msgstr "Nenalezena žádná zpráva s návěštím. Hledat od začátku?"
 
 #: src/summaryview.c:1792
 msgid "Attracting messages by subject..."
-msgstr "Získávám zprávy od osoby..."
+msgstr "Získávají se zprávy s předmětem..."
 
 #: src/summaryview.c:1986
 #, c-format
@@ -6760,12 +6598,12 @@ msgstr "%s %d zkopírováno"
 
 #: src/summaryview.c:2010
 msgid " item(s) selected"
-msgstr " položky(ek) vybrány"
+msgstr " položek vybráno"
 
 #: src/summaryview.c:2032
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
-msgstr "%d nová(é), %d nepřečtená(é), celkem %d (%s)"
+msgstr "%d nových, %d nepřečtených, celkem %d (%s)"
 
 #: src/summaryview.c:2036
 #, c-format
@@ -6778,16 +6616,16 @@ msgstr "Celkové setřídění..."
 
 #: src/summaryview.c:2322
 msgid "\tSetting summary from message data..."
-msgstr "\tNastavuji přehled z dat zpráv..."
+msgstr "\tNastavování přehledu z dat zpráv..."
 
 #: src/summaryview.c:2324
 msgid "Setting summary from message data..."
-msgstr "Nastavuji přehled z dat zpráv..."
+msgstr "Nastavování přehledu z dat zpráv..."
 
 #: src/summaryview.c:2431
 #, c-format
 msgid "Writing summary cache (%s)..."
-msgstr "Zapisuji celkovou mezipaměť (%s)..."
+msgstr "Zapisování mezipaměti souhrnu (%s)..."
 
 #: src/summaryview.c:2779
 #, c-format
@@ -6811,20 +6649,20 @@ msgstr "Zpráva %s/%d je nastavena ke smazání\n"
 
 #: src/summaryview.c:3126
 msgid "Delete message(s)"
-msgstr "Smazat zprávu(y)"
+msgstr "Smazat zprávy"
 
 #: src/summaryview.c:3127
 msgid "Do you really want to delete message(s) from the trash?"
-msgstr "Opravdu chcete smazat tuto zprávu(y) z koše?"
+msgstr "Opravdu chcete vymazat tyto zprávy z koše?"
 
 #: src/summaryview.c:3201
 msgid "Deleting duplicated messages..."
-msgstr "Vymazávám duplikované zprávy..."
+msgstr "Vymazávání duplikovaných zpráv..."
 
 #: src/summaryview.c:3239
 #, c-format
 msgid "Message %s/%d is unmarked\n"
-msgstr "Zpráva %s/%d je odznačena\n"
+msgstr "Zpráva %s/%d má zrušeno označení\n"
 
 #: src/summaryview.c:3299
 #, c-format
@@ -6838,96 +6676,90 @@ msgstr "Cílová položka je stejná jako aktuální složka."
 #: src/summaryview.c:3397
 #, c-format
 msgid "Message %d is set to copy to %s\n"
-msgstr "Zpráva %d je nastavena pro kopírování do %s\n"
+msgstr "Zpráva %d je nastavena ke zkopírování do %s\n"
 
 #: src/summaryview.c:3428
-#, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cíl kopírování je stejný jako aktuální složka."
 
 #: src/summaryview.c:3610
-#, fuzzy
 msgid "Error occurred while processing messages."
-msgstr "Během zpracovávání pošty se vyskytla chyba ."
+msgstr "Během zpracovávání pošty se vyskytla chyba."
 
 #: src/summaryview.c:3916 src/summaryview.c:3917
 msgid "Building threads..."
-msgstr "Vytvářím vlákna..."
+msgstr "Vytváří se vlákna..."
 
 #: src/summaryview.c:4067 src/summaryview.c:4068
 msgid "Unthreading..."
-msgstr "Ruším vlákna..."
+msgstr "Ruší se vlákna..."
 
 #: src/summaryview.c:4361 src/summaryview.c:4422
-#, fuzzy, c-format
+#, c-format
 msgid "Filtering (%d / %d)..."
-msgstr "Filtruji..."
+msgstr "Filtrování (%d·/·%d)..."
 
 #: src/summaryview.c:4476
 msgid "filtering..."
-msgstr "filtruji..."
+msgstr "filtrování..."
 
 #: src/summaryview.c:4477
 msgid "Filtering..."
-msgstr "Filtruji..."
+msgstr "Filtrování..."
 
 #: src/summaryview.c:4514
-#, fuzzy, c-format
+#, c-format
 msgid "%d message(s) have been filtered."
-msgstr "Zpráva %d už byla v mezipaměti.\n"
+msgstr "%d zpráv bylo filtrováno."
 
 #: src/summaryview.c:5021
 msgid "No."
-msgstr "Čís."
+msgstr "Č."
 
 #: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
-msgstr "soubor '%s' už existuje\n"
+msgstr "soubor %s už existuje\n"
 
 #: src/textview.c:249
 msgid "Creating text view...\n"
-msgstr "Vytvářím zobrazení textu...\n"
+msgstr "Vytváří se zobrazení textu...\n"
 
 #: src/textview.c:820
-#, fuzzy
 msgid "This message can't be displayed.\n"
-msgstr "zpráva nebyla přijata\n"
+msgstr "Tato zpráva nemůže být zobrazena.\n"
 
 #: src/textview.c:844
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
+"Tělo zprávy nemohlo být zobrazeno z důvodu selhání zápisu do dočasného "
+"souboru.\n"
 
 #: src/textview.c:1986
-#, fuzzy
 msgid "Sa_ve this image as..."
-msgstr "/_Uložit jako..."
+msgstr "Uložit o_brázek jako..."
 
 #: src/textview.c:2002 src/trayicon.c:158
-#, fuzzy
 msgid "Compose _new message"
-msgstr "Vytváří novou zprávu"
+msgstr "Napsat novou _zprávu"
 
 #: src/textview.c:2004
-#, fuzzy
 msgid "Add to address _book..."
-msgstr "/Přidat odesílatele do data_báze adres"
+msgstr "Přidat do _adresáře..."
 
 #: src/textview.c:2006
-#, fuzzy
 msgid "Copy this add_ress"
-msgstr "Společná adresa"
+msgstr "Kopí_rovat tuto adresu"
 
 #: src/textview.c:2009
-#, fuzzy
 msgid "_Open with Web browser"
-msgstr "Webový prohlížeč"
+msgstr "Otevřít internetovým prohlížečem"
 
 #: src/textview.c:2011
 msgid "Copy this _link"
-msgstr ""
+msgstr "Kopírovat _tento odkaz"
 
 #: src/textview.c:2154
 #, c-format
@@ -6937,1092 +6769,38 @@ msgid ""
 "\n"
 "Open it anyway?"
 msgstr ""
+"Skutečná adresa (%s) je rozdílná oproti\n"
+"zobrazené (%s).\n"
+"\n"
+"Přesto otevřít?"
 
 #: src/textview.c:2159
 msgid "Fake URL warning"
-msgstr ""
+msgstr "Varování - podvržená adresa"
 
 #: src/trayicon.c:139
-#, fuzzy
 msgid "_Display Sylpheed"
-msgstr "Starý Sylpheed"
+msgstr "_Zobrazit Sylpheed"
 
 #: src/trayicon.c:144
-#, fuzzy
 msgid "Get from _current account"
-msgstr "/_Zpráva/Přijmout _ze všech účtů"
+msgstr "Přijmout z _aktuálního účtu"
 
 #: src/trayicon.c:148
-#, fuzzy
 msgid "Get from _all accounts"
-msgstr "/_Zpráva/Přijmout _ze všech účtů"
+msgstr "Přijmout z_e všech účtů"
 
 #: src/trayicon.c:152
-#, fuzzy
 msgid "_Send queued messages"
-msgstr "Odešle pozdrženou zprávu(y)"
+msgstr "Odeslat pozdržené z_právy"
 
 #: src/trayicon.c:164
-#, fuzzy
 msgid "E_xit"
-msgstr "Ukončení programu"
+msgstr "Ukonči_t"
 
 #: src/trayicon.c:198 src/trayicon.c:289
-#, fuzzy
 msgid "Sylpheed"
-msgstr "Starý Sylpheed"
-
-#~ msgid ""
-#~ "Select items to be displayed on the summary view. You can modify\n"
-#~ "the order by using the Up / Down button, or dragging the items."
-#~ msgstr ""
-#~ "Vyberte položky, které chcete zobrazit v celkovém pohledu. Můžete změnit\n"
-#~ "pořadí pomocí tlačítek Nahoru / Dolů nebo přetažením položek."
-
-#~ msgid "/_Tools/E_xecute"
-#~ msgstr "/_Nástroje/S_pustit"
-
-#~ msgid "Account setting"
-#~ msgstr "Nastavení účtu"
-
-#~ msgid "SSL connect failed (%s)\n"
-#~ msgstr "SSL spojení selhalo (%s)\n"
-
-#, fuzzy
-#~ msgid "_About"
-#~ msgstr "O aplikaci"
-
-#, fuzzy
-#~ msgid "/_View/Show all _headers"
-#~ msgstr "/Z_obrazit/Zobrazit všechna zá_hlaví"
-
-#~ msgid "/_View/_Source"
-#~ msgstr "/_Zobrazit/_Zdroj"
-
-#~ msgid "Last number in dir %s = %d\n"
-#~ msgstr "Poslední počet v adresáři %s = %d\n"
-
-#~ msgid "MIME viewer command line is invalid: `%s'"
-#~ msgstr "Neplatná příkazová řádka prohlížeče MIME: '%s'"
-
-#~ msgid "%dB"
-#~ msgstr "%dB"
-
-#~ msgid "%.1fKB"
-#~ msgstr "%.1fKB"
-
-#~ msgid "%.2fMB"
-#~ msgstr "%.2fMB"
-
-#~ msgid "%.2fGB"
-#~ msgstr "%.2fGB"
-
-#~ msgid "Wrap before sending"
-#~ msgstr "Zalomit před odesláním"
-
-#~ msgid "Insert signature"
-#~ msgstr "Vloží podpis"
-
-#~ msgid "can't retrieve newsgroup list\n"
-#~ msgstr "Nemohu načíst seznam diskuzních skupin\n"
-
-#, fuzzy
-#~ msgid "%s - Search folder properties"
-#~ msgstr "Vlastnosti složky"
-
-#~ msgid "Body:"
-#~ msgstr "Tělo:"
-
-#~ msgid "Beginning of list reached; continue from end?"
-#~ msgstr "Dosažen začátek seznamu, pokračovat od konce?"
-
-#~ msgid "End of list reached; continue from beginning?"
-#~ msgstr "Dosažen konec seznamu, pokračovat od začátku?"
-
-#, fuzzy
-#~ msgid "Outgoing encoding"
-#~ msgstr "Výstupní znaková sada"
-
-#~ msgid "Quote"
-#~ msgstr "Citování"
-
-#~ msgid "Font"
-#~ msgstr "Písmo"
-
-#~ msgid " [Edited]"
-#~ msgstr " [Upraveno]"
-
-#, fuzzy
-#~ msgid "Fallback encoding"
-#~ msgstr "Výstupní znaková sada"
-
-#~ msgid "Terminated process group id: %d"
-#~ msgstr "Přerušen proces číslo: %d"
-
-#~ msgid "Temporary file: %s"
-#~ msgstr "Dočasný soubor: %s"
-
-#~ msgid "Compose: input from monitoring process\n"
-#~ msgstr "Psaní: vstup z externího procesu\n"
-
-#~ msgid "Couldn't exec external editor\n"
-#~ msgstr "Nelze spustit externí editor\n"
-
-#~ msgid "Couldn't write to file\n"
-#~ msgstr "Nelze zapisovat do souboru\n"
-
-#~ msgid "Pipe read failed\n"
-#~ msgstr "Nelze číst\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Filtered messages will be moved to the junk folder and deleted from the "
-#~ "server."
-#~ msgstr "(Nefiltrované zprávy budou uloženy v této složce)"
-
-#~ msgid ""
-#~ "Enter the print command line:\n"
-#~ "(`%s' will be replaced with file name)"
-#~ msgstr ""
-#~ "Vložte příkazovou řádku pro tisk:\n"
-#~ "('%s' bude nahrazeno jménem souboru)"
-
-#~ msgid ""
-#~ "First, you have to set the location of mailbox.\n"
-#~ "You can use existing mailbox in MH format\n"
-#~ "if you have the one.\n"
-#~ "If you're not sure, just select OK."
-#~ msgstr ""
-#~ "Nejprve nastavte umístění poštovní schránky.\n"
-#~ "Pokud již nějakou máte, můžete použít\n"
-#~ "poštovní schránku v MH formátu.\n"
-#~ "Pokud si nejste jisti, stiskněte pouze OK."
-
-#~ msgid ""
-#~ "Select the preset of key bindings.\n"
-#~ "You can also modify each menu's shortcuts by pressing\n"
-#~ "any key(s) when placing the mouse pointer on the item."
-#~ msgstr ""
-#~ "Vyberte klávesové zkratky.\n"
-#~ "Klávesovou zkratku pro nabídku můžete také změnit tak,\n"
-#~ "že při najetí myší na položku stisknete odpovídající klávesu."
-
-#~ msgid "Compose message%s"
-#~ msgstr "Psaní zprávy%s"
-
-#~ msgid "Translate header name (such as `From:', `Subject:')"
-#~ msgstr "Překládat názvy záhlaví (jako například 'Od:', 'Předmět:')"
-
-#~ msgid "Font selection"
-#~ msgstr "Výběr písma"
-
-#, fuzzy
-#~ msgid "Empty messages in all trash?"
-#~ msgstr "Vyprázdnit všechny zprávy v koši?"
-
-#~ msgid "Yes"
-#~ msgstr "Ano"
-
-#~ msgid "+No"
-#~ msgstr "+Ne"
-
-#~ msgid "Discard message"
-#~ msgstr "Zrušit zprávu"
-
-#~ msgid "Discard"
-#~ msgstr "Stornovat"
-
-#~ msgid "to Draft"
-#~ msgstr "Uložit jako koncept"
-
-#~ msgid "can't write headers\n"
-#~ msgstr "nelze zapsat záhlaví\n"
-
-#~ msgid "External program"
-#~ msgstr "Externí program"
-
-#~ msgid "Local spool"
-#~ msgstr "Místní spool"
-
-#~ msgid "Sending queued message %d failed.\n"
-#~ msgstr "Neúspěšné poslání zprávy %d z fronty.\n"
-
-#~ msgid "Backward search"
-#~ msgstr "Hledat nazpět"
-
-#~ msgid "Select all matched"
-#~ msgstr "Vybrat všechny označené"
-
-#~ msgid "M"
-#~ msgstr "M"
-
-#~ msgid "U"
-#~ msgstr "U"
-
-#~ msgid "Selecting all messages..."
-#~ msgstr "Vybírám všechny zprávy..."
-
-#~ msgid "Unthreading for execution..."
-#~ msgstr "Ruším vlákna..."
-
-#~ msgid "/_Edit/A_dvanced"
-#~ msgstr "/Úp_ravy/_Rozšířené"
-
-#~ msgid "/_Edit/A_dvanced/Move a character backward"
-#~ msgstr "/Úp_ravy/_Rozšířené/Přesun o znak zpět"
-
-#~ msgid "/_Edit/A_dvanced/Move a character forward"
-#~ msgstr "/Úp_ravy/_Rozšířené/Přesun o znak dále"
-
-#~ msgid "/_Edit/A_dvanced/Move a word backward"
-#~ msgstr "/Úp_ravy/_Rozšířené/Přesun o slovo zpět"
-
-#~ msgid "/_Edit/A_dvanced/Move a word forward"
-#~ msgstr "/Úp_ravy/_Rozšířené/Přesun o slov dále"
-
-#~ msgid "/_Edit/A_dvanced/Move to beginning of line"
-#~ msgstr "/Úp_ravy/_Rozšířené/Přesun na začátek řádku"
-
-#~ msgid "/_Edit/A_dvanced/Move to end of line"
-#~ msgstr "/Úp_ravy/_Rozšířené/Přesun na konec řádku"
-
-#~ msgid "/_Edit/A_dvanced/Move to previous line"
-#~ msgstr "/Úp_ravy/_Rozšířené/Přesun na předchozí řádek"
-
-#~ msgid "/_Edit/A_dvanced/Move to next line"
-#~ msgstr "/Úp_ravy/_Rozšířené/Přesun na další řádek"
-
-#~ msgid "/_Edit/A_dvanced/Delete a character backward"
-#~ msgstr "/Úp_ravy/_Rozšířené/Smazat znak zpět"
-
-#~ msgid "/_Edit/A_dvanced/Delete a character forward"
-#~ msgstr "/Úp_ravy/_Rozšířené/Smazat znak vpředu"
-
-#~ msgid "/_Edit/A_dvanced/Delete a word backward"
-#~ msgstr "/Úp_ravy/_Rozšířené/Smazat slovo zpět"
-
-#~ msgid "/_Edit/A_dvanced/Delete a word forward"
-#~ msgstr "/Úp_ravy/_Rozšířené/Smazat slovo vpředu"
-
-#~ msgid "/_Edit/A_dvanced/Delete line"
-#~ msgstr "/Úp_ravy/_Rozšířené/Smazat řádek"
-
-#~ msgid "/_Edit/A_dvanced/Delete to end of line"
-#~ msgstr "/Úp_ravy/_Rozšířené/Smazat do konce řádku"
-
-#~ msgid "Rebuilding all folder trees..."
-#~ msgstr "Provádím obnovu stromu složek..."
-
-#~ msgid "/_View/_Code set/---"
-#~ msgstr "/Z_obrazit/_Znaková sada/---"
-
-#~ msgid "/_View/_Code set"
-#~ msgstr "/Z_obrazit/_Znaková sada"
-
-#~ msgid "To save this part, pop up the context menu with "
-#~ msgstr "Pro uložení této části vyvolejte kontextovou nabídku pomocí "
-
-#~ msgid "right click and select `Save as...', "
-#~ msgstr "pravého tlačítka myši a zvolte 'Uložit jako...' "
-
-#~ msgid "To display this part as a text message, select "
-#~ msgstr "K zobrazení této části jako textové zprávy vyberte "
-
-#~ msgid ""
-#~ "`Display as text', or press `t' key.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "'Zobrazit jako text', nebo stiskněte klávesu 't'.\n"
-#~ "\n"
-
-#~ msgid "To open this part with external program, select "
-#~ msgstr "K otevření této části pomocí externího programu vyberte "
-
-#~ msgid "`Open' or `Open with...', "
-#~ msgstr "'Otevřít' nebo 'Otevřít čím...', "
-
-#~ msgid "or double-click, or click the center button, "
-#~ msgstr "nebo poklepejte dvakrát či klepněte na střední tlačítko, "
-
-#~ msgid "or press `l' key."
-#~ msgstr "nebo stiskněte klávesu 'I'."
-
-#~ msgid "To check it, pop up the context menu with\n"
-#~ msgstr "Pro zkontrolování vyvolejte kontextovou nabídku pomocí\n"
-
-#~ msgid "right click and select `Check signature'.\n"
-#~ msgstr "pravého tlačítka myši a zvolte 'Zkontrolovat podpis'.\n"
-
-#, fuzzy
-#~ msgid "Top"
-#~ msgstr "Komu:"
-
-#, fuzzy
-#~ msgid "Copy"
-#~ msgstr "/_Kopírovat..."
-
-#~ msgid "OK"
-#~ msgstr "OK"
-
-#~ msgid "Close"
-#~ msgstr "Zavřít"
-
-#~ msgid "Cancel"
-#~ msgstr "Zrušit"
-
-#~ msgid "No"
-#~ msgstr "Ne"
-
-#~ msgid "Refresh"
-#~ msgstr "Obnovit"
-
-#~ msgid "Apply"
-#~ msgstr "Použít"
-
-#~ msgid "Oops: Signature not verified"
-#~ msgstr "Oops: Podpis není verifikován"
-
-#~ msgid "Different results for signatures"
-#~ msgstr "Různé výsledky pro podpisy"
-
-#~ msgid "Error: Unknown status"
-#~ msgstr "Chyba: Neznámý status"
-
-#~ msgid "                aka \"%s\"\n"
-#~ msgstr "                alias \"%s\"\n"
-
-#~ msgid "Key fingerprint: %s\n"
-#~ msgstr "Key fingerprint: %s\n"
-
-#~ msgid "Found label: %s\n"
-#~ msgstr "Nalezeno návěští: %s\n"
-
-#~ msgid "Reading configuration...\n"
-#~ msgstr "Načítám konfiguraci..\n"
-
-#~ msgid "Finished reading configuration.\n"
-#~ msgstr "Načítání konfigurace dokončeno.\n"
-
-#~ msgid "Leave space on head"
-#~ msgstr "Vynechat prázdné místo v záhlaví"
-
-#~ msgid "Abcdef"
-#~ msgstr "Abcdef"
-
-#~ msgid "Can't open file %s\n"
-#~ msgstr "Nelze otevřít soubor %s\n"
-
-#~ msgid "POP3 (normal)"
-#~ msgstr "POP3 (normální)"
-
-#~ msgid "POP3 (APOP auth)"
-#~ msgstr "POP3 (APOP auth)"
-
-#~ msgid "/Remove _mailbox"
-#~ msgstr "/Odebrat _poštovní schránku"
-
-#~ msgid "/Remove _IMAP4 account"
-#~ msgstr "/Odebrat _IMAP4 účet"
-
-#~ msgid "/Remove _news account"
-#~ msgstr "/S_mazat účet pro diskusní skupinu"
-
-#~ msgid "/_Message/_Send"
-#~ msgstr "/_Zpráva/_Poslat"
-
-#~ msgid "/_Message/Si_gn"
-#~ msgstr "/_Zpráva/Po_depsat"
-
-#~ msgid "no messages in local mailbox.\n"
-#~ msgstr "Žádné zprávy v místní poštovní schránce.\n"
-
-#, fuzzy
-#~ msgid "Select..."
-#~ msgstr " Vybrat... "
-
-#~ msgid "Condition"
-#~ msgstr "Podmínka"
-
-#~ msgid "Keyword"
-#~ msgstr "Klíčové slovo"
-
-#~ msgid "Destination"
-#~ msgstr "Místo určení"
-
-#~ msgid "Use regex"
-#~ msgstr "Použít regulární výraz "
-
-#~ msgid "Registered rules"
-#~ msgstr "Registrovaná pravidla"
-
-#~ msgid "(none)"
-#~ msgstr "(žádný)"
-
-#~ msgid "Entry not saved"
-#~ msgstr "Neuložený záznam."
-
-#~ msgid "The entry was not saved. Close anyway?"
-#~ msgstr "Záznam nebyl uložen. Chcete přesto okno zavřít?"
-
-#~ msgid "Open URI command line is invalid: `%s'"
-#~ msgstr "Neplatný příkazový řádek URI: '%s'"
-
-#~ msgid "Cache data is corrupted\n"
-#~ msgstr "Data v mezipaměti jsou porušena\n"
-
-#~ msgid "Queueing"
-#~ msgstr "Zařazuji"
-
-#~ msgid ""
-#~ "Error occurred while sending the message.\n"
-#~ "Put this message into queue folder?"
-#~ msgstr ""
-#~ "Při odesílání zprávy nastala chyba.\n"
-#~ "Chcete zprávu zařadit do výstupní fronty?"
-
-#~ msgid "Queue messages that fail to send"
-#~ msgstr "Zprávy, které se nepodařilo odeslat, zařadit do fronty"
-
-#~ msgid "/E_xecute"
-#~ msgstr "/S_pustit"
-
-#~ msgid "/Select _all"
-#~ msgstr "/Vybrat _vše"
-
-#~ msgid "/Select t_hread"
-#~ msgstr "/Vybrat _vlákno"
-
-#~ msgid "can't set group: %s\n"
-#~ msgstr "Nemohu nastavit skupinu: %s\n"
-
-#~ msgid "a message won't be received\n"
-#~ msgstr "zpráva nebyla přijata\n"
-
-#~ msgid "\tNo cache file\n"
-#~ msgstr "\tŽádný soubor v mezipaměti\n"
-
-#~ msgid "\tReading summary cache..."
-#~ msgstr "\tČtení celkové mezipaměti..."
-
-#~ msgid "Cache version is different. Discarding it.\n"
-#~ msgstr "Verze v mezipaměti je rozdílná, Vyřazuji ji.\n"
-
-#~ msgid "Mark file not found.\n"
-#~ msgstr "Označený soubor nebyl nalezen.\n"
-
-#~ msgid "Mark version is different (%d != %d). Discarding it.\n"
-#~ msgstr "Označená verze je odlišná (%d != %d). Vyřazuji ji.\n"
-
-#~ msgid "Can't open mark file with append mode.\n"
-#~ msgstr "Nemohu otevřít označený soubor s režimem připojení.\n"
-
-#~ msgid "Can't open mark file with write mode.\n"
-#~ msgstr "Nemohu otevřít označený soubor s režimem zápisu.\n"
-
-#, fuzzy
-#~ msgid "can't create root folder %s\n"
-#~ msgstr "Nemohu vytvořit uzamčený soubor %s\n"
-
-#~ msgid ""
-#~ "empty folder\n"
-#~ "\n"
-#~ msgstr ""
-#~ "prázdná složka\n"
-#~ "\n"
-
-#~ msgid "Only if a window is active"
-#~ msgstr "Pouze pokud je okno aktivní"
-
-#~ msgid ""
-#~ "All previous settings for each folders will be lost.\n"
-#~ "Continue?"
-#~ msgstr ""
-#~ "Všechna předchozí nastavení pro každou složku budou ztracena.\n"
-#~ "Pokračovat?"
-
-#~ msgid "window position: x = %d, y = %d\n"
-#~ msgstr "pozice okna: x = %d, y = %d\n"
-
-#~ msgid "Setting widgets..."
-#~ msgstr "Nastavuji grafické prvky..."
-
-#~ msgid "\tMarking the messages..."
-#~ msgstr "\tOznačuji zprávy..."
-
-#~ msgid "\t%d new message(s)\n"
-#~ msgstr "\t%d nová(é) zpráva(y)\n"
-
-#~ msgid "can't select mailbox %s\n"
-#~ msgstr "Nemohu vybrat poštovní schránku %s\n"
-
-#~ msgid "getting message %d...\n"
-#~ msgstr "Získávám zprávu %d...\n"
-
-#~ msgid "Deleting cached messages %u - %u ... "
-#~ msgstr "Vymazávám zprávy z mezipaměti %u - %u ... "
-
-#~ msgid "Deleting all cached messages... "
-#~ msgstr "Vymazávám všechny zprávy z mezipaměti... "
-
-#~ msgid "Counting total number of messages...\n"
-#~ msgstr "Zjišťuji počet nových zpráv...\n"
-
-#~ msgid "Could not get message file."
-#~ msgstr "Nelze načíst soubor se zprávou."
-
-#~ msgid "Open message when cursor keys are pressed on summary"
-#~ msgstr "Při stisku kurzorové klávesy v souhrnu otevřít zprávu"
-
-#~ msgid ""
-#~ "Error occurred while sending mail:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Během posílání emailu se vyskytla chyba:\n"
-#~ "%s"
-
-#~ msgid "Some errors occurred while sending queued messages."
-#~ msgstr "Při posílání pozdržených zpráv nastala stejná chyba."
-
-#~ msgid "No message part selected."
-#~ msgstr "Není vybrána žádná část zprávy."
-
-#~ msgid "Predicate"
-#~ msgstr "Tvrzení"
-
-#~ msgid "Creating actions setting window...\n"
-#~ msgstr "Vytvářím okno pro nastavení akcí...\n"
-
-#~ msgid "Actions setting"
-#~ msgstr "Nastavení akcí"
-
-#~ msgid "Reading actions configurations...\n"
-#~ msgstr "Načítám konfiguraci akcí...\n"
-
-#~ msgid "Action command error\n"
-#~ msgstr "Chyba v příkazu pro akci\n"
-
-#~ msgid "Forking child and grandchild.\n"
-#~ msgstr "Vytvářím potomka a rodiče.\n"
-
-#~ msgid "Child: Waiting for grandchild\n"
-#~ msgstr "Potomek: čekám na rodiče\n"
-
-#~ msgid "Child: grandchild ended\n"
-#~ msgstr "Potomek: rodič je ukončen\n"
-
-#~ msgid "Killing child group id %d\n"
-#~ msgstr "Zabíjím potomky ve skupině s id %d\n"
-
-#~ msgid "Freeing children data %p\n"
-#~ msgstr "Uvolňuji data %p od potomků\n"
-
-#~ msgid "Updating actions input/output dialog.\n"
-#~ msgstr "Vytvářím dialog vstupu/výstupu pro akce.\n"
-
-#~ msgid "Child returned %c\n"
-#~ msgstr "Potomek vrátil %c\n"
-
-#~ msgid "Sending input to grand child.\n"
-#~ msgstr "Posílám vstup na rodiče.\n"
-
-#~ msgid "Input to grand child sent.\n"
-#~ msgstr "Vstup pro rodiče odeslán.\n"
-
-#~ msgid "Catching grand child's output.\n"
-#~ msgstr "Odchytávám výstup od rodiče.\n"
-
-#~ msgid "Socket error\n"
-#~ msgstr "Chyba soketu\n"
-
-#~ msgid "Account not found. Using current account...\n"
-#~ msgstr "Účet nenalezen. Použiji aktuální účet...\n"
-
-#~ msgid "Account not found.\n"
-#~ msgstr "Účet nenalezen.\n"
-
-#~ msgid "SMTP AUTH failed\n"
-#~ msgstr "SMTP AUTH selhala\n"
-
-#~ msgid "Error occurred while sending QUIT\n"
-#~ msgstr "Během posílání QUIT se vyskytla chyba\n"
-
-#~ msgid "Can't connect to SMTP server: %s:%d\n"
-#~ msgstr "Nemohu se spojit s SMTP serverem: %s:%d\n"
-
-#~ msgid "Error occurred while connecting to %s:%d\n"
-#~ msgstr "Během připojování k %s: %d se vyskytla chyba\n"
-
-#~ msgid "Error occurred while sending HELO\n"
-#~ msgstr "Během posílání HELO se vyskytla chyba\n"
-
-#~ msgid "Error occurred while sending STARTTLS\n"
-#~ msgstr "Během posílání STARTTLS se vyskytla chyba\n"
-
-#~ msgid "Error occurred while sending EHLO\n"
-#~ msgstr "Během posílání EHLO se vyskytla chyba\n"
-
-#~ msgid "Signature file"
-#~ msgstr "Soubor s podpisem"
-
-#~ msgid "Creating custom header setting window...\n"
-#~ msgstr "Vytvářím okno pro nastavení vlastních záhlaví...\n"
-
-#~ msgid "Reading custom header configuration...\n"
-#~ msgstr "Načítání vlastního nastavení záhlaví...\n"
-
-#~ msgid "Writing custom header configuration...\n"
-#~ msgstr "Zápis vlastního nastavení záhlaví...\n"
-
-#~ msgid "Creating filter setting window...\n"
-#~ msgstr "Vytvářím okno pro nastavení filtru...\n"
-
-#~ msgid "Reading filter configuration...\n"
-#~ msgstr "Načítám nastavení filtru...\n"
-
-#~ msgid "Writing filter configuration...\n"
-#~ msgstr "Zápis nastavení filtru...\n"
-
-#~ msgid "\tSearching uncached messages... "
-#~ msgstr "\tHledám zprávy mimo mezipaměť... "
-
-#~ msgid "%d uncached message(s) found.\n"
-#~ msgstr "Bylo nalezeno %d zpráv(y) mimo mezipaměť.\n"
-
-#~ msgid "\tSorting uncached messages in numerical order... "
-#~ msgstr "\tTřídím zprávy, které byly mimo mezipaměť v číselném pořadí... "
-
-#~ msgid "forced charset: %s\n"
-#~ msgstr "Vnucená znaková sada: %s\n"
-
-#~ msgid "Enable horizontal scroll bar"
-#~ msgstr "Povolit horizontální posuvník"
-
-#~ msgid "Display unread messages with bold font"
-#~ msgstr "Zobrazit počet nepřečtených zpráv tučným písmem"
-
-#~ msgid "Finished"
-#~ msgstr "Dokončeno"
-
-#~ msgid "Done"
-#~ msgstr "Hotovo"
-
-#~ msgid "Checking all folders for new messages..."
-#~ msgstr "Kontroluji všechny složky na nové zprávy..."
-
-#~ msgid "/_File/_Rescan folder tree"
-#~ msgstr "/_Soubor/Z_novu načíst strom složek"
-
-#~ msgid "move_file(): file %s already exists."
-#~ msgstr "move_file(): soubor '%s' už existuje."
-
-#~ msgid "%s:%d loading template from %s\n"
-#~ msgstr "%s:%d načítám šablony z %s\n"
-
-#~ msgid "%s:%d reading templates dir %s\n"
-#~ msgstr "%s:%d načítám adresář %s se šablonami\n"
-
-#~ msgid "%s:%d found file %s\n"
-#~ msgstr "%s: %d nalezl soubor %s\n"
-
-#~ msgid "%s:%d %s is not an ordinary file\n"
-#~ msgstr "%s: %d %s není běžným souborem\n"
-
-#~ msgid "%s:%d writing template \"%s\" to %s\n"
-#~ msgstr "%s: %d zapisuji šablonu \"%s\" do %s\n"
-
-#~ msgid "saving sent message...\n"
-#~ msgstr "ukládám odeslanou zprávu...\n"
-
-#~ msgid "can't save message\n"
-#~ msgstr "nelze uložit zprávu\n"
-
-#~ msgid "Creating actions dialog\n"
-#~ msgstr "Vytvářím dialog pro akce\n"
-
-#~ msgid "Creating log window...\n"
-#~ msgstr "Vytvářím záznamové okno...\n"
-
-#~ msgid "Deleting cached articles 1 - %d ... "
-#~ msgstr "Vymazávám příspěvky z mezipaměti. 1 - %d ... "
-
-#~ msgid "\tDeleting all cached articles... "
-#~ msgstr "\tVymazávám všechny příspěvky z mezipaměti... "
-
-#~ msgid ""
-#~ "The portions applied from fetchmail is Copyright 1997 by Eric S. "
-#~ "Raymond.  Portions of those are also copyrighted by Carl Harris, 1993 and "
-#~ "1995.  Copyright retained for the purpose of protecting free "
-#~ "redistribution of source.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Části kódu z programu fetchmail jsou chráněny Copyrightem 1997 Erica S. "
-#~ "Raymonda. Jeho další části jsou chráněny Copyrightem Carla Harrisa, 1993 "
-#~ "a 1995. Ponechání si práv za účelem ochrany volné\n"
-#~ " distribuce kódu.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Kcc is copyright by Yasuhiro Tonooka <tonooka@msi.co.jp>, and libkcc is "
-#~ "copyright by takeshi@SoftAgency.co.jp.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Kcc je chráněno Copyrightem Yasuhiro Tonooka <tonooka@msi.co.jp>, a "
-#~ "libkcc je chráněno Copyrightem takeshi@SoftAgency.co.jp.\n"
-#~ "\n"
-
-#~ msgid "can't allocate memory\n"
-#~ msgstr "Nelze alokovat paměť\n"
-
-#~ msgid "/_View/Toggle summary _view"
-#~ msgstr "/Z_obrazit/Pře_pnout zobrazení souhrnu"
-
-#~ msgid "Error occurred while %s\n"
-#~ msgstr "Během %s se vyskytla chyba\n"
-
-#~ msgid "/_Tool"
-#~ msgstr "/_Nástroje"
-
-#~ msgid "Outbox"
-#~ msgstr "Odeslaná pošta"
-
-#~ msgid "Skipping message %d\n"
-#~ msgstr "Vynechávám zprávu %d\n"
-
-#~ msgid "Creating header window...\n"
-#~ msgstr "Vytvářím náhled na záhlaví...\n"
-
-#~ msgid "Displaying the header of %s ...\n"
-#~ msgstr "Zobrazuji záhlaví pro %s ...\n"
-
-#~ msgid "%s - All header"
-#~ msgstr "%s - Všechna záhlaví"
-
-#~ msgid "/_View/U_nthread view"
-#~ msgstr "/Z_obrazit/Nezobrazit vlá_kna"
-
-#~ msgid " Apply "
-#~ msgstr " Použít "
-
-#~ msgid "External Web browser (%s will be replaced with URI)"
-#~ msgstr "Externí webový prohlížeč (%s bude nahrazen URI)"
-
-#~ msgid "Go to %s\n"
-#~ msgstr "Přejít na %s\n"
-
-#~ msgid "/_Message/_Bcc"
-#~ msgstr "/_Zpráva/_Slepá kopie"
-
-#~ msgid "/_Message/_Attach"
-#~ msgstr "/_Zpráva/Připoji_t"
-
-#~ msgid "/_Update folder tree"
-#~ msgstr "/Akt_ualizovat strom složek"
-
-#~ msgid "/_Edit/_Search folder"
-#~ msgstr "/Ú_pravy/Vy_hledat složku"
-
-#~ msgid "/_Message/Add sender to address boo_k"
-#~ msgstr "/_Zpráva/Přidat odesílatele do data_báze adres"
-
-#~ msgid "/_Summary"
-#~ msgstr "/_Přehled"
-
-#~ msgid "/_Summary/E_xecute"
-#~ msgstr "/_Přehled/S_pustit"
-
-#~ msgid "/_Summary/_Update"
-#~ msgstr "/_Přehled/_Aktualizace"
-
-#~ msgid "/_Summary/---"
-#~ msgstr "/_Přehled/---"
-
-#~ msgid "/_Summary/Go _to"
-#~ msgstr "/_Přehled/Přejít _na"
-
-#~ msgid "/_Summary/Go _to/---"
-#~ msgstr "/_Přehled/Přejít _na/---"
-
-#~ msgid "/_Summary/_Sort"
-#~ msgstr "/_Přehled/Setříd_it"
-
-#~ msgid "/_Summary/_Sort/---"
-#~ msgstr "/_Přehled/Setříd_it/---"
-
-#~ msgid "/_Summary/_Thread view"
-#~ msgstr "/_Přehled/Zobrazit _vlákna"
-
-#~ msgid "/_Summary/Unt_hread view"
-#~ msgstr "/_Přehled/Nezobrazit v_lákna"
-
-#~ msgid "The newsgroup `%s' already exists."
-#~ msgstr "Diskuzní skupina '%s' už existuje."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Begin forwarded message:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Začátek předané zprávy:\n"
-#~ "\n"
-
-#~ msgid "Usually used"
-#~ msgstr "Obvykle použitý"
-
-#~ msgid "Program path"
-#~ msgstr "Cesta k programu"
-
-#~ msgid "Quotation format:"
-#~ msgstr "Formát citace:"
-
-#~ msgid "Set display item"
-#~ msgstr "Nastavit položku zobrazení"
-
-#~ msgid "MIME"
-#~ msgstr "MIME"
-
-#~ msgid "Preferences for each account"
-#~ msgstr "Nastavení pro každý účet"
-
-#~ msgid "each"
-#~ msgstr "každých"
-
-#~ msgid "/Show all _header"
-#~ msgstr "/Zobrazit všechna zá_hlaví"
-
-#~ msgid "Current folder is Trash."
-#~ msgstr "Tato složka je odpadkový koš."
-
-#~ msgid "Reading addressbook file..."
-#~ msgstr "Načítám soubor s databází adres..."
-
-#~ msgid "%s doesn't exist.\n"
-#~ msgstr "%s neexistuje.\n"
-
-#~ msgid "Exporting addressbook to file..."
-#~ msgstr "Exportuji databázi adres do souboru..."
-
-#~ msgid "failed to write addressbook data.\n"
-#~ msgstr "Neúspěšný zápis dat databáze adres.\n"
-
-#~ msgid "The name already exists."
-#~ msgstr "Název již existuje."
-
-#~ msgid "New group"
-#~ msgstr "Nová skupina"
-
-#~ msgid "Input the name of new group:"
-#~ msgstr "Zadejte název nové skupiny:"
-
-#~ msgid "Input the new name of group:"
-#~ msgstr "Zadejte nový název skupiny:"
-
-#~ msgid "The address <%s> has already been registered."
-#~ msgstr "Adresa <%s> již byla registrována."
-
-#~ msgid "/_Message/Show all _header"
-#~ msgstr "/Zpráva/Zobrazit všechna zá_hlaví"
-
-#~ msgid "Sending queued message failed."
-#~ msgstr "Odeslání zprávy z fronty selhalo."
-
-#~ msgid "Current account: %s"
-#~ msgstr "Aktuální účet: %s"
-
-#~ msgid ""
-#~ "Emulate the behavior of mouse operation of\n"
-#~ "Emacs-based mailer"
-#~ msgstr ""
-#~ "Emulovat chování myši v mailovacím programu\n"
-#~ "založeném na Emacsu"
-
-#~ msgid "can't get the next uid of folder: %s\n"
-#~ msgstr "nelze získat další uid pro složku: %s\n"
-
-#~ msgid "/Remove _news server"
-#~ msgstr "/Odebrat d_iskusní server"
-
-#~ msgid "Really delete news server `%s'?"
-#~ msgstr "Opravdu chcete odebrat diskusní server '%s'?"
-
-#~ msgid "/_View/_Toolbar/_Non-display"
-#~ msgstr "/Z_obrazit/_Nástrojová lišta/_Nic"
-
-#~ msgid "/_Message/_Mark/Mark it as _being read"
-#~ msgstr "/_Zpráva/Označ_it/Označit jako _přečtené"
-
-#~ msgid "deleting article %d...\n"
-#~ msgstr "mažu příspěvek %d...\n"
-
-#~ msgid "/_Mark/Make it as _being read"
-#~ msgstr "/_Označit/Označit jak_o přečtené"
-
-#~ msgid "Show other headers"
-#~ msgstr "Zobrazit všechna záhlaví"
-
-#~ msgid ""
-#~ "The MD5 support is copyright by RSA Data Security, Inc.  See the header "
-#~ "comment of the md5.c module for license terms.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Podpora MD5 je chráněna Copyrightem RSA Data Security, Inc. Pro "
-#~ "podrobnosti viz komentář ve hlavičce modulu md5.c.\n"
-#~ "\n"
-
-#~ msgid "SunMonTueWedThuFriSat"
-#~ msgstr "Ne Po Út St Čt Pá So"
-
-#~ msgid "/_Summary/Select a_ll"
-#~ msgstr "/_Přehled/Vybrat _vše"
-
-#~ msgid "Clean trash"
-#~ msgstr "Vysypat koš"
-
-#~ msgid "/_Mark/Mark as _important"
-#~ msgstr "/_Označit/Označit jako _důležité"
-
-#~ msgid "D"
-#~ msgstr "D"
-
-#~ msgid "o"
-#~ msgstr "o"
-
-#~ msgid "TextView: color allocation failed\n"
-#~ msgstr "Textové okno: barevné rozvržení bylo neúspěšné\n"
-
-#~ msgid "*** Warning: code conversion failed ***\n"
-#~ msgstr "*** Varování: Neúspěšná konverze kódu ***\n"
-
-#~ msgid "Invalid MIME type\n"
-#~ msgstr "Neplatný MIME typ\n"
-
-#~ msgid "%s - Compose message [Edited]"
-#~ msgstr "%s - Psaní zprávy [Upraveno]"
-
-#~ msgid "deleting folder %s ...\n"
-#~ msgstr "mažu složku %s ...\n"
-
-#~ msgid "The news server `%s' already exists."
-#~ msgstr "Diskuzní server '%s' již existuje."
-
-#~ msgid "deleting cache folder of %s ...\n"
-#~ msgstr "Vymazávám příspěvky z mezipaměti %s ...\n"
-
-#~ msgid "IMAP login command is invalid.\n"
-#~ msgstr "Příkaz pro IMAP přihlášení je neplatný.\n"
-
-#~ msgid "Next unread"
-#~ msgstr "Další nepřečtenou"
-
-#~ msgid "New directory"
-#~ msgstr "Nový adresář"
-
-#~ msgid "The directory not found. Create it?"
-#~ msgstr "Adresář nenalezen. Chcete jej vytvořit?"
-
-#~ msgid "Can't create directory."
-#~ msgstr "Nelze vytvořit adresář"
-
-#~ msgid "Selected name isn't a directory."
-#~ msgstr "Vybraný název není názvem adresáře."
-
-#~ msgid "Writing mail folder list..."
-#~ msgstr "Zapisuji seznam složek..."
-
-#~ msgid "Writing imap folder list..."
-#~ msgstr "Zapisuji seznam imap složek..."
-
-#~ msgid "Writing news folder list..."
-#~ msgstr "Zapisuji seznam složek diskuzních skupin..."
-
-#~ msgid "Mail Server (IMAP4)"
-#~ msgstr "Poštovní server (IMAP4)"
-
-#~ msgid "NetNews"
-#~ msgstr "Diskuzní skupiny"
-
-#~ msgid "reading folder list %s ..."
-#~ msgstr "načítám seznam složek %s ..."
-
-#~ msgid "Broken folder list cache.\n"
-#~ msgstr "Porušený seznam složek.\n"
-
-#~ msgid "Select destination directory"
-#~ msgstr "Výběr cílového adresáře"
-
-#~ msgid "%s exists\n"
-#~ msgstr "%s existuje\n"
-
-#~ msgid "can't move tmpmsg to %s\n"
-#~ msgstr "Nemohu přemístit tmpmsg do %s\n"
-
-#~ msgid "IMAP session is not established\n"
-#~ msgstr "Není vytvořena IMAP4 relace\n"
-
-#~ msgid "news session is not established\n"
-#~ msgstr "nová relace není pevně stanovena\n"
-
-#~ msgid "Unlinking message %s in trash...\n"
-#~ msgstr "Odebírám zprávu %s z odpadkového koše...\n"
-
-#~ msgid "Not yet implemented."
-#~ msgstr "Nenaimplementováno."
-
-#~ msgid "/_Summary/Unsele_ct all"
-#~ msgstr "/_Přehled/Zrušit _celý výběr"
-
-#~ msgid "Korean (ISO-2022-KR)"
-#~ msgstr "Korejská (ISO-2022-KR)"
-
-#~ msgid "Enable thread view on summary"
-#~ msgstr "Povolit zobrazení vláken v přehledu"
-
-#~ msgid "Printing"
-#~ msgstr "Tisk"
-
-#~ msgid ""
-#~ "Date\n"
-#~ "from\n"
-#~ "Subject\n"
-#~ "To\n"
-#~ "Message-ID\n"
-#~ "%"
-#~ msgstr ""
-#~ "Datum\n"
-#~ "Od\n"
-#~ "Předmět\n"
-#~ "Komu\n"
-#~ "Identifikační číslo zprávy\n"
-#~ "%"
-
-#~ msgid "/_Mark/Mark _all"
-#~ msgstr "/_Označit/Označit _všechny"
-
-#~ msgid "/_Mark/U_nmark all"
-#~ msgstr "/_Označit/_Zrušit všechna označení"
-
-#~ msgid "/_Mark/M_ove marked"
-#~ msgstr "/_Označit/Pře_sunout označené"
-
-#~ msgid "/_Mark/_Delete marked"
-#~ msgstr "/_Označit/S_mazat označené"
-
-#~ msgid "/U_nselect all"
-#~ msgstr "/Zrušit _celý výběr"
-
-#~ msgid "/_Message/Reply with _quotation"
-#~ msgstr "/_Zpráva/Odpovědět s _citací"
-
-#~ msgid "/Reply with _quotation"
-#~ msgstr "/Odpovědět s _citací"
-
-#~ msgid "queueing message that failed to send...\n"
-#~ msgstr "zařazuji neodeslané zprávy do fronty...\n"
-
-#~ msgid "allocated mainview size: width = %d, height = %d\n"
-#~ msgstr "Velikost rozvržení hlavního pohledu: šířka = %d, výška = %d\n"
+msgstr "Sylpheed"
 
-#~ msgid "allocated mainwin size: width = %d, height = %d\n"
-#~ msgstr "Velikost rozvržení hlavního okna: šířka = %d, výška = %d\n"
+#~ msgid "#"
+#~ msgstr "#"
diff --git a/po/da.po b/po/da.po
index 8d3a46f8..19ab8607 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -214,34 +214,34 @@ msgstr "iconv kan ikke konvertere UTF-7 til %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv can ikke konvertere %s til UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "kan ikke skrive til midlertidig fil\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Modtager meddelelse fra %s til %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "Kan ikke læse mbox fil.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "ugyldigt mbox format: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "ugyldig mbox format: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "kan ikke åbne midlertidig fil\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -250,48 +250,48 @@ msgstr ""
 "ukodet Fra fundet:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d meddelelse fundet.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "kan ikke oprette lock fil %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "benyt 'flock' i stedet for 'file' hvis muligt.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "kan ikke oprette %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "mailbox hører til anden process, venter...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "kan ikke låse %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "ugyldig lock type\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "kan ikke låse %s op\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "kan ikke tømme mailbox.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksporterer meddelelse fra %s til %s...\n"
@@ -682,9 +682,9 @@ 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:491
+#: 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:265
+#: 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
@@ -826,8 +826,8 @@ msgstr "Tilføj adresse i adressebog"
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Kommentar"
 
@@ -835,29 +835,29 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Vælg adressebog mappe"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Filer"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Filer/Ny _adressebog"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Filer/Ny _vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Filer/Ny _JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Filer/Ny _server"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +865,177 @@ msgstr "/_Filer/Ny _server"
 msgid "/_File/---"
 msgstr "/_Filer/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Filer/_Redigér"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Filer/_Slet"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Filer/_Gem"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Filer/_Luk"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/_Redigér/K_opiere"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/_Redigér/_Sæt ind"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Ny _adresse"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Ny _gruppe"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Ny _mappe"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Redigér"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Funktioner"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Ny _adresse"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Ny _gruppe"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/_Redigér"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Slet"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Kopier..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/_Redigér/_Sæt ind"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Navn:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Overblik"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Slet adresse(r)"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Virklig slette adresse(r)?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1025,38 +1044,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:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Slet mappe"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ny mappe"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mappe og adresser"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Virklig slette `%s' ?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Ny bruger, kunne ikke gemme index fil."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Ny bruger, kunne ikke gemme adressebogs fil."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Gammel adressebog konverteret."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1064,7 +1083,7 @@ msgstr ""
 "Gammel adressebog konverteret,\n"
 "men kunne ikke gemme index filen"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1072,7 +1091,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "men nye og tomme filer blev oprettet."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1080,7 +1099,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1088,86 +1107,86 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Adressebog fejl"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Kunne ikke læse adressebog"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Brugerflade"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mappe"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1301,14 +1320,6 @@ msgstr "/_Redigér/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigér/_Klip"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/_Redigér/K_opiere"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/_Redigér/_Sæt ind"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigér/_Sæt ind som citat"
@@ -1787,7 +1798,7 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1880,7 +1891,7 @@ msgid "Nick Name"
 msgstr "Alias"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "E-post adresse"
 
@@ -1950,56 +1961,56 @@ msgstr "Tilføj ny adressebog"
 msgid "A Group Name must be supplied."
 msgstr " Et gruppe navn skal indtastes."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Redigér gruppendata"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Gruppe navn"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Adresser i gruppe"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Mulige adresser"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Redigér gruppendetaljer"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Tilføj gruppe"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Redigér mappe"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Indtast nyt gruppenavn:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Indtast ny mappes navn:"
 
@@ -2167,42 +2178,42 @@ msgstr "Spool sti"
 msgid "Select folder"
 msgstr "Vælg mappe"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Indbakke"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Sendt"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kø"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Slettet"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Kladde"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "NyMappe"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' kan ikke benyttes i mappe navn."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen `%s' eksisterer allerede."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan ikke oprette mappe `%s'."
@@ -2277,74 +2288,74 @@ msgid "New"
 msgstr "Ny"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Ulæst"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Indtast mappe information...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Genopbyg mappe træ"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Gendanner mappe træ..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Gendanner mappe træ..."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Henter nye meddelelser i alle mapper..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappe %s er valgt\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sende meddelelse..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2354,26 +2365,26 @@ msgstr ""
 "(hvis du vil oprette mappe til undermapper,,\n"
 "så afslut navn med `/')"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nyt navn for `%s':"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Omdøb mappe"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2382,12 +2393,12 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2398,21 +2409,21 @@ msgstr ""
 "Alle mapper og meddelelser i `%s' vil blive slettet.\n"
 "Vil du virkelig slette?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2421,34 +2432,34 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Virklig slette IMAP4 konto `%s'?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Slet IMAP4 konto"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Virklig slette nyhedsgruppe `%s'?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Slet nyhedsgruppe"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Virklig slette nyheds konto `%s'?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Slet nyheds konto"
 
@@ -3610,29 +3621,29 @@ msgstr "ingen"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Ændre vindue adskillelse type fra %d til %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tøm Slettet"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Ny mailbox"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3643,16 +3654,16 @@ msgstr ""
 "Hvis den eksisterende mailbox angives, vil den blive\n"
 "gennemsøgt automatisk."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3661,72 +3672,72 @@ msgstr ""
 "Fejl i oprettelse af mailbox.\n"
 "Måske findes filerne allerede eller du har ikke skrive rettighedder."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappe visning"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelelses visning"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Svar"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/_Svar til/_Afsender"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Videresend"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/_Omdirigér"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Afslut program?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 #, fuzzy
 msgid "Command line options"
 msgstr "Kommando linie ikke opsat."
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Bruges som: %s [OPTION]...\n"
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3742,7 +3753,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6972,6 +6983,9 @@ msgstr "Afslut"
 msgid "Sylpheed"
 msgstr "Gl. Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/de.po b/po/de.po
index 291e8b39..1da3077a 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -212,34 +212,34 @@ msgstr "iconv kann UTF-7 nicht nach %s konvertieren\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kann %s nicht nach UTF-7  konvertieren\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "kann nicht in temporäre Datei schreiben\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Erhaltene Nachrichten von %s in %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "Kann Mbox-Datei nicht lesen.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "Ungültiges Mbox-Format: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "zerstörte Mbox: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "kann temporäre Datei nicht öffnen\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -248,48 +248,48 @@ msgstr ""
 "uncodiertes Von gefunden:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d Nachrichten gefunden.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "kann Sperrdatei %s nicht erstellen\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "Benutze, wenn möglich, 'flock' anstatt 'file'.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "Kann %s nicht erstellen\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "Mailbox gehört einem anderen Prozess, warten...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "kann %s nicht sperren\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "ungültiger Sperrtyp\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "kann %s nicht entperren\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "Kann Mailbox nicht auf null setzen.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportiere Nachrichten von %s in %s...\n"
@@ -684,9 +684,9 @@ 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:491
+#: 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:265
+#: 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
@@ -826,8 +826,8 @@ msgstr "Adresse in Adressbuch einfügen"
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Kommentar"
 
@@ -835,28 +835,28 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Wähle Adressbuchablage"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datei"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Datei/Neues Adress_buch"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Datei/Neue _vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Datei/Neues _JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datei/Neuer _LDAP-Server"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +864,177 @@ msgstr "/_Datei/Neuer _LDAP-Server"
 msgid "/_File/---"
 msgstr "/_Datei/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Datei/_Bearbeiten"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Datei/_Löschen"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/_Bearbeiten/_Kopieren"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/_Bearbeiten/_Einfügen"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Neue _Adresse"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Neue _Gruppe"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Neue Ab_lage"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Bearbeiten"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Werkzeug"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Neue _Adresse"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Neue _Gruppe"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/_Bearbeiten"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Löschen"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Kopieren..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/_Bearbeiten/_Einfügen"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Name:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Vorschau"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Adresse(n) löschen"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1025,36 +1044,36 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "_Folder only"
 msgstr "Nur Abla_ge"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "Folder and _addresses"
 msgstr "Ablage und _Adressen"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wirklich '%s' löschen ?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Neuer Benutzer, kann Index-Datei nicht speichern."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Neuer Benutzer, kann Adressbuch-Dateien nicht speichern."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Altes Adressbuch erfolgreich konvertiert."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1062,7 +1081,7 @@ msgstr ""
 "Altes Adressbuch konvertiert,\n"
 "kann neue Adress-Index-Datei nicht speichern"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1070,7 +1089,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "aber erstellte neue leere Adressbuch-Dateien."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1078,7 +1097,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "konnte neue Adressbuch-Dateien nicht erstellen."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1086,92 +1105,92 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren\n"
 "und konnte neue Adressbuch-Dateien erstellen."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Adressbuch-Konvertierungs-Fehler"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Adressbuch-Fehler"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Konnte Adress-Index nicht lesen"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Adressbuch-Konvertierungs-Fehler"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Ablage"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "LDAP-Server"
 
@@ -1300,14 +1319,6 @@ msgstr "/_Bearbeiten/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Bearbeiten/_Ausschneiden"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/_Bearbeiten/_Kopieren"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/_Bearbeiten/_Einfügen"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Bearbeiten/Als Zitat _einfügen"
@@ -1757,7 +1768,7 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess terminieren (pid: %d)?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1845,7 +1856,7 @@ msgid "Nick Name"
 msgstr "Spitzname"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "E-Mail Adresse"
 
@@ -1915,56 +1926,56 @@ msgstr "Neues Adressbuch hinzufügen"
 msgid "A Group Name must be supplied."
 msgstr "Ein Gruppenname muss angegeben werden."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Gruppendaten bearbeiten"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Gruppenname"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Adressen in Gruppe"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Vorhandene Adressen"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Gruppendetails bearbeiten"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Neue Gruppe hinzufügen"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Ablage bearbeiten"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen der Ablage ein:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Neue Ablage"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen der neuen Ablage ein:"
 
@@ -2131,42 +2142,42 @@ msgstr "Wähle Verzeichnis"
 msgid "Select folder"
 msgstr "Wähle Ablage"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Gesendet"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Warteschlange"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "NeueAblage"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' kann nicht in den Ablagenamen integriert werden."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Die Ablage '%s' existiert bereits."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kann Ablage '%s' nicht erstellen."
@@ -2236,73 +2247,73 @@ msgid "New"
 msgstr "Neu"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Setze Ablageinformation...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Ablagebaum erneuern"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Der Ablagebaum wird erneuert. Weiter?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Ablagenbaum erneuern..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ablagenbaum erneuern fehlgeschlagen..."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ablagen auf neue Nachrichten prüfen..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ablage %s ist gewählt\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Lade Nachrichten nach %s ..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fehler beim Herunterladen der Nachrichten in '%s' ."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2312,26 +2323,26 @@ msgstr ""
 "(wenn Sie eine Ablage zum Speichern von Unterablagen erstellen wollen,\n"
 "dann hängen Sie ein `/' an das Ende des Namens)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Neuer Name für '%s':"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Ablage umbenennen"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kann Ablage '%s' nicht umbenennen."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kann Ablage '%s' nicht verschieben."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2340,11 +2351,11 @@ msgstr ""
 "Suchablage '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 msgid "Delete search folder"
 msgstr "Suchablage löschen"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2357,20 +2368,20 @@ msgstr ""
 "\n"
 "Wollen Sie das wirklich?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kann Ablage '%s' nicht entfernen."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Leere Papierkorb"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 msgid "Delete all messages in the trash folder?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2379,34 +2390,34 @@ msgstr ""
 "Mailbox '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "IMAP4-Account löschen"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Newsgroup '%s' wirklich löschen?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Newsgroup löschen"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "News-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "News-Account löschen"
 
@@ -3533,27 +3544,27 @@ msgstr "nicht"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Wechsle Fenstertrennungstyp von %d zu %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "Verbindungslos"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "Sie sind nicht verbunden. Verbinden?"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "Leere alle Papierkörbe"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 msgid "Delete all messages in trash folders?"
 msgstr "Lösche alle Nachrichten in den Papierkörben?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3563,16 +3574,16 @@ msgstr ""
 "Wenn die existierende Mailbox angegeben wurde, wird\n"
 "sie automatisch durchsucht."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3581,67 +3592,67 @@ msgstr ""
 "Erstellen der Mailbox fehlgeschlagen.\n"
 "Vielleicht existieren einige Dateien, oder Sie haben keine Schreibrechte"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Ablagenansicht"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenansicht"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/An_twort"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "/Antwort an alle"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/Ant_wort an Ab_sender"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/Antwort an Mailing-_Liste"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/_Umadressieren"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr "Sie sind nicht verbunden. Wählen sie das Bild zum Verbinden."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "Sie sind verbunden. Wählen sie das Bild, um die Verbindung zu beenden."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Beenden des Programms?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 msgid "Command line options"
 msgstr "Kommandozeilenoptionen"
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Aufruf: sylpheed [OPTION]..."
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3669,7 +3680,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6828,6 +6839,9 @@ msgstr "Be_enden"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/el.po b/po/el.po
index 9f2bcb77..28c3025d 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -218,82 +218,82 @@ msgstr ""
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "δεν μπορώ να γράψω στο προσωρινό αρχείο\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Λαμβάνω τα μηνύματα από το %s στο %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "δεν μπορώ να διαβάσω το αρχείο mbox.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "μη έγκυρη μορφοποίηση mbox: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "κακώς μορφοποιημένο mbox: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "δεν μπορώ να ανοίξω το προσωρινό αρχείο\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
 "%s"
 msgstr ""
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "Βρέθηκαν %d μηνύματα.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "δεν μπορώ να δημιουργήσω το αρχείο lock %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "χρησιμοποιήστε την 'flock' αντί για την 'file' αν είναι δυνατόν.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "δεν μπορώ να δημιουργήσω %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "το mailbox χρησιμοποιείται από άλλη διεργασία, περιμένω...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "δεν μπορώ να κλειδώσω το %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "απαράδεκτος τύπος κλειδώματος\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "δεν μπορώ να ξεκλειδώσω το %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "δεν μπορώ να μηδενίσω το mailbox.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Εξαγωγή μηνυμάτων από %s προς %s...\n"
@@ -692,9 +692,9 @@ 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:491
+#: 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:265
+#: 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
@@ -831,8 +831,8 @@ msgstr "Προσθήκη διεύθυνσης στο βιβλίο"
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Σχόλια"
 
@@ -840,31 +840,31 @@ msgstr "Σχόλια"
 msgid "Select Address Book Folder"
 msgstr "Επιλογή καταλόγου βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Αρχείο"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/Αρχείο/Νέο βιβλίο"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 #, fuzzy
 msgid "/_File/New _vCard"
 msgstr "/Αρχείο/Νέα _V-Card"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 #, fuzzy
 msgid "/_File/New _JPilot"
 msgstr "/Αρχείο/Νέο _J-Pilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/Αρχείο/Νέος εξυπηρετητής"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,160 +872,179 @@ msgstr "/Αρχείο/Νέος εξυπηρετητής"
 msgid "/_File/---"
 msgstr "/Αρχείο/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/Αρχείο/Επεξεργασία"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/Αρχείο/Διαγραφή"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/Αρχείο/Αποθήκευση"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Αρχείο/Κλείσιμο"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/Επεξεργασία/Αντιγραφή"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/Επεξεργασία/Επικόλληση"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/Διεύθυνση"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/Διεύθυνση/Νέα διεύθυνση"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/Διεύθυνση/Νέα ομάδα"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/Διεύθυνση/Νέος κατάλογος"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/Διεύθυνση/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/Διεύθυνση/Επεξεργασία"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/Διεύθυνση/Διαγραφή"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 #, fuzzy
 msgid "/_Tools"
 msgstr "/Εργαλεία"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 #, fuzzy
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Αρχείο/Εισαγωγή αρχείου mbox..."
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Βοήθεια"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Βοήθεια/Σχετικά"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Νέα διεύθυνση"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Νέα ομάδα"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Νέος κατάλογος"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/Επεξεργασία"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/Διαγραφή"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/Αντιγραφή..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/Επεξεργασία/Επικόλληση"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Όνομα:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Αναζήτηση"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr ""
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Διαγραφή διεύθυνσης (διευθύνσεων)"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Σίγουρα να διαγράψω την (τις) διεύθυνση (διευθύνσεις);"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1035,38 +1054,38 @@ msgstr ""
 "Αν διαγράφετε τον κατάλογο μόνο, οι διευθύνσεις θα μετακινηθούν στον από "
 "πάνω κατάλογο"
 
-#: src/addressbook.c:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Διαγραφή καταλόγου"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "_Folder only"
 msgstr "Κατάλογος μόνο"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Κατάλογος και διευθύνσεις"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Σίγουρα να διαγραφεί το `%s' ;"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Νέος χρήστης, δεν μπόρεσα να σώσω το αρχείο δείκτη."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Νέος χρήστης, δεν μπόρεσα να σώσω τα αρχεία του βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1074,7 +1093,7 @@ msgstr ""
 "Το παλιό βιβλίο διευθύνσεων μετατράπηκε,\n"
 "δεν μπόρεσα να σώσω το νέο αρχείο δείκτη διευθύνσεων"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1082,7 +1101,7 @@ msgstr ""
 "Δεν μπόρεσα να μετατρέψω το βιβλίο διευθύνσεων,\n"
 "αλλά δημιούργησα νέα άδεια αρχεία βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1090,7 +1109,7 @@ msgstr ""
 "Δεν μπόρεσα να μετατρέψω το βιβλίο διευθύνσεων,\n"
 "δεν μπόρεσα να δημιουργήσω νέα αρχεία βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1098,86 +1117,86 @@ msgstr ""
 "Δεν μπόρεσα να μετατρέψω το βιβλίο διευθύνσεων,\n"
 "και δεν μπόρεσα να δημιουργήσω νέα αρχεία βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Σφάλμα μετατροπής βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Μετατροπή βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Σφάλμα βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Δεν μπόρεσα να διαβάσω το δείκτη της διεύθυνσης"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 
-#: src/addressbook.c:2529
+#: src/addressbook.c:2576
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2582
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2588
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 
-#: src/addressbook.c:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Σφάλμα μετατροπής βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Μετατροπή βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Βιβλίο διευθύνσεων"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Άτομο"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "ΝέαΟμάδα"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Κατάλογος"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 #, fuzzy
 msgid "vCard"
 msgstr "V-Card"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 #, fuzzy
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "Εξυπηρέτης LDAP"
 
@@ -1312,14 +1331,6 @@ msgstr "/Επεξεργασία/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Επεξεργασία/Κοπή"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/Επεξεργασία/Αντιγραφή"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/Επεξεργασία/Επικόλληση"
-
 #: src/compose.c:570
 #, fuzzy
 msgid "/_Edit/Paste as _quotation"
@@ -1809,7 +1820,7 @@ msgstr ""
 "Να επιβάλλω τερματισμό της διεργασίας;\n"
 "process group id:  %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1904,7 +1915,7 @@ msgid "Nick Name"
 msgstr "Παρωνύμιο"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "Διεύθυνση e-mail"
 
@@ -1974,58 +1985,58 @@ msgstr "Προσθήκη νέου βιβλίου διευθύνσεων"
 msgid "A Group Name must be supplied."
 msgstr "Πρέπει να δοθεί ένα όνομα ομάδας."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Επεξεργασία στοιχείων ομάδας"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Όνομα ομάδας"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Διευθύνσεις στην ομάδα"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr ""
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr ""
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Διαθέσιμες διευθύνσεις"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Μετακίνηση των διευθύνσεων E-Mail προς ή από ομάδες με τα κουμπιά με τα "
 "βελάκια"
 
-#: src/editgroup.c:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Επεξεργασία λεπτομερειών ομάδας"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Προσθήκη Νέας Ομάδας"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Επεξεργασία καταλόγου"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Εισάγετε το νέο όνομα του καταλόγου:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Νέος κατάλογος"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Εισάγετε το όνομα του νέου καταλόγου:"
 
@@ -2198,44 +2209,44 @@ msgstr "Επιλογή καταλόγου"
 msgid "Select folder"
 msgstr "Επιλογή καταλόγου"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Εισερχόμενα"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 #, fuzzy
 msgid "Sent"
 msgstr "Αποστολή"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Ουρά"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Διαγραμμένα"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 #, fuzzy
 msgid "Drafts"
 msgstr "Πρόχειρα"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "το `%c' δεν μπορεί να συμπεριλαμβάνεται σε όνομα καταλόγου."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Ο κατάλογος `%s' υπάρχει ήδη."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "δεν μπορώ να δημιουργήσω τον κατάλογο `%s'."
@@ -2314,77 +2325,77 @@ msgid "New"
 msgstr "Νέα"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Αδιάβαστα"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "αρ."
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Θέτω τις πληροφορίες καταλόγων...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες καταλόγων..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση καταλόγων %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση καταλόγου %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/Ενημέρωση δομής καταλόγων"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Ενημέρωση της δομής καταλόγων..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ενημέρωση της δομής καταλόγων..."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ο κατάλογος %s είναι επιλεγμένος\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Αποστολή μηνύματος"
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος σε %s ."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2394,26 +2405,26 @@ msgstr ""
 "(αν θέλετε να δημιουργήσετε ένα κατάλογο για να βάλετε υποκαταλόγους\n"
 " προσθέστε το `/' στο τέλος του ονόματος)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Δώστε νέο όνομα για `%s':"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Μετονομασία καταλόγου"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2422,12 +2433,12 @@ msgstr ""
 "Σίγουρα να διαγραφεί το mailbox `%s' ;\n"
 "(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Διαγραφή καταλόγου"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2438,21 +2449,21 @@ msgstr ""
 "Όλοι οι κατάλογοι και τα μηνύματα κάτω από το `%s' θα διαγραφούν.\n"
 "Θέλετε πράγματι να διαγραφούν;"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2461,35 +2472,35 @@ msgstr ""
 "Σίγουρα να διαγραφεί το mailbox `%s' ;\n"
 "(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/Διαγραφή mailbox"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο IMAP4 λογαριασμός `%s';"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Διαγραφή λογαριασμού IMAP4"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Σίγουρα να διαγραφεί το newsgroup `%s';"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Διαγραφή newsgroup"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο λογαριασμός news `%s';"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Διαγραφή λογαριασμού news"
 
@@ -3728,29 +3739,29 @@ msgstr "κανένα"
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Προσθήκη mailbox"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3761,16 +3772,16 @@ msgstr ""
 "Αν οριστεί το υπάρχον mailbox, θα\n"
 "σαρωθεί αυτόματα."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Το mailbox `%s' υπάρχει ήδη"
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3779,74 +3790,74 @@ msgstr ""
 "Η δημιουργία του mailbox απέτυχε.\n"
 "Ίσως κάποια αρχεία να υπάρχουν ήδη, ή δεν έχετε δικαίωμα να γράψετε εκεί. "
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Απάντηση"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Απάντηση στον αποστολέα"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Απάντηση σε όλους"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Προώθηση"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Προώθηση ως προσάρτηση"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Έξοδος από αυτό το πρόγραμμα;"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 #, fuzzy
 msgid "Command line options"
 msgstr "Το όνομα της κεφαλίδας δεν έχει οριστεί."
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]...\n"
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3862,7 +3873,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -7136,6 +7147,9 @@ msgstr "Έξοδος"
 msgid "Sylpheed"
 msgstr ""
 
+#~ msgid "#"
+#~ msgstr "αρ."
+
 #, fuzzy
 #~ msgid "/_Tools/E_xecute"
 #~ msgstr "/Εκτέλεση"
diff --git a/po/es.po b/po/es.po
index 172cc547..9adf39e5 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -210,34 +210,34 @@ msgstr "iconv no puede convertir UTF-7 a %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv no puede convertir %s a UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "no se puede escribir el fichero temporal\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Obteniendo mensajes desde %s en %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "no puedo leer el fichero mbox.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "formato de mbox inválido: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox mal formada: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "no se puede abrir el fichero temporal\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -246,48 +246,48 @@ msgstr ""
 "Encontrado «From» sin proteger:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d mensajes encontrados.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "no se puede crear el fichero de bloqueo %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "usar «flock» en vez de «file» si es posible.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "no puedo crear %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "el buzón esta siendo usado por otro proceso, esperando...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "no se puede bloquear %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "tipo de bloqueo no válido\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "no se puede desbloquear %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "no se puede truncar a cero el buzón.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensajes de %s a %s...\n"
@@ -682,9 +682,9 @@ 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:491
+#: 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:265
+#: 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
@@ -824,8 +824,8 @@ msgstr "Añadir dirección a la agenda"
 msgid "Address"
 msgstr "Dirección"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Notas"
 
@@ -833,28 +833,28 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichero"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Fichero/Nueva _agenda"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Fichero/Nueva _vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Fichero/Nuevo _JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichero/Nuevo servidor _LDAP"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +862,177 @@ msgstr "/_Fichero/Nuevo servidor _LDAP"
 msgid "/_File/---"
 msgstr "/_Fichero/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Fichero/_Editar"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Fichero/_Borrar"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/_Editar/_Copiar"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/_Editar/_Pegar"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Dirección"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Dirección/Nueva _dirección"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Dirección/Nuevo _grupo"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Dirección/Nueva _carpeta"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Dirección/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Dirección/_Editar"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Nueva _dirección"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Nuevo _grupo"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/_Editar"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Copiar..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/_Editar/_Pegar"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nombre:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Buscar"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1022,36 +1041,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:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "_Folder only"
 msgstr "Sólo la _carpeta"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "Folder and _addresses"
 msgstr "La carpeta y las _direcciones"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente «%s»?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se pudo guardar el fichero índice."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pudo guardar los ficheros de direcciones"
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1059,7 +1078,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se pudo guardar el nuevo fichero índice"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1067,7 +1086,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1075,7 +1094,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "no se pudieron crear los ficheros para la nueva."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1083,92 +1102,92 @@ msgstr ""
 "No se pudo convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para una nueva."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "No se pudo leer el índice de direcciones"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "Dirección de correo"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1297,14 +1316,6 @@ msgstr "/_Editar/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/_Editar/_Copiar"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/_Editar/_Pegar"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
@@ -1751,7 +1762,7 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1839,7 +1850,7 @@ msgid "Nick Name"
 msgstr "Apodo"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "Dirección de correo"
 
@@ -1909,56 +1920,56 @@ msgstr "Añadir nueva agenda"
 msgid "A Group Name must be supplied."
 msgstr "Debe proporcionar un nombre de grupo"
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Editar datos del grupo"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Nombre de grupo"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Direcciones en el grupo"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Direcciones disponibles"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Editar detalles del grupo"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Añadir nuevo grupo"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Editar carpeta"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -2127,42 +2138,42 @@ msgstr "Seleccionar directorio"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' no puede estar en el nombre de la carpeta."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La carpeta «%s» ya existe."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "No se puede crear la carpeta «%s»."
@@ -2232,73 +2243,73 @@ msgid "New"
 msgstr "Nuevos"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "No leídos"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "Nº"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Estableciendo la información de la carpeta...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Estableciendo la información de la carpeta..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Reconstruir árbol de carpetas"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Se reconstruirá el árbol de carpetas. ¿Continuar?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo el árbol de carpetas..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "Fallo al reconstruir el árbol de carpetas."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Basura"
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descargando mensajes en %s ..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hubo un error descargando los mensajes en «%s»."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2308,26 +2319,26 @@ msgstr ""
 "(si quiere crear una carpeta para almacenar subcarpetas,\n"
 " añada «/» al final del nombre)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nuevo nombre para «%s»:"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "No se puede renombrar la carpeta «%s»."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "No se puede mover la carpeta «%s»."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2336,11 +2347,11 @@ msgstr ""
 "¿Eliminar la carpeta de búsqueda «%s» ?\n"
 "(Los mensajes no se borrarán)"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 msgid "Delete search folder"
 msgstr "Borrar carpeta de búsqueda"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2353,20 +2364,20 @@ msgstr ""
 "\n"
 "¿Está seguro de que quiere borrarla?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No se puede borrar la carpeta «%s»."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Borrar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2375,34 +2386,34 @@ msgstr ""
 "¿Realmente desea eliminar el buzón «%s» ?\n"
 "(Los mensajes NO se borrarán del disco)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente la cuenta IMAP4 «%s»?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar el grupo de noticias «%s»?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar la cuenta de noticias «%s»?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 
@@ -3529,27 +3540,27 @@ msgstr "ninguna"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambiando el tipo de separación de ventana de %d a %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "Esta desconectado. ¿Conectar?"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "Vaciar todas las papeleras"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 msgid "Delete all messages in trash folders?"
 msgstr "¿Borrar todos los mensajes de las papeleras?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3559,16 +3570,16 @@ msgstr ""
 "Si el buzón especificado ya existe entonces será\n"
 "escaneado automáticamente."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3578,67 +3589,67 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Árbol de carpetas"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "/Responder a _todos"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/Responder al _remitente"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/Responder a la _lista de correo"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Red_irigir"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr "Esta desconectado. Haga click en el icono para conectar."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "Esta conectado. Haga click en el icono para desconectar."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "¿Salir del programa?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 msgid "Command line options"
 msgstr "Opciones de línea de ordenes"
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPCIÓN]..."
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3666,7 +3677,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6799,6 +6810,9 @@ msgstr "_Salir"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "Nº"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/et.po b/po/et.po
index 912a1d43..04406776 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -217,34 +217,34 @@ msgstr "iconv ei suuda konversteerida UTF-7-t %s-ks\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ei suuda konverteerida %s-i UTF-7-ks\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "ei suuda kirjutada ajutisse faili\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "Ei saa lugeda kirjakasti faili.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "sobimatu kirjakasti formaat: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "paha mbox: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "ei saa avada ajutist fili\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -253,48 +253,48 @@ msgstr ""
 "Vabanematuid (kellelt) leitud:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "leiti %d kirju.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "ei saa luua lukufaili %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "kasuta 'flock'-i 'file' asemel kui võimalik.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "ei suuda luua %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "kirjakasti kasutab teine protsess, ootan...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "ei suuda lukustada %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "vale luku tüüp\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "ei saa lukku eemaldada %s-lt\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "kirjakasti ei saa lõigata nulliks.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Ekspordime teated %s-ist %s-i ...\n"
@@ -686,9 +686,9 @@ 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:491
+#: 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:265
+#: 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
@@ -828,8 +828,8 @@ msgstr "Lisa aadress raamatusse"
 msgid "Address"
 msgstr "Aadress"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Märkused"
 
@@ -837,29 +837,29 @@ msgstr "Märkused"
 msgid "Select Address Book Folder"
 msgstr "Vali aadressiraamatu kaust"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fail"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Fail/Uus raamat"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Fail/Uus _V-Kaart"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Fail/Uus _JPiloot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fail/Uus _Server"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +867,177 @@ msgstr "/_Fail/Uus _Server"
 msgid "/_File/---"
 msgstr "/_Fail/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Fail/R_edigeeri"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Fail/Kustuta"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Fail/_Salvesta"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fail/Sul_ge"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/R_edaktor/_Kopeeri"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/R_edaktor/_Aseta"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Aadress"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Aadress/Uus _Aadress"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Aadress/Uus _Grupp"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Aadress/Uus Kaust"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Aadress/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Aadress/R_edigeeri"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Tööriist"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Uus _Aadress"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Uus _Grupp"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/R_edaktor"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/Kustuta"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/Kopeeri..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/R_edaktor/_Aseta"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nimi:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Otsi"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Kustuta aadress(id)"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Kas te tõesti soovite aadresse kustutada?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1027,38 +1046,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:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ainult kataloog"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Kaust ja aadressid"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Kas tõesti kustutada `%s' ?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Uus kasutaja, ei saanud salvestada indeksifaili."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Uus kasutaja, ei saanud salvestada aadressiraamatu faile."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Vana aadressiraamat uuendati edukalt."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1066,7 +1085,7 @@ msgstr ""
 "Vana aadressiraamat uuendati.\n"
 "ei saanud salvestada uut aadresside indeksifaili"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1074,7 +1093,7 @@ msgstr ""
 "Ei saanud uuendada aadressiraamatut,\n"
 "kuid loodi uued ja tühjad aadressiraamatu failid."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1082,7 +1101,7 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ei suutnud luua uusi aadressiraamatu faile."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1090,91 +1109,91 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ja ei suutnud luua uut aadressiraamatu faile."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Aadressiraamat viiakse uude formaati"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Aadressiraamatu viga"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Ei suutnud lugeda aadresside indeksit"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Aadressiraamatu uuendamine"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Kasutajaliides"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "EPosti Aadress"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Kaust"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "V-Kaart"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPiloot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1309,14 +1328,6 @@ msgstr "/R-edaktor/---"
 msgid "/_Edit/Cu_t"
 msgstr "/R_edaktor/_Lõika"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/R_edaktor/_Kopeeri"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/R_edaktor/_Aseta"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/R_edaktor/Aseta kui tsitaat"
@@ -1796,7 +1807,7 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1889,7 +1900,7 @@ msgid "Nick Name"
 msgstr "Hüüdnimi"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "E-Posti aadress"
 
@@ -1959,56 +1970,56 @@ msgstr "Lisa uus aadressiraamat"
 msgid "A Group Name must be supplied."
 msgstr "Grupi nimi peab olema antud."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Muuda grupi andmeid"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Grupi nimi"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Aadress grupis"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Olemasolevad aadressid"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Muuda grupi detaile"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Lisa uus grupp"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Redigeeri kausta"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Sisesta uus nimi või kaust:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Sisesta uue kausta nimi:"
 
@@ -2176,42 +2187,42 @@ msgstr "Kirja jada kataloog"
 msgid "Select folder"
 msgstr "Vali kaust"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Saabunud"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Saadetud"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Järjekord"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Prügikast"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Mustandid"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "Uus Kaust"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Sümbol `%c' ei saa olla lisatud kausta nimele."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Kaust %s on juba olemas."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ei suuda luua kausta %s."
@@ -2287,76 +2298,76 @@ msgid "New"
 msgstr "Uus"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Pole loetud"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Sean kausta info...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "Uuenda kausta puu"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Kõigis kaustades otsitakse uusi kirju..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Valitud on kaust %s\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Saadan kirja"
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2366,26 +2377,26 @@ msgstr ""
 "(kui soovite luua kausta, millesse saaks teisi kaustu lisada,\n"
 " siis lisage / nime lõppu)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Sisesta uus nimi %s-le:"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Nimeta kaust ümber"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2394,12 +2405,12 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Kustuta kaust"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2410,21 +2421,21 @@ msgstr ""
 "Kustutatakse kõik kaustad ja kirjad %s-s.\n"
 "Kas sa tõesti soovid kustutada?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2433,34 +2444,34 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Kas tõesti kustutada IMAP4 konto %s?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Kustuta IMAP4 konto"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Kas tõesti soovite kustutada uudistegruppi %s?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Kustuta uudistegrupp"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Kas tõesti kustutda uudistegrupp %s ?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Kustuta uudistegrupp"
 
@@ -3615,29 +3626,29 @@ msgstr "mittemiski"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Muudan akna eraldamise tüüpi %d-lt %d-le\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tühjenda prügikast"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Lisa kirjakast"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3647,16 +3658,16 @@ msgstr ""
 "Sisesta kirjakasti asukoht.\n"
 "Kui määrate juba olemasoleva kirjakasti, siis seeskaneeritakse automaatselt."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Kirjakast"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3665,72 +3676,72 @@ msgstr ""
 "Kirjakasti loomine ebaõnnestus.\n"
 "Võibolla mõned failid on olemas, või teil pole õigusi sinna kirjutamiseks."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - kausta vaade"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - kirja vaade"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Vastan"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Vasta/_saatjale"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Saadan edasi"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Suuna ümber"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Välju"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Lõpetame programmi töö."
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 #, fuzzy
 msgid "Command line options"
 msgstr "Käsurida ei ole sisestatud."
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Kauta: %s [SEADED]...\n"
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3746,7 +3757,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6973,6 +6984,9 @@ msgstr "Välju"
 msgid "Sylpheed"
 msgstr "Vana Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/fr.po b/po/fr.po
index 9b76a5db..d0bfe93d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,10 +16,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 17:07+0900\n"
-"PO-Revision-Date: 2007-01-14 02:22+0100\n"
+"POT-Creation-Date: 2007-02-15 14:54+0900\n"
+"PO-Revision-Date: 2007-02-07 15:27+0100\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
-"Language-Team: French\n"
+"Language-Team: French <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -220,34 +220,34 @@ msgstr "iconv ne peut convertir de UTF-7 vers %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne peut convertir de %s vers UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "Impossible d'écrire dans le fichier temporaire\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Réception des messages de %s dans %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "Impossible de lire le fichier mbox.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "Format mbox invalide : %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox mal formée : %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "Impossible d'ouvrir un fichier temporaire\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -256,48 +256,48 @@ msgstr ""
 "From 'unescaped' trouvé :\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d messages trouvés.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "Impossible de créer le fichier verrou %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "Utilisation de 'flock' à la place de 'file' si possible\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "Impossible de créer %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "mailbox utilisée par un autre processus, attente...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "Impossible de verrouiller %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "Type de verrou invalide\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "Impossible de déverrouiller %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "Impossible de vider la boîte aux lettres.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportation des messages de %s vers %s...\n"
@@ -696,9 +696,9 @@ 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:491
+#: 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:265
+#: 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
@@ -838,8 +838,8 @@ msgstr "Ajouter l'adresse au carnet"
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Remarques"
 
@@ -847,28 +847,28 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Choisissez un dossier"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichier"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Fichier/Nouveau _carnet d'adresses"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Fichier/Nouveau carnet _vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Fichier/Nouveau carnet _JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +876,177 @@ msgstr "/_Fichier/Nouveau _serveur LDAP"
 msgid "/_File/---"
 msgstr "/_Fichier/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Fichier/Édit_er"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Fichier/_Supprimer"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/É_dition/_Copier"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/É_dition/Co_ller"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Nouvelle _adresse"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Nouveau _groupe"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Nouveau _dossier"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/Édit_er"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Outils"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Nouvelle _adresse"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Nouveau _groupe"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/É_dition"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Supprimer"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Copier..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/É_dition/Co_ller"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nom :"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Rechercher"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Copie discrète :"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Suppression d'adresse(s)"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Voulez-vous supprimer la(les) adresse(s) sélectionnée(s) ?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1037,37 +1056,37 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "_Folder only"
 msgstr "_Dossier uniquement"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "Folder and _addresses"
 msgstr "Dossier et _adresses"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Voulez-vous vraiment supprimer « %s » ?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur. Impossible d'enregistrer le fichier index."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr ""
 "Nouvel utilisateur, impossible d'enregistrer le fichier carnet d'adresses."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1075,7 +1094,7 @@ msgstr ""
 "Ancien carnet d'adresses converti,\n"
 "mais impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1083,7 +1102,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:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1091,7 +1110,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:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1099,92 +1118,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:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Erreur dans le carnet d'adresses"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Personne"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Groupe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Dossier"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "Serveur LDAP"
 
@@ -1313,14 +1332,6 @@ msgstr "/É_dition/---"
 msgid "/_Edit/Cu_t"
 msgstr "/É_dition/Co_uper"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/É_dition/_Copier"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/É_dition/Co_ller"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/É_dition/Coller comme ci_tation"
@@ -1382,9 +1393,8 @@ msgid "/_View/_Attachment"
 msgstr "/_Affichage/_Pièce(s) jointe(s)"
 
 #: src/compose.c:591
-#, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
-msgstr "/_Affichage/_Aller à/Autre _dossier..."
+msgstr "/_Affichage/Personnaliser la _barre d'outils..."
 
 #: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
 msgid "/_View/Character _encoding"
@@ -1772,9 +1782,9 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d) ?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
-msgstr ""
+msgstr "Personnaliser la _barre d'outils..."
 
 #: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
 msgid "Can't queue the message."
@@ -1862,7 +1872,7 @@ msgid "Nick Name"
 msgstr "Surnom"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "Adresse électronique"
 
@@ -1932,58 +1942,58 @@ msgstr "Nouveau carnet d'adresses"
 msgid "A Group Name must be supplied."
 msgstr "Donnez un nom de groupe."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Édition du groupe"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Nom du groupe"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Adresses dans le groupe"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Adresses disponibles"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Édition du groupe"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Nouveau groupe"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Édition du dossier"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Saisissez le nouveau nom du dossier :"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Saisissez le nom du nouveau dossier :"
 
@@ -2151,42 +2161,42 @@ msgstr "Sélectionnez un dossier"
 msgid "Select folder"
 msgstr "Choix d'un dossier"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Réception"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Envoyé"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "File d'attente"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "« %c » n'est pas valide dans le nom du dossier."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Le dossier « %s » existe déjà."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossible de créer le dossier « %s »."
@@ -2256,74 +2266,74 @@ msgid "New"
 msgstr "Nouveau"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Non lu"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Enregistrement des données des dossiers...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Reconstruire l'_arborescence"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'arborescence va être reconstruite. Poursuivre ?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstruction de l'arborescence a échoué."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Recherche des nouveaux messages..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Indésirable"
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Dossier %s sélectionné\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Téléchargement des messages dans %s ..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr ""
 "Une erreur est survenue lors du téléchargement des messages dans « %s »."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2333,26 +2343,26 @@ msgstr ""
 "(si vous voulez créer un dossier pouvant contenir d'autres dossiers,\n"
 " ajouter `/' à la fin du nom)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Saisissez le nouveau nom pour « %s » :"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Impossible de renommer le dossier « %s »."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossible de déplacer le dossier « %s »."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2361,11 +2371,11 @@ msgstr ""
 "Effacer le dossier de tri « %s » ?\n"
 "Les messages existants ne seront PAS effacés du disque."
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 msgid "Delete search folder"
 msgstr "Effacer le dossier de tri"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2378,20 +2388,20 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment les effacer ?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossible d'effacer le dossier « %s »."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 msgid "Delete all messages in the trash folder?"
 msgstr "Effacer tous les messages dans la corbeille ?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2400,34 +2410,34 @@ msgstr ""
 "Ne plus utiliser la boîte aux lettres « %s » (les\n"
 "messages existants ne seront PAS effacés du disque) ?"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Suppression d'une boîte aux lettres"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Confirmez-vous la suppression du compte IMAP4 « %s » ?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Suppression du compte IMAP4"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Confirmer la suppression du groupe de discussion « %s » ?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Suppression du groupe de discussion"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Confirmer la suppression du compte « %s » des groupes de discussion ?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Suppression du compte des groupes de discussion"
 
@@ -2681,7 +2691,7 @@ msgstr "Récupération du nombre de nouveaux messages (UIDL)..."
 
 #: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
-msgstr "Récupération de la taille des messages"
+msgstr "Récupération de la taille des messages (LIST)..."
 
 #: src/inc.c:924
 #, c-format
@@ -3049,9 +3059,9 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/Icônes _et textes"
 
 #: src/mainwindow.c:570
-#, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
-msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Icônes seulement"
+msgstr ""
+"/_Affichage/Affic_her ou masquer/Barre d'_outils/Textes à _droite des icônes"
 
 #: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
@@ -3075,9 +3085,8 @@ msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Affichage/Affic_her ou masquer/_Barre d'état"
 
 #: src/mainwindow.c:582
-#, fuzzy
 msgid "/_View/_Customize toolbar..."
-msgstr "/_Affichage/_Aller à/Autre _dossier..."
+msgstr "/_Affichage/Personnaliser la _barre d'outils..."
 
 #: src/mainwindow.c:584
 msgid "/_View/Separate f_older tree"
@@ -3441,16 +3450,15 @@ msgstr "/_Outils/Filtrer les indésirables dans les _messages sélectionnés"
 
 #: src/mainwindow.c:821
 msgid "/_Tools/Delete du_plicated messages"
-msgstr "/_Message/Supprimer les messages en dou_ble"
+msgstr "/_Outils/Supprimer les messages en _double"
 
 #: src/mainwindow.c:824
-#, fuzzy
 msgid "/_Tools/E_xecute marked process"
-msgstr "Exécuter les commandes marquées"
+msgstr "/_Outils/E_xécuter les commandes marquées"
 
 #: src/mainwindow.c:826
 msgid "/_Tools/_Log window"
-msgstr "/Ou_tils/_Journal de connexion"
+msgstr "/_Outils/_Journal de connexion"
 
 #: src/mainwindow.c:828
 msgid "/_Configuration"
@@ -3563,27 +3571,27 @@ msgstr "aucun"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Changement du type de séparation de fenêtre de %d vers %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "Vous êtes déconnecté. Voulez-vous vous connecter ?"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "Vider toutes les corbeilles"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 msgid "Delete all messages in trash folders?"
 msgstr "Effacer tous les messages des corbeilles ?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Nouvelle boîte aux lettres"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3592,16 +3600,16 @@ msgstr ""
 "Saisissez l'emplacement de la nouvelle boîte aux lettres. Si elle\n"
 "existe déjà, elle sera automatiquement analysée."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La boîte aux lettres « %s » existe déjà."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3611,67 +3619,67 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Dossiers"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Répondre"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "/Répondre à _tous"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/Répondre à l'_expéditeur"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/Répondre à la _liste"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Transférer"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Transférer en pièce _jointe"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr "Vous êtes déconnecté. Cliquer sur l'icône pour vous connecter."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "Vous êtes connecté. Cliquer sur l'icône pour vous déconnecter."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Quitter Sylpheed ?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 msgid "Command line options"
 msgstr "Options de la ligne de commande"
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilisation : sylpheed [OPTION]..."
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3699,7 +3707,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4099,9 +4107,8 @@ msgid "Only check INBOX on receiving"
 msgstr "Vérifier seulement INBOX lors de la réception"
 
 #: src/prefs_account_dialog.c:999
-#, fuzzy
 msgid "Filter new messages in INBOX on receiving"
-msgstr "Filtrage des messages à la réception"
+msgstr "Filtrage des nouveaux messages à la réception"
 
 #: src/prefs_account_dialog.c:1001
 msgid "News"
@@ -4191,12 +4198,10 @@ msgid "Reply-To"
 msgstr "Répondre à"
 
 #: src/prefs_account_dialog.c:1403
-#, fuzzy
 msgid "PGP sign message by default"
 msgstr "Signer le message par défaut"
 
 #: src/prefs_account_dialog.c:1405
-#, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Chiffrer le message par défaut"
 
@@ -4967,7 +4972,7 @@ msgstr "Minimiser dans la zone de notification"
 #: src/prefs_common_dialog.c:2168
 msgid "Toggle window on trayicon click"
 msgstr ""
-"Afficher ou réduire en cliquant sur l'icône dans la zone de notification"
+"Afficher ou minimiser en cliquant sur l'icône dans la zone de notification"
 
 #: src/prefs_common_dialog.c:2178
 msgid " Set key bindings... "
@@ -5472,9 +5477,8 @@ msgid "This header is already in the list."
 msgstr "Cet en-tête est déjà dans la liste."
 
 #: src/prefs_display_items.c:125
-#, fuzzy
 msgid "Display items setting"
-msgstr "Options d'affichage des en-têtes"
+msgstr "Options d'affichage des éléments"
 
 #: src/prefs_display_items.c:165 src/prefs_summary_column.c:223
 msgid "Available items"
@@ -5814,12 +5818,11 @@ msgid "Summary display item setting"
 msgstr "Éléments affichés dans le résumé"
 
 #: src/prefs_summary_column.c:196
-#, fuzzy
 msgid ""
 "Select items to be displayed on the summary view. You can modify\n"
 "the order by using the Up / Down button."
 msgstr ""
-"Sélectionnez les éléments à afficher dans le résumé. Pour\n"
+"Sélectionnez les éléments à afficher dans la barre d'outils. Pour\n"
 "modifier leur disposition, faîtes les glisser à l'aide de la souris\n"
 "ou utilisez les boutons « Plus haut » et « Plus bas »."
 
@@ -5864,9 +5867,8 @@ msgid "Do you really want to delete this template?"
 msgstr "Voulez-vous vraiment détruire ce modèle ?"
 
 #: src/prefs_toolbar.c:37
-#, fuzzy
 msgid "---- Separator ----"
-msgstr "Séparateur de signature"
+msgstr "---- Séparateur ----"
 
 #: src/prefs_toolbar.c:39
 msgid "Get"
@@ -5917,28 +5919,24 @@ msgid "Set as junk mail"
 msgstr "Marquer comme indésirable"
 
 #: src/prefs_toolbar.c:66
-#, fuzzy
 msgid "Not junk"
 msgstr "Acceptable"
 
 #: src/prefs_toolbar.c:67
-#, fuzzy
 msgid "Set as not junk mail"
-msgstr "/Marquer comme acc_eptable"
+msgstr "Marquer comme acceptable"
 
 #: src/prefs_toolbar.c:70
 msgid "Next unread message"
 msgstr "Message non lu suivant"
 
 #: src/prefs_toolbar.c:73
-#, fuzzy
 msgid "Previous unread message"
-msgstr "Message non lu suivant"
+msgstr "Message non lu précédent"
 
 #: src/prefs_toolbar.c:75
-#, fuzzy
 msgid "Search"
-msgstr "Rechercher :"
+msgstr "Rechercher"
 
 #: src/prefs_toolbar.c:76 src/query_search.c:251
 msgid "Search messages"
@@ -5949,9 +5947,8 @@ msgid "Print"
 msgstr "Impression"
 
 #: src/prefs_toolbar.c:79
-#, fuzzy
 msgid "Print message"
-msgstr "Envoyer le message"
+msgstr "Imprimer le message"
 
 #: src/prefs_toolbar.c:84
 msgid "Execute"
@@ -6022,17 +6019,15 @@ msgid "Wrap all long lines"
 msgstr "Justifier tout le message"
 
 #: src/prefs_toolbar.c:217
-#, fuzzy
 msgid "Customize toolbar"
-msgstr "/_Affichage/_Aller à/Autre _dossier..."
+msgstr "Personnalisation de la barre d'outils"
 
 #: src/prefs_toolbar.c:219
-#, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
 "the order by using the Up / Down button."
 msgstr ""
-"Sélectionnez les éléments à afficher dans le résumé. Pour\n"
+"Sélectionnez les éléments à afficher dans la barre d'outils. Pour\n"
 "modifier leur disposition, faîtes les glisser à l'aide de la souris\n"
 "ou utilisez les boutons « Plus haut » et « Plus bas »."
 
@@ -6213,11 +6208,11 @@ msgstr "Envoi"
 
 #: src/send_message.c:657
 msgid "Sending RCPT TO..."
-msgstr "Envoi de RCPT TO"
+msgstr "Envoi de RCPT TO..."
 
 #: src/send_message.c:662
 msgid "Sending DATA..."
-msgstr "Envoi de DATA"
+msgstr "Envoi de DATA..."
 
 #: src/send_message.c:666
 msgid "Quitting..."
@@ -6858,6 +6853,9 @@ msgstr "_Quitter"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/gl.po b/po/gl.po
index 482e69ba..68a137f4 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -216,34 +216,34 @@ msgstr "iconv non pode convertir UTF-7 a %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non pode convertir %s a UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "non se pode escribir o ficheiro temporal\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "non podo ler o ficheiro mbox.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "formato de mbox inválido: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox malformada: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "non se pode abrir o ficheiro temporal\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -252,48 +252,48 @@ msgstr ""
 "Atopado Dende sin escapar:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d mensaxes atopados.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "non se pode crear o ficheiro de bloqueo %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "usar 'flock' en vez de 'file' si é posible.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "non podo crear %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "a caixa de correo esta sendo usada por outro proceso, esperando...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "non se pode bloquear %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "tipo de bloqueo non válido\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "non se pode desbloquear %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "non se pode truncar a cero a caixa de correo.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensaxes de %s a %s...\n"
@@ -684,9 +684,9 @@ 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:491
+#: 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:265
+#: 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
@@ -826,8 +826,8 @@ msgstr "Engadir enderezo á axenda"
 msgid "Address"
 msgstr "Enderezo"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Notas"
 
@@ -835,29 +835,29 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta da axenda"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Ficheiro"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Ficheiro/Nova _axenda"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Ficheiro/Nova _vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Ficheiro/Novo _JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +865,177 @@ msgstr "/_Ficheiro/Novo _servidor"
 msgid "/_File/---"
 msgstr "/_Ficheiro/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Ficheiro/_Editar"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Ficheiro/_Borrar"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Ficheiro/_Pechar"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/_Editar/_Copiar"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/_Editar/_Pegar"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Enderezo"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Enderezo/Novo _enderezo"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "//_Enderezo/Novo _grupo"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Enderezo/Nova _carpeta"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Enderezo/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Enderezo/_Editar"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Novo _enderezo"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Novo _grupo"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/_Editar"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Copiar..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/_Editar/_Pegar"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Buscar"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Borrar enderezo(s)"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente o(s) enderezo(s)?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1025,38 +1044,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:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "_Folder only"
 msgstr "Carpeta só"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Carpeta e enderezos"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente `%s' ?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Novo usuario, non se puido gardar o ficheiro índice."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Novo usuario, non se puido gardar os ficheiros de enderezos"
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Antiga axenda de enderezos convertida con éxito"
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1064,7 +1083,7 @@ msgstr ""
 "Antiga axenda de enderezos convertida,\n"
 "non se puido gardar o novo ficheiro índice"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1072,7 +1091,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "pero crearonse novos ficheiros valeiros."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1080,7 +1099,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "Non se puideron crear os ficheiros para a nova."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1088,92 +1107,92 @@ msgstr ""
 "Non se puido convertir a antiga axenda\n"
 "e non se puideron crear ficheiros para unha nova."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Conversión da  axenda"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Error na axenda"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Non se puido ler o índice de enderezos"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Erro na conversión da axenda"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Conversión da axenda"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Persoa"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1307,14 +1326,6 @@ msgstr "/_Editar/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/_Editar/_Copiar"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/_Editar/_Pegar"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
@@ -1794,7 +1805,7 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1887,7 +1898,7 @@ msgid "Nick Name"
 msgstr "Alcume"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "Enderezo e-mail"
 
@@ -1957,56 +1968,56 @@ msgstr "Engadir nova axenda"
 msgid "A Group Name must be supplied."
 msgstr "Debe proporcionar un nome de grupo"
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Editar datos do grupo"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Nome de grupo"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Enderezos no grupo"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Enderezos disponibles"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Editar detalles do grupo"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Engadir novo grupo"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Editar carpeta"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Nome da nova carpeta:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nova carpeta"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Nome da nova carpeta:"
 
@@ -2175,42 +2186,42 @@ msgstr "Directorio de almacén"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papeleira"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "NovaCarpeta"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' non pode estar no nome da carpeta."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "a carpeta `%s' xa existe."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Non se pode crear a carpeta `%s'."
@@ -2285,74 +2296,74 @@ msgid "New"
 msgstr "Novos"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Non leídos"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "Nº"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Establecendo información de carpeta...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Reconstruir arbre de carpetas"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hai mensaxes novos en todas as carpetas..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Enviando mensaxe"
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2362,26 +2373,26 @@ msgstr ""
 "(si quere crear unha carpeta para almacenar subcarpetas,\n"
 " engada `/' o final do nome)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Renomear carpeta"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2390,12 +2401,12 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2406,21 +2417,21 @@ msgstr ""
 "Todas as carpetas e mensaxes baixo `%s' serán borrados.\n"
 "¿Confirma o borrado?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2429,34 +2440,34 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente a conta IMAP4 `%s'?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Borrar conta IMAP4"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar o grupo de novas `%s'?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de novas"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar a conta de novas `%s'?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Borrar conta de novas"
 
@@ -3614,29 +3625,29 @@ msgstr "ningunha"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambiando o tipo de separación de fiestra de %d a %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Baleirar papeleira"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Engadir caixa de correo"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3647,16 +3658,16 @@ msgstr ""
 "Si xa existe será\n"
 "examinado automáticamente."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3666,72 +3677,72 @@ msgstr ""
 "Quizáis xa existan os ficheiros ou non teña permisos suficientes para "
 "escribir no directorio."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Arbre de carpetas"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaxe"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Respostar"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Respon_der a/Ó _remitente"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Respon_der a/Á _lista de correo"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Red_irixir"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "¿Sair do programa?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 #, fuzzy
 msgid "Command line options"
 msgstr "Non se estableceu o comando."
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3747,7 +3758,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6970,6 +6981,9 @@ msgstr "Sair"
 msgid "Sylpheed"
 msgstr "Antigos de Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "Nº"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/hr.po b/po/hr.po
index bc8483f6..37687467 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -218,34 +218,34 @@ msgstr ""
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "ne mogu pisati u privremenu datoteku\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "ne mogu čitati mbox datoteku.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "pogrešan mbox format: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "pokvaren mbox: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "ne mogu otvoriti privremenu datoteku\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -254,48 +254,48 @@ msgstr ""
 "neizbježan Od pronađen:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d poruka pronađeno.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "ne mogu kreirati lock datoteku %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "koristi 'flock' umjesto 'file' ako je moguće.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "ne mogu kreirati %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "neki drugi proces koristi sandučić, čekam...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "ne mogu zaključati %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "neispravan tip zaključavanja\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "ne mogu otključati %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "ne mogu skratiti sandučić na nulu.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izvozim poruke iz %s u %s...\n"
@@ -691,9 +691,9 @@ 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:491
+#: 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:265
+#: 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
@@ -830,8 +830,8 @@ msgstr "Dodaj adresu u adresar"
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Bilješke"
 
@@ -839,30 +839,30 @@ msgstr "Bilješke"
 msgid "Select Address Book Folder"
 msgstr "Odaberite spis adresara"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _V-kartica"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 #, fuzzy
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _J-Pilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _poslužitelj"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +870,177 @@ msgstr "/_Datoteka/Novi _poslužitelj"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Uredi"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/_Uredi/_Kopiraj"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/_Uredi/U_baci"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _spis"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Uredi"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Novi _spis"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/_Uredi"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Kopiraj..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/_Uredi/U_baci"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Adresar"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Potraži"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Uistinu obrisati adresu/e?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1030,38 +1049,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:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Obriši spis"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo spis"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Spis i adrese"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Uistinu obrisati `%s' ?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu spretmiti index datoteku."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu spremiti datoteke adresara."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspješno unešen."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1069,7 +1088,7 @@ msgstr ""
 "Stari adresar ne može biti unešen,\n"
 "ne mogu spremiti novu index datoteku adresara."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1077,7 +1096,7 @@ msgstr ""
 "Ne mogu unjeti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1085,7 +1104,7 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1093,85 +1112,85 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "i ne mogu stvoriti nove datoteke adresara."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Sučelje"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Spis"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "V-kartica"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 #, fuzzy
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "LDAP Poslužitelj"
 
@@ -1306,14 +1325,6 @@ msgstr "/_Uredi/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/R_eži"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/_Uredi/_Kopiraj"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/_Uredi/U_baci"
-
 #: src/compose.c:570
 #, fuzzy
 msgid "/_Edit/Paste as _quotation"
@@ -1803,7 +1814,7 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1897,7 +1908,7 @@ msgid "Nick Name"
 msgstr "Nadimak"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "E-mail adresa"
 
@@ -1967,56 +1978,56 @@ msgstr "Dodaj Novi Adresar"
 msgid "A Group Name must be supplied."
 msgstr "Ime grupe mora biti unešeno."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Uredi grupu"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Ime grupe"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Adrese u grupi"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Dostupne adrese"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Uredi detalje grupe"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Dodaj novu grupu"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Uredi spis"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog spisa:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Novi spis"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog spisa:"
 
@@ -2184,44 +2195,44 @@ msgstr "Spool direktorij"
 msgid "Select folder"
 msgstr "Odaberite spis"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Sandučić"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 #, fuzzy
 msgid "Sent"
 msgstr "Pošalji"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 #, fuzzy
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "NoviSpis"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uključen u ime spisa."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Spis `%s' već postoji."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu stvoriti spis `%s'."
@@ -2298,77 +2309,77 @@ msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Nepročitano"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Postavljam info spisa...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Osvježavam stablo spisa..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvježavam stablo spisa..."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "Kreiranje nove pošte"
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Spis %s je odabran\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2378,26 +2389,26 @@ msgstr ""
 "(ukoliko želite stvoriti spis za pohranjivanje podspisa,\n"
 "dodajte `/' na kraju imena)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Preimenuj spis"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2406,12 +2417,12 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši spis"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2422,21 +2433,21 @@ msgstr ""
 "Svi spisi i poruke pod `%s' biti će obrisane.\n"
 "Želite li ih uistinu obrisati?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2445,35 +2456,35 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Uistinu obrisati `%s' IMAP4 račun?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 račun"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Uistinu obrisati `%s' news grupu?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Uistinu obrisati `%s' news račun?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Obriši news račun"
 
@@ -3710,29 +3721,29 @@ msgstr "ništa"
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Dodaj sandučić"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3743,16 +3754,16 @@ msgstr ""
 "Ako je unešen postojeći sandučić, biti će\n"
 "automatski pretražen."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sandučić `%s' već postoji."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Sandučić"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3761,74 +3772,74 @@ msgstr ""
 "Kreiranje sandučića propalo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Od_govori"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor_i pošiljatelju"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovori svi_ma"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Prosli_jedi"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Pre-_uredi"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 #, fuzzy
 msgid "Command line options"
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3844,7 +3855,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -7083,6 +7094,9 @@ msgstr "Izlaz"
 msgid "Sylpheed"
 msgstr ""
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/hu.po b/po/hu.po
index d2d4653a..1bbe46f8 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -211,34 +211,34 @@ msgstr "az iconv nem tud UTF-7-ből konvertálni ebbe: %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "az iconv nem tudja UTF-7-re konvertálni ezt: %s\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "nem lehet az ideiglenes fájlba írni\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Üzenetek fogadása innen: %s ide: %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "az mbox fájlt nem lehet olvasni.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "érvénytelen mbox formátum: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "sérült mbox: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "nem lehet ideiglenes fájlt megnyitni\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -247,48 +247,48 @@ msgstr ""
 "Kódolatlan feladó található:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d üzenet található.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "%s zároló fájlt nem lehet létrehozni\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "'flock' használata 'file' helyett, ha lehet.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "%s nem hozható létre\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "A postaláda egy másik processzhez tartozik, várakozás...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "%s nem zárolható\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "érvénytelen zároló típus\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "%s zárolása nem oldható fel\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "nem lehet nulla méretűre változtatni a postafiókot.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Üzenetek exportálása innen: %s ide: %s...\n"
@@ -685,9 +685,9 @@ 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:491
+#: 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:265
+#: 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
@@ -828,8 +828,8 @@ msgstr "Cím hozzáadása a címjegyzékhez"
 msgid "Address"
 msgstr "Cím"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Megjegyzések"
 
@@ -837,28 +837,28 @@ msgstr "Megjegyzések"
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fájl"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Fájl/Új _Címjegyzék"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Fájl/Új _vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Fájl/Új _JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fájl/Új _LDAP Szerver"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +866,177 @@ msgstr "/_Fájl/Új _LDAP Szerver"
 msgid "/_File/---"
 msgstr "/_Fájl/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Fájl/_Szerkesztés"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Fájl/_Törlés"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Fájl/_Mentés"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fájl/_Bezárás"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/_Szerkesztés/_Másolás"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/_Szerkesztés/_Beillesztés"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Cím"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Cím/Új _cím"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Cím/Új cso_port"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Cím/Új _mappa"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Cím/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Cím/_Szerkesztés"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Eszközök"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Eszközök/_LDIF fájl importálása"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Új _cím"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Új cso_port"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/_Szerkesztés"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Törlés"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Másolás..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/_Szerkesztés/_Beillesztés"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "Email cím"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Név:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Előnézet"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Titkos másolat:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Cím(ek) törlése"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Tényleg töröljem a cím(ek)et?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1026,36 +1045,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:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "_Folder only"
 msgstr "Cs_ak mappa"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "Folder and _addresses"
 msgstr "Mappa és _címek"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tényleg törli `%s' elemet?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Az új felhasználó nem tudja menteni az index fájlt."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 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:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "A régi címjegyzék konvertálása sikerült."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1063,7 +1082,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:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1071,7 +1090,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:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1079,7 +1098,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:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1087,88 +1106,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:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Címjegyzék konvertálási hiba"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Címjegyzék hiba"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Cím index olvasása nem sikerült"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Címjegyzék konverziós hiba"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Címjegyzék konverzió"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Illesztő"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Személy"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "Email cím"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Csoport"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mappa"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "LDAP Szerver"
 
@@ -1297,14 +1316,6 @@ msgstr "/_Szerkesztés/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Szerkesztés/_Kivágás"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/_Szerkesztés/_Másolás"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/_Szerkesztés/_Beillesztés"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Szerkesztés/_Beillesztés idézetként"
@@ -1755,7 +1766,7 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr "Eszközs_áv testreszabása..."
 
@@ -1843,7 +1854,7 @@ msgid "Nick Name"
 msgstr "Becenév"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "Email cím"
 
@@ -1913,56 +1924,56 @@ msgstr "Új címjegyzék hozzáadása"
 msgid "A Group Name must be supplied."
 msgstr "Egy csoportnevet meg kell adnia."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Csoportadatok szerkesztése"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Csoportnév"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Címek a csoportban"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Elérhető címek"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Csoport tulajdonságainak szerkesztése"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Új csoport hozzáadása"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Mappa szerkesztése"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "A mappa új neve:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Új mappa"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Az új mappa neve:"
 
@@ -2129,42 +2140,42 @@ msgstr "Könyvtár választása"
 msgid "Select folder"
 msgstr "Mappa választása"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Bejövő"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Kimenő"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Várakozó"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Kuka"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Vázlatok"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "Új mappa"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' nem tehető a mappanévbe."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' mappa már létezik."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' nem hozható létre."
@@ -2234,73 +2245,73 @@ msgid "New"
 msgstr "Új"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Mappa információ beállítása...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Mappa információ beállítása..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Mappafa újraépítése"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "A mappafa újra fog épülni. Folytatja?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Mappafa újraépítése..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "Mappafa újraépítése sikertelen."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Új üzenetek keresése minden mappában..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Levélszemét"
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s mappa kiválasztva\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Üzenetek letöltése %s mappába ..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hiba lépett fel a(z) %s mappába történő üzenetek letöltése közben."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2310,26 +2321,26 @@ msgstr ""
 "(Ha egy almappákat tartalmazó mappát szeretne létrehozni,\n"
 "akkor tegyen egy `/' jelet a név végére)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Adja meg `%s' új nevét:"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Mappa átnevezése"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' mappa nem nevezhető át."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' mappa nem helyezhető át."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2338,11 +2349,11 @@ msgstr ""
 "A(z) `%s' keresési mappa törlése?\n"
 "Az eredeti üzenetek nem törlődnek."
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 msgid "Delete search folder"
 msgstr "Keresési mappa törlése"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2355,20 +2366,20 @@ msgstr ""
 "\n"
 "Biztosan törölni szeretné?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' mappa nem távolítható el."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Kuka ürítése"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 msgid "Delete all messages in the trash folder?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2377,34 +2388,34 @@ msgstr ""
 "Tényleg eltávolítja `%s' postaládát?\n"
 "(Az üzenetek NEM törlődnek a meghajtóról)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Postaláda eltávolítása"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Tényleg törli a(z) `%s' IMAP4 hozzáférést?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hozzáférés törlése"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírcsoportot?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Hírcsoport törlése"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírhozzáférést?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Hírhozzáférés törlése"
 
@@ -3526,27 +3537,27 @@ msgstr "semmi"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Ablak elválasztás típus változtatása %d-ról, %d-ra\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "Kapcsolat nélkül"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "Ön kapcsolat nélküli módban van. Kapcsolódik?"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "Kuka ürítése"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 msgid "Delete all messages in trash folders?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Postaláda hozzáadása"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3556,16 +3567,16 @@ msgstr ""
 "Ha létező postaládát ad meg, akkor\n"
 "automatikusan átvizsgálom."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A(z) `%s' postaláda már létezik."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Postaláda"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3574,68 +3585,68 @@ msgstr ""
 "A postaláda létrehozása nem sikerült.\n"
 "Talán néhány fájl már létezik, vagy nincs írási jogod."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappa nézet"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Üzenet nézet"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Válasz"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "Válasz _mindenkinek"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/Válasz a _küldőnek"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/Válasz a _levelezőlistának"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Továbbítás"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Csatoláské_nt továbbít"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Átirányí_t"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Ön kapcsolat nélküli módban van. Kattintson az ikonra a kapcsolódáshoz."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "Ön kapcsolódva van. Kattintson az ikonra a kapcsolat nélküli módhoz."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Kilépés a programból?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 msgid "Command line options"
 msgstr "Parancssori opciók"
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Használat: sylpheed [OPCIÓ]..."
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3663,7 +3674,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6800,3 +6811,6 @@ msgstr "_Kilépés"
 #: src/trayicon.c:198 src/trayicon.c:289
 msgid "Sylpheed"
 msgstr "Sylpheed"
+
+#~ msgid "#"
+#~ msgstr "#"
diff --git a/po/it.po b/po/it.po
index 53e0268c..3802032f 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -211,34 +211,34 @@ msgstr "iconv non può convertire UTF-7 in %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non può convertire %s in UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "impossibile scrivere sul file temporaneo\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Ricezione in %s dei messaggi da %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "impossibile leggere il file mbox.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "formato mbox non valido: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox non valida: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "impossibile aprire il file temporaneo\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -247,48 +247,48 @@ msgstr ""
 "trovato un Da senza la sequenza di escape:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "trovati %d messaggi.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "impossibile creare il file di lock %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "se possibile usare «flock» al posto di «file».\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "impossibile creare %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "la casella postale è occupata da un altro processo, attendo...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "impossibile effettuare il lock %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "tipo di lock non valido\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "impossibile liberare il lock su %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "impossibile troncare a zero la casella postale.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Esportazione dei messaggi da %s in %s...\n"
@@ -685,9 +685,9 @@ msgstr ""
 "colonna «G» per consentire il recupero dei messaggi attraverso «Ricevi "
 "tutti»."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:491
+#: 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:265
+#: 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
@@ -827,8 +827,8 @@ msgstr "Aggiunta dell'indirizzo alla rubrica"
 msgid "Address"
 msgstr "Indirizzo"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Note"
 
@@ -836,28 +836,28 @@ msgstr "Note"
 msgid "Select Address Book Folder"
 msgstr "Selezione della cartella della rubrica"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_File"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_File/Nuova _rubrica"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_File/Nuova _vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_File/Nuovo _JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 msgid "/_File/New _LDAP Server"
 msgstr "/_File/Nuovo server _LDAP"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +865,177 @@ msgstr "/_File/Nuovo server _LDAP"
 msgid "/_File/---"
 msgstr "/_File/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_File/_Modifica"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_File/_Elimina"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_File/_Salva"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_File/_Chiudi"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/_Modifica/_Copia"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/_Modifica/_Incolla"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Indirizzo"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Indirizzo/Nuovo _indirizzo"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Indirizzo/Nuovo _gruppo"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Indirizzo/Nuova _cartella"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Indirizzo/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Indirizzo/_Modifica"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/S_trumenti"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/S_trumenti/Importa file _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Nuovo _indirizzo"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Nuovo _gruppo"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/_Modifica"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/Eli_mina"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Copia..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/_Modifica/_Incolla"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Cerca"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Elimina l'indirizzo(i)"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Eliminare l'indirizzo(i)?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1026,36 +1045,36 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "_Folder only"
 msgstr "_Solo la cartella"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "Folder and _addresses"
 msgstr "Cartella e _indirizzi"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Eliminare «%s» ?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Nuovo utente, impossibile salvare il file indice."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Nuovo utente, impossibile salvare i file della rubrica."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "La vecchia rubrica è stata convertita con successo."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1063,7 +1082,7 @@ msgstr ""
 "Vecchia rubrica convertita,\n"
 "impossibile salvare il nuovo file indice dell'indirizzo"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1071,7 +1090,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "ma ho creato nuovi file vuoti della rubrica."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1079,7 +1098,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1087,92 +1106,92 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "e impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Errore nella rubrica"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Impossibile leggere l'indice dell'indirizzo"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "Indirizzo email"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Gruppo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Cartella"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1301,14 +1320,6 @@ msgstr "/_Modifica/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Modifica/_Taglia"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/_Modifica/_Copia"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/_Modifica/_Incolla"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Modifica/Incolla co_me citazione"
@@ -1762,7 +1773,7 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1850,7 +1861,7 @@ msgid "Nick Name"
 msgstr "Nick"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "Indirizzo e-mail"
 
@@ -1920,57 +1931,57 @@ msgstr "Aggiunta di una nuova rubrica"
 msgid "A Group Name must be supplied."
 msgstr "Deve essere fornito un nome del gruppo."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Modifica i dati del gruppo"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Nome del gruppo"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Indirizzi nel gruppo"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Indirizzi disponibili"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Modifica i dettagli del gruppo"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Aggiunta di un nuovo gruppo"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Modifica la cartella"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Inserire il nuovo nome della cartella:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 
@@ -2138,42 +2149,42 @@ msgstr "Selezione directory"
 msgid "Select folder"
 msgstr "Selezione della cartella"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "In entrata"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Inviata"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Coda"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Cestino"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Bozze"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "Nuova cartella"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "«%c» non può essere incluso nel nome della cartella."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La cartella «%s» esiste già."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossibile creare la cartella «%s»."
@@ -2243,73 +2254,73 @@ msgid "New"
 msgstr "Nuovi"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Non letti"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "Tot."
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Impostazione delle informazioni della cartella...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Ricostruisco l'albero della cartella"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'albero della cartella sarà ricostruito. Continuo?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Sto ricostruendo l'albero della cartella..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "La ricostruzione delll'albero della cartella è fallita."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Controllo per nuovi messaggi in tutte le cartelle..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Spazzatura"
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "La cartella %s è selezionata\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sto scaricando i messaggi in %s ..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Si è verificato un errore scaricando i messaggi in «%s»."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2319,26 +2330,26 @@ msgstr ""
 "(se si vuole creare una catella per memorizzare sottocartelle,\n"
 " aggiungere «/» alla fine del nome)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Inserire il nuovo nome per «%s»:"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Rinomina la cartella"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Impossibile rinominare la cartella «%s»."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossibile spostare la cartella «%s»."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2347,11 +2358,11 @@ msgstr ""
 "Rimuovere la cartella di ricerca «%s» ?\n"
 "I messaggi reali non saranno eliminati."
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 msgid "Delete search folder"
 msgstr "Elimina la cartella di ricerca"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2365,20 +2376,20 @@ msgstr ""
 "\n"
 "Eliminare?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossibile rimuovere la cartella «%s»."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Svuota cestino"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 msgid "Delete all messages in the trash folder?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2387,34 +2398,34 @@ msgstr ""
 "Rimuovere la casella postale «%s» ?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Eliminare l'account IMAP4 «%s»?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Elimino l'account IMAP4"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Eliminare il newsgroup «%s» ?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Elimino il newsgroup"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Eliminare l'account delle news «%s» ?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Elimino l'account delle news"
 
@@ -3541,27 +3552,27 @@ msgstr "niente"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambio del tipo di separazione della finestra da %d a %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "Siete offline. Andare online?"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "Svuota cestino"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 msgid "Delete all messages in trash folders?"
 msgstr "Svuotare tutti i messaggi nei cestini?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Aggiunta di una casella postale"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3571,16 +3582,16 @@ msgstr ""
 "Se è specificata una casella postale esistente, sarà\n"
 "esaminata automaticamente."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La casella postale «%s» esiste già."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Casella postale"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3590,67 +3601,67 @@ msgstr ""
 "Può darsi che esistano già alcuni file, oppure non si ha il permesso di "
 "scrittura."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vista cartella"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista messaggio"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Rispondi"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "/Rispondi a _tutti"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/Rispondi _al mittente"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/Rispondi alla mailing _list"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Inoltra"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Inoltra com_e allegato"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Rispe_disci"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr "Siete offline. Fare click sull'icona per andare online."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "Siete online. Fare click sull'icona per andare offline."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Esci"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 msgid "Command line options"
 msgstr "Opzioni della linea di comando"
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPZIONE]..."
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3678,7 +3689,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6827,6 +6838,9 @@ msgstr "_Esci"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "Tot."
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/ja.po b/po/ja.po
index eac34efd..70cc7894 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -210,34 +210,34 @@ msgstr "iconv が UTF-7 を %s に変換できません\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv が %s を UTF-7 に変換できません\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "一時ファイルに書き込めません\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "メッセージを %s から %s に取り込んでいます...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "メールボックスファイルを読み込めません。\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "無効なメールボックスの形式: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "メールボックスが異常です: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "一時ファイルを開けません\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -246,48 +246,48 @@ msgstr ""
 "エスケープされていない From が見つかりました:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d 通のメッセージが見つかりました。\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "ロックファイル %s を開けません\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "可能であれば 'file' の代わりに 'flock' を使用してください。\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "%s を作成できません。\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "メールボックスは別のプロセスによって所有されています。待機中...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "%s をロックできません\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "無効なロックタイプです\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "%s をロック解除できません\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "メールボックスをゼロに切り詰められません。\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "メッセージを %s から %s に書き出しています...\n"
@@ -682,9 +682,9 @@ msgstr ""
 "新着メッセージはこの順番でチェックされます。「全受信」によるメッセージ\n"
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:491
+#: 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:265
+#: 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
@@ -824,8 +824,8 @@ msgstr "アドレスをアドレス帳に追加"
 msgid "Address"
 msgstr "アドレス"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "備考"
 
@@ -833,28 +833,28 @@ msgstr "備考"
 msgid "Select Address Book Folder"
 msgstr "アドレス帳フォルダを選択"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/ファイル(_F)"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/ファイル(_F)/新規アドレス帳(_B)"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/ファイル(_F)/新規_vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/ファイル(_F)/新規_JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 msgid "/_File/New _LDAP Server"
 msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +862,175 @@ msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 msgid "/_File/---"
 msgstr "/ファイル(_F)/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/ファイル(_F)/編集(_E)"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/ファイル(_F)/削除(_D)"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/ファイル(_F)/保存(_S)"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/ファイル(_F)/閉じる(_C)"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/編集(_E)/コピー(_C)"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/編集(_E)/ペースト(_P)"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/アドレス(_A)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/アドレス(_A)/新規アドレス(_A)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/アドレス(_A)/新規グループ(_G)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/アドレス(_A)/新規フォルダ(_F)"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/アドレス(_A)/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/アドレス(_A)/編集(_E)"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/アドレス(_A)/削除(_D)"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/ツール(_T)"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/ツール(_T)/_LDIFファイルをインポート"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/新規アドレス(_A)"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/新規グループ(_G)"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/編集(_E)"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/削除(_D)"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+msgid "/_Copy"
+msgstr "/コピー(_C)"
+
+#: src/addressbook.c:416
+msgid "/_Paste"
+msgstr "/ペースト(_P)"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "名前:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "検索"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "アドレスの削除"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "本当にこのアドレスを削除しますか?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1022,36 +1039,36 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "_Folder only"
 msgstr "フォルダのみ(_F)"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "Folder and _addresses"
 msgstr "フォルダとアドレス(_A)"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "本当に `%s' を削除しますか?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "新規ユーザ、インデックスファイルを保存できません。"
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "新規ユーザ、アドレス帳ファイルを保存できません。"
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "旧形式のアドレス帳は正しく変換されました。"
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1059,7 +1076,7 @@ msgstr ""
 "旧形式のアドレス帳は変換されました。\n"
 "新規アドレスインデックスファイルに保存できません"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1067,7 +1084,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "しかし空の新規アドレス帳ファイルが作成されました。"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1075,7 +1092,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1083,90 +1100,90 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "アドレス帳の変換エラー"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "アドレス帳の変換"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "アドレス帳のエラー"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "アドレスインデックスを読み込めません"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "旧形式のアドレス帳は変換されましたが、新規アドレスインデックスファイルを保存"
 "できません"
 
-#: src/addressbook.c:2529
+#: src/addressbook.c:2576
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "アドレス帳を変換できませんでしたが、空の新規アドレス帳ファイルが作成されまし"
 "た。"
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2582
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2588
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "アドレス帳変換エラー"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "アドレス帳変換"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "インタフェース"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "人物"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "グループ"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "フォルダ"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "LDAPサーバ"
 
@@ -1295,14 +1312,6 @@ msgstr "/編集(_E)/---"
 msgid "/_Edit/Cu_t"
 msgstr "/編集(_E)/カット(_T)"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/編集(_E)/コピー(_C)"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/編集(_E)/ペースト(_P)"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編集(_E)/引用としてペースト(_Q)"
@@ -1751,7 +1760,7 @@ msgstr ""
 "外部エディタが動作中です。\n"
 "プロセスを強制終了しますか(pid: %d)?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr "ツールバーをカスタマイズ(_C)..."
 
@@ -1839,7 +1848,7 @@ msgid "Nick Name"
 msgstr "ニックネーム"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "電子メール アドレス"
 
@@ -1909,56 +1918,56 @@ msgstr "新規アドレス帳を追加"
 msgid "A Group Name must be supplied."
 msgstr "グループ名を指定する必要があります。"
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "グループデータの編集"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "グループ名"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "グループのアドレス"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " → "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " ← "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "利用可能なアドレス"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "矢印ボタンで電子メールアドレスをグループに(から)移動"
 
-#: src/editgroup.c:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "グループの詳細の編集"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "新規グループの追加"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "フォルダの編集"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "フォルダの新しい名前を入力してください:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "新規フォルダ"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "新規フォルダの名前を入力してください:"
 
@@ -2125,42 +2134,42 @@ msgstr "ディレクトリの選択"
 msgid "Select folder"
 msgstr "フォルダの選択"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "受信箱"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "送信控"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "送信待ち"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "ごみ箱"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "フォルダ名に `%c' を含むことはできません。"
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "フォルダ `%s' はすでに存在します。"
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "フォルダ `%s' を作成できません。"
@@ -2230,73 +2239,73 @@ msgid "New"
 msgstr "新着"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "未読"
 
-#: src/folderview.c:436
-msgid "#"
+#: src/folderview.c:440
+msgid "Total"
 msgstr "総数"
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "フォルダ情報を設定中...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "フォルダ情報を設定中..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "フォルダをスキャン中 (%s%c%s) ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "フォルダをスキャン中 (%s)..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "フォルダツリーの再構築"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "フォルダツリーを再構築します。続けますか?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "フォルダツリーを再構築中..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "フォルダツリーの再構築に失敗しました。"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "全フォルダの新着メッセージをチェック中..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "迷惑メール"
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "フォルダ %s が選択されました\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "%s 中のメッセージをダウンロード中..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "`%s' 中のメッセージのダウンロード中にエラーが発生しました。"
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2306,26 +2315,26 @@ msgstr ""
 "(サブフォルダを格納するフォルダを作成したい場合は、\n"
 " 名前の最後に `/' を追加してください)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' の新しい名前を入力してください:"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "フォルダ名の変更"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "フォルダ '%s' の名前を変更できません。"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "フォルダ `%s' を移動できません。"
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2334,11 +2343,11 @@ msgstr ""
 "検索フォルダ '%s' を削除しますか?\n"
 "実際のメッセージは削除されません。"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 msgid "Delete search folder"
 msgstr "検索フォルダの削除"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2351,20 +2360,20 @@ msgstr ""
 "\n"
 "本当に削除してもいいですか?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "フォルダ '%s' を削除できません。"
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "ごみ箱を空にする"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 msgid "Delete all messages in the trash folder?"
 msgstr "ごみ箱の中のメッセージをすべて削除しますか?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2373,34 +2382,34 @@ msgstr ""
 "本当にメールボックス `%s' を削除しますか?\n"
 "(メッセージはディスクからは削除されません)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "メールボックスの削除"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "本当にIMAP4アカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "IMAP4アカウントの削除"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "本当にニュースグループ `%s' を削除しますか?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "ニュースグループの削除"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "本当にニュースアカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "ニュースアカウントの削除"
 
@@ -3521,27 +3530,27 @@ msgstr "なし"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "ウィンドウの分離タイプを %d から %d に変更しています\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "オフライン"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "現在オフラインです。オンラインにしますか?"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "すべてのごみ箱を空にする"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 msgid "Delete all messages in trash folders?"
 msgstr "ごみ箱の中のメッセージをすべて削除しますか?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "メールボックスを追加"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3550,16 +3559,16 @@ msgstr ""
 "メールボックスの場所を入力してください。\n"
 "既存のメールボックスを指定するとその内容を自動的にスキャンします。"
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "メールボックス `%s' はすでに存在します。"
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "メール箱"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3568,67 +3577,67 @@ msgstr ""
 "メールボックスの作成に失敗しました。\n"
 "いくつかのファイルがすでに存在するか、あるいは書き込む権限がありません。"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - フォルダビュー"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - メッセージビュー"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/返信(_R)"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "/全員に返信(_A)"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/差出人に返信(_S)"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/転送(_F)"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/添付として転送(_W)"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/手を加えずに転送(_T)"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr "現在オフラインです。アイコンをクリックするとオンラインになります。"
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "現在オンラインです。アイコンをクリックするとオフラインになります。"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "終了"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "このプログラムを終了しますか?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 msgid "Command line options"
 msgstr "コマンドラインオプション"
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "使用法: sylpheed [オプション]..."
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3656,7 +3665,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/ko.po b/po/ko.po
index 76f5d854..a124fa90 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -217,34 +217,34 @@ msgstr "iconv가 UTF-7를 %s로 변환할 수 없습니다\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv가 %s를 UTF-7로 변환할 수 없습니다\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "임시 파일에 쓸 수가 없습니다\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "mbox 파일을 읽을 수가 없습니다.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "올바르지않은 mbox 포멧: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "제대로되어있지않은 mbox: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "임시파일을 열 수가 없습니다\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -253,48 +253,48 @@ msgstr ""
 "메시지 본문중 From으로 시작하는 줄이 있습니다:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d개의 메시지가 발견되었습니다.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "잠금 파일 %s을 만들수가 없습니다\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "가능하면 'file'대신에 'flock'를 사용하세요.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "%s를 생성할 수가 없습니다\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "메일박스를 다른 프로세스가 읽고있습니다. 잠시 기다리세요...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "%s에 lock를 걸수가 없습니다\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "올바르지않은 잠금 타입\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "%s에 lock를 풀 수가 없습니다\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "메일박스의 크기를 0으로 만들수가 없습니다.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "메시지를 %s에서 %s로 보냅니다...\n"
@@ -675,9 +675,9 @@ msgstr ""
 "새 메시지는 이 순서대로 확인될 것입니다. `모두 받기'로 메시지를\n"
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:491
+#: 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:265
+#: 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
@@ -817,8 +817,8 @@ msgstr "주소록에 추가"
 msgid "Address"
 msgstr "주소"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "메모"
 
@@ -826,29 +826,29 @@ msgstr "메모"
 msgid "Select Address Book Folder"
 msgstr "주소록 폴더 선택"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/파일(_F)"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/파일(_F)/새 주소록(_B)"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/파일(_F)/새 vCard(_v)"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/파일(_F)/새 JPilot(_J)"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +856,177 @@ msgstr "/파일(_F)/새 서버(_S)"
 msgid "/_File/---"
 msgstr "/파일(_F)/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/파일(_F)/편집(_E)"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/파일(_F)/삭제(_D)"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/파일(_F)/닫기(_C)"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/편집(_E)/복사(_C)"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/편집(_E)/붙여넣기(_P)"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/주소(_A)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/주소(_A)/새 주소(_A)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/주소(_A)/새 그룹(_G)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/주소(_A)/새 폴더(_F)"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/주소(_A)/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/주소(_A)/편집(_E)"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/도구(_T)"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/새 주소(_A)"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/새 그룹(_G)"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/편집(_E)"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/삭제(_D)"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/복사(_C)..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/편집(_E)/붙여넣기(_P)"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "주소록"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "이름:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "찾기"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "숨은 참조:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "주소를 삭제"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "정말로 주소를 삭제하시겠습니까?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1016,38 +1035,38 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "_Folder only"
 msgstr "폴더만"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "폴더와 주소"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "정말로 `%s'를 지우시겠습니까?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "새 사용자, 색인 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "새 사용자, 주소록 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "예전 주소록을 성공적으로 변환하였습니다."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1055,7 +1074,7 @@ msgstr ""
 "예전 주소록이 변환되었습니다,\n"
 "새 주소록의 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1063,7 +1082,7 @@ msgstr ""
 "주소록을 변환할 수 없습니다,\n"
 "대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1071,7 +1090,7 @@ msgstr ""
 "주소록을 변환하지 못했습니다,\n"
 "새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1079,85 +1098,85 @@ msgstr ""
 "주소록을 변환하지 못했고\n"
 "새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "주소록 에러"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "주소 색인을 읽을 수 없습니다"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 msgid "Old address book converted, could not save new address index file"
 msgstr "예전 주소록이 변환되었습니다, 새 주소록 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2529
+#: src/addressbook.c:2576
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "주소록을 변환할 수 없습니다, 대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2582
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "주소록을 변환하지 못했습니다, 새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2588
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "주소록을 변환하지 못했고 새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "인터페이스"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "주소록"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "사람"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "그룹"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "폴더"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "LDAP 서버"
 
@@ -1292,14 +1311,6 @@ msgstr "/편집(_E)/---"
 msgid "/_Edit/Cu_t"
 msgstr "/편집(_E)/잘라내기(_t)"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/편집(_E)/복사(_C)"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/편집(_E)/붙여넣기(_P)"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/편집(_E)/quotation으로 붙여넣기(_q)"
@@ -1778,7 +1789,7 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1871,7 +1882,7 @@ msgid "Nick Name"
 msgstr "가명"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "이메일 주소"
 
@@ -1941,56 +1952,56 @@ msgstr "새 주소록 추가"
 msgid "A Group Name must be supplied."
 msgstr "그룹명이 지정되지 않았습니다."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "그룹 자료 편집"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "그룹명"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "그룹의 주소"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "사용가능한 주소"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "화살표 버튼으로 그룹에서 혹은 그룹으로 전자우편 주소 이동"
 
-#: src/editgroup.c:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "그룹 상세내용 편집"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "새 그룹 추가"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "폴더 편집"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "새 폴더"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
@@ -2158,42 +2169,42 @@ msgstr "스풀 디렉토리"
 msgid "Select folder"
 msgstr "폴더 선택"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "받은 편지함"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "발송 편지함"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "보낼 편지함"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "지운 편지함"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "임시 보관함"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "새 폴더"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c'는 폴더 이름에 포함될 수 없습니다."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' 폴더가 이미 존재합니다."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' 폴더를 생성할 수가 없습니다."
@@ -2268,74 +2279,74 @@ msgid "New"
 msgstr "새것"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "안읽음"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "전체"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "폴더 정보를 설정합니다...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "폴더 트리 갱신"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "폴더 트리를 갱신합니다..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "폴더 트리를 갱신합니다..."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "모든 폴더의 새로운 메시지를 확인합니다..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s 폴더가 선택되었습니다\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "메시지을 보내는 중"
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2345,26 +2356,26 @@ msgstr ""
 "(만일 하위폴더를 저장하기 위한 폴더를 생성하려면,\n"
 "이름의 마지막에 `/'를 추가하세요)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s'에대한 새 이름을 넣으세요:"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "폴더 이름 변경"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2373,12 +2384,12 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 #, fuzzy
 msgid "Delete search folder"
 msgstr "폴더 삭제"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2389,21 +2400,21 @@ msgstr ""
 "`%s'아래에 있는 모든 폴더와 메시지가 삭제될 것입니다.\n"
 "정말로 삭제하시겠습니까?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2412,34 +2423,34 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "메일박스를 제거합니다"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "정말로 `%s' IMAP4 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 계정 삭제"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "정말로 `%s' 뉴스그룹을 삭제하시겠습니까?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "뉴스그룹 삭제"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "정말로 `%s' 뉴스그룹 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "뉴스그룹 계정 삭제"
 
@@ -3588,29 +3599,29 @@ msgstr "없음"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "창 분리 형식을 %d에서 %d로 바꿉니다\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 #, fuzzy
 msgid "Empty all trash"
 msgstr "지운 편지함 비우기"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "메일박스 추가"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3621,16 +3632,16 @@ msgstr ""
 "기존의 메일 박스가 지정되면 자동으로\n"
 "스캔될것입니다."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "메일 박스 `%s'가 이미 존재합니다."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "메일박스"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3639,72 +3650,72 @@ msgstr ""
 "메일박스 생성이 실패했습니다.\n"
 "아마 어떤 파일이 이미 존재하거나 그 곳에 쓰기 권한이 없습니다."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 폴더 보기"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 메시지 보기"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/회신(_R)"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/전달(_F)"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/첨부로 전달(_w)"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Redirec_t"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "끝내기"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "이 프로그램을 끝내시겠습니까?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 #, fuzzy
 msgid "Command line options"
 msgstr "명령이 지정되지않음"
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "사용법: %s [옵션]...\n"
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3720,7 +3731,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6911,6 +6922,9 @@ msgstr "끝내기"
 msgid "Sylpheed"
 msgstr "예전 Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "전체"
+
 #~ msgid "/_Tools/E_xecute"
 #~ msgstr "/도구(_T)/실행(_x)"
 
diff --git a/po/lt.po b/po/lt.po
index 7ce3b04c..6551ff81 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -210,34 +210,34 @@ msgstr "iconv negali konvertuoti UTF-7 į %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv negali konvertuoti %s į UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "negaliu rašyti į laikinąjį failą\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Gaunami laiškai iš %s į %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "negaliu perskaityti „mbox“ failo.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "neteisingas „mbox“ formatas: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "pažeistas „mbox“ failas: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "negaliu atverti laikinojo failo\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -246,48 +246,48 @@ msgstr ""
 "unescaped From found:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "Rasta laiškų: %d.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "negaliu sukurti užrakto failo %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "naudokite „flock“ vietoj „file“ jei įmanoma.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "negaliu sukurti %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "dėžutę turi kitas procesas, laukiu...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "negaliu užrakinti %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "blogas užrakto tipas\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "negaliu atrakinti %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "negaliu sumažinti dėžutės iki nulio.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksportuojami laiškai iš %s į %s...\n"
@@ -682,9 +682,9 @@ 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:491
+#: 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:265
+#: 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
@@ -824,8 +824,8 @@ msgstr "Įdėti adresą į knygą"
 msgid "Address"
 msgstr "Adresas"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Pastabos"
 
@@ -833,28 +833,28 @@ msgstr "Pastabos"
 msgid "Select Address Book Folder"
 msgstr "Pažymėkite adresų knygos katalogą"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Failas"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Failas/Nauja _Knyga"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Failas/Nauja „_vCard“ kortelė"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Failas/Naujas _JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 msgid "/_File/New _LDAP Server"
 msgstr "/_Failas/Naujas _LDAP serveris"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +862,177 @@ msgstr "/_Failas/Naujas _LDAP serveris"
 msgid "/_File/---"
 msgstr "/_Failas/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Failas/_Taisa"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Failas/Išt_rinti"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Failas/Iš_saugoti"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Failas/_Užverti"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/_Taisa/Kopi_juoti"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/_Taisa/Į_dėti"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Adresas"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Adresas/Naujas _adresas"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Adresas/Nauja _grupė"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Adresas/Naujas _katalogas"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Adresas/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Adresas/_Redaguoti"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Į_rankiai"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Į_rankiai/Importuoti _LDIF failą"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Naujas _adresas"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Nauja _grupė"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/_Taisa"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Ištrinti"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Kopijuoti..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/_Taisa/Į_dėti"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Adresų knyga"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Vardas:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Ieškoti"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Slapta kopija:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Pašalinti adresą(-us)"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Ar tikrai pašalinti adresą(-us)?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1022,36 +1041,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:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "_Folder only"
 msgstr "Tik _katalogą"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "Folder and _addresses"
 msgstr "Katalogą ir _adresus jame"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tikrai pašalinti „%s“?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Naujas vartotojas, negaliu išsaugoti „index“ failo."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Naujas vartotojas, negaliu išsaugoti adresų knygos failų."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Adresų knyga sėkmingai konvertuota"
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1059,7 +1078,7 @@ msgstr ""
 "Sena adresų knyga konvertuota,\n"
 "negaliu išsaugoti naujo adresų indekso failo"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1067,7 +1086,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "bet sukūriau tuščius naujos knygos failus."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1075,7 +1094,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "negaliu sukurti naujos knygos failų."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1083,88 +1102,88 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "ir negaliu sukurti naujos knygos failų."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Adresų knygos klaida"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Negaliu perskaityti adresų indekso"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Sąsaja"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adresų knyga"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Asmuo"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Grupė"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Katalogas"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "LDAP serveris"
 
@@ -1293,14 +1312,6 @@ msgstr "/_Taisa/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Taisa/Iškirp_ti"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/_Taisa/Kopi_juoti"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/_Taisa/Į_dėti"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Taisa/Įdėti kaip _citatą"
@@ -1746,7 +1757,7 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1834,7 +1845,7 @@ msgid "Nick Name"
 msgstr "Slapyvardis"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "El. pašto adresas"
 
@@ -1904,56 +1915,56 @@ msgstr "Pridėti naują adresų knygą"
 msgid "A Group Name must be supplied."
 msgstr "Turi būti nurodytas grupės pavadinimas"
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Redaguoti grupės duomenis"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Grupės pavadinimas"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Adresai grupėje"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Prieinami adresai"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Redaguoti grupės detales"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Pridėti naują grupę"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Redaguoti katalogą"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Įveskite katalogo pavadinimą:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Naujas katalogas"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Įveskite naujo katalogo pavadinimą:"
 
@@ -2120,42 +2131,42 @@ msgstr "Pasirinkti katalogą"
 msgid "Select folder"
 msgstr "Pasirinkti katalogą"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Gauti"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Išsiųsti"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Eilė"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Šiukšlinė"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Juodraščiai"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "NaujasKatalogas"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "„%c“ negali būti katalogo pavadinime."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalogas „%s“ egzistuoja."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Negaliu sukurti katalogo „%s“."
@@ -2225,73 +2236,73 @@ msgid "New"
 msgstr "Nauji"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Neskaityti"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Nustatoma katalogo informacija...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas “%s%c%s“..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Perkurti katalogų medį"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Bus perkurtas katalogų medis. Tęsti?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Perkuriamas katalogų medis..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "Katalogų medžio perkūrimas nepavyko."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Tikrinami nauji laiškai visuose kataloguose..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Nereikalingas"
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pažymėtas katalogas „%s“\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Gaunami laiškai („%s“)..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Klaida gaunant laiškus („%s“)."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2301,26 +2312,26 @@ msgstr ""
 "(jei norite sukurti katalogą talpinti pakatalogiams,\n"
 " pridėkite „/“ prie vardo pabaigos)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Įveskite naują „%s“ pavadinimą:"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Pervadinti katalogą"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Negaliu pervadinti katalogo „%s“"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Negaliu perkelti katalogo „%s“"
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2329,11 +2340,11 @@ msgstr ""
 "Ištrinti paieškos katalogą „%s“ ?\n"
 "Tikri laiškai nebus trinami."
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 msgid "Delete search folder"
 msgstr "Ištrinti paieškos katalogą"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2346,20 +2357,20 @@ msgstr ""
 "\n"
 "Ar tikrai norite ištrinti?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Negaliu pašalinti katalogo „%s“"
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Išvalyti šiukšlinę"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 msgid "Delete all messages in the trash folder?"
 msgstr "Ištrinti visus laiškus šiukšlinėje?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2368,34 +2379,34 @@ msgstr ""
 "Ar tikrai pašalinti dėžutę „%s“ ?\n"
 "(laiškai NEBUS ištrinti iš disko)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Pašalinti dėžutę"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ar tikrai ištrinti IMAP4 sąskaitą „%s“?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Ištrinti IMAP4 sąskaitą"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ar tikrai ištrinti naujienų grupę „%s“?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Ištrinti naujienų grupę"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ar tikrai pašalinti naujienų sąskaitą „%s“?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Pašalinti naujienų sąskaitą"
 
@@ -3522,27 +3533,27 @@ msgstr "nieko"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Keičiamas lango dalijimo tipas iš %d į %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "Jūs esate atsijungęs. Prisijungti?"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "Išvalyti visas šiukšlines"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 msgid "Delete all messages in trash folders?"
 msgstr "Ištrinti visus laiškus šiukšlinėje?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Pridėti dėžutę"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3552,16 +3563,16 @@ msgstr ""
 "Jeigu ji egzistuoja, ji bus\n"
 "nuskaityta automatiškai."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Dėžutė „%s“ egzistuoja."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Dėžutė"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3570,67 +3581,67 @@ msgstr ""
 "Nepavyko sukurti dėžutės.\n"
 "Galbūt kai kurie failai jau egzistuoja arba jūs neturite leidimo rašyti ten."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Katalogų peržiūra"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Laiško peržiūra"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Atsakyti"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "/Atsakyti _visiems"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/Atsakyti _siuntėjui"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/Atsakyti _konferencijai"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Persiųsti"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Pe_rsiųsti kaip priedą"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Nukreip_ti"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr "Jūs esate atsijungęs. Spustelkite piktogramą jei norite prisijungti."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "Jūs esate prisijungęs. Spustelkite piktogramą jei norite atsijungti."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Išeiti"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Užverti programą?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 msgid "Command line options"
 msgstr "Komandinės eilutės parametrai"
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Naudojimas: sylpheed [PARAMETRAI]..."
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3658,7 +3669,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6793,6 +6804,9 @@ msgstr "Iš_eiti"
 msgid "Sylpheed"
 msgstr "„Sylpheed“"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/nl.po b/po/nl.po
index e0986da6..e5ad551d 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -213,34 +213,34 @@ msgstr "iconv kan UTF-7 niet naar %s omzetten\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan %s niet naar UTF-7 omzetten\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "kan niet naar tijdelijk bestand schrijven\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Berichten worden van %s naar %s opgehaald...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "kan mbox bestand niet inlezen.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "mbox formaat is onjuist: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "onjuist formaat in mbox: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "kan tijdelijk bestand niet openen\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -249,48 +249,48 @@ msgstr ""
 "Afzender zonder escapecodes gevonden:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d berichten gevonden\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "kan lock-bestand niet aanmaken: %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "gebruik 'flock' in plaats van 'file' waar mogelijk\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "kan %s niet aanmaken\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "mailbox wordt vastgehouden door een ander proces. we wachten even...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "kan %s niet locken\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "ongeldig locktype\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "kan de lock niet verwijderen van %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "kan de mailbox niet inkorten tot 0.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Berichten worden geëxporteerd van %s naar %s...\n"
@@ -690,9 +690,9 @@ 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:491
+#: 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:265
+#: 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
@@ -832,8 +832,8 @@ msgstr "Adres toevoegen aan adresboek"
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Opmerkingen"
 
@@ -841,28 +841,28 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Bestand"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Bestand/Nieuw _adresboek"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Bestand/Nieuwe _vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Bestand/Nieuwe _JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 msgid "/_File/New _LDAP Server"
 msgstr "/_Bestand/Nieuwe _LDAP-server"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +870,177 @@ msgstr "/_Bestand/Nieuwe _LDAP-server"
 msgid "/_File/---"
 msgstr "/_Bestand/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Bestand/Aanpassen"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Bestand/_Verwijderen"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Bestand/_Sluiten"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/Be_werken/_Kopiëren"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/Be_werken/_Plakken"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Nieuw _adres"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Nieuwe _groep"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Nieuwe _map"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Bewerken"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Gereedschap"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Nieuw _adres"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Nieuwe _groep"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/Be_werken"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/Ver_wijderen"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Kopieer..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/Be_werken/_Plakken"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Naam:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Zoeken"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Adres(sen) verwijderen"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Wilt u de adressen werkelijk verwijderen?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1031,36 +1050,36 @@ msgstr ""
 "Als u alleen de map verwijdert, dan zullen de adressen naar de \n"
 "hoger gelegen map verplaatst worden."
 
-#: src/addressbook.c:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "_Folder only"
 msgstr "Alleen _map"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "Folder and _addresses"
 msgstr "Map en _adressen"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wilt u '%s' werkelijk verwijderen?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Nieuwe gebruiker: Kon indexbestand niet opslaan."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Nieuwe gebruiker: Kon adresboekbestanden niet opslaan."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Oude adresboekgegevens succesvol omgezet."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1068,7 +1087,7 @@ msgstr ""
 "Oude adresboekgegevens omgezet.\n"
 "Kon het nieuwe adresboek indexbestand niet opslaan."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1076,7 +1095,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Nieuw leeg adresboek is gemaakt."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1084,7 +1103,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon geen nieuwe adresboek bestanden aanmaken."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1092,90 +1111,90 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon ook geen nieuwe adresboekbestanden aanmaken."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Adresboek omzetting"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Adresboekprobleem"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Kon adresboek index niet lezen"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Adresboek Omzetting"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Groep"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Accounts"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1304,14 +1323,6 @@ msgstr "/Be_werken/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Be_werken/K_nippen"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/Be_werken/_Kopiëren"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/Be_werken/_Plakken"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Be_werken/Plakken als _citaat"
@@ -1757,7 +1768,7 @@ msgstr ""
 "Het andere programma is nog steeds actief.\n"
 "Zal ik het programma afbreken (pid: %d?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1845,7 +1856,7 @@ msgid "Nick Name"
 msgstr "Alias"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "E-mail adres"
 
@@ -1915,57 +1926,57 @@ msgstr "Adresboek toevoegen"
 msgid "A Group Name must be supplied."
 msgstr "U moet wel een groepsnaam geven."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Groepsgegevens bewerken"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Groepsnaam"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Adressen in groep"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " ->"
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <-"
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Beschikbare adressen"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Groepsdetails bewerken"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Nieuwe groep toevoegen"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Map hernoemen"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Geef de nieuwe naam van de map:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
@@ -2133,42 +2144,42 @@ msgstr "Kies map"
 msgid "Select folder"
 msgstr "Selecteer map"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Verzonden"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Wachtrij"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Klad"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan map '%s' niet aanmaken."
@@ -2239,73 +2250,73 @@ msgid "New"
 msgstr "Nieuw"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Ongelezen"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Mapinfo wordt ingesteld...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Accountlijst verversen"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "De mappenboom zal opnieuw opgebouwd worden. Doorgaan?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Accountlijst wordt ververst..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "Opnieuw opbouwen van de mappenboom mislukt."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Bezig met controleren op nieuwe berichten in alle mappen..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Troep"
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Map %s is geselecteerd\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Downloaden van berichten in %s ..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Er is een fout opgetreden bij het downloaden van berichten in '%s'."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2315,26 +2326,26 @@ msgstr ""
 "(Als je een map wilt maken om daarin submappen te plaatsen,\n"
 "sluit de naam dan af met een '/')"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Hernoem map"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan map '%s' niet hernoemen."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan map '%s' niet verplaatsen."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2343,11 +2354,11 @@ msgstr ""
 "Wilt u de zoekmap '%s' verwijderen?\n"
 "De berichten zelf zullen NIET worden verwijderd."
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 msgid "Delete search folder"
 msgstr "Zoekmap verwijderen"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2360,20 +2371,20 @@ msgstr ""
 "\n"
 "Wilt u werkelijk verwijderen?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan map '%s' niet verplaatsen."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 msgid "Delete all messages in the trash folder?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2382,34 +2393,34 @@ msgstr ""
 "Wilt u de '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4 account '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Verwijder IMAP4 account"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Verwijder nieuwsgroep"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Nieuwsaccount '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Verwijder nieuwsaccount"
 
@@ -3541,27 +3552,27 @@ msgstr "niets"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Vensterscheidingstype wordt gewijzigd van %d naar %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "Off-line"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "U bent off-line aan het werken. Wilt u on-line gaan?"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "Prullenbakken legen"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 msgid "Delete all messages in trash folders?"
 msgstr "Alle berichten uit de prullenbakken weggooien?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Mailbox toevoegen"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3571,16 +3582,16 @@ msgstr ""
 "Als een bestaande postbus wordt ingevuld,\n"
 "dan wordt hij automatisch ingelezen."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3590,71 +3601,71 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
 "schrijven."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappenoverzicht"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Berichtenoverzicht"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Antwoord"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "/_Iedereen beantwoorden"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/_Afzender beantwoorden"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/_Discussielijst beantwoorden"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/D_oorsturen"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/_Omleiden"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "U bent off-line aan het werken. Klik op het pictogram om on-line te gaan "
 "werken."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 "U bent on-line aan het werken. Klik op het pictogram om off-line te gaan "
 "werken."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Sylpheed afsluiten?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 msgid "Command line options"
 msgstr "Opties voor de opdrachtregel"
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Gebruik: Sylpheed [OPTIES]..."
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3682,7 +3693,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6831,6 +6842,9 @@ msgstr "A_fsluiten"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/pl.po b/po/pl.po
index 18c777b6..118bcbf6 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -210,34 +210,34 @@ msgstr "nie można skonwertować UTF-7 do %s za pomocą programu iconv\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "nie można skonwertować %s do UTF-7 za pomocą programu iconv\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "nie można zapisać do pliku tymczasowego\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Pobieranie wiadomości z %s do %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "nie można odczytać pliku mbox.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "niepoprawny format mbox: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "uszkodzona skrzynka: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "nie można otworzyć pliku tymczasowego\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -246,48 +246,48 @@ msgstr ""
 "znaleziono \"unescaped\" From:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "znaleziono %d wiadomości.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "nie można utworzyć pliku lock %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "jeśli to możliwe, należy użyć \"flock\" zamiast \"file\".\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "nie można utworzyć %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "skrzynka jest kontrolowana przez inny proces, oczekiwanie...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "nie można zablokować %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "nieprawidłowy typ blokady\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "nie można odblokować %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "nie można skrócić do zera.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksportowanie wiadomości z %s do %s...\n"
@@ -679,9 +679,9 @@ 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:491
+#: 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:265
+#: 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
@@ -822,8 +822,8 @@ msgstr "Dodaj do książki adresowej"
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Uwagi"
 
@@ -831,29 +831,29 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog książki adresowej"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Plik"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Plik/Nowa _książka"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Plik/Nowy _vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Plik/Nowy _J-Pilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Plik/Nowy _Serwer"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +861,177 @@ msgstr "/_Plik/Nowy _Serwer"
 msgid "/_File/---"
 msgstr "/_Plik/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Plik/_Edycja"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Plik/_Usuń"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/_Edycja/_Kopiuj"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/_Edycja/_Wstaw"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Plik/Nowy _adres"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Plik/Nowa _grupa"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Plik/Nowy _katalog"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Edycja"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Narzędzia"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Nowy _adres"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Nowa _grupa"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/_Edycja"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Usuń"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Kopiuj..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/_Edycja/_Wstaw"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nazwa:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Wyszukaj"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Ukryta kopia:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Usuń adres(y)"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Czy naprawdę chcesz usunąć ten adres(y)?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1022,38 +1041,38 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "_Folder only"
 msgstr "Tylko katalog"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Katalog i adresy"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Czy naprawdę usunąć \"%s\" ?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Nowy użytkownik, nie można było zapisać pliku indeksu."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 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:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Konwersja starej książki adresowej została zakończona pomyślnie."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1061,7 +1080,7 @@ msgstr ""
 "Stara książka adresowa została skonwertowana,\n"
 "nie można było zapisać nowego pliku indeksu adresów."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1069,7 +1088,7 @@ msgstr ""
 "Nie można było skonwertować książki adresowej,\n"
 "utworzono puste pliki nowej książki adresowej."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1077,7 +1096,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:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1085,92 +1104,92 @@ msgstr ""
 "Nie można było skonwertować książki adresowej\n"
 "oraz utworzyć nowych plików książki adresowej."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Błąd książki adresowej"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Nie można odczytać książki adresowej"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Interfejs"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Katalog"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
@@ -1300,14 +1319,6 @@ msgstr "/_Edycja/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Edycja/Wy_tnij"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/_Edycja/_Kopiuj"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/_Edycja/_Wstaw"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Edycja/Wstaw jako c_ytat"
@@ -1756,7 +1767,7 @@ msgstr ""
 "Czy wymusić zakończenie procesu?\n"
 "identyfikator grupy procesów: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1848,7 +1859,7 @@ msgid "Nick Name"
 msgstr "Pseudonim"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "Adres e-mail"
 
@@ -1918,56 +1929,56 @@ msgstr "Dodaj nową książkę adresową"
 msgid "A Group Name must be supplied."
 msgstr "Należy podać nazwę grupy."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Edytuj dane grupy"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Nazwa grupy"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Adresy w grupie"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Dostępne adresy"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Edytuj szczegóły grupy"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Dodaj nową grupę"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Edytuj katalog"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Podaj nową nazwę katalogu:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Podaj nazwę nowego katalogu:"
 
@@ -2135,42 +2146,42 @@ msgstr "Wybierz katalog"
 msgid "Select folder"
 msgstr "Wybierz katalog"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Odebrane"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Wysłane"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kolejka"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Śmietnik"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Szablony"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "Nowy katalog"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nie może wystąpić w nazwie katalogu."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalog '%s' już istnieje."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nie można utworzyć katalog '%s'."
@@ -2243,73 +2254,73 @@ msgid "New"
 msgstr "Nowy"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Nieprzeczytane"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Ustawianie informacji o katalogu...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Odbuduj drzewo katalogów"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Drzewo katalogów zostnie przebudowane. Kontynuować?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Odbudowywanie drzewa katalogów..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "Błąd podczas odbudowywania drzewa katalogów."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Sprawdzanie nowych wiadomości we wszystkich katalogach..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Wybrano katalog %s\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Błąd podczas pobierania wiadomości z `%s'."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2319,26 +2330,26 @@ msgstr ""
 "(jeśli ma zostać utworzony katalog w celu przechowywania\n"
 "innych wiadomości, należy dołączyć \"/\" na końcu nazwy)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Wprowadź nową nazwę dla '%s' :"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Zmień nazwę katalogu"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2347,12 +2358,12 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Usuń katalog"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2363,21 +2374,21 @@ msgstr ""
 "Wszystkie katalogi i wiadomości w \"%s\" zostaną usunięte.\n"
 "Czy naprawdę chcesz je usunąć?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2386,34 +2397,34 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto IMAP4 \"%s\" ?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Usuń konto IMAP4"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Czy naprawdę chcesz usunąć grupę dyskusyjną \"%s\"?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Usuń grupę dyskusyjną"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto grup dyskusyjnych \"%s\"?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Usuń konto grup dyskusyjnych"
 
@@ -3540,28 +3551,28 @@ msgstr "żaden"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Zmiana typu rozdzielania okna z %d na %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "Jesteś offline. Przejść do trybu online?"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Dodaj skrzynkę"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3572,16 +3583,16 @@ msgstr ""
 "Jeśli zostanie podana istniejąca skrzynka, będzie ona\n"
 "automatycznie skanowana."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka \"%s\" już istnieje."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Skrzynka"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3591,69 +3602,69 @@ msgstr ""
 "Być może pliki już istnieją lub brak jest wystarczających uprawnień do "
 "zapisu w tym miejscu."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Widok Katalogów"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok Wiadomości"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "/Odpowiedz wszystkim"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/Odpowiedz nadawcy"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/Odpowiedz _liście dyskusyjnej"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Prze_każ"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Przekaż jako załącznik"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Prze_kieruj"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr "Jesteś offline. Kliknij ikonę by przejść do trybu online."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "Jesteś online. Kliknij ikonę, by przejść do trybu offline."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Koniec programu"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Czy zakończyć program?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 #, fuzzy
 msgid "Command line options"
 msgstr "Nie ustawiono polecenia."
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Użycie: %s [OPCJE]...\n"
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3669,7 +3680,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6866,6 +6877,9 @@ msgstr "Koniec programu"
 msgid "Sylpheed"
 msgstr "Dawny Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 66ff8e6d..c81e1a98 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 17:07+0900\n"
-"PO-Revision-Date: 2007-02-01 11:42-0300\n"
+"POT-Creation-Date: 2007-02-15 14:54+0900\n"
+"PO-Revision-Date: 2007-02-07 10:31-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -218,34 +218,34 @@ msgstr "o iconv não pode converter UTF-7 para %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "o iconv não pode converter %s para UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "não é possível gravar no arquivo temporário\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Obtendo Mensagens de %s até %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "não foi possível ler o arquivo mbox.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "formato de mbox inválido: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox corrompida: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "não foi possível abrir o arquivo temporário\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -254,48 +254,48 @@ msgstr ""
 "Encontrado De sem codificar:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d mensagens encontradas.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "não foi possível criar o arquivo de trava %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "usar 'flock' em vez de 'file' se for possível.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "não foi possível criar %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "o correio está sendo usado por outro processo, aguardando...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "não foi possível travar %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "tipo de trava inválido\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "não foi possível destravar %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "não foi possível zerar o mailbox.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensagens de %s em %s...\n"
@@ -689,9 +689,9 @@ 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:491
+#: 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:265
+#: 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
@@ -831,8 +831,8 @@ msgstr "Adicionar ao Catálogo de Endereços"
 msgid "Address"
 msgstr "Endereço"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Notas"
 
@@ -840,28 +840,28 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione Pasta do Catálogo de Endereços"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arquivo"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Arquivo/Novo _Livro"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Arquivo/Novo _vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Arquivo/Novo _JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arquivo/Novo Servidor _LDAP"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +869,177 @@ msgstr "/_Arquivo/Novo Servidor _LDAP"
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Arquivo/_Editar"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Arquivo/_Apagar"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/_Editar/C_opiar"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/_Editar/Co_lar"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Endereço"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Endereço/Novo _Endereço"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Endereço/Novo _Grupo"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Endereço/Nova _Pasta"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Endereço/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Endereço/_Editar"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/_Apagar"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_juda"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_juda/_Sobre"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Novo _Endereço"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Novo _Grupo"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/_Editar"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Apagar"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Copiar..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/_Editar/Co_lar"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Procurar"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Cco:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Apagar endereço(s)"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Apagar realmente o(s) endereço(s)?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1029,36 +1048,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:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "_Folder only"
 msgstr "_Pasta apenas"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "Folder and _addresses"
 msgstr "Pasta e _endereços"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Apagar realmente `%s' ?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 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:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Catálogo de endereços antigo convertido com sucesso."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1066,7 +1085,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:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1074,7 +1093,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:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1082,7 +1101,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:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1090,92 +1109,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:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Erro convertendo catálogo de endereços"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Conversão do catálogo de endereços"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Erro no Catálogo de Endereços"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice do endereço"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Erro na conversão do catálogo de endereços"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Conversão do Catálogo de Endereços"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Catálogo de Endereços"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Pessoa"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Pasta"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1304,14 +1323,6 @@ msgstr "/_Editar/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Cortar"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/_Editar/C_opiar"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/_Editar/Co_lar"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Colar como ci_tação"
@@ -1761,7 +1772,7 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr "_Customizar barra de ferramentas..."
 
@@ -1849,7 +1860,7 @@ msgid "Nick Name"
 msgstr "Apelido"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "Endereço de e-mail"
 
@@ -1919,57 +1930,57 @@ 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:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Editar Dados do Grupo"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Nome do Grupo"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Endereços no Grupo"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Endereços Disponíveis"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Editar Detalhes de Grupo"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Adicionar Novo Grupo"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Editar pasta"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Nome da nova pasta:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -2138,42 +2149,42 @@ msgstr "Selecionar diretório"
 msgid "Select folder"
 msgstr "Selecione uma pasta"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Enviadas"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Fila de saída"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "NovaPasta"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' não pode ser usado no nome da pasta."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "A pasta `%s' já existe."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "não foi possível criar a pasta `%s'."
@@ -2243,73 +2254,73 @@ msgid "New"
 msgstr "Nova"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Não lido"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Configurando informações da pasta...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "/_Atualizar árvore de pastas"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "A árvore de pastas será reconstruída. Continuar?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Atualizando visualizador de pasta..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "Falha ao tentar reconstruir a árvore de pastas."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Checar novas mensagens em todas as pastas..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pasta %s selecionada\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Recebendo mensagens em %s ..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Erro ao receber mensagens em `%s'."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2319,26 +2330,26 @@ msgstr ""
 "(se você quer criar uma pasta para armazenar subpastas.\n"
 " adicione `/' no final do nome)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Renomear pasta"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Não foi possível renomear a pasta '%s'."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Não foi possível mover a pasta `%s'."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2347,11 +2358,11 @@ msgstr ""
 "Apagar a pasta de busca '%s' ?\n"
 "As mensagens reais não serão apagadas."
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 msgid "Delete search folder"
 msgstr "Apagar pasta de busca"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2364,20 +2375,20 @@ msgstr ""
 "\n"
 "Quer realmente apagá-las?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Não foi possível excluir a pasta `%s'."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Esvaziar lixeira"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 msgid "Delete all messages in the trash folder?"
 msgstr "Apagar todas as mensagens da lixeira?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2386,34 +2397,34 @@ msgstr ""
 "Realmente remover a caixa de correio `%s' ?\n"
 "(As mensagens NÃO são apagadas do disco)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Remover caixa de correio"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Realmente apagar conta IMAP4 `%s' ?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Apagar conta IMAP4"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Apagar grupo de notícias"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Apagar conta de grupo de notícias"
 
@@ -3536,27 +3547,27 @@ msgstr "nenhuma"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Mudando tipo de separação de janela de %d para %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "Você está desconectado. Conectar?"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "Esvaziar lixeira"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 msgid "Delete all messages in trash folders?"
 msgstr "Apagar todas as mensagens nas lixeiras?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Adicionar caixa de correio"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3566,16 +3577,16 @@ msgstr ""
 "Se uma caixa de correio existente for especificada, ela será\n"
 "analisada automaticamente."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A caixa de correio `%s' já existe."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correio"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3585,67 +3596,67 @@ msgstr ""
 "Talvez alguns arquivos já existam, ou você não tem permissão para escrever "
 "lá."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Visão de Pastas"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Visão de Mensagens"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "/Responder para _todos"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/Responder para o _remetente"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/Responder para a /_lista"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/En_caminhar"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr "Você está desconectado. Clique no ícone para conectar."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "Você está conectado. Clique no ícone para desconectar."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Sair do programa?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 msgid "Command line options"
 msgstr "Opções de linha de comando"
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPÇÃO]..."
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3673,7 +3684,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -5773,14 +5784,12 @@ msgid "Summary display item setting"
 msgstr "Configurações de itens a serem mostrados no resumo"
 
 #: src/prefs_summary_column.c:196
-#, fuzzy
 msgid ""
 "Select items to be displayed on the summary view. You can modify\n"
 "the order by using the Up / Down button."
 msgstr ""
-"Selecione os itens a serem mostrados na barra de ferramentas. Você\n"
-"pode modificar a ordem usando as setas pra cima ou para baixo, ou\n"
-"arrastando os itens."
+"Selecione os itens a serem mostrados na visão resumida. Você\n"
+"pode modificar a ordem usando os botões Acima / Abaixo."
 
 #: src/prefs_template.c:164
 msgid "Template name"
@@ -5823,9 +5832,8 @@ msgid "Do you really want to delete this template?"
 msgstr "Quer realmente apagar este modelo?"
 
 #: src/prefs_toolbar.c:37
-#, fuzzy
 msgid "---- Separator ----"
-msgstr "Separador"
+msgstr "---- Separador ----"
 
 #: src/prefs_toolbar.c:39
 msgid "Get"
@@ -5876,14 +5884,12 @@ msgid "Set as junk mail"
 msgstr "Marcar como spam"
 
 #: src/prefs_toolbar.c:66
-#, fuzzy
 msgid "Not junk"
 msgstr "Não spam"
 
 #: src/prefs_toolbar.c:67
-#, fuzzy
 msgid "Set as not junk mail"
-msgstr "/Marcar como _não spam"
+msgstr "Marcar como não spam"
 
 #: src/prefs_toolbar.c:70
 msgid "Next unread message"
@@ -5894,9 +5900,8 @@ msgid "Previous unread message"
 msgstr "Mensagem anterior não lida"
 
 #: src/prefs_toolbar.c:75
-#, fuzzy
 msgid "Search"
-msgstr "Procurar:"
+msgstr "Procurar"
 
 #: src/prefs_toolbar.c:76 src/query_search.c:251
 msgid "Search messages"
@@ -5983,14 +5988,12 @@ msgid "Customize toolbar"
 msgstr "Customizar barra de ferramentas"
 
 #: src/prefs_toolbar.c:219
-#, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
 "the order by using the Up / Down button."
 msgstr ""
 "Selecione os itens a serem mostrados na barra de ferramentas. Você\n"
-"pode modificar a ordem usando as setas pra cima ou para baixo, ou\n"
-"arrastando os itens."
+"pode modificar a ordem usando os botões Acima / Abaixo."
 
 #: src/printing.c:515
 msgid "The message will be printed with the following command:"
@@ -6810,6 +6813,9 @@ msgstr "Sai_r"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/ro.po b/po/ro.po
index 44bf5ce6..a410975e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 17:07+0900\n"
-"PO-Revision-Date: 2007-02-04 21:32+0200\n"
+"POT-Creation-Date: 2007-02-15 14:54+0900\n"
+"PO-Revision-Date: 2007-02-09 09:49+0200\n"
 "Last-Translator: Cristian Secară <cristi@secarica.ro>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -218,34 +218,34 @@ msgstr "iconv nu poate efectua conversia UTF-7 la %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nu poate efectua conversia %s la UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "nu se poate scrie în fișierul temporar\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Obținere mesaje de la %s în %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "nu se poate citi fișierul mbox.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "format mbox invalid: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox malformat: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "nu se poate deschide fișierul temporar\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -254,48 +254,48 @@ msgstr ""
 "a fost găsit câmp From 'unescaped':\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d mesaje găsite.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "nu se poate crea fișierul 'lock' %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "dacă este posibil, folosiți 'flock' în loc de 'file'.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "nu se poate crea %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "căsuța poștală este folosită de alt proces, așteaptați...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "nu se poate bloca %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "tip blocare invalid\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "nu se poate debloca %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "nu se poate reteza la zero căsuța poștală.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportare mesaje din %s în %s...\n"
@@ -695,9 +695,9 @@ 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:491
+#: 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:265
+#: 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
@@ -845,8 +845,8 @@ msgstr "Adăugare în agendă"
 msgid "Address"
 msgstr "Agendă"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Observații"
 
@@ -854,28 +854,28 @@ msgstr "Observații"
 msgid "Select Address Book Folder"
 msgstr "Selectați folderul pentru agendă"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fișier"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Fișier/A_gendă nouă"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Fișier/_vCard nou"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Fișier/_JPilot nou"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fișier/Server _LDAP nou"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,160 +883,179 @@ msgstr "/_Fișier/Server _LDAP nou"
 msgid "/_File/---"
 msgstr "/_Fișier/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Fișier/_Editează"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Fișier/Ș_terge"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Fișier/_Salvează"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fișier/Î_nchide"
 
-#: src/addressbook.c:352
+# obs: comun și în main menu și în rmb agendă
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/_Editare/_Copiază"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/_Editare/Li_pește"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/A_dresă"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/A_dresă/_Adresă nouă"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/A_dresă/_Grup nou"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/A_dresă/_Folder nou"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/A_dresă/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/A_dresă/_Editează"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/A_dresă/Ș_terge"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Unelte"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Unelte/Importă fișier _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ajutor"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ajutor/_Despre"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/_Adresă nouă"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/_Grup nou"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/_Folder nou"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-# obs: comun și în main menu și în rmb agendă
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/_Editare"
-
 # obs: comun și la intrare în agendă și la rmb pe mesaj
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/Șter_ge"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Copiază..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/_Editare/Li_pește"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "Adresă e-mail"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Agendă"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr " Nume:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Căutare"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Șterge adresa (adresele)"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Sigur ștergeți adresa (adresele) ?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1045,36 +1064,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:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Ștergere folder"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "_Folder only"
 msgstr "Doar _folder"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "Folder and _addresses"
 msgstr "Folder și _adrese"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Sigur ștergeți '%s' ?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Utilizator nou, fișierul index nu a putut fi salvat."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Utilizator nou, fișierele agendei nu au putut fi salvate."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Agenda veche a fost convertită cu succes."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1082,7 +1101,7 @@ msgstr ""
 "Agenda veche a fost convertită, iar\n"
 "fișierul index al noii agende nu a putut fi salvat."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1090,7 +1109,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, dar\n"
 "au fost create fișierele noi de agendă goală."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1098,7 +1117,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, iar\n"
 "fișierele noi de agendă nu au putut fi create."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1106,92 +1125,92 @@ msgstr ""
 "Agenda nu a putut fi convertită\n"
 "și fișierele noi de agendă nu au putut fi create."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Eroare agendă"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Fișierul index al agendei nu a putut fi citit"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Interfață"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Agendă"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Persoană"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "Adresă e-mail"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Grupă"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Folder"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1280,13 +1299,14 @@ msgstr "/_Fișier/_Trimite"
 msgid "/_File/Send _later"
 msgstr "/_Fișier/Trimite _mai târziu"
 
+# !!! dependent de traducerea lui draft !!!
 #: src/compose.c:550
 msgid "/_File/Save to _draft folder"
-msgstr "/_Fișier/Salvează în fol_derul ciorne"
+msgstr "/_Fișier/Salvează în folderul _ciorne"
 
 #: src/compose.c:552
 msgid "/_File/Save and _keep editing"
-msgstr "/_Fișier/Salvează și _continuă editarea"
+msgstr "/_Fișier/_Salvează și continuă editarea"
 
 #: src/compose.c:555
 msgid "/_File/_Attach file"
@@ -1321,14 +1341,6 @@ msgstr "/_Editare/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Editare/_Taie"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/_Editare/_Copiază"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/_Editare/Li_pește"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editare/_Lipește ca citare"
@@ -1781,7 +1793,7 @@ msgstr ""
 "Editorul extern este încă în funcțiune.\n"
 "Forțați terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr "_Personalizează bara de unelte..."
 
@@ -1869,7 +1881,7 @@ msgid "Nick Name"
 msgstr "Pseudonim"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "Adresă e-mail"
 
@@ -1940,56 +1952,56 @@ msgstr "Adăugă agendă nouă"
 msgid "A Group Name must be supplied."
 msgstr "Trebuie furnizat un nume de grup."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Editează date grup"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Nume grup"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Adrese în grup"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Adrese disponibile"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Editează detalii grup"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Adaugă grup nou"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Editează folder"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Introduceți noul nume al folderului:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Folder nou"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Introduceți numele noului folder:"
 
@@ -2160,42 +2172,42 @@ msgstr "Selectează director"
 msgid "Select folder"
 msgstr "Selectează folder"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Primite (Inbox)"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Trimise"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Coadă"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Gunoi"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Ciorne"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "Folder nou"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nu poate fi inclus în numele folderului."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Folderul '%s' există deja."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Folderul '%s' nu a putut fi creat."
@@ -2250,7 +2262,7 @@ msgstr "/Desc_arcă"
 
 #: src/folderview.c:293
 msgid "/Su_bscribe to newsgroup..."
-msgstr "/Su_bscrie la grup de știri..."
+msgstr "/Su_bscrie la grupuri de știri..."
 
 #: src/folderview.c:295
 msgid "/_Remove newsgroup"
@@ -2265,73 +2277,73 @@ msgid "New"
 msgstr "Nou"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Necitit"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Setare informații folder...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Setare informații folder..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare folder %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare folder %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Reconstruiește arbore foldere"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Arborele de foldere va fi reconstruit. Continui ?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Reconstrucție arbore foler..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "Reconstrucția arborelui de foldere a eșuat."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Verifică pentru mesaje noi în toate folderele..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Este selectat folderul %s\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descărcare mesaje în %s..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "A apărut o eroare în timpul descărcării mesajelor în '%s'."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2341,26 +2353,26 @@ msgstr ""
 "(dacă doriți să creați un folder care să conțină subfoldere,\n"
 " adăugați '/' la sfârșitul numelui)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Introduceți noul nume pentru '%s':"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Redenumește folderul"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nu se poate redenumi folderul '%s'"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nu se poate muta folderul '%s'"
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2369,11 +2381,11 @@ msgstr ""
 "Ștergeți folderul de căutare '%s' ?\n"
 "Mesajele reale NU sunt șterse de pe disc."
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 msgid "Delete search folder"
 msgstr "Șterge folderul pentru căutare"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2386,23 +2398,23 @@ msgstr ""
 "\n"
 "Chiar doriți să ștergeți ?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nu se poate șterge folderul '%s'."
 
 # hm ? nu merge golește gunoiul cu fraza următoare, sau trebuie reformulată fraza următoare
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Golire gunoi"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 msgid "Delete all messages in the trash folder?"
 msgstr "Ștergeți toate mesajele din containerul de gunoi ?"
 
 # sau ștergeți ?
 # sau retrageți ?
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2411,34 +2423,34 @@ msgstr ""
 "Chiar ștergeți căsuța poștală '%s' ?\n"
 "(Mesajele NU sunt șterse de pe disc)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Șterge căsuța poștală"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Sigur ștergeți contul IMAP4 '%s'?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Șterge cont IMAP4"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Sigur ștergeți grupul de știri '%s' ?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Ștergere grup de știri"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Sigur ștergeți contul de știri '%s' ?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Șterge contul de știri"
 
@@ -2704,10 +2716,9 @@ msgstr "Obținerea dimensiunii mesajelor (LIST)..."
 msgid "Deleting message %d"
 msgstr "Ștergere mesaje %d"
 
-# hm ?
 #: src/inc.c:931 src/send_message.c:667
 msgid "Quitting"
-msgstr "Închidere conexiune"
+msgstr "Părăsire"
 
 #: src/inc.c:956
 #, c-format
@@ -3066,7 +3077,7 @@ msgstr "/_Vizualizare/Arată sau ascun_de/Bară de unel_te/Iconuri și te_xt"
 #: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr ""
-"/_Vizualizare/Arată sau ascun_de/Bară de unel_te/Text la _dreapta iconului"
+"/_Vizualizare/Arată sau ascun_de/Bară de unel_te/Text la _dreapta iconurilor"
 
 #: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
@@ -3446,7 +3457,7 @@ msgstr "/_Unelte/_Crează regulă de filtrare/pe baza câmpului _Subiect"
 
 #: src/mainwindow.c:812
 msgid "/_Tools/Filter _junk mails in folder"
-msgstr "/_Unelte/Filtrează mesajele spam î_n folder"
+msgstr "/_Unelte/Filtrează mesa_jele spam în folder"
 
 #: src/mainwindow.c:814
 msgid "/_Tools/Filter junk _mails in selected messages"
@@ -3454,12 +3465,12 @@ msgstr "/_Unelte/Filtrează _mesajele spam în mesajele selectate"
 
 #: src/mainwindow.c:821
 msgid "/_Tools/Delete du_plicated messages"
-msgstr "/_Unelte/Șterge mesaje du_plicate"
+msgstr "/_Unelte/Șterge mesajele du_plicate"
 
 # !!! n-am pus _
 #: src/mainwindow.c:824
 msgid "/_Tools/E_xecute marked process"
-msgstr "/Unel_te/Execută procesele marcate"
+msgstr "/_Unelte/E_xecută procesele marcate"
 
 # temporar (log)
 #: src/mainwindow.c:826
@@ -3579,30 +3590,30 @@ msgstr "nimic"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Schimbare tip separator fereastră din %d în %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "Deconectat"
 
 # hm ?
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "Sunteți în modul deconectat. Treceți în modul conectat ?"
 
 # hm ? nu merge golește gunoiul cu fraza următoare, sau trebuie reformulată fraza următoare
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "Golire gunoi"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 msgid "Delete all messages in trash folders?"
 msgstr "Ștergeți toate mesajele din containerele de gunoi ?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Adaugă căsuță poștală"
 
 # hm ? sau specificați ? este o explicație sau o comandă ?
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3612,16 +3623,16 @@ msgstr ""
 "Dacă este specificată căsuța poștală existentă,\n"
 "aceasta va fi scanată automat."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Cutia poștală '%s' există deja."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Căsuță poștală"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3631,69 +3642,69 @@ msgstr ""
 "Poate că anumite fișiere există deja, sau acolo nu aveți permisiuni de "
 "scriere."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vizualizare folder"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vizualizare mesaj"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Răspunde"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "/Răspunde _tuturor"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/Răspunde _expeditorului"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/Răspunde _listei de discuții"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Trimite mai _departe"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Trimite mai departe ca _atașament"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Redirecționea_ză"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Sunteți în modul deconectat. Clic pe icon pentru a trece în modul conectat."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 "Sunteți în modul conectat. Clic pe icon pentru a trece în modul deconectat."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Ieșire"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Ieșiți din acest program ?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 msgid "Command line options"
 msgstr "Opțiuni line de comandă"
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilizare: sylpheed [OPȚIUNE]..."
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3721,7 +3732,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3819,7 +3830,7 @@ msgstr "/Deschide _cu..."
 
 #: src/mimeview.c:131
 msgid "/_Display as text"
-msgstr "/Afișază ca te_xt"
+msgstr "/_Afișază ca text"
 
 #: src/mimeview.c:132
 msgid "/_Save as..."
@@ -3860,7 +3871,7 @@ msgstr "Deschide _cu..."
 
 #: src/mimeview.c:642
 msgid "_Display as text"
-msgstr "Afișază ca te_xt"
+msgstr "_Afișază ca text"
 
 #: src/mimeview.c:646
 msgid "_Save as..."
@@ -3878,10 +3889,11 @@ msgstr ""
 msgid "_Check signature"
 msgstr "Verifi_că semnătură"
 
+# hm ? 'selectată' e corect ?
 #: src/mimeview.c:977 src/mimeview.c:1044 src/mimeview.c:1080
 #: src/mimeview.c:1113 src/mimeview.c:1136
 msgid "Can't save the part of multipart message."
-msgstr "Salvarea părții selectate din mesajul multipart este imposibilă."
+msgstr "Nu se poate salva partea selectată din părțile multiple ale mesajului."
 
 #: src/mimeview.c:1057
 msgid "Can't save the attachments."
@@ -3897,7 +3909,7 @@ msgid ""
 "Enter the command line to open file:\n"
 "(`%s' will be replaced with file name)"
 msgstr ""
-"Intrați în linia de comandă pentru deschidere fișier:\n"
+"Intrați în linia de comandă pentru a deschide fișierul:\n"
 "('%s' va fi înlocuit cu numele fișierului)"
 
 #: src/mimeview.c:1178
@@ -3947,7 +3959,7 @@ msgstr ""
 
 #: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
-msgstr "Deschidere fereastră de configurație cont...\n"
+msgstr "Deschidere fereastră de preferințe cont...\n"
 
 #: src/prefs_account_dialog.c:481
 #, c-format
@@ -3956,7 +3968,7 @@ msgstr "Cont%d"
 
 #: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
-msgstr "Preferințe pentru noul cont"
+msgstr "Preferințe pentru contul nou"
 
 #: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
 msgid "Account preferences"
@@ -4142,7 +4154,8 @@ msgstr "Fără limită dacă este specificat 0"
 
 #: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
-msgstr "'Verifică tot' verifică eventuale mesaje noi (și) pentru acest cont"
+msgstr ""
+"'Verifică tot' verifică pentru eventuale mesaje noi (și) pentru acest cont"
 
 # !!! netradus !!!
 #: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
@@ -4997,7 +5010,7 @@ msgstr "Minimizează pe iconul din zona de notificare (tray icon)"
 
 #: src/prefs_common_dialog.c:2168
 msgid "Toggle window on trayicon click"
-msgstr "Comută fereastra la clic pe zona de notificare (tray icon)"
+msgstr "Comută fereastra la clic pe iconul din zona de notificare (tray icon)"
 
 #: src/prefs_common_dialog.c:2178
 msgid " Set key bindings... "
@@ -5848,13 +5861,12 @@ msgid "Summary display item setting"
 msgstr "Stabilire elemente afișate ale sumarului"
 
 #: src/prefs_summary_column.c:196
-#, fuzzy
 msgid ""
 "Select items to be displayed on the summary view. You can modify\n"
 "the order by using the Up / Down button."
 msgstr ""
 "Selectați elementele de afișat la vizualizarea sumarului.\n"
-"Puteți modifica ordinea utilizând butoanele Sus/Jos, sau trăgând de elemente."
+"Puteți modifica ordinea utilizând butoanele Sus/Jos."
 
 #: src/prefs_template.c:164
 msgid "Template name"
@@ -5897,18 +5909,17 @@ msgid "Do you really want to delete this template?"
 msgstr "Sigur doriți să ștergeți acest șablon ?"
 
 #: src/prefs_toolbar.c:37
-#, fuzzy
 msgid "---- Separator ----"
-msgstr "Separator"
+msgstr "---- Separator ----"
 
 #: src/prefs_toolbar.c:39
 msgid "Get"
 msgstr "Verifică"
 
-# ???
+# hm ?
 #: src/prefs_toolbar.c:40
 msgid "Incorporate new mail"
-msgstr "Verifică și eventual încorporează mesaje noi pentru contul curent"
+msgstr "Verifică și încorporează eventualele mesaje noi pentru contul curent"
 
 #: src/prefs_toolbar.c:42
 msgid "Get all"
@@ -5916,11 +5927,11 @@ msgstr "Verifică tot"
 
 #: src/prefs_toolbar.c:43
 msgid "Incorporate new mail of all accounts"
-msgstr "Verifică și eventual încorporează mesaje noi pentru toate conturile"
+msgstr "Verifică și încorporează eventualele mesaje noi pentru toate conturile"
 
 #: src/prefs_toolbar.c:46
 msgid "Send queued message(s)"
-msgstr "Trimite eventualele mesaje din coada de așteptare"
+msgstr "Trimite mesajele din coada de așteptare"
 
 #: src/prefs_toolbar.c:49
 msgid "Compose new message"
@@ -5951,14 +5962,12 @@ msgid "Set as junk mail"
 msgstr "Marchează ca spam"
 
 #: src/prefs_toolbar.c:66
-#, fuzzy
 msgid "Not junk"
 msgstr "Nu e spam"
 
 #: src/prefs_toolbar.c:67
-#, fuzzy
 msgid "Set as not junk mail"
-msgstr "/Marchează ca _util"
+msgstr "Marchează ca util"
 
 #: src/prefs_toolbar.c:70
 msgid "Next unread message"
@@ -5966,12 +5975,11 @@ msgstr "Următorul mesaj necitit"
 
 #: src/prefs_toolbar.c:73
 msgid "Previous unread message"
-msgstr "Mesajul necitit precedent"
+msgstr "Precedentul mesaj necitit"
 
 #: src/prefs_toolbar.c:75
-#, fuzzy
 msgid "Search"
-msgstr "Caută:"
+msgstr "Caută"
 
 #: src/prefs_toolbar.c:76 src/query_search.c:251
 msgid "Search messages"
@@ -5979,7 +5987,7 @@ msgstr "Caută mesaje"
 
 #: src/prefs_toolbar.c:78 src/printing.c:518
 msgid "Print"
-msgstr "Tipărire"
+msgstr "Tipărește"
 
 #: src/prefs_toolbar.c:79
 msgid "Print message"
@@ -6058,15 +6066,13 @@ msgstr "Desparte toate liniile lungi"
 msgid "Customize toolbar"
 msgstr "Personalizează bara de unelte"
 
-# hm ?
 #: src/prefs_toolbar.c:219
-#, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
 "the order by using the Up / Down button."
 msgstr ""
 "Selectați elementele de afișat pe bara de unelte.\n"
-"Puteți modifica ordinea utilizând butoanele Sus/Jos, sau trăgând de elemente."
+"Puteți modifica ordinea utilizând butoanele Sus/Jos."
 
 #: src/printing.c:515
 msgid "The message will be printed with the following command:"
@@ -6413,7 +6419,7 @@ msgstr ""
 
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
-msgstr "Subscrie la grup de știri"
+msgstr "Subscriere la grupuri de știri"
 
 #: src/subscribedialog.c:219
 msgid "Select newsgroups to subscribe."
@@ -6892,3 +6898,6 @@ msgstr "_Ieșire"
 #: src/trayicon.c:198 src/trayicon.c:289
 msgid "Sylpheed"
 msgstr "Sylpheed"
+
+#~ msgid "#"
+#~ msgstr "#"
diff --git a/po/ru.po b/po/ru.po
index 8d6f6bbc..9c6538ed 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -212,34 +212,34 @@ msgstr "ошибка преобразования iconv из UTF-7 в %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "ошибка преобразования iconv из %s в UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "ошибка записи во временный файл\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Получение сообщений из %s в %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "ошибка чтения файла mbox.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "неверный формат почтового ящика: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "испорченный почтовый ящик: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "ошибка при открытии временного файла \n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -248,49 +248,49 @@ msgstr ""
 "найдена незащищённая строка From:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "найдено %d сообщений.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "ошибка создания файла блокировки %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "используйте \"flock\" вместо \"file\", если возможно.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "не удалось создать %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "почтовый ящик занят другим процессом, ожидание...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, fuzzy, c-format
 msgid "can't lock %s\n"
 msgstr "не удалось создать %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 #, fuzzy
 msgid "invalid lock type\n"
 msgstr "Неверный тип MIME."
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, fuzzy, c-format
 msgid "can't unlock %s\n"
 msgstr "не удалось создать %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "не удалось обрезать почтовый ящик до нуля.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Экспорт сообщений из %s в %s...\n"
@@ -687,9 +687,9 @@ msgstr ""
 "Пометьте в колонке \"G\" учётные записи, которые нужно проверять\n"
 "по команде \"Получить все\"."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:491
+#: 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:265
+#: 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
@@ -829,8 +829,8 @@ msgstr "Добавление адреса в книгу"
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Примечание"
 
@@ -838,28 +838,28 @@ msgstr "Примечание"
 msgid "Select Address Book Folder"
 msgstr "Выберите папку в адресной книге"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/Файл/Новая книга"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/Файл/Новый файл vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новый файл JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новый сервер LDAP"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +867,177 @@ msgstr "/Файл/Новый сервер LDAP"
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/Файл/Правка"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/Файл/Удалить"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/Файл/Сохранить"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрыть"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/Правка/Копировать"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/Правка/Вставить"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/Адрес"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/Адрес/Новый адрес"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/Адрес/Новая группа"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/Адрес/Новая папка"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/Адрес/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/Адрес/Правка"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Инструменты"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Инструменты/Импорт файла LDIF"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Новый адрес"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Новая группа"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Новая папка"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/Правка"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/Удалить"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/Копировать"
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/Правка/Вставить"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Имя:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Найти"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Скрытно:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Удалить адрес(а)"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Действительно удалить адрес(а)?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1027,36 +1046,36 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Удалить папку"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "_Folder only"
 msgstr "Только папку"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "Folder and _addresses"
 msgstr "Папку и адреса"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Действительно удалить \"%s\"?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Новый пользователь; не удалось сохранить индексный файл."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Новый пользователь; не удалось сохранить файлы адресной книги."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Старая адресная книга успешно преобразована."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1064,7 +1083,7 @@ msgstr ""
 "Старая адресная книга преобразована,\n"
 "не удалось сохранить новый индексный файл."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1072,7 +1091,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "создана пустая адресная книга."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1080,7 +1099,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "ошибка при создании файлов адресной книги."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1088,91 +1107,91 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "кроме того, произошла ошибка при создании файлов новой адресной книги."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Ошибка при работе с адресной книгой"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Не удалось прочитать индекс адресов"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старая адресная книга преобразована, не удалось сохранить новый индексный "
 "файл"
 
-#: src/addressbook.c:2529
+#: src/addressbook.c:2576
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, создана пустая адресная книга."
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2582
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, ошибка при создании новых файлов "
 "адресной книги"
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2588
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, кроме того, произошла ошибка при "
 "создании новых файлов адресной книги."
 
-#: src/addressbook.c:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Контакт"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Группа"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1301,14 +1320,6 @@ msgstr "/Правка/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Правка/Вырезать"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/Правка/Копировать"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/Правка/Вставить"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Правка/Вставить как цитату"
@@ -1755,7 +1766,7 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1843,7 +1854,7 @@ msgid "Nick Name"
 msgstr "Псевдоним"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "Адрес E-Mail"
 
@@ -1913,56 +1924,56 @@ msgstr "Добавление новой адресной книги"
 msgid "A Group Name must be supplied."
 msgstr "Необходимо указать название группы."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Изменение сведений о группе"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Название группы"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Адреса в группе"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Доступные адреса"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Используйте кнопки со стрелками для изменения списка адресов группы"
 
-#: src/editgroup.c:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Изменение сведений о группе"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Добавление новой группы"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Изменить имя папки"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Введите новое имя папки:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Новая папка"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Введите имя новой папки:"
 
@@ -2130,42 +2141,42 @@ msgstr "Выбор каталога"
 msgid "Select folder"
 msgstr "Выбор папки"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Входящие"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Отправленные"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Очередь"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Корзина"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Черновики"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "НоваяПапка"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Символ \"%c\" не может входить в имя папки."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка \"%s\" уже существует."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не удалось создать папку \"%s\"."
@@ -2236,73 +2247,73 @@ msgid "New"
 msgstr "Новые"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Не прочитано"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Установка информации о папке...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Перестроить дерево папок"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дерево папок будет перестроено. Продолжить?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Перестройка дерева папок..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ошибка при перестройке дерева папок."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Проверка новых сообщений во всех папках..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Спам"
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s выбрана\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Загружаются сообщения из %s ..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Произошла ошибка при загрузке сообщений из \"%s\"."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2312,26 +2323,26 @@ msgstr ""
 "(если вы хотите создать папку для вложенных папок,\n"
 " добавьте \"/\" в конец имени)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введите новое имя для \"%s\":"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Переименовать папку"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Не удалось переименовать папку \"%s\"."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Не удалось переместить папку \"%s\"."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2340,11 +2351,11 @@ msgstr ""
 "Удалить папку поиска \"%s\"?\n"
 "Это не приведёт к удалению сообщений."
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 msgid "Delete search folder"
 msgstr "Удалить папку поиска"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2357,20 +2368,20 @@ msgstr ""
 "\n"
 "Вы действительно хотите удалить папку?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ошибка при удалении папки \"%s\"."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Очистка корзины"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 msgid "Delete all messages in the trash folder?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2379,34 +2390,34 @@ msgstr ""
 "Удалить почтовый ящик \"%s\"?\n"
 "(Сообщения не будут удалены с диска)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Удалить почтовый ящик"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Удалить учётную запись IMAP4 \"%s\"?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Удалить учётную запись IMAP4"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Удалить группу новостей \"%s\"?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Удаление группы новостей"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Удалить учётную запись новостей \"%s\"?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Удалить учётную запись новостей"
 
@@ -3533,27 +3544,27 @@ msgstr "нет"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Изменение типа разделения окна с %d на %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "Автономная работа"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "Вы работаете в автономном режиме. Подключиться к сети?"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "Очистить все корзины"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 msgid "Delete all messages in trash folders?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Добавить почтовый ящик"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3563,16 +3574,16 @@ msgstr ""
 "Если будет указан существующий ящик, то он\n"
 "будет автоматически прочитан."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Почтовый ящик \"%s\" уже существует."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3582,68 +3593,68 @@ msgstr ""
 "Возможно, некоторые файлы уже существуют, или вы не имеете прав на запись в "
 "каталог."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Сообщение"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Ответить"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "/Ответить всем"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/Ответить отправителю"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/Ответить в список рассылки"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Переслать"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Переслать как вложение"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Перенаправить без изменений"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Вы работаете в автономном режиме. Щёлкните по значку, чтобы подключиться."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы подключены. Щёлкните по значку, чтобы работать автономно."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Выйти из программы?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 msgid "Command line options"
 msgstr "Параметры командной строки"
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Использование: sylpheed [ПАРАМЕТР]..."
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3671,7 +3682,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6816,6 +6827,9 @@ msgstr "Выход"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/sk.po b/po/sk.po
index 694d1301..a9b9d31c 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -214,34 +214,34 @@ msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemôže skonvertovať %s na UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "nemôžem zapisovať do dočasného súboru\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Prijímam správy z %s do %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "nemôžem prečítať súbor mbox.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "neplatný formát mbox: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "poškodený mbox: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "nemôžem otvoriť dočasný súbor\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -250,48 +250,48 @@ msgstr ""
 "neukončené From:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "nájdených %d správ.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "nemôžem vytvoriť zámkový súbor %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "ak je to možné, miesto 'file' použite 'flock'.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "nemôžem vytvoriť %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "iný proces vlastní mailbox, čakám...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "nemôžem uzamknúť %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "neplatný typ zámku\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "nemôžem odomknúť %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "nemôžem skrátiť mailbox na nulovú dĺžku.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportujem správy z %s do %s...\n"
@@ -680,9 +680,9 @@ 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:491
+#: 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:265
+#: 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
@@ -824,8 +824,8 @@ msgstr "Pridať adresu do adresára"
 msgid "Address"
 msgstr "Adresár"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Poznámky"
 
@@ -833,29 +833,29 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Súbor"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Súbor/Nový _Adresár"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Súbor/Nový _vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Súbor/Nový _JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Súbor/Nový _Server"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +863,177 @@ msgstr "/_Súbor/Nový _Server"
 msgid "/_File/---"
 msgstr "/_Súbor/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Súbor/_Upraviť"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Súbor/Z_mazať"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/Úp_ravy/_Kopírovať"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/Úp_ravy/_Prilepiť"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _Adresa"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _Skupina"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nový _Priečinok"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Adresa/--- "
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Upraviť"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Nová _Adresa"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Nová _Skupina"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/_Upraviť"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/Z_mazať"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Kopírovať..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/Úp_ravy/_Prilepiť"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Meno:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Vyhľadať"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Zmazať adresu(y)"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Naozaj zmazať adresu(y)?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1023,38 +1042,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:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "_Folder only"
 msgstr "Len priečinok"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Priečinok aj adresy"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Naozaj zmazať '%s' ?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Nový uživateľ; nepodarilo sa uložiť indexový súbor."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Nový uživateľ; nedajú sa uložiť súbory adresára."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Konverzia starého adresára prebehla úspešne."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1062,7 +1081,7 @@ msgstr ""
 "Konverzia starého adresára prebehla,\n"
 "nedá sa uložiť indexový súbor nového adresára"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1070,7 +1089,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "ale boli vytvorené prázdne súbory nového adresára."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1078,7 +1097,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1086,92 +1105,92 @@ msgstr ""
 "Nedá sa konvertovať starý adresár\n"
 "a nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Chyba v adresári"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Nedá sa načítať zoznam adries"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Ovládanie"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adresár"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Priečinok"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1305,14 +1324,6 @@ msgstr "/Úp_ravy/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vystrihnúť"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/Úp_ravy/_Kopírovať"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/Úp_ravy/_Prilepiť"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Prilepiť ako _citáciu"
@@ -1791,7 +1802,7 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1884,7 +1895,7 @@ msgid "Nick Name"
 msgstr "Prezývka"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "E-mailová adresa"
 
@@ -1954,57 +1965,57 @@ msgstr "Pridať nový adresár"
 msgid "A Group Name must be supplied."
 msgstr "Musíte zadať názov skupiny."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Upraviť údaje skupiny"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Názov skupiny"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Adresy v skupine"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Dostupné adresy"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Upraviť detaily skupiny"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Pridať novú skupinu"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Upraviť priečinok"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nový priečinok"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 
@@ -2173,42 +2184,42 @@ msgstr "Spoolovací priečinok"
 msgid "Select folder"
 msgstr "Zvoľte priečinok"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Prijaté"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Odoslané"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Na odoslanie"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Odpadkový kôš"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "Nový Priečinok"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Názov priečinka nemôže obsahovať `%c'."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Priečinok `%s' už existuje."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nedá sa vytvoriť priečinok `%s'."
@@ -2283,73 +2294,73 @@ msgid "New"
 msgstr "Nový"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Neprečítané"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Nastavujem informácie o priečinku...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Obnoviť strom priečinkov"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Strom priečinkov bude obnovený. Pokračovať?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom priečinku..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "Obnova stromu priečinku sa nepodarila."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Priečinok %s je zvolený\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Odosielam správu..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2359,26 +2370,26 @@ msgstr ""
 "(Ak chcete vytvoriť priečinok s ďalšími podzložkami,\n"
 "pridajte na koniec názvu '/')"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadajte nový názov pre `%s':"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2387,12 +2398,12 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Odstrániť priečinok"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2403,21 +2414,21 @@ msgstr ""
 "Všetky priečinky a správy v `%s' budú odstránené.\n"
 "Naozaj pokračovať?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2426,34 +2437,34 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naozaj chcete odstrániť IMAP4 konto '%s'?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Odstrániť IMAP4 konto"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naozaj chcete odstrániť diskusnú skupinu '%s'?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Odstrániť diskusnú skupinu"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naozaj chcede odstrániť news konto '%s'?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Odstrániť news konto"
 
@@ -3605,29 +3616,29 @@ msgstr "žiadny"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Mením typ oddeľovača okien z %d na %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "Odpojené"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "Ste odpojený. Pripojiť sa?"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Pridať mailbox"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3638,16 +3649,16 @@ msgstr ""
 "Ak zadáte existujúci mailbox, bude\n"
 "automaticky prehľadaný."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3657,72 +3668,72 @@ msgstr ""
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte práva na "
 "zapisovanie."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazenie priečinku"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie správy"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Odpovedať"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dpovedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Poslať ďalej ako p_rílohu"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Pr_esmerovať"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr "Ste odpojený. Kliknite na ikonu, ak sa chcete pripojiť."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "Ste pripojený. Kliknite na ikonu, ak sa chcete odpojiť."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Ukončiť program"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 #, fuzzy
 msgid "Command line options"
 msgstr "Nebol zadaný príkazový riadok."
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Použitie: %s [VOĽBY]...\n"
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3738,7 +3749,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6964,6 +6975,9 @@ msgstr "Ukončiť"
 msgid "Sylpheed"
 msgstr "Starší Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/sl.po b/po/sl.po
index 68437cff..9d1f352a 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -217,34 +217,34 @@ msgstr "iconv ne more pretvoriti UTF-7 v %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne more pretvoriti %s v UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "ne morem pisati v začasno datoteko\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "ne morem prebrati datoteke mbox.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "napačen format mbox: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "napačno oblikovan mbox: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "ne morem odpreti začasne datoteke\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -253,48 +253,48 @@ msgstr ""
 "najdeno neubežno polje Od:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "najdenih %d sporočil.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "ne morem narediti datoteke za zaklepanje %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "če je mogoče, uporabi 'flock' namesto 'file'.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "ne morem narediti %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "poštni predal si lasti drug proces, čakam...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "ne morem zakleniti %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "neveljaven tip zaklepanja\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "ne morem odkleniti %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "ne morem prisekati poštnega predala na ničlo.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izvažam sporočila iz %s v %s...\n"
@@ -688,9 +688,9 @@ 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:491
+#: 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:265
+#: 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
@@ -830,8 +830,8 @@ msgstr "Dodaj naslov v adresar"
 msgid "Address"
 msgstr "Naslov"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Opombe"
 
@@ -839,29 +839,29 @@ msgstr "Opombe"
 msgid "Select Address Book Folder"
 msgstr "Izberite mapo za adresar"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _Knjiga"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _v kartica"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Nov _JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +869,177 @@ msgstr "/_Datoteka/Nov _strežnik"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Urejanje"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Brisanje"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/Uredi/_Kopiraj"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/_Uredi/_Prilepi"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Naslov"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Naslov/Nov n_aslov"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Naslov/Nova _skupina"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Naslov/Nova _mapa"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Naslov/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Naslov/_Urejanje"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Nov n_aslov"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Nova _skupina"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/_Urejanje"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Brisanje"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/Prepiš_i..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/_Uredi/_Prilepi"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Poišči"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Skp:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Brisanje naslova"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Res želite izbrisati naslov(e)?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1029,38 +1048,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:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo mapa"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mapa in naslovi"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Res želite izbrisati '%s' ?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Nov uporabnik, ne morem shraniti indeksne datoteke."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Nov uporabnik, ne morem shraniti datotek z iminiki naslovov."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Star imenik naslovov je bil uspešno pretvorjen."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1068,7 +1087,7 @@ msgstr ""
 "Stari imenik naslovov pretvorjen,\n"
 "ne morem shraniti nove indeksne datoteke naslovov"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1076,7 +1095,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "sem pa naredil prazne nove datoteke imenikov naslovov."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1084,7 +1103,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "ne morem narediti novih datotek z imeniki naslovov."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1092,91 +1111,91 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov\n"
 "in ne morem narediti novih datotek z imeniki naslovov"
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Pretvarjam imenik naslovov"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Napaka v imeniku naslovov"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Ne morem prebrati indeksa naslovov"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Pretvorba imenika naslovov"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Oseba"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mapa"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "v-kartica"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "Strežnik LDAP"
 
@@ -1311,14 +1330,6 @@ msgstr "/_Uredi/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/I_zreži"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/Uredi/_Kopiraj"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/_Uredi/_Prilepi"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/Prilepi kot _citat"
@@ -1797,7 +1808,7 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1890,7 +1901,7 @@ msgid "Nick Name"
 msgstr "Vzdevek"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "Elektronski Naslov"
 
@@ -1960,56 +1971,56 @@ msgstr "Dodaj nov imenik naslovov"
 msgid "A Group Name must be supplied."
 msgstr "Ime skupine mora biti podano."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Urejanje podatkov o skupini"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Ime skupine"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Naslovi v skupini"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Razpoložljivi naslovi"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Urejanje podatkov o skupini"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Dodaj novo skupino"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Urejanje mape"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Vnesite novo ime mape:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Vnesite ime nove mape:"
 
@@ -2177,42 +2188,42 @@ msgstr "Imenik spool"
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Prejeto"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Poslano"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Čakajoče"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Smeti"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "Nova mapa"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Znaka '%c' ne more biti v imenu mape."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mapa '%s' že obstaja."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne morem narediti mape '%s'."
@@ -2287,74 +2298,74 @@ msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Neprebrano"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Nastavljam informacije o mapi...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Ponovno zgradi drevo map"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Preverjam nova sporočila v vseh mapah..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mapa %s je izbrana\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pošiljam sporočilo"
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Med pošiljanjem sporočila %s je prišlo do napake."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2364,26 +2375,26 @@ msgstr ""
 "(če želite narediti mapo za shranjevanje podmap,\n"
 "dodajte '/' na koncu imena datoteke)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Vnesite novo ime za '%s':"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Preimenuj mapo"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2392,12 +2403,12 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Izbriši mapo"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2408,21 +2419,21 @@ msgstr ""
 "Vse mape in sporočila pod '%s' bodo izbrisana.\n"
 "Ali jih res želite izbrisati?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2431,34 +2442,34 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Odstrani poštni predal"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ali naj res izbrišem račun IMAP4 '%s'?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Izbriši račun IMAP4"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ali naj res izbrišem novičarsko skupino '%s'?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Izbriši novičarsko skupino"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ali naj res izbrišem novičarski račun '%s'?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Izbriši novičarski račun"
 
@@ -3610,29 +3621,29 @@ msgstr "nič"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Spreminjam tip ločevanja oken z %d na %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Izprazni smetnjak"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Dodaj poštni predal"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3643,16 +3654,16 @@ msgstr ""
 "Če je določen obstoječi poštni predal,\n"
 "bo pregledan samodejno."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštni predal `%s' že obstaja."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Poštni predal"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3661,72 +3672,72 @@ msgstr ""
 "Izdelava poštnega predala ni uspela.\n"
 "Morda obstajajo nekatere datoteke ali pa tam nimate dovoljenja za pisanje."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Syčpheed - ogled mape"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ogled sporočila"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/O_dgovori"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor _za/_pošiljatelja"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/P_osreduj"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Končaj"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Ali naj končam ta program?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 #, fuzzy
 msgid "Command line options"
 msgstr "Ukazna vrstica ni nastavljena."
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uporaba: %s [MOŽNOST]...\n"
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3742,7 +3753,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6967,6 +6978,9 @@ msgstr "Končaj"
 msgid "Sylpheed"
 msgstr "Stari Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/sr.po b/po/sr.po
index ce491d1f..72d3bc3f 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -218,34 +218,34 @@ msgstr "iconv ne može prebaciti UTF-7 to %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne može prebaciti %s to UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "ne mogu pisati u privremenu datoteku\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "ne mogu čitati mbox datoteku.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "pogrešan mbox format: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "pokvaren mbox: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "ne mogu otvoriti privremenu datoteku\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -254,48 +254,48 @@ msgstr ""
 "neizbežan Od pronađen:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d poruka pronađeno.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "ne mogu napraviti zaključanu datoteku %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "koristi 'flock' umesto 'file' ako je moguće.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "ne mogu napraviti %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "neki drugi proces koristi sanduče, čekam...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "ne mogu zaključati %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "neispravan tip zaključavanja\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "ne mogu otključati %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "ne mogu skratiti sanduče na nulu.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izvozim poruke iz %s u %s...\n"
@@ -688,9 +688,9 @@ 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:491
+#: 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:265
+#: 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
@@ -830,8 +830,8 @@ msgstr "Dodaj adresu u adresar"
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Beleške"
 
@@ -839,29 +839,29 @@ msgstr "Beleške"
 msgid "Select Address Book Folder"
 msgstr "Odaberite direktorijum adresara"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _server"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +869,177 @@ msgstr "/_Datoteka/Novi _server"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Izmeni"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/_Izmeni/_Kopiraj"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/_Izmeni/U_baci"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _direktorijum"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Izmeni"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/_Izmeni"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Kopiranje..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/_Izmeni/U_baci"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Adresar"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Potraži"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Zaista obrisati adresu/e?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1030,38 +1049,38 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo direktorijum"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Direktorijum i adrese"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Zaista obrisati `%s' ?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu sačuvati index datoteku."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu sačuvati datoteke adresara."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspešno prebačen."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1069,7 +1088,7 @@ msgstr ""
 "Stari adresar ne može biti prebačen,\n"
 "ne mogu sačuvati novu index datoteku adresara."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1077,7 +1096,7 @@ msgstr ""
 "Ne mogu prebaciti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1085,7 +1104,7 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1093,84 +1112,84 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "i ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Prebacivanje adresara"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Izgled programa"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Direktorijum"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1305,14 +1324,6 @@ msgstr "/_Izmeni/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Izmeni/S_eci"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/_Izmeni/_Kopiraj"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/_Izmeni/U_baci"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Izmeni/Ubaci kao _citat"
@@ -1792,7 +1803,7 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1885,7 +1896,7 @@ msgid "Nick Name"
 msgstr "Nadimak"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "Adresa e-pošte"
 
@@ -1955,56 +1966,56 @@ msgstr "Dodaj Novi adresar"
 msgid "A Group Name must be supplied."
 msgstr "Ime grupe mora biti navedeno."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Izmeni podatke za grupu"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Ime grupe"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Adrese u grupi"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Dostupne adrese"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Izmeni detalje grupe"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Dodaj novu grupu"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Izmeni direktorijum"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
@@ -2172,42 +2183,42 @@ msgstr "Spool direktorijum"
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Sanduče"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Poslato"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "NoviDir"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uvršten u ime direktorijuma."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Direktorijum `%s' već postoji."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu napraviti direktorijum `%s'."
@@ -2282,74 +2293,74 @@ msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Nepročitano"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Postavljam info direktorijuma...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "/O_sveži stablo direktorijuma"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Proveravanje novih poruka u svim direktorijumima..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Direktorijum %s je odabran\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2359,26 +2370,26 @@ msgstr ""
 "(ukoliko želite napraviti direktorijum za smeštanje poddirektorijuma,\n"
 "dodajte `/' na kraj imena)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Preimenuj direktorijum"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2387,12 +2398,12 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši direktorijum"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2403,21 +2414,21 @@ msgstr ""
 "Svi direktorijum(i) i poruka/e pod `%s' biće obrisane.\n"
 "Želite li ih zaista obrisati?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2426,34 +2437,34 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Zaista obrisati `%s' IMAP4 nalog?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 nalog"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Zaista obrisati `%s' news grupu?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Zaista obrisati `%s' news nalog?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Obriši news nalog"
 
@@ -3606,29 +3617,29 @@ msgstr "ništa"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Menjanje vrste podele prozora iz %d u %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Dodaj sanduče"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3639,16 +3650,16 @@ msgstr ""
 "Ako je unešen postojeće sanduče, automatski\n"
 "će biti pretražen."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sanduče`%s' već postoji."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Sanduče"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3657,72 +3668,72 @@ msgstr ""
 "Kreiranje sandučeta nije uspelo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Direktorijumi"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Poruke"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Od_govor"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dgovori/_pošiljaocu"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/P_rosledi"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 #, fuzzy
 msgid "Command line options"
 msgstr "Linija za neredbe nije podešena."
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3738,7 +3749,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6965,6 +6976,9 @@ msgstr "Izlaz"
 msgid "Sylpheed"
 msgstr "Stari Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/sv.po b/po/sv.po
index d868e862..8bb31e75 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -211,34 +211,34 @@ msgstr "iconv kan inte konvertera UTF-7 till %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan inte konvertera %s till UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "kan inte skriva till temporär fil\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Hämtar meddelanden från %s till %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "kan inte läsa mboxfil.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "felaktigt mboxformat: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "felformad mbox: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "kan inte öppna temporär fil\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -247,48 +247,48 @@ msgstr ""
 "o-esc:at Från-fält funnet:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d meddelanden funna.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "kan inte skapa låsfil %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "använd \"flock\" istället för \"file\" om möjligt.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "kan inte skapa %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "brevlådan ägs av en annan process, väntar...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "kan inte låsa %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "felaktig låstyp\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "kan inte låsa upp %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "kan inte korta av brevlåda till noll.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exporterar meddelanden från %s till %s...\n"
@@ -685,9 +685,9 @@ 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:491
+#: 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:265
+#: 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
@@ -827,8 +827,8 @@ msgstr "Lägg till i adressbok"
 msgid "Address"
 msgstr "Adress"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Kommentarer"
 
@@ -836,29 +836,29 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arkiv"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Arkiv/Ny _bok"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Arkiv/Nytt _vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Arkiv/Ny _JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arkiv/Ny _Server"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +866,177 @@ msgstr "/_Arkiv/Ny _Server"
 msgid "/_File/---"
 msgstr "/_Arkiv/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Arkiv/_Redigera"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Arkiv/_Ta bort"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Arkiv/_Spara"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Arkiv/St_äng"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/_Redigera/_Kopiera"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/_Redigera/Klistra _in"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/A_dress"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/A_dress/Ny _adress"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/A_dress/Ny _grupp"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/A_dress/Ny _mapp"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/A_dress/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/A_dress/_Redigera"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/V_erktyg"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Ny _adress"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Ny _grupp"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/_Redigera"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Ta bort"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Kopiera..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/_Redigera/Klistra _in"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Namn:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Slå upp"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Dold kopia:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Ta bort adress(er)"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Vill du verkligen ta bort adress(erna)?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1027,36 +1046,36 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "_Folder only"
 msgstr "_Endast mapp"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "Folder and _addresses"
 msgstr "Mapp och _adresser"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Vill du verkligen ta bort \"%s\" ?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Ny användare, kunde inte spara indexfil."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Ny användare, kunde inte spara adressboksfiler."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Den gamla adressboken är konverterad."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1064,7 +1083,7 @@ msgstr ""
 "Gammal adressbok konverterad,\n"
 "kunde inte spara ny adressindexfil"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1072,7 +1091,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1080,7 +1099,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1088,86 +1107,86 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Adressboksfel"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 msgid "Old address book converted, could not save new address index file"
 msgstr "Gammal adressbok konverterad, kunde inte skapa ny adressindexfil"
 
-#: src/addressbook.c:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mapp"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
@@ -1297,14 +1316,6 @@ msgstr "/_Redigera/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigera/Klipp _ut"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/_Redigera/_Kopiera"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/_Redigera/Klistra _in"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigera/Klistra in som _citat"
@@ -1756,7 +1767,7 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1844,7 +1855,7 @@ msgid "Nick Name"
 msgstr "Smeknamn"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "E-postadress"
 
@@ -1914,56 +1925,56 @@ msgstr "Lägg till ny adressbok"
 msgid "A Group Name must be supplied."
 msgstr "Ett gruppnamn måste anges."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Redigera gruppdata"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Gruppnamn"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Adresser i grupp"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Tillgängliga adresser"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Redigera gruppdetaljer"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Lägg till ny grupp"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Redigera mapp"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Skriv in det nya namnet på mappen:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -2130,42 +2141,42 @@ msgstr "Välj katalog"
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Skickat"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kö"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "NyMapp"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" får inte finnas i mappnamn."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen \"%s\" finns redan."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan inte skapa mappen \"%s\"."
@@ -2237,73 +2248,73 @@ msgid "New"
 msgstr "Nya"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Olästa"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Ställer in mappinfo...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Uppdatera mappträd"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Mappträdet kommer att uppdateras. Fortsätt?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Uppdaterar mappträd..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uppdatering av mappträdet misslyckades."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelanden i alla mappar..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Skräp"
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappen %s är vald\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Laddar ner meddelanden i %s ..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ett fel uppstod vid nedladdning av meddelanden i \"%s\"."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2313,26 +2324,26 @@ msgstr ""
 "(om du vill skapa en mapp som skall innehålla undermappar,\n"
 " lägg till \"/\" vid slutet av namnet)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Skriv in nytt namn på \"%s\":"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan inte flytta mappen \"%s\"."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2341,12 +2352,12 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ta bort mapp"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2359,20 +2370,20 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dem?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Töm papperskorgen"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 msgid "Delete all messages in the trash folder?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2381,34 +2392,34 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Ta bort brevlåda"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Vill du verkligen ta bort IMAP4-kontot \"%s\"?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Ta bort IMAP4-konto"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgrupp \"%s\"?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Ta bort diskussionsgrupp"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgruppskonto \"%s\"?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Ta bort diskussionsgruppskonto"
 
@@ -3542,27 +3553,27 @@ msgstr "inget"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Byter fönsterseparationstyp från %d till %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "Du är frånkopplad. Vill du ansluta?"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "Töm alla papperskorgar"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 msgid "Delete all messages in trash folders?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3572,16 +3583,16 @@ msgstr ""
 "Om den existerande brevlådan specificeras, kommer den\n"
 "att sökas igenom automatiskt."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Brevlådan \"%s\" finns redan."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3590,69 +3601,69 @@ msgstr ""
 "Brevlådan kunde inte skapas.\n"
 "Några filer finns redan eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappvy"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelandevy"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Sva_ra"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "/Svara till _alla"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/Svara till av_sändaren"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/Svara till e-post_lista"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Vi_darebefordra"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Vidarebefordra som _bilaga"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/_Omdirigera"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr "Du är frånkopplad. Klicka på ikonen för att ansluta."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "Du är ansluten. Klicka på ikonen för att koppla från."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Avsluta detta program?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 #, fuzzy
 msgid "Command line options"
 msgstr "Kommandorad saknas."
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Användning: %s [FLAGGOR]...\n"
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3668,7 +3679,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6830,6 +6841,9 @@ msgstr "Avsluta"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/tr.po b/po/tr.po
index 2198d871..ace2ef44 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -218,34 +218,34 @@ msgstr "iconv, UTF-7 yi %s'e çeviremedi\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv %s yi UTF-7'ye çeviremedi\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "geçici dosyaya yazılamadı\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "%s daki mesajlar %s e alınıyor...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "Posta kutusu dosyası okunamıyor.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "geçersiz posta kutusu biçimi: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "bozuk posta kutusu: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "geçici dosya açılamadı\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -254,49 +254,49 @@ msgstr ""
 "uygun olmayan Kimden:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d ileti bulundu.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "kilit dosyası yaratılamadı: %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "file yerine flock kullanmayı deneyin.\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "%s oluşturulamadı\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr ""
 "posta kutusu başka bir süreç tarafından kullanıldığı için bekleniyor...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "%s kilitlenemedi\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "geçersiz kilit türü\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "%s açılamadı\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "posta kutusu sıfırlanamıyor.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "%s daki mesajlar %s a aktarılıyor...\n"
@@ -683,9 +683,9 @@ 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:491
+#: 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:265
+#: 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
@@ -827,8 +827,8 @@ msgstr "Adres Defterine Ekle"
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Notlar"
 
@@ -836,29 +836,29 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Dosya"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Dosya/Yeni _Defter"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Dosya/Yeni _vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Dosya/Yeni _JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Dosya/Yeni _Sunucu"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +866,177 @@ msgstr "/_Dosya/Yeni _Sunucu"
 msgid "/_File/---"
 msgstr "/_Dosya/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Dosya/_Düzenle"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Dosya/_Sil"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Dosya/_Kaydet"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Dosya/K_apat"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/Dü_zenle/K_opyala"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/Dü_zenle/_Yapıştır"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Yeni _Adres"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Yeni _Grup"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Yeni _Dizin"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/_Adres/Dü_zenle"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/A_raçlar"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Yeni _Adres"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Yeni _Grup"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/Dü_zenle"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Sil"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Kopyala..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/Dü_zenle/_Yapıştır"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Adres defteri"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "İsim:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Ara"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Adres(ler)i sil"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Adres(ler) silinsin mi?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1027,38 +1046,38 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Dizini sil"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "_Folder only"
 msgstr "Sadece dizin"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Dizin ve Adresler"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "`%s' silinsin mi?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Yeni kullanıcı, indeks dosyası kaydedilemedi."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Yeni kullanıcı, adres defteri dosyaları kaydedilemedi."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Eski adres defteri başarıyla çevrildi."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1066,7 +1085,7 @@ msgstr ""
 "Eski adres defteri çevrildi,\n"
 "yeni adres indeks dosyası kaydedilemedi"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1074,7 +1093,7 @@ msgstr ""
 "Adres defteri çevrilemedi,\n"
 "ancak boş bir adres defteri dosyası oluşturuldu."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1082,7 +1101,7 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1090,89 +1109,89 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Adres defteri çevrimi"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Adres Defteri Hatası"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Adres indeksi okunamadı"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Adres Defteri Çevrim Hatası"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Adres Defteri Çevrimi"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Arayüz"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adres Defteri"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Kişi"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "İleti Adresi"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Grup"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Dizin"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "LDAP Sunucu"
 
@@ -1302,14 +1321,6 @@ msgstr "/Dü_zenle/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Dü_zenle/_Kes"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/Dü_zenle/K_opyala"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/Dü_zenle/_Yapıştır"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Dü_zenle/_Alıntı Yaparak Yapıştır"
@@ -1784,7 +1795,7 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1877,7 +1888,7 @@ msgid "Nick Name"
 msgstr "Lakabı"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "E-posta Adresi"
 
@@ -1947,57 +1958,57 @@ msgstr "Yeni Adres Defteri Ekle"
 msgid "A Group Name must be supplied."
 msgstr "Bir Grup Adı verilmelidir."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Grup Bilgisini Düzenle"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Grup Adı"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Gruptaki Adresler"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Kullanılabilir Adresler"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Grup Ayrıntılarını Düzenle"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Yeni Grup Ekle"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Dizini düzenle"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Dizinin yeni adıni girin:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Yeni dizin"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin adını verin:"
 
@@ -2165,42 +2176,42 @@ msgstr "Dizini seç"
 msgid "Select folder"
 msgstr "Dizini seç"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Gelen"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Gönderilen"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kuyruk"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Çöp"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "YeniDizin"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' bir dizin adı içinde olamaz."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' dizini zaten var."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' dizini oluşturulamıyor."
@@ -2273,73 +2284,73 @@ msgid "New"
 msgstr "Yeni"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Okunmamış"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Dizin bilgisi ayarlanıyor...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Dizin ağacını yeniden tara"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Dizin ağacı yeniden oluşturulacak. Devam edilsin mi?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Dizin ağacı yeniden yaratılıyor..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "Dizin ağacı yeniden oluşturulamadı."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Dizinlerde yeni mesajlar kontrol ediliyor..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s dizini seçildi\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "İletiler %s içine indiriliyor..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "İletiler `%s' içine indirilirken hata oluştu."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2349,26 +2360,26 @@ msgstr ""
 "(Eğer alt dizin içerecek bir dizin oluşturmak \n"
 "istiyorsanız, adının sonuna `/' karakteri getirin)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' için yeni bir isim verin:"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Dizini yeniden adlandır"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2377,12 +2388,12 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Dizini sil"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2393,21 +2404,21 @@ msgstr ""
 "`%s' altındaki tüm dizinler ve mesajlar silinecek.\n"
 "Devam etmek istediğinizden emin misiniz?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Çöpü boşalt"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2416,34 +2427,34 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Posta kutusunu sil"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "`%s' IMAP4 hesabı silinsin mi?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hesabını sil"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "`%s' haber grubu silinsin mi?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Haber grubunu sil"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "`%s' haber grubu hesabı silinsin mi?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Haber grubu hesabını sil"
 
@@ -3582,28 +3593,28 @@ msgstr "hiçbiri"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Pencere ayırma tarzı %d den %d e çevriliyor\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "Çevrimdışısınız. Çevrimiçi olunsun mu?"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "Tüm çöpü boşalt"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Posta kutusu ekle"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3614,16 +3625,16 @@ msgstr ""
 "Eğer varolan potsa kutusu verilirse, otomatik\n"
 "olarak taranacaktır."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3632,69 +3643,69 @@ msgstr ""
 "Posta kutusu oluşturulurken hata oluştu.\n"
 "Bazı dosyalar bulunuyor olabilir veya yeterli izine sahip olmayabilirsiniz."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylheed - Dizin Görünümü"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpeed - İleti Görünümü"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Yanıtla"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "/Her_kese yanıtla"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/_Gönderene yanıtla"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/_E-posta listesine yanıtla"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Yönlendir"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/_Ek olarak yönlendir"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Ye_niden yönlendir"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr "Çevrimdışısınız. Çevrimiçi olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "Çevrimiçisiniz. Çevrimdışı olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Çık"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Programdan çıkılsın mı?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 #, fuzzy
 msgid "Command line options"
 msgstr "Komut satırı belirtilmedi."
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Kullanım: %s [SEÇENEKLER] ...\n"
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3710,7 +3721,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6915,6 +6926,9 @@ msgstr "Çık"
 msgid "Sylpheed"
 msgstr "Eski Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/uk.po b/po/uk.po
index adde00df..5ed1b2b1 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -216,34 +216,34 @@ msgstr "iconv не може конвертувати UTF-7 в %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може конвертувати %s в UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "неможливо писати в тимчасовий файл\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Отримуємо листи від %s в %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "не вдалось прочитати файл mbox.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "неправильний формат файла mbox: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "неправильно збудований mbox: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "неможливо відкрити тимчасовий файл\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -252,48 +252,48 @@ msgstr ""
 "знайдено незахищений рядок From:\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "знайдено %d листів.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "не вдалось створити lock-файл %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "якщо можливо, вживайте 'flock' замість 'file'\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "не вдалось створити %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "скринька зайнята іншим процесом, чекаємо...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "не вдалось заблокувати %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "неправильний тип блокування\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "не вдалось розблокувати %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "не вдалось обрізати скриньку до нуля.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Експортуємо листи з %s в %s...\n"
@@ -689,9 +689,9 @@ msgstr ""
 "Порядок перевірки нових листів. Позначте в колонці `G'\n"
 "account'и, які поповнюються через `Отримати всі'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:491
+#: 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:265
+#: 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
@@ -831,8 +831,8 @@ msgstr "Додати адресу до книги"
 msgid "Address"
 msgstr "Адреса"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Нотатки"
 
@@ -840,28 +840,28 @@ msgstr "Нотатки"
 msgid "Select Address Book Folder"
 msgstr "Обрати папку адресної книги"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/Файл/Нова книга"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/Файл/Нова vCard"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новий JPilot"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новий сервер LDAP"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +869,177 @@ msgstr "/Файл/Новий сервер LDAP"
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/Файл/Редагувати"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/Файл/Видалити"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/Файл/Зберегти"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/Редагувати/Копіювати"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/Редагувати/Вставити"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/Адреса"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/Адреса/Нова адреса"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/Адреса/Нова група"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/Адреса/Нова папка"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/Адреса/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/Адреса/Редагувати"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Інструменти"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Інструменти/Імпортувати файл LDIF"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Нова адреса"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/Нова група"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Нова папка"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/Редагувати"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/Видалити"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/Копіювати"
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/Редагувати/Вставити"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ім'я:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Пошук"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Приховано:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Видалити адресу(и)"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Дійсно видалити адресу(и)?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1029,36 +1048,36 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Видалити папку"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "_Folder only"
 msgstr "Тільки папку"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "Folder and _addresses"
 msgstr "Папку та адреси"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Дійсно видалити `%s' ?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "Новий користувач, не вдалось зберегти покажчик."
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "Новий користувач, не вдалось зберегти адресну книгу."
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Стару адресну книгу успішно конвертовано."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1066,7 +1085,7 @@ msgstr ""
 "Стару адресну книгу конвертовано,\n"
 "не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1074,7 +1093,7 @@ msgstr ""
 "Не вдалось конвертувати адресну книгу,\n"
 "але створено нову (порожню)."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1082,7 +1101,7 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1090,85 +1109,85 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Помилка в адресній книзі"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Не вдалось прочитати покажчик адрес"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Стару адресну книгу конвертовано, не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2529
+#: src/addressbook.c:2576
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Не вдалось конвертувати адресну книгу, але створено нову (порожню)."
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2582
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2588
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Інтерфейс"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Особа"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1297,14 +1316,6 @@ msgstr "/Редагувати/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Редагувати/Вирізати"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/Редагувати/Копіювати"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/Редагувати/Вставити"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Редагувати/Вставити як цитату"
@@ -1754,7 +1765,7 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово обірвати процес (pid: %d)?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1842,7 +1853,7 @@ msgid "Nick Name"
 msgstr "Прізвисько"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "Адреса e-mail"
 
@@ -1912,56 +1923,56 @@ msgstr "Додати нову адресну книгу"
 msgid "A Group Name must be supplied."
 msgstr "Потрібно вказати назву групи."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Редагувати дані групи"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Назва групи"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Адреси в групі"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Наявні адреси"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Перемістити адреси e-mail з чи в групу кнопкою з стрілкою"
 
-#: src/editgroup.c:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Редагувати подробиці про групу"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Додати нову групу"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Редагувати папку"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Введіть нову назву папки:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "Введіть назву нової папки:"
 
@@ -2128,42 +2139,42 @@ msgstr "Обрати папку"
 msgid "Select folder"
 msgstr "Обрати папку"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Відіслані"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Черга"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Кошик"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Чернетки"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може міститись в назві папки."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка `%s' вже існує."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не вдалось створити папку `%s'."
@@ -2233,73 +2244,73 @@ msgid "New"
 msgstr "Нові"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Непрочитані"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Встановлюємо інформацію папки...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Встановлюємо інформацію папки..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перечитуємо папку %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перечитуємо папку %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Перебудувати дерево папок"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дерево папок буде перебудовано. Продовжити?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Перебудовуємо дерево папок..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "Не вдалось перебудувати дерево папок."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Перевірити за новими листами у всіх папках..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Мотлох"
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папку %s обрано\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Завантажуємо листи у %s ..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Трапилась помилка при завантаженні листів у `%s'."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2309,26 +2320,26 @@ msgstr ""
 "(якщо бажаєте створити папку, яка містить підпапки,\n"
 " додайте `/' в кінці назви)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введіть нову назву для `%s':"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Перейменувати папку"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Не вдалось перейменувати папку `%s'."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Не вдалось перенести папку `%s'."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2337,11 +2348,11 @@ msgstr ""
 "Справді видалити папку пошуку `%s' ?\n"
 "(Листи НЕ видаляються з диска.)"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 msgid "Delete search folder"
 msgstr "Видалити папку пошуку"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2354,20 +2365,20 @@ msgstr ""
 "\n"
 "Справді бажаєте видалити?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Не вдалось видалити папку `%s'."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Спорожнити кошик"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 msgid "Delete all messages in the trash folder?"
 msgstr "Видалити всі листи з кошика?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2376,34 +2387,34 @@ msgstr ""
 "Справді видалити скриньку `%s' ?\n"
 "(Листи НЕ видаляються з диска)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Видалити скриньку"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Справді видалити обліковий запис IMAP4 `%s'?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Видалити обліковий запис IMAP4"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Дійсно видалити конференцію `%s'?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Видалити конференцію"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Дійсно видалити обліковий запис конференції `%s'?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Видалити обліковий запис конференції"
 
@@ -3526,27 +3537,27 @@ msgstr "немає"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Зміна типу розділення вікна з %d на %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "Без з'єднання"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "З'єднання немає. Під'єднатись?"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "Спорожнити весь кошик"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 msgid "Delete all messages in trash folders?"
 msgstr "Видалити всі листи з усіх папок кошика?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Додати скриньку"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3556,16 +3567,16 @@ msgstr ""
 "Якщо вона вже існує, її буде перечитано\n"
 "автоматично."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Скринька `%s' вже існує."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Скринька"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3575,67 +3586,67 @@ msgstr ""
 "Можливо, деякі файли вже існують, або Ви не маєте\n"
 "права запису тут."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Листи"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Відповісти"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "/Відповісти всім"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/Відповісти відправникові"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/Відповісти конференції"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Переслати далі"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Переслати далі як вкладення"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Переспрямувати"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr "З'єднання немає. Клацніть на іконці, щоб під'єднатись."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "Ви під'єднані. Клацніть на іконці, щоб від'єднатись."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Вихід"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Вийти з цієї програми?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 msgid "Command line options"
 msgstr "Опції командного рядка"
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Вживання: sylpheed [ОПЦІЇ]..."
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3663,7 +3674,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6796,6 +6807,9 @@ msgstr "Вихід"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/vi.po b/po/vi.po
index 479f4379..721dcbc6 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -211,82 +211,82 @@ msgstr "iconv không thể chuyển UTF-7 sang %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv không thể chuyển %s sang UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "không ghi được vào tập tin tạm\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Lấy thư từ %s vào %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "không đọc được tập tin mbox.\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "định dạng mbox không hợp lệ: %s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox có lỗi: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "không mở được tập tin tạm\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
 "%s"
 msgstr ""
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "Tìm thấy %d thư.\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "không tạo được tập tin khoá %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "dùng lệnh 'flock' thay vì 'file' nếu có thể\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "không tạo được %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "hộp thư bị chiếm dụng bởi một tiến trình khác, đang chờ...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "không thể khoá %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "kiểu khoá không hợp lệ\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "không thể mở khoá %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "không thể giảm số lượng hộp thư xuống 0.\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Xuất thư từ %s sang %s...\n"
@@ -667,9 +667,9 @@ 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:491
+#: 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:265
+#: 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
@@ -809,8 +809,8 @@ msgstr "Thêm địa chỉ vào sổ"
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "Ghi chú"
 
@@ -818,28 +818,28 @@ msgstr "Ghi chú"
 msgid "Select Address Book Folder"
 msgstr "Chọn thư mục sổ địa chỉ"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Tập tin"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/_Tập tin/_Sổ mới"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/_Tập tin/_vCard mới"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/_Tập tin/_JPilot mới"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 msgid "/_File/New _LDAP Server"
 msgstr "/_Tập tin/_Máy chủ LDAP mới"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +847,177 @@ msgstr "/_Tập tin/_Máy chủ LDAP mới"
 msgid "/_File/---"
 msgstr "/_Tập tin/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/_Tập tin/Soạ_n"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/_Tập tin/_Xoá"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/_Tập tin/_Lưu"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Tập tin/Đón_g"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/_Soạn/_Sao chép"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/_Soạn/_Dán"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/Đị_a chỉ"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/Đị_a chỉ/Địa chỉ _mới"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/Đị_a chỉ/_Nhóm mới"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/Đị_a chỉ/_Thư mục mới"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/Đị_a chỉ/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/Đị_a chỉ/_Soạn"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/Đị_a chỉ/_Xoá"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Công cụ"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hỗ trợ"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 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:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/Địa chỉ _mới"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/_Nhóm mới"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/Thư _mục mới"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/_Soạn"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/_Xoá"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/_Sao chép"
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/_Soạn/_Dán"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "Sổ địa chỉ"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Tên:"
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "Tra cứu"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "Xoá địa chỉ"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "Thực sự muốn xoá (các) địa chỉ này?"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1007,36 +1026,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:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "Xoá thư mục"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "_Folder only"
 msgstr "_Chỉ thư mục"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "Folder and _addresses"
 msgstr "Thư mục và địa c_hỉ"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Thực sự muốn xoá `%s' ?"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 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:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 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:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "Sổ địa chỉ cũ đã được chuyển đổi thành công."
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1044,7 +1063,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:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1052,7 +1071,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:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1060,7 +1079,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:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1068,89 +1087,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:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "Lỗi sổ địa chỉ"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "Không thể đọc mục lục địa chỉ"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 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:2529
+#: src/addressbook.c:2576
 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:2535
+#: src/addressbook.c:2582
 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:2541
+#: src/addressbook.c:2588
 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:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "Giao diện"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "Sổ địa chỉ"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "Cá nhân"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "Nhóm"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Thư mục"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "Máy chủ LDAP"
 
@@ -1279,14 +1298,6 @@ msgstr "/_Soạn/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Soạn/_Cắt"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/_Soạn/_Sao chép"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/_Soạn/_Dán"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Soạn/Dán ở dạng t_rích dẫn"
@@ -1732,7 +1743,7 @@ msgstr ""
 "Trình soạn thảo ngoài vẫn đang hoạt động.\n"
 "Bắt buộc dừng tiến trình (pid: %d)?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1820,7 +1831,7 @@ msgid "Nick Name"
 msgstr "Biệt danh"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "Địa chỉ email"
 
@@ -1890,56 +1901,56 @@ 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:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "Soạn dữ liệu cho nhóm"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "Tên nhóm"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "Các địa chỉ trong nhóm"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "Các địa chỉ hiện có"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 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:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "Soạn thông tin về nhóm"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "Thêm nhóm mới"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Sửa thư mục"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Đặt tên mới cho thư mục:"
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "Thư mục mới"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 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:"
 
@@ -2106,42 +2117,42 @@ msgstr "Chọn thư mục"
 msgid "Select folder"
 msgstr "Chọn thư mục"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Hộp nhận"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Đã gửi"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Đợi gửi"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Thùng rác"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Nháp"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "Thư mục mới"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' không được có trong tên thư mục."
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Thư mục `%s' đã có trước."
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Không tạo được thư mục `%s'."
@@ -2212,73 +2223,73 @@ msgid "New"
 msgstr "Mới"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "Chưa đọc"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "Thiết lập thông tin thư mục...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "Thiết lập thông tin thư mục..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Đang quét thư mục %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Đang quét thư mục %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "Làm lại cây thư mục"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Cây thư mục sẽ được làm lại. Tiếp tục?"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "Đang làm lại cây thư mục..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "Việc làm lại cây thư mục thất bại."
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "Kiểm tra thư mới trong mọi thư mục..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Rác"
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Thư mục %s được chọn\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Đang tải thư về trong %s ..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Có lỗi khi tải thư về trong `%s'."
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2288,26 +2299,26 @@ msgstr ""
 "(nếu bạn muốn tạo một thư mục để lưu thư mục con,\n"
 " thêm `/' vào cuối tên)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Đặt tên cho `%s':"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "Đổi tên thư mục"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Không thể đổi tên thư mục `%s'."
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Không thể di chuyển thư mục `%s'."
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2316,11 +2327,11 @@ msgstr ""
 "Xoá thư mục tìm kiếm `%s' ?\n"
 "Thư sẽ không bị xoá khỏi ổ cứng."
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 msgid "Delete search folder"
 msgstr "Xoá thư mục tìm kiếm"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2333,20 +2344,20 @@ msgstr ""
 "\n"
 "Bạn có thực sự muốn xoá không?"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Không thể xoá thư mục '%s'."
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "Đổi rác"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 msgid "Delete all messages in the trash folder?"
 msgstr "Xoá mọi thư trong thùng rác?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2355,34 +2366,34 @@ msgstr ""
 "Thực sự muốn xoá hộp thư `%s' ?\n"
 "(Thư sẽ KHÔNG bị xoá khỏi ổ cứng)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "Xoá hộp thư"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Thực sự muốn xoá tài khoản IMAP4 `%s'?"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "Xoá tài khoản IMAP4"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Thực sự muốn xoá nhóm tin `%s'?"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "Xoá nhóm tin"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Thực sự muốn xoá tài khoản tin tức `%s'?"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "Xoá tài khoản tin tức"
 
@@ -3508,27 +3519,27 @@ msgstr "không"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Đổi kiểu vạch phân cách cửa sổ từ %d sang %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "Ngoại tuyến"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "Bạn đang ngoại tuyến. Chuyển sang trực tuyến?"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "Đổ mọi thùng rác"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 msgid "Delete all messages in trash folders?"
 msgstr "Xoá mọi thư trong thùng rác?"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "Thêm hộp thư"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3538,16 +3549,16 @@ msgstr ""
 "Nếu hộp thư có trước được chỉ định, nó sẽ được\n"
 "tự động quét."
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Hộp thư `%s' đã có trước."
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "Hộp thư"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3556,67 +3567,67 @@ msgstr ""
 "Việc tạo hộp thư đã thất bại.\n"
 "Có thể một số tập tin đã có trước, hoặc bạn không có quyền ghi lên đó."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Khung thư mục"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Khung đọc thư"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Hồi âm"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "/Hồi âm _tất cả"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/Hồi âm cho người _gửi"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/Hồi âm cho _hộp thư chung"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Chuyển tiếp"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Ch_uyển tiếp ở dạng đính kèm"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Chu_yển hướng"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr "Bạn đang ngoại tuyến. Nhấn vào biểu tượng để chuyển sang trực tuyến."
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "Bạn đang trực tuyến. Nhấn vào biểu tượng để chuyển sang ngoại tuyến."
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "Thoát"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "Thoát chương trình này?"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 msgid "Command line options"
 msgstr "Tuỳ chọn dòng lệnh"
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Cách dùng: sylpheed [TUỲ CHỌN]..."
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3644,7 +3655,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6776,6 +6787,9 @@ msgstr "_Thoát"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ae3b601b..9a3d4f90 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -214,34 +214,34 @@ msgstr "iconv 无法转换 UTF-7 到 %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv 无法转换 %s 到 UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "无法写入临时文件\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "正在从 %s 获取邮件到 %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "无法读取 mbox 文件。\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "无效的 mbox 格式：%s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "格式不正确的 mbox：%s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "无法打开临时文件\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -250,48 +250,48 @@ msgstr ""
 "找到没有转码的发件人：\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "找到 %d 封邮件。\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "无法创建锁文件 %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "如果可能，用“flock”代替“file”。\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "无法创建 %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "另一个进程拥有该邮箱，等待...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "无法锁住 %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "无效的锁类型\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "无法解锁 %s\n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "无法将邮箱删除为空。\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "正在从 %s 导出信件到 %s...\n"
@@ -677,9 +677,9 @@ msgstr ""
 "按照该顺序检查新邮件。选中“G”列的复选框，在“全部接收”\n"
 "时会检查新邮件。"
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:491
+#: 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:265
+#: 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
@@ -821,8 +821,8 @@ msgstr "将地址添加到地址簿"
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "注释"
 
@@ -830,29 +830,29 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/文件(_F)/新建地址簿(_B)"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/文件(_F)/新建 vCard(_V)"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/文件(_F)/新建 JPilot(_J)"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +860,177 @@ msgstr "/文件(_F)/新建服务器(_S)"
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/文件(_F)/编辑(_E)"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/文件(_F)/删除(_D)"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/编辑(_E)/复制(_C)"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/编辑(_E)/粘贴(_P)"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新建地址(_A)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新建组(_G)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新建文件夹(_F)"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/新建地址(_A)"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/新建组(_G)"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/编辑(_E)"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/复制(_C)..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/编辑(_E)/粘贴(_P)"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "地址簿"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "姓名："
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "查找"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "密件抄送："
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "删除地址"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "真的要删除地址？"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1020,38 +1039,38 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "删除文件夹"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "_Folder only"
 msgstr "仅文件夹"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "文件夹和地址"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "真的要删除“%s”？"
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "新建用户，无法保存索引文件。"
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "新建用户，无法保存地址簿文件。"
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr "成功转换旧的地址簿。"
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1059,7 +1078,7 @@ msgstr ""
 "已经转换旧的地址簿，\n"
 "无法保存新的地址索引文件"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1067,7 +1086,7 @@ msgstr ""
 "无法转换地址簿，\n"
 "但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1075,90 +1094,90 @@ msgstr ""
 "无法转换地址簿，\n"
 "无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "地址簿错误"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 msgid "Old address book converted, could not save new address index file"
 msgstr "已经转换旧的地址簿，无法保存新的地址索引文件"
 
-#: src/addressbook.c:2529
+#: src/addressbook.c:2576
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "无法转换地址簿，但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2582
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "无法转换地址簿，无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2588
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "地址簿"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "个人"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "群组"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "文件夹"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 
@@ -1288,14 +1307,6 @@ msgstr "/编辑(_E)/---"
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_T)"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/编辑(_E)/复制(_C)"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/编辑(_E)/粘贴(_P)"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/编辑(_E)/作为引文粘贴(_Q)"
@@ -1748,7 +1759,7 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1840,7 +1851,7 @@ msgid "Nick Name"
 msgstr "昵称"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "电子邮件地址"
 
@@ -1910,56 +1921,56 @@ msgstr "添加新地址簿"
 msgid "A Group Name must be supplied."
 msgstr "必须提供群组名。"
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "编辑群组信息"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "群组名"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "群组中的地址"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "可用邮件地址"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "用箭头按钮将电子邮件地址移入和移出群组"
 
-#: src/editgroup.c:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "编辑群组细节"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "添加新群组"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "编辑文件夹"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "输入文件夹的新名字："
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名字："
 
@@ -2127,42 +2138,42 @@ msgstr "邮件池目录"
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "收件箱"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "已发送"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "队列"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "废件箱"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "草稿箱"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "新文件夹"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "字符“%c”不能包含在文件夹名字中。"
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "文件夹“%s”已存在。"
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "无法创建文件夹“%s”。"
@@ -2235,73 +2246,73 @@ msgid "New"
 msgstr "新建"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "未读"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "正在设置文件夹信息...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "重建文件夹树"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "文件夹树将重建。继续吗？"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "正在重建文件夹树..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "重建文件夹树失败。"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "正在检查所有文件夹中的新邮件..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "选中文件夹 %s\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "正在下载 %s 中的邮件..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "下载“%s”中的邮件时发生错误。"
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2311,26 +2322,26 @@ msgstr ""
 "(如果您要创建一个保存子文件夹的文件夹，\n"
 "在名字的最后添加“/”)"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "输入“%s”的新名字："
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "重命名文件件"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2339,12 +2350,12 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 #, fuzzy
 msgid "Delete search folder"
 msgstr "删除文件夹"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2355,21 +2366,21 @@ msgstr ""
 "“%s”下的所有文件夹和邮件将被删除。\n"
 "您真的要删除吗？"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "清空废件箱"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2378,34 +2389,34 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "删除邮箱"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "真的要删除 IMAP4 帐号“%s”？"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "删除 IMAP4 帐号"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "真的要删除新闻组“%s”？"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "删除新闻组"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "真到要删除新闻组帐号“%s”？"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "删除新闻组帐号"
 
@@ -3536,28 +3547,28 @@ msgstr "无"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "正在把窗口分隔方式从 %d 改到 %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "离线"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "您处于离线状态。切换到在线状态吗？"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "清空所有废件箱"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "添加邮箱"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3567,16 +3578,16 @@ msgstr ""
 "输入邮箱位置。\n"
 "如果指定了已存在的邮箱，它将被自动扫描。"
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "邮箱“%s”已经存在。"
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3585,69 +3596,69 @@ msgstr ""
 "创建邮件箱失败。\n"
 "也许某些文件已经存在，或者您没有写权限。"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed－文件夹视图"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed－邮件视图"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "/回复到所有人(_A)"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/回复到发件人(_S)"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/回复到邮件列表(_L)"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/转发(_F)"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_W)"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/重定向(_T)"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr "您处于离线状态。单击图标切换到在线状态。"
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "您处于在线状态。单击图标切换到离线状态。"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "退出"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "要退出本程序吗？"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 #, fuzzy
 msgid "Command line options"
 msgstr "没有设置命令行。"
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "用法：%s [OPTION]...\n"
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3663,7 +3674,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6844,6 +6855,9 @@ msgstr "退出"
 msgid "Sylpheed"
 msgstr "旧式的Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 02ca5234..7095433e 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-07 17:07+0900\n"
+"POT-Creation-Date: 2007-02-15 14:54+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"
@@ -213,34 +213,34 @@ msgstr "無法將 UTF-7 轉換為 %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "無法轉換 %s 為 UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:203
+#: libsylph/mbox.c:50 libsylph/mbox.c:206
 msgid "can't write to temporary file\n"
 msgstr "無法寫入暫存檔。\n"
 
-#: libsylph/mbox.c:76
+#: libsylph/mbox.c:79
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "從 %s 中取得郵件放入 %s...\n"
 
-#: libsylph/mbox.c:86
+#: libsylph/mbox.c:89
 msgid "can't read mbox file.\n"
 msgstr "無法讀取 mbox 檔案。\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "不合法的 mbox 格式：%s\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "損壞的 mbox: %s\n"
 
-#: libsylph/mbox.c:117
+#: libsylph/mbox.c:120
 msgid "can't open temporary file\n"
 msgstr "無法開啟暫存檔。\n"
 
-#: libsylph/mbox.c:168
+#: libsylph/mbox.c:171
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -249,48 +249,48 @@ msgstr ""
 "不完整的 From 格式：\n"
 "%s"
 
-#: libsylph/mbox.c:272
+#: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
 msgstr "共有 %d 封郵件。\n"
 
-#: libsylph/mbox.c:290
+#: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "無法開啟檔案 %s\n"
 
-#: libsylph/mbox.c:291
+#: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "如果可以，請使用「flock」替代「file」。\n"
 
-#: libsylph/mbox.c:303
+#: libsylph/mbox.c:304
 #, c-format
 msgid "can't create %s\n"
 msgstr "無法產生 %s\n"
 
-#: libsylph/mbox.c:309
+#: libsylph/mbox.c:310
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "信箱正被其他的行程讀取中, 請稍候...\n"
 
-#: libsylph/mbox.c:338
+#: libsylph/mbox.c:339
 #, c-format
 msgid "can't lock %s\n"
 msgstr "無法鎖住 %s\n"
 
-#: libsylph/mbox.c:345 libsylph/mbox.c:395
+#: libsylph/mbox.c:346 libsylph/mbox.c:396
 msgid "invalid lock type\n"
 msgstr "不合法的 lock 型態。\n"
 
-#: libsylph/mbox.c:381
+#: libsylph/mbox.c:382
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "%s 無法打開 \n"
 
-#: libsylph/mbox.c:416
+#: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
 msgstr "無法清除信箱。\n"
 
-#: libsylph/mbox.c:440
+#: libsylph/mbox.c:441
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "將郵件由 %s 匯出到 %s 中...\n"
@@ -682,9 +682,9 @@ msgstr ""
 "檢查新郵件時將會依照下面的順序。您可以勾選 G 欄位中的方塊，\n"
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:491
+#: 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:265
+#: 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
@@ -824,8 +824,8 @@ msgstr "將地址加入通訊錄"
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:197 src/addressbook.c:493 src/editaddress.c:202
-#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
+#: src/addressadd.c:197 src/addressbook.c:514 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:270
 msgid "Remarks"
 msgstr "備註"
 
@@ -833,29 +833,29 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇通訊錄資料夾"
 
-#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:347 src/compose.c:544 src/mainwindow.c:515
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/檔案(_F)"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:348
 msgid "/_File/New _Book"
 msgstr "/檔案(_F)/新增通訊錄(_B)"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:349
 msgid "/_File/New _vCard"
 msgstr "/檔案(_F)/新增vCard(_V)"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:351
 msgid "/_File/New _JPilot"
 msgstr "/檔案(_F)/新增J-Pilot(_J)"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:354
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/addressbook.c:356 src/addressbook.c:359 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,158 +863,177 @@ msgstr "/檔案(_F)/新增伺服器(_S)"
 msgid "/_File/---"
 msgstr "/檔案(_F)/---"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:357
 msgid "/_File/_Edit"
 msgstr "/檔案(_F)/編輯(_E)"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:358
 msgid "/_File/_Delete"
 msgstr "/檔案(_F)/刪除(_D)"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:360
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
+#: src/addressbook.c:361 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:363 src/addressbook.c:402 src/addressbook.c:412
+#: 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/messageview.c:160
+msgid "/_Edit/_Copy"
+msgstr "/編輯(_E)/複製(_C)"
+
+#: src/addressbook.c:365 src/compose.c:569
+msgid "/_Edit/_Paste"
+msgstr "/編輯(_E)/貼上(_P)"
+
+#: src/addressbook.c:367
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:368
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新增地址(_A)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:369
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新增群組(_G)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:370
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新增資料夾(_F)"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:371
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:372
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/編輯(_E)"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:373
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/刪除(_D)"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:375 src/compose.c:679 src/mainwindow.c:793
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:376
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:378 src/compose.c:700 src/mainwindow.c:847
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:379 src/compose.c:701 src/mainwindow.c:859
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:398 src/addressbook.c:408
 msgid "/New _Address"
 msgstr "/新增地址(_A)"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:399 src/addressbook.c:409
 msgid "/New _Group"
 msgstr "/新增群組(_G)"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:400 src/addressbook.c:410
 msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
-#: src/addressbook.c:384 src/addressbook.c:394 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 src/folderview.c:284
-#: src/folderview.c:298 src/folderview.c:300 src/folderview.c:304
-#: src/folderview.c:306 src/summaryview.c:424 src/summaryview.c:428
-#: src/summaryview.c:431 src/summaryview.c:443 src/summaryview.c:445
-#: src/summaryview.c:448 src/summaryview.c:450 src/summaryview.c:462
-#: src/summaryview.c:468
+#: src/addressbook.c:401 src/addressbook.c:411 src/addressbook.c:414
+#: 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
+#: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
+#: src/folderview.c:304 src/folderview.c:306 src/summaryview.c:424
+#: src/summaryview.c:428 src/summaryview.c:431 src/summaryview.c:443
+#: src/summaryview.c:445 src/summaryview.c:448 src/summaryview.c:450
+#: src/summaryview.c:462 src/summaryview.c:468
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
-#: src/mainwindow.c:551 src/messageview.c:159
-msgid "/_Edit"
-msgstr "/編輯(_E)"
-
-#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:444
+#: src/addressbook.c:403 src/addressbook.c:413 src/summaryview.c:444
 msgid "/_Delete"
 msgstr "/刪除(_D)"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Copy"
+msgstr "/複製(_C)..."
+
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Paste"
+msgstr "/編輯(_E)/貼上(_P)"
+
+#: src/addressbook.c:513
 msgid "E-Mail address"
 msgstr "E-Mail 地址"
 
-#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:517 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
 msgid "Address book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:603 src/prefs_filter_edit.c:249
+#: src/addressbook.c:624 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "姓名："
 
 #. Buttons
-#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
+#: src/addressbook.c:655 src/addressbook.c:1644 src/editaddress.c:884
 #: src/editaddress.c:1017 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:639 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:658 src/editaddress.c:890 src/editaddress.c:1023
 #: 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:642
+#: src/addressbook.c:661
 msgid "Lookup"
 msgstr "尋找"
 
-#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
+#: 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:658 src/headerview.c:56 src/prefs_folder_item.c:356
+#: 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:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:681 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "密件副本"
 
 #. Confirm deletion
-#: src/addressbook.c:832
+#: src/addressbook.c:850
 msgid "Delete address(es)"
 msgstr "刪除通訊紀錄"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:851
 msgid "Really delete the address(es)?"
 msgstr "您確定要刪除這些紀錄嗎？"
 
-#: src/addressbook.c:1669
+#: src/addressbook.c:1635
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1023,38 +1042,38 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1672 src/folderview.c:2426
+#: src/addressbook.c:1638 src/folderview.c:2433
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "_Folder only"
 msgstr "只刪除資料夾(_F)"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1638
 msgid "Folder and _addresses"
 msgstr "全部刪除(_A)"
 
-#: src/addressbook.c:1677
+#: src/addressbook.c:1643
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "您確定要刪除「%s」? "
 
-#: src/addressbook.c:2363 src/addressbook.c:2496
+#: src/addressbook.c:2410 src/addressbook.c:2543
 msgid "New user, could not save index file."
 msgstr "無法儲存索引檔案。"
 
-#: src/addressbook.c:2367 src/addressbook.c:2500
+#: src/addressbook.c:2414 src/addressbook.c:2547
 msgid "New user, could not save address book files."
 msgstr "無法儲存通訊錄檔案。"
 
-#: src/addressbook.c:2377 src/addressbook.c:2510
+#: src/addressbook.c:2424 src/addressbook.c:2557
 msgid "Old address book converted successfully."
 msgstr ""
 "轉換舊通訊錄格式完成。\n"
 "您可以開始使用新的通訊錄。"
 
-#: src/addressbook.c:2382
+#: src/addressbook.c:2429
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1062,7 +1081,7 @@ msgstr ""
 "舊通訊錄格式已轉換，\n"
 "但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2442
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1070,7 +1089,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "但已產生空的新通訊錄。"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2448
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1078,7 +1097,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2453
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1086,84 +1105,84 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2413
+#: src/addressbook.c:2460
 msgid "Addressbook conversion error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:2417
+#: src/addressbook.c:2464
 msgid "Addressbook conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:2452
+#: src/addressbook.c:2499
 msgid "Addressbook Error"
 msgstr "通訊錄發生錯誤"
 
-#: src/addressbook.c:2453 src/addressbook.c:2553
+#: src/addressbook.c:2500 src/addressbook.c:2600
 msgid "Could not read address index"
 msgstr "無法讀取通訊錄索引"
 
-#: src/addressbook.c:2515
+#: src/addressbook.c:2562
 msgid "Old address book converted, could not save new address index file"
 msgstr "舊通訊錄格式已轉換，但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2529
+#: src/addressbook.c:2576
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "無法轉換通訊錄格式，但已產生空的新通訊錄。"
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2582
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2588
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2559
+#: src/addressbook.c:2606
 msgid "Addressbook Conversion Error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2612
 msgid "Addressbook Conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3127 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "介面"
 
-#: src/addressbook.c:3096 src/importldif.c:515
+#: src/addressbook.c:3143 src/importldif.c:515
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3159
 msgid "Person"
 msgstr "人名"
 
-#: src/addressbook.c:3128
+#: src/addressbook.c:3175
 msgid "EMail Address"
 msgstr "電子郵件信箱"
 
-#: src/addressbook.c:3144
+#: src/addressbook.c:3191
 msgid "Group"
 msgstr "群組"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3207 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "資料夾"
 
-#: src/addressbook.c:3176
+#: src/addressbook.c:3223
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3192 src/addressbook.c:3208
+#: src/addressbook.c:3239 src/addressbook.c:3255
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3271
 msgid "LDAP Server"
 msgstr "LDAP 伺服器"
 
@@ -1293,14 +1312,6 @@ msgstr "/編輯(_E)/---"
 msgid "/_Edit/Cu_t"
 msgstr "/編輯(_E)/剪下(_T)"
 
-#: src/compose.c:568 src/mainwindow.c:552 src/messageview.c:160
-msgid "/_Edit/_Copy"
-msgstr "/編輯(_E)/複製(_C)"
-
-#: src/compose.c:569
-msgid "/_Edit/_Paste"
-msgstr "/編輯(_E)/貼上(_P)"
-
 #: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編輯(_E)/貼進引言(_Q)"
@@ -1750,7 +1761,7 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:6060 src/mainwindow.c:2796
+#: src/compose.c:6060 src/mainwindow.c:2799
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -1838,7 +1849,7 @@ msgid "Nick Name"
 msgstr "暱稱"
 
 #: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
-#: src/editgroup.c:266
+#: src/editgroup.c:269
 msgid "E-Mail Address"
 msgstr "E-Mail 地址"
 
@@ -1908,56 +1919,56 @@ msgstr "新增通訊錄"
 msgid "A Group Name must be supplied."
 msgstr "未指定群組名稱"
 
-#: src/editgroup.c:272
+#: src/editgroup.c:275
 msgid "Edit Group Data"
 msgstr "編輯群組資料"
 
-#: src/editgroup.c:299
+#: src/editgroup.c:302
 msgid "Group Name"
 msgstr "群組名稱"
 
-#: src/editgroup.c:318
+#: src/editgroup.c:321
 msgid "Addresses in Group"
 msgstr "群組內地址"
 
-#: src/editgroup.c:320
+#: src/editgroup.c:323
 msgid " -> "
 msgstr " → "
 
-#: src/editgroup.c:347
+#: src/editgroup.c:350
 msgid " <- "
 msgstr " ← "
 
-#: src/editgroup.c:349
+#: src/editgroup.c:352
 msgid "Available Addresses"
 msgstr "可使用之電子郵件地址"
 
-#: src/editgroup.c:415
+#: src/editgroup.c:418
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "請使用箭頭指標將電子郵件地址加入或移除該群組"
 
-#: src/editgroup.c:467
+#: src/editgroup.c:470
 msgid "Edit Group Details"
 msgstr "編輯群組詳細資料"
 
-#: src/editgroup.c:470
+#: src/editgroup.c:473
 msgid "Add New Group"
 msgstr "新增群組"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "編輯資料夾"
 
-#: src/editgroup.c:521
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "請輸入新的資料夾名稱："
 
-#: src/editgroup.c:524 src/foldersel.c:546 src/folderview.c:2175
-#: src/folderview.c:2181
+#: src/editgroup.c:529 src/foldersel.c:546 src/folderview.c:2182
+#: src/folderview.c:2188
 msgid "New folder"
 msgstr "新資料夾"
 
-#: src/editgroup.c:525 src/foldersel.c:547 src/folderview.c:2182
+#: src/editgroup.c:530 src/foldersel.c:547 src/folderview.c:2189
 msgid "Input the name of new folder:"
 msgstr "請輸入新資料夾的名稱："
 
@@ -2124,42 +2135,42 @@ msgstr "選擇目錄"
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: src/foldersel.c:362 src/folderview.c:1200 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "收件夾"
 
-#: src/foldersel.c:366 src/folderview.c:1206 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "寄件夾"
 
-#: src/foldersel.c:370 src/folderview.c:1212 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "暫存資料夾"
 
-#: src/foldersel.c:374 src/folderview.c:1218 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "刪除的郵件"
 
-#: src/foldersel.c:378 src/folderview.c:1224 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:548 src/folderview.c:2179 src/folderview.c:2183
+#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
 msgid "NewFolder"
 msgstr "新資料夾"
 
-#: src/foldersel.c:556 src/folderview.c:2191 src/folderview.c:2252
+#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "資料夾名稱中不應含有「%c」這個字元。"
 
-#: src/foldersel.c:566 src/folderview.c:2201 src/folderview.c:2260
+#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "資料夾「%s」已存在。"
 
-#: src/foldersel.c:574 src/folderview.c:2208
+#: src/foldersel.c:574 src/folderview.c:2215
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "無法建立資料夾「%s」。"
@@ -2231,73 +2242,73 @@ msgid "New"
 msgstr "新的"
 
 #. S_COL_MARK
-#: src/folderview.c:422 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:527
 msgid "Unread"
 msgstr "未讀的"
 
-#: src/folderview.c:436
-msgid "#"
-msgstr "#"
+#: src/folderview.c:440
+msgid "Total"
+msgstr ""
 
-#: src/folderview.c:567
+#: src/folderview.c:573
 msgid "Setting folder info...\n"
 msgstr "設定資料夾...\n"
 
-#: src/folderview.c:568
+#: src/folderview.c:574
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:868 src/mainwindow.c:3794 src/setup.c:80
+#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3799 src/setup.c:85
+#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/folderview.c:914
+#: src/folderview.c:920
 msgid "Rebuild folder tree"
 msgstr "重建資料夾結構"
 
-#: src/folderview.c:915
+#: src/folderview.c:921
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "準備重建資料夾。確定要繼續？"
 
-#: src/folderview.c:924
+#: src/folderview.c:930
 msgid "Rebuilding folder tree..."
 msgstr "重建資料夾結構中..."
 
-#: src/folderview.c:931
+#: src/folderview.c:937
 msgid "Rebuilding of the folder tree failed."
 msgstr "重建資料夾結構失敗。"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1071
 msgid "Checking for new messages in all folders..."
 msgstr "檢查每個資料夾中的新郵件..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: src/folderview.c:1904
+#: src/folderview.c:1911
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "已選取 %s 資料夾\n"
 
-#: src/folderview.c:2059
+#: src/folderview.c:2066
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "從 %s 下載郵件中..."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2103
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "從 %s 下載郵件時出現錯誤。"
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2307,26 +2318,26 @@ msgstr ""
 "（若是資料夾下要有子資料夾，\n"
 "　請在資料夾名稱的後面加上「/'）"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2247
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "請輸入「%s」的新名稱："
 
-#: src/folderview.c:2241
+#: src/folderview.c:2248
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
-#: src/folderview.c:2272 src/folderview.c:2280
+#: src/folderview.c:2279 src/folderview.c:2287
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2357
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "無法移動資料夾「%s」。"
 
-#: src/folderview.c:2416
+#: src/folderview.c:2423
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2335,12 +2346,12 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2425
 #, fuzzy
 msgid "Delete search folder"
 msgstr "刪除資料夾"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2430
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2353,20 +2364,20 @@ msgstr ""
 "\n"
 "您確定要刪除它嗎？"
 
-#: src/folderview.c:2455 src/folderview.c:2461
+#: src/folderview.c:2462 src/folderview.c:2468
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2497
+#: src/folderview.c:2504
 msgid "Empty trash"
 msgstr "清空刪除的郵件"
 
-#: src/folderview.c:2498
+#: src/folderview.c:2505
 msgid "Delete all messages in the trash folder?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2546
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2375,34 +2386,34 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2541
+#: src/folderview.c:2548
 msgid "Remove mailbox"
 msgstr "移除信箱"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2598
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "您確定要刪除 %s 這個 IMAP4 帳號？"
 
-#: src/folderview.c:2592
+#: src/folderview.c:2599
 msgid "Delete IMAP4 account"
 msgstr "刪除 IMAP4 帳號"
 
-#: src/folderview.c:2745
+#: src/folderview.c:2752
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "您確定要刪除新聞群組「%s」嗎？"
 
-#: src/folderview.c:2746
+#: src/folderview.c:2753
 msgid "Delete newsgroup"
 msgstr "刪除新聞群組"
 
-#: src/folderview.c:2796
+#: src/folderview.c:2803
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "您確定要刪除新聞群組帳號「%s」嗎？"
 
-#: src/folderview.c:2797
+#: src/folderview.c:2804
 msgid "Delete news account"
 msgstr "刪除帳號"
 
@@ -3525,27 +3536,27 @@ msgstr "無"
 msgid "Changing window separation type from %d to %d\n"
 msgstr "正在變更視窗分割類型由 %d 到 %d\n"
 
-#: src/mainwindow.c:1673
+#: src/mainwindow.c:1676
 msgid "Offline"
 msgstr "離線"
 
-#: src/mainwindow.c:1674
+#: src/mainwindow.c:1677
 msgid "You are offline. Go online?"
 msgstr "您目前正離線中。要連線嗎？"
 
-#: src/mainwindow.c:1691
+#: src/mainwindow.c:1694
 msgid "Empty all trash"
 msgstr "清空刪除的郵件"
 
-#: src/mainwindow.c:1692
+#: src/mainwindow.c:1695
 msgid "Delete all messages in trash folders?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/mainwindow.c:1722
+#: src/mainwindow.c:1725
 msgid "Add mailbox"
 msgstr "新增信箱"
 
-#: src/mainwindow.c:1723
+#: src/mainwindow.c:1726
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3555,16 +3566,16 @@ msgstr ""
 "並請注意不要輸入已存在的信箱名稱，\n"
 "系統會自動判別是否它已存在。"
 
-#: src/mainwindow.c:1729 src/setup.c:49
+#: src/mainwindow.c:1732 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "信箱「%s」已存在。"
 
-#: src/mainwindow.c:1734 src/setup.c:56
+#: src/mainwindow.c:1737 src/setup.c:56
 msgid "Mailbox"
 msgstr "信箱"
 
-#: src/mainwindow.c:1740 src/setup.c:62
+#: src/mainwindow.c:1743 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3573,69 +3584,69 @@ msgstr ""
 "無法產生信箱目錄。\n"
 "可能是因為同樣名稱的檔案已經存在，或者是你沒有權限可以開新目錄。"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 資料夾檢視"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 郵件列表"
 
-#: src/mainwindow.c:2400 src/summaryview.c:418
+#: src/mainwindow.c:2403 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/直接回覆(_R)"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2404
 msgid "/Reply to _all"
 msgstr "/全部回覆(_A)"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2405
 msgid "/Reply to _sender"
 msgstr "/回覆給原作者(_S)"
 
-#: src/mainwindow.c:2403
+#: src/mainwindow.c:2406
 msgid "/Reply to mailing _list"
 msgstr "/回覆到郵遞論壇(_L)"
 
-#: src/mainwindow.c:2408 src/summaryview.c:425
+#: src/mainwindow.c:2411 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/轉寄(_F)"
 
-#: src/mainwindow.c:2409 src/summaryview.c:426
+#: src/mainwindow.c:2412 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/將郵件當成附加檔轉寄(_W)"
 
-#: src/mainwindow.c:2410 src/summaryview.c:427
+#: src/mainwindow.c:2413 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/郵件導向(_T)"
 
-#: src/mainwindow.c:2823
+#: src/mainwindow.c:2826
 msgid "You are offline. Click the icon to go online."
 msgstr "您目前正離線中。按下按鈕恢復連線。"
 
-#: src/mainwindow.c:2834
+#: src/mainwindow.c:2837
 msgid "You are online. Click the icon to go offline."
 msgstr "您目前正連線中。按下按鈕離線工作。"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:3108
+#: src/mainwindow.c:3111
 msgid "Exit this program?"
 msgstr "您確定要離開嗎？"
 
-#: src/mainwindow.c:3712
+#: src/mainwindow.c:3715
 #, fuzzy
 msgid "Command line options"
 msgstr "未設定執行指令"
 
-#: src/mainwindow.c:3725
+#: src/mainwindow.c:3728
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "用法：%s [選項]...\n"
 
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:3736
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3651,7 +3662,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3749
+#: src/mainwindow.c:3752
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -6797,6 +6808,9 @@ msgstr "離開"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "#"
+#~ msgstr "#"
+
 #~ msgid ""
 #~ "Select items to be displayed on the summary view. You can modify\n"
 #~ "the order by using the Up / Down button, or dragging the items."