[Commits] [SCM] claws branch, master, updated. 3.9.2-134-g09425de

claws at claws-mail.org claws at claws-mail.org
Sat Dec 14 09:37:44 CET 2013


The branch master of project "claws" (Claws Mail) has been updated
       via  09425de03a7eda1d39979853e3590908ec31dde6 (commit)
      from  e589ff5ab9641a72160ad1e735408ce5b2b7c617 (commit)


- Log -----------------------------------------------------------------
commit 09425de03a7eda1d39979853e3590908ec31dde6
Author: Paul <paul at claws-mail.org>
Date:   Sat Dec 14 08:37:32 2013 +0000

    update translations
    
    cs: David Vachulka
    de: Thomas Bellmann
    es: Ricarddo Mones
    fr: Colin Leroy
    he: Genghis Khan
    nl: Marcel Pol
    pt_BR: Frederico Goncalves Guimaraes
    sk: Slavko
    sv: Andreas Rönnquist

diff --git a/po/cs.po b/po/cs.po
index cee19dc..80344ea 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2013-02-20 17:49+0100\n"
-"PO-Revision-Date: 2013-04-29 20:24+0100\n"
+"POT-Creation-Date: 2013-12-07 08:54+0000\n"
+"PO-Revision-Date: 2013-12-07 13:24+0100\n"
 "Last-Translator: David Vachulka <david at konstrukce-cad.com>\n"
 "Language-Team: Czech <cs at li.org>\n"
 "Language: cs\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(((n%100>=10 && n%100<=14) || (n%10>5)) ? "
 "2 : (n%10>=2 && n%10<=4) ? 1 : 0);\n"
 
-#: src/account.c:384
+#: src/account.c:392
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -26,15 +26,15 @@ msgstr ""
 "Jsou stále otevřena nějaká okna s rozepsanou zprávou.\n"
 "Před úpravou tohoto účtu zavřete prosím všechna tato okna."
 
-#: src/account.c:431
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Nemohu vytvořit složku."
 
-#: src/account.c:710
+#: src/account.c:717
 msgid "Edit accounts"
 msgstr "Úpravy účtů"
 
-#: src/account.c:731
+#: src/account.c:734
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -44,7 +44,7 @@ msgstr ""
 "zde uvedeny. Zaškrtnutím ve sloupci 'P' určíte, zda účet bude touto funkcí "
 "zpracován. Tučný text značí aktuální účet."
 
-#: src/account.c:802
+#: src/account.c:805
 msgid " _Set as default account "
 msgstr " Nastavit účet jako _výchozí "
 
@@ -71,33 +71,33 @@ msgstr "(Nepojmenovaný)"
 msgid "Delete account"
 msgstr "Odstranit účet"
 
-#: src/account.c:1537
+#: src/account.c:1536
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "P"
 
-#: src/account.c:1543
+#: src/account.c:1542
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 "Funkce 'Přijmout poštu ze všech účtů' načte zprávy z účtů označených "
 "zaškrtnutím"
 
-#: src/account.c:1550 src/addressadd.c:215 src/addressbook.c:125
-#: src/addrduplicates.c:481 src/compose.c:6984 src/editaddress.c:1270
-#: src/editaddress.c:1327 src/editaddress.c:1347 src/editbook.c:170
+#: src/account.c:1549 src/addressadd.c:215 src/addressbook.c:125
+#: src/addrduplicates.c:481 src/compose.c:7073 src/editaddress.c:1263
+#: src/editaddress.c:1320 src/editaddress.c:1340 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:284 src/plugins/pdf_viewer/poppler_viewer.c:1789
-#: src/plugins/pgpcore/select-keys.c:398 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1872 src/prefs_template.c:78
+#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1800
+#: src/plugins/pgpcore/select-keys.c:394 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1868 src/prefs_template.c:78
 msgid "Name"
 msgstr "Jméno"
 
-#: src/account.c:1558 src/prefs_account.c:1089 src/prefs_account.c:3914
+#: src/account.c:1557 src/prefs_account.c:1097 src/prefs_account.c:3921
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:1566 src/ssl_manager.c:102
+#: src/account.c:1565 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Server"
 
@@ -137,7 +137,7 @@ msgstr ""
 "Neplatná(é) filtrovací akce:\n"
 "%s"
 
-#: src/action.c:978
+#: src/action.c:988
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -148,7 +148,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:980 src/plugins/bogofilter/bogofilter.c:875
+#: src/action.c:990 src/plugins/bogofilter/bogofilter.c:875
 #: src/plugins/rssyl/feed.c:1734 src/plugins/rssyl/feed.c:1738
 #: src/plugins/tnef_parse/tnef_parse.c:67
 #: src/plugins/vcalendar/vcal_folder.c:1800
@@ -158,25 +158,25 @@ msgstr ""
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
-#: src/action.c:1198 src/action.c:1368
+#: src/action.c:1208 src/action.c:1373
 msgid "Completed"
 msgstr "Dokončeno"
 
-#: src/action.c:1234
+#: src/action.c:1244
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Spuštěno: %s\n"
 
-#: src/action.c:1238
+#: src/action.c:1248
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Ukončeno: %s\n"
 
-#: src/action.c:1271
+#: src/action.c:1281
 msgid "Action's input/output"
 msgstr "Vstup/výstup akce"
 
-#: src/action.c:1604
+#: src/action.c:1609
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -187,11 +187,11 @@ msgstr ""
 "('%%h' bude nahrazeno parametrem)\n"
 "  %s"
 
-#: src/action.c:1609
+#: src/action.c:1614
 msgid "Action's hidden user argument"
 msgstr "Skrytý uživatelský parametr akce"
 
-#: src/action.c:1613
+#: src/action.c:1618
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -202,11 +202,11 @@ msgstr ""
 "('%%u' bude nahrazeno parametrem)\n"
 "  %s"
 
-#: src/action.c:1618
+#: src/action.c:1623
 msgid "Action's user argument"
 msgstr "Uživatelský parametr akce"
 
-#: src/addr_compl.c:600 src/addressbook.c:4881
+#: src/addr_compl.c:600 src/addressbook.c:4870
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:314
 msgid "Group"
 msgstr "Skupina"
@@ -281,13 +281,13 @@ msgstr ""
 
 #: src/addrcustomattr.c:212 src/addressbook.c:435 src/addressbook.c:463
 #: src/addressbook.c:480 src/edittags.c:271
-#: src/plugins/archive/archiver_gtk.c:1193 src/prefs_actions.c:1086
-#: src/prefs_filtering.c:1692 src/prefs_template.c:1095
+#: src/plugins/archive/archiver_gtk.c:1193 src/prefs_actions.c:1090
+#: src/prefs_filtering.c:1695 src/prefs_template.c:1099
 msgid "_Delete"
 msgstr "_Odstranit"
 
-#: src/addrcustomattr.c:213 src/edittags.c:272 src/prefs_actions.c:1087
-#: src/prefs_filtering.c:1693 src/prefs_template.c:1096
+#: src/addrcustomattr.c:213 src/edittags.c:272 src/prefs_actions.c:1091
+#: src/prefs_filtering.c:1696 src/prefs_template.c:1100
 msgid "Delete _all"
 msgstr "Odstranit _vše"
 
@@ -295,20 +295,20 @@ msgstr "Odstranit _vše"
 msgid "_Reset to default"
 msgstr "_Nastavit výchozí hodnoty"
 
-#: src/addrcustomattr.c:410
+#: src/addrcustomattr.c:403
 msgid "Attribute name is not set."
 msgstr "Není nastaven název atributu."
 
-#: src/addrcustomattr.c:469
+#: src/addrcustomattr.c:462
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Upravit jméno atributu"
 
-#: src/addrcustomattr.c:483
+#: src/addrcustomattr.c:476
 msgid "New attribute name:"
 msgstr "Název nového atributu:"
 
-#: src/addrcustomattr.c:520
+#: src/addrcustomattr.c:513
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -325,12 +325,12 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #: src/addressadd.c:227 src/addrduplicates.c:452
-#: src/plugins/pgpcore/select-keys.c:399 src/toolbar.c:431
+#: src/plugins/pgpcore/select-keys.c:395 src/toolbar.c:432
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1062
-#: src/editaddress.c:1137 src/editgroup.c:290
+#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1055
+#: src/editaddress.c:1130 src/editgroup.c:290
 msgid "Remarks"
 msgstr "Poznámky"
 
@@ -338,7 +338,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku pro knihu adres"
 
-#: src/addressadd.c:483 src/editaddress.c:1585 src/headerview.c:348
+#: src/addressadd.c:483 src/editaddress.c:1582 src/headerview.c:348
 #: src/textview.c:2110
 #, c-format
 msgid ""
@@ -348,7 +348,7 @@ msgstr ""
 "Chyba uložení obrázku: \n"
 "%s"
 
-#: src/addressadd.c:532 src/addressbook.c:3221 src/addressbook.c:3272
+#: src/addressadd.c:532 src/addressbook.c:3210 src/addressbook.c:3261
 msgid "Add address(es)"
 msgstr "Přidat adresu(y)"
 
@@ -356,8 +356,8 @@ msgstr "Přidat adresu(y)"
 msgid "Can't add the specified address"
 msgstr "Nebylo možno přidat zadanou adresu"
 
-#: src/addressbook.c:126 src/addressbook.c:4869 src/editaddress.c:1059
-#: src/editaddress.c:1120 src/editgroup.c:289 src/expldifdlg.c:517
+#: src/addressbook.c:126 src/addressbook.c:4858 src/editaddress.c:1052
+#: src/editaddress.c:1113 src/editgroup.c:289 src/expldifdlg.c:517
 #: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:782
 msgid "Email Address"
 msgstr "E-mail"
@@ -367,18 +367,18 @@ msgid "_Book"
 msgstr "_Kniha"
 
 #: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
-#: src/addressbook.c:479 src/compose.c:576 src/gtk/quicksearch.c:799
-#: src/gtk/quicksearch.c:814 src/mainwindow.c:503 src/messageview.c:211
+#: src/addressbook.c:479 src/compose.c:578 src/mainwindow.c:504
+#: src/messageview.c:209
 msgid "_Edit"
 msgstr "Ú_pravy"
 
-#: src/addressbook.c:404 src/compose.c:581 src/mainwindow.c:506
-#: src/messageview.c:214
+#: src/addressbook.c:404 src/compose.c:583 src/mainwindow.c:507
+#: src/messageview.c:212
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: src/addressbook.c:405 src/compose.c:582 src/mainwindow.c:508
-#: src/messageview.c:215
+#: src/addressbook.c:405 src/compose.c:584 src/mainwindow.c:509
+#: src/messageview.c:213
 msgid "_Help"
 msgstr "Nápo_věda"
 
@@ -410,15 +410,15 @@ msgstr "Up_ravit knihu"
 msgid "_Delete book"
 msgstr "_Odstranit knihu"
 
-#: src/addressbook.c:424 src/compose.c:592
+#: src/addressbook.c:424 src/compose.c:595
 msgid "_Save"
 msgstr "_Uložit"
 
-#: src/addressbook.c:425 src/compose.c:596 src/messageview.c:224
+#: src/addressbook.c:425 src/compose.c:599 src/messageview.c:222
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:228
+#: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:226
 msgid "_Select all"
 msgstr "Vybrat vš_e"
 
@@ -427,12 +427,12 @@ msgid "C_ut"
 msgstr "_Vyjmout"
 
 #: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:604 src/mainwindow.c:537 src/messageview.c:227
+#: src/compose.c:607 src/mainwindow.c:538 src/messageview.c:225
 msgid "_Copy"
 msgstr "_Kopírovat"
 
 #: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:605
+#: src/compose.c:608
 msgid "_Paste"
 msgstr "V_ložit"
 
@@ -476,8 +476,8 @@ msgstr "Najít duplikované"
 msgid "Edit custom attributes..."
 msgstr "Upravit uživatelské atributy..."
 
-#: src/addressbook.c:455 src/compose.c:684 src/mainwindow.c:800
-#: src/messageview.c:340
+#: src/addressbook.c:455 src/compose.c:687 src/mainwindow.c:801
+#: src/messageview.c:338
 msgid "_About"
 msgstr "_O programu"
 
@@ -486,7 +486,7 @@ msgid "_Browse Entry"
 msgstr "_Prohlížet záznam"
 
 #: src/addressbook.c:504 src/crash.c:451 src/crash.c:470 src/importldif.c:115
-#: src/plugins/pgpcore/select-keys.c:255 src/plugins/pgpcore/sgpgme.c:140
+#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:140
 #: src/plugins/vcalendar/day-view.c:410 src/plugins/vcalendar/month-view.c:431
 #: src/prefs_themes.c:705 src/prefs_themes.c:737 src/prefs_themes.c:738
 msgid "Unknown"
@@ -588,32 +588,32 @@ msgstr "Pod tímto klíčem je již existující kontakt"
 msgid "Strong(er) authentication required"
 msgstr "Vyžadována silnější autentizace"
 
-#: src/addressbook.c:913
+#: src/addressbook.c:910
 msgid "Sources"
 msgstr "Zdroje adres"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:629 src/prefs_other.c:475
-#: src/toolbar.c:223 src/toolbar.c:2156
+#: src/addressbook.c:914 src/prefs_matcher.c:629 src/prefs_other.c:475
+#: src/toolbar.c:224 src/toolbar.c:2157
 msgid "Address book"
 msgstr "Kniha adres"
 
-#: src/addressbook.c:1120
+#: src/addressbook.c:1109
 msgid "Lookup name:"
 msgstr "Hledané jméno:"
 
-#: src/addressbook.c:1444 src/addressbook.c:1497 src/addrduplicates.c:803
+#: src/addressbook.c:1433 src/addressbook.c:1486 src/addrduplicates.c:803
 msgid "Delete address(es)"
 msgstr "Odstranit adresu(y)"
 
-#: src/addressbook.c:1445 src/addrduplicates.c:853
+#: src/addressbook.c:1434 src/addrduplicates.c:853
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Tato data jsou pouze pro čtení a nelze je odstranit."
 
-#: src/addressbook.c:1489
+#: src/addressbook.c:1478
 msgid "Delete group"
 msgstr "Odstranit skupinu"
 
-#: src/addressbook.c:1490
+#: src/addressbook.c:1479
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -621,53 +621,53 @@ msgstr ""
 "Chcete odstranit skupinu (skupiny)?\n"
 "Adresy v ní (v nich) obsažené budou ztraceny."
 
-#: src/addressbook.c:1498 src/addrduplicates.c:804
+#: src/addressbook.c:1487 src/addrduplicates.c:804
 msgid "Really delete the address(es)?"
 msgstr "Opravdu chcete odstranit tuto adresu(y)?"
 
-#: src/addressbook.c:2201
+#: src/addressbook.c:2190
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Nelze vložit. Cílová kniha adres je pouze pro čtení."
 
-#: src/addressbook.c:2211
+#: src/addressbook.c:2200
 msgid "Cannot paste into an address group."
 msgstr "Nelze provést vložení do skupiny adres."
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2906
 #, c-format
-msgid "Do you want to delete the query results and addresses in '%s' ?"
-msgstr "Opravdu chcete odstranit výsledky vyhledávání '%s' ?"
+msgid "Do you want to delete the query results and addresses in '%s'?"
+msgstr "Opravdu chcete odstranit výsledky vyhledávání a adresy v '%s' ?"
 
-#: src/addressbook.c:2920 src/addressbook.c:2946 src/addressbook.c:2953
+#: src/addressbook.c:2909 src/addressbook.c:2935 src/addressbook.c:2942
 #: src/plugins/archive/archiver_prefs.c:337 src/prefs_filtering_action.c:177
-#: src/toolbar.c:413
+#: src/toolbar.c:414
 msgid "Delete"
 msgstr "Odstranit"
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2918
 #, c-format
 msgid ""
-"Do you want to delete '%s' ? If you delete the folder only, the addresses it "
+"Do you want to delete '%s'? If you delete the folder only, the addresses it "
 "contains will be moved into the parent folder."
 msgstr ""
 "Chcete odstranit '%s'? Pokud odstraníte pouze složku, adresy v ní obsažené "
 "budou přesunuty do nadřazené složky."
 
-#: src/addressbook.c:2932 src/imap_gtk.c:363 src/mh_gtk.c:202
-#: src/plugins/mailmbox/plugin_gtk.c:325 src/plugins/rssyl/rssyl_cb_menu.c:237
-#: src/plugins/vcalendar/vcal_folder.c:1953
+#: src/addressbook.c:2921 src/imap_gtk.c:363 src/mh_gtk.c:202
+#: src/plugins/mailmbox/plugin_gtk.c:324 src/plugins/rssyl/rssyl_cb_menu.c:237
+#: src/plugins/vcalendar/vcal_folder.c:1951
 msgid "Delete folder"
 msgstr "Odstranit složku"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "+Delete _folder only"
 msgstr "+Odstranit pouze _složku"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "Delete folder and _addresses"
 msgstr "Odstranit složku a _adresy"
 
-#: src/addressbook.c:2944
+#: src/addressbook.c:2933
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -676,7 +676,7 @@ msgstr ""
 "Chcete odstranit '%s'?\n"
 "Adresy v ní obsažené budou ztraceny."
 
-#: src/addressbook.c:2951
+#: src/addressbook.c:2940
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -685,28 +685,28 @@ msgstr ""
 "Chcete odstranit '%s'?\n"
 "Adresy v ní obsažené budou ztraceny."
 
-#: src/addressbook.c:3065
+#: src/addressbook.c:3054
 #, c-format
 msgid "Search '%s'"
 msgstr "Hledání '%s'"
 
-#: src/addressbook.c:3203 src/addressbook.c:3253
+#: src/addressbook.c:3192 src/addressbook.c:3242
 msgid "New Contacts"
 msgstr "Nový kontakt"
 
-#: src/addressbook.c:4035
+#: src/addressbook.c:4024
 msgid "New user, could not save index file."
 msgstr "Nový uživatel, nelze uložit index soubor."
 
-#: src/addressbook.c:4039
+#: src/addressbook.c:4028
 msgid "New user, could not save address book files."
 msgstr "Nový uživatel, nelze uložit soubory s knihou adres."
 
-#: src/addressbook.c:4049
+#: src/addressbook.c:4038
 msgid "Old address book converted successfully."
 msgstr "Konverze staré knihy adres proběhla úspěšně."
 
-#: src/addressbook.c:4054
+#: src/addressbook.c:4043
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -714,7 +714,7 @@ msgstr ""
 "Stará kniha adres zkonvertována,\n"
 "nepodařilo se uložit nový soubor s indexem adres."
 
-#: src/addressbook.c:4067
+#: src/addressbook.c:4056
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -722,7 +722,7 @@ msgstr ""
 "Nepodařilo se provést konverzi knihy adres,\n"
 "ale byl vytvořen nové prázdné soubory knihy adres."
 
-#: src/addressbook.c:4073
+#: src/addressbook.c:4062
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -730,7 +730,7 @@ msgstr ""
 "Nepodařilo se provést konverzi knihy adres,\n"
 "nepodařilo se uložit nový soubor s indexem adres."
 
-#: src/addressbook.c:4078
+#: src/addressbook.c:4067
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -738,53 +738,53 @@ msgstr ""
 "Nepodařilo se provést konverzi knihy adres\n"
 "a nepodařilo se vytvořit nové soubory knihy adres."
 
-#: src/addressbook.c:4085 src/addressbook.c:4091
+#: src/addressbook.c:4074 src/addressbook.c:4080
 msgid "Addressbook conversion error"
 msgstr "Chyba při konverzi knihy adres"
 
-#: src/addressbook.c:4198
+#: src/addressbook.c:4187
 msgid "Addressbook Error"
 msgstr "Chyba v knize adres"
 
-#: src/addressbook.c:4199
+#: src/addressbook.c:4188
 msgid "Could not read address index"
 msgstr "Nelze načíst index adres"
 
-#: src/addressbook.c:4530
+#: src/addressbook.c:4519
 msgid "Busy searching..."
 msgstr "Prohledávám..."
 
-#: src/addressbook.c:4833
+#: src/addressbook.c:4822
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/addressbook.c:4845 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
+#: src/addressbook.c:4834 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
 #: src/expldifdlg.c:388 src/exporthtml.c:984 src/importldif.c:657
 msgid "Address Book"
 msgstr "Kniha adres"
 
-#: src/addressbook.c:4857
+#: src/addressbook.c:4846
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:4893 src/exporthtml.c:884 src/folderview.c:338
+#: src/addressbook.c:4882 src/exporthtml.c:884 src/folderview.c:338
 #: src/folderview.c:426 src/prefs_account.c:2738 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Složka"
 
-#: src/addressbook.c:4905
+#: src/addressbook.c:4894
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4917 src/addressbook.c:4929
+#: src/addressbook.c:4906 src/addressbook.c:4918
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4941
+#: src/addressbook.c:4930
 msgid "LDAP servers"
 msgstr "LDAP servery"
 
-#: src/addressbook.c:4953
+#: src/addressbook.c:4942
 msgid "LDAP Query"
 msgstr "LDAP dotaz"
 
@@ -799,9 +799,9 @@ msgstr "LDAP dotaz"
 #: src/plugins/spamassassin/spamassassin_gtk.c:443
 #: src/plugins/spamassassin/spamassassin_gtk.c:490
 #: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:672
-#: src/prefs_matcher.c:707 src/prefs_matcher.c:1601 src/prefs_matcher.c:1608
-#: src/prefs_matcher.c:1616 src/prefs_matcher.c:1618 src/prefs_matcher.c:2498
-#: src/prefs_matcher.c:2502
+#: src/prefs_matcher.c:707 src/prefs_matcher.c:1607 src/prefs_matcher.c:1614
+#: src/prefs_matcher.c:1622 src/prefs_matcher.c:1624 src/prefs_matcher.c:2504
+#: src/prefs_matcher.c:2508
 msgid "Any"
 msgstr "kterákoliv"
 
@@ -855,7 +855,7 @@ msgstr "Zpracovat tato pole z hlavičky zprávy"
 msgid "Include subfolders"
 msgstr "Zahrnout podsložky"
 
-#: src/addrgather.c:456 src/prefs_filtering_action.c:1423
+#: src/addrgather.c:456 src/prefs_filtering_action.c:1425
 msgid "Header Name"
 msgstr "Záhlaví"
 
@@ -937,18 +937,19 @@ msgstr "Cesta ke knize adres"
 msgid "Delete address"
 msgstr "Odstranit adresu(y)"
 
-#: src/alertpanel.c:146 src/compose.c:9160
+#: src/alertpanel.c:146 src/compose.c:9217
 msgid "Notice"
 msgstr "Poznámka"
 
-#: src/alertpanel.c:159 src/compose.c:5556 src/compose.c:6022
-#: src/compose.c:11468 src/messageview.c:874 src/messageview.c:887
-#: src/plugins/pgpcore/sgpgme.c:703 src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4868
+#: src/alertpanel.c:159 src/compose.c:5597 src/compose.c:6063
+#: src/compose.c:11533 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:852 src/messageview.c:865
+#: src/plugins/pgpcore/sgpgme.c:706 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4865
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5497 src/inc.c:666
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5538 src/inc.c:652
 #: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:246
 msgid "Error"
 msgstr "Chyba"
@@ -1066,7 +1067,7 @@ msgstr "Vaše verze Claws Mail je příliš stará na použití s modulem %s."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Vaše verze Claws Mail je příliš stará na použití s tímto modulem."
 
-#: src/common/session.c:173 src/imap.c:1145
+#: src/common/session.c:175 src/imap.c:1145
 msgid "SSL handshake failed\n"
 msgstr "Inicializace SSL spojení selhala\n"
 
@@ -1218,661 +1219,665 @@ msgstr "<not in certificate>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Předmět odstraněn reg. výrazem)"
 
-#: src/common/utils.c:371
+#: src/common/utils.c:362
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
-#: src/common/utils.c:372
+#: src/common/utils.c:363
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dKB"
 
-#: src/common/utils.c:373
+#: src/common/utils.c:364
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMB"
 
-#: src/common/utils.c:374
+#: src/common/utils.c:365
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4974
+#: src/common/utils.c:4946
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Neděle"
 
-#: src/common/utils.c:4975
+#: src/common/utils.c:4947
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Pondělí"
 
-#: src/common/utils.c:4976
+#: src/common/utils.c:4948
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: src/common/utils.c:4977
+#: src/common/utils.c:4949
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Středa"
 
-#: src/common/utils.c:4978
+#: src/common/utils.c:4950
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: src/common/utils.c:4979
+#: src/common/utils.c:4951
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Pátek"
 
-#: src/common/utils.c:4980
+#: src/common/utils.c:4952
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/common/utils.c:4982
+#: src/common/utils.c:4954
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Leden"
 
-#: src/common/utils.c:4983
+#: src/common/utils.c:4955
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Únor"
 
-#: src/common/utils.c:4984
+#: src/common/utils.c:4956
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Březen"
 
-#: src/common/utils.c:4985
+#: src/common/utils.c:4957
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Duben"
 
-#: src/common/utils.c:4986
+#: src/common/utils.c:4958
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Květen"
 
-#: src/common/utils.c:4987
+#: src/common/utils.c:4959
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Červen"
 
-#: src/common/utils.c:4988
+#: src/common/utils.c:4960
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Červenec"
 
-#: src/common/utils.c:4989
+#: src/common/utils.c:4961
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Srpen"
 
-#: src/common/utils.c:4990
+#: src/common/utils.c:4962
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Září"
 
-#: src/common/utils.c:4991
+#: src/common/utils.c:4963
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Říjen"
 
-#: src/common/utils.c:4992
+#: src/common/utils.c:4964
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Listopad"
 
-#: src/common/utils.c:4993
+#: src/common/utils.c:4965
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Prosinec"
 
-#: src/common/utils.c:4995
+#: src/common/utils.c:4967
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "ne"
 
-#: src/common/utils.c:4996
+#: src/common/utils.c:4968
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "po"
 
-#: src/common/utils.c:4997
+#: src/common/utils.c:4969
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "út"
 
-#: src/common/utils.c:4998
+#: src/common/utils.c:4970
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "st"
 
-#: src/common/utils.c:4999
+#: src/common/utils.c:4971
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "čt"
 
-#: src/common/utils.c:5000
+#: src/common/utils.c:4972
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "pá"
 
-#: src/common/utils.c:5001
+#: src/common/utils.c:4973
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "so"
 
-#: src/common/utils.c:5003
+#: src/common/utils.c:4975
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "led"
 
-#: src/common/utils.c:5004
+#: src/common/utils.c:4976
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "úno"
 
-#: src/common/utils.c:5005
+#: src/common/utils.c:4977
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "bře"
 
-#: src/common/utils.c:5006
+#: src/common/utils.c:4978
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "dub"
 
-#: src/common/utils.c:5007
+#: src/common/utils.c:4979
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "kvě"
 
-#: src/common/utils.c:5008
+#: src/common/utils.c:4980
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "čen"
 
-#: src/common/utils.c:5009
+#: src/common/utils.c:4981
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "čvc"
 
-#: src/common/utils.c:5010
+#: src/common/utils.c:4982
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "srp"
 
-#: src/common/utils.c:5011
+#: src/common/utils.c:4983
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "zář"
 
-#: src/common/utils.c:5012
+#: src/common/utils.c:4984
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "říj"
 
-#: src/common/utils.c:5013
+#: src/common/utils.c:4985
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "lis"
 
-#: src/common/utils.c:5014
+#: src/common/utils.c:4986
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "pro"
 
-#: src/common/utils.c:5025
+#: src/common/utils.c:4997
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "DOP."
 
-#: src/common/utils.c:5026
+#: src/common/utils.c:4998
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "ODP."
 
-#: src/common/utils.c:5027
+#: src/common/utils.c:4999
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "dop."
 
-#: src/common/utils.c:5028
+#: src/common/utils.c:5000
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "odp."
 
-#: src/common/utils.c:5035
+#: src/common/utils.c:5007
 msgctxt "For use by strftime (default date+time format)"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %d.%m.%Y %H:%M"
 
-#: src/common/utils.c:5036
+#: src/common/utils.c:5008
 msgctxt "For use by strftime (default date format)"
 msgid "%m/%d/%y"
 msgstr "%d.%m.%Y"
 
-#: src/common/utils.c:5037
+#: src/common/utils.c:5009
 msgctxt "For use by strftime (default time format)"
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
-#: src/common/utils.c:5039
+#: src/common/utils.c:5011
 msgctxt "For use by strftime (default 12-hour time format)"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
-#: src/compose.c:565
+#: src/compose.c:567
 msgid "_Add..."
 msgstr "_Přidat..."
 
-#: src/compose.c:566 src/mh_gtk.c:361 src/plugins/mailmbox/plugin_gtk.c:293
+#: src/compose.c:568 src/mh_gtk.c:361 src/plugins/mailmbox/plugin_gtk.c:293
 #: src/plugins/rssyl/rssyl_cb_menu.c:140
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: src/compose.c:568 src/folderview.c:234
+#: src/compose.c:570 src/folderview.c:234
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
-#: src/compose.c:575 src/mainwindow.c:505 src/messageview.c:213
+#: src/compose.c:577 src/mainwindow.c:506 src/messageview.c:211
 msgid "_Message"
 msgstr "_Zpráva"
 
-#: src/compose.c:578
+#: src/compose.c:580
 msgid "_Spelling"
 msgstr "_Pravopis"
 
-#: src/compose.c:580 src/compose.c:646
+#: src/compose.c:582 src/compose.c:649
 msgid "_Options"
 msgstr "Nastav_ení"
 
-#: src/compose.c:584
+#: src/compose.c:586
 msgid "S_end"
 msgstr "_Odeslat"
 
-#: src/compose.c:585
+#: src/compose.c:587
 msgid "Send _later"
 msgstr "Poslat _později"
 
-#: src/compose.c:588
+#: src/compose.c:590
 msgid "_Attach file"
 msgstr "Připojit _soubor"
 
-#: src/compose.c:589
+#: src/compose.c:591
 msgid "_Insert file"
 msgstr "_Vložit soubor"
 
-#: src/compose.c:590
+#: src/compose.c:592
 msgid "Insert si_gnature"
 msgstr "Vložit p_odpis"
 
-#: src/compose.c:594
+#: src/compose.c:593
+msgid "_Replace signature"
+msgstr "Na_hradit podpis"
+
+#: src/compose.c:597
 msgid "_Print"
 msgstr "_Tisk"
 
-#: src/compose.c:599
+#: src/compose.c:602
 msgid "_Undo"
 msgstr "_Zpět"
 
-#: src/compose.c:600
+#: src/compose.c:603
 msgid "_Redo"
 msgstr "Z_novu"
 
-#: src/compose.c:603
+#: src/compose.c:606
 msgid "Cu_t"
 msgstr "_Vyjmout"
 
-#: src/compose.c:607
+#: src/compose.c:610
 msgid "_Special paste"
 msgstr "_Vložit jinak"
 
-#: src/compose.c:608
+#: src/compose.c:611
 msgid "As _quotation"
 msgstr "Jako _citaci"
 
-#: src/compose.c:609
+#: src/compose.c:612
 msgid "_Wrapped"
 msgstr "_Zalomené"
 
-#: src/compose.c:610
+#: src/compose.c:613
 msgid "_Unwrapped"
 msgstr "_Nezalomené"
 
-#: src/compose.c:612 src/mainwindow.c:538
+#: src/compose.c:615 src/mainwindow.c:539
 msgid "Select _all"
 msgstr "Vybrat vš_e"
 
-#: src/compose.c:614
+#: src/compose.c:617
 msgid "A_dvanced"
 msgstr "Po_kročilé"
 
-#: src/compose.c:615
+#: src/compose.c:618
 msgid "Move a character backward"
 msgstr "Přesun o znak zpět"
 
-#: src/compose.c:616
+#: src/compose.c:619
 msgid "Move a character forward"
 msgstr "Přesun o znak dále"
 
-#: src/compose.c:617
+#: src/compose.c:620
 msgid "Move a word backward"
 msgstr "Přesun o slovo zpět"
 
-#: src/compose.c:618
+#: src/compose.c:621
 msgid "Move a word forward"
 msgstr "Přesun o slovo dále"
 
-#: src/compose.c:619
+#: src/compose.c:622
 msgid "Move to beginning of line"
 msgstr "Přesun na začátek řádku"
 
-#: src/compose.c:620
+#: src/compose.c:623
 msgid "Move to end of line"
 msgstr "Přesun na konec řádku"
 
-#: src/compose.c:621
+#: src/compose.c:624
 msgid "Move to previous line"
 msgstr "Přesun na předchozí řádek"
 
-#: src/compose.c:622
+#: src/compose.c:625
 msgid "Move to next line"
 msgstr "Přesun na další řádek"
 
-#: src/compose.c:623
+#: src/compose.c:626
 msgid "Delete a character backward"
 msgstr "Smazat znak zpět"
 
-#: src/compose.c:624
+#: src/compose.c:627
 msgid "Delete a character forward"
 msgstr "Smazat znak vpřed"
 
-#: src/compose.c:625
+#: src/compose.c:628
 msgid "Delete a word backward"
 msgstr "Smazat slovo zpět"
 
-#: src/compose.c:626
+#: src/compose.c:629
 msgid "Delete a word forward"
 msgstr "Smazat slovo vpřed"
 
-#: src/compose.c:627
+#: src/compose.c:630
 msgid "Delete line"
 msgstr "Smazat řádek"
 
-#: src/compose.c:628
+#: src/compose.c:631
 msgid "Delete to end of line"
 msgstr "Smazat do konce řádku"
 
-#: src/compose.c:631 src/messageview.c:230
+#: src/compose.c:634 src/messageview.c:228
 msgid "_Find"
 msgstr "_Najít"
 
-#: src/compose.c:634
+#: src/compose.c:637
 msgid "_Wrap current paragraph"
 msgstr "_Zalomit aktuální odstavec"
 
-#: src/compose.c:635
+#: src/compose.c:638
 msgid "Wrap all long _lines"
 msgstr "Zalomit všechny _dlouhé řádky"
 
-#: src/compose.c:637
+#: src/compose.c:640
 msgid "Edit with e_xternal editor"
 msgstr "Upravit e_xterním editorem"
 
-#: src/compose.c:640
+#: src/compose.c:643
 msgid "_Check all or check selection"
 msgstr "_Zkontrolovat vše nebo výběr"
 
-#: src/compose.c:641
+#: src/compose.c:644
 msgid "_Highlight all misspelled words"
 msgstr "Z_výraznit nesprávná slova"
 
-#: src/compose.c:642
+#: src/compose.c:645
 msgid "Check _backwards misspelled word"
 msgstr "Přejít na _předchozí chybu"
 
-#: src/compose.c:643
+#: src/compose.c:646
 msgid "_Forward to next misspelled word"
 msgstr "Přejít na _následující chybu"
 
-#: src/compose.c:651
+#: src/compose.c:654
 msgid "Reply _mode"
 msgstr "_Mód odpovědi"
 
-#: src/compose.c:653
+#: src/compose.c:656
 msgid "Privacy _System"
 msgstr "Systém _zabezpečení"
 
-#: src/compose.c:658
+#: src/compose.c:661
 msgid "_Priority"
 msgstr "_Priorita"
 
-#: src/compose.c:660 src/mainwindow.c:602 src/messageview.c:266
+#: src/compose.c:663 src/mainwindow.c:603 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "_Kódování znaků"
 
-#: src/compose.c:665 src/mainwindow.c:607 src/messageview.c:271
+#: src/compose.c:668 src/mainwindow.c:608 src/messageview.c:269
 msgid "Western European"
 msgstr "Západní Evropa"
 
-#: src/compose.c:666 src/mainwindow.c:608 src/messageview.c:272
+#: src/compose.c:669 src/mainwindow.c:609 src/messageview.c:270
 msgid "Baltic"
 msgstr "Baltské"
 
-#: src/compose.c:667 src/mainwindow.c:609 src/messageview.c:273
+#: src/compose.c:670 src/mainwindow.c:610 src/messageview.c:271
 msgid "Hebrew"
 msgstr "Hebrejština"
 
-#: src/compose.c:668 src/mainwindow.c:610 src/messageview.c:274
+#: src/compose.c:671 src/mainwindow.c:611 src/messageview.c:272
 msgid "Arabic"
 msgstr "Arabština"
 
-#: src/compose.c:669 src/mainwindow.c:611 src/messageview.c:275
+#: src/compose.c:672 src/mainwindow.c:612 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "Azbuka"
 
-#: src/compose.c:670 src/mainwindow.c:612 src/messageview.c:276
+#: src/compose.c:673 src/mainwindow.c:613 src/messageview.c:274
 msgid "Japanese"
 msgstr "Japonština"
 
-#: src/compose.c:671 src/mainwindow.c:613 src/messageview.c:277
+#: src/compose.c:674 src/mainwindow.c:614 src/messageview.c:275
 msgid "Chinese"
 msgstr "Čínština"
 
-#: src/compose.c:672 src/mainwindow.c:614 src/messageview.c:278
+#: src/compose.c:675 src/mainwindow.c:615 src/messageview.c:276
 msgid "Korean"
 msgstr "Korejština"
 
-#: src/compose.c:673 src/mainwindow.c:615 src/messageview.c:279
+#: src/compose.c:676 src/mainwindow.c:616 src/messageview.c:277
 msgid "Thai"
 msgstr "Thajština"
 
-#: src/compose.c:676 src/mainwindow.c:722 src/messageview.c:315
+#: src/compose.c:679 src/mainwindow.c:723 src/messageview.c:313
 msgid "_Address book"
 msgstr "_Kniha adres"
 
-#: src/compose.c:678
+#: src/compose.c:681
 msgid "_Template"
 msgstr "Ša_blona"
 
-#: src/compose.c:680 src/mainwindow.c:750 src/messageview.c:336
+#: src/compose.c:683 src/mainwindow.c:751 src/messageview.c:334
 msgid "Actio_ns"
 msgstr "Ak_ce"
 
-#: src/compose.c:689
+#: src/compose.c:692
 msgid "Aut_o wrapping"
 msgstr "Aut_omatické zalamování"
 
-#: src/compose.c:690
+#: src/compose.c:693
 msgid "Auto _indent"
 msgstr "Automatické _odsazení"
 
-#: src/compose.c:691
+#: src/compose.c:694
 msgid "Si_gn"
 msgstr "Po_depsat"
 
-#: src/compose.c:692
+#: src/compose.c:695
 msgid "_Encrypt"
 msgstr "Ši_frovat"
 
-#: src/compose.c:693
+#: src/compose.c:696
 msgid "_Request Return Receipt"
 msgstr "_Vyžadovat potvrzení o doručení"
 
-#: src/compose.c:694
+#: src/compose.c:697
 msgid "Remo_ve references"
 msgstr "Odstranit reference"
 
-#: src/compose.c:695
+#: src/compose.c:698
 msgid "Show _ruler"
 msgstr "Zobrazit _pravítko"
 
-#: src/compose.c:700 src/compose.c:710
+#: src/compose.c:703 src/compose.c:713
 msgid "_Normal"
 msgstr "_Normální"
 
-#: src/compose.c:701 src/mainwindow.c:656 src/messageview.c:304
+#: src/compose.c:704 src/mainwindow.c:657 src/messageview.c:302
 msgid "_All"
 msgstr "_Všem"
 
-#: src/compose.c:702 src/mainwindow.c:657 src/messageview.c:305
+#: src/compose.c:705 src/mainwindow.c:658 src/messageview.c:303
 msgid "_Sender"
 msgstr "_Odesílateli"
 
-#: src/compose.c:703
+#: src/compose.c:706
 msgid "_Mailing-list"
 msgstr "Kon_ference"
 
-#: src/compose.c:708
+#: src/compose.c:711
 msgid "_Highest"
 msgstr "_Nejvyšší"
 
-#: src/compose.c:709
+#: src/compose.c:712
 msgid "Hi_gh"
 msgstr "Vy_soká"
 
-#: src/compose.c:711
+#: src/compose.c:714
 msgid "Lo_w"
 msgstr "Ní_zká"
 
-#: src/compose.c:712
+#: src/compose.c:715
 msgid "_Lowest"
 msgstr "Ne_jnižsí"
 
-#: src/compose.c:717 src/mainwindow.c:866 src/messageview.c:353
+#: src/compose.c:720 src/mainwindow.c:865 src/messageview.c:351
 msgid "_Automatic"
 msgstr "_Automaticky"
 
-#: src/compose.c:718 src/mainwindow.c:867 src/messageview.c:354
+#: src/compose.c:721 src/mainwindow.c:866 src/messageview.c:352
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bitové ASCII (US-ASC_II)"
 
-#: src/compose.c:719 src/mainwindow.c:868 src/messageview.c:355
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:353
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:723 src/mainwindow.c:872 src/messageview.c:359
+#: src/compose.c:726 src/mainwindow.c:871 src/messageview.c:357
 msgid "Central European (ISO-8859-_2)"
 msgstr "Střední Evropa (ISO-8859-_2)"
 
-#: src/compose.c:726 src/mainwindow.c:875 src/messageview.c:362
+#: src/compose.c:729 src/mainwindow.c:874 src/messageview.c:360
 msgid "Greek (ISO-8859-_7)"
 msgstr "Řečtina (ISO-8859-_7)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:367
+#: src/compose.c:734 src/mainwindow.c:879 src/messageview.c:365
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turečtina (ISO-8859-_9)"
 
-#: src/compose.c:1034
+#: src/compose.c:1062
 msgid "New message From format error."
 msgstr "Chyba ve formátu pole Od nové zprávy."
 
-#: src/compose.c:1126
+#: src/compose.c:1154
 msgid "New message subject format error."
 msgstr "Chyba v předmětu šablony nové zprávy."
 
-#: src/compose.c:1157 src/quote_fmt.c:563
+#: src/compose.c:1185 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Napsat\" na řádku %d."
 
-#: src/compose.c:1413
+#: src/compose.c:1439
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Není možno odpovědět. Originální email pravděpodobně neexistuje."
 
-#: src/compose.c:1596 src/quote_fmt.c:580
+#: src/compose.c:1622 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 "Pole \"Od\" v šabloně \"Odpovědět\" obsahuje neplatnou emailovou adresu."
 
-#: src/compose.c:1644 src/quote_fmt.c:583
+#: src/compose.c:1670 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Odpovědět\" na řádku %d."
 
-#: src/compose.c:1780 src/compose.c:1972 src/quote_fmt.c:600
+#: src/compose.c:1806 src/compose.c:1998 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "Pole \"Od\" v šabloně \"Předat\" obsahuje neplatnou emailovou adresu."
 
-#: src/compose.c:1840 src/quote_fmt.c:603
+#: src/compose.c:1866 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Předat\" na řádku %d."
 
-#: src/compose.c:2014
+#: src/compose.c:2040
 msgid "Fw: multiple emails"
 msgstr "Fw: vice zprav"
 
-#: src/compose.c:2456
+#: src/compose.c:2482
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Přesměrovat\" na řádku %d."
 
-#: src/compose.c:2522 src/gtk/headers.h:13
+#: src/compose.c:2549 src/gtk/headers.h:13
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/compose.c:2525 src/gtk/headers.h:14
+#: src/compose.c:2552 src/gtk/headers.h:14
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
 
-#: src/compose.c:2528 src/gtk/headers.h:11
+#: src/compose.c:2555 src/gtk/headers.h:11
 msgid "Reply-To:"
 msgstr "Odpovědět komu:"
 
-#: src/compose.c:2531 src/compose.c:4818 src/compose.c:4820
+#: src/compose.c:2558 src/compose.c:4854 src/compose.c:4856
 #: src/gtk/headers.h:32
 msgid "Newsgroups:"
 msgstr "Diskusní skupiny:"
 
-#: src/compose.c:2534 src/gtk/headers.h:33
+#: src/compose.c:2561 src/gtk/headers.h:33
 msgid "Followup-To:"
 msgstr "Pokračování:"
 
-#: src/compose.c:2537 src/gtk/headers.h:16
+#: src/compose.c:2564 src/gtk/headers.h:16
 msgid "In-Reply-To:"
 msgstr "V odpovědi komu:"
 
-#: src/compose.c:2541 src/compose.c:4815 src/compose.c:4823
-#: src/gtk/headers.h:12 src/summary_search.c:419
+#: src/compose.c:2568 src/compose.c:4851 src/compose.c:4859
+#: src/gtk/headers.h:12 src/summary_search.c:445
 msgid "To:"
 msgstr "Komu:"
 
-#: src/compose.c:2747
+#: src/compose.c:2774
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Nepodařilo se připojit soubor (konverze znakové sady se nezdařila)."
 
-#: src/compose.c:2753
+#: src/compose.c:2780
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1890,64 +1895,64 @@ msgstr[2] ""
 "Následující soubory byly připojeny: \n"
 "%s"
 
-#: src/compose.c:3026
+#: src/compose.c:3053
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"Značka pro citaci\" v šabloně je neplatná."
 
-#: src/compose.c:3514
+#: src/compose.c:3542
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Nemohu získat velikost souboru '%s'."
 
-#: src/compose.c:3525
+#: src/compose.c:3553
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr "Chystáte se vložit soubor %s do těla zprávy. Jste si tím jistý?"
 
-#: src/compose.c:3528
+#: src/compose.c:3556
 msgid "Are you sure?"
 msgstr "Jste si jistý?"
 
-#: src/compose.c:3529 src/compose.c:10962
+#: src/compose.c:3557 src/compose.c:11027
 msgid "+_Insert"
 msgstr "+_Vložit"
 
-#: src/compose.c:3639
+#: src/compose.c:3672
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:3643
+#: src/compose.c:3676
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemohu načíst %s."
 
-#: src/compose.c:3670
+#: src/compose.c:3703
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:4658 src/plugins/python/composewindowtype.c:428
+#: src/compose.c:4691 src/plugins/python/composewindowtype.c:432
 msgid " [Edited]"
 msgstr " [Upraveno]"
 
-#: src/compose.c:4665 src/plugins/python/composewindowtype.c:431
+#: src/compose.c:4698 src/plugins/python/composewindowtype.c:435
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:4668 src/plugins/python/composewindowtype.c:434
+#: src/compose.c:4701 src/plugins/python/composewindowtype.c:438
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[žádný předmět] - Psaní zprávy%s"
 
-#: src/compose.c:4670 src/plugins/python/composewindowtype.c:422
+#: src/compose.c:4703 src/plugins/python/composewindowtype.c:426
 msgid "Compose message"
 msgstr "Napsat zprávu"
 
-#: src/compose.c:4697 src/messageview.c:909
+#: src/compose.c:4730 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1955,55 +1960,55 @@ msgstr ""
 "Není zadán účet pro odesílání mailů.\n"
 "Před odesláním vyberte prosím nějaký účet."
 
-#: src/compose.c:4914 src/compose.c:4946 src/compose.c:4988
-#: src/plugins/attachwarner/attachwarner.c:312 src/prefs_account.c:3237
-#: src/toolbar.c:404 src/toolbar.c:422
+#: src/compose.c:4950 src/compose.c:4982 src/compose.c:5024
+#: src/plugins/attachwarner/attachwarner.c:219 src/prefs_account.c:3237
+#: src/toolbar.c:405 src/toolbar.c:423
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/compose.c:4915
+#: src/compose.c:4951
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 "Jediný adresát je výchozí příjemce kopií (viz nastavení účtu). Opravdu "
 "odeslat?"
 
-#: src/compose.c:4916 src/compose.c:4948 src/compose.c:4981 src/compose.c:5497
-#: src/plugins/attachwarner/attachwarner.c:304
+#: src/compose.c:4952 src/compose.c:4984 src/compose.c:5017 src/compose.c:5538
+#: src/plugins/attachwarner/attachwarner.c:211
 msgid "+_Send"
 msgstr "+_Odeslat"
 
-#: src/compose.c:4947
+#: src/compose.c:4983
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 "Jediný adresát je výchozí příjemce skrytých kopií (viz nastavení účtu). "
 "Opravdu odeslat?"
 
-#: src/compose.c:4964
+#: src/compose.c:5000
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:4983 src/plugins/attachwarner/attachwarner.c:306
+#: src/compose.c:5019 src/plugins/attachwarner/attachwarner.c:213
 msgid "+_Queue"
 msgstr "+_Fronta"
 
-#: src/compose.c:4984
+#: src/compose.c:5020
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Předmět je prázdný.  %s"
 
-#: src/compose.c:4985
+#: src/compose.c:5021
 msgid "Send it anyway?"
 msgstr "Přesto odeslat?"
 
-#: src/compose.c:4986
+#: src/compose.c:5022
 msgid "Queue it anyway?"
 msgstr "Opravdu zařadit do fronty?"
 
-#: src/compose.c:4988 src/toolbar.c:423
+#: src/compose.c:5024 src/toolbar.c:424
 msgid "Send later"
 msgstr "Poslat později"
 
-#: src/compose.c:5036 src/compose.c:9585
+#: src/compose.c:5077 src/compose.c:9643
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2013,7 +2018,7 @@ msgstr ""
 "\n"
 "Konverze znakové sady se nezdařila."
 
-#: src/compose.c:5039 src/compose.c:9588
+#: src/compose.c:5080 src/compose.c:9646
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2023,7 +2028,7 @@ msgstr ""
 "\n"
 "Nepodařilo se získat šifrovací klíč příjemce."
 
-#: src/compose.c:5045 src/compose.c:9582
+#: src/compose.c:5086 src/compose.c:9640
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2034,7 +2039,7 @@ msgstr ""
 "\n"
 "Podepisování se nezdařilo: %s"
 
-#: src/compose.c:5048
+#: src/compose.c:5089
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2045,11 +2050,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5050
+#: src/compose.c:5091
 msgid "Could not queue message for sending."
 msgstr "Zprávu nelze uložit do fronty pro odeslání."
 
-#: src/compose.c:5065 src/compose.c:5125
+#: src/compose.c:5106 src/compose.c:5166
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2057,7 +2062,7 @@ msgstr ""
 "Zpráva byla uložena do fronty ale nemohla být odeslána.\n"
 "Použijte nabídku \"Odeslat pozdržené zprávy \" z hlavního okna."
 
-#: src/compose.c:5121
+#: src/compose.c:5162
 #, c-format
 msgid ""
 "%s\n"
@@ -2066,7 +2071,7 @@ msgstr ""
 "%s\n"
 "Použijte nabídku \"Odeslat pozdržené zprávy \" z hlavního okna."
 
-#: src/compose.c:5494
+#: src/compose.c:5535
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2077,7 +2082,7 @@ msgstr ""
 "na %s.\n"
 "Odeslat v kódování %s?"
 
-#: src/compose.c:5552
+#: src/compose.c:5593
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2091,67 +2096,67 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:5733
+#: src/compose.c:5774
 msgid "Encryption warning"
 msgstr "Varování šifrování"
 
-#: src/compose.c:5734
+#: src/compose.c:5775
 msgid "+C_ontinue"
 msgstr "+_Pokračovat"
 
-#: src/compose.c:5783
+#: src/compose.c:5824
 msgid "No account for sending mails available!"
 msgstr "Není dostupný žádný účet pro odeslání pošty!"
 
-#: src/compose.c:5792
+#: src/compose.c:5833
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Vybraný účet není NNTP: Odeslání není možné. "
 
-#: src/compose.c:6021
+#: src/compose.c:6062
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Příloha %s už neexistuje. Ignorovat?"
 
-#: src/compose.c:6022 src/mainwindow.c:647 src/toolbar.c:229
-#: src/toolbar.c:2181
+#: src/compose.c:6063 src/mainwindow.c:648 src/toolbar.c:230
+#: src/toolbar.c:2182
 msgid "Cancel sending"
 msgstr "Zrušit posílání"
 
-#: src/compose.c:6022
+#: src/compose.c:6063
 msgid "Ignore attachment"
 msgstr "Ignorovat přílohu"
 
-#: src/compose.c:6061
+#: src/compose.c:6102
 #, c-format
 msgid "Original %s part"
 msgstr "Část originálu %s"
 
-#: src/compose.c:6592
+#: src/compose.c:6681
 msgid "Add to address _book"
 msgstr "Přidat do knihy adres"
 
-#: src/compose.c:6748
+#: src/compose.c:6837
 msgid "Delete entry contents"
 msgstr "Smazat obsah pole"
 
-#: src/compose.c:6752 src/plugins/vcalendar/vcal_meeting_gtk.c:295
+#: src/compose.c:6841 src/plugins/vcalendar/vcal_meeting_gtk.c:295
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Použijte <tab> pro automatické dokončení podle knihy adres"
 
-#: src/compose.c:6972
+#: src/compose.c:7061
 msgid "Mime type"
 msgstr "MIME typ"
 
-#: src/compose.c:6978 src/mimeview.c:283 src/plugins/pgpcore/select-keys.c:396
+#: src/compose.c:7067 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:392
 #: src/prefs_matcher.c:627 src/prefs_summary_column.c:85 src/summaryview.c:447
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:7048
+#: src/compose.c:7130
 msgid "Save Message to "
 msgstr "Uložit zprávu do "
 
-#: src/compose.c:7081 src/editjpilot.c:276 src/editldap.c:520
+#: src/compose.c:7167 src/editjpilot.c:276 src/editldap.c:520
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1028
 #: src/plugins/bogofilter/bogofilter_gtk.c:188
@@ -2162,24 +2167,24 @@ msgstr "Uložit zprávu do "
 msgid "_Browse"
 msgstr "P_rocházet"
 
-#: src/compose.c:7569
+#: src/compose.c:7643
 msgid "Hea_der"
 msgstr "_Záhlaví"
 
-#: src/compose.c:7574
+#: src/compose.c:7648
 msgid "_Attachments"
 msgstr "_Přílohy"
 
-#: src/compose.c:7588
+#: src/compose.c:7662
 msgid "Othe_rs"
 msgstr "_Ostatní"
 
-#: src/compose.c:7603 src/gtk/headers.h:18
-#: src/plugins/pdf_viewer/poppler_viewer.c:704 src/summary_search.c:426
+#: src/compose.c:7677 src/gtk/headers.h:18
+#: src/plugins/pdf_viewer/poppler_viewer.c:704 src/summary_search.c:452
 msgid "Subject:"
 msgstr "Předmět:"
 
-#: src/compose.c:7830
+#: src/compose.c:7891
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2188,20 +2193,20 @@ msgstr ""
 "Nelze spustit kontrolu pravopisu.\n"
 "%s"
 
-#: src/compose.c:7943
+#: src/compose.c:8000
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Od: <i>%s</i>"
 
-#: src/compose.c:7977
+#: src/compose.c:8034
 msgid "Account to use for this email"
 msgstr "Účet použitý pro tuto zprávu"
 
-#: src/compose.c:7979
+#: src/compose.c:8036
 msgid "Sender address to be used"
 msgstr "Adresa odesílatele musí být uvedena"
 
-#: src/compose.c:8143
+#: src/compose.c:8200
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2210,64 +2215,64 @@ msgstr ""
 "Systém zabezpečení '%s' se nepodařilo načíst. Nebudete moci digitálně "
 "podepsat nebo šifrovat zprávu."
 
-#: src/compose.c:8243 src/plugins/archive/archiver_gtk.c:1082
+#: src/compose.c:8300 src/plugins/archive/archiver_gtk.c:1082
 msgid "_None"
 msgstr "Žá_dné"
 
-#: src/compose.c:8344 src/prefs_template.c:749
+#: src/compose.c:8401 src/prefs_template.c:753
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Chyba v těle šablony na řádku %d."
 
-#: src/compose.c:8460
+#: src/compose.c:8517
 msgid "Template From format error."
 msgstr "Chyba v poli 'Od' šablony."
 
-#: src/compose.c:8478
+#: src/compose.c:8535
 msgid "Template To format error."
 msgstr "Chyba v poli 'Komu' šablony."
 
-#: src/compose.c:8496
+#: src/compose.c:8553
 msgid "Template Cc format error."
 msgstr "Chyba v poli 'Kopie' šablony."
 
-#: src/compose.c:8514
+#: src/compose.c:8571
 msgid "Template Bcc format error."
 msgstr "Chyba v poli 'Skrytá kopie' šablony."
 
-#: src/compose.c:8533
+#: src/compose.c:8590
 msgid "Template subject format error."
 msgstr "Chyba v poli 'Předmět' šablony."
 
-#: src/compose.c:8797
+#: src/compose.c:8854
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:8812
+#: src/compose.c:8869
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:8886
+#: src/compose.c:8943
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:8903
+#: src/compose.c:8960
 msgid "MIME type"
 msgstr "MIME typ"
 
-#: src/compose.c:8944
+#: src/compose.c:9001
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:8964
+#: src/compose.c:9021
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:8965
+#: src/compose.c:9022
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:9157
+#: src/compose.c:9214
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2278,15 +2283,15 @@ msgstr ""
 "Mám přerušit proces?\n"
 "číslo procesu: %d"
 
-#: src/compose.c:9551 src/messageview.c:1116
+#: src/compose.c:9609 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail potřebuje přístup k síti, aby mohl odeslat tuto zprávu."
 
-#: src/compose.c:9577
+#: src/compose.c:9635
 msgid "Could not queue message."
 msgstr "Zprávu nelze uložit do fronty pro odeslání."
 
-#: src/compose.c:9579
+#: src/compose.c:9637
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2297,15 +2302,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:9747
+#: src/compose.c:9805
 msgid "Could not save draft."
 msgstr "Nelze uložit koncept."
 
-#: src/compose.c:9751
+#: src/compose.c:9809
 msgid "Could not save draft"
 msgstr "Nelze uložit koncept"
 
-#: src/compose.c:9752
+#: src/compose.c:9810
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2313,24 +2318,24 @@ msgstr ""
 "Nemohu uložit koncept.\n"
 "Chcete zrušit ukončení nebo zahodit tuto zprávu?"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Cancel exit"
 msgstr "_Zrušit ukončení"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Discard email"
 msgstr "_Zahodit zprávu"
 
-#: src/compose.c:9914 src/compose.c:9928
+#: src/compose.c:9972 src/compose.c:9986
 msgid "Select file"
 msgstr "Výběr souboru"
 
-#: src/compose.c:9942
+#: src/compose.c:10000
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Soubor '%s' nelze číst."
 
-#: src/compose.c:9944
+#: src/compose.c:10002
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2339,60 +2344,62 @@ msgstr ""
 "Soubor '%s' obsahuje neplatné znaky\n"
 "pro nastavené kódování, vložení může obsahovat chyby."
 
-#: src/compose.c:10016
+#: src/compose.c:10081
 msgid "Discard message"
 msgstr "Zrušit zprávu"
 
-#: src/compose.c:10017
+#: src/compose.c:10082
 msgid "This message has been modified. Discard it?"
 msgstr "Zpráva byla modifikována. Chcete ji zahodit?"
 
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Discard"
 msgstr "_Zahodit"
 
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Save to Drafts"
 msgstr "Uložit jako _koncept"
 
-#: src/compose.c:10020
+#: src/compose.c:10085
 msgid "Save changes"
 msgstr "Uložit změny"
 
-#: src/compose.c:10021
+#: src/compose.c:10086
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Zpráva byla modifikována. Chcete uložit poslední změny?"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "_Don't save"
 msgstr "_Neukládat"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "+_Save to Drafts"
 msgstr "+Uložit jako _koncept"
 
-#: src/compose.c:10092
+#: src/compose.c:10157
 #, c-format
-msgid "Do you want to apply the template '%s' ?"
+msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použít šablonu '%s' ?"
 
-#: src/compose.c:10094
+#: src/compose.c:10159
 msgid "Apply template"
 msgstr "Použít šablonu"
 
-#: src/compose.c:10095
+#: src/compose.c:10160 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:772 src/prefs_template.c:309 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Nahradit"
 
-#: src/compose.c:10095
+#: src/compose.c:10160
 msgid "_Insert"
 msgstr "_Vložit"
 
-#: src/compose.c:10959
+#: src/compose.c:11024
 msgid "Insert or attach?"
 msgstr "Vložit nebo připojit?"
 
-#: src/compose.c:10960
+#: src/compose.c:11025
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2400,16 +2407,16 @@ msgstr ""
 "Chcete obsah souboru(ů) vložit do textu zprávy nebo soubor(y) připojit ke "
 "zprávě jako přílohu?"
 
-#: src/compose.c:10962
+#: src/compose.c:11027
 msgid "_Attach"
 msgstr "_Přiložit"
 
-#: src/compose.c:11178
+#: src/compose.c:11243
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba formátu citace na řádku %d."
 
-#: src/compose.c:11462
+#: src/compose.c:11527
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2440,7 +2447,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Debug log"
 
-#: src/crash.c:252 src/toolbar.c:420
+#: src/crash.c:252 src/toolbar.c:421
 msgid "Close"
 msgstr "Zavřít"
 
@@ -2557,41 +2564,41 @@ msgstr "_Zrušit obrázek"
 msgid "Photo"
 msgstr "Fotografie"
 
-#: src/editaddress.c:959 src/editaddress.c:961 src/expldifdlg.c:516
+#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:516
 #: src/exporthtml.c:761 src/ldif.c:766
 msgid "Display Name"
 msgstr "Zobrazované jméno"
 
-#: src/editaddress.c:968 src/editaddress.c:972 src/ldif.c:774
+#: src/editaddress.c:961 src/editaddress.c:965 src/ldif.c:774
 msgid "Last Name"
 msgstr "Příjmení"
 
-#: src/editaddress.c:969 src/editaddress.c:971 src/ldif.c:770
+#: src/editaddress.c:962 src/editaddress.c:964 src/ldif.c:770
 msgid "First Name"
 msgstr "Jméno"
 
-#: src/editaddress.c:975 src/editaddress.c:977
+#: src/editaddress.c:968 src/editaddress.c:970
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: src/editaddress.c:1061 src/editaddress.c:1129
+#: src/editaddress.c:1054 src/editaddress.c:1122
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1271 src/editaddress.c:1340 src/editaddress.c:1360
+#: src/editaddress.c:1264 src/editaddress.c:1333 src/editaddress.c:1353
 #: src/prefs_customheader.c:223
 msgid "Value"
 msgstr "Hodnota"
 
-#: src/editaddress.c:1427
+#: src/editaddress.c:1424
 msgid "_User Data"
 msgstr "_Osobní data"
 
-#: src/editaddress.c:1428
+#: src/editaddress.c:1425
 msgid "_Email Addresses"
 msgstr "_E-mailové adresy"
 
-#: src/editaddress.c:1431 src/editaddress.c:1434
+#: src/editaddress.c:1428 src/editaddress.c:1431
 msgid "O_ther Attributes"
 msgstr "_Další údaje"
 
@@ -2617,7 +2624,7 @@ msgstr " Otestovat soubor "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
 #: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1934
-#: src/wizard.c:1371 src/wizard.c:1650
+#: src/wizard.c:1183 src/wizard.c:1457
 msgid "File"
 msgstr "Soubor"
 
@@ -2740,7 +2747,7 @@ msgstr "Alespoň jeden atribut musí být uveden."
 msgid "Connected successfully to server"
 msgstr "Úspěšně připojeno k serveru"
 
-#: src/editldap.c:336 src/editldap.c:980
+#: src/editldap.c:336 src/editldap.c:976
 msgid "Edit LDAP Server"
 msgstr "Upravit LDAP server"
 
@@ -2922,46 +2929,46 @@ msgstr ""
 msgid "Bind Password"
 msgstr "Připojovací heslo"
 
-#: src/editldap.c:733
+#: src/editldap.c:729
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr ""
 "Heslo, které bude použito pro připojení spolu s údajem \"Přihlašovací jméno"
 "\"."
 
-#: src/editldap.c:738
+#: src/editldap.c:734
 msgid "Timeout (secs)"
 msgstr "Časový limit (s)"
 
-#: src/editldap.c:752
+#: src/editldap.c:748
 msgid "The timeout period in seconds."
 msgstr "Časový limit v sekundách."
 
-#: src/editldap.c:756
+#: src/editldap.c:752
 msgid "Maximum Entries"
 msgstr "Maximum položek"
 
-#: src/editldap.c:770
+#: src/editldap.c:766
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Maximální počet položek, které budou vráceny při prohledávání."
 
-#: src/editldap.c:785 src/prefs_account.c:3201
+#: src/editldap.c:781 src/prefs_account.c:3201
 msgid "Basic"
 msgstr "Server"
 
-#: src/editldap.c:786
+#: src/editldap.c:782
 msgid "Search"
 msgstr "Hledání"
 
-#: src/editldap.c:787 src/gtk/quicksearch.c:661
+#: src/editldap.c:783 src/gtk/quicksearch.c:670
 msgid "Extended"
 msgstr "Ostatní"
 
-#: src/editldap.c:985
+#: src/editldap.c:981
 msgid "Add New LDAP Server"
 msgstr "Přidat nový LDAP server"
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1444
+#: src/edittags.c:187 src/prefs_filtering_action.c:1446
 msgid "Tag"
 msgstr "Značka"
 
@@ -2981,24 +2988,24 @@ msgstr "Odstranit všechny značky"
 msgid "Do you really want to delete all tags?"
 msgstr "Opravdu chcete odstranit všechny značky?"
 
-#: src/edittags.c:422
+#: src/edittags.c:415
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr "Vložili jste rezervované jméno tagu, prosím vyberte jiné."
 
-#: src/edittags.c:464
+#: src/edittags.c:457
 msgid "Tag is not set."
 msgstr "Hodnota není nastavena."
 
-#: src/edittags.c:529
+#: src/edittags.c:522
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "Použít značky"
 
-#: src/edittags.c:543
+#: src/edittags.c:536
 msgid "New tag:"
 msgstr "Nová značka:"
 
-#: src/edittags.c:576
+#: src/edittags.c:569
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr "Vyberte značku pro přidání/odstranění. Změny jsou okamžité."
 
@@ -3082,9 +3089,9 @@ msgid "Stylesheet"
 msgstr "Šablona stylu"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:133 src/mainwindow.c:1174
-#: src/plugins/archive/archiver_prefs.c:241 src/prefs_account.c:938
-#: src/prefs_toolbar.c:775 src/prefs_toolbar.c:1456 src/summaryview.c:6009
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1173
+#: src/plugins/archive/archiver_prefs.c:241 src/prefs_account.c:946
+#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1465 src/summaryview.c:6006
 msgid "None"
 msgstr "Žádná"
 
@@ -3093,7 +3100,7 @@ msgstr "Žádná"
 msgid "Default"
 msgstr "Výchozí"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:248
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
 #: src/plugins/pgpcore/sgpgme.c:148
 msgid "Full"
 msgstr "Úplná"
@@ -3319,7 +3326,7 @@ msgstr "Exportovat knihu adres do LDIF souboru"
 msgid "Distinguished Name"
 msgstr "Rozlišovací jméno (dn)"
 
-#: src/export.c:113 src/summaryview.c:8161
+#: src/export.c:113 src/summaryview.c:8143
 msgid "Export to mbox file"
 msgstr "Exportovat do mbox souboru"
 
@@ -3380,52 +3387,70 @@ msgstr "Název je příliš dlouhý."
 msgid "Not specified."
 msgstr "Není uveden."
 
-#: src/folder.c:1571 src/foldersel.c:374 src/prefs_folder_item.c:308
+#: src/file_checker.c:76
+#, c-format
+msgid "The file %s is missing! Do you want to use the backup file from %s?"
+msgstr "Soubor %s chybí! Chcete použít zazálohovaný soubor z %s?"
+
+#: src/file_checker.c:84 src/file_checker.c:106
+#, c-format
+msgid "Could not copy %s to %s"
+msgstr "Nemohu zkopírovat %s do %s"
+
+#: src/file_checker.c:98
+#, c-format
+msgid ""
+"The file %s is empty or corrupted! Do you want to use the backup file from "
+"%s?"
+msgstr ""
+"Soubor %s je prázdný nebo poškozen! Chcete použít zazálohovaný soubor z %s?"
+
+#: src/folder.c:1577 src/foldersel.c:374 src/prefs_folder_item.c:308
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: src/folder.c:1575 src/foldersel.c:378
+#: src/folder.c:1581 src/foldersel.c:378
 msgid "Sent"
 msgstr "Odeslaná pošta"
 
-#: src/folder.c:1579 src/foldersel.c:382
-#: src/plugins/attachwarner/attachwarner.c:312 src/prefs_folder_item.c:311
+#: src/folder.c:1585 src/foldersel.c:382
+#: src/plugins/attachwarner/attachwarner.c:219 src/prefs_folder_item.c:311
 msgid "Queue"
 msgstr "Fronta"
 
-#: src/folder.c:1583 src/foldersel.c:386 src/prefs_folder_item.c:312
+#: src/folder.c:1589 src/foldersel.c:386 src/prefs_folder_item.c:312
 msgid "Trash"
 msgstr "Koš"
 
-#: src/folder.c:1587 src/foldersel.c:390 src/prefs_folder_item.c:310
+#: src/folder.c:1593 src/foldersel.c:390 src/prefs_folder_item.c:310
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/folder.c:2017
+#: src/folder.c:2023
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Zpracovávám (%s)...\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopíruji %s do %s...\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Přesouvám %s do %s...\n"
 
-#: src/folder.c:3563
+#: src/folder.c:3569
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Aktualizuji vyrovnávací paměť pro %s..."
 
-#: src/folder.c:4435
+#: src/folder.c:4443
 msgid "Processing messages..."
 msgstr "Zpracovávám zprávy..."
 
-#: src/folder.c:4571
+#: src/folder.c:4579
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronizuji %s pro použití offline...\n"
@@ -3440,23 +3465,26 @@ msgid "NewFolder"
 msgstr "Nová složka"
 
 #: src/foldersel.c:562 src/imap_gtk.c:210 src/imap_gtk.c:216
-#: src/imap_gtk.c:272 src/mh_gtk.c:155 src/mh_gtk.c:259 src/news_gtk.c:314
-#: src/plugins/rssyl/rssyl_cb_menu.c:97 src/plugins/rssyl/rssyl_cb_menu.c:341
-#: src/plugins/vcalendar/vcal_folder.c:2025
+#: src/imap_gtk.c:272 src/imap_gtk.c:277 src/mh_gtk.c:155 src/mh_gtk.c:259
+#: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:249
+#: src/plugins/mailmbox/plugin_gtk.c:416 src/plugins/rssyl/rssyl_cb_menu.c:97
+#: src/plugins/rssyl/rssyl_cb_menu.c:341
+#: src/plugins/vcalendar/vcal_folder.c:2026
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' nemůže být obsaženo ve jméně složky."
 
 #: src/foldersel.c:572 src/imap_gtk.c:226 src/imap_gtk.c:284 src/mh_gtk.c:165
-#: src/mh_gtk.c:266 src/news_gtk.c:321 src/plugins/rssyl/rssyl_cb_menu.c:107
+#: src/mh_gtk.c:266 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:261
+#: src/plugins/mailmbox/plugin_gtk.c:425 src/plugins/rssyl/rssyl_cb_menu.c:107
 #: src/plugins/rssyl/rssyl_cb_menu.c:348
-#: src/plugins/vcalendar/vcal_folder.c:2032
+#: src/plugins/vcalendar/vcal_folder.c:2033
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Složka '%s' už existuje."
 
 #: src/foldersel.c:579 src/imap_gtk.c:232 src/mh_gtk.c:171
-#: src/plugins/rssyl/rssyl_cb_menu.c:113
+#: src/plugins/mailmbox/plugin_gtk.c:268 src/plugins/rssyl/rssyl_cb_menu.c:113
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Nemohu vytvořit složku '%s'."
@@ -3469,7 +3497,7 @@ msgstr "Označit všechny jako _přečtené"
 msgid "R_un processing rules"
 msgstr "S_pustit pravidla zpracování"
 
-#: src/folderview.c:233 src/mainwindow.c:543
+#: src/folderview.c:233 src/mainwindow.c:544
 msgid "_Search folder..."
 msgstr "_Prohledat složku..."
 
@@ -3487,13 +3515,13 @@ msgstr "Odeslat _frontu..."
 
 #: src/folderview.c:380 src/folderview.c:427
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:388 src/summaryview.c:6293
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:388 src/summaryview.c:6282
 msgid "New"
 msgstr "Nové"
 
 #: src/folderview.c:381 src/folderview.c:428
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:387 src/summaryview.c:6295
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:387 src/summaryview.c:6284
 msgid "Unread"
 msgstr "Nepřečtené"
 
@@ -3507,108 +3535,108 @@ msgstr "Celkem"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:734
+#: src/folderview.c:727
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o složce..."
 
-#: src/folderview.c:797 src/summaryview.c:4111 src/summaryview.c:4113
+#: src/folderview.c:790 src/summaryview.c:4109 src/summaryview.c:4111
 msgid "Mark all as read"
 msgstr "Označit všechny jako přečtené"
 
-#: src/folderview.c:798 src/summaryview.c:4112
-msgid "Do you really want to mark all mails in this folder as read ?"
+#: src/folderview.c:791 src/summaryview.c:4110
+msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Opravdu chcete označit všechny zprávy v této složce jako přečtené?"
 
-#: src/folderview.c:1021 src/imap.c:4490 src/mainwindow.c:5316 src/setup.c:91
+#: src/folderview.c:1014 src/imap.c:4497 src/mainwindow.c:5128 src/setup.c:91
 #, c-format
-msgid "Scanning folder %s%c%s ..."
+msgid "Scanning folder %s%c%s..."
 msgstr "Prohledávám složku %s%c%s ..."
 
-#: src/folderview.c:1025 src/imap.c:4495 src/mainwindow.c:5321 src/setup.c:96
+#: src/folderview.c:1018 src/imap.c:4502 src/mainwindow.c:5133 src/setup.c:96
 #, c-format
-msgid "Scanning folder %s ..."
+msgid "Scanning folder %s..."
 msgstr "Prohledávám složku %s ..."
 
-#: src/folderview.c:1056
+#: src/folderview.c:1049
 msgid "Rebuild folder tree"
 msgstr "Obnovit strom složek"
 
-#: src/folderview.c:1057
+#: src/folderview.c:1050
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Obnovení stromu složek vyčistí všechny lokální vyrovnávací paměti. Chcete "
 "pokračovat?"
 
-#: src/folderview.c:1067
+#: src/folderview.c:1060
 msgid "Rebuilding folder tree..."
 msgstr "Provádím obnovu stromu složek..."
 
-#: src/folderview.c:1069 src/folderview.c:1110
+#: src/folderview.c:1062 src/folderview.c:1103
 msgid "Scanning folder tree..."
 msgstr "Prohledávám strom složek..."
 
-#: src/folderview.c:1201
+#: src/folderview.c:1194
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Nepodařilo se načíst obsah adresáře %s\n"
 
-#: src/folderview.c:1255
+#: src/folderview.c:1248
 msgid "Checking for new messages in all folders..."
 msgstr "Zjišťuji nové zprávy ve všech složkách..."
 
-#: src/folderview.c:2083
+#: src/folderview.c:2076
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Zavírám složku %s..."
 
-#: src/folderview.c:2178
+#: src/folderview.c:2171
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Otevírám složku %s..."
 
-#: src/folderview.c:2196
+#: src/folderview.c:2189
 msgid "Folder could not be opened."
 msgstr "Složku nelze otevřít."
 
-#: src/folderview.c:2337 src/mainwindow.c:3070 src/mainwindow.c:3074
+#: src/folderview.c:2330 src/mainwindow.c:2877 src/mainwindow.c:2881
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2331
 msgid "Delete all messages in trash?"
 msgstr "Odstranit všechny zprávy v koši?"
 
-#: src/folderview.c:2339
+#: src/folderview.c:2332
 msgid "+_Empty trash"
 msgstr "+_Vyprázdnit koš"
 
-#: src/folderview.c:2383 src/inc.c:1620 src/toolbar.c:2689
+#: src/folderview.c:2376 src/inc.c:1528 src/toolbar.c:2678
 msgid "Offline warning"
 msgstr "Varování offline režimu"
 
-#: src/folderview.c:2384 src/toolbar.c:2690
+#: src/folderview.c:2377 src/toolbar.c:2679
 msgid "You're working offline. Override?"
 msgstr "Pracujete v režimu offline. Přepnout?"
 
-#: src/folderview.c:2395 src/toolbar.c:2709
+#: src/folderview.c:2388 src/toolbar.c:2698
 msgid "Send queued messages"
 msgstr "Odeslat pozdržené zprávy"
 
-#: src/folderview.c:2396 src/toolbar.c:2710
+#: src/folderview.c:2389 src/toolbar.c:2699
 msgid "Send all queued messages?"
 msgstr "Odeslat všechny zprávy ve frontě pozdržených zpráv?"
 
-#: src/folderview.c:2397 src/messageview.c:875 src/messageview.c:892
-#: src/toolbar.c:2711
+#: src/folderview.c:2390 src/messageview.c:853 src/messageview.c:870
+#: src/toolbar.c:2700
 msgid "_Send"
 msgstr "_Odeslat"
 
-#: src/folderview.c:2405 src/toolbar.c:2729
+#: src/folderview.c:2398 src/toolbar.c:2718
 msgid "Some errors occurred while sending queued messages."
 msgstr "Při posílání pozdržených zpráv nastala stejná chyba."
 
-#: src/folderview.c:2408 src/main.c:2853 src/toolbar.c:2732
+#: src/folderview.c:2401 src/main.c:2689 src/toolbar.c:2721
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3617,64 +3645,64 @@ msgstr ""
 "Při odesílání pozdržených zpráv nastala chyba:\n"
 "%s"
 
-#: src/folderview.c:2485
+#: src/folderview.c:2478
 #, c-format
-msgid "Do you really want to copy folder '%s' in '%s' ?"
+msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Opravdu chcete složku '%s' zkopírovat do '%s' ?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2479
 #, c-format
-msgid "Do you really want to make folder '%s' a subfolder of '%s' ?"
+msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Opravdu chcete složku '%s' učinit podsložkou složky '%s' ?"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Copy folder"
 msgstr "Kopírovat složku"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Move folder"
 msgstr "Přesunout složku"
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopíruji %s do %s..."
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Přesouvám %s do %s..."
 
-#: src/folderview.c:2530
+#: src/folderview.c:2523
 msgid "Source and destination are the same."
 msgstr "Zdroj i cíl jsou totožné."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2526
 msgid "Can't copy a folder to one of its children."
 msgstr "Nelze kopírovat složku do své vlastní podsložky."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2527
 msgid "Can't move a folder to one of its children."
 msgstr "Nelze přesunout složku do své vlastní podsložky."
 
-#: src/folderview.c:2537
+#: src/folderview.c:2530
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Složka nemůže být přesouvána mezi různými poštovními schránkami."
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Copy failed!"
 msgstr "Kopírování se nezdařilo!"
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Move failed!"
 msgstr "Přesun se nezdařil!"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2584
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Zpracování složky - pravidla pro složku %s"
 
-#: src/folderview.c:3018 src/summaryview.c:4553 src/summaryview.c:4652
+#: src/folderview.c:3011 src/summaryview.c:4550 src/summaryview.c:4649
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Cílová složka může být použita pouze k uložení podsložek."
 
@@ -3822,7 +3850,7 @@ msgstr ""
 "Lokalita: %s (znaková sada: %s)\n"
 "Operační systém: neznámý"
 
-#: src/gtk/about.c:243 src/prefs_themes.c:728 src/wizard.c:545
+#: src/gtk/about.c:243 src/prefs_themes.c:728 src/wizard.c:523
 msgid "The Claws Mail Team"
 msgstr "Tým Claws Mail"
 
@@ -3946,44 +3974,44 @@ msgstr ""
 ">. \n"
 "\n"
 
-#: src/gtk/about.c:699 src/main.c:2680
+#: src/gtk/about.c:699 src/main.c:2516
 msgid "Session statistics\n"
 msgstr "Statistiky sezení\n"
 
-#: src/gtk/about.c:709 src/gtk/about.c:712 src/main.c:2690 src/main.c:2693
+#: src/gtk/about.c:709 src/gtk/about.c:712 src/main.c:2526 src/main.c:2529
 #, c-format
 msgid "Started: %s\n"
 msgstr "Spuštěno: %s\n"
 
-#: src/gtk/about.c:719 src/main.c:2699
+#: src/gtk/about.c:719 src/main.c:2535
 msgid "Incoming traffic\n"
 msgstr "Příchozí provoz\n"
 
-#: src/gtk/about.c:722 src/main.c:2702
+#: src/gtk/about.c:722 src/main.c:2538
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Přijaté zprávy: %d\n"
 
-#: src/gtk/about.c:729 src/main.c:2708
+#: src/gtk/about.c:729 src/main.c:2544
 msgid "Outgoing traffic\n"
 msgstr "Odchozí provoz\n"
 
-#: src/gtk/about.c:732 src/main.c:2711
+#: src/gtk/about.c:732 src/main.c:2547
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nové/přesměrované zprávy: %d\n"
 
-#: src/gtk/about.c:737 src/main.c:2715
+#: src/gtk/about.c:737 src/main.c:2551
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Zodpovězené zprávy: %d\n"
 
-#: src/gtk/about.c:742 src/main.c:2719
+#: src/gtk/about.c:742 src/main.c:2555
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Přeposlané zprávy: %d\n"
 
-#: src/gtk/about.c:747 src/main.c:2723
+#: src/gtk/about.c:747 src/main.c:2559
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Celkem odchozích zpráv: %d\n"
@@ -4026,63 +4054,63 @@ msgstr "_Poznámky k verzi"
 msgid "_Statistics"
 msgstr "_Statistiky"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:358
 msgid "Orange"
 msgstr "Oranžová"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:362
 msgid "Red"
 msgstr "Červená"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:366
 msgid "Pink"
 msgstr "Růžová"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:370
 msgid "Sky blue"
 msgstr "Nebeská modř"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:374
 msgid "Blue"
 msgstr "Modrá"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:378
 msgid "Green"
 msgstr "Zelená"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:382
 msgid "Brown"
 msgstr "Hnědá"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:386
 msgid "Grey"
 msgstr "Šedá"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:390
 msgid "Light brown"
 msgstr "Světle hnědá"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:394
 msgid "Dark red"
 msgstr "Tmavě červená"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:398
 msgid "Dark pink"
 msgstr "Tmavě růžová"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:402
 msgid "Steel blue"
 msgstr "Ocelově modrá"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:406
 msgid "Gold"
 msgstr "Zlatá"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:410
 msgid "Bright green"
 msgstr "Světle zelená"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:424
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:414
 msgid "Magenta"
 msgstr "Fialová"
 
@@ -4207,8 +4235,8 @@ msgstr ""
 "Nepodařilo se změnit alternativní slovník pro kontrolu pravopisu.\n"
 "%s"
 
-#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1257
-#: src/prefs_matcher.c:2152 src/prefs_summary_column.c:84 src/quote_fmt.c:49
+#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1259
+#: src/prefs_matcher.c:2158 src/prefs_summary_column.c:84 src/quote_fmt.c:49
 #: src/summaryview.c:446
 msgid "Date"
 msgstr "Datum"
@@ -4217,13 +4245,13 @@ msgstr "Datum"
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1254
-#: src/prefs_matcher.c:2149 src/prefs_summary_column.c:82 src/quote_fmt.c:50
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1256
+#: src/prefs_matcher.c:2155 src/prefs_summary_column.c:82 src/quote_fmt.c:50
 #: src/summaryview.c:444
 msgid "From"
 msgstr "Od"
 
-#: src/gtk/headers.h:9 src/summary_search.c:412
+#: src/gtk/headers.h:9 src/summary_search.c:438
 msgid "From:"
 msgstr "Od:"
 
@@ -4239,14 +4267,14 @@ msgstr "Odesílatel:"
 msgid "Reply-To"
 msgstr "Odpovědět komu"
 
-#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2150 src/prefs_summary_column.c:83 src/quote_fmt.c:57
+#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1257
+#: src/prefs_matcher.c:2156 src/prefs_summary_column.c:83 src/quote_fmt.c:57
 #: src/summaryview.c:445
 msgid "To"
 msgstr "Komu"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2151 src/quote_fmt.c:58
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1258
+#: src/prefs_matcher.c:2157 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Kopie"
 
@@ -4254,8 +4282,8 @@ msgstr "Kopie"
 msgid "Bcc"
 msgstr "Skrytá kopie"
 
-#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1258
-#: src/prefs_matcher.c:2153 src/quote_fmt.c:61
+#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1260
+#: src/prefs_matcher.c:2159 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Message-ID"
 
@@ -4267,8 +4295,8 @@ msgstr "Message-ID:"
 msgid "In-Reply-To"
 msgstr "V odpovědi komu"
 
-#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2155 src/quote_fmt.c:60
+#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1262
+#: src/prefs_matcher.c:2161 src/quote_fmt.c:60
 msgid "References"
 msgstr "References"
 
@@ -4276,8 +4304,8 @@ msgstr "References"
 msgid "References:"
 msgstr "References:"
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1253
-#: src/prefs_matcher.c:2148 src/prefs_summary_column.c:81 src/quote_fmt.c:56
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1255
+#: src/prefs_matcher.c:2154 src/prefs_summary_column.c:81 src/quote_fmt.c:56
 #: src/summaryview.c:443
 msgid "Subject"
 msgstr "Předmět"
@@ -4370,8 +4398,8 @@ msgstr "Příjmuto"
 msgid "Received:"
 msgstr "Příjmuto:"
 
-#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2154 src/quote_fmt.c:59
+#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1261
+#: src/prefs_matcher.c:2160 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Diskusní skupiny"
 
@@ -4469,7 +4497,7 @@ msgstr "Priorita"
 msgid "Precedence:"
 msgstr "Priorita:"
 
-#: src/gtk/headers.h:45 src/prefs_account.c:1059
+#: src/gtk/headers.h:45 src/prefs_account.c:1067
 msgid "Organization"
 msgstr "Organizace"
 
@@ -4693,39 +4721,39 @@ msgstr ""
 "<span weight=\"bold\">Následující ikony jsou používány pro zobrazení stavu "
 "zpráv a složek:</span>"
 
-#: src/gtk/inputdialog.c:246 src/gtk/inputdialog.c:268
+#: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Zadejte heslo pro %s na %s:"
 
-#: src/gtk/inputdialog.c:249 src/gtk/inputdialog.c:252
-#: src/gtk/inputdialog.c:271 src/gtk/inputdialog.c:274
+#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
+#: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
 #, c-format
 msgid "Input password for %s:"
 msgstr "Zadejte heslo pro %s:"
 
-#: src/gtk/inputdialog.c:255 src/gtk/inputdialog.c:277
+#: src/gtk/inputdialog.c:242 src/gtk/inputdialog.c:264
 msgid "Input password:"
 msgstr "Zadejte heslo:"
 
-#: src/gtk/inputdialog.c:256 src/gtk/inputdialog.c:284
-#: src/gtk/inputdialog.c:296
+#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
+#: src/gtk/inputdialog.c:283
 msgid "Input password"
 msgstr "Zadejte heslo"
 
-#: src/gtk/inputdialog.c:286
+#: src/gtk/inputdialog.c:273
 msgid "Remember password for this session"
 msgstr "Pamatovat heslo pro tuto relaci"
 
-#: src/gtk/inputdialog.c:385 src/gtk/inputdialog.c:434
+#: src/gtk/inputdialog.c:372 src/gtk/inputdialog.c:421
 msgid "Remember this"
 msgstr "Zapamatovat"
 
-#: src/gtk/logwindow.c:451
+#: src/gtk/logwindow.c:447
 msgid "Clear _Log"
 msgstr "Vyčistit _protokol"
 
-#: src/gtk/menu.c:145
+#: src/gtk/menu.c:137
 msgid ""
 "<span><b>Warning:</b> This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -4770,13 +4798,12 @@ msgstr ""
 
 #: src/gtk/pluginwindow.c:304 src/plugins/acpi_notifier/acpi_notifier.c:790
 #: src/plugins/archive/archiver_prefs.c:92
-#: src/plugins/att_remover/att_remover.c:519
-#: src/plugins/attachwarner/attachwarner_prefs.c:201
-#: src/plugins/address_keeper/address_keeper_prefs.c:208
+#: src/plugins/attachwarner/attachwarner_prefs.c:228
+#: src/plugins/address_keeper/address_keeper_prefs.c:248
 #: src/plugins/bogofilter/bogofilter_gtk.c:457
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
 #: src/plugins/clamd/clamav_plugin_gtk.c:549
-#: src/plugins/fancy/fancy_prefs.c:110
+#: src/plugins/fancy/fancy_prefs.c:109
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:178
 #: src/plugins/gdata/cm_gdata_prefs.c:145
 #: src/plugins/notification/notification_prefs.c:396
@@ -4790,7 +4817,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:557 src/plugins/rssyl/rssyl_prefs.c:63
 #: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:648
-#: src/plugins/vcalendar/vcal_prefs.c:645 src/prefs_toolbar.c:939
+#: src/plugins/vcalendar/vcal_prefs.c:647 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
@@ -4806,236 +4833,237 @@ msgstr "Odebrat"
 msgid "Description"
 msgstr "Popis"
 
-#: src/gtk/pluginwindow.c:373
-msgid "More plugins are available from the Claws Mail website."
-msgstr "Další zásuvné moduly jsou dostupné z webových stránek Claws Mail."
-
-#: src/gtk/pluginwindow.c:379 src/prefs_themes.c:843
-msgid "Get more..."
-msgstr "Získat další..."
+#: src/gtk/pluginwindow.c:374
+#, c-format
+msgid ""
+"For more information about plugins see the <a href=\"%s\"><span underline="
+"\"none\">Claws Mail website</span></a>."
+msgstr ""
+"Pro více informací o zásuvných modulech navštivte <a href=\"%s\"><span "
+"underline=\"none\">stránku Claws Mail</span></a>."
 
-#: src/gtk/pluginwindow.c:415
+#: src/gtk/pluginwindow.c:414
 msgid "Click here to load one or more plugins"
 msgstr "Klikněte zde pro načtení jednoho nebo více modulů"
 
-#: src/gtk/pluginwindow.c:418
+#: src/gtk/pluginwindow.c:417
 msgid "Unload the selected plugin"
 msgstr "Odebrat vybraný zásuvný modul"
 
-#: src/gtk/pluginwindow.c:483
+#: src/gtk/pluginwindow.c:482
 msgid "Loaded plugins"
 msgstr "Zavedené moduly"
 
-#: src/gtk/prefswindow.c:679
+#: src/gtk/prefswindow.c:671
 msgid "Page Index"
 msgstr "Index stránky"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:829
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:828
 msgid "_Hide"
 msgstr "_Skrýt"
 
 #: src/gtk/progressdialog.c:141 src/prefs_account.c:3200
 #: src/prefs_account.c:3218 src/prefs_account.c:3236 src/prefs_account.c:3254
 #: src/prefs_account.c:3272 src/prefs_account.c:3290 src/prefs_account.c:3309
-#: src/prefs_account.c:3391 src/prefs_filtering_action.c:1419
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1881
+#: src/prefs_account.c:3399 src/prefs_filtering_action.c:1421
+#: src/prefs_filtering.c:397 src/prefs_filtering.c:1877
 msgid "Account"
 msgstr "Účet"
 
-#: src/gtk/quicksearch.c:433
+#: src/gtk/quicksearch.c:442
 msgid "all messages"
 msgstr "všechny zprávy"
 
-#: src/gtk/quicksearch.c:434
+#: src/gtk/quicksearch.c:443
 msgid "messages whose age is greater than # days"
 msgstr "zprávy starší než # dnů"
 
-#: src/gtk/quicksearch.c:435
+#: src/gtk/quicksearch.c:444
 msgid "messages whose age is less than # days"
 msgstr "zprávy mladší než # dnů"
 
-#: src/gtk/quicksearch.c:436
+#: src/gtk/quicksearch.c:445
 msgid "messages whose age is greater than # hours"
 msgstr "zprávy starší než # hodin"
 
-#: src/gtk/quicksearch.c:437
+#: src/gtk/quicksearch.c:446
 msgid "messages whose age is less than # hours"
 msgstr "zprávy mladší než # hodin"
 
-#: src/gtk/quicksearch.c:438
+#: src/gtk/quicksearch.c:447
 msgid "messages which contain S in the message body"
 msgstr "zprávy obsahující S v těle zprávy"
 
-#: src/gtk/quicksearch.c:439
+#: src/gtk/quicksearch.c:448
 msgid "messages which contain S in the whole message"
 msgstr "zprávy obsahující S v celé zprávě"
 
-#: src/gtk/quicksearch.c:440
+#: src/gtk/quicksearch.c:449
 msgid "messages carbon-copied to S"
 msgstr "zpráva obsahující S v poli \"Kopie\""
 
-#: src/gtk/quicksearch.c:441
+#: src/gtk/quicksearch.c:450
 msgid "message is either to: or cc: to S"
 msgstr "zpráva obsahující S v poli \"Komu\" nebo \"Kopie\""
 
-#: src/gtk/quicksearch.c:442
+#: src/gtk/quicksearch.c:451
 msgid "deleted messages"
 msgstr "odstraněné zprávy"
 
-#: src/gtk/quicksearch.c:443
+#: src/gtk/quicksearch.c:452
 msgid "messages which contain S in the Sender field"
 msgstr "zpráva obsahující S v poli \"Odesílatel\""
 
-#: src/gtk/quicksearch.c:444
+#: src/gtk/quicksearch.c:453
 msgid "true if execute \"S\" succeeds"
 msgstr "pravda, pokud bylo provedení \"S\" úspěšné"
 
-#: src/gtk/quicksearch.c:445
+#: src/gtk/quicksearch.c:454
 msgid "messages originating from user S"
 msgstr "zprávy pocházející od uživatele S"
 
-#: src/gtk/quicksearch.c:446
+#: src/gtk/quicksearch.c:455
 msgid "forwarded messages"
 msgstr "přeposlané zprávy"
 
-#: src/gtk/quicksearch.c:447
+#: src/gtk/quicksearch.c:456
 msgid "messages which have attachments"
 msgstr "zprávy, které mají přílohy"
 
-#: src/gtk/quicksearch.c:448
+#: src/gtk/quicksearch.c:457
 msgid "messages which contain header S"
 msgstr "zprávy obsahující záhlaví S"
 
-#: src/gtk/quicksearch.c:449
+#: src/gtk/quicksearch.c:458
 msgid "messages which contain S in Message-ID header"
 msgstr "zprávy obsahující S v záhlaví \"Message-ID\""
 
-#: src/gtk/quicksearch.c:450
+#: src/gtk/quicksearch.c:459
 msgid "messages which contain S in In-Reply-To header"
 msgstr "zprávy obsahující S v záhlaví In-Reply-To"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:460
 msgid "messages which are marked with color #"
 msgstr "zprávy obarvené barvou č. #"
 
-#: src/gtk/quicksearch.c:452
+#: src/gtk/quicksearch.c:461
 msgid "locked messages"
 msgstr "zamknuté zprávy"
 
-#: src/gtk/quicksearch.c:453
+#: src/gtk/quicksearch.c:462
 msgid "messages which are in newsgroup S"
 msgstr "zprávy, které jsou v diskusní skupině S"
 
-#: src/gtk/quicksearch.c:454
+#: src/gtk/quicksearch.c:463
 msgid "new messages"
 msgstr "nové zprávy"
 
-#: src/gtk/quicksearch.c:455
+#: src/gtk/quicksearch.c:464
 msgid "old messages"
 msgstr "staré zprávy"
 
-#: src/gtk/quicksearch.c:456
+#: src/gtk/quicksearch.c:465
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "nekompletní zprávy (zprávy neúplně stažené)"
 
-#: src/gtk/quicksearch.c:457
+#: src/gtk/quicksearch.c:466
 msgid "messages which have been replied to"
 msgstr "zprávy, na které bylo odpovězeno"
 
-#: src/gtk/quicksearch.c:458
+#: src/gtk/quicksearch.c:467
 msgid "read messages"
 msgstr "přečtené zprávy"
 
-#: src/gtk/quicksearch.c:459
+#: src/gtk/quicksearch.c:468
 msgid "messages which contain S in subject"
 msgstr "zprávy obsahující S v poli \"Předmět\""
 
-#: src/gtk/quicksearch.c:460
+#: src/gtk/quicksearch.c:469
 msgid "messages whose score is equal to # points"
 msgstr "zprávy, jejichž ohodnocení je rovné # bodům"
 
-#: src/gtk/quicksearch.c:461
+#: src/gtk/quicksearch.c:470
 msgid "messages whose score is greater than # points"
 msgstr "zprávy, jejichž ohodnocení je větší než # bodů"
 
-#: src/gtk/quicksearch.c:462
+#: src/gtk/quicksearch.c:471
 msgid "messages whose score is lower than # points"
 msgstr "zprávy, jejichž ohodnocení je menší než # bodů"
 
-#: src/gtk/quicksearch.c:463
+#: src/gtk/quicksearch.c:472
 msgid "messages whose size is equal to # bytes"
 msgstr "zprávy, jejichž velikost je rovna # bytů"
 
-#: src/gtk/quicksearch.c:464
+#: src/gtk/quicksearch.c:473
 msgid "messages whose size is greater than # bytes"
 msgstr "zprávy, jejichž velikost je větší než # bytů"
 
-#: src/gtk/quicksearch.c:465
+#: src/gtk/quicksearch.c:474
 msgid "messages whose size is smaller than # bytes"
 msgstr "zprávy, jejichž velikost je menší než # bytů"
 
-#: src/gtk/quicksearch.c:466
+#: src/gtk/quicksearch.c:475
 msgid "messages which have been sent to S"
 msgstr "zprávy, které byly odeslány S"
 
-#: src/gtk/quicksearch.c:467
+#: src/gtk/quicksearch.c:476
 msgid "messages which tags contain S"
 msgstr "zprávy se značkami obsahujícími S"
 
-#: src/gtk/quicksearch.c:468
+#: src/gtk/quicksearch.c:477
 msgid "messages which have tag(s)"
 msgstr "zprávy, se značkami"
 
-#: src/gtk/quicksearch.c:469
+#: src/gtk/quicksearch.c:478
 msgid "marked messages"
 msgstr "označené zprávy"
 
-#: src/gtk/quicksearch.c:470
+#: src/gtk/quicksearch.c:479
 msgid "unread messages"
 msgstr "nepřečtené zprávy"
 
-#: src/gtk/quicksearch.c:471
+#: src/gtk/quicksearch.c:480
 msgid "messages which contain S in References header"
 msgstr "zprávy obsahující S v záhlaví \"References\""
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:481
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "zprávy vracející 0, jsou-li předány příkazu - %F je soubor se zprávou"
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:482
 msgid "messages which contain S in X-Label header"
 msgstr "zprávy obsahující S v záhlaví \"X-Label\""
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:484
 msgid "logical AND operator"
 msgstr "logický operátor A (AND)"
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:485
 msgid "logical OR operator"
 msgstr "logický operátor NEBO (OR)"
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:486
 msgid "logical NOT operator"
 msgstr "logický operátor NENÍ PRAVDA, ŽE (NOT)"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:487
 msgid "case sensitive search"
 msgstr "vyhledávání rozlišuje malá a velká písmena"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:488
 msgid "match using regular expressions instead of substring search"
 msgstr "shodné pomocí regulárních výrazů místo hledání části řetězce"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:490
 msgid "all filtering expressions are allowed"
 msgstr "všechny filtrovací výrazy jsou povoleny"
 
-#: src/gtk/quicksearch.c:490 src/summary_search.c:457
+#: src/gtk/quicksearch.c:499 src/summary_search.c:483
 msgid "Extended Search"
 msgstr "Rozšířené vyhledávání"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:500
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
@@ -5045,47 +5073,52 @@ msgstr ""
 "splňovat, aby byla zobrazena v seznamu zpráv.\n"
 "Následující symboly mohou být použity:"
 
-#: src/gtk/quicksearch.c:591
+#: src/gtk/quicksearch.c:600
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Něco selhalo během hledání. Prosím zkontrolujte záznamy."
 
-#: src/gtk/quicksearch.c:657
+#: src/gtk/quicksearch.c:666
 msgid "From/To/Subject/Tag"
 msgstr "Od/Komu/Předmět/Značka"
 
-#: src/gtk/quicksearch.c:668 src/plugins/archive/archiver_prefs.c:322
+#: src/gtk/quicksearch.c:677 src/plugins/archive/archiver_prefs.c:322
 msgid "Recursive"
 msgstr "Včetně podsložek"
 
-#: src/gtk/quicksearch.c:677
+#: src/gtk/quicksearch.c:686
 msgid "Sticky"
 msgstr "Zachovat i při změně složky"
 
-#: src/gtk/quicksearch.c:687
+#: src/gtk/quicksearch.c:696
 msgid "Type-ahead"
 msgstr "Vyhledávat během psaní"
 
-#: src/gtk/quicksearch.c:699
+#: src/gtk/quicksearch.c:708
 msgid "Run on select"
 msgstr "Spustit na vybrané"
 
-#: src/gtk/quicksearch.c:741
+#: src/gtk/quicksearch.c:750
 msgid "Clear the current search"
 msgstr "Odstranit nastavenou podmínku"
 
-#: src/gtk/quicksearch.c:751 src/summary_search.c:410
+#: src/gtk/quicksearch.c:760 src/summary_search.c:436
 msgid "Edit search criteria"
 msgstr "Upravit vyhledávací kritéria"
 
-#: src/gtk/quicksearch.c:760
+#: src/gtk/quicksearch.c:769
 msgid "Information about extended symbols"
 msgstr "Informace o rozšířených možnostech vyhledávání"
 
-#: src/gtk/quicksearch.c:798 src/gtk/quicksearch.c:813
+#: src/gtk/quicksearch.c:807 src/gtk/quicksearch.c:822
 msgid "_Information"
 msgstr "_Informace"
 
-#: src/gtk/quicksearch.c:800 src/gtk/quicksearch.c:815
+#: src/gtk/quicksearch.c:808 src/gtk/quicksearch.c:823
+msgid "E_dit"
+msgstr "U_pravit"
+
+#: src/gtk/quicksearch.c:809 src/gtk/quicksearch.c:824 src/prefs_actions.c:347
+#: src/prefs_filtering.c:495 src/prefs_template.c:328
 msgid "C_lear"
 msgstr "Vyč_istit"
 
@@ -5235,15 +5268,15 @@ msgstr "Značky:"
 
 #: src/headerview.c:216 src/plugins/notification/notification_popup.c:316
 #: src/plugins/notification/notification_popup.c:621
-#: src/plugins/notification/notification_trayicon.c:854 src/summaryview.c:3342
-#: src/summaryview.c:3359 src/summaryview.c:3380
+#: src/plugins/notification/notification_trayicon.c:854 src/summaryview.c:3344
+#: src/summaryview.c:3361 src/summaryview.c:3382
 msgid "(No From)"
 msgstr "(Neznámý odesílatel)"
 
 #: src/headerview.c:231 src/plugins/notification/notification_popup.c:318
 #: src/plugins/notification/notification_popup.c:625
-#: src/plugins/notification/notification_trayicon.c:857 src/summaryview.c:3393
-#: src/summaryview.c:3397
+#: src/plugins/notification/notification_trayicon.c:857 src/summaryview.c:3395
+#: src/summaryview.c:3399
 msgid "(No Subject)"
 msgstr "(Žádný předmět)"
 
@@ -5251,7 +5284,7 @@ msgstr "(Žádný předmět)"
 msgid "Error:"
 msgstr "Chyba:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2555
+#: src/image_viewer.c:299 src/mimeview.c:2546
 #: src/plugins/pdf_viewer/poppler_viewer.c:700
 msgid "Filename:"
 msgstr "Název souboru:"
@@ -5530,17 +5563,17 @@ msgstr "Připojení k %s selhalo"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojení s %s bylo rozpojeno. Obnovuji spojení...\n"
 
-#: src/imap.c:992 src/imap.c:3539 src/imap.c:4199 src/imap.c:4296
-#: src/imap.c:4479 src/imap.c:5276
+#: src/imap.c:992 src/imap.c:3546 src/imap.c:4206 src/imap.c:4303
+#: src/imap.c:4486 src/imap.c:5283
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail potřebuje přístup k síti, aby mohl přistupovat k IMAP serveru."
 
-#: src/imap.c:1086 src/inc.c:816 src/news.c:394 src/send_message.c:305
+#: src/imap.c:1086 src/inc.c:802 src/news.c:388 src/send_message.c:269
 msgid "Insecure connection"
 msgstr "Nezabezpečené připojení"
 
-#: src/imap.c:1087 src/inc.c:817 src/news.c:395 src/send_message.c:306
+#: src/imap.c:1087 src/inc.c:803 src/news.c:389 src/send_message.c:270
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5553,7 +5586,7 @@ msgstr ""
 "\n"
 "Chcete pokračovat v připojování k serveru? Komunikace nebude zabezpečena."
 
-#: src/imap.c:1093 src/inc.c:823 src/news.c:401 src/send_message.c:312
+#: src/imap.c:1093 src/inc.c:809 src/news.c:395 src/send_message.c:276
 msgid "Con_tinue connecting"
 msgstr "_Pokračovat v připojování"
 
@@ -5572,90 +5605,90 @@ msgstr "Nemohu se spojit s IMAP4 serverem: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nemohu se spojit s IMAP4 serverem: %s:%d\n"
 
-#: src/imap.c:1187 src/imap.c:3961
+#: src/imap.c:1187 src/imap.c:3968
 msgid "Can't start TLS session.\n"
 msgstr "Nelze spustit TLS relaci.\n"
 
-#: src/imap.c:1243
+#: src/imap.c:1250
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nepodařilo se přihlásit k IMAP serveru %s.\n"
 
-#: src/imap.c:1246
+#: src/imap.c:1253
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodařilo se přihlásit k IMAP serveru %s."
 
-#: src/imap.c:1640
+#: src/imap.c:1647
 msgid "Adding messages..."
 msgstr "Přidávám zprávy..."
 
-#: src/imap.c:1842 src/mh.c:520
+#: src/imap.c:1849 src/mh.c:520
 msgid "Copying messages..."
 msgstr "Kopíruji zprávy..."
 
-#: src/imap.c:2421
+#: src/imap.c:2428
 msgid "can't set deleted flags\n"
 msgstr "nelze nastavit příznak odstranění\n"
 
-#: src/imap.c:2428 src/imap.c:4906
+#: src/imap.c:2435 src/imap.c:4913
 msgid "can't expunge\n"
 msgstr "nelze odstranit\n"
 
-#: src/imap.c:2779
+#: src/imap.c:2786
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Vyhledávám odhlášené složky v %s..."
 
-#: src/imap.c:2782
+#: src/imap.c:2789
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Hledám podsložky %s..."
 
-#: src/imap.c:3078
+#: src/imap.c:3085
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nelze vytvořit mailbox: selhal příkaz LIST\n"
 
-#: src/imap.c:3093
+#: src/imap.c:3100
 msgid "can't create mailbox\n"
 msgstr "nelze vytvořit mailbox\n"
 
-#: src/imap.c:3184
+#: src/imap.c:3191
 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 "Název složky nesmí obsahovat znaky používané serverem IMAP jako oddělovače"
 
-#: src/imap.c:3221
+#: src/imap.c:3228
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nelze přejmenovat mailbox: %s na %s\n"
 
-#: src/imap.c:3333
+#: src/imap.c:3340
 msgid "can't delete mailbox\n"
 msgstr "nelze odstranit mailbox\n"
 
-#: src/imap.c:3620
+#: src/imap.c:3627
 msgid "LIST failed\n"
 msgstr "LIST selhal\n"
 
-#: src/imap.c:3705
+#: src/imap.c:3712
 msgid "Flagging messages..."
 msgstr "Označuji zprávy"
 
-#: src/imap.c:3806
+#: src/imap.c:3813
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: src/imap.c:3958
+#: src/imap.c:3965
 msgid "Server requires TLS to log in.\n"
 msgstr "Server vyžeduje TLS pro přihlášení.\n"
 
-#: src/imap.c:3968
+#: src/imap.c:3975
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodařilo se načíst údaje o schopnostech serveru IMAP.\n"
 
-#: src/imap.c:3973
+#: src/imap.c:3980
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5664,20 +5697,20 @@ msgstr ""
 "Připojení k %s selhalo: server požaduje TLS, ale Claws Mail je zkompilován "
 "bez podpory OpenSSL.\n"
 
-#: src/imap.c:3981
+#: src/imap.c:3988
 msgid "Server logins are disabled.\n"
 msgstr "Přihlašování k serveru je mimo provoz.\n"
 
-#: src/imap.c:4204
+#: src/imap.c:4211
 msgid "Fetching message..."
 msgstr "Stahuji zprávu..."
 
-#: src/imap.c:4899
+#: src/imap.c:4906
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nelze nastavit příznak odstranění: %d\n"
 
-#: src/imap.c:5932
+#: src/imap.c:5939
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -5764,27 +5797,21 @@ msgid "Inherit properties from parent folder"
 msgstr "Zdědit vlastnosti z rodičovské složky"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:249 src/news_gtk.c:305
-#: src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/vcalendar/vcal_folder.c:2017
+#: src/plugins/mailmbox/plugin_gtk.c:405 src/plugins/rssyl/rssyl_cb_menu.c:333
+#: src/plugins/vcalendar/vcal_folder.c:2018
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Zadejte nové jméno pro '%s':"
 
-#: src/imap_gtk.c:263 src/mh_gtk.c:251 src/plugins/mailmbox/plugin_gtk.c:409
+#: src/imap_gtk.c:263 src/mh_gtk.c:251 src/plugins/mailmbox/plugin_gtk.c:406
 #: src/plugins/rssyl/rssyl_cb_menu.c:334
-#: src/plugins/vcalendar/vcal_folder.c:2018
+#: src/plugins/vcalendar/vcal_folder.c:2019
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
-#: src/imap_gtk.c:277 src/plugins/mailmbox/plugin_gtk.c:249
-#: src/plugins/mailmbox/plugin_gtk.c:419
-#, c-format
-msgid "`%c' can't be included in folder name."
-msgstr "'%c' nemůže být obsaženo ve jméně složky."
-
 #: src/imap_gtk.c:292 src/mh_gtk.c:274 src/news_gtk.c:327
-#: src/plugins/mailmbox/plugin_gtk.c:438 src/plugins/rssyl/rssyl_cb_menu.c:354
-#: src/plugins/vcalendar/vcal_folder.c:2038
+#: src/plugins/mailmbox/plugin_gtk.c:433 src/plugins/rssyl/rssyl_cb_menu.c:354
+#: src/plugins/vcalendar/vcal_folder.c:2039
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -5806,8 +5833,8 @@ msgstr ""
 "Chcete je opravdu odstranit?"
 
 #: src/imap_gtk.c:381 src/mh_gtk.c:220 src/news_gtk.c:280
-#: src/plugins/rssyl/rssyl_cb_menu.c:256
-#: src/plugins/vcalendar/vcal_folder.c:1974
+#: src/plugins/mailmbox/plugin_gtk.c:341 src/plugins/rssyl/rssyl_cb_menu.c:256
+#: src/plugins/vcalendar/vcal_folder.c:1972
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemohu odstranit složku '%s'."
@@ -5834,7 +5861,7 @@ msgstr "+_Vyhledat"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Vyberte podsložku ve složce %s, kterou chcete odebírat: "
 
-#: src/imap_gtk.c:537 src/mainwindow.c:671
+#: src/imap_gtk.c:537 src/mainwindow.c:672
 msgid "Subscribe"
 msgstr "Odebírat"
 
@@ -6061,32 +6088,32 @@ msgstr "Vyberte Pine soubor"
 msgid "Import Pine file into Address Book"
 msgstr "Importovat Pine soubor do knihy adres"
 
-#: src/inc.c:205 src/inc.c:312 src/inc.c:339
+#: src/inc.c:186 src/inc.c:293 src/inc.c:320
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail potřebuje přístup k síti, aby mohl stáhnout zprávy."
 
-#: src/inc.c:361
+#: src/inc.c:342
 #, c-format
 msgid "%s failed\n"
 msgstr "%s selhal\n"
 
-#: src/inc.c:432
+#: src/inc.c:413
 msgid "Retrieving new messages"
 msgstr "Načítám nové zprávy"
 
-#: src/inc.c:493
+#: src/inc.c:474
 msgid "Standby"
 msgstr "V pohotovosti"
 
-#: src/inc.c:618 src/inc.c:672
+#: src/inc.c:604 src/inc.c:658
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: src/inc.c:629
+#: src/inc.c:615
 msgid "Retrieving"
 msgstr "Načítám"
 
-#: src/inc.c:638
+#: src/inc.c:624
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
@@ -6094,28 +6121,28 @@ msgstr[0] "Hotovo (%d zpráva (%s) přijato)"
 msgstr[1] "Hotovo (%d zprávy (%s) přijato)"
 msgstr[2] "Hotovo (%d zpráv (%s) přijato)"
 
-#: src/inc.c:644
+#: src/inc.c:630
 msgid "Done (no new messages)"
 msgstr "Hotovo (Nejsou žádné nové zprávy)"
 
-#: src/inc.c:649
+#: src/inc.c:635
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: src/inc.c:652
+#: src/inc.c:638
 msgid "Auth failed"
 msgstr "Autentizace selhala"
 
-#: src/inc.c:659 src/prefs_matcher.c:393 src/prefs_summary_column.c:88
-#: src/summaryview.c:2782 src/summaryview.c:6319
+#: src/inc.c:645 src/prefs_matcher.c:393 src/prefs_summary_column.c:88
+#: src/summaryview.c:2782 src/summaryview.c:6308
 msgid "Locked"
 msgstr "Zamknuto"
 
-#: src/inc.c:669 src/plugins/spamassassin/spamassassin_gtk.c:378
+#: src/inc.c:655 src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Timeout"
 msgstr "Časový limit"
 
-#: src/inc.c:756
+#: src/inc.c:742
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
@@ -6123,65 +6150,65 @@ msgstr[0] "Dokončeno (%d nová zpráva)"
 msgstr[1] "Dokončeno (%d nové zprávy)"
 msgstr[2] "Dokončeno (%d nových zpráv)"
 
-#: src/inc.c:760
+#: src/inc.c:746
 msgid "Finished (no new messages)"
 msgstr "Dokončeno (nejsou nové zprávy)"
 
-#: src/inc.c:799
+#: src/inc.c:785
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Načítám nové zprávy"
 
-#: src/inc.c:832
+#: src/inc.c:818
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Účet '%s': Připojuji se na POP3 server: %s:%d..."
 
-#: src/inc.c:850
+#: src/inc.c:836
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nemohu se spojit s POP3 serverem: %s:%d"
 
-#: src/inc.c:854
+#: src/inc.c:840
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nemohu se spojit s POP3 serverem: %s:%d\n"
 
-#: src/inc.c:934 src/send_message.c:475
+#: src/inc.c:920 src/send_message.c:486
 msgid "Authenticating..."
 msgstr "Autentizuji..."
 
-#: src/inc.c:936
+#: src/inc.c:922
 #, c-format
-msgid "Retrieving messages from %s (%s) ..."
+msgid "Retrieving messages from %s (%s)..."
 msgstr "Získávám zprávy z %s (%s) ..."
 
-#: src/inc.c:942
+#: src/inc.c:928
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Zjišťuji počet nových zpráv (STAT)..."
 
-#: src/inc.c:946
+#: src/inc.c:932
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Zjišťuji počet nových zpráv (LAST)..."
 
-#: src/inc.c:950
+#: src/inc.c:936
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Zjišťuji počet nových zpráv (UIDL)..."
 
-#: src/inc.c:954
+#: src/inc.c:940
 msgid "Getting the size of messages (LIST)..."
 msgstr "Zjišťuji počet zpráv (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:493
+#: src/inc.c:947 src/send_message.c:504
 msgid "Quitting"
 msgstr "Ukončuji"
 
-#: src/inc.c:986
+#: src/inc.c:972
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Načítám zprávu (%d / %d) (%s / %s)"
 
-#: src/inc.c:999
+#: src/inc.c:985
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
@@ -6189,16 +6216,16 @@ msgstr[0] "Hotovo (%d zpráva (%s) přijato)"
 msgstr[1] "Hotovo (%d zprávy (%s) přijato)"
 msgstr[2] "Hotovo (%d zpráv (%s) přijato)"
 
-#: src/inc.c:1158
+#: src/inc.c:1144
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Připojení k %s:%d selhalo."
 
-#: src/inc.c:1163
+#: src/inc.c:1149
 msgid "Error occurred while processing mail."
 msgstr "Nastala chyba během zpracovávání pošty."
 
-#: src/inc.c:1169
+#: src/inc.c:1155
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6207,37 +6234,37 @@ msgstr ""
 "Nastala chyba během zpracovávání pošty:\n"
 "%s"
 
-#: src/inc.c:1175
+#: src/inc.c:1161
 msgid "No disk space left."
 msgstr "Nezbylo žádné místo na disku."
 
-#: src/inc.c:1180
+#: src/inc.c:1166
 msgid "Can't write file."
 msgstr "Nemohu zapisovat do souboru."
 
-#: src/inc.c:1185
+#: src/inc.c:1171
 msgid "Socket error."
 msgstr "Chyba soketu."
 
-#: src/inc.c:1188
+#: src/inc.c:1174
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Chyba socketu v připojení k %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:403 src/send_message.c:667
+#: src/inc.c:1179 src/send_message.c:414 src/send_message.c:678
 msgid "Connection closed by the remote host."
 msgstr "Připojení bylo ukončeno vzdáleným počítačem."
 
-#: src/inc.c:1196
+#: src/inc.c:1182
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Připojení k %s:%d bylo ukončeno vzdáleným počítačem."
 
-#: src/inc.c:1201
+#: src/inc.c:1187
 msgid "Mailbox is locked."
 msgstr "Mailbox je zamknut."
 
-#: src/inc.c:1205
+#: src/inc.c:1191
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6246,11 +6273,11 @@ msgstr ""
 "Mailbox je uzamčen:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:652
+#: src/inc.c:1197 src/send_message.c:663
 msgid "Authentication failed."
 msgstr "Autentizace selhala."
 
-#: src/inc.c:1217 src/send_message.c:655
+#: src/inc.c:1203 src/send_message.c:666
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6259,7 +6286,7 @@ msgstr ""
 "Autentizace selhala:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:671
+#: src/inc.c:1208 src/send_message.c:682
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6267,38 +6294,26 @@ msgstr ""
 "Čas relace vypršel. Můžete ji obnovit zvýšením hodnoty ve Volby/Ostatní/"
 "Různé."
 
-#: src/inc.c:1227
+#: src/inc.c:1213
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Časový limit připojení k %s:%d vypršel."
 
-#: src/inc.c:1265
+#: src/inc.c:1251
 msgid "Incorporation cancelled\n"
 msgstr "Začleňování zrušeno\n"
 
-#: src/inc.c:1457
-#, c-format
-msgid "Claws Mail: %d new message"
-msgid_plural "Claws Mail: %d new messages"
-msgstr[0] "Claws Mail: %d nová zpráva"
-msgstr[1] "Claws Mail: %d nové zpávy"
-msgstr[2] "Claws Mail: %d nových zpáv"
-
-#: src/inc.c:1584
-msgid "Unable to connect: you are offline."
-msgstr "Nemohu se připojit: Jste offline."
-
-#: src/inc.c:1610
+#: src/inc.c:1518
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sPracujete v režimu offline. Přepnout na %d minut do režimu online?"
 
-#: src/inc.c:1616
+#: src/inc.c:1524
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sPracujete v režimu offline. Přepnout?"
 
-#: src/inc.c:1623
+#: src/inc.c:1531
 msgid "On_ly once"
 msgstr "Pouze _jednou"
 
@@ -6306,7 +6321,7 @@ msgstr "Pouze _jednou"
 msgid "Nick Name"
 msgstr "Přezdívka"
 
-#: src/main.c:271
+#: src/main.c:241
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6315,11 +6330,7 @@ msgstr ""
 "Soubor '%s' už existuje.\n"
 "Nemohu vytvořit složku."
 
-#: src/main.c:293 src/main.c:306
-msgid "Exiting..."
-msgstr "Ukončuji..."
-
-#: src/main.c:437
+#: src/main.c:362
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6328,7 +6339,7 @@ msgstr ""
 "Byla nalezena konfigurace pro %s.\n"
 "Chcete převést tuto konfiguraci?"
 
-#: src/main.c:439
+#: src/main.c:364
 #, c-format
 msgid ""
 "\n"
@@ -6341,11 +6352,11 @@ msgstr ""
 "Vaše pravidla filtrování Sylpheed může být převedena pomocí\n"
 "skriptu dostupného na %s."
 
-#: src/main.c:451
+#: src/main.c:376
 msgid "Keep old configuration"
 msgstr "Ponechat původní nastavení"
 
-#: src/main.c:454
+#: src/main.c:379
 msgid ""
 "Keeping a backup will allow you to go back to an older version, but may take "
 "a while if you have cached IMAP or News data, and will take some extra room "
@@ -6356,50 +6367,50 @@ msgstr ""
 "pro IMAP nebo diskuzní skupiny. Záloha také vyžaduje určité místo na vašem "
 "disku."
 
-#: src/main.c:462
+#: src/main.c:387
 msgid "Migration of configuration"
 msgstr "Převedení konfigurace"
 
-#: src/main.c:473
+#: src/main.c:398
 msgid "Copying configuration... This may take a while..."
 msgstr "Kopíruji konfiguraci... Může to chvíli trvat..."
 
-#: src/main.c:482
+#: src/main.c:407
 msgid "Migration failed!"
 msgstr "Převedení selhalo!"
 
-#: src/main.c:491
+#: src/main.c:416
 msgid "Migrating configuration..."
 msgstr "Převádím konfiguraci..."
 
-#: src/main.c:1038
+#: src/main.c:934
 msgid "Failed to register folder item update hook"
 msgstr ""
 "Nepodařilo se zaregistrovat funkci pro obsloužení události \"změna položky "
 "složky\""
 
-#: src/main.c:1045
+#: src/main.c:941
 msgid "Failed to register folder update hook"
 msgstr ""
 "Nepodařilo se zaregistrovat funkci pro obsloužení události \"změna složky\""
 
-#: src/main.c:1224
+#: src/main.c:1110
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread není v glib podporován.\n"
 
-#: src/main.c:1243
+#: src/main.c:1129
 msgid "Sylpheed-Claws 2.6.0 (or older)"
 msgstr "Sylpheed-Claws 2.6.0 (nebo starší)"
 
-#: src/main.c:1246
+#: src/main.c:1132
 msgid "Sylpheed-Claws 1.9.15 (or older)"
 msgstr "Sylpheed-Claws 1.9.15 (nebo starší)"
 
-#: src/main.c:1249
+#: src/main.c:1135
 msgid "Sylpheed-Claws 1.0.5 (or older)"
 msgstr "Sylpheed-Claws 1.0.5 (nebo starší)"
 
-#: src/main.c:1572
+#: src/main.c:1434
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6419,7 +6430,7 @@ msgstr[2] ""
 "Následující zásuvné moduly se nepodařilo načíst. Zkontrolujte nastavení.\n"
 "%s"
 
-#: src/main.c:1600
+#: src/main.c:1462
 msgid ""
 "Claws Mail has detected a configured mailbox, but it is incomplete. It is "
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
@@ -6429,7 +6440,7 @@ msgstr ""
 "Pravděpodobně chyba IMAP účtu. Použijte \"Obnovit strom složek\" v menu "
 "rodičovské složky pro opravu."
 
-#: src/main.c:1606
+#: src/main.c:1468
 msgid ""
 "Claws Mail has detected a configured mailbox, but could not load it. It is "
 "probably provided by an out-of-date external plugin. Please reinstall the "
@@ -6439,41 +6450,36 @@ msgstr ""
 "pochází od zastaralého externího modulu. Prosím přeinstalujte modul a zkuste "
 "to znovu."
 
-#: src/main.c:1635
-#, c-format
-msgid "Claws Mail can not start without its data volume (%s)."
-msgstr "Claws Mail se nemůže spustit bez prostoru pro data (%s)."
-
-#: src/main.c:1882
+#: src/main.c:1711
 msgid "Missing filename\n"
 msgstr "Chybějící jméno souboru\n"
 
-#: src/main.c:1889
+#: src/main.c:1718
 msgid "Cannot open filename for reading\n"
 msgstr "Nepodařilo se otevřít soubor pro čtení\n"
 
-#: src/main.c:1900
+#: src/main.c:1729
 msgid "Malformed header\n"
 msgstr "Poškozená hlavička\n"
 
-#: src/main.c:1907
+#: src/main.c:1736
 msgid "Duplicated 'To:' header\n"
 msgstr "Duplikovaná hlavička 'To:'\n"
 
-#: src/main.c:1922
+#: src/main.c:1751
 msgid "Missing required 'To:' header\n"
 msgstr "Chybějící požadovaná hlavička 'To:'\n"
 
-#: src/main.c:2067
+#: src/main.c:1898
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použití: %s [VOLBY]...\n"
 
-#: src/main.c:2069
+#: src/main.c:1900
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]             otevře okno pro psaní nové zprávy"
 
-#: src/main.c:2070
+#: src/main.c:1901
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6492,13 +6498,13 @@ msgstr ""
 "do\n"
 "                         prázdné řádky, pak tělo do konce souboru."
 
-#: src/main.c:2075
+#: src/main.c:1906
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe [uri]              přihlásí se k odběru zadaného URI pokud to "
 "lze"
 
-#: src/main.c:2076
+#: src/main.c:1907
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6507,23 +6513,23 @@ msgstr ""
 "  --attach soubor1 [soubor2]...  otevře okno pro psaní zprávy s připojeným\n"
 "                                 souborem(y)"
 
-#: src/main.c:2079
+#: src/main.c:1910
 msgid "  --receive              receive new messages"
 msgstr "  --receive                      načte nové zprávy"
 
-#: src/main.c:2080
+#: src/main.c:1911
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all                  načte nové zprávy ze všech účtů"
 
-#: src/main.c:2081
+#: src/main.c:1912
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     zrušit přijímání zpráv"
 
-#: src/main.c:2082
+#: src/main.c:1913
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       zrušit odesílání zpráv"
 
-#: src/main.c:2083
+#: src/main.c:1914
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6542,29 +6548,29 @@ msgstr ""
 "                         rekurzivně: nepravda když argument startuje s 0, n, "
 "N, f nebo F"
 
-#: src/main.c:2090
+#: src/main.c:1921
 msgid "  --send                 send all queued messages"
 msgstr "  --send                         pošle všechny pozdržené zprávy"
 
-#: src/main.c:2091
+#: src/main.c:1922
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [složka]...           zobrazit celkový počet zpráv"
 
-#: src/main.c:2092
+#: src/main.c:1923
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status-full [složka]...      zobrazí status každé složky"
 
-#: src/main.c:2094
+#: src/main.c:1925
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           zobrazí statistiky sezení"
 
-#: src/main.c:2095
+#: src/main.c:1926
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     resetuje statistiky sezení"
 
-#: src/main.c:2096
+#: src/main.c:1927
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6573,31 +6579,35 @@ msgstr ""
 "                                 <složka> je id složky, např. 'složka/"
 "podsložka'"
 
-#: src/main.c:2098
+#: src/main.c:1929
 msgid "  --online               switch to online mode"
 msgstr "  --online                       přejde do online režimu"
 
-#: src/main.c:2099
+#: src/main.c:1930
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline                      přejde do offline režimu"
 
-#: src/main.c:2100
+#: src/main.c:1931
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit                         ukončí Claws Mail"
 
-#: src/main.c:2101
+#: src/main.c:1932
 msgid "  --debug                debug mode"
 msgstr "  --debug                        režim trasování"
 
-#: src/main.c:2102
+#: src/main.c:1933
+msgid "  --toggle-debug         toggle debug mode"
+msgstr "  --toggle-debug                        přepne režim trasování"
+
+#: src/main.c:1934
 msgid "  --help -h              display this help and exit"
 msgstr "  --help                         vypíše tuto nápovědu a skončí"
 
-#: src/main.c:2103
+#: src/main.c:1935
 msgid "  --version -v           output version information and exit"
 msgstr "  --version                      vypíše informace o verzi a skončí"
 
-#: src/main.c:2104
+#: src/main.c:1936
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6605,11 +6615,11 @@ msgstr ""
 "  --version-full -V     vypíše informace o verzi a vestavěných vlastnostech "
 "a skončí"
 
-#: src/main.c:2105
+#: src/main.c:1937
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir                   vypíše název adresáře s konfigurací"
 
-#: src/main.c:2106
+#: src/main.c:1938
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6617,647 +6627,647 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                  použije zadaný adresář s konfigurací"
 
-#: src/main.c:2156
+#: src/main.c:1988
 msgid "Unknown option\n"
 msgstr "Neznámá volba\n"
 
-#: src/main.c:2174
+#: src/main.c:2006
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Zpracovávám (%s)..."
 
-#: src/main.c:2177
+#: src/main.c:2009
 msgid "top level folder"
 msgstr "nejvyšší složka v hierarchii"
 
-#: src/main.c:2260
+#: src/main.c:2092
 msgid "Queued messages"
 msgstr "Pozdržené zprávy"
 
-#: src/main.c:2261
+#: src/main.c:2093
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Ve frontě jsou neodeslaně zprávy. Skončit nyní?"
 
-#: src/main.c:2990
+#: src/main.c:2818
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: network is online.\n"
 
-#: src/main.c:2996
+#: src/main.c:2824
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: síť je odpojena.\n"
 
-#: src/mainwindow.c:502 src/messageview.c:210
+#: src/mainwindow.c:503 src/messageview.c:208
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/mainwindow.c:504 src/messageview.c:212 src/summaryview.c:436
+#: src/mainwindow.c:505 src/messageview.c:210 src/summaryview.c:436
 msgid "_View"
 msgstr "Z_obrazit"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:508
 msgid "_Configuration"
 msgstr "Nastav_ení"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:512
 msgid "_Add mailbox"
 msgstr "_Přidat mailbox"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:513
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:516
 msgid "Change mailbox order..."
 msgstr "Změnit pořadí schránek..."
 
-#: src/mainwindow.c:518
+#: src/mainwindow.c:519
 msgid "_Import mbox file..."
 msgstr "_Importovat mbox soubor..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:520
 msgid "_Export to mbox file..."
 msgstr "_Exportovat do mbox souboru..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:521
 msgid "_Export selected to mbox file..."
 msgstr "Exportovat _vybrané do mbox souboru..."
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:523
 msgid "Empty all _Trash folders"
 msgstr "Vyprázdnit všechny _koše"
 
-#: src/mainwindow.c:525 src/messageview.c:219
+#: src/mainwindow.c:526 src/messageview.c:217
 msgid "_Save email as..."
 msgstr "Uložit email j_ako..."
 
-#: src/mainwindow.c:526 src/messageview.c:220
+#: src/mainwindow.c:527 src/messageview.c:218
 msgid "_Save part as..."
 msgstr "Uložit část j_ako..."
 
-#: src/mainwindow.c:529 src/messageview.c:221
+#: src/mainwindow.c:530 src/messageview.c:219
 msgid "Page setup..."
 msgstr "Nastavení stránky..."
 
-#: src/mainwindow.c:530 src/messageview.c:222
+#: src/mainwindow.c:531 src/messageview.c:220
 msgid "_Print..."
 msgstr "_Tisk..."
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:533
 msgid "Synchronise folders"
 msgstr "Synchronizovat složky"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:535
 msgid "E_xit"
 msgstr "_Konec"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:540
 msgid "Select _thread"
 msgstr "Vybrat _vlákno"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:541
 msgid "_Delete thread"
 msgstr "_Odstranit vlákno"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:543
 msgid "_Find in current message..."
 msgstr "_Hledat v aktuální zprávě..."
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:545
 msgid "_Quick search"
 msgstr "_Rychlé vyhledávání"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:548
 msgid "Show or hi_de"
 msgstr "Zobrazit nebo s_krýt"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:549
 msgid "_Toolbar"
 msgstr "Nástrojová lišta"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:551
 msgid "Set displayed _columns"
 msgstr "Zobrazované _sloupce"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:552
 msgid "In _folder list..."
 msgstr "V seznamu _složek.."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:553
 msgid "In _message list..."
 msgstr "V seznamu _zpráv..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:558
 msgid "La_yout"
 msgstr "Us_pořádání"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:561
 msgid "_Sort"
 msgstr "_Seřadit"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:563
 msgid "_Attract by subject"
 msgstr "_Seskupit dle předmětu"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:565
 msgid "E_xpand all threads"
 msgstr "Rozbalit vše_chna vlákna"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:566
 msgid "Co_llapse all threads"
 msgstr "_Sbalit všechna vlákna"
 
-#: src/mainwindow.c:567 src/messageview.c:233
+#: src/mainwindow.c:568 src/messageview.c:231
 msgid "_Go to"
 msgstr "_Jít na"
 
-#: src/mainwindow.c:568 src/messageview.c:234
+#: src/mainwindow.c:569 src/messageview.c:232
 msgid "_Previous message"
 msgstr "_Předchozí zpráva"
 
-#: src/mainwindow.c:569 src/messageview.c:235
+#: src/mainwindow.c:570 src/messageview.c:233
 msgid "_Next message"
 msgstr "_Další zpráva"
 
-#: src/mainwindow.c:571 src/messageview.c:237
+#: src/mainwindow.c:572 src/messageview.c:235
 msgid "P_revious unread message"
 msgstr "Pře_dchozí nepřečtenou zpráva"
 
-#: src/mainwindow.c:572 src/messageview.c:238
+#: src/mainwindow.c:573 src/messageview.c:236
 msgid "N_ext unread message"
 msgstr "Da_lší nepřečtená zpráva"
 
-#: src/mainwindow.c:574 src/messageview.c:240
+#: src/mainwindow.c:575 src/messageview.c:238
 msgid "Previous ne_w message"
 msgstr "Předchozí no_vá zpráva"
 
-#: src/mainwindow.c:575 src/messageview.c:241
+#: src/mainwindow.c:576 src/messageview.c:239
 msgid "Ne_xt new message"
 msgstr "D_alší nová zpráva"
 
-#: src/mainwindow.c:577 src/messageview.c:243
+#: src/mainwindow.c:578 src/messageview.c:241
 msgid "Previous _marked message"
 msgstr "Předchozí _označená zpráva"
 
-#: src/mainwindow.c:578 src/messageview.c:244
+#: src/mainwindow.c:579 src/messageview.c:242
 msgid "Next m_arked message"
 msgstr "Další o_značená zprávy."
 
-#: src/mainwindow.c:580 src/messageview.c:246
+#: src/mainwindow.c:581 src/messageview.c:244
 msgid "Previous _labeled message"
 msgstr "Předchozí _obarvená zpráva"
 
-#: src/mainwindow.c:581 src/messageview.c:247
+#: src/mainwindow.c:582 src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "Další o_barvená zpráva"
 
-#: src/mainwindow.c:583 src/messageview.c:249
+#: src/mainwindow.c:584 src/messageview.c:247
 msgid "Previous opened message"
 msgstr "Předchozí otevřená zpráva"
 
-#: src/mainwindow.c:584 src/messageview.c:250
+#: src/mainwindow.c:585 src/messageview.c:248
 msgid "Next opened message"
 msgstr "Další otevřená zpráva"
 
-#: src/mainwindow.c:586 src/messageview.c:252
+#: src/mainwindow.c:587 src/messageview.c:250
 msgid "Parent message"
 msgstr "Rodičovská zpráva"
 
-#: src/mainwindow.c:588 src/messageview.c:254
+#: src/mainwindow.c:589 src/messageview.c:252
 msgid "Next unread _folder"
 msgstr "Následující nepřečtená _složka"
 
-#: src/mainwindow.c:589 src/messageview.c:255
+#: src/mainwindow.c:590 src/messageview.c:253
 msgid "_Other folder..."
 msgstr "_Jiná složka..."
 
-#: src/mainwindow.c:591 src/messageview.c:257 src/mimeview.c:210
+#: src/mainwindow.c:592 src/messageview.c:255 src/mimeview.c:201
 msgid "Next part"
 msgstr "Další část"
 
-#: src/mainwindow.c:592 src/messageview.c:258 src/mimeview.c:211
+#: src/mainwindow.c:593 src/messageview.c:256 src/mimeview.c:202
 msgid "Previous part"
 msgstr "Předchozí část"
 
-#: src/mainwindow.c:595 src/messageview.c:259
+#: src/mainwindow.c:596 src/messageview.c:257
 msgid "Message scroll"
 msgstr "Rolování zpráv"
 
-#: src/mainwindow.c:596 src/messageview.c:260
+#: src/mainwindow.c:597 src/messageview.c:258
 msgid "Previous line"
 msgstr "Předchozí řádek"
 
-#: src/mainwindow.c:597 src/messageview.c:261
+#: src/mainwindow.c:598 src/messageview.c:259
 msgid "Next line"
 msgstr "Další řádek"
 
-#: src/mainwindow.c:598 src/messageview.c:262 src/printing.c:487
+#: src/mainwindow.c:599 src/messageview.c:260 src/printing.c:487
 msgid "Previous page"
 msgstr "Předchozí stránka"
 
-#: src/mainwindow.c:599 src/messageview.c:263 src/printing.c:494
+#: src/mainwindow.c:600 src/messageview.c:261 src/printing.c:494
 msgid "Next page"
 msgstr "Další stránka"
 
-#: src/mainwindow.c:617 src/messageview.c:281
+#: src/mainwindow.c:618 src/messageview.c:279
 msgid "Decode"
 msgstr "Dekódovat"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:625
 msgid "Open in new _window"
 msgstr "Otevřít v _novém okně"
 
-#: src/mainwindow.c:625 src/messageview.c:288
+#: src/mainwindow.c:626 src/messageview.c:286
 msgid "Mess_age source"
 msgstr "Zd_roj zprávy"
 
-#: src/mainwindow.c:627 src/messageview.c:289
+#: src/mainwindow.c:628 src/messageview.c:287
 msgid "Message part"
 msgstr "Část zprávy"
 
-#: src/mainwindow.c:628 src/messageview.c:290
+#: src/mainwindow.c:629 src/messageview.c:288
 msgid "View as text"
 msgstr "Zobrazit jako text"
 
-#: src/mainwindow.c:629 src/messageview.c:291 src/toolbar.c:401
+#: src/mainwindow.c:630 src/messageview.c:289 src/toolbar.c:402
 msgid "Open"
 msgstr "Otevřít"
 
-#: src/mainwindow.c:631 src/messageview.c:293
+#: src/mainwindow.c:632 src/messageview.c:291
 msgid "Open with..."
 msgstr "Otevřít čím..."
 
-#: src/mainwindow.c:635 src/messageview.c:296
+#: src/mainwindow.c:636 src/messageview.c:294
 msgid "Quotes"
 msgstr "Citace"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:638
 msgid "_Update summary"
 msgstr "_Aktualizace souhrnu"
 
-#: src/mainwindow.c:640
+#: src/mainwindow.c:641
 msgid "Recei_ve"
 msgstr "Přij_mout"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:642
 msgid "Get from _current account"
 msgstr "Přijmout z _aktuálního účtu"
 
-#: src/mainwindow.c:642
+#: src/mainwindow.c:643
 msgid "Get from _all accounts"
 msgstr "Přijmout ze _všech účtů"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:644
 msgid "Cancel receivin_g"
 msgstr "Přerušit stahování zprá_v"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:647
 msgid "_Send queued messages"
 msgstr "_Odeslat pozdržené zprávy"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:652
 msgid "Compose a_n email message"
 msgstr "_Napsat nový mail"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:653
 msgid "Compose a news message"
 msgstr "_Napsat news zprávu"
 
-#: src/mainwindow.c:654 src/messageview.c:302
+#: src/mainwindow.c:655 src/messageview.c:300
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: src/mainwindow.c:655 src/messageview.c:303 src/summaryview.c:428
+#: src/mainwindow.c:656 src/messageview.c:301 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "Odpovědět ko_mu"
 
-#: src/mainwindow.c:658 src/messageview.c:306
+#: src/mainwindow.c:659 src/messageview.c:304
 msgid "Mailing _list"
 msgstr "Kon_ference"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:660
 msgid "Follow-up and reply to"
 msgstr "Postoupit a odpovědět"
 
-#: src/mainwindow.c:662 src/messageview.c:309 src/toolbar.c:2087
+#: src/mainwindow.c:663 src/messageview.c:307 src/toolbar.c:2088
 msgid "_Forward"
 msgstr "Pře_dat"
 
-#: src/mainwindow.c:663 src/messageview.c:310 src/toolbar.c:2088
+#: src/mainwindow.c:664 src/messageview.c:308 src/toolbar.c:2089
 msgid "For_ward as attachment"
 msgstr "Předat jako pří_lohu"
 
-#: src/mainwindow.c:664 src/messageview.c:311 src/toolbar.c:2089
+#: src/mainwindow.c:665 src/messageview.c:309 src/toolbar.c:2090
 msgid "Redirec_t"
 msgstr "Pře_směrovat"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:667
 msgid "Mailing-_List"
 msgstr "Kon_ference"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:668
 msgid "Post"
 msgstr "Pošta"
 
-#: src/mainwindow.c:669
+#: src/mainwindow.c:670
 msgid "Help"
 msgstr "Nápověda"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:674
 msgid "Unsubscribe"
 msgstr "Odhlásit"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:676
 msgid "View archive"
 msgstr "Zobrazit archív"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:678
 msgid "Contact owner"
 msgstr "Kontaktovat vlastníka"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:682
 msgid "M_ove..."
 msgstr "Přesunou_t..."
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:683
 msgid "_Copy..."
 msgstr "_Kopírovat..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:684
 msgid "Move to _trash"
 msgstr "Přesuno_ut do koše"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:685
 msgid "_Delete..."
 msgstr "_Odstranit..."
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:686
 msgid "Cancel a news message"
 msgstr "Stornovat news zprávu"
 
-#: src/mainwindow.c:688 src/mainwindow.c:689 src/summaryview.c:429
+#: src/mainwindow.c:689 src/mainwindow.c:690 src/summaryview.c:429
 msgid "_Mark"
 msgstr "Označ_it"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:691
 msgid "_Unmark"
 msgstr "Odo_značit"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:694
 msgid "Mark as unr_ead"
 msgstr "Označit jako _nepřečtené"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:695
 msgid "Mark as rea_d"
 msgstr "Označit jako _přečtené"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:697
 msgid "Mark all read"
 msgstr "Označit všechny jako přečtené"
 
-#: src/mainwindow.c:698 src/prefs_filtering_action.c:199 src/toolbar.c:207
-#: src/toolbar.c:417
+#: src/mainwindow.c:699 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/toolbar.c:418
 msgid "Ignore thread"
 msgstr "Ignorovat vlákno"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:700
 msgid "Unignore thread"
 msgstr "Přestat ignorovat vlákno"
 
-#: src/mainwindow.c:700 src/prefs_filtering_action.c:200 src/toolbar.c:208
-#: src/toolbar.c:418
+#: src/mainwindow.c:701 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/toolbar.c:419
 msgid "Watch thread"
 msgstr "Sledovat vlákno"
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:702
 msgid "Unwatch thread"
 msgstr "Nesledovat vlákno"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:705
 msgid "Mark as _spam"
 msgstr "Označit jako _spam"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:706
 msgid "Mark as _ham"
 msgstr "Označit jako n_e spam"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:709 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Zamknout"
 
-#: src/mainwindow.c:709 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:710 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Odemknout"
 
-#: src/mainwindow.c:711 src/summaryview.c:430
+#: src/mainwindow.c:712 src/summaryview.c:430
 msgid "Color la_bel"
 msgstr "O_barvit"
 
-#: src/mainwindow.c:712 src/summaryview.c:431
+#: src/mainwindow.c:713 src/summaryview.c:431
 msgid "Ta_gs"
 msgstr "Zn_ačky"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:716
 msgid "Re-_edit"
 msgstr "Znovu _upravit"
 
-#: src/mainwindow.c:718 src/messageview.c:312 src/mimeview.c:1028
+#: src/mainwindow.c:719 src/messageview.c:310 src/mimeview.c:1030
 msgid "Check signature"
 msgstr "Zkontrolovat podpis"
 
-#: src/mainwindow.c:723 src/messageview.c:316
+#: src/mainwindow.c:724 src/messageview.c:314
 msgid "Add sender to address boo_k"
 msgstr "Přidat odesílatele do kni_hy adres"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:726
 msgid "C_ollect addresses"
 msgstr "S_bírat adresy"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:727
 msgid "From current _folder..."
 msgstr "Z aktuální _složky..."
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:728
 msgid "From selected _messages..."
 msgstr "Z vybraných _zpráv..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:731
 msgid "_Filter all messages in folder"
 msgstr "Pře_filtrovat všechny zprávy ve složce"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:732
 msgid "Filter _selected messages"
 msgstr "Přefiltrovat _vybrané zprávy"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:733
 msgid "Run folder pr_ocessing rules"
 msgstr "Spustit pravidl_o zpracování složky"
 
-#: src/mainwindow.c:734 src/messageview.c:319
+#: src/mainwindow.c:735 src/messageview.c:317
 msgid "_Create filter rule"
 msgstr "Vytvořit pravidlo _filtru"
 
-#: src/mainwindow.c:735 src/mainwindow.c:741 src/messageview.c:320
-#: src/messageview.c:326
+#: src/mainwindow.c:736 src/mainwindow.c:742 src/messageview.c:318
+#: src/messageview.c:324
 msgid "_Automatically"
 msgstr "_Automaticky"
 
-#: src/mainwindow.c:736 src/mainwindow.c:742 src/mainwindow.c:846
-#: src/messageview.c:321 src/messageview.c:327
+#: src/mainwindow.c:737 src/mainwindow.c:743 src/mainwindow.c:845
+#: src/messageview.c:319 src/messageview.c:325
 msgid "By _From"
 msgstr "Podle _Od"
 
-#: src/mainwindow.c:737 src/mainwindow.c:743 src/mainwindow.c:847
-#: src/messageview.c:322 src/messageview.c:328
+#: src/mainwindow.c:738 src/mainwindow.c:744 src/mainwindow.c:846
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _To"
 msgstr "Podle _Komu"
 
-#: src/mainwindow.c:738 src/mainwindow.c:744 src/messageview.c:323
-#: src/messageview.c:329
+#: src/mainwindow.c:739 src/mainwindow.c:745 src/messageview.c:321
+#: src/messageview.c:327
 msgid "By _Subject"
 msgstr "Podle _Předmětu"
 
-#: src/mainwindow.c:740 src/messageview.c:325 src/summaryview.c:434
+#: src/mainwindow.c:741 src/messageview.c:323 src/summaryview.c:434
 msgid "Create processing rule"
 msgstr "Vytvořit pravidlo zpracování"
 
-#: src/mainwindow.c:747 src/messageview.c:333
+#: src/mainwindow.c:748 src/messageview.c:331
 msgid "List _URLs..."
 msgstr "Seznam _URLs..."
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:755
 msgid "Ch_eck for new messages in all folders"
 msgstr "_Zjistit nové zprávy ve všech složkách"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:756
 msgid "Delete du_plicated messages"
 msgstr "_Odstranit duplikáty zpráv"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:757
 msgid "In selected folder"
 msgstr "Ve vybrané složce"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:758
 msgid "In all folders"
 msgstr "Ve všech složkách"
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:761
 msgid "E_xecute"
 msgstr "S_pustit"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:762
 msgid "Exp_unge"
 msgstr "Vy_mazat"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:765
 msgid "SSL cer_tificates"
 msgstr "SSL cer_tifikáty"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:769
 msgid "Filtering Lo_g"
 msgstr "Záznam filtrování"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:771
 msgid "Network _Log"
 msgstr "Záznam o připojení"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:773
 msgid "_Forget all session passwords"
 msgstr "_Zapomenout všechna hesla relace"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:776
 msgid "C_hange current account"
 msgstr "_Zvolit aktuální účet"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:778
 msgid "_Preferences for current account..."
 msgstr "Upravit a_ktuální účet..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:779
 msgid "Create _new account..."
 msgstr "Vytvořit _nový účet..."
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:780
 msgid "_Edit accounts..."
 msgstr "U_pravit účty"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:783
 msgid "P_references..."
 msgstr "_Volby"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:784
 msgid "Pre-pr_ocessing..."
 msgstr "Před zpracování..."
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:785
 msgid "Post-pro_cessing..."
 msgstr "Následné zpracování..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:786
 msgid "_Filtering..."
 msgstr "_Filtrování..."
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:787
 msgid "_Templates..."
 msgstr "Ša_blony"
 
-#: src/mainwindow.c:787
+#: src/mainwindow.c:788
 msgid "_Actions..."
 msgstr "_Akce..."
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:789
 msgid "Tag_s..."
 msgstr "Znač_ky..."
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:791
 msgid "Plu_gins..."
 msgstr "Zásuvné _moduly..."
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:794
 msgid "_Manual"
 msgstr "_Manuál"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:795
 msgid "_Online User-contributed FAQ"
 msgstr "FAQ (online)"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:796
 msgid "Icon _Legend"
 msgstr "_Význam ikon"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:798
 msgid "Set as default client"
 msgstr "Nastavit jako výchozí klient"
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:805
 msgid "Offline _mode"
 msgstr "Offline _mód"
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:806
 msgid "_Message view"
 msgstr "_Náhled zprávy"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:808
 msgid "Status _bar"
 msgstr "_Stavový řádek"
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:810
 msgid "Column headers"
 msgstr "Záhlaví sloupců"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:811
 msgid "Th_read view"
 msgstr "Zobrazit _vlákna"
 
-#: src/mainwindow.c:811
+#: src/mainwindow.c:812
 msgid "Hide read threads"
 msgstr "Skrýt přečtená vlákna"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:813
 msgid "_Hide read messages"
 msgstr "Skrýt přeč_tené zprávy"
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:814
 msgid "Hide deleted messages"
 msgstr "Skrýt odstraněné zprávy"
 
@@ -7265,184 +7275,184 @@ msgstr "Skrýt odstraněné zprávy"
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
-#: src/mainwindow.c:817 src/messageview.c:345
+#: src/mainwindow.c:816 src/messageview.c:343
 msgid "Show all _headers"
 msgstr "Zobrazit všechny _hlavičky"
 
-#: src/mainwindow.c:818 src/messageview.c:346
+#: src/mainwindow.c:817 src/messageview.c:344
 msgid "_Collapse all"
 msgstr "_Sbalit vše"
 
-#: src/mainwindow.c:819 src/messageview.c:347
+#: src/mainwindow.c:818 src/messageview.c:345
 msgid "Collapse from level _2"
 msgstr "Sbalit od úrovně _2"
 
-#: src/mainwindow.c:820 src/messageview.c:348
+#: src/mainwindow.c:819 src/messageview.c:346
 msgid "Collapse from level _3"
 msgstr "Sbalit od úrovně _3"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:823
 msgid "Text _below icons"
 msgstr "Text _pod ikonami"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:824
 msgid "Text be_side icons"
 msgstr "Text _vedle ikon"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:825
 msgid "_Icons only"
 msgstr "Jen _ikony"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:826
 msgid "_Text only"
 msgstr "Jen _text"
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:833
 msgid "_Standard"
 msgstr "_Standartní"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:834
 msgid "_Three columns"
 msgstr "_Tři sloupce"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:835
 msgid "_Wide message"
 msgstr "Široký náhled _zpráv"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:836
 msgid "W_ide message list"
 msgstr "Široký _seznam zpráv"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:837
 msgid "S_mall screen"
 msgstr "_Malá obrazovka"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:841
 msgid "By _number"
 msgstr "Podle čí_sla"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:842
 msgid "By s_ize"
 msgstr "Podle _velikosti"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:843
 msgid "By _date"
 msgstr "Podle _data"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:844
 msgid "By thread date"
 msgstr "Podle data vlákna"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:847
 msgid "By s_ubject"
 msgstr "Podle _předmětu"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:848
 msgid "By _color label"
 msgstr "Podle _barevného označení zprávy"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:849
 msgid "By tag"
 msgstr "Podle tag"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:850
 msgid "By _mark"
 msgstr "Podle _značky"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:851
 msgid "By _status"
 msgstr "Podle _stavu"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:852
 msgid "By a_ttachment"
 msgstr "Podle _přílohy"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:853
 msgid "By score"
 msgstr "Podle skóre"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:854
 msgid "By locked"
 msgstr "Podle zamknuto"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:855
 msgid "D_on't sort"
 msgstr "N_eřadit"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:859
 msgid "Ascending"
 msgstr "Vzestupně"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:860
 msgid "Descending"
 msgstr "Sestupně"
 
-#: src/mainwindow.c:902 src/messageview.c:389
+#: src/mainwindow.c:901 src/messageview.c:387
 msgid "_Auto detect"
 msgstr "_Autodetekce"
 
-#: src/mainwindow.c:1306 src/summaryview.c:6245
+#: src/mainwindow.c:1297 src/summaryview.c:6234
 msgid "Apply tags..."
 msgstr "Použít značky"
 
-#: src/mainwindow.c:2123
+#: src/mainwindow.c:1935
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Došlo k chybě (chybám). Klikněte zde pro zobrazení protokolu."
 
-#: src/mainwindow.c:2138
+#: src/mainwindow.c:1950
 msgid "You are online. Click the icon to go offline"
 msgstr ""
 "Pracujete v režimu online. Klikněte na ikonu pro přechod do režimu offline."
 
-#: src/mainwindow.c:2141
+#: src/mainwindow.c:1953
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 "Pracujete v režimu offline. Klikněte na ikonu pro přechod do režimu online."
 
-#: src/mainwindow.c:2155
+#: src/mainwindow.c:1967
 msgid "Select account"
 msgstr "Vybrat účet"
 
-#: src/mainwindow.c:2182 src/prefs_logging.c:140
+#: src/mainwindow.c:1994 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Síťový protokol"
 
-#: src/mainwindow.c:2186
+#: src/mainwindow.c:1998
 msgid "Filtering/Processing debug log"
 msgstr "Protokol filtrování zpráv a zpracování složek"
 
-#: src/mainwindow.c:2205 src/prefs_logging.c:392
+#: src/mainwindow.c:2017 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "protokolování filtrů zapnuto\n"
 
-#: src/mainwindow.c:2207 src/prefs_logging.c:394
+#: src/mainwindow.c:2019 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "protokolování filtrů vypnuto\n"
 
-#: src/mainwindow.c:2653 src/mainwindow.c:2660 src/mainwindow.c:2703
-#: src/mainwindow.c:2736 src/mainwindow.c:2768 src/mainwindow.c:2813
+#: src/mainwindow.c:2460 src/mainwindow.c:2467 src/mainwindow.c:2510
+#: src/mainwindow.c:2543 src/mainwindow.c:2575 src/mainwindow.c:2620
 #: src/plugins/notification/notification_trayicon.c:363
 #: src/prefs_folder_item.c:1067
 msgid "Untitled"
 msgstr "Neoznačený"
 
-#: src/mainwindow.c:2814 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2621 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:3071 src/mainwindow.c:3075
+#: src/mainwindow.c:2878 src/mainwindow.c:2882
 msgid "Delete all messages in trash folders?"
 msgstr "Odstranit všechny zprávy ve VŠECH koších?"
 
-#: src/mainwindow.c:3072
+#: src/mainwindow.c:2879
 msgid "Don't quit"
 msgstr "Neukončit"
 
-#: src/mainwindow.c:3101 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2908 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Přidat mailbox"
 
-#: src/mainwindow.c:3102
+#: src/mainwindow.c:2909
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7452,17 +7462,18 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/mainwindow.c:3108 src/plugins/rssyl/rssyl_gtk.c:158
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/plugins/rssyl/rssyl_gtk.c:158
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Mailbox '%s' již existuje."
 
-#: src/mainwindow.c:3113 src/plugins/mailmbox/plugin_gtk.c:202 src/setup.c:52
-#: src/wizard.c:774
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:202 src/setup.c:52
+#: src/wizard.c:737
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:3118 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:55
+#: src/mainwindow.c:2925 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7472,43 +7483,43 @@ msgstr ""
 "Může to být tím, že mailbox již existuje, nebo nemáte dostatečná práva\n"
 "pro zápis."
 
-#: src/mainwindow.c:3563
+#: src/mainwindow.c:3373
 msgid "No posting allowed"
 msgstr "Zasílání zpráv do konference není povoleno"
 
-#: src/mainwindow.c:4141
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "Import souboru mbox se nezdařil."
 
-#: src/mainwindow.c:4150 src/mainwindow.c:4159
+#: src/mainwindow.c:3960 src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "Export do mbox souboru se nezdařil."
 
-#: src/mainwindow.c:4200 src/plugins/notification/notification_trayicon.c:518
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:518
 msgid "Exit"
 msgstr "Ukončení programu"
 
-#: src/mainwindow.c:4200 src/plugins/notification/notification_trayicon.c:518
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:518
 msgid "Exit Claws Mail?"
 msgstr "Ukončit Claws Mail?"
 
-#: src/mainwindow.c:4387
+#: src/mainwindow.c:4199
 msgid "Folder synchronisation"
 msgstr "Synchronizace složek"
 
-#: src/mainwindow.c:4388
+#: src/mainwindow.c:4200
 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete nyní synchronizovat složky?"
 
-#: src/mainwindow.c:4389
+#: src/mainwindow.c:4201
 msgid "+_Synchronise"
 msgstr "+_Synchronizovat"
 
-#: src/mainwindow.c:4818
+#: src/mainwindow.c:4630
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávám duplikované zprávy..."
 
-#: src/mainwindow.c:4855
+#: src/mainwindow.c:4667
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -7516,33 +7527,33 @@ msgstr[0] "Odstraněna %d duplicitní zpráva v %d složkách.\n"
 msgstr[1] "Odstraněny %d duplicitní zprávy v %d složkách.\n"
 msgstr[2] "Odstraněno %d duplicitních zpráv v %d složkách.\n"
 
-#: src/mainwindow.c:5110 src/summaryview.c:5726
+#: src/mainwindow.c:4922 src/summaryview.c:5723
 msgid "Processing rules to apply before folder rules"
 msgstr "Zpracování složky - pravidla prováděná před pravidly složky"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:4930
 msgid "Processing rules to apply after folder rules"
 msgstr "Zpracování složky - pravidla prováděná po pravidlech složky"
 
-#: src/mainwindow.c:5126 src/summaryview.c:5737
+#: src/mainwindow.c:4938 src/summaryview.c:5734
 msgid "Filtering configuration"
 msgstr "Filtr pro příjem - nastavení pravidel"
 
-#: src/mainwindow.c:5241
+#: src/mainwindow.c:5053
 msgid "Can not register as default client: impossible to get executable path."
 msgstr "Nemohu zaregistrovat jako výchozí klient: není možné získat cestu."
 
-#: src/mainwindow.c:5300
+#: src/mainwindow.c:5112
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail byl zaregistrován jako výchozí klient."
 
-#: src/mainwindow.c:5302
+#: src/mainwindow.c:5114
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Nemohu zaregistrovat jako výchozí klient: není možné zapisovat do registrů."
 
-#: src/mainwindow.c:5460
+#: src/mainwindow.c:5272
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7572,30 +7583,30 @@ msgstr "řádek těla"
 msgid "tag"
 msgstr "značka"
 
-#: src/matcher.c:517 src/matcher.c:522 src/matcher.c:542 src/matcher.c:547
-#: src/message_search.c:212 src/prefs_matcher.c:737 src/summary_search.c:452
+#: src/matcher.c:523 src/matcher.c:528 src/matcher.c:548 src/matcher.c:553
+#: src/message_search.c:217 src/prefs_matcher.c:739 src/summary_search.c:478
 msgid "Case sensitive"
 msgstr "Rozlišovat malá a velká písmena"
 
-#: src/matcher.c:517 src/matcher.c:522 src/matcher.c:542 src/matcher.c:547
+#: src/matcher.c:523 src/matcher.c:528 src/matcher.c:548 src/matcher.c:553
 msgid "Case insensitive"
 msgstr "Rozlišovat malá a velká písmena"
 
-#: src/matcher.c:1712
+#: src/matcher.c:1819
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "zkontrolovat jestli zpráva odpovídá [ %s ]\n"
 
-#: src/matcher.c:1781 src/matcher.c:1800 src/matcher.c:1813
+#: src/matcher.c:1888 src/matcher.c:1907 src/matcher.c:1920
 msgid "message matches\n"
 msgstr "zpráva odpovídá\n"
 
-#: src/matcher.c:1788 src/matcher.c:1806 src/matcher.c:1815
+#: src/matcher.c:1895 src/matcher.c:1913 src/matcher.c:1922
 msgid "message does not match\n"
 msgstr "zpráva neodpovídá\n"
 
-#: src/matcher.c:2078 src/matcher.c:2079 src/matcher.c:2080 src/matcher.c:2081
-#: src/matcher.c:2082 src/matcher.c:2083 src/matcher.c:2084 src/matcher.c:2085
+#: src/matcher.c:2185 src/matcher.c:2186 src/matcher.c:2187 src/matcher.c:2188
+#: src/matcher.c:2189 src/matcher.c:2190 src/matcher.c:2191 src/matcher.c:2192
 msgid "(none)"
 msgstr "(žádný)"
 
@@ -7611,7 +7622,7 @@ msgstr ""
 #: src/mbox.c:144
 #, c-format
 msgid "Importing from mbox... (%d mail imported)"
-msgid_plural "Importing from mbox ... (%d mails imported)"
+msgid_plural "Importing from mbox... (%d mails imported)"
 msgstr[0] "Importuji mbox... (načtených zpráv: %d)"
 msgstr[1] "Importuji mbox... (načtených zpráv: %d)"
 msgstr[2] "Importuji mbox... (načtených zpráv: %d)"
@@ -7624,7 +7635,7 @@ msgstr "Přepsat mbox soubor"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tento soubor již existuje. Chcete ho přepsat?"
 
-#: src/mbox.c:555 src/messageview.c:1867 src/mimeview.c:1827
+#: src/mbox.c:555 src/messageview.c:1843 src/mimeview.c:1844
 #: src/prefs_themes.c:553 src/textview.c:3120
 msgid "Overwrite"
 msgstr "Přepsat"
@@ -7650,39 +7661,39 @@ msgstr "Hledat text v aktuální zprávě"
 msgid "Find text:"
 msgstr "Hledaný text:"
 
-#: src/message_search.c:332 src/summary_search.c:768
+#: src/message_search.c:346 src/summary_search.c:791
 msgid "Search failed"
 msgstr "Neúspěšné hledání"
 
-#: src/message_search.c:333 src/summary_search.c:769
+#: src/message_search.c:347 src/summary_search.c:792
 msgid "Search string not found."
 msgstr "Hledaný řetězec nebyl nalezen."
 
-#: src/message_search.c:342
+#: src/message_search.c:356
 msgid "Beginning of message reached; continue from end?"
 msgstr "Dosažen začátek zprávy, pokračovat od konce?"
 
-#: src/message_search.c:345
+#: src/message_search.c:359
 msgid "End of message reached; continue from beginning?"
 msgstr "Dosažen konec zprávy, pokračovat od začátku?"
 
-#: src/message_search.c:348 src/summary_search.c:780
+#: src/message_search.c:362 src/summary_search.c:803
 msgid "Search finished"
 msgstr "Hledání ukončeno"
 
-#: src/messageview.c:299 src/textview.c:245
+#: src/messageview.c:297 src/textview.c:245
 msgid "Compose _new message"
 msgstr "_Napsat novou zprávu"
 
-#: src/messageview.c:729 src/messageview.c:1413 src/messageview.c:1609
+#: src/messageview.c:711 src/messageview.c:1388 src/messageview.c:1585
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Náhled zprávy"
 
-#: src/messageview.c:860
+#: src/messageview.c:838
 msgid "<No Return-Path found>"
 msgstr "<návratová adresa nebyla nalezena>"
 
-#: src/messageview.c:868
+#: src/messageview.c:846
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7697,11 +7708,11 @@ msgstr ""
 "Návratová adresa: %s\n"
 "Doporučuje se neodesílat potvrzení o doručení."
 
-#: src/messageview.c:875 src/messageview.c:892
+#: src/messageview.c:853 src/messageview.c:870
 msgid "_Don't Send"
 msgstr "_Neodesílat"
 
-#: src/messageview.c:888
+#: src/messageview.c:866
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7712,64 +7723,64 @@ msgstr ""
 "'Komu:' a 'Kopie: nejste oficiálním adresátem.\n"
 "Doporučuje se neodesílat potvrzení o doručení."
 
-#: src/messageview.c:1341
+#: src/messageview.c:1319
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Přijímaní zprávy (%s)..."
 
-#: src/messageview.c:1377 src/procmime.c:983
+#: src/messageview.c:1355 src/procmime.c:986
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Nepodařilo se rozšifrovat: %s"
 
-#: src/messageview.c:1460 src/messageview.c:1468
+#: src/messageview.c:1435 src/messageview.c:1443
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Zpráva nevyhovuje MIME standardu. Může být špatně zobrazena."
 
-#: src/messageview.c:1859 src/messageview.c:1862 src/mimeview.c:1980
-#: src/plugins/fancy/fancy_viewer.c:788 src/summaryview.c:4813
-#: src/summaryview.c:4816 src/textview.c:3108
+#: src/messageview.c:1835 src/messageview.c:1838 src/mimeview.c:1997
+#: src/plugins/fancy/fancy_viewer.c:668 src/summaryview.c:4810
+#: src/summaryview.c:4813 src/textview.c:3108
 msgid "Save as"
 msgstr "Uložit jako"
 
-#: src/messageview.c:1868
+#: src/messageview.c:1844
 msgid "Overwrite existing file?"
 msgstr "Přepsat existující soubor?"
 
-#: src/messageview.c:1876 src/summaryview.c:4833 src/summaryview.c:4836
-#: src/summaryview.c:4851
+#: src/messageview.c:1852 src/summaryview.c:4830 src/summaryview.c:4833
+#: src/summaryview.c:4848
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Nemohu uložit soubor '%s'."
 
-#: src/messageview.c:1930
+#: src/messageview.c:1905
 #, c-format
 msgid "Show all %s."
 msgstr "Zobrazit všechny %s."
 
-#: src/messageview.c:1932
+#: src/messageview.c:1907
 msgid "Only the first megabyte of text is shown."
 msgstr "Je zobrazen jen první megabyte textu."
 
-#: src/messageview.c:1963
+#: src/messageview.c:1938
 msgid ""
 "You got a return receipt for this message : it has been displayed by the "
 "recipient."
 msgstr "Obdržel potvrzení pro tuto zprávu : Byla zobrazena příjemcem"
 
-#: src/messageview.c:1966
+#: src/messageview.c:1941
 msgid "You asked for a return receipt in this message."
 msgstr "U této zprávy jste vyžádal(a) potvrzení o doručení."
 
-#: src/messageview.c:1972
+#: src/messageview.c:1947
 msgid "This message asks for a return receipt."
 msgstr "Tato zpráva vyžaduje potvrzení o duručení."
 
-#: src/messageview.c:1973
+#: src/messageview.c:1948
 msgid "Send receipt"
 msgstr "Odeslat potvrzení"
 
-#: src/messageview.c:2016
+#: src/messageview.c:1991
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -7777,7 +7788,7 @@ msgstr ""
 "Tato zpráva byla částečně stažena\n"
 "a byla odstraněna ze serveru."
 
-#: src/messageview.c:2022
+#: src/messageview.c:1997
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7786,15 +7797,15 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s."
 
-#: src/messageview.c:2026 src/messageview.c:2048
+#: src/messageview.c:2001 src/messageview.c:2023
 msgid "Mark for download"
 msgstr "Označit ke stažení"
 
-#: src/messageview.c:2027 src/messageview.c:2039
+#: src/messageview.c:2002 src/messageview.c:2014
 msgid "Mark for deletion"
 msgstr "Označit k odstranění"
 
-#: src/messageview.c:2032
+#: src/messageview.c:2007
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7803,12 +7814,12 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s a bude stažena úplně."
 
-#: src/messageview.c:2037 src/messageview.c:2050
+#: src/messageview.c:2012 src/messageview.c:2025
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Odoznačit"
 
-#: src/messageview.c:2043
+#: src/messageview.c:2018
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7817,32 +7828,33 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s a bude odstraněna."
 
-#: src/messageview.c:2116
+#: src/messageview.c:2091
 msgid "Return Receipt Notification"
 msgstr "Oznámení o doručení"
 
-#: src/messageview.c:2117
+#: src/messageview.c:2092
 msgid ""
-"The message was sent to several of your accounts.\n"
-"Please choose which account do you want to use for sending the receipt "
+"More than one of your accounts uses the address that this message was sent "
+"to.\n"
+"Please choose which account you want to use for sending the receipt "
 "notification:"
 msgstr ""
 "Tato zpráva byla doručena do více vašich účtů.\n"
 "Vyberte si prosím účet, ze kterého bude odesláno potvrzení o doručení:"
 
-#: src/messageview.c:2121 src/plugins/rssyl/rssyl_gtk.c:480
+#: src/messageview.c:2096 src/plugins/rssyl/rssyl_gtk.c:480
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/messageview.c:2121
+#: src/messageview.c:2096
 msgid "_Send Notification"
 msgstr "_Odeslat oznámení"
 
-#: src/messageview.c:2188
+#: src/messageview.c:2163
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Nemohu tisknout: zpráva neobsahuje text."
 
-#: src/messageview.c:2957
+#: src/messageview.c:2932
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -7850,7 +7862,7 @@ msgstr ""
 "\n"
 "  Ve složce nejsou žádné zprávy"
 
-#: src/messageview.c:2965
+#: src/messageview.c:2940
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -7858,16 +7870,16 @@ msgstr ""
 "\n"
 "  Zpráva smazána"
 
-#: src/messageview.c:2966
+#: src/messageview.c:2941
 msgid ""
 "\n"
-"  Message has been moved to trash"
+"  Message has been deleted or moved to another folder"
 msgstr ""
 "\n"
-"  Zpráva přesunuta do koše"
+"  Zpráva byla smazána nebo přesunuta do jiné složky"
 
-#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4185
-#: src/summaryview.c:6982
+#: src/messageview.c:2974 src/messageview.c:2980 src/summaryview.c:4183
+#: src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "Během učení došlo k chybě.\n"
 
@@ -7888,10 +7900,10 @@ msgstr "Odstraňuji zprávy..."
 msgid "Remove _mailbox..."
 msgstr "Odstranit _mailbox..."
 
-#: src/mh_gtk.c:358
+#: src/mh_gtk.c:358 src/plugins/mailmbox/plugin_gtk.c:290
 #, c-format
 msgid ""
-"Really remove the mailbox '%s' ?\n"
+"Really remove the mailbox '%s'?\n"
 "(The messages are NOT deleted from the disk)"
 msgstr ""
 "Opravdu odstranit mailbox '%s' ?\n"
@@ -7901,91 +7913,100 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Odstranit mailbox"
 
-#: src/mimeview.c:202
+#: src/mimeview.c:193
 msgid "_Open"
 msgstr "_Otevřít"
 
-#: src/mimeview.c:204
+#: src/mimeview.c:195
 msgid "Open _with..."
 msgstr "Otevřít čím..."
 
-#: src/mimeview.c:206
+#: src/mimeview.c:197
 msgid "Send to..."
 msgstr "Odeslat ..."
 
-#: src/mimeview.c:207
+#: src/mimeview.c:198
 msgid "_Display as text"
 msgstr "Zobrazit jako text"
 
-#: src/mimeview.c:208
+#: src/mimeview.c:199
 msgid "_Save as..."
 msgstr "Uložit j_ako..."
 
-#: src/mimeview.c:209
+#: src/mimeview.c:200
 msgid "Save _all..."
 msgstr "Uložit _vše..."
 
-#: src/mimeview.c:282
+#: src/mimeview.c:273
 msgid "MIME Type"
 msgstr "MIME Typ"
 
-#: src/mimeview.c:1033 src/mimeview.c:1038 src/mimeview.c:1043
-#: src/mimeview.c:1048
+#: src/mimeview.c:1035 src/mimeview.c:1040 src/mimeview.c:1045
+#: src/mimeview.c:1050
 msgid "View full information"
 msgstr "Zobrazit úplnou informaci"
 
-#: src/mimeview.c:1054
+#: src/mimeview.c:1056
 msgid "Check again"
 msgstr "Zkontrolovat znovu"
 
-#: src/mimeview.c:1064
-msgid "Click the icon or hit 'C' to check it."
-msgstr "Stiskněte ikonu nebo 'C' pro zkontrolování."
+#: src/mimeview.c:1068
+#, c-format
+msgid "%s Click the icon to check it."
+msgstr "Stiskněte ikonu %s pro zkontrolování."
 
-#: src/mimeview.c:1069
-msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
+#: src/mimeview.c:1070
+#, c-format
+msgid "%s Click the icon or hit '%s' to check it."
+msgstr "Stiskněte ikonu %s nebo '%s' pro zkontrolování."
+
+#: src/mimeview.c:1080
+msgid "Timeout checking the signature. Click the icon to try again."
+msgstr ""
+"Vypršel časový limit pro kontrolu podpisu. Stiskněte ikonu pro nový pokus."
+
+#: src/mimeview.c:1082
+#, c-format
+msgid ""
+"Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
-"Vypršel časový limit pro kontrolu podpisu. Stiskněte ikonu nebo 'C' pro nový "
-"pokus."
+"Vypršel časový limit pro kontrolu podpisu. Stiskněte ikonu nebo '%s' pro "
+"nový pokus."
 
-#: src/mimeview.c:1307
+#: src/mimeview.c:1322
 msgid "Checking signature..."
 msgstr "Kontroluji podpis..."
 
-#: src/mimeview.c:1350
+#: src/mimeview.c:1363
 msgid "Go back to email"
 msgstr "Zpět na zprávu"
 
-#: src/mimeview.c:1746 src/mimeview.c:1835 src/mimeview.c:2027
-#: src/mimeview.c:2070 src/mimeview.c:2201
-#: src/plugins/fancy/fancy_viewer.c:461
+#: src/mimeview.c:1763 src/mimeview.c:1852 src/mimeview.c:2044
+#: src/mimeview.c:2080 src/mimeview.c:2192
+#: src/plugins/fancy/fancy_viewer.c:421
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nepodařilo se uložit tuto část zprávy: %s"
 
-#: src/mimeview.c:1824 src/textview.c:3118
+#: src/mimeview.c:1841 src/textview.c:3118
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Přepsat existující soubor '%s'?"
 
-#: src/mimeview.c:1866 src/plugins/archive/archiver_prefs.c:128
+#: src/mimeview.c:1883 src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
 msgstr "Vybrat cílovou složku"
 
-#: src/mimeview.c:1873 src/plugins/archive/archiver_prefs.c:134
+#: src/mimeview.c:1890 src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' není adresář."
 
-#: src/mimeview.c:2102
-msgid "No registered viewer for this file type."
-msgstr "Prohlížeč pro tento typ souboru není registrován."
-
-#: src/mimeview.c:2134 src/mimeview.c:2141 src/textview.c:3039
+#: src/mimeview.c:2127 src/mimeview.c:2134 src/textview.c:3039
 msgid "Open with"
 msgstr "Otevřít čím"
 
-#: src/mimeview.c:2135 src/mimeview.c:2142 src/textview.c:3040
+#: src/mimeview.c:2128 src/mimeview.c:2135 src/textview.c:3040
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -7994,11 +8015,11 @@ msgstr ""
 "Vložte příkazovou řádku pro otevření souboru:\n"
 "('%s' bude nahrazeno jménem souboru)"
 
-#: src/mimeview.c:2235
+#: src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "Spustit nedůvěryhodný binární soubor?"
 
-#: src/mimeview.c:2236
+#: src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8010,98 +8031,98 @@ msgstr ""
 "\n"
 "Chcete ho spustit?"
 
-#: src/mimeview.c:2240
+#: src/mimeview.c:2231
 msgid "Run binary"
 msgstr "Spustit binární soubor"
 
-#: src/mimeview.c:2542
+#: src/mimeview.c:2533
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/mimeview.c:2543 src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/mimeview.c:2534 src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Size:"
 msgstr "Velikost:"
 
-#: src/mimeview.c:2555 src/plugins/vcalendar/vcalendar.c:1271
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1730
+#: src/mimeview.c:2546 src/plugins/vcalendar/vcalendar.c:1271
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1741
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1751
 msgid "Description:"
 msgstr "Popis:"
 
-#: src/news.c:300
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "NNTP spojení %s:%d bylo odpojeno.\n"
 
-#: src/news.c:333
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Účet '%s': Připojuji se na NNTP server: %s:%d...\n"
 
-#: src/news.c:354
+#: src/news.c:356
 #, c-format
-msgid "Error logging in to %s:%d ...\n"
+msgid "Error logging in to %s:%d...\n"
 msgstr "Chyba logování na %s:%d ...\n"
 
-#: src/news.c:432
+#: src/news.c:438
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan nepodporuje návratový kód 480, takže nyní je vybráno pokračovat\n"
 
-#: src/news.c:441
+#: src/news.c:447
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Režim čtení selhal, přesto pokračuji\n"
 
-#: src/news.c:445
+#: src/news.c:451
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Chyba při vytvoření sezení s %s:%d\n"
 
-#: src/news.c:459
+#: src/news.c:466
 #, c-format
-msgid "Error authenticating to %s:%d ...\n"
+msgid "Error authenticating to %s:%d...\n"
 msgstr "Chyba autentizace pro %s:%d ...\n"
 
-#: src/news.c:484
+#: src/news.c:491
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "Claws Mail potřebuje přístup k síti, aby mohl přistupovat k serveru "
 "diskusních skupin."
 
-#: src/news.c:853
+#: src/news.c:862
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "nemohu vybrat skupinu: %s\n"
 
-#: src/news.c:1042 src/news.c:1212
+#: src/news.c:1051 src/news.c:1221
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "nemohu nastavit skupinu: %s\n"
 
-#: src/news.c:1051
+#: src/news.c:1060
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatný rozsah příspěvků: %d - %d\n"
 
-#: src/news.c:1121 src/news.c:1145 src/news.c:1169
+#: src/news.c:1130 src/news.c:1154 src/news.c:1178
 msgid "couldn't get xhdr\n"
 msgstr "nelze získat xhdr\n"
 
-#: src/news.c:1205
+#: src/news.c:1214
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "získávám xover %d - %d v %s...\n"
 
-#: src/news.c:1220
+#: src/news.c:1229
 msgid "couldn't get xover\n"
 msgstr "nelze získat xover\n"
 
-#: src/news.c:1235
+#: src/news.c:1244
 msgid "invalid xover line\n"
 msgstr "neplatná xover řádka\n"
 
-#: src/news.c:1450
+#: src/news.c:1459
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -8257,7 +8278,8 @@ msgstr "Archivování mailů"
 msgid "Create Archive..."
 msgstr "Vytvořit archiv..."
 
-#: src/plugins/archive/archiver.c:113
+#: src/plugins/archive/archiver.c:126
+#, c-format
 msgid ""
 "This plugin adds archiving features to Claws Mail.\n"
 "\n"
@@ -8273,10 +8295,7 @@ msgid ""
 "\tCPIO\n"
 "\n"
 "The archive can be compressed using:\n"
-"\tGZIP/ZIP\n"
-"\tBZIP2\n"
-"\tCOMPRESS\n"
-"\n"
+"%s\n"
 "The archives can be restored with any standard tool that supports the chosen "
 "format and compression.\n"
 "\n"
@@ -8300,10 +8319,7 @@ msgstr ""
 "\tCPIO\n"
 "\n"
 "Archiv může být komprimován:\n"
-"\tGZIP/ZIP\n"
-"\tBZIP2\n"
-"\tCOMPRESS\n"
-"\n"
+"%s\n"
 "Archivy můžou být obnoveny nástroji podporující formát a kompresi.\n"
 "\n"
 "Podporováné typy složek MH, IMAP, RSSyl a vCalendar.\n"
@@ -8312,7 +8328,7 @@ msgstr ""
 "\n"
 "Nastavení v /Nastavení/Volby/Zásuvné moduly/Archivování mailů"
 
-#: src/plugins/archive/archiver.c:145
+#: src/plugins/archive/archiver.c:156
 msgid "Archiver"
 msgstr "Archivování"
 
@@ -8498,7 +8514,7 @@ msgstr "Umístění a jméno archivu"
 
 #: src/plugins/archive/archiver_gtk.c:1045
 #: src/plugins/archive/archiver_prefs.c:198
-#: src/plugins/pgpcore/select-keys.c:424
+#: src/plugins/pgpcore/select-keys.c:420
 msgid "_Select"
 msgstr "_Vybrat"
 
@@ -8719,7 +8735,7 @@ msgstr "Zničit přílohy"
 
 #: src/plugins/att_remover/att_remover.c:418
 msgid ""
-"Do you really want to remove all attachments from the selected messages ?\n"
+"Do you really want to remove all attachments from the selected messages?\n"
 "\n"
 "The deleted data will be unrecoverable."
 msgstr ""
@@ -8735,12 +8751,12 @@ msgstr "Tyto zprávy nemají žádné přílohy."
 msgid "Remove attachments..."
 msgstr "Odebrat přílohy..."
 
-#: src/plugins/att_remover/att_remover.c:507
-#: src/plugins/att_remover/att_remover.c:574
+#: src/plugins/att_remover/att_remover.c:506
+#: src/plugins/att_remover/att_remover.c:566
 msgid "AttRemover"
 msgstr "AttRemover"
 
-#: src/plugins/att_remover/att_remover.c:579
+#: src/plugins/att_remover/att_remover.c:571
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -8752,11 +8768,11 @@ msgstr ""
 "Varování: operace bude nezrušitelná a smazané přílohy bude ztraceny navždy "
 "opravdu navždy."
 
-#: src/plugins/att_remover/att_remover.c:603
+#: src/plugins/att_remover/att_remover.c:595
 msgid "Attachment handling"
 msgstr "Zpracování přílohy"
 
-#: src/plugins/attachwarner/attachwarner.c:309
+#: src/plugins/attachwarner/attachwarner.c:216
 #, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
@@ -8771,22 +8787,22 @@ msgstr ""
 "\n"
 "%s it anyway?"
 
-#: src/plugins/attachwarner/attachwarner.c:313
+#: src/plugins/attachwarner/attachwarner.c:220
 msgid "Attachment warning"
 msgstr "Příloha - upozornění"
 
-#: src/plugins/attachwarner/attachwarner.c:338
-#: src/plugins/attachwarner/attachwarner.c:375
-#: src/plugins/attachwarner/attachwarner.c:427
+#: src/plugins/attachwarner/attachwarner.c:245
+#: src/plugins/attachwarner/attachwarner.c:282
+#: src/plugins/attachwarner/attachwarner.c:334
 msgid "Attach warner"
 msgstr "Kontrola příloh"
 
-#: src/plugins/attachwarner/attachwarner.c:345
-#: src/plugins/address_keeper/address_keeper.c:221
+#: src/plugins/attachwarner/attachwarner.c:252
+#: src/plugins/address_keeper/address_keeper.c:254
 msgid "Failed to register check before send hook"
 msgstr "Nepodařilo se zaregistrovat kontrolu do operace odesílání zprávy."
 
-#: src/plugins/attachwarner/attachwarner.c:385
+#: src/plugins/attachwarner/attachwarner.c:292
 msgid ""
 "Warns user if some reference to attachments is found in the message text and "
 "no file is attached."
@@ -8794,42 +8810,52 @@ msgstr ""
 "Tento zásuvný modul upozorňuje pokud je v textu zprávy zmíněna příloha a "
 "není přiložen žádný soubor."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:53
+#: src/plugins/attachwarner/attachwarner_prefs.c:54
 msgid "attach"
 msgstr "přiložit"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:80
-msgid ""
-"Warn when matching the following regular expressions:\n"
-"(one per line)"
-msgstr ""
-"Upozornit, pokud dojde k nalezení jednoho z těchto regulárních výrazů:\n"
-"(každý výraz na samostatný řádek)"
+#: src/plugins/attachwarner/attachwarner_prefs.c:85
+msgid "One of the following regular expressions is matched (one per line):"
+msgstr "Jeden z regulárních výrazů splněn (každý na samostatném řádku):"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:99
-msgid "Skip quoted lines"
-msgstr "Přeskočit citace"
+#: src/plugins/attachwarner/attachwarner_prefs.c:89
+msgid "Expressions are case sensitive"
+msgstr "Výrazy zohledňují velikost písmen"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:106
-msgid "Exclude quoted lines from checking for the regular expressions above"
-msgstr "Text citací ve zprávě nebude kontrolován."
+#: src/plugins/attachwarner/attachwarner_prefs.c:96
+msgid "Case sensitive when matching for the regular expressions in the list"
+msgstr "Velikost písmen při shodě s regulárními výrazy v seznamu"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:109
-msgid "Skip forwards and redirections"
-msgstr "Nekontrolovat předávané a přesměrovávané zprávy"
+#: src/plugins/attachwarner/attachwarner_prefs.c:114
+msgid "Lines starting with quotation marks"
+msgstr "Řádky začínající uvozovkami"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:116
+#: src/plugins/attachwarner/attachwarner_prefs.c:121
+msgid ""
+"Exclude quoted lines from checking for the regular expressions above. Note "
+"that handmade quotes cannot be distinguished from quotes generated by "
+"replying."
+msgstr ""
+"Vyjmout citované řádky z regulárního výrazu výše. Ručně vložené uvozovky "
+"nemohou být rozlišeny od generovaných odpovědí."
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:124
+msgid "Forwarded or redirected messages"
+msgstr "Přeposlané nebo přesměrované zprávy"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:131
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr ""
 "Text zpráv, které předáváte (forward) nebo přesměrováváte (redirect) nebude "
 "kontrolován."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:119
-msgid "Skip signature"
-msgstr "Přeskočit podpis"
+#: src/plugins/attachwarner/attachwarner_prefs.c:134
+#: src/prefs_msg_colors.c:362
+msgid "Signatures"
+msgstr "Podpisy"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:126
+#: src/plugins/attachwarner/attachwarner_prefs.c:141
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
@@ -8837,56 +8863,76 @@ msgstr ""
 "Vyjmout řádky od prvního oddělovače podpisu dopředu z kontroly regulárních "
 "výrazů výše"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:202
+#: src/plugins/attachwarner/attachwarner_prefs.c:147
+msgid "Warn when"
+msgstr "Varovat při"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:151
+msgid "Excluding"
+msgstr "Vyloučení"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:229
 msgid "Attach Warner"
 msgstr "Kontrola příloh"
 
-#: src/plugins/address_keeper/address_keeper.c:261
+#: src/plugins/address_keeper/address_keeper.c:294
 msgid "Keeps all recipient addresses in an addressbook folder."
 msgstr "Udržuje všechny adresy příjemců v knize adres."
 
-#: src/plugins/address_keeper/address_keeper.c:302
+#: src/plugins/address_keeper/address_keeper.c:335
 #: src/plugins/address_keeper/address_keeper.h:34
-#: src/plugins/address_keeper/address_keeper_prefs.c:209
+#: src/plugins/address_keeper/address_keeper_prefs.c:249
 msgid "Address Keeper"
 msgstr "Údržbář adresář"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:97
+#: src/plugins/address_keeper/address_keeper_prefs.c:104
 msgid "Keep to folder"
 msgstr "Uchovat do složky"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:105
+#: src/plugins/address_keeper/address_keeper_prefs.c:112
 msgid "Address book path where addresses are kept"
 msgstr "Cesta knihy adres kde jsou adresy uloženy"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:107
+#: src/plugins/address_keeper/address_keeper_prefs.c:114
+#: src/plugins/bogofilter/bogofilter_gtk.c:234
+#: src/plugins/bsfilter/bsfilter_gtk.c:201
+#: src/plugins/spamassassin/spamassassin_gtk.c:447
+#: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
+#: src/prefs_matcher.c:676
 msgid "Select..."
 msgstr "Vybírám..."
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:123
+#: src/plugins/address_keeper/address_keeper_prefs.c:130
 msgid "Keep 'To' addresses"
 msgstr "Uchová 'To' adresy"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:128
+#: src/plugins/address_keeper/address_keeper_prefs.c:135
 msgid "Keep addresses which appear in 'To' headers"
 msgstr "Uchová adresy, které jsou v 'To' hlavičce"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:133
+#: src/plugins/address_keeper/address_keeper_prefs.c:140
 msgid "Keep 'Cc' addresses"
 msgstr "Uchová 'Cc' adresy"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:138
+#: src/plugins/address_keeper/address_keeper_prefs.c:145
 msgid "Keep addresses which appear in 'Cc' headers"
 msgstr "Uchová adresy, které jsou v 'Cc' hlavičce"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:143
+#: src/plugins/address_keeper/address_keeper_prefs.c:150
 msgid "Keep 'Bcc' addresses"
 msgstr "Uchová 'Bcc' adresy"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:148
+#: src/plugins/address_keeper/address_keeper_prefs.c:155
 msgid "Keep addresses which appear in 'Bcc' headers"
 msgstr "Uchová adresy, které jsou v 'Bcc' hlavičce"
 
+#: src/plugins/address_keeper/address_keeper_prefs.c:160
+msgid ""
+"Exclude addresses matching the following regular expressions (one per line):"
+msgstr ""
+"Vyloučit adresy odpovídající jednomu z těchto regulárních výrazů:\n"
+"(každý výraz na samostatný řádek)"
+
 #: src/plugins/bogofilter/bogofilter.c:81
 #: src/plugins/bogofilter/bogofilter_gtk.c:458
 msgid "Bogofilter"
@@ -8972,13 +9018,13 @@ msgstr ""
 "Nastavení v /Nastavení/Volby/Zásuvné moduly/Bogofilter"
 
 #: src/plugins/bogofilter/bogofilter.c:1035
-#: src/plugins/bsfilter/bsfilter.c:670
+#: src/plugins/bsfilter/bsfilter.c:674
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Rozpoznávání spamu"
 
 #: src/plugins/bogofilter/bogofilter.c:1036
-#: src/plugins/bsfilter/bsfilter.c:671
+#: src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Učení se rozpoznávat spam"
@@ -9003,7 +9049,7 @@ msgstr "Zprávy větší než tato velikost nebudou kontrolovány"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:170
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1479
+#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1483
 msgid "KB"
 msgstr "KB"
 
@@ -9070,14 +9116,6 @@ msgstr ""
 "Zprávy přicházející od kontaktů z knihy adres budou doručeny do normálních "
 "složek, i když byly detekovány jako spam"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:234
-#: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:447
-#: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
-#: src/prefs_matcher.c:676
-msgid "Select ..."
-msgstr "Vybrat ..."
-
 #: src/plugins/bogofilter/bogofilter_gtk.c:238
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
 #: src/plugins/spamassassin/spamassassin_gtk.c:451
@@ -9162,7 +9200,7 @@ msgstr "Bsfilter nemůže filtrovat zprávy. Příkaz `%s` nemohl být spuštěn
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: učení ze zprávy..."
 
-#: src/plugins/bsfilter/bsfilter.c:637
+#: src/plugins/bsfilter/bsfilter.c:641
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -9189,12 +9227,12 @@ msgstr ""
 "\n"
 "Volby jsou dostupné v /Nastavení/Volby/Zásuvné moduly/Bsfilter"
 
-#: src/plugins/clamd/clamav_plugin.c:45
+#: src/plugins/clamd/clamav_plugin.c:47
 #: src/plugins/clamd/clamav_plugin_gtk.c:550
 msgid "Clam AntiVirus"
 msgstr "Clam AntiVirus"
 
-#: src/plugins/clamd/clamav_plugin.c:103
+#: src/plugins/clamd/clamav_plugin.c:106
 msgid ""
 "Scanning\n"
 "No socket information.\n"
@@ -9204,7 +9242,7 @@ msgstr ""
 "Žádná informace o soketu.\n"
 "Antivirus zakázán."
 
-#: src/plugins/clamd/clamav_plugin.c:107
+#: src/plugins/clamd/clamav_plugin.c:110
 msgid ""
 "Scanning\n"
 "Clamd does not respond to ping.\n"
@@ -9214,12 +9252,12 @@ msgstr ""
 "Clamd neodpovídá na ping.\n"
 "Běží clamd?"
 
-#: src/plugins/clamd/clamav_plugin.c:111
+#: src/plugins/clamd/clamav_plugin.c:113
 #, c-format
 msgid "Detected %s virus."
 msgstr "Nalezen %s vir."
 
-#: src/plugins/clamd/clamav_plugin.c:115
+#: src/plugins/clamd/clamav_plugin.c:127
 #, c-format
 msgid ""
 "Scanning error:\n"
@@ -9228,15 +9266,15 @@ msgstr ""
 "Chyba skenování:\n"
 "%s"
 
-#: src/plugins/clamd/clamav_plugin.c:149
+#: src/plugins/clamd/clamav_plugin.c:161
 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: skenuji zprávu..."
 
-#: src/plugins/clamd/clamav_plugin.c:250
+#: src/plugins/clamd/clamav_plugin.c:262
 msgid "Failed to register mail filtering hook"
 msgstr "Selhala registrace filtrování mailu"
 
-#: src/plugins/clamd/clamav_plugin.c:267
+#: src/plugins/clamd/clamav_plugin.c:279
 msgid ""
 "Init\n"
 "No socket information.\n"
@@ -9246,7 +9284,7 @@ msgstr ""
 "Žádná informace o soketu.\n"
 "Antivirus zakázán."
 
-#: src/plugins/clamd/clamav_plugin.c:271
+#: src/plugins/clamd/clamav_plugin.c:283
 msgid ""
 "Init\n"
 "Clamd does not respond to ping.\n"
@@ -9256,7 +9294,7 @@ msgstr ""
 "Clamd neodpovídá na ping.\n"
 "Běží clamd?"
 
-#: src/plugins/clamd/clamav_plugin.c:302
+#: src/plugins/clamd/clamav_plugin.c:314
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
@@ -9294,7 +9332,7 @@ msgstr ""
 "\n"
 "Volby jsou v /Nastavení/Volby/Zásuvné moduly/Clam AntiVirus"
 
-#: src/plugins/clamd/clamav_plugin.c:341
+#: src/plugins/clamd/clamav_plugin.c:353
 msgid "Virus detection"
 msgstr "Detekce virů"
 
@@ -9466,130 +9504,98 @@ msgstr ""
 "\n"
 "Modul je zcela neužitečný"
 
-#: src/plugins/fancy/fancy_viewer.c:188
-#, c-format
-msgid ""
-"Printing failed:\n"
-" %s"
-msgstr ""
-"Tisk selhal:\n"
-" %s"
-
-#: src/plugins/fancy/fancy_viewer.c:216
-msgid "Printing HTML is only possible if the program 'html2ps' is installed."
-msgstr "Tisk HTML je možný jen s nainstalovaným programem 'html2ps'"
-
-#: src/plugins/fancy/fancy_viewer.c:221
-msgid "Filename is null."
-msgstr "Jméno souboru je prázdné"
-
-#: src/plugins/fancy/fancy_viewer.c:237
-msgid "Conversion to postscript failed."
-msgstr "Konverze do postscript selhala."
-
-#: src/plugins/fancy/fancy_viewer.c:244 src/toolbar.c:209 src/toolbar.c:419
-msgid "Print"
-msgstr "Tisk"
-
-#: src/plugins/fancy/fancy_viewer.c:267
-#, c-format
-msgid "Printer %s doesn't accept PostScript files."
-msgstr "Tiskárna %s neakceptuje PostScript soubory."
+#: src/plugins/fancy/fancy_viewer.c:392
+msgid "Remote content loading is disabled."
+msgstr "Načítání vzdáleného obsahu je zakázáno."
 
-#: src/plugins/fancy/fancy_viewer.c:281
-#, c-format
-msgid ""
-"Printing failed:\n"
-"%s"
-msgstr ""
-"Tisk selhal:\n"
-"%s"
-
-#: src/plugins/fancy/fancy_viewer.c:419
-#, c-format
-msgid "Navigation to %s blocked"
-msgstr "Navigace k %s blokována"
-
-#: src/plugins/fancy/fancy_viewer.c:583
+#: src/plugins/fancy/fancy_viewer.c:469
 msgid "Load images"
 msgstr "Načíst obrázky"
 
-#: src/plugins/fancy/fancy_viewer.c:587
-msgid "Unblock external content"
+#: src/plugins/fancy/fancy_viewer.c:471
+msgid "Enable remote content"
 msgstr "Odblokovat externí obsah"
 
-#: src/plugins/fancy/fancy_viewer.c:591 src/plugins/fancy/fancy_prefs.c:194
+#: src/plugins/fancy/fancy_viewer.c:473
 msgid "Enable Javascript"
 msgstr "Povolit Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:595 src/plugins/fancy/fancy_prefs.c:200
+#: src/plugins/fancy/fancy_viewer.c:475
 msgid "Enable Plugins"
 msgstr "Povolit zásuvné moduly"
 
-#: src/plugins/fancy/fancy_viewer.c:598 src/plugins/fancy/fancy_prefs.c:205
+#: src/plugins/fancy/fancy_viewer.c:477
 msgid "Enable Java"
 msgstr "Povolit Javu"
 
-#: src/plugins/fancy/fancy_viewer.c:601 src/plugins/fancy/fancy_prefs.c:210
+#: src/plugins/fancy/fancy_viewer.c:479
 msgid "Open links with external browser"
 msgstr "Otevřít odkazy v externím prohlížeči"
 
-#: src/plugins/fancy/fancy_viewer.c:768
+#: src/plugins/fancy/fancy_viewer.c:648
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Nastala chyba: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:819
+#: src/plugins/fancy/fancy_viewer.c:704
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s je poškozený nebo není podporovaný kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:830
+#: src/plugins/fancy/fancy_viewer.c:715
 msgid "Search the Web"
 msgstr "Prohledat web"
 
-#: src/plugins/fancy/fancy_viewer.c:846
+#: src/plugins/fancy/fancy_viewer.c:727
+msgid "Open in Viewer"
+msgstr "Otevřít v prohlížeči"
+
+#: src/plugins/fancy/fancy_viewer.c:729
+msgid "Open in Viewer (enable remote content)"
+msgstr "Otevřít v prohlížeči (povolit vzdálený obsah)"
+
+#: src/plugins/fancy/fancy_viewer.c:738
 msgid "Open in Browser"
 msgstr "Otevřít v prohlížeči"
 
-#: src/plugins/fancy/fancy_viewer.c:856
+#: src/plugins/fancy/fancy_viewer.c:748
 msgid "Open Image"
 msgstr "Otevřít obrázek"
 
-#: src/plugins/fancy/fancy_viewer.c:865
+#: src/plugins/fancy/fancy_viewer.c:757
 msgid "Copy Link"
 msgstr "Kopírovat odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:871
+#: src/plugins/fancy/fancy_viewer.c:761
 msgid "Download Link"
 msgstr "Stáhnout odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:893
+#: src/plugins/fancy/fancy_viewer.c:772
 msgid "Save Image As"
 msgstr "Uložit obrázek jako"
 
-#: src/plugins/fancy/fancy_viewer.c:914
+#: src/plugins/fancy/fancy_viewer.c:782
 msgid "Copy Image"
 msgstr "Kopírovat obrázek"
 
-#: src/plugins/fancy/fancy_viewer.c:933
+#: src/plugins/fancy/fancy_viewer.c:800
 msgid "Import feed"
 msgstr "Načíst kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:1162
+#: src/plugins/fancy/fancy_viewer.c:1013
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1187
+#: src/plugins/fancy/fancy_viewer.c:1038
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML prohlížeč"
 
-#: src/plugins/fancy/fancy_viewer.c:1192
+#: src/plugins/fancy/fancy_viewer.c:1043
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
-"By default all remote content is blocked and images are not automatically "
-"loaded. Options can be found in /Configuration/Preferences/Plugins/Fancy"
+"By default all remote content is blocked. Options can be found in /"
+"Configuration/Preferences/Plugins/Fancy"
 msgstr ""
 "Tento zásuvný modul interpretuje HTML zprávy pomocí knihovny WebKit %d.%d."
 "%d.\n"
@@ -9597,21 +9603,87 @@ msgstr ""
 "automaticky načteny. Nastavení naleznete v / Nastavení / Předvolby / Zásuvné "
 "moduly / Fancy"
 
+#: src/plugins/fancy/fancy_prefs.c:141
+msgid "Display images"
+msgstr "Zobrazovat obrázky"
+
+#: src/plugins/fancy/fancy_prefs.c:142
+msgid "Display embedded images"
+msgstr "Zobrazovat vložené obrázky"
+
+#: src/plugins/fancy/fancy_prefs.c:146
+msgid "Execute javascript"
+msgstr "Povolit Javascript"
+
+#: src/plugins/fancy/fancy_prefs.c:147
+msgid "Execute embedded javascript"
+msgstr "Spouštět vložený javascript"
+
+#: src/plugins/fancy/fancy_prefs.c:151
+msgid "Execute Java applets"
+msgstr "Spouštět Java applety"
+
+#: src/plugins/fancy/fancy_prefs.c:152
+msgid "Execute embedded Java applets"
+msgstr "Spouštět vložené Java applety"
+
 #: src/plugins/fancy/fancy_prefs.c:156
-msgid "Proxy Setting"
-msgstr "Nastavení proxy"
+msgid "Render objects using plugins"
+msgstr "Renderovat objekty pomocí zásuvných modulů"
+
+#: src/plugins/fancy/fancy_prefs.c:157
+msgid "Render embedded objects using plugins"
+msgstr "Renderovat vložené objekty pomocí zásuvných modulů"
+
+#: src/plugins/fancy/fancy_prefs.c:164
+msgid "Open in viewer (remote content is enabled)"
+msgstr "Otevřít v prohlížeči (vzdálený obsah je povolen)"
+
+#: src/plugins/fancy/fancy_prefs.c:167
+msgid "Do nothing (remote content is disabled)"
+msgstr "Nedělat nic (vzdálený obsah je zakázán)"
 
-#: src/plugins/fancy/fancy_prefs.c:172
-msgid "Use GNOME proxy setting"
+#: src/plugins/fancy/fancy_prefs.c:200
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/plugins/fancy/fancy_prefs.c:202
+msgid "Use GNOME's proxy settings"
 msgstr "Použít nastavení GNOME proxy"
 
-#: src/plugins/fancy/fancy_prefs.c:182
-msgid "Auto-Load images"
-msgstr "Automaticky načíst obrázky"
+#: src/plugins/fancy/fancy_prefs.c:212
+msgid "Use proxy:"
+msgstr "Použít proxy:"
+
+#: src/plugins/fancy/fancy_prefs.c:226
+msgid "Remote resources"
+msgstr "Vzdálené zdroje"
+
+#: src/plugins/fancy/fancy_prefs.c:227
+msgid ""
+"Loading remote resources can lead to some privacy issues.\n"
+"When remote content loading is disabled, nothing will be requested\n"
+"from the network. Rendering of images, scripts, plugin objects or\n"
+"Java applets can still be enabled for content that is attached\n"
+"in the email."
+msgstr ""
+"Načítání vzdáleného obsahu může přinést problémy s bezpečností.\n"
+"Když je načítání vzdáleného obsahu zakázáno, nic nebude požadováno\n"
+"ze sítě. Renderování obrázků, skriptů, zásuvných modulů nebo\n"
+"Java appletů můžou být povoleno, pokud jsou přiloženy\n"
+"v emailu."
+
+#: src/plugins/fancy/fancy_prefs.c:233
+msgid "Enable loading of remote content"
+msgstr "Povolit načtení vzdáleného obsahu"
+
+#: src/plugins/fancy/fancy_prefs.c:265
+msgid "When clicking on a link, by default:"
+msgstr "Při kliknutí na odkaz:"
 
-#: src/plugins/fancy/fancy_prefs.c:188
-msgid "Block external content"
-msgstr "Blokovat externí obsah"
+#: src/plugins/fancy/fancy_prefs.c:273
+msgid "Open in external browser"
+msgstr "Otevřít v externím prohlížeči"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:151
 msgid "failed to write Fetchinfo configuration to file\n"
@@ -9721,7 +9793,7 @@ msgstr "Zásuvný modul GData: Autentizován\n"
 msgid "GData plugin: Starting async authentication\n"
 msgstr "Zásuvný modul GData: Spuštěna asynchronní autentizace\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:78 src/prefs_account.c:1716
+#: src/plugins/gdata/cm_gdata_prefs.c:78 src/prefs_account.c:1720
 msgid "Authentication"
 msgstr "Autentizace"
 
@@ -9731,7 +9803,7 @@ msgid "Username:"
 msgstr "Uživatelské jméno:"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:91
-#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1601
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1413
 msgid "Password:"
 msgstr "Heslo:"
 
@@ -9812,92 +9884,46 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/plugins/mailmbox/plugin_gtk.c:196
-#, c-format
-msgid "The mailbox `%s' already exists."
-msgstr "Mailbox `%s' již existuje."
-
-#: src/plugins/mailmbox/plugin_gtk.c:261 src/plugins/mailmbox/plugin_gtk.c:428
-#, c-format
-msgid "The folder `%s' already exists."
-msgstr "Složka `%s' už existuje."
-
-#: src/plugins/mailmbox/plugin_gtk.c:268
-#, c-format
-msgid "Can't create the folder `%s'."
-msgstr "Nemohu vytvořit složku `%s'."
-
-#: src/plugins/mailmbox/plugin_gtk.c:290
+#: src/plugins/mailmbox/plugin_gtk.c:322
 #, c-format
 msgid ""
-"Really remove the mailbox `%s' ?\n"
-"(The messages are NOT deleted from the disk)"
-msgstr ""
-"Opravdu odstranit mailbox `%s' ?\n"
-"(Zprávy NEBUDOU odstraněny z disku)"
-
-#: src/plugins/mailmbox/plugin_gtk.c:323
-#, c-format
-msgid ""
-"All folder(s) and message(s) under `%s' will be deleted.\n"
+"All folder(s) and message(s) under '%s' will be deleted.\n"
 "Do you really want to delete?"
 msgstr ""
 "Všechny složky a zprávy v `%s' budou nenávratně odstraněny\n"
 "Chcete je opravdu odstranit?"
 
-#: src/plugins/mailmbox/plugin_gtk.c:343
-#, c-format
-msgid "Can't remove the folder `%s'."
-msgstr "Nemohu odstranit složku `%s'."
-
-#: src/plugins/mailmbox/plugin_gtk.c:408
-#, c-format
-msgid "Input new name for `%s':"
-msgstr "Zadejte nové jméno pro `%s':"
-
-#: src/plugins/newmail/newmail.c:91
-#, c-format
-msgid "Newmail plugin unloaded\n"
-msgstr "Zásuvný modul Newmail odebrán\n"
-
-#: src/plugins/newmail/newmail.c:98 src/plugins/newmail/newmail.c:137
+#: src/plugins/newmail/newmail.c:111 src/plugins/newmail/newmail.c:162
 msgid "NewMail"
 msgstr "NewMail"
 
-#: src/plugins/newmail/newmail.c:103
+#: src/plugins/newmail/newmail.c:116
 msgid "Failed to register newmail hook"
 msgstr "Nepodařilo se zaregistrovat funkci newmail"
 
-#: src/plugins/newmail/newmail.c:115
-msgid ""
-"Cannot load plugin NewMail\n"
-"$HOME is too long\n"
-msgstr ""
-"Nemohu načíst zásuvný modul NewMail\n"
-"$HOME je příliš dlouhá\n"
-
-#: src/plugins/newmail/newmail.c:130
+#: src/plugins/newmail/newmail.c:137 src/plugins/newmail/newmail.c:140
 #, c-format
-msgid ""
-"Newmail plugin loaded\n"
-"Message header summaries written to %s\n"
-msgstr ""
-"Zásuvný modul Newmail načten\n"
-"Shrnutí hlaviček zpráv zapsáno do %s\n"
+msgid "Could not open log file %s: %s\n"
+msgstr "Nepodařilo se otevřít soubor záznamu %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:142
+#: src/plugins/newmail/newmail.c:154
+#, c-format
 msgid ""
-"This Plugin writes a header summary to a log file for each mail received "
+"This plugin writes a header summary to a log file for each mail received "
 "after sorting.\n"
 "\n"
-"Default is ~/Mail/NewLog"
+"Default is ~/Mail/NewLog\n"
+"\n"
+"Current log is %s"
 msgstr ""
 "Zásuvný modul zapisuje shrnutí hlaviček do souboru záznamu pro každý stažený "
 "mail po třídění.\n"
 "\n"
-"Výchozí je ~/Mail/NewLog"
+"Výchozí je ~/Mail/NewLog\n"
+"\n"
+"Aktuální log je v %s"
 
-#: src/plugins/newmail/newmail.c:165
+#: src/plugins/newmail/newmail.c:188
 msgid "Log file"
 msgstr "Soubor záznamu"
 
@@ -10037,6 +10063,11 @@ msgstr "Zpráva neznámého typu"
 msgid "Unknown message type arrived"
 msgstr "Byla přijata nová zpráva neznámého typu"
 
+#: src/plugins/notification/notification_popup.c:381
+#: src/plugins/notification/notification_trayicon.c:647
+msgid "Present main window"
+msgstr "Otevřít v hlavním okně"
+
 #: src/plugins/notification/notification_popup.c:491
 msgid "Mail message"
 msgstr "Zpráva"
@@ -10100,7 +10131,7 @@ msgid "Popup"
 msgstr "Vyskakovací okno"
 
 #: src/plugins/notification/notification_prefs.c:464 src/prefs_actions.c:263
-#: src/prefs_receive.c:147
+#: src/prefs_receive.c:133
 msgid "Command"
 msgstr "Příkaz"
 
@@ -10170,12 +10201,12 @@ msgid "Show banner"
 msgstr "Zobrazovat proužek"
 
 #: src/plugins/notification/notification_prefs.c:746
-#: src/plugins/pgpcore/select-keys.c:242 src/plugins/pgpcore/sgpgme.c:144
-#: src/prefs_receive.c:197 src/prefs_summaries.c:462
+#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:144
+#: src/prefs_receive.c:183 src/prefs_summaries.c:462
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/plugins/notification/notification_prefs.c:748 src/prefs_receive.c:195
+#: src/plugins/notification/notification_prefs.c:748 src/prefs_receive.c:181
 #: src/prefs_summaries.c:444 src/prefs_summaries.c:463
 msgid "Always"
 msgstr "Vždy"
@@ -10488,82 +10519,82 @@ msgstr "Formát:"
 msgid "Optimized:"
 msgstr "Optimalizováno:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1166
-msgid "PDF Viewer Plugin"
-msgstr "Zásuvný modul prohlížeč PDF"
+#: src/plugins/pdf_viewer/poppler_viewer.c:1181
+msgid "PDF properties"
+msgstr "Vlastnosti PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1268
+#: src/plugins/pdf_viewer/poppler_viewer.c:1279
 msgid "Loading..."
 msgstr "Načítám..."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1327
+#: src/plugins/pdf_viewer/poppler_viewer.c:1338
 #, c-format
 msgid "%s Document"
 msgstr "%s dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1333
+#: src/plugins/pdf_viewer/poppler_viewer.c:1344
 #, c-format
 msgid "of %d"
 msgstr "z %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1710
-#: src/plugins/pdf_viewer/poppler_viewer.c:1932
+#: src/plugins/pdf_viewer/poppler_viewer.c:1721
+#: src/plugins/pdf_viewer/poppler_viewer.c:1943
 msgid "Document Index"
 msgstr "Index dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1900
+#: src/plugins/pdf_viewer/poppler_viewer.c:1911
 msgid "First Page"
 msgstr "První stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1903
+#: src/plugins/pdf_viewer/poppler_viewer.c:1914
 msgid "Previous Page"
 msgstr "Předchozí stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1906
+#: src/plugins/pdf_viewer/poppler_viewer.c:1917
 msgid "Next Page"
 msgstr "Následující stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1909
+#: src/plugins/pdf_viewer/poppler_viewer.c:1920
 msgid "Last Page"
 msgstr "Poslední stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1912
+#: src/plugins/pdf_viewer/poppler_viewer.c:1923
 msgid "Zoom In"
 msgstr "Zvětšit"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1914
+#: src/plugins/pdf_viewer/poppler_viewer.c:1925
 msgid "Zoom Out"
 msgstr "Zmenšit"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1917
+#: src/plugins/pdf_viewer/poppler_viewer.c:1928
 msgid "Fit Page"
 msgstr "Přizpůsobit stránce"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1920
+#: src/plugins/pdf_viewer/poppler_viewer.c:1931
 msgid "Fit Page Width"
 msgstr "Přizpůsobit šířce stránky"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1923
+#: src/plugins/pdf_viewer/poppler_viewer.c:1934
 msgid "Rotate Left"
 msgstr "Otočit vlevo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1926
+#: src/plugins/pdf_viewer/poppler_viewer.c:1937
 msgid "Rotate Right"
 msgstr "Otočit vpravo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1929
+#: src/plugins/pdf_viewer/poppler_viewer.c:1940
 msgid "Document Info"
 msgstr "Informace o dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1934
+#: src/plugins/pdf_viewer/poppler_viewer.c:1945
 msgid "Page Number"
 msgstr "Číslo stránky"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1936
+#: src/plugins/pdf_viewer/poppler_viewer.c:1947
 msgid "Zoom Factor"
 msgstr "Faktor zobrazení"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2041
+#: src/plugins/pdf_viewer/poppler_viewer.c:2052
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -10576,13 +10607,13 @@ msgstr ""
 "\n"
 "Jakákoliv zpětná vazba je vítána: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2047
-#: src/plugins/pdf_viewer/poppler_viewer.c:2055
-#: src/plugins/pdf_viewer/poppler_viewer.c:2075
+#: src/plugins/pdf_viewer/poppler_viewer.c:2058
+#: src/plugins/pdf_viewer/poppler_viewer.c:2066
+#: src/plugins/pdf_viewer/poppler_viewer.c:2086
 msgid "PDF Viewer"
 msgstr "Prohlížeč PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2051
+#: src/plugins/pdf_viewer/poppler_viewer.c:2062
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -10597,43 +10628,72 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/python/python_plugin.c:338
-#: src/plugins/python/python_plugin.c:482
+#: src/plugins/python/python_plugin.c:358
+#: src/plugins/python/python_plugin.c:502
 msgid "Python scripts"
 msgstr "Skripty v Pythonu"
 
-#: src/plugins/python/python_plugin.c:477
+#: src/plugins/python/python_plugin.c:497
 msgid "Show Python console..."
 msgstr "Zobrazit konzoli Pythonu..."
 
-#: src/plugins/python/python_plugin.c:483
+#: src/plugins/python/python_plugin.c:503
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: src/plugins/python/python_plugin.c:485 src/prefs_account.c:2480
-#: src/prefs_account.c:2502 src/prefs_account.c:2761 src/wizard.c:1379
-#: src/wizard.c:1658
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2480
+#: src/prefs_account.c:2502 src/prefs_account.c:2761 src/wizard.c:1191
+#: src/wizard.c:1465
 msgid "Browse"
 msgstr "Procházet"
 
-#: src/plugins/python/python_plugin.c:548
-#: src/plugins/python/python_plugin.c:602
+#: src/plugins/python/python_plugin.c:646
+#: src/plugins/python/python_plugin.c:725
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:554
+#: src/plugins/python/python_plugin.c:652
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Selhala registrace \"compose create hook\" v zásuvném modulu Python"
 
-#: src/plugins/python/python_plugin.c:607
+#: src/plugins/python/python_plugin.c:730
 msgid ""
 "This plugin provides Python integration features.\n"
+"Python code can be entered interactively into an embedded Python console, "
+"under Tools -> Show Python console, or stored in scripts.\n"
+"\n"
+"These scripts are then available via the menu. You can assign keyboard "
+"shortcuts to them just like it is done with other menu items. You can also "
+"put buttons for script invokation into the toolbars using Claws Mail's "
+"builtin toolbar editor.\n"
+"\n"
+"You can provide scripts working on the main window by placing files into ~/."
+"claws-mail/python-scripts/main.\n"
+"\n"
+"You can also provide scripts working on an open compose window by placing "
+"files into ~/.claws-mail/python-scripts/compose.\n"
+"\n"
+"The folder ~/.claws-mail/python-scripts/auto/ may contain some scripts that "
+"are automatically executed when certain events occur. Currently, the "
+"following files in this directory are recognised:\n"
+"\n"
+"compose_any\n"
+"Gets executed whenever a compose window is opened, no matterif that opening "
+"happened as a result of composing a new message,replying or forwarding a "
+"message.\n"
+"\n"
+"startup\n"
+"Executed at plugin load\n"
+"\n"
+"shutdown\n"
+"Executed at plugin unload\n"
+"\n"
 "\n"
 "For the most up-to-date API documentation, type\n"
 "\n"
 " help(clawsmail)\n"
 "\n"
-"in the interactive Python console under Tools -> Show Python console.\n"
+"in the interactive Python console.\n"
 "\n"
 "The source distribution of this plugin comes with various example scripts in "
 "the \"examples\" subdirectory. If you wrote a script that you would be "
@@ -10642,21 +10702,47 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"Zásuvný modul umožňuje integraci Pythonu.\n"
+"Tenot zásuvný modul poskytuje integraci s Python.\n"
+"Python kód muže být vložen interaktivně v Nástroje -> Zobrazit Python "
+"konzoli, nebo uložené ve skriptu.\n"
+"\n"
+"Skripty jsou dostupné v menu. Můžete přiřadit klávesovou zkratku a skript "
+"pracuje jako jiná položka menu. Jde skript také přiřadit tlačítku pomocí "
+"Claws Mail's toolbar editor.\n"
 "\n"
-"Pro nejaktuálnější dokumentaci napište\n"
+"Můžete napsat skript pracující s hlavním oknem uložit do ~/.claws-mail/"
+"python-scripts/main.\n"
+"\n"
+"Můžete napsat skript při otevření okna nová zpráva uložit do ~/.claws-mail/"
+"python-scripts/compose.\n"
+"\n"
+"Složka ~/.claws-mail/python-scripts/auto/ může obsahovat skripty, které "
+"budou automaticky spuštěny při dané události. Aktuálně jsou to tyto "
+"skripty:\n"
+"\n"
+"compose_any\n"
+"Spuštěno při otevření okna nová zpráva.\n"
+"\n"
+"startup\n"
+"Spuštěno při načtení modulu\n"
+"\n"
+"shutdown\n"
+"Spušteno při odebrání modulu\n"
+"\n"
+"\n"
+"Pro aktuální API dokumentaci napište\n"
 "\n"
 " help(clawsmail)\n"
 "\n"
-"v interaktivní Pythonní konzoli v Nástroje -> Zobrazit konzoli Pythonu.\n"
+"v interaktivní Python konzoli.\n"
 "\n"
-"Distribuční zdroj zásuvného modulu obsahuje několik vzorových skriptů v "
-"adresáři \"examples\". Jestliže napíšete skript, který by bylo zajímavé "
-"sdílet. Pošlete mi ho pro vložení mezi přiklady.\n"
+"Zdroj zásuvného modulu obsahuje ukázkové skripty v podadresáři \"examples\". "
+"Jestliže napíšete skript vhodný pro sílení, pošlete mi ho pro vloženi do "
+"examples.\n"
 "\n"
-"Zpětná vazba k <berndth at gmx.de> je vítána."
+"Zpětná vazba na <berndth at gmx.de> je vítána."
 
-#: src/plugins/python/python_plugin.c:636
+#: src/plugins/python/python_plugin.c:781
 msgid "Python integration"
 msgstr "Integrace Pythonu"
 
@@ -10664,11 +10750,11 @@ msgstr "Integrace Pythonu"
 msgid "Passphrase"
 msgstr "Heslo"
 
-#: src/plugins/pgpcore/passphrase.c:253
+#: src/plugins/pgpcore/passphrase.c:249
 msgid "[no user id]"
 msgstr "[bez id uživatele]"
 
-#: src/plugins/pgpcore/passphrase.c:264
+#: src/plugins/pgpcore/passphrase.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the "
@@ -10681,11 +10767,11 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:267
+#: src/plugins/pgpcore/passphrase.c:263
 msgid "Passphrases did not match.\n"
 msgstr "Hesla se neshodují.\n"
 
-#: src/plugins/pgpcore/passphrase.c:270
+#: src/plugins/pgpcore/passphrase.c:266
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the "
@@ -10698,7 +10784,7 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:274
+#: src/plugins/pgpcore/passphrase.c:270
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
@@ -10710,7 +10796,7 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:277
+#: src/plugins/pgpcore/passphrase.c:273
 msgid "Bad passphrase.\n"
 msgstr "Špatné heslo.\n"
 
@@ -10848,7 +10934,7 @@ msgstr "Vyprší za"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Nastavte '0' pro uložení hesla po celou dobu relace"
 
-#: src/plugins/pgpcore/prefs_gpg.c:145 src/prefs_receive.c:173
+#: src/plugins/pgpcore/prefs_gpg.c:145 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "minut"
 
@@ -10902,52 +10988,52 @@ msgstr "Nenalezena shoda pro '%s'; prosím vyberte klíč."
 msgid "Collecting info for '%s' ... %c"
 msgstr "Získávám informace pro '%s' ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:142
 msgid "Undefined"
 msgstr "Nedefinovaná"
 
-#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:146
+#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:146
 msgid "Marginal"
 msgstr "Částečná"
 
-#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:150
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:150
 msgid "Ultimate"
 msgstr "Absolutní"
 
-#: src/plugins/pgpcore/select-keys.c:370
+#: src/plugins/pgpcore/select-keys.c:366
 msgid "Select Keys"
 msgstr "Vybrat klíče"
 
-#: src/plugins/pgpcore/select-keys.c:397
+#: src/plugins/pgpcore/select-keys.c:393
 msgid "Key ID"
 msgstr "ID klíče"
 
-#: src/plugins/pgpcore/select-keys.c:400
+#: src/plugins/pgpcore/select-keys.c:396
 msgid "Trust"
 msgstr "Důvěřovat"
 
-#: src/plugins/pgpcore/select-keys.c:425
+#: src/plugins/pgpcore/select-keys.c:421
 msgid "_Other"
 msgstr "_Ostatní"
 
-#: src/plugins/pgpcore/select-keys.c:426
+#: src/plugins/pgpcore/select-keys.c:422
 msgid "Do_n't encrypt"
 msgstr "_Nešifrovat"
 
-#: src/plugins/pgpcore/select-keys.c:585
+#: src/plugins/pgpcore/select-keys.c:581
 msgid "Add key"
 msgstr "Přidat klíč"
 
-#: src/plugins/pgpcore/select-keys.c:586
+#: src/plugins/pgpcore/select-keys.c:582
 msgid "Enter another user or key ID:"
 msgstr "Zadejte dalšího uživatele nebo ID klíče:"
 
-#: src/plugins/pgpcore/select-keys.c:608
+#: src/plugins/pgpcore/select-keys.c:604
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Šifrování %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:609
+#: src/plugins/pgpcore/select-keys.c:605
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -11019,81 +11105,81 @@ msgstr "Klíč 0x%s pro ověření tohoto podpisu není dostupný."
 msgid "Error checking signature: no status\n"
 msgstr "Chyba při kontrole podpisu: žádný status\n"
 
-#: src/plugins/pgpcore/sgpgme.c:278
+#: src/plugins/pgpcore/sgpgme.c:280
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Chyba při kontrole podpisu: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:294
+#: src/plugins/pgpcore/sgpgme.c:299
 #, c-format
-msgid "Signature made using %s key ID %s\n"
-msgstr "Digitálně podepsáno pomocí %s ID klíče %s\n"
+msgid "Signature made on %s using %s key ID %s\n"
+msgstr "Digitálně podepsáno na %s pomocí %s ID klíče %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:301
+#: src/plugins/pgpcore/sgpgme.c:306
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Správný podpis od uid \"%s\" (Platnost: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:306
+#: src/plugins/pgpcore/sgpgme.c:311
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Podpis s prošlou platností od uid\"%s\" (Platnost: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:311
+#: src/plugins/pgpcore/sgpgme.c:316
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "ŠPATNÝ pdopis od \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:322
+#: src/plugins/pgpcore/sgpgme.c:327
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                    uid \"%s\" (Platnost: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:329
+#: src/plugins/pgpcore/sgpgme.c:334
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint primárního klíče:"
 
-#: src/plugins/pgpcore/sgpgme.c:347
+#: src/plugins/pgpcore/sgpgme.c:352
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "VAROVÁNÍ: Adresa autora podpisu \"%s\" nesouhlasí s DNS záznamem\n"
 
-#: src/plugins/pgpcore/sgpgme.c:353
+#: src/plugins/pgpcore/sgpgme.c:358
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Ověřená adresa autora podpisu je \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:395
+#: src/plugins/pgpcore/sgpgme.c:400
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Nelze načíst obsah zprávy, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:411
+#: src/plugins/pgpcore/sgpgme.c:416
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Nelze inicializovat data, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:556
+#: src/plugins/pgpcore/sgpgme.c:561
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Tajný klíč nebyl nalezen (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:585
+#: src/plugins/pgpcore/sgpgme.c:590
 msgid "Secret key specification is ambiguous"
 msgstr "Specifikace tajného klíče není jednoznačná"
 
-#: src/plugins/pgpcore/sgpgme.c:597
+#: src/plugins/pgpcore/sgpgme.c:602
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Nepodařilo se nastavit tajný klíč: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:674
+#: src/plugins/pgpcore/sgpgme.c:677
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme protokol '%s' je nepoužitelný: Jádro '%s' není správně nainstalováno."
 
-#: src/plugins/pgpcore/sgpgme.c:680
+#: src/plugins/pgpcore/sgpgme.c:683
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -11102,12 +11188,12 @@ msgstr ""
 "Gpgme protokol '%s' je nepoužitelný: Je nainstalováno jádro '%s' verze %s, "
 "ale pro správnou funkci je vyžadována verze %s.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:688
+#: src/plugins/pgpcore/sgpgme.c:691
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme protokol '%s' je nepoužitelný (neznámý problém)"
 
-#: src/plugins/pgpcore/sgpgme.c:704
+#: src/plugins/pgpcore/sgpgme.c:707
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -11115,7 +11201,7 @@ msgstr ""
 "GnuPG není korektně instalováno, nebo je verze příliš stará.\n"
 "Podpora pro OpenPGP je vypnuta."
 
-#: src/plugins/pgpcore/sgpgme.c:738
+#: src/plugins/pgpcore/sgpgme.c:741
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -11123,11 +11209,11 @@ msgstr ""
 "Chcete-li generovat klíče, musíte nejprve uložit informace o účtu tlačítkem "
 "\"OK\".\n"
 
-#: src/plugins/pgpcore/sgpgme.c:743
+#: src/plugins/pgpcore/sgpgme.c:746
 msgid "No PGP key found"
 msgstr "Nenalezen PGP klíč"
 
-#: src/plugins/pgpcore/sgpgme.c:744
+#: src/plugins/pgpcore/sgpgme.c:747
 msgid ""
 "Claws Mail did not find a secret PGP key, which means that you won't be able "
 "to sign emails or receive encrypted emails.\n"
@@ -11137,12 +11223,12 @@ msgstr ""
 "podepisovat zprávy a přijímat šifrované zprávy.\n"
 "Chcete vytvořit nový pár klíčů?"
 
-#: src/plugins/pgpcore/sgpgme.c:814 src/plugins/pgpcore/sgpgme.c:830
+#: src/plugins/pgpcore/sgpgme.c:817 src/plugins/pgpcore/sgpgme.c:833
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Nepodařilo se vygenerovat nový pár klíčů: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:821
+#: src/plugins/pgpcore/sgpgme.c:824
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -11150,11 +11236,11 @@ msgstr ""
 "Generuji nový pár klíčů... Prosím pohybujte myší abyste pomohli generátoru "
 "získat dostatek entropie..."
 
-#: src/plugins/pgpcore/sgpgme.c:836
+#: src/plugins/pgpcore/sgpgme.c:839
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Nepodařilo se vygenerovat nový pár klíčů: neznámá chyba"
 
-#: src/plugins/pgpcore/sgpgme.c:840
+#: src/plugins/pgpcore/sgpgme.c:843
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -11167,66 +11253,66 @@ msgstr ""
 "\n"
 "Chcete je uložit na server klíčů?"
 
-#: src/plugins/pgpcore/sgpgme.c:844
+#: src/plugins/pgpcore/sgpgme.c:847
 msgid "Key generated"
 msgstr "Klíč vygenerován"
 
-#: src/plugins/pgpcore/sgpgme.c:883
+#: src/plugins/pgpcore/sgpgme.c:886
 msgid "Key exported."
 msgstr "Klíč exportován."
 
-#: src/plugins/pgpcore/sgpgme.c:885
+#: src/plugins/pgpcore/sgpgme.c:888
 msgid "Couldn't export key."
 msgstr "Nelze exportovat klíč."
 
-#: src/plugins/pgpcore/sgpgme.c:889
+#: src/plugins/pgpcore/sgpgme.c:892
 msgid "Key export isn't implemented in Windows."
 msgstr "Export klíče není ve Windows implementován."
 
-#: src/plugins/pgpinline/pgpinline.c:242
+#: src/plugins/pgpinline/pgpinline.c:156
 msgid "Incorrect part"
 msgstr "Nesprávná část"
 
-#: src/plugins/pgpinline/pgpinline.c:246
+#: src/plugins/pgpinline/pgpinline.c:160
 msgid "Not a text part"
 msgstr "Není textová část"
 
-#: src/plugins/pgpinline/pgpinline.c:257 src/plugins/pgpinline/pgpinline.c:414
+#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
 msgid "Couldn't get text data."
 msgstr "Nelze načíst text."
 
-#: src/plugins/pgpinline/pgpinline.c:275
+#: src/plugins/pgpinline/pgpinline.c:189
 msgid "Couldn't convert text data to any sane charset."
 msgstr "Nelze převést text do žádné znakové sady."
 
-#: src/plugins/pgpinline/pgpinline.c:283 src/plugins/pgpinline/pgpinline.c:608
-#: src/plugins/pgpinline/pgpinline.c:747 src/plugins/pgpinline/pgpinline.c:803
-#: src/plugins/pgpmime/pgpmime.c:73 src/plugins/pgpmime/pgpmime.c:182
-#: src/plugins/pgpmime/pgpmime.c:322 src/plugins/pgpmime/pgpmime.c:500
-#: src/plugins/pgpmime/pgpmime.c:644 src/plugins/smime/smime.c:406
+#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:517
+#: src/plugins/pgpinline/pgpinline.c:656 src/plugins/pgpinline/pgpinline.c:712
+#: src/plugins/pgpmime/pgpmime.c:74 src/plugins/pgpmime/pgpmime.c:183
+#: src/plugins/pgpmime/pgpmime.c:329 src/plugins/pgpmime/pgpmime.c:507
+#: src/plugins/pgpmime/pgpmime.c:651 src/plugins/smime/smime.c:395
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Nepodařilo se inicializovat GPG, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:407
+#: src/plugins/pgpinline/pgpinline.c:316
 msgid "Couldn't parse mime part."
 msgstr "Nelze analyzovat MIME část zprávy."
 
-#: src/plugins/pgpinline/pgpinline.c:437 src/plugins/pgpmime/pgpmime.c:345
+#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:352
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Nepodařilo se otevřít šifrovaný soubor %s"
 
-#: src/plugins/pgpinline/pgpinline.c:454 src/plugins/pgpinline/pgpinline.c:463
-#: src/plugins/pgpinline/pgpinline.c:472 src/plugins/pgpinline/pgpinline.c:480
-#: src/plugins/pgpinline/pgpinline.c:490 src/plugins/pgpinline/pgpinline.c:499
-#: src/plugins/pgpmime/pgpmime.c:356 src/plugins/pgpmime/pgpmime.c:370
+#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
+#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
+#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
+#: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "Nepodařilo se zapsat do šifrovaného souboru %s"
 
-#: src/plugins/pgpinline/pgpinline.c:468 src/plugins/pgpinline/pgpinline.c:469
-#: src/plugins/pgpinline/pgpinline.c:470
+#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:379
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -11234,51 +11320,51 @@ msgstr ""
 "\n"
 "--- Start PGP/Inline šifrovaných dat ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:486 src/plugins/pgpinline/pgpinline.c:487
-#: src/plugins/pgpinline/pgpinline.c:488
+#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:397
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Konec PGP/Inline šifrovaných dat ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:507 src/plugins/pgpmime/pgpmime.c:382
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:389
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "Nepodařilo se zavřít šifrovaný soubor %s"
 
-#: src/plugins/pgpinline/pgpinline.c:519
+#: src/plugins/pgpinline/pgpinline.c:428
 msgid "Couldn't scan decrypted file."
 msgstr "Nelze testovat šifrovaný soubor."
 
-#: src/plugins/pgpinline/pgpinline.c:527
+#: src/plugins/pgpinline/pgpinline.c:436
 msgid "Couldn't scan decrypted file parts."
 msgstr "Nelze testovat části šifrovaného souboru."
 
-#: src/plugins/pgpinline/pgpinline.c:582 src/plugins/pgpinline/pgpinline.c:774
+#: src/plugins/pgpinline/pgpinline.c:491 src/plugins/pgpinline/pgpinline.c:683
 msgid "Malformed message"
 msgstr "Chybná zpráva"
 
-#: src/plugins/pgpinline/pgpinline.c:593
+#: src/plugins/pgpinline/pgpinline.c:502
 msgid "Couldn't create temporary file."
 msgstr "Nelze vytvořit dočasný soubor."
 
-#: src/plugins/pgpinline/pgpinline.c:632 src/plugins/pgpmime/pgpmime.c:527
+#: src/plugins/pgpinline/pgpinline.c:541 src/plugins/pgpmime/pgpmime.c:534
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Digitální podepisování selhalo, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:650 src/plugins/pgpmime/pgpmime.c:552
+#: src/plugins/pgpinline/pgpinline.c:559 src/plugins/pgpmime/pgpmime.c:559
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Digitální podepisování selhalo - neplatný podepisující: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:659 src/plugins/pgpmime/pgpmime.c:561
+#: src/plugins/pgpinline/pgpinline.c:568 src/plugins/pgpmime/pgpmime.c:568
 msgid "Data signing failed, no results."
 msgstr "Digitální podepisování selhalo - žádný výstup."
 
-#: src/plugins/pgpinline/pgpinline.c:669 src/plugins/pgpmime/pgpmime.c:572
+#: src/plugins/pgpinline/pgpinline.c:578 src/plugins/pgpmime/pgpmime.c:579
 msgid "Data signing failed, no contents."
 msgstr "Digitální podepisování selhalo - žádný obsah."
 
-#: src/plugins/pgpinline/pgpinline.c:713
+#: src/plugins/pgpinline/pgpinline.c:622
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
@@ -11286,22 +11372,22 @@ msgstr ""
 "Upozornění, že přílohy nejsou šifrovány PGP/Inline systémem, stejně tak "
 "záhlaví, jako Předmět."
 
-#: src/plugins/pgpinline/pgpinline.c:757 src/plugins/pgpmime/pgpmime.c:654
+#: src/plugins/pgpinline/pgpinline.c:666 src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Nepodařilo se přidat GPG klíč %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:785 src/plugins/pgpmime/pgpmime.c:683
+#: src/plugins/pgpinline/pgpinline.c:694 src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Nelze vytvořit dočasný soubor, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:816 src/plugins/pgpmime/pgpmime.c:710
+#: src/plugins/pgpinline/pgpinline.c:725 src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Šifrování selhalo, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:883
+#: src/plugins/pgpinline/pgpinline.c:793
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
@@ -11335,31 +11421,31 @@ msgstr ""
 "\n"
 "GPGME (c) 2001 Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:202
+#: src/plugins/pgpmime/pgpmime.c:203
 msgid "Signature boundary not found."
 msgstr "Hranice digitálního podpisu nebyla nalezena."
 
-#: src/plugins/pgpmime/pgpmime.c:394 src/plugins/smime/smime.c:487
+#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:476
 msgid "Couldn't parse decrypted file."
 msgstr "Nelze analyzovat dešifrovaný soubor."
 
-#: src/plugins/pgpmime/pgpmime.c:400 src/plugins/smime/smime.c:494
+#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:483
 msgid "Couldn't parse decrypted file parts."
 msgstr "Nelze analyzovat části dešifrového souboru."
 
-#: src/plugins/pgpmime/pgpmime.c:446 src/plugins/pgpmime/pgpmime.c:485
+#: src/plugins/pgpmime/pgpmime.c:453 src/plugins/pgpmime/pgpmime.c:492
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Nepodařilo se vytvořit dočasný soubor: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:610
+#: src/plugins/pgpmime/pgpmime.c:617
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
 msgstr ""
 "Upozornění, že záhlaví, jako Předmět, nejsou šifrovány PGP/Mime systémem."
 
-#: src/plugins/pgpmime/pgpmime.c:780
+#: src/plugins/pgpmime/pgpmime.c:788
 msgid "PGP/Mime"
 msgstr "PGP/MIME"
 
@@ -11625,7 +11711,7 @@ msgstr "Vložte URL kanálu, který chcete odebírat:"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:138
 #, c-format
-msgid "Really remove the folder tree '%s' ?\n"
+msgid "Really remove the folder tree '%s'?\n"
 msgstr "Opravdu chcete odstranit strom složek '%s' ?\n"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:139
@@ -11757,7 +11843,7 @@ msgid "Can't subscribe feed '%s'."
 msgstr "Nepodařilo se přihlásit k odběru kanálu '%s'."
 
 #: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:924
+#: src/plugins/smime/smime.c:883
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -11797,24 +11883,24 @@ msgstr ""
 "\n"
 "GPGME (c) 2001 Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:414
+#: src/plugins/smime/smime.c:403
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "Nepodařilo se nastavit GPG, %s"
 
-#: src/plugins/smime/smime.c:442
+#: src/plugins/smime/smime.c:431
 msgid "Couldn't open temporary file"
 msgstr "Nelze otevřít dočasný soubor."
 
-#: src/plugins/smime/smime.c:453 src/plugins/smime/smime.c:468
+#: src/plugins/smime/smime.c:442 src/plugins/smime/smime.c:457
 msgid "Couldn't write to temporary file"
 msgstr "Nelze zapisovat do dočasného souboru."
 
-#: src/plugins/smime/smime.c:479
+#: src/plugins/smime/smime.c:468
 msgid "Couldn't close temporary file"
 msgstr "Nelze zavřít dočasný soubor."
 
-#: src/plugins/smime/smime.c:695
+#: src/plugins/smime/smime.c:684
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
@@ -11822,8 +11908,8 @@ msgstr ""
 "Upozornění, že záhlaví, jako Předmět, nejsou šifrovány S/MIME systémem."
 
 #: src/plugins/spam_report/spam_report_prefs.c:80
-#: src/plugins/spam_report/spam_report.c:340
-#: src/plugins/spam_report/spam_report.c:380
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
 msgid "SpamReport"
 msgstr "Spam zpráva"
 
@@ -11835,15 +11921,15 @@ msgstr "Povolen"
 msgid "Forward to:"
 msgstr "Přeposlat:"
 
-#: src/plugins/spam_report/spam_report.c:294
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Oznamování spamu..."
 
-#: src/plugins/spam_report/spam_report.c:329
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Oznamovat spam online..."
 
-#: src/plugins/spam_report/spam_report.c:385
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -11859,7 +11945,7 @@ msgstr ""
 "* spamcop.net\n"
 "* lists.debian.org nomination system"
 
-#: src/plugins/spam_report/spam_report.c:410
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Oznamování spamu"
 
@@ -12038,6 +12124,22 @@ msgstr ""
 "Používá knihovnu Ytnef, jejíž copyright 2002-2007 má Randall Hand "
 "<yerase at yerot.com>"
 
+#: src/plugins/vcalendar/common-views.c:62
+msgid "_Edit this meeting..."
+msgstr "_Upravit schůzku..."
+
+#: src/plugins/vcalendar/common-views.c:63
+msgid "_Cancel this meeting..."
+msgstr "_Zrušit schůzku"
+
+#: src/plugins/vcalendar/common-views.c:65
+msgid "_Create new meeting..."
+msgstr "_Vytvořit schůzku"
+
+#: src/plugins/vcalendar/common-views.c:67
+msgid "_Go to today"
+msgstr "_Jít na den"
+
 #: src/plugins/vcalendar/vcalendar.c:100
 msgid "Create meeting from message..."
 msgstr "Vytvořit schůzku ze zprávy..."
@@ -12150,9 +12252,9 @@ msgstr "Účet nenalezen"
 #: src/plugins/vcalendar/vcalendar.c:1088
 msgid ""
 "You have no account matching any attendee.\n"
-"Do you want to reply anyway ?"
+"Do you want to reply anyway?"
 msgstr ""
-"Nemáte účet odpovídající žádnému účastníkovi.\n"
+"Nemáte účet odpovídající jakémukoliv účastníkovi.\n"
 "Chcete přesto odpovědět?"
 
 #: src/plugins/vcalendar/vcalendar.c:1090
@@ -12180,25 +12282,25 @@ msgid "You are already busy at this time."
 msgstr "Již jste zaneprázdněn v tuto dobu."
 
 #: src/plugins/vcalendar/vcalendar.c:1265
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1759
 msgid "Event:"
 msgstr "Událost:"
 
 #: src/plugins/vcalendar/vcalendar.c:1266
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1727
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1737
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1748
 msgid "Organizer:"
 msgstr "Organizátor:"
 
 #: src/plugins/vcalendar/vcalendar.c:1267
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1729
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1740
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1750
 msgid "Location:"
 msgstr "Místo:"
 
 #: src/plugins/vcalendar/vcalendar.c:1268
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1717
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1728
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1749
 msgid "Summary:"
 msgstr "Shrnutí:"
 
@@ -12211,8 +12313,8 @@ msgid "Ending:"
 msgstr "Konec:"
 
 #: src/plugins/vcalendar/vcalendar.c:1272
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1752
 msgid "Attendees:"
 msgstr "Účastníci:"
 
@@ -12220,85 +12322,85 @@ msgstr "Účastníci:"
 msgid "Action:"
 msgstr "Akce:"
 
-#: src/plugins/vcalendar/vcal_prefs.c:256
+#: src/plugins/vcalendar/vcal_prefs.c:258
 msgid "Reminders"
 msgstr "Připomenutí"
 
-#: src/plugins/vcalendar/vcal_prefs.c:265
+#: src/plugins/vcalendar/vcal_prefs.c:267
 msgid "Alert me"
 msgstr "Upozornit mně"
 
-#: src/plugins/vcalendar/vcal_prefs.c:277
+#: src/plugins/vcalendar/vcal_prefs.c:279
 msgid "minutes before an event"
 msgstr "minut před událostí"
 
-#: src/plugins/vcalendar/vcal_prefs.c:289
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Calendar export"
 msgstr "Export kalendáře"
 
-#: src/plugins/vcalendar/vcal_prefs.c:300
+#: src/plugins/vcalendar/vcal_prefs.c:302
 msgid "Automatically export calendar to"
 msgstr "Automaticky exportovat kalendář do"
 
-#: src/plugins/vcalendar/vcal_prefs.c:309
-#: src/plugins/vcalendar/vcal_prefs.c:415
+#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:417
 msgid "You can export to a local file or URL"
 msgstr "Nemohu exportovat do lokálního souboru nebo URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:313
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Specifikovat lokální soubor nebo URL (http://server/path/file.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:319
-#: src/plugins/vcalendar/vcal_prefs.c:425 src/prefs_account.c:1255
-#: src/prefs_account.c:1762
+#: src/plugins/vcalendar/vcal_prefs.c:321
+#: src/plugins/vcalendar/vcal_prefs.c:427 src/prefs_account.c:1259
+#: src/prefs_account.c:1766
 msgid "User ID"
 msgstr "Uživatelské jméno"
 
-#: src/plugins/vcalendar/vcal_prefs.c:327
-#: src/plugins/vcalendar/vcal_prefs.c:433 src/prefs_account.c:1261
-#: src/prefs_account.c:1782 src/prefs_account.c:2491 src/prefs_account.c:2513
-#: src/wizard.c:1389 src/wizard.c:1668
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1265
+#: src/prefs_account.c:1786 src/prefs_account.c:2491 src/prefs_account.c:2513
+#: src/wizard.c:1201 src/wizard.c:1475
 msgid "Password"
 msgstr "Heslo"
 
-#: src/plugins/vcalendar/vcal_prefs.c:341
+#: src/plugins/vcalendar/vcal_prefs.c:343
 msgid "Include webcal subscriptions in export"
 msgstr "Vložit webcal přihlášení do exportu"
 
-#: src/plugins/vcalendar/vcal_prefs.c:351
+#: src/plugins/vcalendar/vcal_prefs.c:353
 msgid "Command to run after calendar export"
 msgstr "Příkaz pro spuštění po exportu kalendáře"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:382
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Registrovat Claws kalnedář do XFCE Orage"
 
-#: src/plugins/vcalendar/vcal_prefs.c:382
+#: src/plugins/vcalendar/vcal_prefs.c:384
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr "Povolit Orage (verze vyšší než 4.4) vidět Claws Mail kalendář"
 
-#: src/plugins/vcalendar/vcal_prefs.c:394
+#: src/plugins/vcalendar/vcal_prefs.c:396
 msgid "Free/Busy information"
 msgstr "Volný/zaneprázdněn informace"
 
-#: src/plugins/vcalendar/vcal_prefs.c:406
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Automatically export free/busy status to"
 msgstr "Automaticky exportovat volný/zaneprázdněn stav do"
 
-#: src/plugins/vcalendar/vcal_prefs.c:417
+#: src/plugins/vcalendar/vcal_prefs.c:419
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Specifikovat lokální nebo URL (http://server/path/file.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:447
+#: src/plugins/vcalendar/vcal_prefs.c:449
 msgid "Command to run after free/busy status export"
 msgstr "Příkaz pro spuštění po exportu stavu volný/zaneprázdněn"
 
-#: src/plugins/vcalendar/vcal_prefs.c:474
+#: src/plugins/vcalendar/vcal_prefs.c:476
 msgid "Get free/busy status of others from"
 msgstr "Získat stav volný/zaneprázdněn jiných z"
 
-#: src/plugins/vcalendar/vcal_prefs.c:482
+#: src/plugins/vcalendar/vcal_prefs.c:484
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -12307,7 +12409,7 @@ msgstr ""
 "Specifikovat lokální soubor nebo URL (http://server/path/file.ifb). Použijte "
 "%u pro levou část emailové adresy, %d pro doménu."
 
-#: src/plugins/vcalendar/vcal_prefs.c:646 src/plugins/vcalendar/plugin.c:43
+#: src/plugins/vcalendar/vcal_prefs.c:648 src/plugins/vcalendar/plugin.c:43
 #: src/plugins/vcalendar/plugin.c:64
 msgid "vCalendar"
 msgstr "vCalendar"
@@ -12344,6 +12446,10 @@ msgstr "Zobrazení po _týdnech"
 msgid "_Month view"
 msgstr "Zobrazení po _měsících"
 
+#: src/plugins/vcalendar/vcal_folder.c:1091
+msgid "Meetings"
+msgstr "Schůzky"
+
 #: src/plugins/vcalendar/vcal_folder.c:1475
 msgid "in the past"
 msgstr "v minulosti"
@@ -12451,11 +12557,11 @@ msgstr "Přihlásit WebCal"
 msgid "Enter the WebCal URL:"
 msgstr "Vložte WebCal URL:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1923
+#: src/plugins/vcalendar/vcal_folder.c:1921
 msgid "Could not parse the URL."
 msgstr "Nemohu parsovat URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1952
+#: src/plugins/vcalendar/vcal_folder.c:1950
 msgid "Do you really want to unsubscribe?"
 msgstr "Skutečně chcete odhlásit?"
 
@@ -12606,7 +12712,7 @@ msgid "available"
 msgstr "dostupné"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:899
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1150
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1151
 msgid "Free/busy retrieval failed"
 msgstr "Nalezení volný/zaneprázdněn selhalo"
 
@@ -12622,22 +12728,22 @@ msgstr "Přesto poslat"
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr "Ne každý je dostupný. Další viz. tip..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1132
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1133
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "Stahování plánování pro %s..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1159
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1160
 msgid "Available"
 msgstr "Dostupné"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1172
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1179
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1187
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1180
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
 msgid "Everyone is available."
 msgstr "Každý je dostupný."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1189
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
@@ -12645,7 +12751,7 @@ msgstr ""
 "Všichni vypadají dostupní, ale některé volný/zaneprázdněn zprávy nebyly "
 "doručeny."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1360
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1361
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -12653,42 +12759,42 @@ msgstr ""
 "Nemohu poslat pozvání ke schůzce.\n"
 "Zkontrolujte příjemce."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1476
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1493
 msgid "Save & Send"
 msgstr "Uložit & Poslat"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1494
 msgid "Check availability"
 msgstr "Zkontrolovat dostupnost"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1600
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "<b>Starts at:</b> "
 msgstr "<b>Začíná v:</b> "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1627
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1623
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1647
 msgid "<b> on:</b>"
 msgstr "<b> přes:</b>"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1641
 msgid "<b>Ends at:</b> "
 msgstr "<b>Končí v:</b> "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1661
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1682
 msgid "New meeting"
 msgstr "Nová schůzka"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1663
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1684
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Upravil schůzku"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1763
 msgid "Time:"
 msgstr "Čas:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1878
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1896
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -12696,7 +12802,7 @@ msgstr[0] "%d hodina"
 msgstr[1] "%d hodiny"
 msgstr[2] "%d hodin"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1881
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1899
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -12704,12 +12810,12 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1892
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Aktuální událost: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1893
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1911
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -12726,7 +12832,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1928
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
@@ -12734,32 +12840,32 @@ msgstr[0] "Připomenout za %d minutu"
 msgstr[1] "Připomenout za %d minuty"
 msgstr[2] "Připomenout za %d minut"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2036
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2054
 msgid "Empty calendar"
 msgstr "Prázdný kalendář"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2037
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2055
 msgid "There is nothing to export."
 msgstr "Nic k exportu."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2077
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2095
 msgid "Could not export the calendar."
 msgstr "Nemohu exportovat kalendář."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2112
 msgid "Export calendar to ICS"
 msgstr "Export kalendáře do ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2135
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "Nemohu exportovat kalendář do '%s'\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2232
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2251
 msgid "Could not export the freebusy info."
 msgstr "Nemohu exportovat informaci volný/zaneprázdněn."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2263
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2283
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Nemohu exportovat volný/zaneprázdněn do '%s'\n"
@@ -12837,7 +12943,7 @@ msgid "Show"
 msgstr "Zobrazit"
 
 #: src/plugins/vcalendar/day-view.c:622 src/plugins/vcalendar/month-view.c:722
-#: src/prefs_account.c:1448 src/prefs_folder_item.c:562
+#: src/prefs_account.c:1452 src/prefs_folder_item.c:562
 #: src/prefs_matcher.c:334
 msgid "days"
 msgstr "dnech"
@@ -13014,12 +13120,12 @@ msgstr "nastala chyba v POP3 relaci\n"
 msgid "TOP command unsupported\n"
 msgstr "Příkaz TOP není podporován\n"
 
-#: src/prefs_account.c:332 src/prefs_account.c:1422 src/prefs_account.c:2408
-#: src/wizard.c:1549
+#: src/prefs_account.c:332 src/prefs_account.c:1426 src/prefs_account.c:2408
+#: src/wizard.c:1361
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1535 src/prefs_account.c:2423
+#: src/prefs_account.c:335 src/prefs_account.c:1539 src/prefs_account.c:2423
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -13027,7 +13133,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "Diskusní skupiny (NNTP)"
 
-#: src/prefs_account.c:337 src/wizard.c:1551
+#: src/prefs_account.c:337 src/wizard.c:1363
 msgid "Local mbox file"
 msgstr "Lokální mbox soubor"
 
@@ -13035,31 +13141,31 @@ msgstr "Lokální mbox soubor"
 msgid "None (SMTP only)"
 msgstr "Žádný (pouze odesílání SMTP)"
 
-#: src/prefs_account.c:1021
+#: src/prefs_account.c:1029
 msgid "Name of account"
 msgstr "Název účtu"
 
-#: src/prefs_account.c:1030
+#: src/prefs_account.c:1038
 msgid "Set as default"
 msgstr "Nastavit jako výchozí"
 
-#: src/prefs_account.c:1038
+#: src/prefs_account.c:1046
 msgid "Personal information"
 msgstr "Osobní informace"
 
-#: src/prefs_account.c:1047
+#: src/prefs_account.c:1055
 msgid "Full name"
 msgstr "Celé jméno"
 
-#: src/prefs_account.c:1053
+#: src/prefs_account.c:1061
 msgid "Mail address"
 msgstr "Poštovní adresa"
 
-#: src/prefs_account.c:1083
+#: src/prefs_account.c:1091
 msgid "Server information"
 msgstr "Informace o serveru"
 
-#: src/prefs_account.c:1118
+#: src/prefs_account.c:1126
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support.</span>"
@@ -13067,86 +13173,86 @@ msgstr ""
 "<span weight=\"bold\">Pozor: tato verze Claws Mail byla zkompilována\n"
 "bez podpory IMAP a News.</span>"
 
-#: src/prefs_account.c:1147
+#: src/prefs_account.c:1155
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizaci"
 
-#: src/prefs_account.c:1154
+#: src/prefs_account.c:1162
 msgid "Authenticate on connect"
 msgstr "Autentizace při připojení"
 
-#: src/prefs_account.c:1212
+#: src/prefs_account.c:1216
 msgid "News server"
 msgstr "Server diskuzních skupin"
 
-#: src/prefs_account.c:1218
+#: src/prefs_account.c:1222
 msgid "Server for receiving"
 msgstr "Server pro příjem"
 
-#: src/prefs_account.c:1224
+#: src/prefs_account.c:1228
 msgid "Local mailbox"
 msgstr "Lokální mailbox"
 
-#: src/prefs_account.c:1231
+#: src/prefs_account.c:1235
 msgid "SMTP server (send)"
 msgstr "SMTP server (odesílání)"
 
-#: src/prefs_account.c:1239
+#: src/prefs_account.c:1243
 msgid "Use mail command rather than SMTP server"
 msgstr "Použít místo SMTP serveru příkaz pro odeslání"
 
-#: src/prefs_account.c:1248
+#: src/prefs_account.c:1252
 msgid "command to send mails"
 msgstr "příkaz pro odeslání pošty"
 
-#: src/prefs_account.c:1310
+#: src/prefs_account.c:1314
 #, c-format
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account.c:1396
+#: src/prefs_account.c:1400
 msgid "Local"
 msgstr "Lokální mbox soubor"
 
-#: src/prefs_account.c:1402 src/prefs_account.c:1491
+#: src/prefs_account.c:1406 src/prefs_account.c:1495
 msgid "Default Inbox"
 msgstr "Výchozí inbox"
 
-#: src/prefs_account.c:1409 src/prefs_account.c:1416 src/prefs_account.c:1498
-#: src/prefs_account.c:1505
+#: src/prefs_account.c:1413 src/prefs_account.c:1420 src/prefs_account.c:1502
+#: src/prefs_account.c:1509
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Nefiltrované zprávy budou uloženy v této složce"
 
-#: src/prefs_account.c:1413 src/prefs_account.c:1502 src/prefs_account.c:1966
+#: src/prefs_account.c:1417 src/prefs_account.c:1506 src/prefs_account.c:1966
 #: src/prefs_customheader.c:237
 msgid "Bro_wse"
 msgstr "_Procházet"
 
-#: src/prefs_account.c:1424
+#: src/prefs_account.c:1428
 msgid "Use secure authentication (APOP)"
 msgstr "Použít zabezpečenou autentizaci (APOP)"
 
-#: src/prefs_account.c:1427
+#: src/prefs_account.c:1431
 msgid "Remove messages on server when received"
 msgstr "Odstranit zprávy na serveru po jejich přijmutí"
 
-#: src/prefs_account.c:1438
+#: src/prefs_account.c:1442
 msgid "Remove after"
 msgstr "Odstranit po"
 
-#: src/prefs_account.c:1445 src/prefs_account.c:1455
+#: src/prefs_account.c:1449 src/prefs_account.c:1459
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dnů a 0 hodin: odstranit ihned"
 
-#: src/prefs_account.c:1458 src/prefs_matcher.c:333
+#: src/prefs_account.c:1462 src/prefs_matcher.c:333
 msgid "hours"
 msgstr "hodin"
 
-#: src/prefs_account.c:1468
+#: src/prefs_account.c:1472
 msgid "Receive size limit"
 msgstr "Limit velikosti pro příjem"
 
-#: src/prefs_account.c:1471
+#: src/prefs_account.c:1475
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -13154,82 +13260,82 @@ msgstr ""
 "Zprávy překračující tento limit budou staženy pouze částečně. Když takovou "
 "zprávu vyberete, budete moci dokončit stažení nebo ji odstranit."
 
-#: src/prefs_account.c:1511 src/prefs_account.c:2438
+#: src/prefs_account.c:1515 src/prefs_account.c:2438
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1518
+#: src/prefs_account.c:1522
 msgid "Maximum number of articles to download"
 msgstr "Maximální počet příspěvků pro stažení"
 
-#: src/prefs_account.c:1528
+#: src/prefs_account.c:1532
 msgid "unlimited if 0 is specified"
 msgstr "(pokud je 0, je to neomezený počet)"
 
-#: src/prefs_account.c:1541 src/prefs_account.c:1734
+#: src/prefs_account.c:1545 src/prefs_account.c:1738
 msgid "Authentication method"
 msgstr "Metoda autentizace"
 
-#: src/prefs_account.c:1551 src/prefs_account.c:1743 src/prefs_send.c:286
+#: src/prefs_account.c:1555 src/prefs_account.c:1747 src/prefs_send.c:290
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/prefs_account.c:1563
+#: src/prefs_account.c:1567
 msgid "IMAP server directory"
 msgstr "adresář pro IMAP server"
 
-#: src/prefs_account.c:1567
+#: src/prefs_account.c:1571
 msgid "(usually empty)"
 msgstr "(obvykle prázdné)"
 
-#: src/prefs_account.c:1581
+#: src/prefs_account.c:1585
 msgid "Show subscribed folders only"
 msgstr "Zobrazovat pouze odebírané složky"
 
-#: src/prefs_account.c:1588
+#: src/prefs_account.c:1592
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Mód efektivní šířka pásma (prevence stahování vzdálených značek)"
 
-#: src/prefs_account.c:1590
+#: src/prefs_account.c:1594
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Tento mód používá menší šířku pásma, ale může být pomalejší s některými "
 "servery."
 
-#: src/prefs_account.c:1597
+#: src/prefs_account.c:1601
 msgid "Filter messages on receiving"
 msgstr "Při načítání zpracovat zprávy filtrem pro příjem"
 
-#: src/prefs_account.c:1604
+#: src/prefs_account.c:1608
 msgid "Allow filtering using plugins on receiving"
 msgstr "Při načítání filtrovat zprávy zásuvnými moduly"
 
-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1612
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "Zpracovat tento účet při volbě 'Přijmout poštu ze všech účtů'"
 
-#: src/prefs_account.c:1689 src/prefs_customheader.c:209
-#: src/prefs_matcher.c:620 src/prefs_matcher.c:1952 src/prefs_matcher.c:1974
+#: src/prefs_account.c:1693 src/prefs_customheader.c:209
+#: src/prefs_matcher.c:620 src/prefs_matcher.c:1958 src/prefs_matcher.c:1980
 msgid "Header"
 msgstr "Záhlaví"
 
-#: src/prefs_account.c:1691
+#: src/prefs_account.c:1695
 msgid "Generate Message-ID"
 msgstr "Generovat číslo zprávy"
 
-#: src/prefs_account.c:1694
+#: src/prefs_account.c:1698
 msgid "Send account mail address in Message-ID"
 msgstr "Poslat mailovou adresu účtu v Message-ID"
 
-#: src/prefs_account.c:1697
+#: src/prefs_account.c:1701
 msgid "Generate X-Mailer header"
 msgstr "Generovat hlavičku X-Mailer"
 
-#: src/prefs_account.c:1704
+#: src/prefs_account.c:1708
 msgid "Add user-defined header"
 msgstr "Přidat uživatelsky definované záhlaví"
 
-#: src/prefs_account.c:1719
+#: src/prefs_account.c:1723
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autentizace (SMTP AUTH)"
 
@@ -13295,12 +13401,12 @@ msgid "Compose"
 msgstr "Napsat"
 
 #: src/prefs_account.c:2154 src/prefs_folder_item.c:1471 src/prefs_quote.c:134
-#: src/toolbar.c:407
+#: src/toolbar.c:408
 msgid "Reply"
 msgstr "Odpovědět"
 
 #: src/prefs_account.c:2169 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1499 src/prefs_quote.c:149 src/toolbar.c:411
+#: src/prefs_folder_item.c:1499 src/prefs_quote.c:149 src/toolbar.c:412
 msgid "Forward"
 msgstr "Předat"
 
@@ -13504,32 +13610,32 @@ msgstr "Šablony"
 msgid "Privacy"
 msgstr "Zabezpečení"
 
-#: src/prefs_account.c:3392
+#: src/prefs_account.c:3400
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/prefs_account.c:3680
+#: src/prefs_account.c:3688
 msgid "Preferences for new account"
 msgstr "Nastavení pro nový účet"
 
-#: src/prefs_account.c:3682
+#: src/prefs_account.c:3690
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - nastavení účtu"
 
-#: src/prefs_account.c:3787
+#: src/prefs_account.c:3794
 msgid "Select signature file"
 msgstr "Soubor s podpisem"
 
-#: src/prefs_account.c:3805 src/prefs_account.c:3822 src/wizard.c:1237
+#: src/prefs_account.c:3812 src/prefs_account.c:3829 src/wizard.c:1053
 msgid "Select certificate file"
 msgstr "Vybrat soubor s certifikátem"
 
-#: src/prefs_account.c:3918
+#: src/prefs_account.c:3925
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:4058
+#: src/prefs_account.c:4065
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (modul nebyl načten)"
@@ -13558,72 +13664,72 @@ msgstr "Upravit filtrovací akci"
 msgid "Append the new action above to the list"
 msgstr "Přidat novou akci nahoře do seznamu"
 
-#: src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:768 src/prefs_template.c:309
-#: src/prefs_toolbar.c:1043
-msgid "Replace"
-msgstr "Nahradit"
-
 #: src/prefs_actions.c:335
 msgid "Replace the selected action in list with the action above"
 msgstr "Nahradit vybranou akci v seznam tou nahoře"
 
-#: src/prefs_actions.c:343
+#: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:778 src/prefs_template.c:318
+#: src/prefs_toolbar.c:1056
+msgid "Re_move"
+msgstr "Odstranit"
+
+#: src/prefs_actions.c:345
 msgid "Delete the selected action from the list"
 msgstr "Odstranit vybranou akci ze seznamu"
 
-#: src/prefs_actions.c:351 src/prefs_filtering.c:500 src/prefs_template.c:332
+#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:336
 msgid "Clear all the input fields in the dialog"
 msgstr "Vyčistit všechna vstupní pole v dialogu"
 
-#: src/prefs_actions.c:359
+#: src/prefs_actions.c:363
 msgid "Show information on configuring actions"
 msgstr "Zobrazit informace o konfiguračních akcí"
 
-#: src/prefs_actions.c:390
+#: src/prefs_actions.c:394
 msgid "Move the selected action up"
 msgstr "Přesunout vybranou akci nahoru"
 
-#: src/prefs_actions.c:398
+#: src/prefs_actions.c:402
 msgid "Move selected action down"
 msgstr "Přesunout vybranou akci dolů"
 
-#: src/prefs_actions.c:531 src/prefs_filtering_action.c:702
-#: src/prefs_filtering.c:833 src/prefs_filtering.c:835
-#: src/prefs_filtering.c:836 src/prefs_filtering.c:946 src/prefs_matcher.c:891
-#: src/prefs_template.c:465
+#: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
+#: src/prefs_filtering.c:836 src/prefs_filtering.c:838
+#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:897
+#: src/prefs_template.c:469
 msgid "(New)"
 msgstr "(Nová)"
 
-#: src/prefs_actions.c:596
+#: src/prefs_actions.c:600
 msgid "Menu name is not set."
 msgstr "Není nastaven název nabídky."
 
-#: src/prefs_actions.c:601
+#: src/prefs_actions.c:605
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "Název nabídky nemůže začínat znakem '/'."
 
-#: src/prefs_actions.c:606
+#: src/prefs_actions.c:610
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "V názvu nabídky není povolena dvojtečka ':'."
 
-#: src/prefs_actions.c:612
+#: src/prefs_actions.c:616
 msgid "There is an action with this name already."
 msgstr "Existuje akce stejného jména."
 
-#: src/prefs_actions.c:631
+#: src/prefs_actions.c:635
 msgid "Menu name is too long."
 msgstr "Název nabídky je příliš dlouhý."
 
-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:644
 msgid "Command-line not set."
 msgstr "Není nastavena příkazová řádka."
 
-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:649
 msgid "Menu name and command are too long."
 msgstr "Název nabídky a příkaz jsou příliš dlouhé."
 
-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:655
 #, c-format
 msgid ""
 "The command\n"
@@ -13634,166 +13740,166 @@ msgstr ""
 "%s\n"
 "má syntaktickou chybu."
 
-#: src/prefs_actions.c:709
+#: src/prefs_actions.c:713
 msgid "Delete action"
 msgstr "Odstranit akci"
 
-#: src/prefs_actions.c:710
+#: src/prefs_actions.c:714
 msgid "Do you really want to delete this action?"
 msgstr "Opravdu chcete odstranit tuto akci?"
 
-#: src/prefs_actions.c:730
+#: src/prefs_actions.c:734
 msgid "Delete all actions"
 msgstr "Odstranit všechny akce"
 
-#: src/prefs_actions.c:731
+#: src/prefs_actions.c:735
 msgid "Do you really want to delete all the actions?"
 msgstr "Opravdu chcete odstranit všechny akce?"
 
-#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1496
-#: src/prefs_filtering.c:1518 src/prefs_matcher.c:2103
-#: src/prefs_template.c:565 src/prefs_template.c:590
+#: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1499
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2109
+#: src/prefs_template.c:569 src/prefs_template.c:594
 msgid "Entry not saved"
 msgstr "Neuložený záznam."
 
-#: src/prefs_actions.c:895 src/prefs_actions.c:926 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_template.c:566
-#: src/prefs_template.c:591
+#: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1522 src/prefs_template.c:570
+#: src/prefs_template.c:595
 msgid "The entry was not saved. Close anyway?"
 msgstr "Záznam nebyl uložen. Chcete přesto okno zavřít?"
 
-#: src/prefs_actions.c:896 src/prefs_actions.c:901 src/prefs_actions.c:927
-#: src/prefs_filtering.c:1476 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_matcher.c:2105
-#: src/prefs_template.c:567 src/prefs_template.c:592 src/prefs_template.c:597
+#: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
+#: src/prefs_filtering.c:1479 src/prefs_filtering.c:1501
+#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2111
+#: src/prefs_template.c:571 src/prefs_template.c:596 src/prefs_template.c:601
 msgid "+_Continue editing"
 msgstr "+_Pokračovat v úpravách"
 
-#: src/prefs_actions.c:899
+#: src/prefs_actions.c:903
 msgid "Actions list not saved"
 msgstr "Seznam akcí neuložen"
 
-#: src/prefs_actions.c:900
+#: src/prefs_actions.c:904
 msgid "The actions list has been modified. Close anyway?"
 msgstr "Seznam akcí byl změnen. Chcete přesto zavřít?"
 
-#: src/prefs_actions.c:970
+#: src/prefs_actions.c:974
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Název nabídky:</span>"
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:975
 msgid "Use / in menu name to make submenus."
 msgstr "Použijte \"/\" v názvu nabídky pro vytvoření podnabídek."
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:977
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Příkazová řádka:</span>"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:978
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Začíná-li:</span>"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:979
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "bude odesláno tělo zprávy nebo vybraná část na standardní vstup příkazu"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:980
 msgid "to send user provided text to command's standard input"
 msgstr "bude odeslán uživatelem zadaný text na standardní vstup příkazu"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:981
 msgid "to send user provided hidden text to command's standard input"
 msgstr "bude odeslán uživatelem skrytě zadaný text na standardní vstup příkazu"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:982
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Končí-li:</span>"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:983
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "bude tělo zprávy nebo vybraná část nahrazena standardním výstupem příkazu"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:984
 msgid "to insert command's standard output without replacing old text"
 msgstr "bude standardní výstup příkazu vložen bez nahrazení původního textu"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:985
 msgid "to run command asynchronously"
 msgstr "bude příkaz spuštěn asynchronně"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:986
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Použijte:</span>"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:987
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "pro soubor s vybranou zprávou ve formátu RFC822/2822"
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:988
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "pro seznam souborů s vybranými zprávami ve formátu RFC822/2822"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:989
 msgid "for the file of the selected decoded message MIME part"
 msgstr "pro soubor vybrané dekódované MIME části zprávy"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:990
 msgid "for a user provided argument"
 msgstr "pro uživatelem zadaný parametr"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:991
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "pro uživatelem skrytě zadaný parametr (např. heslo)"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:992
 msgid "for the text selection"
 msgstr "pro vybraný text"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:993
 msgid "apply filtering actions between {} to selected messages"
 msgstr "pro aplikaci filtrovacích pravidel mezi {} na vybrané zprávy"
 
-#: src/prefs_actions.c:990
+#: src/prefs_actions.c:994
 msgid "for a literal %"
 msgstr "pro znak %"
 
-#: src/prefs_actions.c:1000 src/prefs_themes.c:959
+#: src/prefs_actions.c:1004 src/prefs_themes.c:959
 msgid "Actions"
 msgstr "Akce"
 
-#: src/prefs_actions.c:1001
+#: src/prefs_actions.c:1005
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
 msgstr ""
 "Akce umožňují spouštět externí příkazy ke zpracování zpráv nebo jejich částí."
 
-#: src/prefs_actions.c:1088 src/prefs_filtering.c:1694
-#: src/prefs_template.c:1097
+#: src/prefs_actions.c:1092 src/prefs_filtering.c:1697
+#: src/prefs_template.c:1101
 msgid "D_uplicate"
 msgstr "D_uplikáty"
 
-#: src/prefs_actions.c:1215
+#: src/prefs_actions.c:1212
 msgid "Current actions"
 msgstr "Nadefinované akce"
 
-#: src/prefs_actions.c:1314 src/prefs_filtering.c:1071
-#: src/prefs_filtering.c:1129
+#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074
+#: src/prefs_filtering.c:1132
 msgid "Action string is not valid."
 msgstr "Definice akce není platná."
 
-#: src/prefs_common.c:230 src/prefs_quote.c:69
+#: src/prefs_common.c:220 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Nazdar,\\n"
 
-#: src/prefs_common.c:304
+#: src/prefs_common.c:294
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "V %d\\n%f napsáno:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:310 src/prefs_quote.c:85
+#: src/prefs_common.c:300 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -13801,7 +13907,7 @@ msgstr ""
 "\\n\\nZačátek předané zprávy:\\n\\n?d{Datum: %d\\n}?f{Od: %f\\n}?t{Komu: %t"
 "\\n}?c{Kopie: %c\\n}?n{Diskuzní skupina: %n\\n}?s{Předmět: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:450
+#: src/prefs_common.c:440
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -13881,11 +13987,11 @@ msgstr "Při přetažení souboru do okna s rozepsanou zprávou"
 msgid "Ask"
 msgstr "Zeptat se"
 
-#: src/prefs_compose_writing.c:230 src/toolbar.c:425
+#: src/prefs_compose_writing.c:230 src/toolbar.c:426
 msgid "Insert"
 msgstr "Vložit"
 
-#: src/prefs_compose_writing.c:231 src/toolbar.c:426
+#: src/prefs_compose_writing.c:231 src/toolbar.c:427
 msgid "Attach"
 msgstr "Přiložit"
 
@@ -13898,7 +14004,7 @@ msgid "Custom header configuration"
 msgstr "Nastavení vlastního záhlaví"
 
 #: src/prefs_customheader.c:507 src/prefs_display_header.c:599
-#: src/prefs_matcher.c:1577 src/prefs_matcher.c:1592
+#: src/prefs_matcher.c:1583 src/prefs_matcher.c:1598
 msgid "Header name is not set."
 msgstr "Není nastaven název záhlaví."
 
@@ -13998,19 +14104,19 @@ msgstr "%s bude nahrazeno jménem souboru / URI"
 msgid "Use system defaults when possible"
 msgstr "Použít hodnoty ze systému, když je to možné"
 
-#: src/prefs_ext_prog.c:146
+#: src/prefs_ext_prog.c:141
 msgid "Web browser"
 msgstr "Webový prohlížeč"
 
-#: src/prefs_ext_prog.c:180
+#: src/prefs_ext_prog.c:169
 msgid "Text editor"
 msgstr "Textový editor"
 
-#: src/prefs_ext_prog.c:208
+#: src/prefs_ext_prog.c:197
 msgid "Command for 'Display as text'"
 msgstr "Příkaz pro 'Zobrazit jako text'"
 
-#: src/prefs_ext_prog.c:221
+#: src/prefs_ext_prog.c:210
 msgid ""
 "This option enables MIME parts to be displayed in the message view via a "
 "script when using the 'Display as text' contextual menu item"
@@ -14018,12 +14124,12 @@ msgstr ""
 "Tato položka umožňuje definovat externí program, který bude použit při "
 "aktivaci funkce 'Zobrazit jako text'"
 
-#: src/prefs_ext_prog.c:280 src/prefs_image_viewer.c:138
+#: src/prefs_ext_prog.c:269 src/prefs_image_viewer.c:138
 #: src/prefs_message.c:354
 msgid "Message View"
 msgstr "Náhled zprávy"
 
-#: src/prefs_ext_prog.c:281
+#: src/prefs_ext_prog.c:270
 msgid "External Programs"
 msgstr "Externí programy"
 
@@ -14067,8 +14173,8 @@ msgstr "Označit jako spam"
 msgid "Mark as ham"
 msgstr "Označit jako ne spam"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1436
-#: src/toolbar.c:204 src/toolbar.c:435 src/toolbar.c:2106
+#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1438
+#: src/toolbar.c:205 src/toolbar.c:436 src/toolbar.c:2107
 msgid "Execute"
 msgstr "Provést odložené operace"
 
@@ -14086,7 +14192,7 @@ msgid "Redirect"
 msgstr "Přesměrovat"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1440 src/prefs_matcher.c:626
+#: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:626
 #: src/prefs_summary_column.c:87 src/summaryview.c:449
 msgid "Score"
 msgstr "Ohodnocení"
@@ -14129,7 +14235,7 @@ msgstr "Zastavit filtrování"
 msgid "Action configuration"
 msgstr "Nastavení akcí"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1892
+#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1888
 #: src/prefs_matcher.c:583
 msgid "Rule"
 msgstr "Pravidlo"
@@ -14138,65 +14244,65 @@ msgstr "Pravidlo"
 msgid "Action"
 msgstr "Akce"
 
-#: src/prefs_filtering_action.c:933
+#: src/prefs_filtering_action.c:935
 msgid "Command-line not set"
 msgstr "Příkazová řádka není nastavena"
 
-#: src/prefs_filtering_action.c:934
+#: src/prefs_filtering_action.c:936
 msgid "Destination is not set."
 msgstr "Místo určení není nastaveno."
 
-#: src/prefs_filtering_action.c:945
+#: src/prefs_filtering_action.c:947
 msgid "Recipient is not set."
 msgstr "Příjemce není nastaven."
 
-#: src/prefs_filtering_action.c:963
+#: src/prefs_filtering_action.c:965
 msgid "Score is not set"
 msgstr "Ohodnocení není nastaveno"
 
-#: src/prefs_filtering_action.c:971
+#: src/prefs_filtering_action.c:973
 msgid "Header is not set."
 msgstr "Záhlaví není nastaveno."
 
-#: src/prefs_filtering_action.c:978
+#: src/prefs_filtering_action.c:980
 msgid "Target addressbook/folder is not set."
 msgstr "Cílová kniha adres/složka není nastavena."
 
-#: src/prefs_filtering_action.c:992
+#: src/prefs_filtering_action.c:994
 msgid "Tag name is empty."
 msgstr "Jméno značky je prázdné."
 
-#: src/prefs_filtering_action.c:1214
+#: src/prefs_filtering_action.c:1216
 msgid "No action was defined."
 msgstr "Není nastavena žádná akce."
 
-#: src/prefs_filtering_action.c:1252 src/prefs_matcher.c:2147
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2153
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "Procento - znak %"
 
-#: src/prefs_filtering_action.c:1261 src/prefs_matcher.c:2156
+#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2162
 msgid "filename (should not be modified)"
 msgstr "název souboru (neměl by být měněn)"
 
-#: src/prefs_filtering_action.c:1262 src/prefs_matcher.c:2157
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2163
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "nový řádek"
 
-#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2158
+#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2164
 msgid "escape character for quotes"
 msgstr "únikový znak pro citaci"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2159
+#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2165
 msgid "quote character"
 msgstr "uvozovka (znak \")"
 
-#: src/prefs_filtering_action.c:1273
+#: src/prefs_filtering_action.c:1275
 msgid "Filtering Action: 'Execute'"
 msgstr "Filtrovací akce: 'Provést'"
 
-#: src/prefs_filtering_action.c:1274
+#: src/prefs_filtering_action.c:1276
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
@@ -14206,23 +14312,23 @@ msgstr ""
 "skriptu.\n"
 "Při definici mohou být použity následující symboly:"
 
-#: src/prefs_filtering_action.c:1420
+#: src/prefs_filtering_action.c:1422
 msgid "Recipient"
 msgstr "Příjemce"
 
-#: src/prefs_filtering_action.c:1424
+#: src/prefs_filtering_action.c:1426
 msgid "Book/Folder"
 msgstr "Kniha/složka"
 
-#: src/prefs_filtering_action.c:1428
+#: src/prefs_filtering_action.c:1430
 msgid "Destination"
 msgstr "Místo určení"
 
-#: src/prefs_filtering_action.c:1432
+#: src/prefs_filtering_action.c:1434
 msgid "Color"
 msgstr "Barva"
 
-#: src/prefs_filtering_action.c:1518
+#: src/prefs_filtering_action.c:1520
 msgid "Current action list"
 msgstr "Platný seznam akcí"
 
@@ -14230,8 +14336,8 @@ msgstr "Platný seznam akcí"
 msgid "Filtering/Processing configuration"
 msgstr "Nastavení filtrování/zpracování"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:864
-#: src/prefs_filtering.c:978
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
+#: src/prefs_filtering.c:981
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "všechny"
@@ -14240,9 +14346,13 @@ msgstr "všechny"
 msgid "Condition"
 msgstr "Podmínka"
 
-#: src/prefs_filtering.c:424 src/prefs_filtering.c:446
-msgid " Define... "
-msgstr " Definovat ... "
+#: src/prefs_filtering.c:424
+msgid " D_efine... "
+msgstr " D_efinovat"
+
+#: src/prefs_filtering.c:446
+msgid " De_fine... "
+msgstr " De_finovat"
 
 #: src/prefs_filtering.c:475
 msgid "Append the new rule above to the list"
@@ -14252,87 +14362,87 @@ msgstr "Přidat pravidlo nahoře do seznamu"
 msgid "Replace the selected rule in list with the rule above"
 msgstr "Nahradit vybrané pravidlo pravidlem nahoře"
 
-#: src/prefs_filtering.c:492
+#: src/prefs_filtering.c:493
 msgid "Delete the selected rule from the list"
 msgstr "Odstranit vybrané pravidlo ze seznamu"
 
-#: src/prefs_filtering.c:529
+#: src/prefs_filtering.c:532
 msgid "Move the selected rule to the top"
 msgstr "Přesunout vybrané pravidlo na vrchol"
 
-#: src/prefs_filtering.c:532
-msgid "Page up"
-msgstr "O stránku výš"
+#: src/prefs_filtering.c:535
+msgid "Page u_p"
+msgstr "O stránku _výš"
 
-#: src/prefs_filtering.c:540
+#: src/prefs_filtering.c:543
 msgid "Move the selected rule one page up"
 msgstr "Přesunout vybrané pravidlo o stránku výš"
 
-#: src/prefs_filtering.c:549
+#: src/prefs_filtering.c:552
 msgid "Move the selected rule up"
 msgstr "Posunout vybrané pravidlo nahoru"
 
-#: src/prefs_filtering.c:557
+#: src/prefs_filtering.c:560
 msgid "Move the selected rule down"
 msgstr "Posunout vybrané pravidlo dolu"
 
-#: src/prefs_filtering.c:560
-msgid "Page down"
-msgstr "O stránku dolu"
+#: src/prefs_filtering.c:563
+msgid "Page dow_n"
+msgstr "O stránku _dolu"
 
-#: src/prefs_filtering.c:568
+#: src/prefs_filtering.c:571
 msgid "Move the selected rule one page down"
 msgstr "Přesunout vybrané pravidlo o stránku níže"
 
-#: src/prefs_filtering.c:577
+#: src/prefs_filtering.c:580
 msgid "Move the selected rule to the bottom"
 msgstr "Přesunout vybrané pravidlo dospodu"
 
-#: src/prefs_filtering.c:1035 src/prefs_filtering.c:1121
+#: src/prefs_filtering.c:1038 src/prefs_filtering.c:1124
 msgid "Condition string is not valid."
 msgstr "Definice podmínky není platná."
 
-#: src/prefs_filtering.c:1108
+#: src/prefs_filtering.c:1111
 msgid "Condition string is empty."
 msgstr "Podmínka je prázdná."
 
-#: src/prefs_filtering.c:1114
+#: src/prefs_filtering.c:1117
 msgid "Action string is empty."
 msgstr "Akce je prázdná."
 
-#: src/prefs_filtering.c:1202
+#: src/prefs_filtering.c:1205
 msgid "Delete rule"
 msgstr "Odstranit pravidlo"
 
-#: src/prefs_filtering.c:1203
+#: src/prefs_filtering.c:1206
 msgid "Do you really want to delete this rule?"
 msgstr "Opravdu chcete odstranit toto pravidlo?"
 
-#: src/prefs_filtering.c:1221
+#: src/prefs_filtering.c:1224
 msgid "Delete all rules"
 msgstr "Odstranit všechna pravidla"
 
-#: src/prefs_filtering.c:1222
+#: src/prefs_filtering.c:1225
 msgid "Do you really want to delete all the rules?"
 msgstr "Opravdu chcete odstranit všechna pravidla?"
 
-#: src/prefs_filtering.c:1474
+#: src/prefs_filtering.c:1477
 msgid "Filtering rules not saved"
 msgstr "Pravidla filtrování neuložena"
 
-#: src/prefs_filtering.c:1475
+#: src/prefs_filtering.c:1478
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "Seznam pravidel filtrování byl změněn. Přesto zavřít?"
 
-#: src/prefs_filtering.c:1697
+#: src/prefs_filtering.c:1700
 msgid "Move one page up"
 msgstr "Přesunout o stránku výš"
 
-#: src/prefs_filtering.c:1698
+#: src/prefs_filtering.c:1701
 msgid "Move one page down"
 msgstr "Jít o stránku dolů"
 
-#: src/prefs_filtering.c:1860
+#: src/prefs_filtering.c:1856
 msgid "Enable"
 msgstr "Povolit"
 
@@ -14358,7 +14468,7 @@ msgid "Displayed columns"
 msgstr "Zobrazené sloupce"
 
 #: src/prefs_folder_column.c:329 src/prefs_msg_colors.c:494
-#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1055
+#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1064
 msgid " Use default "
 msgstr " Použít výchozí "
 
@@ -14516,7 +14626,7 @@ msgstr "Vlastnosti složky %s"
 msgid "Folder and Message Lists"
 msgstr "Seznam složek a seznam zpráv"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2024
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2030
 msgid "Message"
 msgstr "Text zprávy"
 
@@ -14549,7 +14659,7 @@ msgstr "Zobrazení"
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/prefs_gtk.c:938 src/toolbar.c:212 src/toolbar.c:421
+#: src/prefs_gtk.c:938 src/toolbar.c:213 src/toolbar.c:422
 msgid "Preferences"
 msgstr "Předvolby"
 
@@ -14765,11 +14875,11 @@ msgstr "část těla"
 msgid "whole message"
 msgstr "celá zpráva"
 
-#: src/prefs_matcher.c:389 src/summaryview.c:6309
+#: src/prefs_matcher.c:389 src/summaryview.c:6298
 msgid "Marked"
 msgstr "Označené"
 
-#: src/prefs_matcher.c:390 src/summaryview.c:6307
+#: src/prefs_matcher.c:390 src/summaryview.c:6296
 msgid "Deleted"
 msgstr "Odstraněné"
 
@@ -14777,12 +14887,12 @@ msgstr "Odstraněné"
 msgid "Replied"
 msgstr "Odpovězené"
 
-#: src/prefs_matcher.c:392 src/summaryview.c:6301
+#: src/prefs_matcher.c:392 src/summaryview.c:6290
 msgid "Forwarded"
 msgstr "Předané"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6291 src/toolbar.c:414
-#: src/toolbar.c:950 src/toolbar.c:1996
+#: src/prefs_matcher.c:394 src/summaryview.c:6280 src/toolbar.c:415
+#: src/toolbar.c:951 src/toolbar.c:1997
 msgid "Spam"
 msgstr "Spam"
 
@@ -14790,7 +14900,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Má přílohu"
 
-#: src/prefs_matcher.c:396 src/summaryview.c:6327
+#: src/prefs_matcher.c:396 src/summaryview.c:6316
 msgid "Signed"
 msgstr "Podepsané"
 
@@ -14890,54 +15000,54 @@ msgstr "Částečně staženo"
 msgid "External program test"
 msgstr "Test externího programu"
 
-#: src/prefs_matcher.c:707 src/prefs_matcher.c:1598 src/prefs_matcher.c:1613
-#: src/prefs_matcher.c:2495
+#: src/prefs_matcher.c:707 src/prefs_matcher.c:1604 src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:2501
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "všechny"
 
-#: src/prefs_matcher.c:739
+#: src/prefs_matcher.c:741
 msgid "Use regexp"
 msgstr "Použít regulární výraz"
 
-#: src/prefs_matcher.c:812
+#: src/prefs_matcher.c:818
 msgid "Message must match"
 msgstr "Zpráva musí odpovídat"
 
-#: src/prefs_matcher.c:816
+#: src/prefs_matcher.c:822
 msgid "at least one"
 msgstr "nejméně jeden"
 
-#: src/prefs_matcher.c:817
+#: src/prefs_matcher.c:823
 msgid "all"
 msgstr "vše"
 
-#: src/prefs_matcher.c:820
+#: src/prefs_matcher.c:826
 msgid "of above rules"
 msgstr "výše uvedenými pravidly"
 
-#: src/prefs_matcher.c:1516 src/prefs_matcher.c:1582
+#: src/prefs_matcher.c:1522 src/prefs_matcher.c:1588
 msgid "Search pattern is not set."
 msgstr "Není nastaven vzor pro vyhledávání."
 
-#: src/prefs_matcher.c:1525
+#: src/prefs_matcher.c:1531
 msgid "Test command is not set."
 msgstr "Není nastaven test příkazu."
 
-#: src/prefs_matcher.c:1599
+#: src/prefs_matcher.c:1605
 msgid "all addresses in all headers"
 msgstr "každá adresa ze všech položek záhlaví zprávy"
 
-#: src/prefs_matcher.c:1602
+#: src/prefs_matcher.c:1608
 msgid "any address in any header"
 msgstr "libovolná adresa z libovolného záhlaví zprávy"
 
-#: src/prefs_matcher.c:1604
+#: src/prefs_matcher.c:1610
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "adresa ze záhlaví '%s' zprávy"
 
-#: src/prefs_matcher.c:1605
+#: src/prefs_matcher.c:1611
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -14950,79 +15060,79 @@ msgstr ""
 "Pokud chcete zjišťovat zda %s existuje v rámci celé knihy, vyberte '%s' z "
 "knihy/složky přetáhněte do seznamu."
 
-#: src/prefs_matcher.c:1824
+#: src/prefs_matcher.c:1830
 msgid "Headers part"
 msgstr "Část záhlaví"
 
-#: src/prefs_matcher.c:1828
+#: src/prefs_matcher.c:1834
 msgid "Body part"
 msgstr "Část těla"
 
-#: src/prefs_matcher.c:1832
+#: src/prefs_matcher.c:1838
 msgid "Whole message"
 msgstr "Celá zpráva"
 
-#: src/prefs_matcher.c:1951 src/prefs_matcher.c:1995
+#: src/prefs_matcher.c:1957 src/prefs_matcher.c:2001
 msgid "in"
 msgstr "v"
 
-#: src/prefs_matcher.c:1953
+#: src/prefs_matcher.c:1959
 msgid "content is"
 msgstr "obsahuje"
 
-#: src/prefs_matcher.c:1962
+#: src/prefs_matcher.c:1968
 msgid "Age is"
 msgstr "Věk je"
 
-#: src/prefs_matcher.c:1967
+#: src/prefs_matcher.c:1973
 msgid "Flag"
 msgstr "Příznak"
 
-#: src/prefs_matcher.c:1968 src/prefs_matcher.c:1985
+#: src/prefs_matcher.c:1974 src/prefs_matcher.c:1991
 msgid "is"
 msgstr "je"
 
-#: src/prefs_matcher.c:1973
+#: src/prefs_matcher.c:1979
 msgid "Name:"
 msgstr "Jméno: "
 
-#: src/prefs_matcher.c:1984
+#: src/prefs_matcher.c:1990
 msgid "Label"
 msgstr "Označení"
 
-#: src/prefs_matcher.c:1990
+#: src/prefs_matcher.c:1996
 msgid "Value:"
 msgstr "Hodnota:"
 
-#: src/prefs_matcher.c:2007
+#: src/prefs_matcher.c:2013
 msgid "Score is"
 msgstr "Skóre je"
 
-#: src/prefs_matcher.c:2008
+#: src/prefs_matcher.c:2014
 msgid "points"
 msgstr "body"
 
-#: src/prefs_matcher.c:2018
+#: src/prefs_matcher.c:2024
 msgid "Size is"
 msgstr "Velikost je"
 
-#: src/prefs_matcher.c:2023
+#: src/prefs_matcher.c:2029
 msgid "Scope:"
 msgstr "Rozsah:"
 
-#: src/prefs_matcher.c:2025
+#: src/prefs_matcher.c:2031
 msgid "tags"
 msgstr "značky"
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2036
 msgid "type is"
 msgstr "typ je"
 
-#: src/prefs_matcher.c:2034
+#: src/prefs_matcher.c:2040
 msgid "Program returns"
 msgstr "Návratové hodnoty programu"
 
-#: src/prefs_matcher.c:2104
+#: src/prefs_matcher.c:2110
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -15030,11 +15140,11 @@ msgstr ""
 "Záznam nebyl uložen.\n"
 "Chcete přesto okno zavřít?"
 
-#: src/prefs_matcher.c:2168
+#: src/prefs_matcher.c:2174
 msgid "Match Type: 'Test'"
 msgstr "Typ podmínky: 'Test'"
 
-#: src/prefs_matcher.c:2169
+#: src/prefs_matcher.c:2175
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -15046,7 +15156,7 @@ msgstr ""
 "\n"
 "Následující symboly mohou být použity:"
 
-#: src/prefs_matcher.c:2268
+#: src/prefs_matcher.c:2274
 msgid "Current condition rules"
 msgstr "Aktuální pravidla podmínky"
 
@@ -15216,10 +15326,6 @@ msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Vybrat barvu pro podpisy"
 
-#: src/prefs_msg_colors.c:362
-msgid "Signatures"
-msgstr "Podpisy"
-
 #: src/prefs_msg_colors.c:367 src/prefs_summaries.c:354
 msgid "Folder list"
 msgstr "Seznam složek"
@@ -15445,71 +15551,71 @@ msgstr "Různé"
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Dne %d\\n%f napsal(a):\\n\\n%q"
 
-#: src/prefs_receive.c:137
+#: src/prefs_receive.c:123
 msgid "External incorporation program"
 msgstr "Externí program pro příjem"
 
-#: src/prefs_receive.c:140
+#: src/prefs_receive.c:126
 msgid "Use external program for receiving mail"
 msgstr "Použít externí program pro příjem zpráv"
 
-#: src/prefs_receive.c:156
+#: src/prefs_receive.c:142
 msgid "Automatic checking"
 msgstr "Automatický příjem pošty"
 
-#: src/prefs_receive.c:163
+#: src/prefs_receive.c:149
 msgid "Check for new mail every"
 msgstr "Přijímat poštu každých"
 
-#: src/prefs_receive.c:181
+#: src/prefs_receive.c:167
 msgid "Check for new mail on start-up"
 msgstr "Přijmout poštu po spuštění"
 
-#: src/prefs_receive.c:184
+#: src/prefs_receive.c:170
 msgid "Dialogs"
 msgstr "Dialogy"
 
-#: src/prefs_receive.c:186
+#: src/prefs_receive.c:172
 msgid "Show receive dialog"
 msgstr "Zobrazit dialogové okno o přijetí"
 
-#: src/prefs_receive.c:196
+#: src/prefs_receive.c:182
 msgid "Only on manual receiving"
 msgstr "Pouze při ručním příjmu"
 
-#: src/prefs_receive.c:207
+#: src/prefs_receive.c:193
 msgid "Close receive dialog when finished"
 msgstr "Zavřít po dokončení"
 
-#: src/prefs_receive.c:210
+#: src/prefs_receive.c:196
 msgid "Don't popup error dialog on receive error"
 msgstr "Nezobrazovat dialog o chybě v příjmu zpráv"
 
-#: src/prefs_receive.c:213
-msgid "After checking for new mail"
+#: src/prefs_receive.c:199
+msgid "After receiving new mail"
 msgstr "Po přijetí nových zpráv"
 
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:201
 msgid "Go to Inbox"
 msgstr "Přejít do složky \"Doručená pošta\""
 
-#: src/prefs_receive.c:217
+#: src/prefs_receive.c:203
 msgid "Update all local folders"
 msgstr "Aktualizovat všechny lokální složky"
 
-#: src/prefs_receive.c:220
+#: src/prefs_receive.c:205
 msgid "Run command"
 msgstr "Spustit příkaz"
 
-#: src/prefs_receive.c:225
+#: src/prefs_receive.c:210
 msgid "after automatic check"
 msgstr "po automatickém příjmu"
 
-#: src/prefs_receive.c:227
+#: src/prefs_receive.c:212
 msgid "after manual check"
 msgstr "po ručním příjmu"
 
-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:220
 #, c-format
 msgid ""
 "Command to execute:\n"
@@ -15518,47 +15624,39 @@ msgstr ""
 "Příkaz:\n"
 "(použijte %d jako počet nových zpráv)"
 
-#: src/prefs_receive.c:260
-msgid "Blink LED"
-msgstr "Blikat LEDkou"
-
-#: src/prefs_receive.c:261
-msgid "Play sound"
-msgstr "Přehrát zvuk"
-
-#: src/prefs_receive.c:263
-msgid "Show info banner"
-msgstr "Zobrazit informační banner"
-
-#: src/prefs_receive.c:397 src/prefs_send.c:348
+#: src/prefs_receive.c:343 src/prefs_send.c:357
 msgid "Mail Handling"
 msgstr "Zpracování pošty"
 
-#: src/prefs_receive.c:398
+#: src/prefs_receive.c:344
 msgid "Receiving"
 msgstr "Příjem zpráv"
 
-#: src/prefs_send.c:159
+#: src/prefs_send.c:161
 msgid "Save sent messages to Sent folder"
 msgstr "Uložit odeslané zprávy do složky Odeslaná pošta"
 
-#: src/prefs_send.c:162
+#: src/prefs_send.c:164
 msgid "Confirm before sending queued messages"
 msgstr "Potvrzení před odesláním pozdržených zpráv"
 
-#: src/prefs_send.c:165
+#: src/prefs_send.c:167
 msgid "Never send Return Receipts"
 msgstr "Nikdy neodesílat potvrzení o doručení"
 
-#: src/prefs_send.c:168
+#: src/prefs_send.c:170
 msgid "Show send dialog"
 msgstr "Zobrazit dialog o odesílání"
 
-#: src/prefs_send.c:176
+#: src/prefs_send.c:172
+msgid "Warn when Subject is empty"
+msgstr "Varovat, když je Předmět prázdný"
+
+#: src/prefs_send.c:180
 msgid "Outgoing encoding"
 msgstr "Kódování znaků"
 
-#: src/prefs_send.c:201
+#: src/prefs_send.c:205
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
@@ -15566,131 +15664,131 @@ msgstr ""
 "Pokud je zvoleno 'Autodetekce', bude použita optimální znaková sada pro "
 "nastavené locale"
 
-#: src/prefs_send.c:216
+#: src/prefs_send.c:220
 msgid "Automatic (Recommended)"
 msgstr "Autodetekce (doporučeno)"
 
-#: src/prefs_send.c:218
+#: src/prefs_send.c:222
 msgid "7bit ASCII (US-ASCII)"
 msgstr "7bitové ASCII (US-ASCII)"
 
-#: src/prefs_send.c:219
+#: src/prefs_send.c:223
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_send.c:221
+#: src/prefs_send.c:225
 msgid "Western European (ISO-8859-1)"
 msgstr "Západní Evropa (ISO-8859-1)"
 
-#: src/prefs_send.c:222
+#: src/prefs_send.c:226
 msgid "Western European (ISO-8859-15)"
 msgstr "Západní Evropa(ISO-8859-15)"
 
-#: src/prefs_send.c:224
+#: src/prefs_send.c:228
 msgid "Central European (ISO-8859-2)"
 msgstr "Střední Evropa (ISO-8859-2)"
 
-#: src/prefs_send.c:226
+#: src/prefs_send.c:230
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltí (ISO-8859-13)"
 
-#: src/prefs_send.c:227
+#: src/prefs_send.c:231
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltí (ISO-8859-4)"
 
-#: src/prefs_send.c:229
+#: src/prefs_send.c:233
 msgid "Greek (ISO-8859-7)"
 msgstr "Řečtina (ISO-8859-7)"
 
-#: src/prefs_send.c:231
+#: src/prefs_send.c:235
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrejština (ISO-8859-8)"
 
-#: src/prefs_send.c:232
+#: src/prefs_send.c:236
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrejština (Windows-1255)"
 
-#: src/prefs_send.c:234
+#: src/prefs_send.c:238
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabština (ISO-8859-6)"
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:239
 msgid "Arabic (Windows-1256)"
 msgstr "Arabština (Windows-1256)"
 
-#: src/prefs_send.c:237
+#: src/prefs_send.c:241
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turečtina (ISO-8859-9)"
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:243
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Azbuka (ISO-8859-5)"
 
-#: src/prefs_send.c:240
+#: src/prefs_send.c:244
 msgid "Cyrillic (KOI8-R)"
 msgstr "Azbuka (KOI8-R)"
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:245
 msgid "Cyrillic (KOI8-U)"
 msgstr "Azbuka (KOI8-U)"
 
-#: src/prefs_send.c:242
+#: src/prefs_send.c:246
 msgid "Cyrillic (Windows-1251)"
 msgstr "Azbuka (Windows-1251)"
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:248
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonština (ISO-2022-JP)"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:250
 msgid "Japanese (EUC-JP)"
 msgstr "Japonština (EUC-JP)"
 
-#: src/prefs_send.c:247
+#: src/prefs_send.c:251
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonština (Shift_JIS)"
 
-#: src/prefs_send.c:250
+#: src/prefs_send.c:254
 msgid "Simplified Chinese (GB18030)"
 msgstr "Zjednodušená čínština (GB18030)"
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:255
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínština (GB2312)"
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:256
 msgid "Simplified Chinese (GBK)"
 msgstr "Zjednodušená čínština (GBK)"
 
-#: src/prefs_send.c:253
+#: src/prefs_send.c:257
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradiční čínština (Big5)"
 
-#: src/prefs_send.c:255
+#: src/prefs_send.c:259
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradiční čínština (EUC-TW)"
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:260
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínština (ISO-2022-CN)"
 
-#: src/prefs_send.c:259
+#: src/prefs_send.c:263
 msgid "Korean (EUC-KR)"
 msgstr "Korejština (EUC-KR)"
 
-#: src/prefs_send.c:261
+#: src/prefs_send.c:265
 msgid "Thai (TIS-620)"
 msgstr "Thajština (TIS-620)"
 
-#: src/prefs_send.c:262
+#: src/prefs_send.c:266
 msgid "Thai (Windows-874)"
 msgstr "Thajština (Windows-874)"
 
-#: src/prefs_send.c:266
+#: src/prefs_send.c:270
 msgid "Transfer encoding"
 msgstr "Kódování přenosu"
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:281
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
@@ -15698,8 +15796,8 @@ msgstr ""
 "Určete kódování (Content-Transfer-Encoding), které bude použito, pokud "
 "zpráva obsahuje znaky neobsažené v ASCII"
 
-#: src/prefs_send.c:349 src/send_message.c:480 src/send_message.c:484
-#: src/send_message.c:489
+#: src/prefs_send.c:358 src/send_message.c:491 src/send_message.c:495
+#: src/send_message.c:500
 msgid "Sending"
 msgstr "Odesílání"
 
@@ -16022,87 +16120,87 @@ msgstr "Přidat novou šablonu do seznamu"
 msgid "Replace the selected template in list with the template above"
 msgstr "Nahradit šablonu v seznamu šablonou z hora"
 
-#: src/prefs_template.c:324
+#: src/prefs_template.c:326
 msgid "Delete the selected template from the list"
 msgstr "Odstranit vybrané šablony ze seznamu"
 
-#: src/prefs_template.c:340
+#: src/prefs_template.c:344
 msgid "Show information on configuring templates"
 msgstr "Zobrazit informace o konfiguraci šablon"
 
-#: src/prefs_template.c:364
+#: src/prefs_template.c:368
 msgid "Move the selected template to the top"
 msgstr "Přesunout vybrané šablony nahoru."
 
-#: src/prefs_template.c:374
+#: src/prefs_template.c:378
 msgid "Move the selected template up"
 msgstr "Posunout vybranou šablonu nahoru"
 
-#: src/prefs_template.c:382
+#: src/prefs_template.c:386
 msgid "Move the selected template down"
 msgstr "Posunout vybranou šablonu dolů"
 
-#: src/prefs_template.c:392
+#: src/prefs_template.c:396
 msgid "Move the selected template to the bottom"
 msgstr "Přesunout vybrané šablony dolů."
 
-#: src/prefs_template.c:408
+#: src/prefs_template.c:412
 msgid "Template configuration"
 msgstr "Nastavení šablon"
 
-#: src/prefs_template.c:595
+#: src/prefs_template.c:599
 msgid "Templates list not saved"
 msgstr "Seznam šablon neuložen"
 
-#: src/prefs_template.c:596
+#: src/prefs_template.c:600
 msgid "The templates list has been modified. Close anyway?"
 msgstr "Seznam šablon změněn. Chcete přesto zavřít?"
 
-#: src/prefs_template.c:757
+#: src/prefs_template.c:761
 msgid "The template's name is not set."
 msgstr "Název šablony není nastaven."
 
-#: src/prefs_template.c:794
+#: src/prefs_template.c:798
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "Pole \"Od\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:800
+#: src/prefs_template.c:804
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "Pole \"Komu\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:806
+#: src/prefs_template.c:810
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "Pole \"Kopie\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:812
+#: src/prefs_template.c:816
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "Pole \"Skrytá kopie\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:818
+#: src/prefs_template.c:822
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "Pole \"Předmět\" šablony je neplatné."
 
-#: src/prefs_template.c:888
+#: src/prefs_template.c:892
 msgid "Delete template"
 msgstr "Odstranit šablonu"
 
-#: src/prefs_template.c:889
+#: src/prefs_template.c:893
 msgid "Do you really want to delete this template?"
 msgstr "Opravdu chcete odstranit tuto šablonu?"
 
-#: src/prefs_template.c:901
+#: src/prefs_template.c:905
 msgid "Delete all templates"
 msgstr "Odstranit všechny šablony"
 
-#: src/prefs_template.c:902
+#: src/prefs_template.c:906
 msgid "Do you really want to delete all the templates?"
 msgstr "Opravdu chcete odstranit všechny šablony?"
 
-#: src/prefs_template.c:1224
+#: src/prefs_template.c:1221
 msgid "Current templates"
 msgstr "Aktuální šablony"
 
-#: src/prefs_template.c:1252
+#: src/prefs_template.c:1249
 msgid "Template"
 msgstr "Šablona"
 
@@ -16244,6 +16342,10 @@ msgstr "Výběr"
 msgid "Install new..."
 msgstr "Instalovat nový..."
 
+#: src/prefs_themes.c:843
+msgid "Get more..."
+msgstr "Získat další..."
+
 #: src/prefs_themes.c:854
 msgid "Information"
 msgstr "Informace"
@@ -16280,63 +16382,67 @@ msgstr "Položka nemá definovanou žádnou ikonu."
 msgid "Item has no text defined."
 msgstr "Položka nemá definován žádný text."
 
-#: src/prefs_toolbar.c:911
+#: src/prefs_toolbar.c:916
 msgid "Toolbar item"
 msgstr "Položka nástrojové lišty"
 
-#: src/prefs_toolbar.c:927
+#: src/prefs_toolbar.c:932
 msgid "Item type"
 msgstr "Typ položky"
 
-#: src/prefs_toolbar.c:937
+#: src/prefs_toolbar.c:942
 msgid "Internal Function"
 msgstr "Vnitřní funkce"
 
-#: src/prefs_toolbar.c:938
+#: src/prefs_toolbar.c:943
 msgid "User Action"
 msgstr "Uživatelské akce"
 
-#: src/prefs_toolbar.c:940 src/toolbar.c:232
+#: src/prefs_toolbar.c:945 src/toolbar.c:233
 msgid "Separator"
 msgstr "Separátor"
 
-#: src/prefs_toolbar.c:947
+#: src/prefs_toolbar.c:952
 msgid "Event executed on click"
 msgstr "Událost spuštěná po klepnutí"
 
-#: src/prefs_toolbar.c:986
+#: src/prefs_toolbar.c:991
 msgid "Toolbar text"
 msgstr "Text nástrojové lišty"
 
-#: src/prefs_toolbar.c:1001 src/prefs_toolbar.c:1372
+#: src/prefs_toolbar.c:1006 src/prefs_toolbar.c:1381
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/prefs_toolbar.c:1252 src/prefs_toolbar.c:1266 src/prefs_toolbar.c:1280
+#: src/prefs_toolbar.c:1042
+msgid "A_dd"
+msgstr "Při_dat"
+
+#: src/prefs_toolbar.c:1261 src/prefs_toolbar.c:1275 src/prefs_toolbar.c:1289
 msgid "Toolbars"
 msgstr "Nástrojová lišta"
 
-#: src/prefs_toolbar.c:1253
+#: src/prefs_toolbar.c:1262
 msgid "Main Window"
 msgstr "Hlavní okno"
 
-#: src/prefs_toolbar.c:1267
+#: src/prefs_toolbar.c:1276
 msgid "Message Window"
 msgstr "Okno zpráv"
 
-#: src/prefs_toolbar.c:1281
+#: src/prefs_toolbar.c:1290
 msgid "Compose Window"
 msgstr "Okno pro psaní zprávy"
 
-#: src/prefs_toolbar.c:1395
+#: src/prefs_toolbar.c:1404
 msgid "Icon text"
 msgstr "Text ikony"
 
-#: src/prefs_toolbar.c:1404
+#: src/prefs_toolbar.c:1413
 msgid "Mapped event"
 msgstr "Namapovaná událost"
 
-#: src/prefs_toolbar.c:1701
+#: src/prefs_toolbar.c:1710
 msgid "Toolbar item icon"
 msgstr "Ikony nástrojové lišty"
 
@@ -16405,7 +16511,7 @@ msgstr "Žádné informace nejsou dostupné"
 msgid "No recipient keys defined."
 msgstr "Nejsou definovány klíče příjemce."
 
-#: src/procmime.c:419 src/procmime.c:421 src/procmime.c:422
+#: src/procmime.c:422 src/procmime.c:424 src/procmime.c:425
 msgid "[Error decoding BASE64]\n"
 msgstr "[Chyba při dekódování BASE64]\n"
 
@@ -16440,7 +16546,7 @@ msgstr ""
 
 #: src/procmsg.c:1732
 msgid ""
-"Couldn't determine sending informations. Maybe the email hasn't been "
+"Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
 "Nepodařilo se zjistit informace nutné pro odeslání. Tento e-mail "
@@ -16771,73 +16877,73 @@ msgstr "Nemohu provést příkaz: %s"
 msgid "Error occurred while executing command: %s"
 msgstr "Nastala chyba během provádění příkazu: %s"
 
-#: src/send_message.c:328
+#: src/send_message.c:339
 msgid "Connecting"
 msgstr "Připojení"
 
-#: src/send_message.c:333
+#: src/send_message.c:344
 msgid "Doing POP before SMTP..."
 msgstr "Provádím POP před SMTP..."
 
-#: src/send_message.c:336
+#: src/send_message.c:347
 msgid "POP before SMTP"
 msgstr "POP před SMTP"
 
-#: src/send_message.c:341
+#: src/send_message.c:352
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Účet '%s': Připojuji se na SMTP server: %s:%d ..."
 
-#: src/send_message.c:398
+#: src/send_message.c:409
 msgid "Mail sent successfully."
 msgstr "Pošta byla úspěšně odeslána."
 
-#: src/send_message.c:465
+#: src/send_message.c:476
 msgid "Sending HELO..."
 msgstr "Posílám HELO..."
 
-#: src/send_message.c:466 src/send_message.c:471 src/send_message.c:476
+#: src/send_message.c:477 src/send_message.c:482 src/send_message.c:487
 msgid "Authenticating"
 msgstr "Autentizuji"
 
-#: src/send_message.c:467 src/send_message.c:472
+#: src/send_message.c:478 src/send_message.c:483
 msgid "Sending message..."
 msgstr "Posílám zprávu..."
 
-#: src/send_message.c:470
+#: src/send_message.c:481
 msgid "Sending EHLO..."
 msgstr "Posílám EHLO..."
 
-#: src/send_message.c:479
+#: src/send_message.c:490
 msgid "Sending MAIL FROM..."
 msgstr "Posílám MAIL FROM..."
 
-#: src/send_message.c:483
+#: src/send_message.c:494
 msgid "Sending RCPT TO..."
 msgstr "Posílám RCPT TO..."
 
-#: src/send_message.c:488
+#: src/send_message.c:499
 msgid "Sending DATA..."
 msgstr "Posílám DATA..."
 
-#: src/send_message.c:492
+#: src/send_message.c:503
 msgid "Quitting..."
 msgstr "Ukončuji..."
 
-#: src/send_message.c:521
+#: src/send_message.c:532
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Posílám zprávu (%d / %d bytů)"
 
-#: src/send_message.c:574
+#: src/send_message.c:585
 msgid "Sending message"
 msgstr "Posílám zprávu"
 
-#: src/send_message.c:643 src/send_message.c:663
+#: src/send_message.c:654 src/send_message.c:674
 msgid "Error occurred while sending the message."
 msgstr "Nastala chyba při posílání zprávy."
 
-#: src/send_message.c:646
+#: src/send_message.c:657
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -16883,40 +16989,40 @@ msgstr "Odstranit certifikát"
 msgid "Do you really want to delete this certificate?"
 msgstr "Opravdu chcete odstranit tento certifikát?"
 
-#: src/summary_search.c:266
+#: src/summary_search.c:271
 msgid "Search messages"
 msgstr "Hledat zprávy v aktuální složce"
 
-#: src/summary_search.c:292
+#: src/summary_search.c:293
 msgid "Match any of the following"
 msgstr "Zprávy splňující KTEROUKOLI podmínku"
 
-#: src/summary_search.c:294
+#: src/summary_search.c:295
 msgid "Match all of the following"
 msgstr "Zprávy splňující VŠECHNY podmínky"
 
-#: src/summary_search.c:433
+#: src/summary_search.c:459
 msgid "Body:"
 msgstr "Tělo:"
 
-#: src/summary_search.c:440
+#: src/summary_search.c:466
 msgid "Condition:"
 msgstr "Podmínka:"
 
-#: src/summary_search.c:470
+#: src/summary_search.c:496
 msgid "Find _all"
 msgstr "Najít _všechny"
 
-#: src/summary_search.c:679 src/summaryview.c:1105 src/summaryview.c:1366
+#: src/summary_search.c:702 src/summaryview.c:1105 src/summaryview.c:1366
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Hledám v %s... \n"
 
-#: src/summary_search.c:776
+#: src/summary_search.c:799
 msgid "Beginning of list reached; continue from end?"
 msgstr "Dosažen začátek seznamu, pokračovat od konce?"
 
-#: src/summary_search.c:778
+#: src/summary_search.c:801
 msgid "End of list reached; continue from beginning?"
 msgstr "Dosažen konec seznamu, pokračovat od začátku?"
 
@@ -17089,19 +17195,19 @@ msgstr "%d/%d vybráno (%s/%s), %d nepřečteno"
 msgid "Sorting summary..."
 msgstr "Celkové setřídění..."
 
-#: src/summaryview.c:3110
+#: src/summaryview.c:3111
 msgid "Setting summary from message data..."
 msgstr "Nastavuji přehled z dat zpráv..."
 
-#: src/summaryview.c:3314
+#: src/summaryview.c:3316
 msgid "(No Date)"
 msgstr "(Žádné datum)"
 
-#: src/summaryview.c:3365
+#: src/summaryview.c:3367
 msgid "(No Recipient)"
 msgstr "(Žádný příjemce)"
 
-#: src/summaryview.c:3400
+#: src/summaryview.c:3402
 #, c-format
 msgid ""
 "%s\n"
@@ -17110,7 +17216,7 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Od: %s, on %s</span>"
 
-#: src/summaryview.c:3407
+#: src/summaryview.c:3409
 #, c-format
 msgid ""
 "%s\n"
@@ -17119,11 +17225,11 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Komu: %s, on %s</span>"
 
-#: src/summaryview.c:4288
+#: src/summaryview.c:4286
 msgid "You're not the author of the article.\n"
 msgstr "Nejste autorem tohoto příspěvku.\n"
 
-#: src/summaryview.c:4380
+#: src/summaryview.c:4379
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
@@ -17131,62 +17237,62 @@ msgstr[0] "Opravdu chcete odstranit %d vybranou zprávu?"
 msgstr[1] "Opravdu chcete odstranit %d vybrané zprávy?"
 msgstr[2] "Opravdu chcete odstranit %d vybraných zpráv?"
 
-#: src/summaryview.c:4383
+#: src/summaryview.c:4382
 msgid "Delete message(s)"
 msgstr "Odstranit zprávu(y)"
 
-#: src/summaryview.c:4548
+#: src/summaryview.c:4545
 msgid "Destination is same as current folder."
 msgstr "Cílová položka je stejná jako aktuální složka."
 
-#: src/summaryview.c:4647
+#: src/summaryview.c:4644
 msgid "Destination to copy is same as current folder."
 msgstr "Cíl kopírování je stejný jako aktuální složka."
 
-#: src/summaryview.c:4820
+#: src/summaryview.c:4817
 msgid "Append or Overwrite"
 msgstr "Přidat nebo přepsat"
 
-#: src/summaryview.c:4821
+#: src/summaryview.c:4818
 msgid "Append or overwrite existing file?"
 msgstr "Přidat nebo přepsat existující soubor?"
 
-#: src/summaryview.c:4822
+#: src/summaryview.c:4819
 msgid "_Append"
 msgstr "_Přidat"
 
-#: src/summaryview.c:4822
+#: src/summaryview.c:4819
 msgid "_Overwrite"
 msgstr "Př_epsat"
 
-#: src/summaryview.c:4863
+#: src/summaryview.c:4860
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr ""
 "Chystáte se vytisknout okolo %d zpráv postupně po jedné. Chcete pokračovat?"
 
-#: src/summaryview.c:5340
+#: src/summaryview.c:5337
 msgid "Building threads..."
 msgstr "Vytvářím vlákna..."
 
-#: src/summaryview.c:5586
+#: src/summaryview.c:5583
 msgid "Skip these rules"
 msgstr "Přeskočit"
 
-#: src/summaryview.c:5589
+#: src/summaryview.c:5586
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Aplikovat bez ohledu na účet ke kterému jsou přiřazena"
 
-#: src/summaryview.c:5592
+#: src/summaryview.c:5589
 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplikovat, jsou-li přiřazena k aktuálnímu účtu"
 
-#: src/summaryview.c:5621
+#: src/summaryview.c:5618
 msgid "Filtering"
 msgstr "Filtrování"
 
-#: src/summaryview.c:5622
+#: src/summaryview.c:5619
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -17194,59 +17300,59 @@ msgstr ""
 "Některá filtrovací pravidla jsou přiřazena specifickým účtům.\n"
 "Zvolte prosím způsob aplikace těchto pravidel:"
 
-#: src/summaryview.c:5624
+#: src/summaryview.c:5621
 msgid "_Filter"
 msgstr "_Filtrovat"
 
-#: src/summaryview.c:5652
+#: src/summaryview.c:5649
 msgid "Filtering..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:5731
+#: src/summaryview.c:5728
 msgid "Processing configuration"
 msgstr "Zpracovávám nastavení"
 
-#: src/summaryview.c:6287
+#: src/summaryview.c:6276
 msgid "Ignored thread"
 msgstr "Ignorované vlákno"
 
-#: src/summaryview.c:6289
+#: src/summaryview.c:6278
 msgid "Watched thread"
 msgstr "Sledované vlákno"
 
-#: src/summaryview.c:6297
+#: src/summaryview.c:6286
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Odpovězeno ale také přeposláno - klikněte pro zobrazení odpovědi"
 
-#: src/summaryview.c:6299
+#: src/summaryview.c:6288
 msgid "Replied - click to see reply"
 msgstr "Odpovězeno - klikněte pro zobrazení odpovědi"
 
-#: src/summaryview.c:6311
+#: src/summaryview.c:6300
 msgid "To be moved"
 msgstr "K přesunutí"
 
-#: src/summaryview.c:6313
+#: src/summaryview.c:6302
 msgid "To be copied"
 msgstr "Bude zkopírováno"
 
-#: src/summaryview.c:6325
+#: src/summaryview.c:6314
 msgid "Signed, has attachment(s)"
 msgstr "Zpráva je podepsaná a má přílohu/přílohy"
 
-#: src/summaryview.c:6329
+#: src/summaryview.c:6318
 msgid "Encrypted, has attachment(s)"
 msgstr "Zpráva je šifrovaná a má přílohu/přílohy"
 
-#: src/summaryview.c:6331
+#: src/summaryview.c:6320
 msgid "Encrypted"
 msgstr "Šifrovaná zpráva"
 
-#: src/summaryview.c:6333
+#: src/summaryview.c:6322
 msgid "Has attachment(s)"
 msgstr "Má přílohu/přílohy"
 
-#: src/summaryview.c:7970
+#: src/summaryview.c:7952
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -17255,11 +17361,11 @@ msgstr ""
 "Chyba v regulárním výrazu (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8078
+#: src/summaryview.c:8060
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Přejít zpět na seznam složek (Máte nepřečtené zprávy)"
 
-#: src/summaryview.c:8083
+#: src/summaryview.c:8065
 msgid "Go back to the folder list"
 msgstr "Přejít zpět na seznam složek"
 
@@ -17418,274 +17524,278 @@ msgstr "Upozornění na možný pokus o podvrh"
 msgid "_Open URL"
 msgstr "_Otevřít URL"
 
-#: src/toolbar.c:191 src/toolbar.c:1948
+#: src/toolbar.c:192 src/toolbar.c:1949
 msgid "Receive Mail from all Accounts"
 msgstr "Přijmout poštu ze všech účtů"
 
-#: src/toolbar.c:192 src/toolbar.c:1953
+#: src/toolbar.c:193 src/toolbar.c:1954
 msgid "Receive Mail from current Account"
 msgstr "Přijmout poštu z aktuálního účtu"
 
-#: src/toolbar.c:193 src/toolbar.c:1957
+#: src/toolbar.c:194 src/toolbar.c:1958
 msgid "Send Queued Messages"
 msgstr "Odeslat pozdržené zprávy"
 
-#: src/toolbar.c:194 src/toolbar.c:918 src/toolbar.c:1975 src/toolbar.c:1986
+#: src/toolbar.c:195 src/toolbar.c:919 src/toolbar.c:1976 src/toolbar.c:1987
 msgid "Compose Email"
 msgstr "Napsat novou zprávu"
 
-#: src/toolbar.c:195
+#: src/toolbar.c:196
 msgid "Compose News"
 msgstr "Napsat diskusní příspěvek"
 
-#: src/toolbar.c:196 src/toolbar.c:2014 src/toolbar.c:2024
+#: src/toolbar.c:197 src/toolbar.c:2015 src/toolbar.c:2025
 msgid "Reply to Message"
 msgstr "Odpovědět na zprávu"
 
-#: src/toolbar.c:197 src/toolbar.c:2031 src/toolbar.c:2041
+#: src/toolbar.c:198 src/toolbar.c:2032 src/toolbar.c:2042
 msgid "Reply to Sender"
 msgstr "Odpovědět odesílateli"
 
-#: src/toolbar.c:198 src/toolbar.c:2048 src/toolbar.c:2058
+#: src/toolbar.c:199 src/toolbar.c:2049 src/toolbar.c:2059
 msgid "Reply to All"
 msgstr "Odpovědět všem"
 
-#: src/toolbar.c:199 src/toolbar.c:2065 src/toolbar.c:2075
+#: src/toolbar.c:200 src/toolbar.c:2066 src/toolbar.c:2076
 msgid "Reply to Mailing-list"
 msgstr "Odpovědět do konference"
 
-#: src/toolbar.c:200 src/toolbar.c:1969
+#: src/toolbar.c:201 src/toolbar.c:1970
 msgid "Open email"
 msgstr "Otevřít email"
 
-#: src/toolbar.c:201 src/toolbar.c:2082 src/toolbar.c:2093
+#: src/toolbar.c:202 src/toolbar.c:2083 src/toolbar.c:2094
 msgid "Forward Message"
 msgstr "Předat zprávu"
 
-#: src/toolbar.c:202 src/toolbar.c:2098
+#: src/toolbar.c:203 src/toolbar.c:2099
 msgid "Trash Message"
 msgstr "Hodit zprávu do koše"
 
-#: src/toolbar.c:203 src/toolbar.c:2102
+#: src/toolbar.c:204 src/toolbar.c:2103
 msgid "Delete Message"
 msgstr "Odstranit zprávu"
 
-#: src/toolbar.c:205 src/toolbar.c:2110
+#: src/toolbar.c:206 src/toolbar.c:2111
 msgid "Go to Previous Unread Message"
 msgstr "Jít na předchozí nepřečtenou zprávu"
 
-#: src/toolbar.c:206 src/toolbar.c:2114
+#: src/toolbar.c:207 src/toolbar.c:2115
 msgid "Go to Next Unread Message"
 msgstr "Jít na následující nepřečtenou zprávu"
 
-#: src/toolbar.c:210
+#: src/toolbar.c:210 src/toolbar.c:420
+msgid "Print"
+msgstr "Tisk"
+
+#: src/toolbar.c:211
 msgid "Learn Spam or Ham"
 msgstr "Naučit se rozpoznat spam nebo ham"
 
-#: src/toolbar.c:211
+#: src/toolbar.c:212
 msgid "Open folder/Go to folder list"
 msgstr "Otevřít složku/Přejít na seznam složek"
 
-#: src/toolbar.c:214 src/toolbar.c:2120
+#: src/toolbar.c:215 src/toolbar.c:2121
 msgid "Send Message"
 msgstr "Odeslat zprávu"
 
-#: src/toolbar.c:215 src/toolbar.c:2124
+#: src/toolbar.c:216 src/toolbar.c:2125
 msgid "Put into queue folder and send later"
 msgstr "Zařadit do fronty a odeslat později"
 
-#: src/toolbar.c:216 src/toolbar.c:2128
+#: src/toolbar.c:217 src/toolbar.c:2129
 msgid "Save to draft folder"
 msgstr "Uložit do složky konceptů"
 
-#: src/toolbar.c:217 src/toolbar.c:2132
+#: src/toolbar.c:218 src/toolbar.c:2133
 msgid "Insert file"
 msgstr "Vložit soubor"
 
-#: src/toolbar.c:218 src/toolbar.c:2136
+#: src/toolbar.c:219 src/toolbar.c:2137
 msgid "Attach file"
 msgstr "Připojit soubor"
 
-#: src/toolbar.c:219 src/toolbar.c:2140
+#: src/toolbar.c:220 src/toolbar.c:2141
 msgid "Insert signature"
 msgstr "Vložit podpis"
 
-#: src/toolbar.c:220 src/toolbar.c:2144
+#: src/toolbar.c:221 src/toolbar.c:2145
 msgid "Edit with external editor"
 msgstr "Upravit externím editorem"
 
-#: src/toolbar.c:221 src/toolbar.c:2148
+#: src/toolbar.c:222 src/toolbar.c:2149
 msgid "Wrap long lines of current paragraph"
 msgstr "Zalomit dlouhé řádky aktuálního odstavce"
 
-#: src/toolbar.c:222 src/toolbar.c:2152
+#: src/toolbar.c:223 src/toolbar.c:2153
 msgid "Wrap all long lines"
 msgstr "Zalomit všechny dlouhé řádky"
 
-#: src/toolbar.c:225 src/toolbar.c:437 src/toolbar.c:2161
+#: src/toolbar.c:226 src/toolbar.c:438 src/toolbar.c:2162
 msgid "Check spelling"
 msgstr "Zkontrolovat pravopis"
 
-#: src/toolbar.c:227
+#: src/toolbar.c:228
 msgid "Claws Mail Actions Feature"
 msgstr "Akce Claws Mail"
 
-#: src/toolbar.c:228 src/toolbar.c:2177
+#: src/toolbar.c:229 src/toolbar.c:2178
 msgid "Cancel receiving"
 msgstr "Přerušit stahování zpráv"
 
-#: src/toolbar.c:230 src/toolbar.c:2185
+#: src/toolbar.c:231 src/toolbar.c:2186
 msgid "Cancel receiving/sending"
 msgstr "Zrušit stahování/posílání zpráv"
 
-#: src/toolbar.c:231 src/toolbar.c:1961
+#: src/toolbar.c:232 src/toolbar.c:1962
 msgid "Close window"
 msgstr "Zavřít okno"
 
-#: src/toolbar.c:233
+#: src/toolbar.c:234
 msgid "Claws Mail Plugins"
 msgstr "Zásuvné moduly Claws Mail"
 
-#: src/toolbar.c:377 src/toolbar.c:412
+#: src/toolbar.c:378 src/toolbar.c:413
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Koš"
 
-#: src/toolbar.c:400
+#: src/toolbar.c:401
 msgid "Folders"
 msgstr "Složky"
 
-#: src/toolbar.c:402
+#: src/toolbar.c:403
 msgid "Get Mail"
 msgstr "Přijmout poštu"
 
-#: src/toolbar.c:403
+#: src/toolbar.c:404
 msgid "Get"
 msgstr "Získat"
 
-#: src/toolbar.c:405 src/toolbar.c:406
+#: src/toolbar.c:406 src/toolbar.c:407
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Napsat zprávu"
 
-#: src/toolbar.c:408
+#: src/toolbar.c:409
 msgid "All"
 msgstr "Všem"
 
-#: src/toolbar.c:409
+#: src/toolbar.c:410
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "Odesílatel"
 
-#: src/toolbar.c:410
+#: src/toolbar.c:411
 msgid "List"
 msgstr "Seznam"
 
-#: src/toolbar.c:415
+#: src/toolbar.c:416
 msgid "Prev"
 msgstr "Předchozí"
 
-#: src/toolbar.c:416
+#: src/toolbar.c:417
 msgid "Next"
 msgstr "Další"
 
-#: src/toolbar.c:424
+#: src/toolbar.c:425
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/toolbar.c:427
+#: src/toolbar.c:428
 msgid "Insert sig."
 msgstr "Vložit podpis"
 
-#: src/toolbar.c:428
+#: src/toolbar.c:429
 msgid "Edit"
 msgstr "Úpravy"
 
-#: src/toolbar.c:429
+#: src/toolbar.c:430
 msgid "Wrap para."
 msgstr "Zalomit odstavec"
 
-#: src/toolbar.c:430
+#: src/toolbar.c:431
 msgid "Wrap all"
 msgstr "Zalomit vše"
 
-#: src/toolbar.c:432 src/toolbar.c:433
+#: src/toolbar.c:433 src/toolbar.c:434
 msgid "Stop"
 msgstr "Zastavit"
 
-#: src/toolbar.c:434
+#: src/toolbar.c:435
 msgid "Stop all"
 msgstr "Vše zastavit"
 
-#: src/toolbar.c:910
+#: src/toolbar.c:911
 msgid "Compose News message"
 msgstr "Napsat novou zprávu"
 
-#: src/toolbar.c:952
+#: src/toolbar.c:953
 msgid "Learn spam"
 msgstr "Naučit se, že jde o nevyžádanou zprávu (spam)"
 
-#: src/toolbar.c:961
+#: src/toolbar.c:962
 msgid "Ham"
 msgstr "Ham"
 
-#: src/toolbar.c:963
+#: src/toolbar.c:964
 msgid "Learn ham"
 msgstr "Naučit se, že nejde o nevyžádanou zprávu (ham)"
 
-#: src/toolbar.c:1943
+#: src/toolbar.c:1944
 msgid "Go to folder list"
 msgstr "Přejít na seznam složek"
 
-#: src/toolbar.c:1949
+#: src/toolbar.c:1950
 msgid "Receive Mail from selected Account"
 msgstr "Přijmout poštu z vybraného účtu"
 
-#: src/toolbar.c:1965
+#: src/toolbar.c:1966
 msgid "Open preferences"
 msgstr "Otevřít předvolby"
 
-#: src/toolbar.c:1976
+#: src/toolbar.c:1977
 msgid "Compose with selected Account"
 msgstr "Napsat novou zprávu pomocí vybraného účtu"
 
-#: src/toolbar.c:1997
+#: src/toolbar.c:1998
 msgid "Learn as..."
 msgstr "Učit se jako..."
 
-#: src/toolbar.c:2007
+#: src/toolbar.c:2008
 msgid "Learn as _Spam"
 msgstr "Učit jako _Spam"
 
-#: src/toolbar.c:2008
+#: src/toolbar.c:2009
 msgid "Learn as _Ham"
 msgstr "Učit jako _Ne spam"
 
-#: src/toolbar.c:2015
+#: src/toolbar.c:2016
 msgid "Reply to Message options"
 msgstr "Odpovědět na zprávu"
 
-#: src/toolbar.c:2019 src/toolbar.c:2036 src/toolbar.c:2053 src/toolbar.c:2070
+#: src/toolbar.c:2020 src/toolbar.c:2037 src/toolbar.c:2054 src/toolbar.c:2071
 msgid "_Reply with quote"
 msgstr "Odpovědět s _citací"
 
-#: src/toolbar.c:2020 src/toolbar.c:2037 src/toolbar.c:2054 src/toolbar.c:2071
+#: src/toolbar.c:2021 src/toolbar.c:2038 src/toolbar.c:2055 src/toolbar.c:2072
 msgid "Reply without _quote"
 msgstr "Odpovědět _bez citace"
 
-#: src/toolbar.c:2032
+#: src/toolbar.c:2033
 msgid "Reply to Sender options"
 msgstr "Odpovědět odesílateli"
 
-#: src/toolbar.c:2049
+#: src/toolbar.c:2050
 msgid "Reply to All options"
 msgstr "Odpovědět všem"
 
-#: src/toolbar.c:2066
+#: src/toolbar.c:2067
 msgid "Reply to Mailing-list options"
 msgstr "Odpovědět do konference"
 
-#: src/toolbar.c:2083
+#: src/toolbar.c:2084
 msgid "Forward Message options"
 msgstr "Předat zprávu"
 
@@ -17710,12 +17820,12 @@ msgstr "Vyberte odkaz, který chcete otevřít."
 msgid "Select All"
 msgstr "Vybrat vše"
 
-#: src/wizard.c:539
+#: src/wizard.c:517
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "=?UTF-8?Q?V=C3=ADtejte?= v Claws Mail"
 
-#: src/wizard.c:562
+#: src/wizard.c:540
 #, c-format
 msgid ""
 "\n"
@@ -17810,147 +17920,131 @@ msgstr ""
 " <%s>.\n"
 "\n"
 
-#: src/wizard.c:638
+#: src/wizard.c:616
 msgid "Please enter the mailbox name."
 msgstr "Prosím uveďte název schránky (mailboxu)."
 
-#: src/wizard.c:681
+#: src/wizard.c:644
 msgid "Please enter your name and email address."
 msgstr "Prosím uveďte své jméno a e-mailovou adresu."
 
-#: src/wizard.c:692
+#: src/wizard.c:655
 msgid "Please enter your receiving server and username."
 msgstr "Prosím uveďte název serveru a uživatelské jméno pro příjem zpráv."
 
-#: src/wizard.c:702
+#: src/wizard.c:665
 msgid "Please enter your username."
 msgstr "Prosím uveďte vaše přihlašovací jméno."
 
-#: src/wizard.c:712
+#: src/wizard.c:675
 msgid "Please enter your SMTP server."
 msgstr "Prosím uveďte jméno SMTP serveru."
 
-#: src/wizard.c:723
+#: src/wizard.c:686
 msgid "Please enter your SMTP username."
 msgstr "Prosím uveďte přihlašovací jméno pro SMTP server."
 
-#: src/wizard.c:1013
+#: src/wizard.c:965
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Vaše jméno:</span>"
 
-#: src/wizard.c:1023
+#: src/wizard.c:975
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Vaše e-mailová adresa:</span>"
 
-#: src/wizard.c:1033
+#: src/wizard.c:985
 msgid "Your organization:"
 msgstr "Vaše organizace:"
 
-#: src/wizard.c:1141
+#: src/wizard.c:1018
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Název schránky (mailbox):</span>"
 
-#: src/wizard.c:1149
+#: src/wizard.c:1026
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 "Je možno nastavit úplnou cestu, například \"/home/john/Documents/Mail\""
 
-#: src/wizard.c:1157
-msgid "on internal memory"
-msgstr "ve vnitřní paměti"
-
-#: src/wizard.c:1160
-msgid "on external memory card"
-msgstr "na externí paměťovou kartu"
-
-#: src/wizard.c:1163
-msgid "on internal memory card"
-msgstr "na interní paměťovou kartu"
-
-#: src/wizard.c:1213
-msgid "<span weight=\"bold\">Store data</span>"
-msgstr "<span weight=\"bold\">Uložit data</span>"
-
-#: src/wizard.c:1281
+#: src/wizard.c:1097
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr "Můžete specifikovat číslo portu: \"mail.example.com:25\""
 
-#: src/wizard.c:1284
+#: src/wizard.c:1100
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">SMTP server:</span>"
 
-#: src/wizard.c:1290
+#: src/wizard.c:1106
 msgid "Use authentication"
 msgstr "Použít autentizaci"
 
-#: src/wizard.c:1298
+#: src/wizard.c:1114
 msgid "<span size=\"small\">(empty to use the same as receive)</span>"
 msgstr ""
 "<span size=\"small\">(prázdné pro použití téhož jako pro příjem)</span>"
 
-#: src/wizard.c:1312
+#: src/wizard.c:1128
 msgid "SMTP username:"
 msgstr "SMTP uživatelské jméno:"
 
-#: src/wizard.c:1323
+#: src/wizard.c:1139
 msgid "SMTP password:"
 msgstr "SMTP heslo:"
 
-#: src/wizard.c:1340
+#: src/wizard.c:1152
 msgid "Use SSL to connect to SMTP server"
 msgstr "Použít SSL pro připojení k SMTP serveru"
 
-#: src/wizard.c:1351 src/wizard.c:1630
+#: src/wizard.c:1163 src/wizard.c:1437
 msgid "Use SSL via STARTTLS"
 msgstr "Použít SSL pomocí STARTTLS"
 
-#: src/wizard.c:1363 src/wizard.c:1642
+#: src/wizard.c:1175 src/wizard.c:1449
 msgid "Client SSL certificate (optional)"
 msgstr "Klientský SSL certifikát (volitelné)"
 
-#: src/wizard.c:1425 src/wizard.c:1450 src/wizard.c:1573
+#: src/wizard.c:1237 src/wizard.c:1262 src/wizard.c:1385
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Server:</span>"
 
-#: src/wizard.c:1480
+#: src/wizard.c:1292
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Lokální mailbox:</span>"
 
-#: src/wizard.c:1540
+#: src/wizard.c:1352
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Typ serveru:</span>"
 
-#: src/wizard.c:1550
+#: src/wizard.c:1362
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1584
+#: src/wizard.c:1396
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr "Můžete specifikovat číslo portu: \"mail.example.com:110\""
 
-#: src/wizard.c:1589
+#: src/wizard.c:1401
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Přihlašovací jméno:</span>"
 
-#: src/wizard.c:1619
+#: src/wizard.c:1426
 msgid "Use SSL to connect to receiving server"
 msgstr "Použít SSL pro připojení k serveru pro příjem zpráv"
 
-#: src/wizard.c:1684
+#: src/wizard.c:1491
 msgid "IMAP server directory:"
 msgstr "Adresář IMAP serveru:"
 
-#: src/wizard.c:1695
+#: src/wizard.c:1502
 msgid "Show only subscribed folders"
 msgstr "Zobrazovat pouze odebírané složky"
 
-#: src/wizard.c:1703
+#: src/wizard.c:1510
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"
@@ -17958,15 +18052,15 @@ msgstr ""
 "<span weight=\"bold\">Pozor: tato verze Claws Mail byla zkompilována\n"
 "bez podpory IMAP.</span>"
 
-#: src/wizard.c:1823
+#: src/wizard.c:1628
 msgid "Claws Mail Setup Wizard"
 msgstr "Průvodce nastavením Claws Mail"
 
-#: src/wizard.c:1857
+#: src/wizard.c:1662
 msgid "Welcome to Claws Mail"
 msgstr "Vítejte v Claws Mail"
 
-#: src/wizard.c:1865
+#: src/wizard.c:1670
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -17979,344 +18073,34 @@ msgstr ""
 "Začneme nastavením několika základních informací o Vás a Vašem poštovním "
 "účtu, takže budete moci začít používat Claws Mail za méně než pět minut."
 
-#: src/wizard.c:1888
+#: src/wizard.c:1683
 msgid "About You"
 msgstr "O Vás"
 
-#: src/wizard.c:1896 src/wizard.c:1911 src/wizard.c:1926 src/wizard.c:1942
+#: src/wizard.c:1691 src/wizard.c:1706 src/wizard.c:1721 src/wizard.c:1737
 msgid "Bold fields must be completed"
 msgstr "Tučně nadepsaná pole musí být vyplněna"
 
-#: src/wizard.c:1903
+#: src/wizard.c:1698
 msgid "Receiving mail"
 msgstr "Příjem zpráv"
 
-#: src/wizard.c:1918
+#: src/wizard.c:1713
 msgid "Sending mail"
 msgstr "Odesílání zpráv"
 
-#: src/wizard.c:1934
+#: src/wizard.c:1729
 msgid "Saving mail on disk"
 msgstr "Ukládání zpráv na disk"
 
-#: src/wizard.c:1950
+#: src/wizard.c:1745
 msgid "Configuration finished"
 msgstr "Konfigurace dokončena"
 
-#: src/wizard.c:1958
+#: src/wizard.c:1753
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
 "Claws Mail je nyní připraven.\n"
 "Stiskněte uložit a můžeme začít."
-
-#~ msgid "Dillo Browser"
-#~ msgstr "Prohlížeč Dillo"
-
-#~ msgid "Load remote links in mails"
-#~ msgstr "Načítat vzdálené odkazy ve zprávách"
-
-#~ msgid "Equivalent to Dillo's '--local' option"
-#~ msgstr "Stejné jako volba '--local' prohlížeče Dillo"
-
-#~ msgid "You can still load remote links by reloading the page"
-#~ msgstr "Stále můžete odkazy načíst obnovením stránky"
-
-#~ msgid "Only for senders found in address book/folder"
-#~ msgstr "Pouze pro odesílatele nalezené v knize adres"
-
-#~ msgid "Full window mode (hide controls)"
-#~ msgstr "Režim \"přes celé okno\" (skryje ovládací prvky)"
-
-#~ msgid "Equivalent to Dillo's '--fullwindow' option"
-#~ msgstr "Stejné jako volba '--fullwindow' prohlížeče Dillo"
-
-#~ msgid "Dillo HTML Viewer"
-#~ msgstr "Prohlížeč Dillo"
-
-#~ msgid "Can't find the dillo executable in PATH. Is it installed?"
-#~ msgstr "Nemohu najít dillo v PATH. Je nainstalováno?"
-
-#~ msgid ""
-#~ "This plugin renders HTML mail using the Dillo web browser.\n"
-#~ "\n"
-#~ "Options can be found in /Configuration/Preferences/Plugins/Dillo Browser"
-#~ msgstr ""
-#~ "Tento zásuvný modul interpretuje HTML zprávy pomocí webového prohlížeče "
-#~ "Dillo.\n"
-#~ "\n"
-#~ "Nastavení naleznete v '/ Nastavení / Předvolby / Zásuvné moduly / "
-#~ "Prohlížeč Dillo'"
-
-#~ msgid "Trayicon"
-#~ msgstr "Trayicon"
-
-#~ msgid "Claws Mail"
-#~ msgstr "Claws Mail"
-
-#~ msgid "Failed to register offline switch hook"
-#~ msgstr ""
-#~ "Nepodařilo se zaregistrovat funkci pro obsloužení události \"přepnutí do "
-#~ "režimu offline\""
-
-#~ msgid "Failed to register account list changed hook"
-#~ msgstr ""
-#~ "Nepodařilo se zaregistrovat funkci pro obsloužení události \"seznam účtů "
-#~ "se změnil\""
-
-#~ msgid "Failed to register close hook"
-#~ msgstr ""
-#~ "Nepodařilo se zaregistrovat funkci pro obsloužení události \"zavření okna"
-#~ "\""
-
-#~ msgid "Failed to register got iconified hook"
-#~ msgstr "Selhala registrace, dostal hák"
-
-#~ msgid "Failed to register theme change hook"
-#~ msgstr "Nepodařilo se zaregistrovat změnu motivu"
-
-#~ msgid ""
-#~ "This plugin places a mailbox icon in the system tray that indicates if "
-#~ "you have new or unread mail.\n"
-#~ "\n"
-#~ "The mailbox is empty if you have no unread mail, otherwise it contains a "
-#~ "letter. A tooltip shows new, unread and total number of messages."
-#~ msgstr ""
-#~ "Tento zásuvný modul umístí do systémové lišty ikonu schránky, která "
-#~ "indikuje, zda máte novou nebo nepřečtenou poštu.\n"
-#~ "\n"
-#~ "Schránka je prázdná pokud nemáte nepřečtenou poštu, jinak obsahuje dopis. "
-#~ "Při podržení kurzoru myši nad ikonou zobrazí počet nových, nepřečtených a "
-#~ "celkový počet zpráv ve složce."
-
-#~ msgid "Hide Claws Mail at start-up"
-#~ msgstr "Skrýt okno Claws Mail po spuštění aplikace"
-
-#~ msgid ""
-#~ "Hide Claws Mail using the tray icon instead of closing it\n"
-#~ "when the window close button is clicked"
-#~ msgstr ""
-#~ "Skrýt Claws Mail použitím ikony namísto zavření\n"
-#~ "po kliknutí na tlačítko zavřít"
-
-#~ msgid "Minimize to tray"
-#~ msgstr "Minimalizovat do systémové lišty"
-
-#~ msgid "Hide Claws Mail using the tray icon instead of minimizing it"
-#~ msgstr "Skrýt Claws Mail použitím ikony namísto minimalizace"
-
-#~ msgid ""
-#~ "An attachment is mentioned in the mail you're sending, but no file was "
-#~ "attached. Mention appears on line %d, which begins with text: <span "
-#~ "weight=\"bold\">%.20s</span>…\n"
-#~ "\n"
-#~ "%s it anyway?"
-#~ msgstr ""
-#~ "V textu odesílané zprávy je zmíněna příloha, ale není připojen žádný "
-#~ "soubor. Zmínka začíná na řádce %d, která začíná textem: <span weight="
-#~ "\"bold\">%.20s</span>…\n"
-#~ "\n"
-#~ "Přesto %s?"
-
-#~ msgid ""
-#~ "Command could not be started. Pipe creation failed.\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nelze spustit příkaz. Selhalo vytvoření roury.\n"
-#~ "%s"
-
-#~ msgid "Charset"
-#~ msgstr "Znaková sada"
-
-#~ msgid "Change dictionary"
-#~ msgstr "Změnit slovník"
-
-#~ msgid "Unknown SSL Certificate"
-#~ msgstr "Neznámý SSL certifikát"
-
-#~ msgid "Expired SSL Certificate"
-#~ msgstr "SSL certifikáty se skončenou platností"
-
-#~ msgid "Changed SSL Certificate"
-#~ msgstr "Změněné SSL certifikáty"
-
-#~ msgid "Connecting to IMAP4 server %s...\n"
-#~ msgstr "Připojuji se na IMAP4 server %s...\n"
-
-#~ msgid "_Open (l)"
-#~ msgstr "_Otevřít (l)"
-
-#~ msgid "Open _with (o)..."
-#~ msgstr "Ot_evřít čím... (o)"
-
-#~ msgid "_Display as text (t)"
-#~ msgstr "Z_obrazit jako text (t)"
-
-#~ msgid "_Save as (y)..."
-#~ msgstr "Uložit j_ako... (y)"
-
-#~ msgid "Trust key"
-#~ msgstr "Důvěřovat klíči"
-
-#~ msgid "Main toolbar configuration"
-#~ msgstr "Nastavení hlavní nástrojové lišty"
-
-#~ msgid "Compose toolbar configuration"
-#~ msgstr "Nastavení nástrojové lišty pro nové zprávy"
-
-#~ msgid "Message view toolbar configuration"
-#~ msgstr "Nastavení lišty pro náhled zprávy"
-
-#~ msgid " (Shortcut key: 't')"
-#~ msgstr " (Klávesová zkratka: 't')"
-
-#~ msgid " (Shortcut key: 'l')\n"
-#~ msgstr " (Klávesová zkratka: 'l')\n"
-
-#~ msgid " (Shortcut key: 'o')"
-#~ msgstr " (Klávesová zkratka: 'o')"
-
-#~ msgid "Last read message"
-#~ msgstr "Poslední čtená zpráva"
-
-#~ msgid "_all"
-#~ msgstr "_všem"
-
-#~ msgid "_sender"
-#~ msgstr "_odesílateli"
-
-#~ msgid "by _Date"
-#~ msgstr "podle _Data"
-
-#~ msgid "by _From"
-#~ msgstr "podle _Od"
-
-#~ msgid "by _To"
-#~ msgstr "podle _Komu"
-
-#~ msgid "by S_ubject"
-#~ msgstr "podle _Předmětu"
-
-#~ msgid "by Tag"
-#~ msgstr "podle Značky"
-
-#~ msgid "by _Mark"
-#~ msgstr "podle _Označení"
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with a more recent GTK+ library than is "
-#~ "currently available. This will cause crashes. You need to upgrade GTK+ or "
-#~ "recompile Claws Mail."
-#~ msgstr ""
-#~ "Claws Mail byl zkompilován s novější verzí GTK+, než je nyní dostupná. To "
-#~ "bude způsobovat zhroucení programu. Je nutno instalovat novější verzi GTK"
-#~ "+ nebo překompilovat Claws Mail."
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with an older GTK+ library than is currently "
-#~ "available. This will cause crashes. You need to recompile Claws Mail."
-#~ msgstr ""
-#~ "Claws Mail byl zkompilován se starší verzí GTK+, než je nyní dostupná. To "
-#~ "bude způsobovat zhroucení programu. Je třeba překompilovat Claws Mail."
-
-#~ msgid "  --search folder type request [recursive]"
-#~ msgstr "  --prohledat složky [rekurzivně]"
-
-#~ msgid "                         searches mail"
-#~ msgstr "                         searches mail"
-
-#~ msgid ""
-#~ "                         folder ex.: \"#mh/Mailbox/inbox\" or \"Mail\""
-#~ msgstr ""
-#~ "                         př. složky: \"#mh/Mailbox/inbox\" nebo \"Mail\""
-
-#~ msgid ""
-#~ "                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] "
-#~ "or g: tag"
-#~ msgstr ""
-#~ "                         typ: s[ubject],f[rom],t[o],e[xtended],m[ixed] "
-#~ "nebo g: značka"
-
-#~ msgid "                         request: search string"
-#~ msgstr "                         požadavek: hledaný řetězec"
-
-#~ msgid ""
-#~ "                         recursive: false if arg. starts with 0, n, N, f "
-#~ "or F"
-#~ msgstr ""
-#~ "                         rekurzivně: nepravda jestliže argument začíná s "
-#~ "0, n, N, f nebo F"
-
-#~ msgid "Compose: input from monitoring process\n"
-#~ msgstr "Psaní: vstup z externího procesu\n"
-
-#~ msgid "_Fold all"
-#~ msgstr "_Sbalit všechny"
-
-#~ msgid "creating NNTP connection to %s:%d ...\n"
-#~ msgstr "Vytvářím NNTP spojení s %s:%d ...\n"
-
-#~ msgid " blocked"
-#~ msgstr " blokováno"
-
-#~ msgid "Unblock links"
-#~ msgstr "Odblokovat odkazy"
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for Atom feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr ""
-#~ "RSSyl: Pro Atom kanály není stahování komentářů podporováno. Nepodařilo "
-#~ "se stáhnout komentáře pro '%s'."
-
-#~ msgid "/Refresh feed"
-#~ msgstr "/Aktualizovat kanál"
-
-#~ msgid "/Refresh all feeds"
-#~ msgstr "/Aktualizovat všechny kanály"
-
-#~ msgid "/Subscribe new feed..."
-#~ msgstr "/Odebírat nový kanál..."
-
-#~ msgid "/Unsubscribe feed..."
-#~ msgstr "/Odhlásit kanál..."
-
-#~ msgid "/Feed properties..."
-#~ msgstr "/Vlastnosti kanálu..."
-
-#~ msgid "/Rename..."
-#~ msgstr "/Přejmenovat složku..."
-
-#~ msgid "/Create new folder..."
-#~ msgstr "/Vytvořit novou složku..."
-
-#~ msgid "/Delete folder..."
-#~ msgstr "/Odstranit složku..."
-
-#~ msgid "/Remove folder tree..."
-#~ msgstr "/Odstranit strom složek..."
-
-#~ msgid "/File/Add mailbox/RSSyl..."
-#~ msgstr "/_Soubor/Přidat _mailbox/RSSyl..."
-
-#~ msgid "Timeout for downloading feeds in seconds"
-#~ msgstr "Časový limit pro stahování kanálů (v sekundách)"
-
-#~ msgid "GData plugin: Added %d of %d contacts to the cache\n"
-#~ msgstr "Zásuvný modul GData: Přidáno %d z %d kontaktů do paměti\n"
-
-#~ msgid "%d page"
-#~ msgid_plural "%d pages"
-#~ msgstr[0] "%d stránka"
-#~ msgstr[1] "%d stránky"
-#~ msgstr[2] "%d stránek"
-
-#~ msgid ""
-#~ "This plugin provides Python integration features.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome."
-#~ msgstr ""
-#~ "Zásuvný modul umožňuje integraci Pythonu.\n"
-#~ "\n"
-#~ "Zpětná vazba k <berndth at gmx.de> je vítána."
diff --git a/po/de.po b/po/de.po
index 03e5bfd..22cbcb4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
 # German translation of Sylpheed.
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Thomas Bellmann <ThomasBellmann at gmx.net>, 2012
+# Thomas Bellmann <ThomasBellmann at gmx.net>, 2012, 2013
 # Marc Arens <marens at marens.eu>, 2009
 # Stephan Sachse <white at dev-zero.com>, 2005-2010
 # Thomas Gilgin <thg1 at karate-muellheim.de>, 2004, 2005
@@ -8,24 +8,29 @@
 # Jens Oberender <j.obi at troja.net>, 2003, 2004
 # Kilian Krause <kk at verfaction.de>, 2002
 #
-# (ggf) todo: Protokoll-Datei durch Log-Datei ersetzen
 msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2013-04-29 18:56+0200\n"
-"PO-Revision-Date: 2013-05-04 12:37+0100\n"
+"POT-Creation-Date: 2013-12-07 09:47+0100\n"
+"PO-Revision-Date: 2013-12-09 22:03+0100\n"
 "Last-Translator: Thomas Bellmann <ThomasBellmann at gmx.net>\n"
-"Language-Team:  <translators at lists.claws-mail.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-Bookmarks: 2990,1708,-1,2647,2658,2696,2793,-1,-1,-1\n"
 "X-Generator: Poedit 1.5.4\n"
+"Language-Team: \n"
 
-# in General: maybe should unify "failed"; "message body"; "recieve, retrieve" when translating into german.
-#: src/account.c:393
+# in General: maybe should unify "receive, retrieve" when translating into german.
+# (maybe) todo: replace "Protokoll-Datei" by "Log-Datei"; "Stylesheet" by "..?"; "free/busy" by "..?"
+# what is better:
+# "message body" -> "Textkörper" or "Nachrichtenkörper"?
+# "failed" -> "schlug fehl" or "fehlgeschlagen"?
+#
+#: src/account.c:392
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -33,15 +38,15 @@ msgstr ""
 "Einige Editor-Fenster sind geöffnet.\n"
 "Bitte schließen Sie alle Editor-Fenster vor dem Bearbeiten der Konten."
 
-#: src/account.c:438
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Ordner kann nicht erstellt werden."
 
-#: src/account.c:719
+#: src/account.c:717
 msgid "Edit accounts"
 msgstr "Konten bearbeiten"
 
-#: src/account.c:740
+#: src/account.c:734
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -51,57 +56,57 @@ msgstr ""
 "Das Kontrollkästchen zeigt an, welche Konten einbezogen sind. Fette Schrift "
 "markiert das Standardkonto."
 
-#: src/account.c:811
+#: src/account.c:805
 msgid " _Set as default account "
 msgstr "_Als Standardkonto setzen"
 
-#: src/account.c:906
+#: src/account.c:897
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Konten mit ferngelegenen Ordnern sind nicht kopierbar."
 
-#: src/account.c:913
+#: src/account.c:904
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopie von %s"
 
-#: src/account.c:1073
+#: src/account.c:1064
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Möchten Sie das Konto '%s' wirklich löschen?"
 
-#: src/account.c:1075
+#: src/account.c:1066
 msgid "(Untitled)"
 msgstr "(Unbenannt)"
 
-#: src/account.c:1076
+#: src/account.c:1067
 msgid "Delete account"
 msgstr "Konto löschen"
 
-#: src/account.c:1546
+#: src/account.c:1536
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1552
+#: src/account.c:1542
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Abrufen' holt Nachrichten von den gewählten Konten ab"
 
-#: src/account.c:1559 src/addressadd.c:215 src/addressbook.c:125
-#: src/addrduplicates.c:481 src/compose.c:6984 src/editaddress.c:1270
-#: src/editaddress.c:1327 src/editaddress.c:1347 src/editbook.c:170
+#: src/account.c:1549 src/addressadd.c:215 src/addressbook.c:125
+#: src/addrduplicates.c:481 src/compose.c:7073 src/editaddress.c:1263
+#: src/editaddress.c:1320 src/editaddress.c:1340 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:284 src/plugins/pdf_viewer/poppler_viewer.c:1784
-#: src/plugins/pgpcore/select-keys.c:398 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1872 src/prefs_template.c:78
+#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1800
+#: src/plugins/pgpcore/select-keys.c:394 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1868 src/prefs_template.c:78
 msgid "Name"
 msgstr "Name"
 
-#: src/account.c:1567 src/prefs_account.c:1097 src/prefs_account.c:3922
+#: src/account.c:1557 src/prefs_account.c:1097 src/prefs_account.c:3921
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/account.c:1575 src/ssl_manager.c:102
+#: src/account.c:1565 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Server"
 
@@ -117,7 +122,7 @@ msgstr "Nachrichtenteil ist nicht abrufbar."
 #: src/action.c:437
 #, c-format
 msgid "Can't get part of multipart message: %s"
-msgstr "Mehrteilige Nachricht unvollständig erhalten: %s"
+msgstr "Teil einer mehrteiligen Nachricht nicht abrufbar: %s"
 
 #: src/action.c:609
 #, c-format
@@ -141,7 +146,7 @@ msgstr ""
 "Ungültige Filteraktion(en):\n"
 "%s"
 
-#: src/action.c:978
+#: src/action.c:988
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -152,7 +157,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:980 src/plugins/bogofilter/bogofilter.c:875
+#: src/action.c:990 src/plugins/bogofilter/bogofilter.c:875
 #: src/plugins/rssyl/feed.c:1734 src/plugins/rssyl/feed.c:1738
 #: src/plugins/tnef_parse/tnef_parse.c:67
 #: src/plugins/vcalendar/vcal_folder.c:1800
@@ -162,25 +167,25 @@ msgstr ""
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/action.c:1198 src/action.c:1368
+#: src/action.c:1208 src/action.c:1373
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: src/action.c:1234
+#: src/action.c:1244
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Läuft: %s\n"
 
-#: src/action.c:1238
+#: src/action.c:1248
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Beendet: %s\n"
 
-#: src/action.c:1271
+#: src/action.c:1281
 msgid "Action's input/output"
 msgstr "Ein-/Ausgabe der Aktion"
 
-#: src/action.c:1604
+#: src/action.c:1609
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -191,11 +196,11 @@ msgstr ""
 "('%%h' wird durch das Argument ersetzt)\n"
 "  %s"
 
-#: src/action.c:1609
+#: src/action.c:1614
 msgid "Action's hidden user argument"
 msgstr "Versteckte Benutzerargumente der Aktion"
 
-#: src/action.c:1613
+#: src/action.c:1618
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -206,11 +211,11 @@ msgstr ""
 "('%%u' wird durch das Argument ersetzt)\n"
 "  %s"
 
-#: src/action.c:1618
+#: src/action.c:1623
 msgid "Action's user argument"
 msgstr "Benutzerargument der Aktion"
 
-#: src/addr_compl.c:600 src/addressbook.c:4881
+#: src/addr_compl.c:600 src/addressbook.c:4870
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:314
 msgid "Group"
 msgstr "Gruppe"
@@ -285,13 +290,13 @@ msgstr ""
 
 #: src/addrcustomattr.c:212 src/addressbook.c:435 src/addressbook.c:463
 #: src/addressbook.c:480 src/edittags.c:271
-#: src/plugins/archive/archiver_gtk.c:1193 src/prefs_actions.c:1086
-#: src/prefs_filtering.c:1692 src/prefs_template.c:1095
+#: src/plugins/archive/archiver_gtk.c:1193 src/prefs_actions.c:1090
+#: src/prefs_filtering.c:1695 src/prefs_template.c:1099
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: src/addrcustomattr.c:213 src/edittags.c:272 src/prefs_actions.c:1087
-#: src/prefs_filtering.c:1693 src/prefs_template.c:1096
+#: src/addrcustomattr.c:213 src/edittags.c:272 src/prefs_actions.c:1091
+#: src/prefs_filtering.c:1696 src/prefs_template.c:1100
 msgid "Delete _all"
 msgstr "_alle Löschen"
 
@@ -299,20 +304,20 @@ msgstr "_alle Löschen"
 msgid "_Reset to default"
 msgstr "Standard _wiederherstellen"
 
-#: src/addrcustomattr.c:410
+#: src/addrcustomattr.c:403
 msgid "Attribute name is not set."
 msgstr "Zusatzangabe nicht benannt."
 
-#: src/addrcustomattr.c:469
+#: src/addrcustomattr.c:462
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Zusatzangaben bearbeiten"
 
-#: src/addrcustomattr.c:483
+#: src/addrcustomattr.c:476
 msgid "New attribute name:"
 msgstr "Neue Zusatzangabe:"
 
-#: src/addrcustomattr.c:520
+#: src/addrcustomattr.c:513
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -329,12 +334,12 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #: src/addressadd.c:227 src/addrduplicates.c:452
-#: src/plugins/pgpcore/select-keys.c:399 src/toolbar.c:431
+#: src/plugins/pgpcore/select-keys.c:395 src/toolbar.c:432
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1062
-#: src/editaddress.c:1137 src/editgroup.c:290
+#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1055
+#: src/editaddress.c:1130 src/editgroup.c:290
 msgid "Remarks"
 msgstr "Anmerkungen"
 
@@ -342,17 +347,17 @@ msgstr "Anmerkungen"
 msgid "Select Address Book Folder"
 msgstr "Adressbuchordner auswählen"
 
-#: src/addressadd.c:483 src/editaddress.c:1585 src/headerview.c:348
+#: src/addressadd.c:483 src/editaddress.c:1582 src/headerview.c:348
 #: src/textview.c:2110
 #, c-format
 msgid ""
 "Failed to save image: \n"
 "%s"
 msgstr ""
-"Bild ist nicht speicherbar: \n"
+"Speichern des Bildes schlug fehl: \n"
 "%s"
 
-#: src/addressadd.c:532 src/addressbook.c:3221 src/addressbook.c:3272
+#: src/addressadd.c:532 src/addressbook.c:3210 src/addressbook.c:3261
 msgid "Add address(es)"
 msgstr "Adresse(n) hinzufügen"
 
@@ -360,8 +365,8 @@ msgstr "Adresse(n) hinzufügen"
 msgid "Can't add the specified address"
 msgstr "Hinzufügen der angegebenen Adresse schlug fehl"
 
-#: src/addressbook.c:126 src/addressbook.c:4869 src/editaddress.c:1059
-#: src/editaddress.c:1120 src/editgroup.c:289 src/expldifdlg.c:517
+#: src/addressbook.c:126 src/addressbook.c:4858 src/editaddress.c:1052
+#: src/editaddress.c:1113 src/editgroup.c:289 src/expldifdlg.c:517
 #: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:782
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
@@ -371,18 +376,18 @@ msgid "_Book"
 msgstr "Adressb_uch"
 
 #: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
-#: src/addressbook.c:479 src/compose.c:576 src/gtk/quicksearch.c:799
-#: src/gtk/quicksearch.c:814 src/mainwindow.c:504 src/messageview.c:211
+#: src/addressbook.c:479 src/compose.c:578 src/mainwindow.c:504
+#: src/messageview.c:209
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: src/addressbook.c:404 src/compose.c:581 src/mainwindow.c:507
-#: src/messageview.c:214
+#: src/addressbook.c:404 src/compose.c:583 src/mainwindow.c:507
+#: src/messageview.c:212
 msgid "_Tools"
 msgstr "E_xtras"
 
-#: src/addressbook.c:405 src/compose.c:582 src/mainwindow.c:509
-#: src/messageview.c:215
+#: src/addressbook.c:405 src/compose.c:584 src/mainwindow.c:509
+#: src/messageview.c:213
 msgid "_Help"
 msgstr "_Hilfe"
 
@@ -414,15 +419,15 @@ msgstr "Adressbuch _bearbeiten"
 msgid "_Delete book"
 msgstr "Adressbuch _löschen"
 
-#: src/addressbook.c:424 src/compose.c:592
+#: src/addressbook.c:424 src/compose.c:595
 msgid "_Save"
 msgstr "_Speichern"
 
-#: src/addressbook.c:425 src/compose.c:596 src/messageview.c:224
+#: src/addressbook.c:425 src/compose.c:599 src/messageview.c:222
 msgid "_Close"
 msgstr "S_chließen"
 
-#: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:228
+#: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:226
 msgid "_Select all"
 msgstr "All_e auswählen"
 
@@ -431,12 +436,12 @@ msgid "C_ut"
 msgstr "_Ausschneiden"
 
 #: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:604 src/mainwindow.c:538 src/messageview.c:227
+#: src/compose.c:607 src/mainwindow.c:538 src/messageview.c:225
 msgid "_Copy"
 msgstr "_Kopieren"
 
 #: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:605
+#: src/compose.c:608
 msgid "_Paste"
 msgstr "_Einfügen"
 
@@ -478,10 +483,10 @@ msgstr "Duplikate finden..."
 
 #: src/addressbook.c:452
 msgid "Edit custom attributes..."
-msgstr "Nutzerdefinierte Zusätze..."
+msgstr "Nutzerdefinierte Angaben..."
 
-#: src/addressbook.c:455 src/compose.c:684 src/mainwindow.c:801
-#: src/messageview.c:340
+#: src/addressbook.c:455 src/compose.c:687 src/mainwindow.c:801
+#: src/messageview.c:338
 msgid "_About"
 msgstr "Ü_ber"
 
@@ -490,7 +495,7 @@ msgid "_Browse Entry"
 msgstr "Eintrag ü_berfliegen"
 
 #: src/addressbook.c:504 src/crash.c:451 src/crash.c:470 src/importldif.c:115
-#: src/plugins/pgpcore/select-keys.c:255 src/plugins/pgpcore/sgpgme.c:140
+#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:140
 #: src/plugins/vcalendar/day-view.c:410 src/plugins/vcalendar/month-view.c:431
 #: src/prefs_themes.c:705 src/prefs_themes.c:737 src/prefs_themes.c:738
 msgid "Unknown"
@@ -578,7 +583,7 @@ msgstr "Fehler beim Einleiten der TLS-Verbindung"
 
 #: src/addressbook.c:540
 msgid "Distinguished Name (dn) is missing"
-msgstr "Distinguished Name (dn) fehlt"
+msgstr "Distinguierter Name (dn) fehlt"
 
 #: src/addressbook.c:541
 msgid "Missing required information"
@@ -592,32 +597,32 @@ msgstr "Es existiert bereits ein Kontakt mit diesem Index"
 msgid "Strong(er) authentication required"
 msgstr "Strenge(re) Authentifizierung erforderlich"
 
-#: src/addressbook.c:913
+#: src/addressbook.c:910
 msgid "Sources"
 msgstr "Quellen"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:629 src/prefs_other.c:475
-#: src/toolbar.c:223 src/toolbar.c:2156
+#: src/addressbook.c:914 src/prefs_matcher.c:629 src/prefs_other.c:475
+#: src/toolbar.c:224 src/toolbar.c:2157
 msgid "Address book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:1120
+#: src/addressbook.c:1109
 msgid "Lookup name:"
 msgstr "Suchname:"
 
-#: src/addressbook.c:1444 src/addressbook.c:1497 src/addrduplicates.c:803
+#: src/addressbook.c:1433 src/addressbook.c:1486 src/addrduplicates.c:803
 msgid "Delete address(es)"
 msgstr "Adresse(n) löschen"
 
-#: src/addressbook.c:1445 src/addrduplicates.c:853
+#: src/addressbook.c:1434 src/addrduplicates.c:853
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Diese Adressdaten können nur gelesen und nicht gelöscht werden."
 
-#: src/addressbook.c:1489
+#: src/addressbook.c:1478
 msgid "Delete group"
 msgstr "Gruppe löschen"
 
-#: src/addressbook.c:1490
+#: src/addressbook.c:1479
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -625,30 +630,30 @@ msgstr ""
 "Diese Gruppe(n) wirklich löschen?\n"
 "Die enthaltenen Adressen gehen nicht verloren"
 
-#: src/addressbook.c:1498 src/addrduplicates.c:804
+#: src/addressbook.c:1487 src/addrduplicates.c:804
 msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 
-#: src/addressbook.c:2201
+#: src/addressbook.c:2190
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Einfügen schlug fehl, da das Zieladressbuch nur lesbar ist."
 
-#: src/addressbook.c:2211
+#: src/addressbook.c:2200
 msgid "Cannot paste into an address group."
 msgstr "Einfügen in eine Adressgruppe schlug fehl."
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2906
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Sollen die Suchergebnisse und Adressen in '%s' gelöscht werden?"
 
-#: src/addressbook.c:2920 src/addressbook.c:2946 src/addressbook.c:2953
+#: src/addressbook.c:2909 src/addressbook.c:2935 src/addressbook.c:2942
 #: src/plugins/archive/archiver_prefs.c:337 src/prefs_filtering_action.c:177
-#: src/toolbar.c:413
+#: src/toolbar.c:414
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2918
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -657,21 +662,21 @@ msgstr ""
 "Soll '%s' gelöscht werden? Wenn nur der Ordner gelöscht wird, werden die "
 "Adressen in den darüber liegenden Ordner verschoben."
 
-#: src/addressbook.c:2932 src/imap_gtk.c:363 src/mh_gtk.c:202
-#: src/plugins/mailmbox/plugin_gtk.c:325 src/plugins/rssyl/rssyl_cb_menu.c:237
-#: src/plugins/vcalendar/vcal_folder.c:1953
+#: src/addressbook.c:2921 src/imap_gtk.c:363 src/mh_gtk.c:202
+#: src/plugins/mailmbox/plugin_gtk.c:324 src/plugins/rssyl/rssyl_cb_menu.c:237
+#: src/plugins/vcalendar/vcal_folder.c:1951
 msgid "Delete folder"
 msgstr "Ordner löschen"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "+Delete _folder only"
 msgstr "+nur Ordner löschen"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "Delete folder and _addresses"
 msgstr "Ordner und Adressen löschen"
 
-#: src/addressbook.c:2944
+#: src/addressbook.c:2933
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -680,7 +685,7 @@ msgstr ""
 "Soll '%s' gelöscht werden?\n"
 "Die enthaltenen Adressen gehen nicht verloren."
 
-#: src/addressbook.c:2951
+#: src/addressbook.c:2940
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -689,36 +694,36 @@ msgstr ""
 "Soll '%s' gelöscht werden?\n"
 "Die enthaltenen Adressen gehen verloren."
 
-#: src/addressbook.c:3065
+#: src/addressbook.c:3054
 #, c-format
 msgid "Search '%s'"
 msgstr "Suche '%s'"
 
-#: src/addressbook.c:3203 src/addressbook.c:3253
+#: src/addressbook.c:3192 src/addressbook.c:3242
 msgid "New Contacts"
 msgstr "Neue Kontakte"
 
-#: src/addressbook.c:4035
+#: src/addressbook.c:4024
 msgid "New user, could not save index file."
-msgstr "Neuer Benutzer, Indexdatei nicht speicherbar."
+msgstr "Neuer Benutzer, Indexdatei konnte nicht gespeichert werden."
 
-#: src/addressbook.c:4039
+#: src/addressbook.c:4028
 msgid "New user, could not save address book files."
-msgstr "Neuer Benutzer, Adressbuchdateien nicht speicherbar."
+msgstr "Neuer Benutzer, Adressbuchdateien konnten nicht gespeichert werden."
 
-#: src/addressbook.c:4049
+#: src/addressbook.c:4038
 msgid "Old address book converted successfully."
 msgstr "Altes Adressbuch erfolgreich konvertiert."
 
-#: src/addressbook.c:4054
+#: src/addressbook.c:4043
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgstr ""
 "Altes Adressbuch konvertiert,\n"
-"Indexdatei neuer Adressen nicht speicherbar."
+"Indexdatei neuer Adressen konnten nicht gespeichert werden."
 
-#: src/addressbook.c:4067
+#: src/addressbook.c:4056
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -726,15 +731,15 @@ msgstr ""
 "Adressbuch konnte nicht konvertiert werden,\n"
 "es wurden leere neue Adressbuchdateien erstellt."
 
-#: src/addressbook.c:4073
+#: src/addressbook.c:4062
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgstr ""
 "Adressbuch konnte nicht konvertiert werden,\n"
-"neue Adressindexdatei nicht speicherbar."
+"neue Adressindexdatei konnte nicht gespeichert werden."
 
-#: src/addressbook.c:4078
+#: src/addressbook.c:4067
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -742,53 +747,53 @@ msgstr ""
 "Adressbuch konnte nicht konvertiert und\n"
 "neue Adressbuchdateien konnten nicht erstellt werden."
 
-#: src/addressbook.c:4085 src/addressbook.c:4091
+#: src/addressbook.c:4074 src/addressbook.c:4080
 msgid "Addressbook conversion error"
 msgstr "Fehler bei Adressbuch-Konvertierung"
 
-#: src/addressbook.c:4198
+#: src/addressbook.c:4187
 msgid "Addressbook Error"
 msgstr "Adressbuch-Fehler"
 
-#: src/addressbook.c:4199
+#: src/addressbook.c:4188
 msgid "Could not read address index"
-msgstr "Adressindex nicht einlesbar"
+msgstr "Adressindex nicht lesbar"
 
-#: src/addressbook.c:4530
+#: src/addressbook.c:4519
 msgid "Busy searching..."
 msgstr "Suche läuft..."
 
-#: src/addressbook.c:4833
+#: src/addressbook.c:4822
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
-#: src/addressbook.c:4845 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
+#: src/addressbook.c:4834 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
 #: src/expldifdlg.c:388 src/exporthtml.c:984 src/importldif.c:657
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:4857
+#: src/addressbook.c:4846
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:4893 src/exporthtml.c:884 src/folderview.c:338
-#: src/folderview.c:426 src/prefs_account.c:2746 src/prefs_folder_column.c:78
+#: src/addressbook.c:4882 src/exporthtml.c:884 src/folderview.c:338
+#: src/folderview.c:426 src/prefs_account.c:2738 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Ordner"
 
-#: src/addressbook.c:4905
+#: src/addressbook.c:4894
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4917 src/addressbook.c:4929
+#: src/addressbook.c:4906 src/addressbook.c:4918
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4941
+#: src/addressbook.c:4930
 msgid "LDAP servers"
 msgstr "LDAP-Server"
 
-#: src/addressbook.c:4953
+#: src/addressbook.c:4942
 msgid "LDAP Query"
 msgstr "LDAP-Anfrage"
 
@@ -803,9 +808,13 @@ msgstr "LDAP-Anfrage"
 #: src/plugins/spamassassin/spamassassin_gtk.c:443
 #: src/plugins/spamassassin/spamassassin_gtk.c:490
 #: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:672
-#: src/prefs_matcher.c:707 src/prefs_matcher.c:1601 src/prefs_matcher.c:1608
-#: src/prefs_matcher.c:1616 src/prefs_matcher.c:1618 src/prefs_matcher.c:2498
-#: src/prefs_matcher.c:2502 src/addrgather.c:172
+#: src/prefs_matcher.c:707 src/prefs_matcher.c:1607 src/prefs_matcher.c:1614
+#: src/prefs_matcher.c:1622 src/prefs_matcher.c:1624 src/prefs_matcher.c:2504
+#: src/prefs_matcher.c:2508
+msgid "Any"
+msgstr "Alle"
+
+#: src/addrgather.c:172
 msgid "Please specify name for address book."
 msgstr "Bitte Namen für das Adressbuch angeben."
 
@@ -854,7 +863,7 @@ msgstr "Diese Kopfzeilenfelder bearbeiten"
 msgid "Include subfolders"
 msgstr "Unterordner einbeziehen"
 
-#: src/addrgather.c:456 src/prefs_filtering_action.c:1423
+#: src/addrgather.c:456 src/prefs_filtering_action.c:1425
 msgid "Header Name"
 msgstr "Kopfzeilenname"
 
@@ -938,18 +947,19 @@ msgstr "Adressbuch-Pfad"
 msgid "Delete address"
 msgstr "Adresse löschen"
 
-#: src/alertpanel.c:146 src/compose.c:9160
+#: src/alertpanel.c:146 src/compose.c:9217
 msgid "Notice"
 msgstr "Anmerkung"
 
-#: src/alertpanel.c:159 src/compose.c:5556 src/compose.c:6022
-#: src/compose.c:11468 src/messageview.c:874 src/messageview.c:887
+#: src/alertpanel.c:159 src/compose.c:5597 src/compose.c:6063
+#: src/compose.c:11533 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:852 src/messageview.c:865
 #: src/plugins/pgpcore/sgpgme.c:706 src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4869
+#: src/summaryview.c:4865
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5497 src/inc.c:666
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5538 src/inc.c:652
 #: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:246
 msgid "Error"
 msgstr "Fehler"
@@ -972,7 +982,7 @@ msgstr "Servername :"
 
 #: src/browseldap.c:247
 msgid "Distinguished Name (dn) :"
-msgstr "Distinguished Name (dn) :"
+msgstr "Distinguierter Name (dn) :"
 
 #: src/browseldap.c:270
 msgid "LDAP Name"
@@ -1008,7 +1018,7 @@ msgstr "ein Datenschutzinterface"
 
 #: src/common/plugin.c:71
 msgid "a notifier"
-msgstr "ein Benachrichtiger"
+msgstr "ein Melder"
 
 #: src/common/plugin.c:72
 msgid "an utility"
@@ -1072,7 +1082,7 @@ msgstr "Ihre Claws Mail-Version ist zu alt für das Plugin."
 
 #: src/common/session.c:175 src/imap.c:1145
 msgid "SSL handshake failed\n"
-msgstr "SSL-Verbindung fehlgeschlagen\n"
+msgstr "SSL-Verbindung schlug fehl\n"
 
 #: src/common/smtp.c:180
 msgid "No SMTP AUTH method available\n"
@@ -1124,7 +1134,7 @@ msgstr "%s: unbekannter Host.\n"
 #: src/common/socket.c:831
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
-msgstr "%s:%d: Verbindung fehlgeschlagen (%s).\n"
+msgstr "%s:%d: Verbindung schlug fehl (%s).\n"
 
 #: src/common/socket.c:1071
 #, c-format
@@ -1222,595 +1232,599 @@ msgstr "<nicht im Zertifikat>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Betreff gelöscht durch RegExp)"
 
-#: src/common/utils.c:371
+#: src/common/utils.c:362
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
-#: src/common/utils.c:372
+#: src/common/utils.c:363
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dKB"
 
-#: src/common/utils.c:373
+#: src/common/utils.c:364
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMB"
 
-#: src/common/utils.c:374
+#: src/common/utils.c:365
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4974
+#: src/common/utils.c:4946
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: src/common/utils.c:4975
+#: src/common/utils.c:4947
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Montag"
 
-#: src/common/utils.c:4976
+#: src/common/utils.c:4948
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: src/common/utils.c:4977
+#: src/common/utils.c:4949
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: src/common/utils.c:4978
+#: src/common/utils.c:4950
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: src/common/utils.c:4979
+#: src/common/utils.c:4951
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Freitag"
 
-#: src/common/utils.c:4980
+#: src/common/utils.c:4952
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Samstag"
 
-#: src/common/utils.c:4982
+#: src/common/utils.c:4954
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Januar"
 
-#: src/common/utils.c:4983
+#: src/common/utils.c:4955
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Februar"
 
-#: src/common/utils.c:4984
+#: src/common/utils.c:4956
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "März"
 
-#: src/common/utils.c:4985
+#: src/common/utils.c:4957
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "April"
 
-#: src/common/utils.c:4986
+#: src/common/utils.c:4958
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4987
+#: src/common/utils.c:4959
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Juni"
 
-#: src/common/utils.c:4988
+#: src/common/utils.c:4960
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Juli"
 
-#: src/common/utils.c:4989
+#: src/common/utils.c:4961
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "August"
 
-#: src/common/utils.c:4990
+#: src/common/utils.c:4962
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "September"
 
-#: src/common/utils.c:4991
+#: src/common/utils.c:4963
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Oktober"
 
-#: src/common/utils.c:4992
+#: src/common/utils.c:4964
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "November"
 
-#: src/common/utils.c:4993
+#: src/common/utils.c:4965
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Dezember"
 
-#: src/common/utils.c:4995
+#: src/common/utils.c:4967
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "So"
 
-#: src/common/utils.c:4996
+#: src/common/utils.c:4968
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Mo"
 
-#: src/common/utils.c:4997
+#: src/common/utils.c:4969
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Di"
 
-#: src/common/utils.c:4998
+#: src/common/utils.c:4970
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mi"
 
-#: src/common/utils.c:4999
+#: src/common/utils.c:4971
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Do"
 
-#: src/common/utils.c:5000
+#: src/common/utils.c:4972
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Fr"
 
-#: src/common/utils.c:5001
+#: src/common/utils.c:4973
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sa"
 
-#: src/common/utils.c:5003
+#: src/common/utils.c:4975
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:5004
+#: src/common/utils.c:4976
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:5005
+#: src/common/utils.c:4977
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mrz"
 
-#: src/common/utils.c:5006
+#: src/common/utils.c:4978
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Apr"
 
-#: src/common/utils.c:5007
+#: src/common/utils.c:4979
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:5008
+#: src/common/utils.c:4980
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:5009
+#: src/common/utils.c:4981
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:5010
+#: src/common/utils.c:4982
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aug"
 
-#: src/common/utils.c:5011
+#: src/common/utils.c:4983
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:5012
+#: src/common/utils.c:4984
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Okt"
 
-#: src/common/utils.c:5013
+#: src/common/utils.c:4985
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:5014
+#: src/common/utils.c:4986
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dez"
 
-#: src/common/utils.c:5025
+#: src/common/utils.c:4997
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:5026
+#: src/common/utils.c:4998
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:5027
+#: src/common/utils.c:4999
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:5028
+#: src/common/utils.c:5000
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/common/utils.c:5035
+#: src/common/utils.c:5007
 msgctxt "For use by strftime (default date+time format)"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %e %b %H:%M:%S %Y"
 
-#: src/common/utils.c:5036
+#: src/common/utils.c:5008
 msgctxt "For use by strftime (default date format)"
 msgid "%m/%d/%y"
 msgstr "%d.%m.%y"
 
-#: src/common/utils.c:5037
+#: src/common/utils.c:5009
 msgctxt "For use by strftime (default time format)"
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
-#: src/common/utils.c:5039
+#: src/common/utils.c:5011
 msgctxt "For use by strftime (default 12-hour time format)"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
-#: src/compose.c:565
+#: src/compose.c:567
 msgid "_Add..."
 msgstr "_Hinzufügen..."
 
-#: src/compose.c:566 src/mh_gtk.c:361 src/plugins/mailmbox/plugin_gtk.c:293
+#: src/compose.c:568 src/mh_gtk.c:361 src/plugins/mailmbox/plugin_gtk.c:293
 #: src/plugins/rssyl/rssyl_cb_menu.c:140
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: src/compose.c:568 src/folderview.c:234
+#: src/compose.c:570 src/folderview.c:234
 msgid "_Properties..."
 msgstr "_Eigenschaften..."
 
-#: src/compose.c:575 src/mainwindow.c:506 src/messageview.c:213
+#: src/compose.c:577 src/mainwindow.c:506 src/messageview.c:211
 msgid "_Message"
 msgstr "_Nachricht"
 
-#: src/compose.c:578
+#: src/compose.c:580
 msgid "_Spelling"
 msgstr "_Rechtschreibung"
 
-#: src/compose.c:580 src/compose.c:646
+#: src/compose.c:582 src/compose.c:649
 msgid "_Options"
 msgstr "_Optionen"
 
-#: src/compose.c:584
+#: src/compose.c:586
 msgid "S_end"
 msgstr "S_enden"
 
-#: src/compose.c:585
+#: src/compose.c:587
 msgid "Send _later"
 msgstr "Später senden"
 
-#: src/compose.c:588
+#: src/compose.c:590
 msgid "_Attach file"
 msgstr "Datei anhängen"
 
-#: src/compose.c:589
+#: src/compose.c:591
 msgid "_Insert file"
 msgstr "Datei einfügen"
 
-#: src/compose.c:590
+#: src/compose.c:592
 msgid "Insert si_gnature"
 msgstr "Si_gnatur anfügen"
 
-#: src/compose.c:594
+#: src/compose.c:593
+msgid "_Replace signature"
+msgstr "Signatur E_rsetzen"
+
+#: src/compose.c:597
 msgid "_Print"
 msgstr "Drucken"
 
-#: src/compose.c:599
+#: src/compose.c:602
 msgid "_Undo"
 msgstr "_Rückgängig"
 
-#: src/compose.c:600
+#: src/compose.c:603
 msgid "_Redo"
 msgstr "_Wiederholen"
 
-#: src/compose.c:603
+#: src/compose.c:606
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
-#: src/compose.c:607
+#: src/compose.c:610
 msgid "_Special paste"
 msgstr "_Spezielles Einfügen"
 
-#: src/compose.c:608
+#: src/compose.c:611
 msgid "As _quotation"
 msgstr "als _Zitat"
 
-#: src/compose.c:609
+#: src/compose.c:612
 msgid "_Wrapped"
 msgstr "mit _Umbruch"
 
-#: src/compose.c:610
+#: src/compose.c:613
 msgid "_Unwrapped"
 msgstr "_ohne Umbruch"
 
-#: src/compose.c:612 src/mainwindow.c:539
+#: src/compose.c:615 src/mainwindow.c:539
 msgid "Select _all"
 msgstr "_Alles auswählen"
 
-#: src/compose.c:614
+#: src/compose.c:617
 msgid "A_dvanced"
 msgstr "Erweitert"
 
-#: src/compose.c:615
+#: src/compose.c:618
 msgid "Move a character backward"
 msgstr "Ein Zeichen rückwärts"
 
-#: src/compose.c:616
+#: src/compose.c:619
 msgid "Move a character forward"
 msgstr "Ein Zeichen vorwärts"
 
-#: src/compose.c:617
+#: src/compose.c:620
 msgid "Move a word backward"
 msgstr "Ein Wort rückwärts"
 
-#: src/compose.c:618
+#: src/compose.c:621
 msgid "Move a word forward"
 msgstr "Ein Wort vorwärts"
 
-#: src/compose.c:619
+#: src/compose.c:622
 msgid "Move to beginning of line"
 msgstr "Zum Zeilenanfang"
 
-#: src/compose.c:620
+#: src/compose.c:623
 msgid "Move to end of line"
 msgstr "Zum Zeilenende"
 
-#: src/compose.c:621
+#: src/compose.c:624
 msgid "Move to previous line"
 msgstr "Zur vorigen Zeile"
 
-#: src/compose.c:622
+#: src/compose.c:625
 msgid "Move to next line"
 msgstr "Zur nächsten Zeile"
 
-#: src/compose.c:623
+#: src/compose.c:626
 msgid "Delete a character backward"
 msgstr "Ein Zeichen rückwärts löschen"
 
-#: src/compose.c:624
+#: src/compose.c:627
 msgid "Delete a character forward"
 msgstr "Ein Zeichen vorwärts löschen"
 
-#: src/compose.c:625
+#: src/compose.c:628
 msgid "Delete a word backward"
 msgstr "Ein Wort rückwärts löschen"
 
-#: src/compose.c:626
+#: src/compose.c:629
 msgid "Delete a word forward"
 msgstr "Ein Wort vorwärts löschen"
 
-#: src/compose.c:627
+#: src/compose.c:630
 msgid "Delete line"
 msgstr "Zeile löschen"
 
-#: src/compose.c:628
+#: src/compose.c:631
 msgid "Delete to end of line"
 msgstr "Bis zum Ende der Zeile löschen"
 
-#: src/compose.c:631 src/messageview.c:230
+#: src/compose.c:634 src/messageview.c:228
 msgid "_Find"
 msgstr "_Suchen"
 
-#: src/compose.c:634
+#: src/compose.c:637
 msgid "_Wrap current paragraph"
 msgstr "Aktuellen Absatz _umbrechen"
 
-#: src/compose.c:635
+#: src/compose.c:638
 msgid "Wrap all long _lines"
 msgstr "Alle _langen Zeilen umbrechen"
 
-#: src/compose.c:637
+#: src/compose.c:640
 msgid "Edit with e_xternal editor"
 msgstr "Mit e_xternem Editor bearbeiten"
 
-#: src/compose.c:640
+#: src/compose.c:643
 msgid "_Check all or check selection"
 msgstr "Alles oder markierte Auswahl _prüfen"
 
-#: src/compose.c:641
+#: src/compose.c:644
 msgid "_Highlight all misspelled words"
 msgstr "Alle _Schreibfehler hervorheben"
 
-#: src/compose.c:642
+#: src/compose.c:645
 msgid "Check _backwards misspelled word"
 msgstr "_Rechtschreibung rückwärts prüfen"
 
-#: src/compose.c:643
+#: src/compose.c:646
 msgid "_Forward to next misspelled word"
 msgstr "_Nächstes falsch geschriebenes Wort"
 
-#: src/compose.c:651
+#: src/compose.c:654
 msgid "Reply _mode"
 msgstr "Antwortmodus"
 
-#: src/compose.c:653
+#: src/compose.c:656
 msgid "Privacy _System"
 msgstr "Datenschutz_system"
 
-#: src/compose.c:658
+#: src/compose.c:661
 msgid "_Priority"
 msgstr "_Priorität"
 
-#: src/compose.c:660 src/mainwindow.c:603 src/messageview.c:266
+#: src/compose.c:663 src/mainwindow.c:603 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "Zei_chenkodierung"
 
-#: src/compose.c:665 src/mainwindow.c:608 src/messageview.c:271
+#: src/compose.c:668 src/mainwindow.c:608 src/messageview.c:269
 msgid "Western European"
 msgstr "Westeuropäisch"
 
-#: src/compose.c:666 src/mainwindow.c:609 src/messageview.c:272
+#: src/compose.c:669 src/mainwindow.c:609 src/messageview.c:270
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: src/compose.c:667 src/mainwindow.c:610 src/messageview.c:273
+#: src/compose.c:670 src/mainwindow.c:610 src/messageview.c:271
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: src/compose.c:668 src/mainwindow.c:611 src/messageview.c:274
+#: src/compose.c:671 src/mainwindow.c:611 src/messageview.c:272
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: src/compose.c:669 src/mainwindow.c:612 src/messageview.c:275
+#: src/compose.c:672 src/mainwindow.c:612 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "Kyrillisch"
 
-#: src/compose.c:670 src/mainwindow.c:613 src/messageview.c:276
+#: src/compose.c:673 src/mainwindow.c:613 src/messageview.c:274
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: src/compose.c:671 src/mainwindow.c:614 src/messageview.c:277
+#: src/compose.c:674 src/mainwindow.c:614 src/messageview.c:275
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: src/compose.c:672 src/mainwindow.c:615 src/messageview.c:278
+#: src/compose.c:675 src/mainwindow.c:615 src/messageview.c:276
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: src/compose.c:673 src/mainwindow.c:616 src/messageview.c:279
+#: src/compose.c:676 src/mainwindow.c:616 src/messageview.c:277
 msgid "Thai"
 msgstr "Thailändisch"
 
-#: src/compose.c:676 src/mainwindow.c:723 src/messageview.c:315
+#: src/compose.c:679 src/mainwindow.c:723 src/messageview.c:313
 msgid "_Address book"
 msgstr "_Adressbuch"
 
-#: src/compose.c:678
+#: src/compose.c:681
 msgid "_Template"
 msgstr "Vorlage"
 
-#: src/compose.c:680 src/mainwindow.c:751 src/messageview.c:336
+#: src/compose.c:683 src/mainwindow.c:751 src/messageview.c:334
 msgid "Actio_ns"
 msgstr "A_ktionen"
 
-#: src/compose.c:689
+#: src/compose.c:692
 msgid "Aut_o wrapping"
 msgstr "Aut_omatisch umbrechen"
 
-#: src/compose.c:690
+#: src/compose.c:693
 msgid "Auto _indent"
 msgstr "Automa_tisch einrücken"
 
-#: src/compose.c:691
+#: src/compose.c:694
 msgid "Si_gn"
 msgstr "Unterzeichnen"
 
-#: src/compose.c:692
+#: src/compose.c:695
 msgid "_Encrypt"
 msgstr "Verschlüsseln"
 
-#: src/compose.c:693
+#: src/compose.c:696
 msgid "_Request Return Receipt"
 msgstr "Empfangsbestätigung anfordern"
 
-#: src/compose.c:694
+#: src/compose.c:697
 msgid "Remo_ve references"
 msgstr "_Referenzen entfernen"
 
-#: src/compose.c:695
+#: src/compose.c:698
 msgid "Show _ruler"
 msgstr "_Lineal anzeigen"
 
-#: src/compose.c:700 src/compose.c:710
+#: src/compose.c:703 src/compose.c:713
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:701 src/mainwindow.c:657 src/messageview.c:304
+#: src/compose.c:704 src/mainwindow.c:657 src/messageview.c:302
 msgid "_All"
 msgstr "_Alle"
 
-#: src/compose.c:702 src/mainwindow.c:658 src/messageview.c:305
+#: src/compose.c:705 src/mainwindow.c:658 src/messageview.c:303
 msgid "_Sender"
 msgstr "Absender"
 
-#: src/compose.c:703
+#: src/compose.c:706
 msgid "_Mailing-list"
 msgstr "_Mailingliste"
 
-#: src/compose.c:708
+#: src/compose.c:711
 msgid "_Highest"
 msgstr "S_ehr hoch"
 
-#: src/compose.c:709
+#: src/compose.c:712
 msgid "Hi_gh"
 msgstr "_Hoch"
 
-#: src/compose.c:711
+#: src/compose.c:714
 msgid "Lo_w"
 msgstr "_Gering"
 
-#: src/compose.c:712
+#: src/compose.c:715
 msgid "_Lowest"
 msgstr "_Sehr gering"
 
-#: src/compose.c:717 src/mainwindow.c:867 src/messageview.c:353
+#: src/compose.c:720 src/mainwindow.c:865 src/messageview.c:351
 msgid "_Automatic"
 msgstr "_Automatisch"
 
-#: src/compose.c:718 src/mainwindow.c:868 src/messageview.c:354
+#: src/compose.c:721 src/mainwindow.c:866 src/messageview.c:352
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:719 src/mainwindow.c:869 src/messageview.c:355
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:353
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:723 src/mainwindow.c:873 src/messageview.c:359
+#: src/compose.c:726 src/mainwindow.c:871 src/messageview.c:357
 msgid "Central European (ISO-8859-_2)"
 msgstr "Mitteleuropäisch (ISO-8859-_2)"
 
-#: src/compose.c:726 src/mainwindow.c:876 src/messageview.c:362
+#: src/compose.c:729 src/mainwindow.c:874 src/messageview.c:360
 msgid "Greek (ISO-8859-_7)"
 msgstr "Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:731 src/mainwindow.c:881 src/messageview.c:367
+#: src/compose.c:734 src/mainwindow.c:879 src/messageview.c:365
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Türkisch (ISO-8859-_9)"
 
-#: src/compose.c:1034
+#: src/compose.c:1062
 msgid "New message From format error."
-msgstr "Neue Nachricht hat Formatfehler in 'Von'."
+msgstr "Neue Nachricht hat Formatierungsfehler in 'Von'."
 
-#: src/compose.c:1126
+#: src/compose.c:1154
 msgid "New message subject format error."
 msgstr "Neue Nachricht hat Formatierungsfehler im Betreff."
 
-#: src/compose.c:1157 src/quote_fmt.c:563
+#: src/compose.c:1185 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Der Text der Vorlage \"neue Nachricht\" hat einen Fehler in Zeile %d."
 
-#: src/compose.c:1413
+#: src/compose.c:1439
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Keine Antwort möglich. Die Original-Mail existiert vermutlich nicht."
 
-#: src/compose.c:1596 src/quote_fmt.c:580
+#: src/compose.c:1622 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
@@ -1818,12 +1832,12 @@ msgstr ""
 "Das \"Von\"-Feld der \"Antworten\"-Vorlage enthält eine ungültige E-"
 "Mailadresse."
 
-#: src/compose.c:1644 src/quote_fmt.c:583
+#: src/compose.c:1670 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Der Körper der \"Antworten\"-Vorlage hat eine Fehler in Zeile %d."
 
-#: src/compose.c:1780 src/compose.c:1972 src/quote_fmt.c:600
+#: src/compose.c:1806 src/compose.c:1998 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1831,56 +1845,56 @@ msgstr ""
 "Das \"Von\" Feld der \"Weiterleiten\"-Vorlage enthält eine ungültige E-"
 "Mailadresse."
 
-#: src/compose.c:1840 src/quote_fmt.c:603
+#: src/compose.c:1866 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Der Körper der \"Weiterleiten\"-Vorlage hat eine Fehler in Zeile %d."
 
-#: src/compose.c:2014
+#: src/compose.c:2040
 msgid "Fw: multiple emails"
 msgstr "Fw: mehrere E-Mails"
 
-#: src/compose.c:2456
+#: src/compose.c:2482
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
-msgstr "Der Textkörper der \"Umleiten\"-Vorlage ist fehlerhaft in Zeile %d."
+msgstr "Der Körper der \"Umleiten\"-Vorlage hat einen Fehler in Zeile %d."
 
-#: src/compose.c:2522 src/gtk/headers.h:13
+#: src/compose.c:2549 src/gtk/headers.h:13
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2525 src/gtk/headers.h:14
+#: src/compose.c:2552 src/gtk/headers.h:14
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2528 src/gtk/headers.h:11
+#: src/compose.c:2555 src/gtk/headers.h:11
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
-#: src/compose.c:2531 src/compose.c:4818 src/compose.c:4820
+#: src/compose.c:2558 src/compose.c:4854 src/compose.c:4856
 #: src/gtk/headers.h:32
 msgid "Newsgroups:"
 msgstr "Newsgruppen:"
 
-#: src/compose.c:2534 src/gtk/headers.h:33
+#: src/compose.c:2561 src/gtk/headers.h:33
 msgid "Followup-To:"
 msgstr "Followup an:"
 
-#: src/compose.c:2537 src/gtk/headers.h:16
+#: src/compose.c:2564 src/gtk/headers.h:16
 msgid "In-Reply-To:"
 msgstr "In-Reply-To:"
 
-#: src/compose.c:2541 src/compose.c:4815 src/compose.c:4823
-#: src/gtk/headers.h:12 src/summary_search.c:419
+#: src/compose.c:2568 src/compose.c:4851 src/compose.c:4859
+#: src/gtk/headers.h:12 src/summary_search.c:445
 msgid "To:"
 msgstr "An:"
 
-#: src/compose.c:2747
+#: src/compose.c:2774
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Datei konnte nicht angehängt werden (Zeichensatzkonvertierung schlug fehl)."
 
-#: src/compose.c:2753
+#: src/compose.c:2780
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1895,66 +1909,66 @@ msgstr[1] ""
 "Die folgenden Dateien wurden angehängt: \n"
 "%s"
 
-#: src/compose.c:3026
+#: src/compose.c:3053
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Das \"Zitatzeichen\" der Vorlage ist ungültig."
 
-#: src/compose.c:3514
+#: src/compose.c:3542
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Die Größe der Datei '%s' ist nicht ermittelbar."
 
-#: src/compose.c:3525
+#: src/compose.c:3553
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr ""
-"Sie sind dabei eine %s große Datei in die Nachricht einzufügen. Möchten Sie "
-"das wirklich tun?"
+"Sie sind dabei eine %s große Datei in den Nachrichtenkörper einzufügen. "
+"Möchten Sie das wirklich tun?"
 
-#: src/compose.c:3528
+#: src/compose.c:3556
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
-#: src/compose.c:3529 src/compose.c:10962
+#: src/compose.c:3557 src/compose.c:11027
 msgid "+_Insert"
 msgstr "+Einfügen"
 
-#: src/compose.c:3639
+#: src/compose.c:3672
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:3643
+#: src/compose.c:3676
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:3670
+#: src/compose.c:3703
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:4658 src/plugins/python/composewindowtype.c:428
+#: src/compose.c:4691 src/plugins/python/composewindowtype.c:432
 msgid " [Edited]"
 msgstr " [Bearbeitet]"
 
-#: src/compose.c:4665 src/plugins/python/composewindowtype.c:431
+#: src/compose.c:4698 src/plugins/python/composewindowtype.c:435
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Nachricht verfassen%s"
 
-#: src/compose.c:4668 src/plugins/python/composewindowtype.c:434
+#: src/compose.c:4701 src/plugins/python/composewindowtype.c:438
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[kein Betreff] - Nachricht verfassen%s"
 
-#: src/compose.c:4670 src/plugins/python/composewindowtype.c:422
+#: src/compose.c:4703 src/plugins/python/composewindowtype.c:426
 msgid "Compose message"
 msgstr "Nachricht verfassen"
 
-#: src/compose.c:4697 src/messageview.c:909
+#: src/compose.c:4730 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1962,51 +1976,51 @@ msgstr ""
 "Kein Konto zum Versenden von E-Mails angegeben.\n"
 "Bitte wählen Sie einen E-Mail-Konto vor dem Senden."
 
-#: src/compose.c:4914 src/compose.c:4946 src/compose.c:4988
-#: src/plugins/attachwarner/attachwarner.c:219 src/prefs_account.c:3245
-#: src/toolbar.c:404 src/toolbar.c:422
+#: src/compose.c:4950 src/compose.c:4982 src/compose.c:5024
+#: src/plugins/attachwarner/attachwarner.c:219 src/prefs_account.c:3237
+#: src/toolbar.c:405 src/toolbar.c:423
 msgid "Send"
 msgstr "Senden"
 
-#: src/compose.c:4915
+#: src/compose.c:4951
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Der einzige Empfänger ist die Standard-Cc-Adresse. Trotzdem senden?"
 
-#: src/compose.c:4916 src/compose.c:4948 src/compose.c:4981 src/compose.c:5497
+#: src/compose.c:4952 src/compose.c:4984 src/compose.c:5017 src/compose.c:5538
 #: src/plugins/attachwarner/attachwarner.c:211
 msgid "+_Send"
 msgstr "+_Senden"
 
-#: src/compose.c:4947
+#: src/compose.c:4983
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Der einzige Empfänger ist die Standard-Bcc-Adresse. Trotzdem senden?"
 
-#: src/compose.c:4964
+#: src/compose.c:5000
 msgid "Recipient is not specified."
 msgstr "Kein Empfänger angegeben."
 
-#: src/compose.c:4983 src/plugins/attachwarner/attachwarner.c:213
+#: src/compose.c:5019 src/plugins/attachwarner/attachwarner.c:213
 msgid "+_Queue"
 msgstr "+_Postausgang"
 
-#: src/compose.c:4984
+#: src/compose.c:5020
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Betreff ist leer. %s"
 
-#: src/compose.c:4985
+#: src/compose.c:5021
 msgid "Send it anyway?"
 msgstr "Trotzdem senden?"
 
-#: src/compose.c:4986
+#: src/compose.c:5022
 msgid "Queue it anyway?"
 msgstr "Trotzdem vorspeichern?"
 
-#: src/compose.c:4988 src/toolbar.c:423
+#: src/compose.c:5024 src/toolbar.c:424
 msgid "Send later"
 msgstr "Später senden"
 
-#: src/compose.c:5036 src/compose.c:9585
+#: src/compose.c:5077 src/compose.c:9643
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2016,7 +2030,7 @@ msgstr ""
 "\n"
 "Zeichensatz-Konvertierung schlug fehl."
 
-#: src/compose.c:5039 src/compose.c:9588
+#: src/compose.c:5080 src/compose.c:9646
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2026,7 +2040,7 @@ msgstr ""
 "\n"
 "Schlüssel des Empfängers nicht erhältlich."
 
-#: src/compose.c:5045 src/compose.c:9582
+#: src/compose.c:5086 src/compose.c:9640
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2037,7 +2051,7 @@ msgstr ""
 "\n"
 "Fehler bei digitaler Signatur: %s"
 
-#: src/compose.c:5048
+#: src/compose.c:5089
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2048,11 +2062,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5050
+#: src/compose.c:5091
 msgid "Could not queue message for sending."
 msgstr "Nachricht konnte nicht zum Senden vorgespeichert werden."
 
-#: src/compose.c:5065 src/compose.c:5125
+#: src/compose.c:5106 src/compose.c:5166
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2061,7 +2075,7 @@ msgstr ""
 "gesendet. Benutzen Sie 'Ausgehende Nachrichten senden'\n"
 "aus dem Hauptmenü zum Wiederholen."
 
-#: src/compose.c:5121
+#: src/compose.c:5162
 #, c-format
 msgid ""
 "%s\n"
@@ -2071,7 +2085,7 @@ msgstr ""
 "Benutzen Sie \"Vorgespeicherte Nachrichten senden\" vom Hauptfenster zum "
 "Wiederholen."
 
-#: src/compose.c:5494
+#: src/compose.c:5535
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2082,7 +2096,7 @@ msgstr ""
 "spezifizierten Zeichensatz %s konvertiert werden.\n"
 "Als %s senden?"
 
-#: src/compose.c:5552
+#: src/compose.c:5593
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2095,68 +2109,68 @@ msgstr ""
 "\n"
 "Trotzdem senden?"
 
-#: src/compose.c:5733
+#: src/compose.c:5774
 msgid "Encryption warning"
 msgstr "Verschlüsselungshinweis"
 
-#: src/compose.c:5734
+#: src/compose.c:5775
 msgid "+C_ontinue"
 msgstr "+Fortfahren"
 
-#: src/compose.c:5783
+#: src/compose.c:5824
 msgid "No account for sending mails available!"
 msgstr "Kein Konto zum Versenden von E-Mails vorhanden!"
 
-#: src/compose.c:5792
+#: src/compose.c:5833
 msgid "Selected account isn't NNTP: Posting is impossible."
-msgstr "Kein Newskonto gewählt: Absenden schlug fehl."
+msgstr "Gewähltes Konto ist nicht NNTP: Absenden schlug fehl."
 
-#: src/compose.c:6021
+#: src/compose.c:6062
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Der Anhang %s existiert nicht mehr. Ignorieren?"
 
-#: src/compose.c:6022 src/mainwindow.c:648 src/toolbar.c:229
-#: src/toolbar.c:2181
+#: src/compose.c:6063 src/mainwindow.c:648 src/toolbar.c:230
+#: src/toolbar.c:2182
 msgid "Cancel sending"
 msgstr "Senden abbrechen"
 
-#: src/compose.c:6022
+#: src/compose.c:6063
 msgid "Ignore attachment"
 msgstr "Anhang ignorieren"
 
 # Maybe not completely correct translated but I could not get the context...
-#: src/compose.c:6061
+#: src/compose.c:6102
 #, c-format
 msgid "Original %s part"
 msgstr "Originaler %s-Teil"
 
-#: src/compose.c:6592
+#: src/compose.c:6681
 msgid "Add to address _book"
 msgstr "Zum Adress_buch hinzufügen"
 
-#: src/compose.c:6748
+#: src/compose.c:6837
 msgid "Delete entry contents"
 msgstr "Inhalt des Eintrags löschen"
 
-#: src/compose.c:6752 src/plugins/vcalendar/vcal_meeting_gtk.c:295
+#: src/compose.c:6841 src/plugins/vcalendar/vcal_meeting_gtk.c:295
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Mit <tab> automatisch aus dem Adressbuch vervollständigen"
 
-#: src/compose.c:6972
+#: src/compose.c:7061
 msgid "Mime type"
 msgstr "MIME-Typ"
 
-#: src/compose.c:6978 src/mimeview.c:283 src/plugins/pgpcore/select-keys.c:396
+#: src/compose.c:7067 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:392
 #: src/prefs_matcher.c:627 src/prefs_summary_column.c:85 src/summaryview.c:447
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:7048
+#: src/compose.c:7130
 msgid "Save Message to "
 msgstr "Nachricht speichern unter "
 
-#: src/compose.c:7081 src/editjpilot.c:276 src/editldap.c:520
+#: src/compose.c:7167 src/editjpilot.c:276 src/editldap.c:520
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1028
 #: src/plugins/bogofilter/bogofilter_gtk.c:188
@@ -2167,24 +2181,24 @@ msgstr "Nachricht speichern unter "
 msgid "_Browse"
 msgstr "_Durchsuchen"
 
-#: src/compose.c:7569
+#: src/compose.c:7643
 msgid "Hea_der"
 msgstr "_Kopfzeile"
 
-#: src/compose.c:7574
+#: src/compose.c:7648
 msgid "_Attachments"
 msgstr "_Anhänge"
 
-#: src/compose.c:7588
+#: src/compose.c:7662
 msgid "Othe_rs"
 msgstr "_Weiteres"
 
-#: src/compose.c:7603 src/gtk/headers.h:18
-#: src/plugins/pdf_viewer/poppler_viewer.c:704 src/summary_search.c:426
+#: src/compose.c:7677 src/gtk/headers.h:18
+#: src/plugins/pdf_viewer/poppler_viewer.c:704 src/summary_search.c:452
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: src/compose.c:7830
+#: src/compose.c:7891
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2193,20 +2207,20 @@ msgstr ""
 "Rechtschreibprüfung konnte nicht gestartet werden.\n"
 "%s"
 
-#: src/compose.c:7943
+#: src/compose.c:8000
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Von: <i>%s</i>"
 
-#: src/compose.c:7977
+#: src/compose.c:8034
 msgid "Account to use for this email"
 msgstr "Für diese E-Mail zu verwendendes Konto"
 
-#: src/compose.c:7979
+#: src/compose.c:8036
 msgid "Sender address to be used"
 msgstr "Zu benutzende Absenderadresse"
 
-#: src/compose.c:8143
+#: src/compose.c:8200
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2215,64 +2229,64 @@ msgstr ""
 "Das Datenschutzsystem '%s' kann nicht geladen werden. Es wird nicht möglich "
 "sein, diese Nachricht zu signieren oder zu verschlüsseln."
 
-#: src/compose.c:8243 src/plugins/archive/archiver_gtk.c:1082
+#: src/compose.c:8300 src/plugins/archive/archiver_gtk.c:1082
 msgid "_None"
 msgstr "_Keines"
 
-#: src/compose.c:8344 src/prefs_template.c:749
+#: src/compose.c:8401 src/prefs_template.c:753
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Der Text der Vorlage hat einen Fehler in Zeile %d."
 
-#: src/compose.c:8460
+#: src/compose.c:8517
 msgid "Template From format error."
-msgstr "Formatfehler in Von-Vorlage."
+msgstr "Formatierungsfehler in Von-Vorlage."
 
-#: src/compose.c:8478
+#: src/compose.c:8535
 msgid "Template To format error."
-msgstr "Formatfehler in An-Vorlage."
+msgstr "Formatierungsfehler in An-Vorlage."
 
-#: src/compose.c:8496
+#: src/compose.c:8553
 msgid "Template Cc format error."
-msgstr "Formatfehler in Cc-Vorlage."
+msgstr "Formatierungsfehler in Cc-Vorlage."
 
-#: src/compose.c:8514
+#: src/compose.c:8571
 msgid "Template Bcc format error."
-msgstr "Formatfehler in Bcc-Vorlage."
+msgstr "Formatierungsfehler in Bcc-Vorlage."
 
-#: src/compose.c:8533
+#: src/compose.c:8590
 msgid "Template subject format error."
-msgstr "Formatfehler in Betreff-Vorlage."
+msgstr "Formatierungsfehler in Betreff-Vorlage."
 
-#: src/compose.c:8797
+#: src/compose.c:8854
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME-Typ."
 
-#: src/compose.c:8812
+#: src/compose.c:8869
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:8886
+#: src/compose.c:8943
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:8903
+#: src/compose.c:8960
 msgid "MIME type"
 msgstr "MIME-Typ"
 
-#: src/compose.c:8944
+#: src/compose.c:9001
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:8964
+#: src/compose.c:9021
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:8965
+#: src/compose.c:9022
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:9157
+#: src/compose.c:9214
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2283,15 +2297,15 @@ msgstr ""
 "Prozess beenden?\n"
 "Prozessgruppen-ID: %d"
 
-#: src/compose.c:9551 src/messageview.c:1116
+#: src/compose.c:9609 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail benötigt Zugang zum Netz, um diese E-Mail zu senden."
 
-#: src/compose.c:9577
+#: src/compose.c:9635
 msgid "Could not queue message."
 msgstr "Nachricht konnte nicht vorgespeichert werden."
 
-#: src/compose.c:9579
+#: src/compose.c:9637
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2301,15 +2315,15 @@ msgstr ""
 "Nachricht konnte nicht vorgespeichert werden\n"
 "%s."
 
-#: src/compose.c:9747
+#: src/compose.c:9805
 msgid "Could not save draft."
 msgstr "Entwurf konnte nicht gespeichert werden."
 
-#: src/compose.c:9751
+#: src/compose.c:9809
 msgid "Could not save draft"
 msgstr "Entwurf konnte nicht gespeichert werden"
 
-#: src/compose.c:9752
+#: src/compose.c:9810
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2317,24 +2331,24 @@ msgstr ""
 "Entwurf konnte nicht gespeichert werden.\n"
 "Möchten Sie das Beenden zurücknehmen oder die Nachricht verwerfen?"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Cancel exit"
 msgstr "Beenden _zurücknehmen"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Discard email"
 msgstr "_Nachricht verwerfen"
 
-#: src/compose.c:9914 src/compose.c:9928
+#: src/compose.c:9972 src/compose.c:9986
 msgid "Select file"
 msgstr "Datei auswählen"
 
-#: src/compose.c:9942
+#: src/compose.c:10000
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Datei '%s' konnte nicht gelesen werden."
 
-#: src/compose.c:9944
+#: src/compose.c:10002
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2343,60 +2357,62 @@ msgstr ""
 "Die Datei '%s' enthält ungültige Zeichen\n"
 "für die aktuelle Kodierung, Einfügung kann fehlerhaft sein."
 
-#: src/compose.c:10016
+#: src/compose.c:10081
 msgid "Discard message"
 msgstr "Nachricht verwerfen"
 
-#: src/compose.c:10017
+#: src/compose.c:10082
 msgid "This message has been modified. Discard it?"
 msgstr "Diese Nachricht wurde geändert. Verwerfen?"
 
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Discard"
 msgstr "_Verwerfen"
 
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Save to Drafts"
 msgstr "Entwurf _speichern"
 
-#: src/compose.c:10020
+#: src/compose.c:10085
 msgid "Save changes"
 msgstr "Änderungen speichern"
 
-#: src/compose.c:10021
+#: src/compose.c:10086
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Diese Nachricht wurde geändert. Die letzten Änderungen speichern?"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "_Don't save"
 msgstr "_Nicht Speichern"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "+_Save to Drafts"
 msgstr "+Als Entwurf _speichern"
 
-#: src/compose.c:10092
+#: src/compose.c:10157
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Möchten Sie die Vorlage '%s' anwenden?"
 
-#: src/compose.c:10094
+#: src/compose.c:10159
 msgid "Apply template"
 msgstr "Vorlage anwenden"
 
-#: src/compose.c:10095
+#: src/compose.c:10160 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:772 src/prefs_template.c:309 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "Ersetzen"
 
-#: src/compose.c:10095
+#: src/compose.c:10160
 msgid "_Insert"
 msgstr "Einfügen"
 
-#: src/compose.c:10959
+#: src/compose.c:11024
 msgid "Insert or attach?"
 msgstr "Einfügen oder Anhängen?"
 
-#: src/compose.c:10960
+#: src/compose.c:11025
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2404,16 +2420,16 @@ msgstr ""
 "Wollen Sie den Inhalt der Datei in den Nachrichtenkörper einfügen oder an "
 "die Nachricht anhängen?"
 
-#: src/compose.c:10962
+#: src/compose.c:11027
 msgid "_Attach"
 msgstr "_Anhang"
 
-#: src/compose.c:11178
+#: src/compose.c:11243
 #, c-format
 msgid "Quote format error at line %d."
-msgstr "Zitat-Formatfehler in Zeile %d."
+msgstr "Zitat-Formatierungsfehler in Zeile %d."
 
-#: src/compose.c:11462
+#: src/compose.c:11527
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2444,7 +2460,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Fehlerprotokoll"
 
-#: src/crash.c:252 src/toolbar.c:420
+#: src/crash.c:252 src/toolbar.c:421
 msgid "Close"
 msgstr "Schließen"
 
@@ -2563,42 +2579,42 @@ msgstr "Bild _entfernen"
 msgid "Photo"
 msgstr "Foto"
 
-#: src/editaddress.c:959 src/editaddress.c:961 src/expldifdlg.c:516
+#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:516
 #: src/exporthtml.c:761 src/ldif.c:766
 msgid "Display Name"
 msgstr "Angezeigter Name"
 
-#: src/editaddress.c:968 src/editaddress.c:972 src/ldif.c:774
+#: src/editaddress.c:961 src/editaddress.c:965 src/ldif.c:774
 msgid "Last Name"
 msgstr "Nachname"
 
-#: src/editaddress.c:969 src/editaddress.c:971 src/ldif.c:770
+#: src/editaddress.c:962 src/editaddress.c:964 src/ldif.c:770
 msgid "First Name"
 msgstr "Vorname"
 
-#: src/editaddress.c:975 src/editaddress.c:977
+#: src/editaddress.c:968 src/editaddress.c:970
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: src/editaddress.c:1061 src/editaddress.c:1129
+#: src/editaddress.c:1054 src/editaddress.c:1122
 msgid "Alias"
 msgstr "Alias"
 
 # UI adapted
-#: src/editaddress.c:1271 src/editaddress.c:1340 src/editaddress.c:1360
+#: src/editaddress.c:1264 src/editaddress.c:1333 src/editaddress.c:1353
 #: src/prefs_customheader.c:223
 msgid "Value"
 msgstr "Feldwert"
 
-#: src/editaddress.c:1427
+#: src/editaddress.c:1424
 msgid "_User Data"
 msgstr "_Persönliche Daten"
 
-#: src/editaddress.c:1428
+#: src/editaddress.c:1425
 msgid "_Email Addresses"
 msgstr "_E-Mail-Adressen"
 
-#: src/editaddress.c:1431 src/editaddress.c:1434
+#: src/editaddress.c:1428 src/editaddress.c:1431
 msgid "O_ther Attributes"
 msgstr "_Zusätzliche Angaben"
 
@@ -2623,8 +2639,8 @@ msgid " Check File "
 msgstr " Datei überprüfen "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1942
-#: src/wizard.c:1371 src/wizard.c:1650
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1934
+#: src/wizard.c:1183 src/wizard.c:1457
 msgid "File"
 msgstr "Datei"
 
@@ -2748,7 +2764,7 @@ msgstr "Mindestens ein LDAP-Suchattribut sollte angegeben werden."
 msgid "Connected successfully to server"
 msgstr "Verbindung zum Server erfolgreich"
 
-#: src/editldap.c:336 src/editldap.c:980
+#: src/editldap.c:336 src/editldap.c:976
 msgid "Edit LDAP Server"
 msgstr "LDAP-Server bearbeiten"
 
@@ -2772,7 +2788,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3318
+#: src/editldap.c:471 src/prefs_account.c:3310
 msgid "SSL"
 msgstr "SSL"
 
@@ -2874,14 +2890,14 @@ msgid ""
 msgstr ""
 "Dies definiert die maximale Zeit (in Sekunden), für die das Ergebnis einer "
 "Adresssuche für die Vervollständigung gültig sein soll. Suchergebnisse "
-"werden für diese Zeit in einem Zwischenspeicher gehalten und dann entfernt. "
-"Dies verbessert die Antwortzeit bei der Suche nach gleichen Namen oder "
-"Adressen in aufeinanderfolgenden Anfragen zur Adressvervollständigung. Der "
-"Zwischenspeicher wird vorrangig vor Anfragen an den Server zur Suche "
+"werden für diesen Zeitraum in einem Zwischenspeicher gehalten und dann "
+"entfernt. Dies verbessert die Antwortzeit bei der Suche nach gleichen Namen "
+"oder Adressen in aufeinanderfolgenden Anfragen zur Adressvervollständigung. "
+"Der Zwischenspeicher wird vorrangig vor Anfragen an den Server zur Suche "
 "verwendet. Der Standardwert ist 600 Sekunden (10 Minuten), was für die "
 "meisten Server genug sein sollte. Ein größerer Wert reduziert die Suchzeit "
 "für aufeinanderfolgende Anfragen. Dies ist nützlich bei Servern mit "
-"langsamer Antwortzeit, benötigt aber mehrSpeicher zum Zwischenspeichern der "
+"langsamer Antwortzeit, benötigt aber mehr Speicher zum Zwischenspeichern der "
 "Ergebnissen."
 
 #: src/editldap.c:634
@@ -2909,7 +2925,7 @@ msgid ""
 "searches against other address interfaces."
 msgstr ""
 "Die Suche nach Namen und Adressen kann entweder mit 'beginnt-mit' oder "
-"'enthält' durchgeführt werden. Diesen Option wählen, um eine 'enthält' Suche "
+"'enthält' durchgeführt werden. Diese Option wählen, um eine 'enthält' Suche "
 "durchzuführen; diese Art der Suche dauert normalerweise länger. Aus "
 "Geschwindigkeitsgründen wird deshalb für die Adressvervollständigung eine "
 "'beginnt mit'-Suche für alle anderen Adressinterfaces verwendet."
@@ -2934,46 +2950,46 @@ msgstr ""
 msgid "Bind Password"
 msgstr "Bind Kennwort"
 
-#: src/editldap.c:733
+#: src/editldap.c:729
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "Das Kennwort zum Verbinden als der 'Bind DN' Benutzer."
 
-#: src/editldap.c:738
+#: src/editldap.c:734
 msgid "Timeout (secs)"
 msgstr "Timeout (Sek.)"
 
-#: src/editldap.c:752
+#: src/editldap.c:748
 msgid "The timeout period in seconds."
 msgstr "Die Timeout-Dauer in Sekunden."
 
-#: src/editldap.c:756
+#: src/editldap.c:752
 msgid "Maximum Entries"
 msgstr "Maximale Anzahl von Einträgen"
 
-#: src/editldap.c:770
+#: src/editldap.c:766
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 "Die maximale Zahl von Einträgen, die im Suchresultat ausgegeben werden "
 "sollen."
 
-#: src/editldap.c:785 src/prefs_account.c:3209
+#: src/editldap.c:781 src/prefs_account.c:3201
 msgid "Basic"
 msgstr "Allgemein"
 
-#: src/editldap.c:786
+#: src/editldap.c:782
 msgid "Search"
 msgstr "Suchen"
 
-#: src/editldap.c:787 src/gtk/quicksearch.c:661
+#: src/editldap.c:783 src/gtk/quicksearch.c:670
 msgid "Extended"
 msgstr "Erweitert"
 
-#: src/editldap.c:985
+#: src/editldap.c:981
 msgid "Add New LDAP Server"
 msgstr "Neuen LDAP-Server hinzufügen"
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1444
+#: src/edittags.c:187 src/prefs_filtering_action.c:1446
 msgid "Tag"
 msgstr "Marke"
 
@@ -2993,26 +3009,26 @@ msgstr "Alle Marken löschen"
 msgid "Do you really want to delete all tags?"
 msgstr "Sollen wirklich alle Marken gelöscht werden?"
 
-#: src/edittags.c:422
+#: src/edittags.c:415
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr ""
 "Sie haben einen reservierten Tag-Name eingegeben, bitte verwenden Sie einen "
 "anderen."
 
-#: src/edittags.c:464
+#: src/edittags.c:457
 msgid "Tag is not set."
 msgstr "Marke ist nicht gesetzt."
 
-#: src/edittags.c:529
+#: src/edittags.c:522
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "Marken setzen"
 
-#: src/edittags.c:543
+#: src/edittags.c:536
 msgid "New tag:"
 msgstr "Neue Marke:"
 
-#: src/edittags.c:576
+#: src/edittags.c:569
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr "Marken zum Setzen/Entfernen auswählen. Änderungen geschehen sofort."
 
@@ -3096,9 +3112,9 @@ msgid "Stylesheet"
 msgstr "Stylesheet"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:133 src/mainwindow.c:1175
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1173
 #: src/plugins/archive/archiver_prefs.c:241 src/prefs_account.c:946
-#: src/prefs_toolbar.c:775 src/prefs_toolbar.c:1456 src/summaryview.c:6010
+#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1465 src/summaryview.c:6006
 msgid "None"
 msgstr "ohne"
 
@@ -3107,7 +3123,7 @@ msgstr "ohne"
 msgid "Default"
 msgstr "Standard"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:248
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
 #: src/plugins/pgpcore/sgpgme.c:148
 msgid "Full"
 msgstr "Voll"
@@ -3182,7 +3198,7 @@ msgstr "Zum Erstellen bitte Ausgabeverzeichnis und LDIF-Dateinamen angeben."
 
 #: src/expldifdlg.c:111
 msgid "Specify parameters to format distinguished name."
-msgstr "Parameter angeben, um den Distinguished Name zu formatieren."
+msgstr "Parameter angeben, um den Distinguierten Name zu formatieren."
 
 #: src/expldifdlg.c:187
 #, c-format
@@ -3268,8 +3284,8 @@ msgid ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
-"Das Suffix wird verwendet, um ein \"Distinguished Name\" (oder DN) für einen "
-"LDAP Eintrag zu erzeugen. Beispiele sind:\n"
+"Das Suffix wird verwendet, um einen \"Distinguierten Name\" (oder DN) für "
+"einen LDAP Eintrag zu erzeugen. Beispiele sind:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
@@ -3292,10 +3308,10 @@ msgid ""
 msgstr ""
 "Die LDIF-Datei enthält mehrere Einträge, die normalerweise in einen LDAP-"
 "Server geladen werden. Jeder Eintrag der LDIF-Datei wird eindeutig "
-"identifiziert durch einen 'Distinguished Name' (oder DN). Das Suffix wird an "
-"den 'Relative Distinguished Name' (oder RDN) angehängt, um den DN zu "
-"erzeugen. Bitte eine der verfügbaren RDN-Optionen wählen, die für die "
-"Erstellung des DN verwendet wird."
+"identifiziert durch einen 'Distinguierten Name' (oder DN). Das Suffix wird "
+"an den 'Relativen Distinguierten Name' (oder RDN) angehängt, um den DN zu "
+"erzeugen. Bitte eine der verfügbaren RDN-Optionen für die Erstellung des DN "
+"wählen."
 
 #: src/expldifdlg.c:543
 msgid "Use DN attribute if present in data"
@@ -3309,10 +3325,10 @@ msgid ""
 "above will be used if the DN user attribute is not found."
 msgstr ""
 "Das Adressbuch kann zuvor aus einer LDIF-Datei importierte Einträge "
-"enthalten. Die Zusatzangabe 'Distinguished Name' (DN) läßt sich, wenn in den "
-"Adressbuchdaten vorhanden, in der exportierten LDIF-Date verwenden. Der oben "
-"gewählte RDN wird benutzt, wenn die Benutzer-Zusatzangabe DN nicht gefunden "
-"wird."
+"enthalten. Die Zusatzangabe 'Distinguished Name' (DN) lässt sich, wenn in "
+"den Adressbuchdaten vorhanden, in der exportierten LDIF-Date verwenden. Der "
+"oben gewählte RDN wird benutzt, wenn die Benutzer-Zusatzangabe DN nicht "
+"gefunden wird."
 
 #: src/expldifdlg.c:558
 msgid "Exclude record if no Email Address"
@@ -3334,7 +3350,7 @@ msgstr "Adressbuch in LDIF-Datei exportieren"
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:113 src/summaryview.c:8154
+#: src/export.c:113 src/summaryview.c:8143
 msgid "Export to mbox file"
 msgstr "Export in Mbox-Datei"
 
@@ -3395,52 +3411,71 @@ msgstr "Name ist zu lang."
 msgid "Not specified."
 msgstr "Nicht angegeben."
 
-#: src/folder.c:1571 src/foldersel.c:374 src/prefs_folder_item.c:308
+#: src/file_checker.c:76
+#, c-format
+msgid "The file %s is missing! Do you want to use the backup file from %s?"
+msgstr "Datei %s fehlt! Möchten Sie die gesicherte Datei von %s verwenden?"
+
+#: src/file_checker.c:84 src/file_checker.c:106
+#, c-format
+msgid "Could not copy %s to %s"
+msgstr "Konnte %s nicht nach %s kopieren."
+
+#: src/file_checker.c:98
+#, c-format
+msgid ""
+"The file %s is empty or corrupted! Do you want to use the backup file from "
+"%s?"
+msgstr ""
+"Datei %s ist leer oder defekt! Möchten Sie die gesicherte Datei von %s "
+"verwenden?"
+
+#: src/folder.c:1577 src/foldersel.c:374 src/prefs_folder_item.c:308
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: src/folder.c:1575 src/foldersel.c:378
+#: src/folder.c:1581 src/foldersel.c:378
 msgid "Sent"
 msgstr "Gesendet"
 
-#: src/folder.c:1579 src/foldersel.c:382
+#: src/folder.c:1585 src/foldersel.c:382
 #: src/plugins/attachwarner/attachwarner.c:219 src/prefs_folder_item.c:311
 msgid "Queue"
 msgstr "Postausgang"
 
-#: src/folder.c:1583 src/foldersel.c:386 src/prefs_folder_item.c:312
+#: src/folder.c:1589 src/foldersel.c:386 src/prefs_folder_item.c:312
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/folder.c:1587 src/foldersel.c:390 src/prefs_folder_item.c:310
+#: src/folder.c:1593 src/foldersel.c:390 src/prefs_folder_item.c:310
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: src/folder.c:2017
+#: src/folder.c:2023
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Bearbeitung läuft (%s)...\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopiere %s nach %s...\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Verschiebe %s nach %s...\n"
 
-#: src/folder.c:3563
+#: src/folder.c:3569
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "aktualisiere Pufferspeicher für %s..."
 
-#: src/folder.c:4435
+#: src/folder.c:4443
 msgid "Processing messages..."
 msgstr "Bearbeitung läuft..."
 
-#: src/folder.c:4571
+#: src/folder.c:4579
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronisiere %s für Offline-Nutzung...\n"
@@ -3457,18 +3492,18 @@ msgstr "NeuerOrdner"
 #: src/foldersel.c:562 src/imap_gtk.c:210 src/imap_gtk.c:216
 #: src/imap_gtk.c:272 src/imap_gtk.c:277 src/mh_gtk.c:155 src/mh_gtk.c:259
 #: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:249
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:97
+#: src/plugins/mailmbox/plugin_gtk.c:416 src/plugins/rssyl/rssyl_cb_menu.c:97
 #: src/plugins/rssyl/rssyl_cb_menu.c:341
-#: src/plugins/vcalendar/vcal_folder.c:2028
+#: src/plugins/vcalendar/vcal_folder.c:2026
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' darf nicht im Ordnernamen enthalten sein."
 
 #: src/foldersel.c:572 src/imap_gtk.c:226 src/imap_gtk.c:284 src/mh_gtk.c:165
 #: src/mh_gtk.c:266 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:261
-#: src/plugins/mailmbox/plugin_gtk.c:428 src/plugins/rssyl/rssyl_cb_menu.c:107
+#: src/plugins/mailmbox/plugin_gtk.c:425 src/plugins/rssyl/rssyl_cb_menu.c:107
 #: src/plugins/rssyl/rssyl_cb_menu.c:348
-#: src/plugins/vcalendar/vcal_folder.c:2035
+#: src/plugins/vcalendar/vcal_folder.c:2033
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Der Ordner '%s' existiert bereits."
@@ -3505,13 +3540,13 @@ msgstr "_Postausgang senden..."
 
 #: src/folderview.c:380 src/folderview.c:427
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:388 src/summaryview.c:6286
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:388 src/summaryview.c:6282
 msgid "New"
 msgstr "Neu"
 
 #: src/folderview.c:381 src/folderview.c:428
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:387 src/summaryview.c:6288
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:387 src/summaryview.c:6284
 msgid "Unread"
 msgstr "Ungelesen"
 
@@ -3525,109 +3560,109 @@ msgstr "Gesamt"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:734
+#: src/folderview.c:727
 msgid "Setting folder info..."
 msgstr "Ordnerdaten werden erstellt..."
 
-#: src/folderview.c:797 src/summaryview.c:4113 src/summaryview.c:4115
+#: src/folderview.c:790 src/summaryview.c:4109 src/summaryview.c:4111
 msgid "Mark all as read"
 msgstr "Alle als gelesen markieren"
 
-#: src/folderview.c:798 src/summaryview.c:4114
+#: src/folderview.c:791 src/summaryview.c:4110
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 "Möchten Sie wirklich alle Mails in diesem Ordner als gelesen markieren?"
 
-#: src/folderview.c:1021 src/imap.c:4490 src/mainwindow.c:5308 src/setup.c:91
+#: src/folderview.c:1014 src/imap.c:4497 src/mainwindow.c:5128 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Ordner %s%c%s wird durchsucht..."
 
-#: src/folderview.c:1025 src/imap.c:4495 src/mainwindow.c:5313 src/setup.c:96
+#: src/folderview.c:1018 src/imap.c:4502 src/mainwindow.c:5133 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Ordner %s wird durchsucht..."
 
-#: src/folderview.c:1056
+#: src/folderview.c:1049
 msgid "Rebuild folder tree"
 msgstr "Ordnerbaum erneuern"
 
-#: src/folderview.c:1057
+#: src/folderview.c:1050
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Erneuern des Ordnerbaumes löscht den lokalen Pufferspeicher. Möchten Sie "
 "fortfahren?"
 
-#: src/folderview.c:1067
+#: src/folderview.c:1060
 msgid "Rebuilding folder tree..."
 msgstr "Ordnerbaum wird erneuert..."
 
-#: src/folderview.c:1069 src/folderview.c:1110
+#: src/folderview.c:1062 src/folderview.c:1103
 msgid "Scanning folder tree..."
 msgstr "Ordnerbaum wird durchsucht..."
 
-#: src/folderview.c:1201
+#: src/folderview.c:1194
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Ordner %s konnte nicht durchsucht werden\n"
 
-#: src/folderview.c:1255
+#: src/folderview.c:1248
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ordner werden auf neue Nachrichten geprüft..."
 
-#: src/folderview.c:2083
+#: src/folderview.c:2076
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Schließe Ordner %s..."
 
-#: src/folderview.c:2178
+#: src/folderview.c:2171
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Öffne Ordner %s..."
 
-#: src/folderview.c:2196
+#: src/folderview.c:2189
 msgid "Folder could not be opened."
 msgstr "Ordner konnte nicht geöffnet werden."
 
-#: src/folderview.c:2337 src/mainwindow.c:3059 src/mainwindow.c:3063
+#: src/folderview.c:2330 src/mainwindow.c:2877 src/mainwindow.c:2881
 msgid "Empty trash"
 msgstr "Papierkorb leeren"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2331
 msgid "Delete all messages in trash?"
 msgstr "Alle Nachrichten im Papierkorb löschen?"
 
-#: src/folderview.c:2339
+#: src/folderview.c:2332
 msgid "+_Empty trash"
 msgstr "+_Papierkorb leeren"
 
-#: src/folderview.c:2383 src/inc.c:1620 src/toolbar.c:2689
+#: src/folderview.c:2376 src/inc.c:1528 src/toolbar.c:2678
 msgid "Offline warning"
 msgstr "Offline-Warnung"
 
-#: src/folderview.c:2384 src/toolbar.c:2690
+#: src/folderview.c:2377 src/toolbar.c:2679
 msgid "You're working offline. Override?"
 msgstr "Sie arbeiten offline. Trotzdem fortfahren?"
 
-#: src/folderview.c:2395 src/toolbar.c:2709
+#: src/folderview.c:2388 src/toolbar.c:2698
 msgid "Send queued messages"
 msgstr "Vorgespeicherte Nachrichten senden"
 
-#: src/folderview.c:2396 src/toolbar.c:2710
+#: src/folderview.c:2389 src/toolbar.c:2699
 msgid "Send all queued messages?"
 msgstr "Alle vorgespeicherten Nachrichten senden?"
 
-#: src/folderview.c:2397 src/messageview.c:875 src/messageview.c:892
-#: src/toolbar.c:2711
+#: src/folderview.c:2390 src/messageview.c:853 src/messageview.c:870
+#: src/toolbar.c:2700
 msgid "_Send"
 msgstr "_Senden"
 
-#: src/folderview.c:2405 src/toolbar.c:2729
+#: src/folderview.c:2398 src/toolbar.c:2718
 msgid "Some errors occurred while sending queued messages."
 msgstr "Fehler beim Senden vorgespeicherter Nachrichten."
 
-#: src/folderview.c:2408 src/main.c:2862 src/toolbar.c:2732
+#: src/folderview.c:2401 src/main.c:2689 src/toolbar.c:2721
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3636,66 +3671,66 @@ msgstr ""
 "Fehler beim Senden vorgespeicherter Nachrichten:\n"
 "%s"
 
-#: src/folderview.c:2485
+#: src/folderview.c:2478
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Soll der Ordner '%s' in '%s' kopiert werden?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2479
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Soll der Ordner '%s' wirklich ein Unterordner von '%s' werden?"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Copy folder"
 msgstr "Kopiere Ordner"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Move folder"
 msgstr "Ordner verschieben"
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopiere %s nach %s..."
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "%s wird nach %s verschoben..."
 
-#: src/folderview.c:2530
+#: src/folderview.c:2523
 msgid "Source and destination are the same."
 msgstr "Quelle und Ziel sind identisch."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2526
 msgid "Can't copy a folder to one of its children."
 msgstr "Ein Ordner ist nicht in untergeordnete Ordner kopierbar."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2527
 msgid "Can't move a folder to one of its children."
 msgstr ""
 "Ein Ordner kann nicht in einen seiner untergeordneten Ordner verschoben "
 "werden."
 
-#: src/folderview.c:2537
+#: src/folderview.c:2530
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Ordner können nicht zwischen verschiedenen Mailboxen verschoben werden"
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Copy failed!"
 msgstr "Kopieren schlug fehl!"
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Move failed!"
 msgstr "Verschieben schlug fehl!"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2584
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Konfiguration Verarbeitung für Ordner %s"
 
-#: src/folderview.c:3018 src/summaryview.c:4554 src/summaryview.c:4653
+#: src/folderview.c:3011 src/summaryview.c:4550 src/summaryview.c:4649
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Der Zielordner kann nur Unterordner aufnehmen."
 
@@ -3772,7 +3807,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Für Hilfe und Disukussionen können Sie die Claws Mail-Users-Mailingliste "
+"Für Hilfe und Diskussionen können Sie die Claws Mail-Users-Mailingliste "
 "abonnieren:\n"
 
 #: src/gtk/about.c:143
@@ -3844,7 +3879,7 @@ msgstr ""
 "Locale: %s (Zeichensatz: %s)\n"
 "Betriebssystem: unbekannt"
 
-#: src/gtk/about.c:243 src/prefs_themes.c:728 src/wizard.c:545
+#: src/gtk/about.c:243 src/prefs_themes.c:728 src/wizard.c:523
 msgid "The Claws Mail Team"
 msgstr "Das Claws Mail Team"
 
@@ -3973,46 +4008,46 @@ msgstr ""
 ">.\n"
 "\n"
 
-#: src/gtk/about.c:699 src/main.c:2689
+#: src/gtk/about.c:699 src/main.c:2516
 msgid "Session statistics\n"
 msgstr "Sitzungsstatistik\n"
 
-#: src/gtk/about.c:709 src/gtk/about.c:712 src/main.c:2699 src/main.c:2702
+#: src/gtk/about.c:709 src/gtk/about.c:712 src/main.c:2526 src/main.c:2529
 #, c-format
 msgid "Started: %s\n"
 msgstr "Beginn: %s\n"
 
-#: src/gtk/about.c:719 src/main.c:2708
+#: src/gtk/about.c:719 src/main.c:2535
 msgid "Incoming traffic\n"
 msgstr "Eingang\n"
 
-#: src/gtk/about.c:722 src/main.c:2711
+#: src/gtk/about.c:722 src/main.c:2538
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Empfangene Nachrichten: %d\n"
 
-#: src/gtk/about.c:729 src/main.c:2717
+#: src/gtk/about.c:729 src/main.c:2544
 msgid "Outgoing traffic\n"
 msgstr "Ausgang\n"
 
 # msgid "/_Tools/---"
 # msgstr "/E_xtras/---"
-#: src/gtk/about.c:732 src/main.c:2720
+#: src/gtk/about.c:732 src/main.c:2547
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Neue/weitergeleitete Nachrichten: %d\n"
 
-#: src/gtk/about.c:737 src/main.c:2724
+#: src/gtk/about.c:737 src/main.c:2551
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Beantwortete Nachrichten: %d\n"
 
-#: src/gtk/about.c:742 src/main.c:2728
+#: src/gtk/about.c:742 src/main.c:2555
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Weitergeleitete Nachrichten: %d\n"
 
-#: src/gtk/about.c:747 src/main.c:2732
+#: src/gtk/about.c:747 src/main.c:2559
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Alle verschickten Nachrichten: %d\n"
@@ -4055,63 +4090,63 @@ msgstr "_Versionsbeschreibung"
 msgid "_Statistics"
 msgstr "_Statistik"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:358
 msgid "Orange"
 msgstr "Orange"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:362
 msgid "Red"
 msgstr "Rot"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:366
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:370
 msgid "Sky blue"
 msgstr "Himmelblau"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:374
 msgid "Blue"
 msgstr "Blau"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:378
 msgid "Green"
 msgstr "Grün"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:382
 msgid "Brown"
 msgstr "Braun"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:386
 msgid "Grey"
 msgstr "Grau"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:390
 msgid "Light brown"
 msgstr "Hellbraun"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:394
 msgid "Dark red"
 msgstr "Dunkelrot"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:398
 msgid "Dark pink"
 msgstr "Dunkelrosa"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:402
 msgid "Steel blue"
 msgstr "Stahlblau"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:406
 msgid "Gold"
 msgstr "Gold"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:410
 msgid "Bright green"
 msgstr "Hellgrün"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:424
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:414
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -4140,7 +4175,7 @@ msgstr "Rechtschreibprüfung %s konnte nicht initialisiert werden."
 
 #: src/gtk/gtkaspell.c:707
 msgid "Couldn't initialize Enchant broker."
-msgstr "Enchant broker konnte nicht initialisiert werden."
+msgstr "Enchant-Broker konnte nicht initialisiert werden."
 
 #: src/gtk/gtkaspell.c:713
 #, c-format
@@ -4239,8 +4274,8 @@ msgstr ""
 "Die Rechtschreibprüfung konnte das alternative Wörterbuch nicht ändern.\n"
 "%s"
 
-#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1257
-#: src/prefs_matcher.c:2152 src/prefs_summary_column.c:84 src/quote_fmt.c:49
+#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1259
+#: src/prefs_matcher.c:2158 src/prefs_summary_column.c:84 src/quote_fmt.c:49
 #: src/summaryview.c:446
 msgid "Date"
 msgstr "Datum"
@@ -4249,13 +4284,13 @@ msgstr "Datum"
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1254
-#: src/prefs_matcher.c:2149 src/prefs_summary_column.c:82 src/quote_fmt.c:50
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1256
+#: src/prefs_matcher.c:2155 src/prefs_summary_column.c:82 src/quote_fmt.c:50
 #: src/summaryview.c:444
 msgid "From"
 msgstr "Von"
 
-#: src/gtk/headers.h:9 src/summary_search.c:412
+#: src/gtk/headers.h:9 src/summary_search.c:438
 msgid "From:"
 msgstr "Von:"
 
@@ -4269,16 +4304,16 @@ msgstr "Absender:"
 
 #: src/gtk/headers.h:11
 msgid "Reply-To"
-msgstr "Antwort an"
+msgstr "Reply-To"
 
-#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2150 src/prefs_summary_column.c:83 src/quote_fmt.c:57
+#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1257
+#: src/prefs_matcher.c:2156 src/prefs_summary_column.c:83 src/quote_fmt.c:57
 #: src/summaryview.c:445
 msgid "To"
 msgstr "An"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2151 src/quote_fmt.c:58
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1258
+#: src/prefs_matcher.c:2157 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
@@ -4286,8 +4321,8 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1258
-#: src/prefs_matcher.c:2153 src/quote_fmt.c:61
+#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1260
+#: src/prefs_matcher.c:2159 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Message-ID"
 
@@ -4299,8 +4334,8 @@ msgstr "Message-ID:"
 msgid "In-Reply-To"
 msgstr "In-Reply-To"
 
-#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2155 src/quote_fmt.c:60
+#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1262
+#: src/prefs_matcher.c:2161 src/quote_fmt.c:60
 msgid "References"
 msgstr "Referenzen"
 
@@ -4308,8 +4343,8 @@ msgstr "Referenzen"
 msgid "References:"
 msgstr "Referenzen:"
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1253
-#: src/prefs_matcher.c:2148 src/prefs_summary_column.c:81 src/quote_fmt.c:56
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1255
+#: src/prefs_matcher.c:2154 src/prefs_summary_column.c:81 src/quote_fmt.c:56
 #: src/summaryview.c:443
 msgid "Subject"
 msgstr "Betreff"
@@ -4402,8 +4437,8 @@ msgstr "Empfangen"
 msgid "Received:"
 msgstr "Empfangen:"
 
-#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2154 src/quote_fmt.c:59
+#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1261
+#: src/prefs_matcher.c:2160 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Newsgruppen"
 
@@ -4421,11 +4456,11 @@ msgstr "Delivered-To:"
 
 #: src/gtk/headers.h:35
 msgid "Seen"
-msgstr "Gesehen"
+msgstr "Seen"
 
 #: src/gtk/headers.h:35
 msgid "Seen:"
-msgstr "Gesehen:"
+msgstr "Seen:"
 
 #: src/gtk/headers.h:36 src/gtk/progressdialog.c:149
 #: src/gtk/sslcertwindow.c:164 src/prefs_summary_column.c:79
@@ -4455,11 +4490,11 @@ msgstr "Disposition-Notification-To:"
 
 #: src/gtk/headers.h:39
 msgid "Return-Receipt-To"
-msgstr "Empfangsbestätigung An"
+msgstr "Return-Receipt-To"
 
 #: src/gtk/headers.h:39
 msgid "Return-Receipt-To:"
-msgstr "Empfangsbestätigung An:"
+msgstr "Return-Receipt-To:"
 
 #: src/gtk/headers.h:40
 msgid "User-Agent"
@@ -4479,11 +4514,11 @@ msgstr "Content-Type:"
 
 #: src/gtk/headers.h:42
 msgid "Content-Transfer-Encoding"
-msgstr "Übertragungskodierung:"
+msgstr "Content-Transfer-Encoding:"
 
 #: src/gtk/headers.h:42
 msgid "Content-Transfer-Encoding:"
-msgstr "Übertragungskodierung:"
+msgstr "Content-Transfer-Encoding:"
 
 #: src/gtk/headers.h:43
 msgid "MIME-Version"
@@ -4495,11 +4530,11 @@ msgstr "MIME-Version:"
 
 #: src/gtk/headers.h:44
 msgid "Precedence"
-msgstr "Priorität"
+msgstr "Precedence"
 
 #: src/gtk/headers.h:44
 msgid "Precedence:"
-msgstr "Priorität:"
+msgstr "Precedence:"
 
 #: src/gtk/headers.h:45 src/prefs_account.c:1067
 msgid "Organization"
@@ -4631,11 +4666,11 @@ msgstr "Von, An oder Betreff:"
 
 #: src/gtk/icon_legend.c:64
 msgid "New message"
-msgstr "neue Nachricht"
+msgstr "Neue Nachricht"
 
 #: src/gtk/icon_legend.c:65
 msgid "Unread message"
-msgstr "ungelesene Nachricht"
+msgstr "Ungelesene Nachricht"
 
 #: src/gtk/icon_legend.c:66
 msgid "Message has been replied to"
@@ -4725,39 +4760,39 @@ msgstr ""
 "<span weight=\"bold\">Folgende Symbole werden genutzt, um den Status von "
 "Nachrichten/Ordnern anzuzeigen:</span>"
 
-#: src/gtk/inputdialog.c:246 src/gtk/inputdialog.c:268
+#: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Kennwort für %s auf %s angeben:"
 
-#: src/gtk/inputdialog.c:249 src/gtk/inputdialog.c:252
-#: src/gtk/inputdialog.c:271 src/gtk/inputdialog.c:274
+#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
+#: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
 #, c-format
 msgid "Input password for %s:"
 msgstr "Kennwort für %s eingeben:"
 
-#: src/gtk/inputdialog.c:255 src/gtk/inputdialog.c:277
+#: src/gtk/inputdialog.c:242 src/gtk/inputdialog.c:264
 msgid "Input password:"
 msgstr "Kennwort eingeben:"
 
-#: src/gtk/inputdialog.c:256 src/gtk/inputdialog.c:284
-#: src/gtk/inputdialog.c:296
+#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
+#: src/gtk/inputdialog.c:283
 msgid "Input password"
 msgstr "Kennwort eingeben"
 
-#: src/gtk/inputdialog.c:286
+#: src/gtk/inputdialog.c:273
 msgid "Remember password for this session"
 msgstr "Kennwort für diese Sitzung merken"
 
-#: src/gtk/inputdialog.c:385 src/gtk/inputdialog.c:434
+#: src/gtk/inputdialog.c:372 src/gtk/inputdialog.c:421
 msgid "Remember this"
 msgstr "Bitte merken"
 
-#: src/gtk/logwindow.c:451
+#: src/gtk/logwindow.c:447
 msgid "Clear _Log"
 msgstr "Protokoll _löschen"
 
-#: src/gtk/menu.c:145
+#: src/gtk/menu.c:137
 msgid ""
 "<span><b>Warning:</b> This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -4765,10 +4800,7 @@ msgid ""
 msgstr ""
 "<span><b>Warnung:</b> Diese URL war zu lang um dargestellt zu werden.\n"
 "Sie wurde aus Sicherheitsgründen gekürzt. Diese Nachricht könnte defekt, "
-"missgebildet oder Teil eines DoS-Versuchs sein.</span><span><b>Warning:</b> "
-"This URL was too long for displaying and\n"
-"has been truncated for safety. This message could be\n"
-"corrupted, malformed or part of some DoS attempt.</span>"
+"missgebildet oder Teil eines DoS-Versuchs sein.</span>"
 
 #: src/gtk/pluginwindow.c:164 src/gtk/pluginwindow.c:169
 msgid ""
@@ -4805,8 +4837,7 @@ msgstr ""
 
 #: src/gtk/pluginwindow.c:304 src/plugins/acpi_notifier/acpi_notifier.c:790
 #: src/plugins/archive/archiver_prefs.c:92
-#: src/plugins/att_remover/att_remover.c:519
-#: src/plugins/attachwarner/attachwarner_prefs.c:201
+#: src/plugins/attachwarner/attachwarner_prefs.c:228
 #: src/plugins/address_keeper/address_keeper_prefs.c:248
 #: src/plugins/bogofilter/bogofilter_gtk.c:457
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
@@ -4825,7 +4856,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:557 src/plugins/rssyl/rssyl_prefs.c:63
 #: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:648
-#: src/plugins/vcalendar/vcal_prefs.c:645 src/prefs_toolbar.c:939
+#: src/plugins/vcalendar/vcal_prefs.c:647 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4841,238 +4872,239 @@ msgstr "Deaktivieren"
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/gtk/pluginwindow.c:373
-msgid "More plugins are available from the Claws Mail website."
-msgstr "Zusätzliche Plugins sind auf der Claws Mail-Webseite verfügbar."
-
-#: src/gtk/pluginwindow.c:379 src/prefs_themes.c:843
-msgid "Get more..."
-msgstr "Weitere holen..."
+#: src/gtk/pluginwindow.c:374
+#, c-format
+msgid ""
+"For more information about plugins see the <a href=\"%s\"><span underline="
+"\"none\">Claws Mail website</span></a>."
+msgstr ""
+"Mehr Informationen zu Plugins finden Sie auf der <a href=\"%s\"><span "
+"underline=\"none\">Website von Claws Mail</span></a>."
 
-#: src/gtk/pluginwindow.c:415
+#: src/gtk/pluginwindow.c:414
 msgid "Click here to load one or more plugins"
 msgstr "Klicken Sie hier, um weitere Plugins zu aktivieren"
 
-#: src/gtk/pluginwindow.c:418
+#: src/gtk/pluginwindow.c:417
 msgid "Unload the selected plugin"
 msgstr "Markiertes Plugin deaktivieren"
 
-#: src/gtk/pluginwindow.c:483
+#: src/gtk/pluginwindow.c:482
 msgid "Loaded plugins"
 msgstr "Aktivierte Plugins"
 
-#: src/gtk/prefswindow.c:679
+#: src/gtk/prefswindow.c:671
 msgid "Page Index"
 msgstr "Seitenindex"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:830
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:828
 msgid "_Hide"
 msgstr "_Ausblenden"
 
-#: src/gtk/progressdialog.c:141 src/prefs_account.c:3208
-#: src/prefs_account.c:3226 src/prefs_account.c:3244 src/prefs_account.c:3262
-#: src/prefs_account.c:3280 src/prefs_account.c:3298 src/prefs_account.c:3317
-#: src/prefs_account.c:3399 src/prefs_filtering_action.c:1419
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1881
+#: src/gtk/progressdialog.c:141 src/prefs_account.c:3200
+#: src/prefs_account.c:3218 src/prefs_account.c:3236 src/prefs_account.c:3254
+#: src/prefs_account.c:3272 src/prefs_account.c:3290 src/prefs_account.c:3309
+#: src/prefs_account.c:3399 src/prefs_filtering_action.c:1421
+#: src/prefs_filtering.c:397 src/prefs_filtering.c:1877
 msgid "Account"
 msgstr "Konto"
 
-#: src/gtk/quicksearch.c:433
+#: src/gtk/quicksearch.c:442
 msgid "all messages"
 msgstr "Alle Nachrichten"
 
-#: src/gtk/quicksearch.c:434
+#: src/gtk/quicksearch.c:443
 msgid "messages whose age is greater than # days"
 msgstr "Nachrichten, die älter sind als # Tage"
 
-#: src/gtk/quicksearch.c:435
+#: src/gtk/quicksearch.c:444
 msgid "messages whose age is less than # days"
 msgstr "Nachrichten, die jünger sind als # Tage"
 
-#: src/gtk/quicksearch.c:436
+#: src/gtk/quicksearch.c:445
 msgid "messages whose age is greater than # hours"
 msgstr "Nachrichten, die älter sind als # Stunden"
 
-#: src/gtk/quicksearch.c:437
+#: src/gtk/quicksearch.c:446
 msgid "messages whose age is less than # hours"
 msgstr "Nachrichten, die jünger sind als # Stunden"
 
-#: src/gtk/quicksearch.c:438
+#: src/gtk/quicksearch.c:447
 msgid "messages which contain S in the message body"
 msgstr "Nachrichten, die S im Nachrichtenkörper enthalten"
 
-#: src/gtk/quicksearch.c:439
+#: src/gtk/quicksearch.c:448
 msgid "messages which contain S in the whole message"
 msgstr "Nachrichten, die S in der ganzen Nachricht enthalten"
 
-#: src/gtk/quicksearch.c:440
+#: src/gtk/quicksearch.c:449
 msgid "messages carbon-copied to S"
 msgstr "Nachrichten mit Kopie an S"
 
-#: src/gtk/quicksearch.c:441
+#: src/gtk/quicksearch.c:450
 msgid "message is either to: or cc: to S"
 msgstr "Nachricht ist entweder to: oder cc: an S"
 
-#: src/gtk/quicksearch.c:442
+#: src/gtk/quicksearch.c:451
 msgid "deleted messages"
 msgstr "Gelöschte Nachrichten"
 
-#: src/gtk/quicksearch.c:443
+#: src/gtk/quicksearch.c:452
 msgid "messages which contain S in the Sender field"
 msgstr "Nachrichten, die S in der 'Sender' Kopfzeile enthalten"
 
-#: src/gtk/quicksearch.c:444
+#: src/gtk/quicksearch.c:453
 msgid "true if execute \"S\" succeeds"
 msgstr "Wahr, wenn Ausführung von \"S\" erfolgreich"
 
-#: src/gtk/quicksearch.c:445
+#: src/gtk/quicksearch.c:454
 msgid "messages originating from user S"
 msgstr "Nachrichten, die von Benutzer S stammen"
 
-#: src/gtk/quicksearch.c:446
+#: src/gtk/quicksearch.c:455
 msgid "forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: src/gtk/quicksearch.c:447
+#: src/gtk/quicksearch.c:456
 msgid "messages which have attachments"
 msgstr "Nachrichten mit Anhängen"
 
-#: src/gtk/quicksearch.c:448
+#: src/gtk/quicksearch.c:457
 msgid "messages which contain header S"
 msgstr "Nachrichten mit S in der Kopfzeile"
 
-#: src/gtk/quicksearch.c:449
+#: src/gtk/quicksearch.c:458
 msgid "messages which contain S in Message-ID header"
 msgstr "Nachrichten mit S in der Message-ID-Kopfzeile"
 
-#: src/gtk/quicksearch.c:450
+#: src/gtk/quicksearch.c:459
 msgid "messages which contain S in In-Reply-To header"
 msgstr "Nachrichten mit S in der 'In-Reply-To'-Kopfzeile"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:460
 msgid "messages which are marked with color #"
 msgstr "Nachrichten, die farblich mit # markiert sind"
 
-#: src/gtk/quicksearch.c:452
+#: src/gtk/quicksearch.c:461
 msgid "locked messages"
 msgstr "Gesperrte Nachrichten"
 
-#: src/gtk/quicksearch.c:453
+#: src/gtk/quicksearch.c:462
 msgid "messages which are in newsgroup S"
 msgstr "Nachrichten in der Newsgruppe S"
 
-#: src/gtk/quicksearch.c:454
+#: src/gtk/quicksearch.c:463
 msgid "new messages"
 msgstr "Neue Nachrichten"
 
-#: src/gtk/quicksearch.c:455
+#: src/gtk/quicksearch.c:464
 msgid "old messages"
 msgstr "Alte Nachrichten"
 
-#: src/gtk/quicksearch.c:456
+#: src/gtk/quicksearch.c:465
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "Unvollständige Nachrichten (teilweise geladen)"
 
-#: src/gtk/quicksearch.c:457
+#: src/gtk/quicksearch.c:466
 msgid "messages which have been replied to"
 msgstr "Nachrichten, die beantwortet wurden"
 
-#: src/gtk/quicksearch.c:458
+#: src/gtk/quicksearch.c:467
 msgid "read messages"
 msgstr "Gelesene Nachrichten"
 
-#: src/gtk/quicksearch.c:459
+#: src/gtk/quicksearch.c:468
 msgid "messages which contain S in subject"
-msgstr "Nachrichten, die S im Betreff enhalten"
+msgstr "Nachrichten, die S im Betreff enthalten"
 
-#: src/gtk/quicksearch.c:460
+#: src/gtk/quicksearch.c:469
 msgid "messages whose score is equal to # points"
 msgstr "Nachrichten mit einer Bewertung von # Punkten"
 
-#: src/gtk/quicksearch.c:461
+#: src/gtk/quicksearch.c:470
 msgid "messages whose score is greater than # points"
 msgstr "Nachrichten mit einer Bewertung von mehr als # Punkten"
 
-#: src/gtk/quicksearch.c:462
+#: src/gtk/quicksearch.c:471
 msgid "messages whose score is lower than # points"
 msgstr "Nachrichten mit einer Bewertung von weniger als # Punkten"
 
-#: src/gtk/quicksearch.c:463
+#: src/gtk/quicksearch.c:472
 msgid "messages whose size is equal to # bytes"
 msgstr "Nachrichten mit einer Größe von # Bytes"
 
-#: src/gtk/quicksearch.c:464
+#: src/gtk/quicksearch.c:473
 msgid "messages whose size is greater than # bytes"
 msgstr "Nachrichten größer als # Bytes"
 
-#: src/gtk/quicksearch.c:465
+#: src/gtk/quicksearch.c:474
 msgid "messages whose size is smaller than # bytes"
 msgstr "Nachrichten kleiner als # Bytes"
 
-#: src/gtk/quicksearch.c:466
+#: src/gtk/quicksearch.c:475
 msgid "messages which have been sent to S"
 msgstr "Nachrichten, die an S gesendet wurden"
 
-#: src/gtk/quicksearch.c:467
+#: src/gtk/quicksearch.c:476
 msgid "messages which tags contain S"
 msgstr "Nachrichten, die Marken mit S enthalten"
 
-#: src/gtk/quicksearch.c:468
+#: src/gtk/quicksearch.c:477
 msgid "messages which have tag(s)"
 msgstr "Nachrichten, die Marke(n) enthalten"
 
-#: src/gtk/quicksearch.c:469
+#: src/gtk/quicksearch.c:478
 msgid "marked messages"
 msgstr "Markierte Nachrichten"
 
-#: src/gtk/quicksearch.c:470
+#: src/gtk/quicksearch.c:479
 msgid "unread messages"
 msgstr "Ungelesene Nachrichten"
 
-#: src/gtk/quicksearch.c:471
+#: src/gtk/quicksearch.c:480
 msgid "messages which contain S in References header"
 msgstr "Nachrichten, die S in der Referenz-Kopfzeile enthalten"
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:481
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "Nachrichten, die bei Übergabe an einen Befehl 0 zurückgeben - %F ist die "
 "Nachrichtendatei"
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:482
 msgid "messages which contain S in X-Label header"
 msgstr "Nachrichten, die S in der X-Label-Kopfzeile enthalten"
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:484
 msgid "logical AND operator"
 msgstr "Logischer UND-Operator"
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:485
 msgid "logical OR operator"
 msgstr "Logischer ODER-Operator"
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:486
 msgid "logical NOT operator"
 msgstr "Logischer NICHT-Operator"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:487
 msgid "case sensitive search"
 msgstr "Groß-/Kleinschreibung beachten"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:488
 msgid "match using regular expressions instead of substring search"
 msgstr "Suche mit regulären Ausdrücken anstatt nach Teilzeichenfolgen"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:490
 msgid "all filtering expressions are allowed"
 msgstr "alle Filterausdrücke sind erlaubt"
 
-#: src/gtk/quicksearch.c:490 src/summary_search.c:457
+#: src/gtk/quicksearch.c:499 src/summary_search.c:483
 msgid "Extended Search"
 msgstr "Erweiterte Suche"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:500
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
@@ -5082,47 +5114,54 @@ msgstr ""
 "erfüllen müssen, um in der Liste angezeigt zu werden.\n"
 "Folgende Symbole können verwendet werden:"
 
-#: src/gtk/quicksearch.c:591
+#: src/gtk/quicksearch.c:600
 msgid "Something went wrong during search. Please check your logs."
-msgstr "Während der Suche lief etwas schief. Bitte überprüfen Sie die Logs."
+msgstr ""
+"Während der Suche lief etwas schief. Bitte überprüfen Sie die Protokoll-"
+"Dateien."
 
-#: src/gtk/quicksearch.c:657
+#: src/gtk/quicksearch.c:666
 msgid "From/To/Subject/Tag"
 msgstr "Von/An/Betreff/Marke"
 
-#: src/gtk/quicksearch.c:668 src/plugins/archive/archiver_prefs.c:322
+#: src/gtk/quicksearch.c:677 src/plugins/archive/archiver_prefs.c:322
 msgid "Recursive"
 msgstr "Rekursiv"
 
-#: src/gtk/quicksearch.c:677
+#: src/gtk/quicksearch.c:686
 msgid "Sticky"
 msgstr "Dauerhaft"
 
-#: src/gtk/quicksearch.c:687
+#: src/gtk/quicksearch.c:696
 msgid "Type-ahead"
 msgstr "Zeichenweise"
 
-#: src/gtk/quicksearch.c:699
+#: src/gtk/quicksearch.c:708
 msgid "Run on select"
 msgstr "In Markierten"
 
-#: src/gtk/quicksearch.c:741
+#: src/gtk/quicksearch.c:750
 msgid "Clear the current search"
 msgstr "Die aktuelle Suche löschen"
 
-#: src/gtk/quicksearch.c:751 src/summary_search.c:410
+#: src/gtk/quicksearch.c:760 src/summary_search.c:436
 msgid "Edit search criteria"
 msgstr "Suchkriterien anpassen"
 
-#: src/gtk/quicksearch.c:760
+#: src/gtk/quicksearch.c:769
 msgid "Information about extended symbols"
 msgstr "Information zu Symbolen für die erweiterten Suche"
 
-#: src/gtk/quicksearch.c:798 src/gtk/quicksearch.c:813
+#: src/gtk/quicksearch.c:807 src/gtk/quicksearch.c:822
 msgid "_Information"
 msgstr "_Information"
 
-#: src/gtk/quicksearch.c:800 src/gtk/quicksearch.c:815
+#: src/gtk/quicksearch.c:808 src/gtk/quicksearch.c:823
+msgid "E_dit"
+msgstr "Bearbeiten"
+
+#: src/gtk/quicksearch.c:809 src/gtk/quicksearch.c:824 src/prefs_actions.c:347
+#: src/prefs_filtering.c:495 src/prefs_template.c:328
 msgid "C_lear"
 msgstr "_Leeren"
 
@@ -5289,7 +5328,7 @@ msgstr "(Kein Betreff)"
 msgid "Error:"
 msgstr "Fehler:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2578
+#: src/image_viewer.c:299 src/mimeview.c:2546
 #: src/plugins/pdf_viewer/poppler_viewer.c:700
 msgid "Filename:"
 msgstr "Dateiname:"
@@ -5569,18 +5608,18 @@ msgstr "Verbindung zu %s schlug fehl"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-Verbindung zu %s wurde unterbrochen. Neuverbindung...\n"
 
-#: src/imap.c:992 src/imap.c:3539 src/imap.c:4199 src/imap.c:4296
-#: src/imap.c:4479 src/imap.c:5276
+#: src/imap.c:992 src/imap.c:3546 src/imap.c:4206 src/imap.c:4303
+#: src/imap.c:4486 src/imap.c:5283
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
-"Claws Mail benötigt eine Netzwerkverbindung, um auf diesen IMAP-Server "
+"Claws Mail benötigt eine Netzwerkverbindung, um auf den IMAP-Server "
 "zuzugreifen."
 
-#: src/imap.c:1086 src/inc.c:816 src/news.c:394 src/send_message.c:308
+#: src/imap.c:1086 src/inc.c:802 src/news.c:388 src/send_message.c:269
 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
-#: src/imap.c:1087 src/inc.c:817 src/news.c:395 src/send_message.c:309
+#: src/imap.c:1087 src/inc.c:803 src/news.c:389 src/send_message.c:270
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5594,7 +5633,7 @@ msgstr ""
 "Soll die Verbindung zu diesem Server fortgesetzt werden? Die Kommunikation "
 "wäre nicht geschützt."
 
-#: src/imap.c:1093 src/inc.c:823 src/news.c:401 src/send_message.c:315
+#: src/imap.c:1093 src/inc.c:809 src/news.c:395 src/send_message.c:276
 msgid "Con_tinue connecting"
 msgstr "Das Verbinden _fortsetzen"
 
@@ -5613,111 +5652,111 @@ msgstr "Keine Verbindung zum IMAP4-Server: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung zum IMAP4-Server: %s:%d\n"
 
-#: src/imap.c:1187 src/imap.c:3961
+#: src/imap.c:1187 src/imap.c:3968
 msgid "Can't start TLS session.\n"
 msgstr "TLS-Sitzung konnte nicht gestartet werden.\n"
 
-#: src/imap.c:1243
+#: src/imap.c:1250
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Anmeldung am IMAP-Server %s schlug fehl.\n"
 
-#: src/imap.c:1246
+#: src/imap.c:1253
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Anmeldung am IMAP-Server %s schlug fehl."
 
-#: src/imap.c:1640
+#: src/imap.c:1647
 msgid "Adding messages..."
 msgstr "Nachrichten werden hinzugefügt..."
 
-#: src/imap.c:1842 src/mh.c:520
+#: src/imap.c:1849 src/mh.c:520
 msgid "Copying messages..."
 msgstr "Nachrichten werden kopiert..."
 
-#: src/imap.c:2421
+#: src/imap.c:2428
 msgid "can't set deleted flags\n"
 msgstr "Gelöscht-Merker nicht setzbar\n"
 
-#: src/imap.c:2428 src/imap.c:4906
+#: src/imap.c:2435 src/imap.c:4913
 msgid "can't expunge\n"
 msgstr "Löschen schlug fehl\n"
 
-#: src/imap.c:2779
+#: src/imap.c:2786
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Suche nach nicht abonnierten Ordnern in %s..."
 
-#: src/imap.c:2782
+#: src/imap.c:2789
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Suche nach Unterordnern von %s..."
 
-#: src/imap.c:3078
+#: src/imap.c:3085
 msgid "can't create mailbox: LIST failed\n"
-msgstr "Mailbox kann nicht erstellt werden: LIST fehlgeschlagen\n"
+msgstr "Mailbox kann nicht erstellt werden: LIST schlug fehl\n"
 
-#: src/imap.c:3093
+#: src/imap.c:3100
 msgid "can't create mailbox\n"
 msgstr "Mailbox kann nicht erstellt werden\n"
 
-#: src/imap.c:3184
+#: src/imap.c:3191
 msgid "New folder name must not contain the namespace path separator"
 msgstr "Neuer Ordnername nur ohne den Pfadtrenner des Namensbereichs"
 
-#: src/imap.c:3221
+#: src/imap.c:3228
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s kann nicht in %s umbenannt werden\n"
 
-#: src/imap.c:3333
+#: src/imap.c:3340
 msgid "can't delete mailbox\n"
 msgstr "Mailbox kann nicht gelöscht werden\n"
 
-#: src/imap.c:3620
+#: src/imap.c:3627
 msgid "LIST failed\n"
-msgstr "LIST fehlgeschlagen\n"
+msgstr "LIST schlug fehl\n"
 
-#: src/imap.c:3705
+#: src/imap.c:3712
 msgid "Flagging messages..."
 msgstr "Nachrichten-Merker setzen..."
 
-#: src/imap.c:3806
+#: src/imap.c:3813
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Ordner %s kann nicht ausgewählt werden\n"
 
-#: src/imap.c:3958
+#: src/imap.c:3965
 msgid "Server requires TLS to log in.\n"
 msgstr "Server benötigt TLS zur Anmeldung.\n"
 
-#: src/imap.c:3968
+#: src/imap.c:3975
 msgid "Can't refresh capabilities.\n"
 msgstr "Ressourcen können nicht aktualisiert werden.\n"
 
-#: src/imap.c:3973
+#: src/imap.c:3980
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without OpenSSL support.\n"
 msgstr ""
-"Verbindung zu %s fehlgeschlagen: Server benötigt TLS, aber Claws Mail wurde "
+"Verbindung zu %s schlug fehl: Server benötigt TLS, aber Claws Mail wurde "
 "ohne OpenSSL kompiliert.\n"
 
-#: src/imap.c:3981
+#: src/imap.c:3988
 msgid "Server logins are disabled.\n"
 msgstr "Serveranmeldungen nicht bereit.\n"
 
-#: src/imap.c:4204
+#: src/imap.c:4211
 msgid "Fetching message..."
 msgstr "Nachricht wird abgeholt..."
 
-#: src/imap.c:4899
+#: src/imap.c:4906
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Gelöscht-Merker nicht setzbar: %d\n"
 
-#: src/imap.c:5932
+#: src/imap.c:5939
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -5806,21 +5845,21 @@ msgid "Inherit properties from parent folder"
 msgstr "Eigenschaften des Überordners übernehmen"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:249 src/news_gtk.c:305
-#: src/plugins/mailmbox/plugin_gtk.c:408 src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/vcalendar/vcal_folder.c:2020
+#: src/plugins/mailmbox/plugin_gtk.c:405 src/plugins/rssyl/rssyl_cb_menu.c:333
+#: src/plugins/vcalendar/vcal_folder.c:2018
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Neuer Name für '%s':"
 
-#: src/imap_gtk.c:263 src/mh_gtk.c:251 src/plugins/mailmbox/plugin_gtk.c:409
+#: src/imap_gtk.c:263 src/mh_gtk.c:251 src/plugins/mailmbox/plugin_gtk.c:406
 #: src/plugins/rssyl/rssyl_cb_menu.c:334
-#: src/plugins/vcalendar/vcal_folder.c:2021
+#: src/plugins/vcalendar/vcal_folder.c:2019
 msgid "Rename folder"
 msgstr "Ordner umbenennen"
 
 #: src/imap_gtk.c:292 src/mh_gtk.c:274 src/news_gtk.c:327
-#: src/plugins/mailmbox/plugin_gtk.c:438 src/plugins/rssyl/rssyl_cb_menu.c:354
-#: src/plugins/vcalendar/vcal_folder.c:2041
+#: src/plugins/mailmbox/plugin_gtk.c:433 src/plugins/rssyl/rssyl_cb_menu.c:354
+#: src/plugins/vcalendar/vcal_folder.c:2039
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -5842,8 +5881,8 @@ msgstr ""
 "Möchten Sie sie wirklich löschen?"
 
 #: src/imap_gtk.c:381 src/mh_gtk.c:220 src/news_gtk.c:280
-#: src/plugins/mailmbox/plugin_gtk.c:343 src/plugins/rssyl/rssyl_cb_menu.c:256
-#: src/plugins/vcalendar/vcal_folder.c:1974
+#: src/plugins/mailmbox/plugin_gtk.c:341 src/plugins/rssyl/rssyl_cb_menu.c:256
+#: src/plugins/vcalendar/vcal_folder.c:1972
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ordner '%s' kann nicht entfernt werden."
@@ -5893,9 +5932,8 @@ msgstr ""
 "der Mailbox."
 
 #: src/imap_gtk.c:566
-#, c-format
 msgid "Do you want to %s the '%s' folder?"
-msgstr "Do you want to %s the '%s' folder?"
+msgstr "Möchten Sie den Ordner %s '%s'?"
 
 #: src/imap_gtk.c:567
 msgid "subscribe"
@@ -5932,7 +5970,7 @@ msgstr "Zielordner:"
 
 #: src/import.c:202
 msgid "Source mbox filename can't be left empty."
-msgstr "Der Name der Quell-mbox darf nicht leer sein."
+msgstr "Der Name der Quell-Mbox darf nicht leer sein."
 
 #: src/import.c:207
 msgid ""
@@ -6100,141 +6138,141 @@ msgstr "Pine-Datei auswählen"
 msgid "Import Pine file into Address Book"
 msgstr "Pine-Datei ins Adressbuch importieren"
 
-#: src/inc.c:205 src/inc.c:312 src/inc.c:339
+#: src/inc.c:186 src/inc.c:293 src/inc.c:320
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail benötigt Zugang zum Netzwerk, um Mails abzurufen."
 
-#: src/inc.c:361
+#: src/inc.c:342
 #, c-format
 msgid "%s failed\n"
 msgstr "%s schlug fehl\n"
 
-#: src/inc.c:432
+#: src/inc.c:413
 msgid "Retrieving new messages"
 msgstr "Hole neue Nachrichten"
 
-#: src/inc.c:493
+#: src/inc.c:474
 msgid "Standby"
 msgstr "Bereit"
 
-#: src/inc.c:618 src/inc.c:672
+#: src/inc.c:604 src/inc.c:658
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: src/inc.c:629
+#: src/inc.c:615
 msgid "Retrieving"
 msgstr "Abholen erfolgt"
 
-#: src/inc.c:638
+#: src/inc.c:624
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Erledigt (%d Nachricht (%s) empfangen)"
 msgstr[1] "Erledigt (%d Nachrichten (%s) empfangen)"
 
-#: src/inc.c:644
+#: src/inc.c:630
 msgid "Done (no new messages)"
 msgstr "Erledigt (keine neuen Nachrichten)"
 
-#: src/inc.c:649
+#: src/inc.c:635
 msgid "Connection failed"
 msgstr "Verbindung schlug fehl"
 
-#: src/inc.c:652
+#: src/inc.c:638
 msgid "Auth failed"
 msgstr "Authentifizierung schlug fehl"
 
-#: src/inc.c:659 src/prefs_matcher.c:393 src/prefs_summary_column.c:88
-#: src/summaryview.c:2782 src/summaryview.c:6312
+#: src/inc.c:645 src/prefs_matcher.c:393 src/prefs_summary_column.c:88
+#: src/summaryview.c:2782 src/summaryview.c:6308
 msgid "Locked"
 msgstr "Gesperrt"
 
-#: src/inc.c:669 src/plugins/spamassassin/spamassassin_gtk.c:378
+#: src/inc.c:655 src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Timeout"
 msgstr "Zeitüberschreitung"
 
-#: src/inc.c:756
+#: src/inc.c:742
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Fertig (%d neue Nachricht)"
 msgstr[1] "Fertig (%d neue Nachrichten)"
 
-#: src/inc.c:760
+#: src/inc.c:746
 msgid "Finished (no new messages)"
 msgstr "Fertig (keine neuen Nachrichten)"
 
-#: src/inc.c:799
+#: src/inc.c:785
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Neue Nachrichten werden abgerufen"
 
-#: src/inc.c:832
+#: src/inc.c:818
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Konto '%s': Verbinde mit POP3-Server: %s:%d..."
 
-#: src/inc.c:850
+#: src/inc.c:836
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Keine Verbindung zu POP3-Server: %s:%d"
 
-#: src/inc.c:854
+#: src/inc.c:840
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung zu POP3-Server: %s:%d\n"
 
-#: src/inc.c:934 src/send_message.c:478
+#: src/inc.c:920 src/send_message.c:486
 msgid "Authenticating..."
 msgstr "Authentifizierung erfolgt..."
 
-#: src/inc.c:936
+#: src/inc.c:922
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Nachrichten von %s (%s) werden abgerufen..."
 
-#: src/inc.c:942
+#: src/inc.c:928
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Anzahl neuer Nachrichten wird geholt (STAT)..."
 
-#: src/inc.c:946
+#: src/inc.c:932
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Anzahl neuer Nachrichten wird geholt (LAST)..."
 
-#: src/inc.c:950
+#: src/inc.c:936
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Anzahl neuer Nachrichten wird geholt (UIDL)..."
 
-#: src/inc.c:954
+#: src/inc.c:940
 msgid "Getting the size of messages (LIST)..."
 msgstr "Anzahl neuer Nachrichten wird geholt (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:496
+#: src/inc.c:947 src/send_message.c:504
 msgid "Quitting"
 msgstr "Ende"
 
-#: src/inc.c:986
+#: src/inc.c:972
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Nachricht wird abgerufen (%d / %d) (%s / %s)"
 
-#: src/inc.c:999
+#: src/inc.c:985
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Empfang läuft (%d Nachricht (%s) empfangen)"
 msgstr[1] "Empfang läuft (%d Nachrichten (%s) empfangen)"
 
-#: src/inc.c:1158
+#: src/inc.c:1144
 #, c-format
 msgid "Connection to %s:%d failed."
-msgstr "Verbindung zu %s:%d fehlgeschlagen."
+msgstr "Verbindung zu %s:%d schlug fehl."
 
-#: src/inc.c:1163
+#: src/inc.c:1149
 msgid "Error occurred while processing mail."
 msgstr "Fehler beim Verarbeiten der E-Mail."
 
-#: src/inc.c:1169
+#: src/inc.c:1155
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6243,37 +6281,37 @@ msgstr ""
 "Fehler beim Verarbeiten der E-Mail:\n"
 "%s"
 
-#: src/inc.c:1175
+#: src/inc.c:1161
 msgid "No disk space left."
 msgstr "Kein freier Speicherplatz."
 
-#: src/inc.c:1180
+#: src/inc.c:1166
 msgid "Can't write file."
 msgstr "Datei kann nicht geschrieben werden."
 
-#: src/inc.c:1185
+#: src/inc.c:1171
 msgid "Socket error."
 msgstr "Socket-Fehler"
 
-#: src/inc.c:1188
+#: src/inc.c:1174
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Socket-Fehler beim Verbinden mit %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:406 src/send_message.c:670
+#: src/inc.c:1179 src/send_message.c:414 src/send_message.c:678
 msgid "Connection closed by the remote host."
 msgstr "Verbindung durch Gegenseite getrennt."
 
-#: src/inc.c:1196
+#: src/inc.c:1182
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Verbindung zu %s:%d von der Gegenstelle geschlossen."
 
-#: src/inc.c:1201
+#: src/inc.c:1187
 msgid "Mailbox is locked."
 msgstr "Mailbox ist gesperrt"
 
-#: src/inc.c:1205
+#: src/inc.c:1191
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6282,11 +6320,11 @@ msgstr ""
 "Mailbox ist gesperrt:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:655
+#: src/inc.c:1197 src/send_message.c:663
 msgid "Authentication failed."
 msgstr "Authentifizierung schlug fehl."
 
-#: src/inc.c:1217 src/send_message.c:658
+#: src/inc.c:1203 src/send_message.c:666
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6295,7 +6333,7 @@ msgstr ""
 "Authentifizierung schlug fehl:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:674
+#: src/inc.c:1208 src/send_message.c:682
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6304,37 +6342,26 @@ msgstr ""
 "Zeitüberschreitung unter Konfiguration/Einstellungen/Weiteres/Verschiedenes "
 "zu erhöhen."
 
-#: src/inc.c:1227
+#: src/inc.c:1213
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Verbindung zu %s:%d abgelaufen."
 
-#: src/inc.c:1265
+#: src/inc.c:1251
 msgid "Incorporation cancelled\n"
 msgstr "Verbindung abgebrochen\n"
 
-#: src/inc.c:1457
-#, c-format
-msgid "Claws Mail: %d new message"
-msgid_plural "Claws Mail: %d new messages"
-msgstr[0] "Claws Mail: %d neue Nachricht"
-msgstr[1] "Claws Mail: %d neue Nachrichten"
-
-#: src/inc.c:1584
-msgid "Unable to connect: you are offline."
-msgstr "Verbindung konnte nicht hergestellt werden: Sie sind offline"
-
-#: src/inc.c:1610
+#: src/inc.c:1518
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sSie arbeiten offline. %d Minuten lang aufheben?"
 
-#: src/inc.c:1616
+#: src/inc.c:1524
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sSie arbeiten offline. Soll dies aufgehoben werden?"
 
-#: src/inc.c:1623
+#: src/inc.c:1531
 msgid "On_ly once"
 msgstr "nur einmal"
 
@@ -6342,7 +6369,7 @@ msgstr "nur einmal"
 msgid "Nick Name"
 msgstr "Spitzname"
 
-#: src/main.c:272
+#: src/main.c:241
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6351,11 +6378,7 @@ msgstr ""
 "Datei '%s' existiert bereits.\n"
 "Ordner kann nicht erstellt werden."
 
-#: src/main.c:294 src/main.c:307
-msgid "Exiting..."
-msgstr "Beenden von..."
-
-#: src/main.c:438
+#: src/main.c:362
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6364,7 +6387,7 @@ msgstr ""
 "Konfiguration für %s gefunden.\n"
 "Soll diese Konfiguration übernommen werden?"
 
-#: src/main.c:440
+#: src/main.c:364
 #, c-format
 msgid ""
 "\n"
@@ -6377,11 +6400,11 @@ msgstr ""
 "Sie können Ihre Sylpheed-Filterregeln mit einem Skript\n"
 "konvertieren, das unter %s verfügbar ist."
 
-#: src/main.c:452
+#: src/main.c:376
 msgid "Keep old configuration"
 msgstr "alte Einstellungen behalten"
 
-#: src/main.c:455
+#: src/main.c:379
 msgid ""
 "Keeping a backup will allow you to go back to an older version, but may take "
 "a while if you have cached IMAP or News data, and will take some extra room "
@@ -6391,47 +6414,47 @@ msgstr ""
 "aber eine Weile dauern, wenn gepufferte IMAP- oder News-Daten vorhanden "
 "sind; auch wird dadurch mehr Platz auf der Festplatte benötigt."
 
-#: src/main.c:463
+#: src/main.c:387
 msgid "Migration of configuration"
 msgstr "Umstellung der Konfiguration"
 
-#: src/main.c:474
+#: src/main.c:398
 msgid "Copying configuration... This may take a while..."
 msgstr "Konfiguration wird kopiert... Bitte warten..."
 
-#: src/main.c:483
+#: src/main.c:407
 msgid "Migration failed!"
-msgstr "Umstellung fehlgeschlagen!"
+msgstr "Umstellung schlug fehl!"
 
-#: src/main.c:492
+#: src/main.c:416
 msgid "Migrating configuration..."
 msgstr "Konfiguration wird umgestellt ..."
 
-#: src/main.c:1039
+#: src/main.c:934
 msgid "Failed to register folder item update hook"
 msgstr "'folder item update hook' konnte nicht registriert werden"
 
-#: src/main.c:1046
+#: src/main.c:941
 msgid "Failed to register folder update hook"
 msgstr "'folder update hook' konnte nicht registriert werden"
 
-#: src/main.c:1226
+#: src/main.c:1110
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread wird von glib nicht unterstützt.\n"
 
-#: src/main.c:1245
+#: src/main.c:1129
 msgid "Sylpheed-Claws 2.6.0 (or older)"
 msgstr "Sylpheed-Claws 2.6.0 (oder älter)"
 
-#: src/main.c:1248
+#: src/main.c:1132
 msgid "Sylpheed-Claws 1.9.15 (or older)"
 msgstr "Sylpheed-Claws 1.9.15 (oder älter)"
 
-#: src/main.c:1251
+#: src/main.c:1135
 msgid "Sylpheed-Claws 1.0.5 (or older)"
 msgstr "Sylpheed-Claws 1.0.5 (oder älter)"
 
-#: src/main.c:1574
+#: src/main.c:1434
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6450,7 +6473,7 @@ msgstr[1] ""
 "Einstellungen des Plugins für mehr Informationen:\n"
 "%s"
 
-#: src/main.c:1602
+#: src/main.c:1462
 msgid ""
 "Claws Mail has detected a configured mailbox, but it is incomplete. It is "
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
@@ -6461,7 +6484,7 @@ msgstr ""
 "erneuern\" im Kontextmenü vom Hauptverzeichnis der Mailbox könnte das "
 "Problem lösen."
 
-#: src/main.c:1608
+#: src/main.c:1468
 msgid ""
 "Claws Mail has detected a configured mailbox, but could not load it. It is "
 "probably provided by an out-of-date external plugin. Please reinstall the "
@@ -6471,41 +6494,36 @@ msgstr ""
 "laden. Diese Mailbox wird vermutlich von einem alten Plugin zur Verfügung "
 "gestellt. Bitte installieren Sie das Plugin neu und versuchen es noch einmal."
 
-#: src/main.c:1637
-#, c-format
-msgid "Claws Mail can not start without its data volume (%s)."
-msgstr "Claws Mail kann ohne seinen Datenträger (%s) nicht starten."
-
-#: src/main.c:1884
+#: src/main.c:1711
 msgid "Missing filename\n"
 msgstr "Fehlender Dateiname\n"
 
-#: src/main.c:1891
+#: src/main.c:1718
 msgid "Cannot open filename for reading\n"
 msgstr "Die Datei kann nicht geöffnet werden\n"
 
-#: src/main.c:1902
+#: src/main.c:1729
 msgid "Malformed header\n"
 msgstr "Fehlerhafte Kopfzeilen\n"
 
-#: src/main.c:1909
+#: src/main.c:1736
 msgid "Duplicated 'To:' header\n"
 msgstr "Doppelte 'An:'-Kopfzeile\n"
 
-#: src/main.c:1924
+#: src/main.c:1751
 msgid "Missing required 'To:' header\n"
 msgstr "Benötigte 'An:'-Kopfzeile fehlt\n"
 
-#: src/main.c:2071
+#: src/main.c:1898
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Aufruf: %s [OPTION]...\n"
 
-#: src/main.c:2073
+#: src/main.c:1900
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [Adresse]  öffnet das Editor-Fenster"
 
-#: src/main.c:2074
+#: src/main.c:1901
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6521,13 +6539,14 @@ msgstr ""
 "                       \"-\" als Dateiname liest von der Standardeingabe;\n"
 "                       Inhaltsformat: zuerst Kopfzeilen (An: benötigt) bis "
 "zu einer\n"
-"                       Leerzeile, dann der Textkörper bis zum Ende der Datei."
+"                       Leerzeile, dann der Nachrichtenkörper bis zum Ende "
+"der Datei."
 
-#: src/main.c:2079
+#: src/main.c:1906
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]    abonniert die angegebene URI, wenn möglich"
 
-#: src/main.c:2080
+#: src/main.c:1907
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6537,23 +6556,23 @@ msgstr ""
 "                       öffnet das Editor-Fenster mit den angegebenen\n"
 "                       Dateien als Anhang"
 
-#: src/main.c:2083
+#: src/main.c:1910
 msgid "  --receive              receive new messages"
 msgstr "  --receive            empfängt neue Nachrichten"
 
-#: src/main.c:2084
+#: src/main.c:1911
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all        empfängt neue Nachrichten von allen Konten"
 
-#: src/main.c:2085
+#: src/main.c:1912
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving   Empfang von Nachrichten abbrechen"
 
-#: src/main.c:2086
+#: src/main.c:1913
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending     Versand von Nachrichten abbrechen"
 
-#: src/main.c:2087
+#: src/main.c:1914
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6573,15 +6592,15 @@ msgstr ""
 "                       rekursiv: nicht mit einem der folgenden Argumente: 0, "
 "n, N, f or F"
 
-#: src/main.c:2094
+#: src/main.c:1921
 msgid "  --send                 send all queued messages"
 msgstr "  --send               sendet alle vorgespeicherten Nachrichten"
 
-#: src/main.c:2095
+#: src/main.c:1922
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [Ordner]... zeigt die Anzahl neuer Nachrichten"
 
-#: src/main.c:2096
+#: src/main.c:1923
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6589,15 +6608,15 @@ msgstr ""
 "  --status-full [Ordner]...\n"
 "                       zeigt den Status jeden Ordners"
 
-#: src/main.c:2098
+#: src/main.c:1925
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics         Zeigt Sitzungsstatistiken"
 
-#: src/main.c:2099
+#: src/main.c:1926
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics   Sitzungsstatistiken zurücksetzen"
 
-#: src/main.c:2100
+#: src/main.c:1927
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6606,35 +6625,35 @@ msgstr ""
 "                       springt zu dem angegebenen Ordner/Nachricht\n"
 "                       Ordner ist eine Ordner-ID wie 'Ordner/Unterordner'"
 
-#: src/main.c:2102
+#: src/main.c:1929
 msgid "  --online               switch to online mode"
 msgstr "  --online             schaltet in den Onlinemodus"
 
-#: src/main.c:2103
+#: src/main.c:1930
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline            schaltet in den Offlinemodus"
 
-#: src/main.c:2104
+#: src/main.c:1931
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q     beendet Claws Mail"
 
-#: src/main.c:2105
+#: src/main.c:1932
 msgid "  --debug                debug mode"
 msgstr "  --debug              Debugmodus"
 
-#: src/main.c:2106
+#: src/main.c:1933
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug       Debug-Modus umschalten"
 
-#: src/main.c:2107
+#: src/main.c:1934
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h            zeigt diese Hilfe"
 
-#: src/main.c:2108
+#: src/main.c:1935
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v         gibt Versionsinformationen aus"
 
-#: src/main.c:2109
+#: src/main.c:1936
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6642,11 +6661,11 @@ msgstr ""
 "  --version-full -V    gibt Versionsinformationen und enthaltene Funktionen "
 "aus"
 
-#: src/main.c:2110
+#: src/main.c:1937
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir         gibt das Konfigurationsverzeichnis aus"
 
-#: src/main.c:2111
+#: src/main.c:1938
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6654,40 +6673,40 @@ msgstr ""
 "  --alternate-config-dir  [Verzeichnis]\n"
 "                       benutzt das angegebene Konfigurationsverzeichnis"
 
-#: src/main.c:2161
+#: src/main.c:1988
 msgid "Unknown option\n"
 msgstr "Unbekannte Option\n"
 
-#: src/main.c:2179
+#: src/main.c:2006
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Bearbeitung erfolgt (%s)..."
 
-#: src/main.c:2182
+#: src/main.c:2009
 msgid "top level folder"
 msgstr "Oberster Ordner"
 
-#: src/main.c:2265
+#: src/main.c:2092
 msgid "Queued messages"
 msgstr "Vorgespeicherte Nachrichten"
 
-#: src/main.c:2266
+#: src/main.c:2093
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Es sind ungesendete Nachrichten vorgespeichert. Jetzt beenden?"
 
-#: src/main.c:2999
+#: src/main.c:2818
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: Netzwerk ist online.\n"
 
-#: src/main.c:3005
+#: src/main.c:2824
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: Netzwerk ist offline.\n"
 
-#: src/mainwindow.c:503 src/messageview.c:210
+#: src/mainwindow.c:503 src/messageview.c:208
 msgid "_File"
 msgstr "_Datei"
 
-#: src/mainwindow.c:505 src/messageview.c:212 src/summaryview.c:436
+#: src/mainwindow.c:505 src/messageview.c:210 src/summaryview.c:436
 msgid "_View"
 msgstr "_Ansicht"
 
@@ -6723,19 +6742,19 @@ msgstr "Auswahl in Mbox-Datei _exportieren..."
 msgid "Empty all _Trash folders"
 msgstr "Alle _Papierkörbe leeren"
 
-#: src/mainwindow.c:526 src/messageview.c:219
+#: src/mainwindow.c:526 src/messageview.c:217
 msgid "_Save email as..."
-msgstr "_Speichere E-mail als..."
+msgstr "_Speichere E-Mail als..."
 
-#: src/mainwindow.c:527 src/messageview.c:220
+#: src/mainwindow.c:527 src/messageview.c:218
 msgid "_Save part as..."
 msgstr "_Speichere Teil als..."
 
-#: src/mainwindow.c:530 src/messageview.c:221
+#: src/mainwindow.c:530 src/messageview.c:219
 msgid "Page setup..."
 msgstr "D_atei/Seite einrichten..."
 
-#: src/mainwindow.c:531 src/messageview.c:222
+#: src/mainwindow.c:531 src/messageview.c:220
 msgid "_Print..."
 msgstr "_Drucken..."
 
@@ -6803,99 +6822,99 @@ msgstr "Alle Diskurse _ausklappen"
 msgid "Co_llapse all threads"
 msgstr "Alle Diskurse _einklappen"
 
-#: src/mainwindow.c:568 src/messageview.c:233
+#: src/mainwindow.c:568 src/messageview.c:231
 msgid "_Go to"
 msgstr "Ge_he zu"
 
-#: src/mainwindow.c:569 src/messageview.c:234
+#: src/mainwindow.c:569 src/messageview.c:232
 msgid "_Previous message"
 msgstr "voriger N_achricht"
 
-#: src/mainwindow.c:570 src/messageview.c:235
+#: src/mainwindow.c:570 src/messageview.c:233
 msgid "_Next message"
 msgstr "nächster Na_chricht"
 
-#: src/mainwindow.c:572 src/messageview.c:237
+#: src/mainwindow.c:572 src/messageview.c:235
 msgid "P_revious unread message"
 msgstr "vorig_er ungelesener Nachricht"
 
-#: src/mainwindow.c:573 src/messageview.c:238
+#: src/mainwindow.c:573 src/messageview.c:236
 msgid "N_ext unread message"
 msgstr "nächster un_gelesener Nachricht"
 
-#: src/mainwindow.c:575 src/messageview.c:240
+#: src/mainwindow.c:575 src/messageview.c:238
 msgid "Previous ne_w message"
 msgstr "_voriger neuer Nachricht"
 
-#: src/mainwindow.c:576 src/messageview.c:241
+#: src/mainwindow.c:576 src/messageview.c:239
 msgid "Ne_xt new message"
 msgstr "nächster neuer Nachr_icht"
 
-#: src/mainwindow.c:578 src/messageview.c:243
+#: src/mainwindow.c:578 src/messageview.c:241
 msgid "Previous _marked message"
 msgstr "voriger mar_kierter Nachricht"
 
-#: src/mainwindow.c:579 src/messageview.c:244
+#: src/mainwindow.c:579 src/messageview.c:242
 msgid "Next m_arked message"
 msgstr "nächster _markierter Nachricht"
 
-#: src/mainwindow.c:581 src/messageview.c:246
+#: src/mainwindow.c:581 src/messageview.c:244
 msgid "Previous _labeled message"
 msgstr "voriger ei_ngefärbter Nachricht"
 
-#: src/mainwindow.c:582 src/messageview.c:247
+#: src/mainwindow.c:582 src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "nächster eingefärbter Nach_richt"
 
-#: src/mainwindow.c:584 src/messageview.c:249
+#: src/mainwindow.c:584 src/messageview.c:247
 msgid "Previous opened message"
 msgstr "voriger geöffneter Nachricht"
 
-#: src/mainwindow.c:585 src/messageview.c:250
+#: src/mainwindow.c:585 src/messageview.c:248
 msgid "Next opened message"
 msgstr "nächster geöffneter Nachricht"
 
-#: src/mainwindow.c:587 src/messageview.c:252
+#: src/mainwindow.c:587 src/messageview.c:250
 msgid "Parent message"
 msgstr "übergeordne_ter Nachricht"
 
-#: src/mainwindow.c:589 src/messageview.c:254
+#: src/mainwindow.c:589 src/messageview.c:252
 msgid "Next unread _folder"
 msgstr "nächstem _ungelesenen Ordner"
 
-#: src/mainwindow.c:590 src/messageview.c:255
+#: src/mainwindow.c:590 src/messageview.c:253
 msgid "_Other folder..."
 msgstr "anderem _Ordner..."
 
-#: src/mainwindow.c:592 src/messageview.c:257 src/mimeview.c:210
+#: src/mainwindow.c:592 src/messageview.c:255 src/mimeview.c:201
 msgid "Next part"
 msgstr "Nächster Teil"
 
-#: src/mainwindow.c:593 src/messageview.c:258 src/mimeview.c:211
+#: src/mainwindow.c:593 src/messageview.c:256 src/mimeview.c:202
 msgid "Previous part"
 msgstr "Voriger Teil"
 
-#: src/mainwindow.c:596 src/messageview.c:259
+#: src/mainwindow.c:596 src/messageview.c:257
 msgid "Message scroll"
 msgstr "Blättere zu"
 
-#: src/mainwindow.c:597 src/messageview.c:260
+#: src/mainwindow.c:597 src/messageview.c:258
 msgid "Previous line"
 msgstr "voriger Zeile"
 
-#: src/mainwindow.c:598 src/messageview.c:261
+#: src/mainwindow.c:598 src/messageview.c:259
 msgid "Next line"
 msgstr "nächster Zeile"
 
-#: src/mainwindow.c:599 src/messageview.c:262 src/printing.c:487
+#: src/mainwindow.c:599 src/messageview.c:260 src/printing.c:487
 msgid "Previous page"
 msgstr "voriger Seite"
 
-#: src/mainwindow.c:600 src/messageview.c:263 src/printing.c:494
+#: src/mainwindow.c:600 src/messageview.c:261 src/printing.c:494
 msgid "Next page"
 msgstr "nächster Seite"
 
-#: src/mainwindow.c:618 src/messageview.c:281
+#: src/mainwindow.c:618 src/messageview.c:279
 msgid "Decode"
 msgstr "De_kodierung"
 
@@ -6903,27 +6922,27 @@ msgstr "De_kodierung"
 msgid "Open in new _window"
 msgstr "Öffnen in neuem _Fenster"
 
-#: src/mainwindow.c:626 src/messageview.c:288
+#: src/mainwindow.c:626 src/messageview.c:286
 msgid "Mess_age source"
 msgstr "_Quelltext anzeigen"
 
-#: src/mainwindow.c:628 src/messageview.c:289
+#: src/mainwindow.c:628 src/messageview.c:287
 msgid "Message part"
 msgstr "Nachrichtenteil"
 
-#: src/mainwindow.c:629 src/messageview.c:290
+#: src/mainwindow.c:629 src/messageview.c:288
 msgid "View as text"
 msgstr "Als Text darstellen"
 
-#: src/mainwindow.c:630 src/messageview.c:291 src/toolbar.c:401
+#: src/mainwindow.c:630 src/messageview.c:289 src/toolbar.c:402
 msgid "Open"
 msgstr "Öffnen"
 
-#: src/mainwindow.c:632 src/messageview.c:293
+#: src/mainwindow.c:632 src/messageview.c:291
 msgid "Open with..."
 msgstr "Öffnen mit..."
 
-#: src/mainwindow.c:636 src/messageview.c:296
+#: src/mainwindow.c:636 src/messageview.c:294
 msgid "Quotes"
 msgstr "_Zitate"
 
@@ -6959,16 +6978,16 @@ msgstr "Neue _Nachricht verfassen"
 msgid "Compose a news message"
 msgstr "Neue _News-Nachricht verfassen"
 
-#: src/mainwindow.c:655 src/messageview.c:302
+#: src/mainwindow.c:655 src/messageview.c:300
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: src/mainwindow.c:656 src/messageview.c:303 src/summaryview.c:428
+#: src/mainwindow.c:656 src/messageview.c:301 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "An_twort an"
 
-#: src/mainwindow.c:659 src/messageview.c:306
+#: src/mainwindow.c:659 src/messageview.c:304
 msgid "Mailing _list"
 msgstr "Mailingliste"
 
@@ -6976,15 +6995,15 @@ msgstr "Mailingliste"
 msgid "Follow-up and reply to"
 msgstr "Fo_llow-up und Antwort an"
 
-#: src/mainwindow.c:663 src/messageview.c:309 src/toolbar.c:2087
+#: src/mainwindow.c:663 src/messageview.c:307 src/toolbar.c:2088
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: src/mainwindow.c:664 src/messageview.c:310 src/toolbar.c:2088
+#: src/mainwindow.c:664 src/messageview.c:308 src/toolbar.c:2089
 msgid "For_ward as attachment"
 msgstr "We_iterleiten als Anhang"
 
-#: src/mainwindow.c:665 src/messageview.c:311 src/toolbar.c:2089
+#: src/mainwindow.c:665 src/messageview.c:309 src/toolbar.c:2090
 msgid "Redirec_t"
 msgstr "_Umleiten"
 
@@ -7052,8 +7071,8 @@ msgstr "Als g_elesen markieren"
 msgid "Mark all read"
 msgstr "Alle als _gelesen markieren"
 
-#: src/mainwindow.c:699 src/prefs_filtering_action.c:199 src/toolbar.c:207
-#: src/toolbar.c:417
+#: src/mainwindow.c:699 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/toolbar.c:418
 msgid "Ignore thread"
 msgstr "Dis_kurs ignorieren"
 
@@ -7061,8 +7080,8 @@ msgstr "Dis_kurs ignorieren"
 msgid "Unignore thread"
 msgstr "Diskurs _nicht ignorieren"
 
-#: src/mainwindow.c:701 src/prefs_filtering_action.c:200 src/toolbar.c:208
-#: src/toolbar.c:418
+#: src/mainwindow.c:701 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/toolbar.c:419
 msgid "Watch thread"
 msgstr "Diskurs be_obachten"
 
@@ -7098,11 +7117,11 @@ msgstr "Nachrichten-Mar_ken"
 msgid "Re-_edit"
 msgstr "Ü_berarbeiten"
 
-#: src/mainwindow.c:719 src/messageview.c:312 src/mimeview.c:1039
+#: src/mainwindow.c:719 src/messageview.c:310 src/mimeview.c:1030
 msgid "Check signature"
 msgstr "Digitale Signatur prüfen"
 
-#: src/mainwindow.c:724 src/messageview.c:316
+#: src/mainwindow.c:724 src/messageview.c:314
 msgid "Add sender to address boo_k"
 msgstr "A_bsender ins Adressbuch übernehmen"
 
@@ -7134,35 +7153,35 @@ msgstr "_Gewählte Nachrichten filtern"
 msgid "Run folder pr_ocessing rules"
 msgstr "Ordner-Verarbeitungsregeln _anwenden"
 
-#: src/mainwindow.c:735 src/messageview.c:319
+#: src/mainwindow.c:735 src/messageview.c:317
 msgid "_Create filter rule"
 msgstr "Filterre_gel erstellen"
 
-#: src/mainwindow.c:736 src/mainwindow.c:742 src/messageview.c:320
-#: src/messageview.c:326
+#: src/mainwindow.c:736 src/mainwindow.c:742 src/messageview.c:318
+#: src/messageview.c:324
 msgid "_Automatically"
 msgstr "_Automatisch"
 
-#: src/mainwindow.c:737 src/mainwindow.c:743 src/mainwindow.c:847
-#: src/messageview.c:321 src/messageview.c:327
+#: src/mainwindow.c:737 src/mainwindow.c:743 src/mainwindow.c:845
+#: src/messageview.c:319 src/messageview.c:325
 msgid "By _From"
 msgstr "_Nach Absender"
 
-#: src/mainwindow.c:738 src/mainwindow.c:744 src/mainwindow.c:848
-#: src/messageview.c:322 src/messageview.c:328
+#: src/mainwindow.c:738 src/mainwindow.c:744 src/mainwindow.c:846
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _To"
 msgstr "Nach _Empfänger"
 
-#: src/mainwindow.c:739 src/mainwindow.c:745 src/messageview.c:323
-#: src/messageview.c:329
+#: src/mainwindow.c:739 src/mainwindow.c:745 src/messageview.c:321
+#: src/messageview.c:327
 msgid "By _Subject"
 msgstr "Nach _Betreff"
 
-#: src/mainwindow.c:741 src/messageview.c:325 src/summaryview.c:434
+#: src/mainwindow.c:741 src/messageview.c:323 src/summaryview.c:434
 msgid "Create processing rule"
 msgstr "_Verarbeitungsregel erstellen"
 
-#: src/mainwindow.c:748 src/messageview.c:333
+#: src/mainwindow.c:748 src/messageview.c:331
 msgid "List _URLs..."
 msgstr "_URLs anzeigen..."
 
@@ -7302,186 +7321,186 @@ msgstr "_Gelesene Nachrichten verbergen"
 msgid "Hide deleted messages"
 msgstr "Gelöschte _Nachrichten verbergen"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:815
 msgid "_Fullscreen"
 msgstr "_Vollbildansicht"
 
-#: src/mainwindow.c:818 src/messageview.c:345
+#: src/mainwindow.c:816 src/messageview.c:343
 msgid "Show all _headers"
 msgstr "Alle _Kopfzeilen anzeigen"
 
-#: src/mainwindow.c:819 src/messageview.c:346
+#: src/mainwindow.c:817 src/messageview.c:344
 msgid "_Collapse all"
 msgstr "Alle einklappen"
 
-#: src/mainwindow.c:820 src/messageview.c:347
+#: src/mainwindow.c:818 src/messageview.c:345
 msgid "Collapse from level _2"
 msgstr "Ab _2. Ebene einklappen"
 
-#: src/mainwindow.c:821 src/messageview.c:348
+#: src/mainwindow.c:819 src/messageview.c:346
 msgid "Collapse from level _3"
 msgstr "Ab _3. Ebene einklappen"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:823
 msgid "Text _below icons"
 msgstr "Text _unter Symbolen"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:824
 msgid "Text be_side icons"
 msgstr "Text _neben Symbolen"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:825
 msgid "_Icons only"
 msgstr "Nur _Symbole"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:826
 msgid "_Text only"
 msgstr "Nur _Text"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:833
 msgid "_Standard"
 msgstr "_Standard"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:834
 msgid "_Three columns"
 msgstr "_Drei Spalten"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:835
 msgid "_Wide message"
 msgstr "_Breite Nachrichtenansicht"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:836
 msgid "W_ide message list"
 msgstr "Breite _Nachrichtenliste"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:837
 msgid "S_mall screen"
 msgstr "_Ein-Feld-Anzeige"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:841
 msgid "By _number"
 msgstr "Nummer"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:842
 msgid "By s_ize"
 msgstr "Größe"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:843
 msgid "By _date"
 msgstr "_Datum"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:844
 msgid "By thread date"
 msgstr "Diskursdatum"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:847
 msgid "By s_ubject"
 msgstr "_Betreff"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:848
 msgid "By _color label"
 msgstr "Farbmarkierung"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:849
 msgid "By tag"
 msgstr "Marke"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:850
 msgid "By _mark"
 msgstr "_Markierung"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:851
 msgid "By _status"
 msgstr "Status"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:852
 msgid "By a_ttachment"
 msgstr "Anhang"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:853
 msgid "By score"
 msgstr "Bewertung"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:854
 msgid "By locked"
 msgstr "Sperre"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:855
 msgid "D_on't sort"
 msgstr "Nicht sortieren"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:859
 msgid "Ascending"
 msgstr "Aufsteigend"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:860
 msgid "Descending"
 msgstr "Absteigend"
 
-#: src/mainwindow.c:903 src/messageview.c:389
+#: src/mainwindow.c:901 src/messageview.c:387
 msgid "_Auto detect"
 msgstr "_Automatisch erkennen"
 
-#: src/mainwindow.c:1299 src/summaryview.c:6238
+#: src/mainwindow.c:1297 src/summaryview.c:6234
 msgid "Apply tags..."
 msgstr "Marken anwenden..."
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:1935
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Es sind einige Fehler aufgetreten. Hier klicken um das Log anzusehen."
 
-#: src/mainwindow.c:2127
+#: src/mainwindow.c:1950
 msgid "You are online. Click the icon to go offline"
 msgstr "Sie sind online. Das Symbol anklicken, um offline zu gehen"
 
-#: src/mainwindow.c:2130
+#: src/mainwindow.c:1953
 msgid "You are offline. Click the icon to go online"
 msgstr "Sie sind offline. Das Symbol anklicken, um online zu gehen"
 
-#: src/mainwindow.c:2144
+#: src/mainwindow.c:1967
 msgid "Select account"
 msgstr "Konto wählen"
 
-#: src/mainwindow.c:2171 src/prefs_logging.c:140
+#: src/mainwindow.c:1994 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Netzwerkprotokoll"
 
-#: src/mainwindow.c:2175
+#: src/mainwindow.c:1998
 msgid "Filtering/Processing debug log"
-msgstr "Filter-/Verarbeitungprotokoll"
+msgstr "Filter-/Verarbeitungsprotokoll"
 
-#: src/mainwindow.c:2194 src/prefs_logging.c:392
+#: src/mainwindow.c:2017 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "Filterprotokoll aktiviert\n"
 
-#: src/mainwindow.c:2196 src/prefs_logging.c:394
+#: src/mainwindow.c:2019 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "Filterprotokoll deaktiviert.\n"
 
-#: src/mainwindow.c:2642 src/mainwindow.c:2649 src/mainwindow.c:2692
-#: src/mainwindow.c:2725 src/mainwindow.c:2757 src/mainwindow.c:2802
+#: src/mainwindow.c:2460 src/mainwindow.c:2467 src/mainwindow.c:2510
+#: src/mainwindow.c:2543 src/mainwindow.c:2575 src/mainwindow.c:2620
 #: src/plugins/notification/notification_trayicon.c:363
 #: src/prefs_folder_item.c:1067
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/mainwindow.c:2803 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2621 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "keine"
 
-#: src/mainwindow.c:3060 src/mainwindow.c:3064
+#: src/mainwindow.c:2878 src/mainwindow.c:2882
 msgid "Delete all messages in trash folders?"
 msgstr "Alle Nachrichten in Papierkörben löschen?"
 
-#: src/mainwindow.c:3061
+#: src/mainwindow.c:2879
 msgid "Don't quit"
 msgstr "Nicht beenden"
 
-#: src/mainwindow.c:3090 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2908 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
-#: src/mainwindow.c:3091
+#: src/mainwindow.c:2909
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7491,100 +7510,100 @@ msgstr ""
 "Wird eine existierende Mailbox angegeben,\n"
 "wird sie automatisch durchsucht."
 
-#: src/mainwindow.c:3097 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:158
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Die Mailbox '%s' existiert bereits."
 
-#: src/mainwindow.c:3102 src/plugins/mailmbox/plugin_gtk.c:202 src/setup.c:52
-#: src/wizard.c:774
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:202 src/setup.c:52
+#: src/wizard.c:737
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:3107 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:55
+#: src/mainwindow.c:2925 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 "there."
 msgstr ""
-"Erstellen der Mailbox fehlgeschlagen.\n"
+"Erstellen der Mailbox schlug fehl.\n"
 "Möglicherweise existieren einige Dateien bereits oder Sie haben keine "
 "Schreibrechte"
 
-#: src/mainwindow.c:3553
+#: src/mainwindow.c:3373
 msgid "No posting allowed"
 msgstr "keine Nachrichten erlaubt"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "Mbox-Import schlug fehl."
 
-#: src/mainwindow.c:4140 src/mainwindow.c:4149
+#: src/mainwindow.c:3960 src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "Export in Mbox schlug fehl."
 
-#: src/mainwindow.c:4190 src/plugins/notification/notification_trayicon.c:518
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:518
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:4190 src/plugins/notification/notification_trayicon.c:518
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:518
 msgid "Exit Claws Mail?"
 msgstr "Claws Mail beenden?"
 
-#: src/mainwindow.c:4379
+#: src/mainwindow.c:4199
 msgid "Folder synchronisation"
 msgstr "Ordner-Synchronisation"
 
-#: src/mainwindow.c:4380
+#: src/mainwindow.c:4200
 msgid "Do you want to synchronise your folders now?"
 msgstr "Sollen die Ordner jetzt synchronisiert werden?"
 
-#: src/mainwindow.c:4381
+#: src/mainwindow.c:4201
 msgid "+_Synchronise"
 msgstr "+_Synchronisieren"
 
-#: src/mainwindow.c:4810
+#: src/mainwindow.c:4630
 msgid "Deleting duplicated messages..."
 msgstr "Lösche doppelte Nachrichten..."
 
-#: src/mainwindow.c:4847
+#: src/mainwindow.c:4667
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d doppelte Nachricht in Ordner %d gelöscht.\n"
 msgstr[1] "%d doppelte Nachrichten in Ordner %d gelöscht.\n"
 
-#: src/mainwindow.c:5102 src/summaryview.c:5727
+#: src/mainwindow.c:4922 src/summaryview.c:5723
 msgid "Processing rules to apply before folder rules"
 msgstr "Ordnerregeln vorausgehende Verarbeitungsregeln"
 
-#: src/mainwindow.c:5110
+#: src/mainwindow.c:4930
 msgid "Processing rules to apply after folder rules"
 msgstr "Ordnerregeln nachfolgende Verarbeitungsregeln"
 
-#: src/mainwindow.c:5118 src/summaryview.c:5738
+#: src/mainwindow.c:4938 src/summaryview.c:5734
 msgid "Filtering configuration"
 msgstr "Filter-Konfiguration"
 
-#: src/mainwindow.c:5233
+#: src/mainwindow.c:5053
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
-"Registrierung als Standardanwendung fehlgeschlagen: Pfad zur ausführbaren "
-"Datei wurde nicht gefunden."
+"Registrierung als Standardanwendung schlug fehl: Pfad zur ausführbaren Datei "
+"wurde nicht gefunden."
 
-#: src/mainwindow.c:5292
+#: src/mainwindow.c:5112
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail wurde als Standardanwendung eingetragen."
 
-#: src/mainwindow.c:5294
+#: src/mainwindow.c:5114
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
-"Eintragung als Standardanwendung fehlgeschlagen: es konnte nicht in die "
+"Eintragung als Standardanwendung schlug fehl: es konnte nicht in die "
 "Registry geschrieben werden."
 
-#: src/mainwindow.c:5452
+#: src/mainwindow.c:5272
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7607,36 +7626,36 @@ msgstr "Kopfzeile"
 
 #: src/matcher.c:218
 msgid "body line"
-msgstr "Textkörperzeile"
+msgstr "Körperzeile"
 
 #: src/matcher.c:219
 msgid "tag"
 msgstr "Marke"
 
-#: src/matcher.c:517 src/matcher.c:522 src/matcher.c:542 src/matcher.c:547
-#: src/message_search.c:212 src/prefs_matcher.c:737 src/summary_search.c:452
+#: src/matcher.c:523 src/matcher.c:528 src/matcher.c:548 src/matcher.c:553
+#: src/message_search.c:217 src/prefs_matcher.c:739 src/summary_search.c:478
 msgid "Case sensitive"
 msgstr "Groß-/Kleinschreibung"
 
-#: src/matcher.c:517 src/matcher.c:522 src/matcher.c:542 src/matcher.c:547
+#: src/matcher.c:523 src/matcher.c:528 src/matcher.c:548 src/matcher.c:553
 msgid "Case insensitive"
-msgstr "schreibungsunabhängig"
+msgstr "Unabhängig von Groß- oder Kleinschreibung"
 
-#: src/matcher.c:1809
+#: src/matcher.c:1819
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "prüfe, ob Nachricht auf [ %s ] passt\n"
 
-#: src/matcher.c:1878 src/matcher.c:1897 src/matcher.c:1910
+#: src/matcher.c:1888 src/matcher.c:1907 src/matcher.c:1920
 msgid "message matches\n"
 msgstr "Nachricht ist passend\n"
 
-#: src/matcher.c:1885 src/matcher.c:1903 src/matcher.c:1912
+#: src/matcher.c:1895 src/matcher.c:1913 src/matcher.c:1922
 msgid "message does not match\n"
 msgstr "Nachricht ist unpassend\n"
 
-#: src/matcher.c:2175 src/matcher.c:2176 src/matcher.c:2177 src/matcher.c:2178
-#: src/matcher.c:2179 src/matcher.c:2180 src/matcher.c:2181 src/matcher.c:2182
+#: src/matcher.c:2185 src/matcher.c:2186 src/matcher.c:2187 src/matcher.c:2188
+#: src/matcher.c:2189 src/matcher.c:2190 src/matcher.c:2191 src/matcher.c:2192
 msgid "(none)"
 msgstr "(nichts)"
 
@@ -7664,7 +7683,7 @@ msgstr "Mbox-Datei überschreiben "
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Die Datei existiert bereits. Soll sie überschrieben werden?"
 
-#: src/mbox.c:555 src/messageview.c:1868 src/mimeview.c:1850
+#: src/mbox.c:555 src/messageview.c:1843 src/mimeview.c:1844
 #: src/prefs_themes.c:553 src/textview.c:3120
 msgid "Overwrite"
 msgstr "Überschreiben"
@@ -7690,39 +7709,39 @@ msgstr "In aktueller Nachricht suchen"
 msgid "Find text:"
 msgstr "Textsuche nach:"
 
-#: src/message_search.c:332 src/summary_search.c:768
+#: src/message_search.c:346 src/summary_search.c:791
 msgid "Search failed"
 msgstr "Suche schlug fehl"
 
-#: src/message_search.c:333 src/summary_search.c:769
+#: src/message_search.c:347 src/summary_search.c:792
 msgid "Search string not found."
 msgstr "Suchbegriff nicht gefunden."
 
-#: src/message_search.c:342
+#: src/message_search.c:356
 msgid "Beginning of message reached; continue from end?"
 msgstr "Anfang der Nachricht erreicht; vom Ende fortsetzen?"
 
-#: src/message_search.c:345
+#: src/message_search.c:359
 msgid "End of message reached; continue from beginning?"
 msgstr "Ende der Nachricht erreicht; vom Anfang fortsetzen?"
 
-#: src/message_search.c:348 src/summary_search.c:780
+#: src/message_search.c:362 src/summary_search.c:803
 msgid "Search finished"
 msgstr "Suche beendet"
 
-#: src/messageview.c:299 src/textview.c:245
+#: src/messageview.c:297 src/textview.c:245
 msgid "Compose _new message"
 msgstr "_Neue Nachricht verfassen"
 
-#: src/messageview.c:729 src/messageview.c:1413 src/messageview.c:1610
+#: src/messageview.c:711 src/messageview.c:1388 src/messageview.c:1585
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Nachrichtenansicht"
 
-#: src/messageview.c:860
+#: src/messageview.c:838
 msgid "<No Return-Path found>"
 msgstr "<Kein Antwortpfad gefunden>"
 
-#: src/messageview.c:868
+#: src/messageview.c:846
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7731,17 +7750,17 @@ msgid ""
 "Return path: %s\n"
 "It is advised to not to send the return receipt."
 msgstr ""
-"Die Benachrichtungsadresse, an die die Empfangsbestätigung \n"
+"Die Benachrichtigungsadresse, an die die Empfangsbestätigung \n"
 "gesendet werden soll, stimmt nicht mit dem Antwortpfad überein:\n"
-"Benachrichtungsadress: %s\n"
+"Benachrichtigungsadresse: %s\n"
 "Antwortpfad: %s\n"
 "Es wird geraten, die Empfangsbestätigung nicht zu senden."
 
-#: src/messageview.c:875 src/messageview.c:892
+#: src/messageview.c:853 src/messageview.c:870
 msgid "_Don't Send"
 msgstr "Nicht Sen_den"
 
-#: src/messageview.c:888
+#: src/messageview.c:866
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7753,48 +7772,48 @@ msgstr ""
 "offiziell an Sie adressiert.\n"
 "Es wird empfohlen, keine  Empfangsbestätigung zu senden."
 
-#: src/messageview.c:1341
+#: src/messageview.c:1319
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Nachricht (%s) wird abgeholt..."
 
-#: src/messageview.c:1377 src/procmime.c:983
+#: src/messageview.c:1355 src/procmime.c:986
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Entschlüsseln schlug fehl: %s"
 
-#: src/messageview.c:1460 src/messageview.c:1468
+#: src/messageview.c:1435 src/messageview.c:1443
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Nachricht entspricht nicht dem MIME-Standard und könnte falsch dargestellt "
 "werden."
 
-#: src/messageview.c:1860 src/messageview.c:1863 src/mimeview.c:2003
-#: src/plugins/fancy/fancy_viewer.c:667 src/summaryview.c:4814
-#: src/summaryview.c:4817 src/textview.c:3108
+#: src/messageview.c:1835 src/messageview.c:1838 src/mimeview.c:1997
+#: src/plugins/fancy/fancy_viewer.c:668 src/summaryview.c:4810
+#: src/summaryview.c:4813 src/textview.c:3108
 msgid "Save as"
 msgstr "Speichern als"
 
-#: src/messageview.c:1869
+#: src/messageview.c:1844
 msgid "Overwrite existing file?"
 msgstr "Existierende Datei überschreiben?"
 
-#: src/messageview.c:1877 src/summaryview.c:4834 src/summaryview.c:4837
-#: src/summaryview.c:4852
+#: src/messageview.c:1852 src/summaryview.c:4830 src/summaryview.c:4833
+#: src/summaryview.c:4848
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Datei '%s' konnte nicht gespeichert werden."
 
-#: src/messageview.c:1931
+#: src/messageview.c:1905
 #, c-format
 msgid "Show all %s."
 msgstr "Alle %s anzeigen."
 
-#: src/messageview.c:1933
+#: src/messageview.c:1907
 msgid "Only the first megabyte of text is shown."
 msgstr "Nur das erste Megabyte an Text wird angezeigt."
 
-#: src/messageview.c:1964
+#: src/messageview.c:1938
 msgid ""
 "You got a return receipt for this message : it has been displayed by the "
 "recipient."
@@ -7802,95 +7821,95 @@ msgstr ""
 "Sie haben eine Empfangsbestätigung für diese Nachricht: Der Empfänger hat "
 "sie geöffnet."
 
-#: src/messageview.c:1967
+#: src/messageview.c:1941
 msgid "You asked for a return receipt in this message."
 msgstr "Sie haben eine Empfangsbestätigung für diese Nachricht erbeten."
 
-#: src/messageview.c:1973
+#: src/messageview.c:1947
 msgid "This message asks for a return receipt."
 msgstr "Diese Nachricht erwartet eine Empfangsbestätigung."
 
-#: src/messageview.c:1974
+#: src/messageview.c:1948
 msgid "Send receipt"
 msgstr "Bestätigung senden"
 
-#: src/messageview.c:2017
+#: src/messageview.c:1991
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgstr ""
-"Diese Nachricht wurde teilweise abgeholt\n"
+"Diese Nachricht wurde teilweise abgerufen\n"
 "und auf dem Server gelöscht."
 
-#: src/messageview.c:2023
+#: src/messageview.c:1997
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s."
 msgstr ""
-"Diese Nachricht wurde teilweise abgeholt;\n"
+"Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s groß."
 
-#: src/messageview.c:2027 src/messageview.c:2049
+#: src/messageview.c:2001 src/messageview.c:2023
 msgid "Mark for download"
 msgstr "Zum Herunterladen markieren"
 
-#: src/messageview.c:2028 src/messageview.c:2040
+#: src/messageview.c:2002 src/messageview.c:2014
 msgid "Mark for deletion"
 msgstr "Zum Löschen markieren"
 
-#: src/messageview.c:2033
+#: src/messageview.c:2007
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be downloaded."
 msgstr ""
-"Diese Nachricht wurde teilweise abgeholt;\n"
+"Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s groß und wird heruntergeladen."
 
-#: src/messageview.c:2038 src/messageview.c:2051
+#: src/messageview.c:2012 src/messageview.c:2025
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Demarkieren"
 
-#: src/messageview.c:2044
+#: src/messageview.c:2018
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be deleted."
 msgstr ""
-"Diese Nachricht wurde teilweise abgeholt;\n"
+"Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s und wird gelöscht werden."
 
-#: src/messageview.c:2117
+#: src/messageview.c:2091
 msgid "Return Receipt Notification"
 msgstr "Empfangsbestätigung"
 
-#: src/messageview.c:2118
+#: src/messageview.c:2092
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
 "Please choose which account you want to use for sending the receipt "
 "notification:"
 msgstr ""
-"Mehr als eines Ihrer Konten verwendet die Adresse, an das diese Nachricht "
+"Mehr als eines Ihrer Konten verwendet die Adresse, an die diese Nachricht "
 "gesendet wurde.\n"
 "Bitte wählen Sie, welches Konto Sie zum Senden der Empfangsbestätigung "
 "verwenden möchten:"
 
-#: src/messageview.c:2122 src/plugins/rssyl/rssyl_gtk.c:480
+#: src/messageview.c:2096 src/plugins/rssyl/rssyl_gtk.c:480
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: src/messageview.c:2122
+#: src/messageview.c:2096
 msgid "_Send Notification"
 msgstr "Benachrichtigung _senden"
 
-#: src/messageview.c:2189
+#: src/messageview.c:2163
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Drucken schlug fehl: Die Nachricht enthält keinen Text."
 
-#: src/messageview.c:2958
+#: src/messageview.c:2932
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -7898,7 +7917,7 @@ msgstr ""
 "\n"
 "  Keine Nachrichten in diesem Ordner"
 
-#: src/messageview.c:2966
+#: src/messageview.c:2940
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -7906,7 +7925,7 @@ msgstr ""
 "\n"
 "  Nachricht wurde gelöscht"
 
-#: src/messageview.c:2967
+#: src/messageview.c:2941
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -7914,8 +7933,8 @@ msgstr ""
 "\n"
 "  Nachricht wurde in den Papierkorb oder einen anderen Ordner verschoben"
 
-#: src/messageview.c:3000 src/messageview.c:3006 src/summaryview.c:4187
-#: src/summaryview.c:6975
+#: src/messageview.c:2974 src/messageview.c:2980 src/summaryview.c:4183
+#: src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "Beim Lernen ist ein Fehler aufgetreten.\n"
 
@@ -7949,60 +7968,60 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Mailbox entfernen"
 
-#: src/mimeview.c:202
+#: src/mimeview.c:193
 msgid "_Open"
 msgstr "Öffnen"
 
-#: src/mimeview.c:204
+#: src/mimeview.c:195
 msgid "Open _with..."
 msgstr "'Öffnen mit...'"
 
-#: src/mimeview.c:206
+#: src/mimeview.c:197
 msgid "Send to..."
 msgstr "Senden an..."
 
-#: src/mimeview.c:207
+#: src/mimeview.c:198
 msgid "_Display as text"
 msgstr "'Als Text darstellen'"
 
-#: src/mimeview.c:208
+#: src/mimeview.c:199
 msgid "_Save as..."
 msgstr "_Speichern als..."
 
-#: src/mimeview.c:209
+#: src/mimeview.c:200
 msgid "Save _all..."
 msgstr "_Alles speichern..."
 
-#: src/mimeview.c:282
+#: src/mimeview.c:273
 msgid "MIME Type"
 msgstr "MIME-Typ"
 
-#: src/mimeview.c:1044 src/mimeview.c:1049 src/mimeview.c:1054
-#: src/mimeview.c:1059
+#: src/mimeview.c:1035 src/mimeview.c:1040 src/mimeview.c:1045
+#: src/mimeview.c:1050
 msgid "View full information"
 msgstr "Vollständige Informationen anzeigen"
 
-#: src/mimeview.c:1065
+#: src/mimeview.c:1056
 msgid "Check again"
 msgstr "Erneut überprüfen"
 
-#: src/mimeview.c:1077
+#: src/mimeview.c:1068
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Klicken Sie zur Überprüfung auf das Symbol."
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1070
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Klicken Sie zur Überprüfung auf das Symbol oder drücken Sie '%s'."
 
-#: src/mimeview.c:1089
+#: src/mimeview.c:1080
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Zeitüberschreitung beim Prüfen der Signatur. Symbol anklicken, um es noch "
 "einmal zu versuchen."
 
-#: src/mimeview.c:1091
+#: src/mimeview.c:1082
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8010,45 +8029,40 @@ msgstr ""
 "Zeitüberschreitung beim Prüfen der Signatur. Symbol anklicken oder '%s' "
 "drücken, um es noch einmal zu versuchen."
 
-#: src/mimeview.c:1330
+#: src/mimeview.c:1322
 msgid "Checking signature..."
 msgstr "Digitale Signatur wird überprüft..."
 
-#: src/mimeview.c:1373
+#: src/mimeview.c:1363
 msgid "Go back to email"
 msgstr "Zurück zur E-Mail"
 
-#: src/mimeview.c:1769 src/mimeview.c:1858 src/mimeview.c:2050
-#: src/mimeview.c:2093 src/mimeview.c:2224
-#: src/plugins/fancy/fancy_viewer.c:420
+#: src/mimeview.c:1763 src/mimeview.c:1852 src/mimeview.c:2044
+#: src/mimeview.c:2080 src/mimeview.c:2192
+#: src/plugins/fancy/fancy_viewer.c:421
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
-msgstr ""
-"Eine mehrteilige Nachricht konnte nicht komplett gespeichert werden: %s"
+msgstr "Teil einer mehrteiligen Nachricht konnte nicht gespeichert werden: %s"
 
-#: src/mimeview.c:1847 src/textview.c:3118
+#: src/mimeview.c:1841 src/textview.c:3118
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Existierende Datei '%s' überschreiben?"
 
-#: src/mimeview.c:1889 src/plugins/archive/archiver_prefs.c:128
+#: src/mimeview.c:1883 src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
 msgstr "Zielordner auswählen"
 
-#: src/mimeview.c:1896 src/plugins/archive/archiver_prefs.c:134
+#: src/mimeview.c:1890 src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' ist kein Ordner."
 
-#: src/mimeview.c:2125
-msgid "No registered viewer for this file type."
-msgstr "Kein Betrachterprogramm für diesen Dateityp eingetragen."
-
-#: src/mimeview.c:2157 src/mimeview.c:2164 src/textview.c:3039
+#: src/mimeview.c:2127 src/mimeview.c:2134 src/textview.c:3039
 msgid "Open with"
 msgstr "Öffnen mit"
 
-#: src/mimeview.c:2158 src/mimeview.c:2165 src/textview.c:3040
+#: src/mimeview.c:2128 src/mimeview.c:2135 src/textview.c:3040
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8057,115 +8071,115 @@ msgstr ""
 "Geben Sie den Befehl zum Öffnen der Datei ein:\n"
 "('%s' wird durch den Dateinamen ersetzt)"
 
-#: src/mimeview.c:2258
+#: src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "Fremde Programmdatei ausführen?"
 
-#: src/mimeview.c:2259
+#: src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
 "\n"
 "Do you want to run this file?"
 msgstr ""
-"Dieser Anhang ist eine Programmdatei. Das Ausführen fremder Programme ist "
-"gefährlich und kann Ihren Computers kompromittieren.\n"
+"Dieser Anhang ist eine Programmdatei. Das Ausführen unbekannter Programme "
+"ist gefährlich und kann Ihren Computers kompromittieren.\n"
 "\n"
-"Möchten Sie diese Datei starten?"
+"Möchten Sie diese Datei ausführen?"
 
-#: src/mimeview.c:2263
+#: src/mimeview.c:2231
 msgid "Run binary"
 msgstr "Programmdatei ausführen"
 
-#: src/mimeview.c:2565
+#: src/mimeview.c:2533
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/mimeview.c:2566 src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/mimeview.c:2534 src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Size:"
 msgstr "Größe:"
 
-#: src/mimeview.c:2578 src/plugins/vcalendar/vcalendar.c:1271
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1730
+#: src/mimeview.c:2546 src/plugins/vcalendar/vcalendar.c:1271
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1741
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1751
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: src/news.c:300
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "NNTP-Verbindung zu %s:%d wurde unterbrochen.\n"
 
-#: src/news.c:333
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Konto '%s': Verbinde mit NNTP-Server: %s:%d...\n"
 
-#: src/news.c:354
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Fehler beim Anmelden an %s:%d...\n"
 
-#: src/news.c:432
+#: src/news.c:438
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan unterstützt Statusmeldung 480 nicht, also machen wir erstmal "
 "weiter\n"
 
-#: src/news.c:441
+#: src/news.c:447
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Leser-Modus schlug fehl, fahre trotzdem fort\n"
 
 # Nochmal ankucken.
-#: src/news.c:445
+#: src/news.c:451
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Fehler beim Anmelden an %s:%d ...\n"
 
-#: src/news.c:459
+#: src/news.c:466
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Fehler beim Authentifizieren an %s:%d...\n"
 
-#: src/news.c:484
+#: src/news.c:491
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
-"Claws Mail benötigt Zugang zum Netz, um auf diesen News-Server zuzugreifen."
+"Claws Mail benötigt Zugang zum Netz, um auf den News-Server zuzugreifen."
 
-#: src/news.c:853
+#: src/news.c:862
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "Gruppe %s konnte nicht gewählt werden\n"
 
-#: src/news.c:1042 src/news.c:1212
+#: src/news.c:1051 src/news.c:1221
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "Gruppe %s konnte nicht gesetzt werden\n"
 
-#: src/news.c:1051
+#: src/news.c:1060
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ungültiger Artikelbereich: %d - %d\n"
 
-#: src/news.c:1121 src/news.c:1145 src/news.c:1169
+#: src/news.c:1130 src/news.c:1154 src/news.c:1178
 msgid "couldn't get xhdr\n"
 msgstr "XHDR nicht abrufbar\n"
 
-#: src/news.c:1205
+#: src/news.c:1214
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "Newsübersicht wird geholt: %d - %d in %s...\n"
 
-#: src/news.c:1220
+#: src/news.c:1229
 msgid "couldn't get xover\n"
 msgstr "Newsübersicht nicht abrufbar\n"
 
-#: src/news.c:1235
+#: src/news.c:1244
 msgid "invalid xover line\n"
 msgstr "ungültige XOVER Zeile\n"
 
-#: src/news.c:1450
+#: src/news.c:1459
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -8368,7 +8382,7 @@ msgstr ""
 "Das Archiv kann komprimiert werden mit:\n"
 "%s\n"
 "Die Archive können mit jedem Standardwerkzeug wiederhergestellt werden, das "
-"das Format und die gewählte Kompressionmethode unterstützt.\n"
+"das Format und die gewählte Kompressionsmethode unterstützt.\n"
 "\n"
 "Die unterstützten Ordnertypen sind MH, IMAP, RSSyl und vCalendar.\n"
 "\n"
@@ -8387,7 +8401,7 @@ msgstr "Archiviere"
 
 #: src/plugins/archive/archiver_gtk.c:122
 msgid "Press Cancel button to stop archiving"
-msgstr "Cancel-Schaltfläche drücken um Archivierung abzubrechen"
+msgstr "Abbrechen-Schaltfläche drücken um Archivierung abzubrechen"
 
 #: src/plugins/archive/archiver_gtk.c:138
 msgid "Archiving:"
@@ -8567,7 +8581,7 @@ msgstr "Archivpfad und -name"
 
 #: src/plugins/archive/archiver_gtk.c:1045
 #: src/plugins/archive/archiver_prefs.c:198
-#: src/plugins/pgpcore/select-keys.c:424
+#: src/plugins/pgpcore/select-keys.c:420
 msgid "_Select"
 msgstr "_Wählen"
 
@@ -8646,7 +8660,7 @@ msgstr ""
 
 #: src/plugins/archive/archiver_gtk.c:1185
 msgid "R_ename"
-msgstr "_Umbennen"
+msgstr "_Umbenennen"
 
 #: src/plugins/archive/archiver_gtk.c:1189
 #: src/plugins/archive/archiver_prefs.c:333
@@ -8757,7 +8771,7 @@ msgstr ""
 
 #: src/plugins/archive/archiver_prefs.c:331
 msgid "Rename"
-msgstr "Umbennen"
+msgstr "Umbenennen"
 
 #: src/plugins/archive/archiver_prefs.c:339
 msgid "Choose this option to delete mails after archiving"
@@ -8811,24 +8825,24 @@ msgstr "Diese Nachricht hat keine Anhänge"
 msgid "Remove attachments..."
 msgstr "Anhänge entfernen..."
 
-#: src/plugins/att_remover/att_remover.c:507
-#: src/plugins/att_remover/att_remover.c:574
+#: src/plugins/att_remover/att_remover.c:506
+#: src/plugins/att_remover/att_remover.c:566
 msgid "AttRemover"
 msgstr "AttRemover"
 
-#: src/plugins/att_remover/att_remover.c:579
+#: src/plugins/att_remover/att_remover.c:571
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
 "Warning: this operation will be completely un-cancellable and the deleted "
 "attachments will be lost forever, and ever, and ever."
 msgstr ""
-"Dieses Plugin entfernt Anhänge von E-mails.\n"
+"Dieses Plugin entfernt Anhänge von E-Mails.\n"
 "\n"
 "Warnung: Dieser Vorgang kann nicht abgebrochen werden und die gelöschten "
 "Anhänge werden für immer und ewig und ewig und ewig verloren sein."
 
-#: src/plugins/att_remover/att_remover.c:603
+#: src/plugins/att_remover/att_remover.c:595
 msgid "Attachment handling"
 msgstr "Behandlung von Anhängen"
 
@@ -8870,43 +8884,57 @@ msgstr ""
 "Warnt den Benutzer, wenn ein Anhang in der Mail erwähnt wurde, aber keine "
 "Datei angehängt ist."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:53
+#: src/plugins/attachwarner/attachwarner_prefs.c:54
 msgid "attach"
 msgstr "anhängen"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:80
-msgid ""
-"Warn when matching the following regular expressions:\n"
-"(one per line)"
+#: src/plugins/attachwarner/attachwarner_prefs.c:85
+msgid "One of the following regular expressions is matched (one per line):"
 msgstr ""
-"Warne, wenn die folgenden Regulären Ausdrücke zutreffen:\n"
+"Einer der folgenden Regulären Ausdrücke zutrifft:\n"
 "(einer pro Zeile)"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:99
-msgid "Skip quoted lines"
-msgstr "Zitierte Zeilen auslassen"
+#: src/plugins/attachwarner/attachwarner_prefs.c:89
+msgid "Expressions are case sensitive"
+msgstr "Zwischen Groß- und Kleinschreibung unterscheiden"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:96
+msgid "Case sensitive when matching for the regular expressions in the list"
+msgstr ""
+"Beim Prüfen auf die Regulären Ausdrücke der Liste wird zwischen Groß- und "
+"Kleinschreibung unterschieden"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:114
+msgid "Lines starting with quotation marks"
+msgstr "Zeilen mit Zitatzeichen am Anfang"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:106
-msgid "Exclude quoted lines from checking for the regular expressions above"
+#: src/plugins/attachwarner/attachwarner_prefs.c:121
+msgid ""
+"Exclude quoted lines from checking for the regular expressions above. Note "
+"that handmade quotes cannot be distinguished from quotes generated by "
+"replying."
 msgstr ""
-"Schließt zitierte Zeilen von der Prüfung gegen obige Reguläre Ausdrücke aus"
+"Zitierte Zeilen von der Prüfung gegen obige Reguläre Ausdrücke ausschließen. "
+"Beachten Sie, dass manuelle Zitate nicht unterschieden werden können von "
+"Zitaten, die beim Beantworten von Nachrichten erzeugt werden."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:109
-msgid "Skip forwards and redirections"
-msgstr "Weiterleitungen und Umleitungen ignorieren"
+#: src/plugins/attachwarner/attachwarner_prefs.c:124
+msgid "Forwarded or redirected messages"
+msgstr "Weitergeleitete oder umgeleitete Nachrichten"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:116
+#: src/plugins/attachwarner/attachwarner_prefs.c:131
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr ""
 "Nicht auf fehlende Anhänge prüfen, wenn die Nachricht weiter- oder "
 "umgeleitet wird"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:119
-msgid "Skip signature"
-msgstr "Signatur ignorieren"
+#: src/plugins/attachwarner/attachwarner_prefs.c:134
+#: src/prefs_msg_colors.c:362
+msgid "Signatures"
+msgstr "Signaturen"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:126
+#: src/plugins/attachwarner/attachwarner_prefs.c:141
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
@@ -8914,7 +8942,15 @@ msgstr ""
 "Zeilen nach dem ersten Signatur-Separator nicht auf obige Reguläre Ausdrücke "
 "prüfen"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:202
+#: src/plugins/attachwarner/attachwarner_prefs.c:147
+msgid "Warn when"
+msgstr "Warne, wenn"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:151
+msgid "Excluding"
+msgstr "Ausschließen"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:229
 msgid "Attach Warner"
 msgstr "Anhangswarner"
 
@@ -9093,7 +9129,7 @@ msgstr "Größere Nachrichten als diese werden nicht überprüft"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:170
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1487
+#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1483
 msgid "KB"
 msgstr "KB"
 
@@ -9560,93 +9596,93 @@ msgstr ""
 "\n"
 "Es ist eigentlich nicht nützlich."
 
-#: src/plugins/fancy/fancy_viewer.c:391
+#: src/plugins/fancy/fancy_viewer.c:392
 msgid "Remote content loading is disabled."
 msgstr "Nachzuladende Inhalte sind deaktiviert"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:469
 msgid "Load images"
 msgstr "Bilder laden"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:471
 msgid "Enable remote content"
 msgstr "Nachzuladende Inhalte aktivieren"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:473
 msgid "Enable Javascript"
 msgstr "JavaScript aktivieren"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:475
 msgid "Enable Plugins"
 msgstr "Plugins aktivieren"
 
-#: src/plugins/fancy/fancy_viewer.c:476
+#: src/plugins/fancy/fancy_viewer.c:477
 msgid "Enable Java"
 msgstr "Java aktivieren"
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:479
 msgid "Open links with external browser"
 msgstr "Links im Webbrowser öffnen"
 
-#: src/plugins/fancy/fancy_viewer.c:647
+#: src/plugins/fancy/fancy_viewer.c:648
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ein Fehler trat auf: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:698
+#: src/plugins/fancy/fancy_viewer.c:704
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s ist ein missgebildeter oder nicht unterstützter Feed."
 
-#: src/plugins/fancy/fancy_viewer.c:709
+#: src/plugins/fancy/fancy_viewer.c:715
 msgid "Search the Web"
 msgstr "Das Web durchsuchen"
 
-#: src/plugins/fancy/fancy_viewer.c:721
+#: src/plugins/fancy/fancy_viewer.c:727
 msgid "Open in Viewer"
 msgstr "Im Betrachter öffnen"
 
-#: src/plugins/fancy/fancy_viewer.c:723
+#: src/plugins/fancy/fancy_viewer.c:729
 msgid "Open in Viewer (enable remote content)"
 msgstr "In Betrachter öffnen (nachzuladende Inhalte aktivieren)"
 
-#: src/plugins/fancy/fancy_viewer.c:732
+#: src/plugins/fancy/fancy_viewer.c:738
 msgid "Open in Browser"
 msgstr "Im Webbrowser öffnen"
 
-#: src/plugins/fancy/fancy_viewer.c:742
+#: src/plugins/fancy/fancy_viewer.c:748
 msgid "Open Image"
 msgstr "Bild öffnen"
 
-#: src/plugins/fancy/fancy_viewer.c:751
+#: src/plugins/fancy/fancy_viewer.c:757
 msgid "Copy Link"
 msgstr "Link-Adresse kopieren"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:761
 msgid "Download Link"
 msgstr "Download-Link"
 
-#: src/plugins/fancy/fancy_viewer.c:766
+#: src/plugins/fancy/fancy_viewer.c:772
 msgid "Save Image As"
 msgstr "Bild speichern unter"
 
-#: src/plugins/fancy/fancy_viewer.c:776
+#: src/plugins/fancy/fancy_viewer.c:782
 msgid "Copy Image"
 msgstr "Bild kopieren"
 
-#: src/plugins/fancy/fancy_viewer.c:794
+#: src/plugins/fancy/fancy_viewer.c:800
 msgid "Import feed"
 msgstr "Importiere Feed"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1013
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1032
+#: src/plugins/fancy/fancy_viewer.c:1038
 msgid "Fancy HTML Viewer"
 msgstr "Fancy - HTML-Betrachter"
 
-#: src/plugins/fancy/fancy_viewer.c:1037
+#: src/plugins/fancy/fancy_viewer.c:1043
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -9816,7 +9852,7 @@ msgstr[1] "%d von"
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] "1 Kontakt dem Zwischenspeicher hinzugefügt"
-msgstr[1] "%d Kontakten dem Zwischenspeicher hinzugefügt"
+msgstr[1] "%d Kontakte dem Zwischenspeicher hinzugefügt"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:216
 msgid "GData plugin: Starting async contacts query\n"
@@ -9829,7 +9865,7 @@ msgstr "GData-Plugin: Fehler bei der Abfrage von Gruppen: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:278
 msgid "GData plugin: Groups received\n"
-msgstr "GData-Plugin: Gruppen erhalten\n"
+msgstr "GData-Plugin: Gruppen empfangen\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:290
 msgid "GData plugin: Starting async groups query\n"
@@ -9850,7 +9886,7 @@ msgstr "GData-Plugin: Authentifiziert\n"
 msgid "GData plugin: Starting async authentication\n"
 msgstr "GData-Plugin: Starte asynchrone Authentifizierung\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:78 src/prefs_account.c:1724
+#: src/plugins/gdata/cm_gdata_prefs.c:78 src/prefs_account.c:1720
 msgid "Authentication"
 msgstr "Authentifizierung"
 
@@ -9860,7 +9896,7 @@ msgid "Username:"
 msgstr "Benutzername:"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:91
-#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1601
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1413
 msgid "Password:"
 msgstr "Kennwort:"
 
@@ -9942,7 +9978,7 @@ msgstr ""
 "Wird eine existierende Mailbox angegeben,\n"
 "wird sie automatisch überprüft."
 
-#: src/plugins/mailmbox/plugin_gtk.c:323
+#: src/plugins/mailmbox/plugin_gtk.c:322
 #, c-format
 msgid ""
 "All folder(s) and message(s) under '%s' will be deleted.\n"
@@ -9952,20 +9988,20 @@ msgstr ""
 "gelöscht.\n"
 "Möchten Sie wirklich löschen?"
 
-#: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
+#: src/plugins/newmail/newmail.c:111 src/plugins/newmail/newmail.c:162
 msgid "NewMail"
 msgstr "NewMail"
 
-#: src/plugins/newmail/newmail.c:115
+#: src/plugins/newmail/newmail.c:116
 msgid "Failed to register newmail hook"
 msgstr "Registrieren des \"newmail hook\" schlug fehl."
 
-#: src/plugins/newmail/newmail.c:132
+#: src/plugins/newmail/newmail.c:137 src/plugins/newmail/newmail.c:140
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "Konnte Protokoll-Datei nicht öffnen %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:145
+#: src/plugins/newmail/newmail.c:154
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -9975,14 +10011,14 @@ msgid ""
 "\n"
 "Current log is %s"
 msgstr ""
-"Dieses Plugin schreibt eine Zusammenfassung der Kopfzeilen jeder erhaltenen "
+"Dieses Plugin schreibt eine Zusammenfassung der Kopfzeilen jeder empfangenen "
 "E-Mail nach dem Sortieren in eine Logdatei.\n"
 "\n"
 "Der Standardpfad ist ~/Mail/NewLog\n"
 "\n"
 "Das aktuelle Log liegt in %s"
 
-#: src/plugins/newmail/newmail.c:179
+#: src/plugins/newmail/newmail.c:188
 msgid "Log file"
 msgstr "Protokoll-Datei"
 
@@ -10125,6 +10161,11 @@ msgstr "neue unbekannte Nachricht"
 msgid "Unknown message type arrived"
 msgstr "Eine Nachricht unbekannten Typs erhalten"
 
+#: src/plugins/notification/notification_popup.c:381
+#: src/plugins/notification/notification_trayicon.c:647
+msgid "Present main window"
+msgstr "Aktuelles Hauptfenster"
+
 #: src/plugins/notification/notification_popup.c:491
 msgid "Mail message"
 msgstr "E-Mail"
@@ -10184,7 +10225,7 @@ msgid "Popup"
 msgstr "Popup"
 
 #: src/plugins/notification/notification_prefs.c:464 src/prefs_actions.c:263
-#: src/prefs_receive.c:147
+#: src/prefs_receive.c:133
 msgid "Command"
 msgstr "Befehl"
 
@@ -10257,12 +10298,12 @@ msgid "Show banner"
 msgstr "Banner anzeigen"
 
 #: src/plugins/notification/notification_prefs.c:746
-#: src/plugins/pgpcore/select-keys.c:242 src/plugins/pgpcore/sgpgme.c:144
-#: src/prefs_receive.c:197 src/prefs_summaries.c:462
+#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:144
+#: src/prefs_receive.c:183 src/prefs_summaries.c:462
 msgid "Never"
 msgstr "Nie"
 
-#: src/plugins/notification/notification_prefs.c:748 src/prefs_receive.c:195
+#: src/plugins/notification/notification_prefs.c:748 src/prefs_receive.c:181
 #: src/prefs_summaries.c:444 src/prefs_summaries.c:463
 msgid "Always"
 msgstr "Immer"
@@ -10572,82 +10613,82 @@ msgstr "Format:"
 msgid "Optimized:"
 msgstr "Optimiert:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1165
+#: src/plugins/pdf_viewer/poppler_viewer.c:1181
 msgid "PDF properties"
 msgstr "PDF-Eigenschaften"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1263
+#: src/plugins/pdf_viewer/poppler_viewer.c:1279
 msgid "Loading..."
 msgstr "Lade..."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1322
+#: src/plugins/pdf_viewer/poppler_viewer.c:1338
 #, c-format
 msgid "%s Document"
 msgstr "%s-Dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1328
+#: src/plugins/pdf_viewer/poppler_viewer.c:1344
 #, c-format
 msgid "of %d"
 msgstr "von %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1705
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1721
+#: src/plugins/pdf_viewer/poppler_viewer.c:1943
 msgid "Document Index"
 msgstr "Inhaltsverzeichnis"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1895
+#: src/plugins/pdf_viewer/poppler_viewer.c:1911
 msgid "First Page"
 msgstr "Erste Seite"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1898
+#: src/plugins/pdf_viewer/poppler_viewer.c:1914
 msgid "Previous Page"
 msgstr "Vorige Seite"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1901
+#: src/plugins/pdf_viewer/poppler_viewer.c:1917
 msgid "Next Page"
 msgstr "Nächste Seite"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1904
+#: src/plugins/pdf_viewer/poppler_viewer.c:1920
 msgid "Last Page"
 msgstr "Letzte Seite"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1907
+#: src/plugins/pdf_viewer/poppler_viewer.c:1923
 msgid "Zoom In"
 msgstr "Vergrößern"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1909
+#: src/plugins/pdf_viewer/poppler_viewer.c:1925
 msgid "Zoom Out"
 msgstr "Verkleinern"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1912
+#: src/plugins/pdf_viewer/poppler_viewer.c:1928
 msgid "Fit Page"
 msgstr "An Seite anpassen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1915
+#: src/plugins/pdf_viewer/poppler_viewer.c:1931
 msgid "Fit Page Width"
 msgstr "An Seitenbreite anpassen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1918
+#: src/plugins/pdf_viewer/poppler_viewer.c:1934
 msgid "Rotate Left"
 msgstr "Nach links drehen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1921
+#: src/plugins/pdf_viewer/poppler_viewer.c:1937
 msgid "Rotate Right"
 msgstr "Nach rechts drehen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1940
 msgid "Document Info"
 msgstr "Dokument-Informationen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1929
+#: src/plugins/pdf_viewer/poppler_viewer.c:1945
 msgid "Page Number"
 msgstr "Seite Nummer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1931
+#: src/plugins/pdf_viewer/poppler_viewer.c:1947
 msgid "Zoom Factor"
 msgstr "Zoomfaktor"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2036
+#: src/plugins/pdf_viewer/poppler_viewer.c:2052
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -10660,13 +10701,13 @@ msgstr ""
 "\n"
 "Jegliche Rückmeldung ist willkommen: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2042
-#: src/plugins/pdf_viewer/poppler_viewer.c:2050
-#: src/plugins/pdf_viewer/poppler_viewer.c:2070
+#: src/plugins/pdf_viewer/poppler_viewer.c:2058
+#: src/plugins/pdf_viewer/poppler_viewer.c:2066
+#: src/plugins/pdf_viewer/poppler_viewer.c:2086
 msgid "PDF Viewer"
 msgstr "PDF-Betrachter"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2046
+#: src/plugins/pdf_viewer/poppler_viewer.c:2062
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -10682,43 +10723,72 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/python/python_plugin.c:338
-#: src/plugins/python/python_plugin.c:482
+#: src/plugins/python/python_plugin.c:358
+#: src/plugins/python/python_plugin.c:502
 msgid "Python scripts"
 msgstr "Python-Scripte"
 
-#: src/plugins/python/python_plugin.c:477
+#: src/plugins/python/python_plugin.c:497
 msgid "Show Python console..."
 msgstr "Python-Konsole öffnen..."
 
-#: src/plugins/python/python_plugin.c:483
+#: src/plugins/python/python_plugin.c:503
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: src/plugins/python/python_plugin.c:485 src/prefs_account.c:2488
-#: src/prefs_account.c:2510 src/prefs_account.c:2769 src/wizard.c:1379
-#: src/wizard.c:1658
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2480
+#: src/prefs_account.c:2502 src/prefs_account.c:2761 src/wizard.c:1191
+#: src/wizard.c:1465
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: src/plugins/python/python_plugin.c:548
-#: src/plugins/python/python_plugin.c:602
+#: src/plugins/python/python_plugin.c:646
+#: src/plugins/python/python_plugin.c:725
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:554
+#: src/plugins/python/python_plugin.c:652
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Registrieren des \"compose create hook\" im Python-Plugin schlug fehl."
 
-#: src/plugins/python/python_plugin.c:607
+#: src/plugins/python/python_plugin.c:730
 msgid ""
 "This plugin provides Python integration features.\n"
+"Python code can be entered interactively into an embedded Python console, "
+"under Tools -> Show Python console, or stored in scripts.\n"
+"\n"
+"These scripts are then available via the menu. You can assign keyboard "
+"shortcuts to them just like it is done with other menu items. You can also "
+"put buttons for script invokation into the toolbars using Claws Mail's "
+"builtin toolbar editor.\n"
+"\n"
+"You can provide scripts working on the main window by placing files into ~/."
+"claws-mail/python-scripts/main.\n"
+"\n"
+"You can also provide scripts working on an open compose window by placing "
+"files into ~/.claws-mail/python-scripts/compose.\n"
+"\n"
+"The folder ~/.claws-mail/python-scripts/auto/ may contain some scripts that "
+"are automatically executed when certain events occur. Currently, the "
+"following files in this directory are recognised:\n"
+"\n"
+"compose_any\n"
+"Gets executed whenever a compose window is opened, no matterif that opening "
+"happened as a result of composing a new message,replying or forwarding a "
+"message.\n"
+"\n"
+"startup\n"
+"Executed at plugin load\n"
+"\n"
+"shutdown\n"
+"Executed at plugin unload\n"
+"\n"
 "\n"
 "For the most up-to-date API documentation, type\n"
 "\n"
 " help(clawsmail)\n"
 "\n"
-"in the interactive Python console under Tools -> Show Python console.\n"
+"in the interactive Python console.\n"
 "\n"
 "The source distribution of this plugin comes with various example scripts in "
 "the \"examples\" subdirectory. If you wrote a script that you would be "
@@ -10728,22 +10798,48 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
 "Dieses Plugin ermöglicht die Integration von Python.\n"
+"Python-Code kann interaktiv in eine eingebettete Python-Konsole eingegeben "
+"werden. Der Aufruf erfolgt über Extras -> Python-Konsole öffnen oder "
+"Scripte.\n"
+"\n"
+"Diese Scripte sind über das Menü verfügbar. Sie können ihnen Tastenkürzel "
+"zuweisen wie allen anderen Menüeinträgen. Mit dem in Claws Mail integrierten "
+"Werkzeugleisteneditor können Sie den Werkzeugleisten auch Schaltflächen für "
+"den Aufruf von Scripten hinzufügen.\n"
+"\n"
+"Scripte, die im Hauptfenster arbeiten sollen, sind in ~/.claws-mail/python-"
+"scripts/main zu speichern, Scripte für Editor-Fenster in ~/.claws-mail/"
+"python-scripts/compose.\n"
+"\n"
+"Der Ordner ~/.claws-mail/python-scripts/auto/ ist für Scripte vorgesehen, "
+"die automatisch ausgeführt werden, wenn bestimmte Ereignisse stattfinden. "
+"Gegenwärtig werden folgende Dateien in diesem Verzeichnis erkannt:\n"
+"\n"
+" compose_any\n"
+"_Umbenennen...ein Editor-Fenster geöffnet wird unabhängig davon, ob durch "
+"das Beantworten, Weiterleiten oder Erstellen einer neuen Nachricht.\n"
+"\n"
+" startup\n"
+"Wird ausgeführt, wenn das Plugin gestartet wird.\n"
+"\n"
+" shutdown\n"
+"Wird ausgeführt, wenn das Plugin beendet wird.\n"
+"\n"
 "\n"
-"Um die API-Dokumentation anzuzeigen, geben Sie\n"
+"Um die aktuelle API-Dokumentation aufzurufen, tippen Sie\n"
 "\n"
 " help(clawsmail)\n"
 "\n"
-"in die interaktive Python-Konsole ein. Diese finden Sie unter Extras -> "
-"Python-Konsole öffnen.\n"
+"in die interaktive Python-Konsole.\n"
 "\n"
 "Der Quellcode dieses Plugins enthält verschiedene Beispielscripte im "
-"\"examples\"-Unterverzeichnis. Falls Sie ein Script geschrieben haben, dass "
+"\"examples\"-Unterverzeichnis. Falls Sie ein Script geschrieben haben, das "
 "Sie gern weitergeben möchten, können Sie es an mich senden, damit es den "
 "Beispielen hinzugefügt wird.\n"
 "\n"
-"Rückmeldungen an <berndth at gmx.de> sind gern gesehen."
+"Rückmeldungen an <berndth at gmx.de> sind willkommen."
 
-#: src/plugins/python/python_plugin.c:636
+#: src/plugins/python/python_plugin.c:781
 msgid "Python integration"
 msgstr "Python-Integration"
 
@@ -10751,11 +10847,11 @@ msgstr "Python-Integration"
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: src/plugins/pgpcore/passphrase.c:253
+#: src/plugins/pgpcore/passphrase.c:249
 msgid "[no user id]"
 msgstr "[keine Benutzer-ID]"
 
-#: src/plugins/pgpcore/passphrase.c:264
+#: src/plugins/pgpcore/passphrase.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the "
@@ -10768,11 +10864,11 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:267
+#: src/plugins/pgpcore/passphrase.c:263
 msgid "Passphrases did not match.\n"
 msgstr "Passphrasen stimmen nicht überein.\n"
 
-#: src/plugins/pgpcore/passphrase.c:270
+#: src/plugins/pgpcore/passphrase.c:266
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the "
@@ -10785,7 +10881,7 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:274
+#: src/plugins/pgpcore/passphrase.c:270
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
@@ -10798,7 +10894,7 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:277
+#: src/plugins/pgpcore/passphrase.c:273
 msgid "Bad passphrase.\n"
 msgstr "Falsche Passphrase.\n"
 
@@ -10937,7 +11033,7 @@ msgstr "Verfällt nach"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Der Eintrag '0' speichert die Passphrase für die ganze Sitzung"
 
-#: src/plugins/pgpcore/prefs_gpg.c:145 src/prefs_receive.c:173
+#: src/plugins/pgpcore/prefs_gpg.c:145 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "Minute(n)"
 
@@ -10991,52 +11087,52 @@ msgstr "Kein genaues Ergebnis für '%s'; Bitte einen Schlüssel wählen."
 msgid "Collecting info for '%s' ... %c"
 msgstr "Einholen von Daten für '%s' ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:142
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:146
+#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:146
 msgid "Marginal"
 msgstr "Gering"
 
-#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:150
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:150
 msgid "Ultimate"
 msgstr "Ultimativ"
 
-#: src/plugins/pgpcore/select-keys.c:370
+#: src/plugins/pgpcore/select-keys.c:366
 msgid "Select Keys"
 msgstr "Schlüssel auswählen"
 
-#: src/plugins/pgpcore/select-keys.c:397
+#: src/plugins/pgpcore/select-keys.c:393
 msgid "Key ID"
 msgstr "Schlüssel-ID"
 
-#: src/plugins/pgpcore/select-keys.c:400
+#: src/plugins/pgpcore/select-keys.c:396
 msgid "Trust"
 msgstr "Vertrauen"
 
-#: src/plugins/pgpcore/select-keys.c:425
+#: src/plugins/pgpcore/select-keys.c:421
 msgid "_Other"
 msgstr "Weiteres"
 
-#: src/plugins/pgpcore/select-keys.c:426
+#: src/plugins/pgpcore/select-keys.c:422
 msgid "Do_n't encrypt"
 msgstr "Nicht verschlüsseln"
 
-#: src/plugins/pgpcore/select-keys.c:585
+#: src/plugins/pgpcore/select-keys.c:581
 msgid "Add key"
 msgstr "Schlüssel hinzufügen"
 
-#: src/plugins/pgpcore/select-keys.c:586
+#: src/plugins/pgpcore/select-keys.c:582
 msgid "Enter another user or key ID:"
 msgstr "Weitere Benutzer- oder Schlüssel-ID eingeben:"
 
-#: src/plugins/pgpcore/select-keys.c:608
+#: src/plugins/pgpcore/select-keys.c:604
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Verschlüsseln nach  %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:609
+#: src/plugins/pgpcore/select-keys.c:605
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -11136,7 +11232,7 @@ msgstr "UNGÜLTIGE Signatur von '%s'\n"
 #: src/plugins/pgpcore/sgpgme.c:327
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
-msgstr "                aka \"%s\" (Gültigkeit: %s)\n"
+msgstr "                uid \"%s\" (Gültigkeit: %s)\n"
 
 #: src/plugins/pgpcore/sgpgme.c:334
 msgid "Primary key fingerprint:"
@@ -11274,50 +11370,50 @@ msgstr "Schlüssel-Export schlug fehl."
 msgid "Key export isn't implemented in Windows."
 msgstr "Schlüssel-Export funktioniert nicht unter Windows."
 
-#: src/plugins/pgpinline/pgpinline.c:258
+#: src/plugins/pgpinline/pgpinline.c:156
 msgid "Incorrect part"
 msgstr "fehlerhafter Teil"
 
-#: src/plugins/pgpinline/pgpinline.c:262
+#: src/plugins/pgpinline/pgpinline.c:160
 msgid "Not a text part"
 msgstr "kein Textteil"
 
-#: src/plugins/pgpinline/pgpinline.c:273 src/plugins/pgpinline/pgpinline.c:430
+#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
 msgid "Couldn't get text data."
 msgstr "Textdaten nicht abrufbar."
 
-#: src/plugins/pgpinline/pgpinline.c:291
+#: src/plugins/pgpinline/pgpinline.c:189
 msgid "Couldn't convert text data to any sane charset."
 msgstr "Textdaten nicht in normalen Zeichensatz konvertierbar."
 
-#: src/plugins/pgpinline/pgpinline.c:299 src/plugins/pgpinline/pgpinline.c:624
-#: src/plugins/pgpinline/pgpinline.c:763 src/plugins/pgpinline/pgpinline.c:819
-#: src/plugins/pgpmime/pgpmime.c:73 src/plugins/pgpmime/pgpmime.c:182
-#: src/plugins/pgpmime/pgpmime.c:322 src/plugins/pgpmime/pgpmime.c:500
-#: src/plugins/pgpmime/pgpmime.c:644 src/plugins/smime/smime.c:406
+#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:517
+#: src/plugins/pgpinline/pgpinline.c:656 src/plugins/pgpinline/pgpinline.c:712
+#: src/plugins/pgpmime/pgpmime.c:74 src/plugins/pgpmime/pgpmime.c:183
+#: src/plugins/pgpmime/pgpmime.c:329 src/plugins/pgpmime/pgpmime.c:507
+#: src/plugins/pgpmime/pgpmime.c:651 src/plugins/smime/smime.c:395
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "GPG Kontext konnte nicht initialisiert werden, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:423
+#: src/plugins/pgpinline/pgpinline.c:316
 msgid "Couldn't parse mime part."
 msgstr "MIME-Teil ist nicht analysierbar."
 
-#: src/plugins/pgpinline/pgpinline.c:453 src/plugins/pgpmime/pgpmime.c:345
+#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:352
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Entschlüsselte Datei %s konnte nicht geöffnet werden"
 
-#: src/plugins/pgpinline/pgpinline.c:470 src/plugins/pgpinline/pgpinline.c:479
-#: src/plugins/pgpinline/pgpinline.c:488 src/plugins/pgpinline/pgpinline.c:496
-#: src/plugins/pgpinline/pgpinline.c:506 src/plugins/pgpinline/pgpinline.c:515
-#: src/plugins/pgpmime/pgpmime.c:356 src/plugins/pgpmime/pgpmime.c:370
+#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
+#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
+#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
+#: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "Fehler beim Schreiben in die entschlüsselte Datei %s"
 
-#: src/plugins/pgpinline/pgpinline.c:484 src/plugins/pgpinline/pgpinline.c:485
-#: src/plugins/pgpinline/pgpinline.c:486
+#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:379
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -11325,51 +11421,51 @@ msgstr ""
 "\n"
 "--- Anfang der PGP/Inline verschlüsselten Daten ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:502 src/plugins/pgpinline/pgpinline.c:503
-#: src/plugins/pgpinline/pgpinline.c:504
+#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:397
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Ende der der PGP/Inline verschlüsselten Daten ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:523 src/plugins/pgpmime/pgpmime.c:382
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:389
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "Fehler beim Schließen der entschlüsselten Datei %s"
 
-#: src/plugins/pgpinline/pgpinline.c:535
+#: src/plugins/pgpinline/pgpinline.c:428
 msgid "Couldn't scan decrypted file."
 msgstr "Scannen der entschlüsselten Datei schlug fehl."
 
-#: src/plugins/pgpinline/pgpinline.c:543
+#: src/plugins/pgpinline/pgpinline.c:436
 msgid "Couldn't scan decrypted file parts."
 msgstr "Scannen der entschlüsselten Dateiteile schlug fehl."
 
-#: src/plugins/pgpinline/pgpinline.c:598 src/plugins/pgpinline/pgpinline.c:790
+#: src/plugins/pgpinline/pgpinline.c:491 src/plugins/pgpinline/pgpinline.c:683
 msgid "Malformed message"
 msgstr "kaputte Nachricht"
 
-#: src/plugins/pgpinline/pgpinline.c:609
+#: src/plugins/pgpinline/pgpinline.c:502
 msgid "Couldn't create temporary file."
 msgstr "Temporäre Datei nicht erstellbar."
 
-#: src/plugins/pgpinline/pgpinline.c:648 src/plugins/pgpmime/pgpmime.c:527
+#: src/plugins/pgpinline/pgpinline.c:541 src/plugins/pgpmime/pgpmime.c:534
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Datensignierung schlug fehl, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:666 src/plugins/pgpmime/pgpmime.c:552
+#: src/plugins/pgpinline/pgpinline.c:559 src/plugins/pgpmime/pgpmime.c:559
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Datensignierung schlug fehl, ungültiger Unterzeichner: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:675 src/plugins/pgpmime/pgpmime.c:561
+#: src/plugins/pgpinline/pgpinline.c:568 src/plugins/pgpmime/pgpmime.c:568
 msgid "Data signing failed, no results."
 msgstr "Datensignierung schlug fehl, kein Ergebnis."
 
-#: src/plugins/pgpinline/pgpinline.c:685 src/plugins/pgpmime/pgpmime.c:572
+#: src/plugins/pgpinline/pgpinline.c:578 src/plugins/pgpmime/pgpmime.c:579
 msgid "Data signing failed, no contents."
 msgstr "Datensignierung schlug fehl, Inhalt fehlt."
 
-#: src/plugins/pgpinline/pgpinline.c:729
+#: src/plugins/pgpinline/pgpinline.c:622
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
@@ -11377,22 +11473,22 @@ msgstr ""
 "Bitte beachten Sie, dass weder Anhänge noch Kopfzeilen (wie Betreff) vom PGP/"
 "Inline-System verschlüsselt werden."
 
-#: src/plugins/pgpinline/pgpinline.c:773 src/plugins/pgpmime/pgpmime.c:654
+#: src/plugins/pgpinline/pgpinline.c:666 src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Hinzufügen des GPG-Schlüssels %s schlug fehl, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:801 src/plugins/pgpmime/pgpmime.c:683
+#: src/plugins/pgpinline/pgpinline.c:694 src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Temporäre Datei nicht erstellbar, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:832 src/plugins/pgpmime/pgpmime.c:710
+#: src/plugins/pgpinline/pgpinline.c:725 src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Verschlüsseln schlug fehl, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:899
+#: src/plugins/pgpinline/pgpinline.c:793
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
@@ -11427,24 +11523,24 @@ msgstr ""
 "\n"
 "GPGME unterliegt dem Copyright 2001 von Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:202
+#: src/plugins/pgpmime/pgpmime.c:203
 msgid "Signature boundary not found."
 msgstr "Signatur-Abgrenzung nicht gefunden."
 
-#: src/plugins/pgpmime/pgpmime.c:394 src/plugins/smime/smime.c:487
+#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:476
 msgid "Couldn't parse decrypted file."
 msgstr "Entschlüsselte Datei nicht analysierbar."
 
-#: src/plugins/pgpmime/pgpmime.c:400 src/plugins/smime/smime.c:494
+#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:483
 msgid "Couldn't parse decrypted file parts."
 msgstr "Entschlüsselte Dateiteile nicht analysierbar."
 
-#: src/plugins/pgpmime/pgpmime.c:446 src/plugins/pgpmime/pgpmime.c:485
+#: src/plugins/pgpmime/pgpmime.c:453 src/plugins/pgpmime/pgpmime.c:492
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Anlegen der temporären Datei schlug fehl: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:610
+#: src/plugins/pgpmime/pgpmime.c:617
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -11452,7 +11548,7 @@ msgstr ""
 "Bitte beachten Sie, dass Kopfzeilen (wie Betreff) vom PGP/Mime-System nicht "
 "verschlüsselt werden."
 
-#: src/plugins/pgpmime/pgpmime.c:780
+#: src/plugins/pgpmime/pgpmime.c:788
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -11665,7 +11761,7 @@ msgid ""
 "the web. You can read them, and delete or keep old entries."
 msgstr ""
 "Dieses Plugin ermöglicht Ihnen einen Mailboxbaum zu erzeugen, zu dem Sie "
-"Newsfeeds im RSS 1.0, RSS 2.0 oder Atom Format hinzufügenen können.\n"
+"Newsfeeds im RSS 1.0-, RSS 2.0- oder Atom-Format hinzufügen können.\n"
 "\n"
 "Jeder Newsfeed erzeugt einen Ordner mit den entsprechenden Einträgen, die "
 "aus dem Web geholt werden. Sie können diese lesen, löschen sowie alte "
@@ -11849,7 +11945,7 @@ msgid "Can't subscribe feed '%s'."
 msgstr "Der Feed '%s' konnte nicht abonniert werden."
 
 #: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:924
+#: src/plugins/smime/smime.c:883
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -11890,24 +11986,24 @@ msgstr ""
 "\n"
 "GPGME unterliegt dem Copyright 2001 von Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:414
+#: src/plugins/smime/smime.c:403
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "GPG Protokoll konnte nicht gesetzt werden, %s"
 
-#: src/plugins/smime/smime.c:442
+#: src/plugins/smime/smime.c:431
 msgid "Couldn't open temporary file"
 msgstr "Temporäre Datei konnte nicht geöffnet werden"
 
-#: src/plugins/smime/smime.c:453 src/plugins/smime/smime.c:468
+#: src/plugins/smime/smime.c:442 src/plugins/smime/smime.c:457
 msgid "Couldn't write to temporary file"
 msgstr "Temporäre Datei konnte nicht geschrieben werden"
 
-#: src/plugins/smime/smime.c:479
+#: src/plugins/smime/smime.c:468
 msgid "Couldn't close temporary file"
 msgstr "Temporäre Datei konnte nicht geschlossen werden"
 
-#: src/plugins/smime/smime.c:695
+#: src/plugins/smime/smime.c:684
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
@@ -11916,8 +12012,8 @@ msgstr ""
 "verschlüsselt werden."
 
 #: src/plugins/spam_report/spam_report_prefs.c:80
-#: src/plugins/spam_report/spam_report.c:340
-#: src/plugins/spam_report/spam_report.c:380
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
 msgid "SpamReport"
 msgstr "SpamReport"
 
@@ -11929,15 +12025,15 @@ msgstr "Aktiviert"
 msgid "Forward to:"
 msgstr "Weiterleiten an:"
 
-#: src/plugins/spam_report/spam_report.c:294
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Melde Spam..."
 
-#: src/plugins/spam_report/spam_report.c:329
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Spam online melden..."
 
-#: src/plugins/spam_report/spam_report.c:385
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -11953,7 +12049,7 @@ msgstr ""
 " * spamcop.net\n"
 " * lists.debian.org-Nominierungssystem"
 
-#: src/plugins/spam_report/spam_report.c:410
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Spam melden"
 
@@ -12296,25 +12392,25 @@ msgid "You are already busy at this time."
 msgstr "Zu dieser Zeit sind Sie bereits beschäftigt."
 
 #: src/plugins/vcalendar/vcalendar.c:1265
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1759
 msgid "Event:"
 msgstr "Veranstaltung:"
 
 #: src/plugins/vcalendar/vcalendar.c:1266
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1727
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1737
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1748
 msgid "Organizer:"
 msgstr "Organisator:"
 
 #: src/plugins/vcalendar/vcalendar.c:1267
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1729
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1740
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1750
 msgid "Location:"
 msgstr "Ort:"
 
 #: src/plugins/vcalendar/vcalendar.c:1268
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1717
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1728
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1749
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
@@ -12327,8 +12423,8 @@ msgid "Ending:"
 msgstr "Ende:"
 
 #: src/plugins/vcalendar/vcalendar.c:1272
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1752
 msgid "Attendees:"
 msgstr "Teilnehmer:"
 
@@ -12336,91 +12432,91 @@ msgstr "Teilnehmer:"
 msgid "Action:"
 msgstr "Verlauf:"
 
-#: src/plugins/vcalendar/vcal_prefs.c:256
+#: src/plugins/vcalendar/vcal_prefs.c:258
 msgid "Reminders"
 msgstr "Erinnerungen"
 
-#: src/plugins/vcalendar/vcal_prefs.c:265
+#: src/plugins/vcalendar/vcal_prefs.c:267
 msgid "Alert me"
 msgstr "Benachrichtige mich"
 
-#: src/plugins/vcalendar/vcal_prefs.c:277
+#: src/plugins/vcalendar/vcal_prefs.c:279
 msgid "minutes before an event"
 msgstr "Minuten vor einem Ereignis"
 
-#: src/plugins/vcalendar/vcal_prefs.c:289
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Calendar export"
 msgstr "Kalender-Export"
 
-#: src/plugins/vcalendar/vcal_prefs.c:300
+#: src/plugins/vcalendar/vcal_prefs.c:302
 msgid "Automatically export calendar to"
 msgstr "Exportiere Kalender automatisch nach "
 
-#: src/plugins/vcalendar/vcal_prefs.c:309
-#: src/plugins/vcalendar/vcal_prefs.c:415
+#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:417
 msgid "You can export to a local file or URL"
 msgstr "Sie können in eine lokale Datei oder zu einer URL exportieren"
 
-#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:313
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr ""
 "Angabe einer lokalen Datei oder einer URL (http://user:pass@server/path/file."
 "ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:319
-#: src/plugins/vcalendar/vcal_prefs.c:425 src/prefs_account.c:1263
-#: src/prefs_account.c:1770
+#: src/plugins/vcalendar/vcal_prefs.c:321
+#: src/plugins/vcalendar/vcal_prefs.c:427 src/prefs_account.c:1259
+#: src/prefs_account.c:1766
 msgid "User ID"
 msgstr "Benutzer-ID"
 
-#: src/plugins/vcalendar/vcal_prefs.c:327
-#: src/plugins/vcalendar/vcal_prefs.c:433 src/prefs_account.c:1269
-#: src/prefs_account.c:1790 src/prefs_account.c:2499 src/prefs_account.c:2521
-#: src/wizard.c:1389 src/wizard.c:1668
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1265
+#: src/prefs_account.c:1786 src/prefs_account.c:2491 src/prefs_account.c:2513
+#: src/wizard.c:1201 src/wizard.c:1475
 msgid "Password"
 msgstr "Kennwort"
 
-#: src/plugins/vcalendar/vcal_prefs.c:341
+#: src/plugins/vcalendar/vcal_prefs.c:343
 msgid "Include webcal subscriptions in export"
 msgstr "Webcal-Abonnements in Export einbeziehen"
 
-#: src/plugins/vcalendar/vcal_prefs.c:351
+#: src/plugins/vcalendar/vcal_prefs.c:353
 msgid "Command to run after calendar export"
 msgstr "Nach dem Export des Kalenders auszuführender Befehl"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:382
 msgid "Register Claws' calendar in XFCE's Orage clock"
-msgstr "Claws' Kalender in XFCEs Orage-Kalender anmelden."
+msgstr "Claws-Kalender in XFCEs Orage-Kalender anmelden."
 
-#: src/plugins/vcalendar/vcal_prefs.c:382
+#: src/plugins/vcalendar/vcal_prefs.c:384
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
 "Erlaubt Orage (Version 4.4 oder höher), den Claws Mail-Kalender zu sehen."
 
-#: src/plugins/vcalendar/vcal_prefs.c:394
+#: src/plugins/vcalendar/vcal_prefs.c:396
 msgid "Free/Busy information"
 msgstr "Frei/Beschäftigt-Informationen"
 
-#: src/plugins/vcalendar/vcal_prefs.c:406
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Automatically export free/busy status to"
 msgstr "Exportiere frei/beschäftigt-Status automatisch nach "
 
-#: src/plugins/vcalendar/vcal_prefs.c:417
+#: src/plugins/vcalendar/vcal_prefs.c:419
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr ""
 "Angabe einer lokalen Datei oder einer URL (http://user:pass@server/path/file."
 "ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:447
+#: src/plugins/vcalendar/vcal_prefs.c:449
 msgid "Command to run after free/busy status export"
 msgstr ""
 "Nach dem Export der frei/beschäftigt-Informationen auszuführender Befehl"
 
-#: src/plugins/vcalendar/vcal_prefs.c:474
+#: src/plugins/vcalendar/vcal_prefs.c:476
 msgid "Get free/busy status of others from"
 msgstr "Frei/Beschäftigt-Status anderer Personen holen von"
 
-#: src/plugins/vcalendar/vcal_prefs.c:482
+#: src/plugins/vcalendar/vcal_prefs.c:484
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -12430,7 +12526,7 @@ msgstr ""
 "ifb). Benutzen Sie %u für den linken Teil der E-Mailadresse und %d für die "
 "Domain."
 
-#: src/plugins/vcalendar/vcal_prefs.c:646 src/plugins/vcalendar/plugin.c:43
+#: src/plugins/vcalendar/vcal_prefs.c:648 src/plugins/vcalendar/plugin.c:43
 #: src/plugins/vcalendar/plugin.c:64
 msgid "vCalendar"
 msgstr "vCalendar"
@@ -12449,7 +12545,7 @@ msgstr "WebCal _abonnieren"
 
 #: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
-msgstr "_Umbennen..."
+msgstr "_Umbenennen..."
 
 #: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
@@ -12467,6 +12563,10 @@ msgstr "_Wochenansicht"
 msgid "_Month view"
 msgstr "_Monatsansicht"
 
+#: src/plugins/vcalendar/vcal_folder.c:1091
+msgid "Meetings"
+msgstr "Treffen"
+
 #: src/plugins/vcalendar/vcal_folder.c:1475
 msgid "in the past"
 msgstr "in der Vergangenheit"
@@ -12576,11 +12676,11 @@ msgstr "WebCal abonnieren"
 msgid "Enter the WebCal URL:"
 msgstr "WebCal-URL eingeben:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1923
+#: src/plugins/vcalendar/vcal_folder.c:1921
 msgid "Could not parse the URL."
 msgstr "Konnte URL nicht analysieren"
 
-#: src/plugins/vcalendar/vcal_folder.c:1952
+#: src/plugins/vcalendar/vcal_folder.c:1950
 msgid "Do you really want to unsubscribe?"
 msgstr "Wollen Sie wirklich abbestellen?"
 
@@ -12732,7 +12832,7 @@ msgid "available"
 msgstr "verfügbar"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:899
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1150
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1151
 msgid "Free/busy retrieval failed"
 msgstr "Holen des free/busy-Status schlug fehl"
 
@@ -12748,22 +12848,22 @@ msgstr "Trotzdem senden"
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr "Nicht alle sind verfügbar. Siehe Tooltip für weitere Informationen..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1132
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1133
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "Abholen geplant für %s..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1159
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1160
 msgid "Available"
 msgstr "Verfügbar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1172
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1179
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1187
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1180
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
 msgid "Everyone is available."
 msgstr "Alle sind verfügbar."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1189
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
@@ -12771,7 +12871,7 @@ msgstr ""
 "Alle sind scheinen verfügbar, aber einige free/busy-Informationen konnten "
 "nicht abgerufen werden."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1360
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1361
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -12779,61 +12879,61 @@ msgstr ""
 "Die Einladungen zum Treffen konnten nicht verschickt werden.\n"
 "Prüfen Sie die Empfänger."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1476
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1493
 msgid "Save & Send"
 msgstr "Speichern & Senden"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1494
 msgid "Check availability"
 msgstr "Verfügbarkeit prüfen"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1600
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "<b>Starts at:</b> "
 msgstr "<b>beginnt um:</b> "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1627
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1623
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1647
 msgid "<b> on:</b>"
 msgstr "<b>am:</b>"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1641
 msgid "<b>Ends at:</b> "
 msgstr "<b>endet um:</b> "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1661
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1682
 msgid "New meeting"
 msgstr "neues Treffen"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1663
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1684
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Treffen bearbeiten"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1763
 msgid "Time:"
 msgstr "Zeit:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1878
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1896
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1881
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1899
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1892
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "anstehender Termin: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1893
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1911
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -12850,39 +12950,39 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1928
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "Erinnerung in %d Minute"
 msgstr[1] "Erinnerung in %d Minuten"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2036
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2054
 msgid "Empty calendar"
 msgstr "Leerer Kalender"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2037
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2055
 msgid "There is nothing to export."
 msgstr "Es gibt nichts zu exportieren"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2077
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2095
 msgid "Could not export the calendar."
 msgstr "Der Kalender konnte nicht exportiert werden."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2112
 msgid "Export calendar to ICS"
 msgstr "Exportiere Kalender zu ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2135
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "Der Kalender konnte nicht nach '%s' exportiert werden.\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2232
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2251
 msgid "Could not export the freebusy info."
 msgstr "Die free/busy-Informationen konnten nicht exportiert werden."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2263
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2283
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr ""
@@ -12961,7 +13061,7 @@ msgid "Show"
 msgstr "Zeigen"
 
 #: src/plugins/vcalendar/day-view.c:622 src/plugins/vcalendar/month-view.c:722
-#: src/prefs_account.c:1456 src/prefs_folder_item.c:562
+#: src/prefs_account.c:1452 src/prefs_folder_item.c:562
 #: src/prefs_matcher.c:334
 msgid "days"
 msgstr "Tag(en)"
@@ -12991,11 +13091,11 @@ msgstr ""
 "angezeigt und Sie haben die Möglichkeit, diese zu akzeptieren oder "
 "abzulehnen.\n"
 "Um ein Treffen zu erstellen, klicken Sie mit der rechten Maustaste auf den "
-"vCalendar oder Versammlungs-Ordner und wählen \"Neues Treffen...\".\n"
+"vCalendar- oder Versammlungs-Ordner und wählen \"Neues Treffen...\".\n"
 "\n"
-"Sie können außerdem entfernte WebCal-Feeds zu abonnieren, Ihre Versammlungen "
-"und Kalender exportieren, Ihre free/busy-Informationen veröffentlichen und "
-"selbige von anderen abfragen."
+"Sie können außerdem entfernte WebCal-Feeds zu abonnieren, Ihre Treffen und "
+"Kalender exportieren, Ihre free/busy-Informationen veröffentlichen und "
+"selbige von anderen abrufen."
 
 #: src/plugins/vcalendar/plugin.c:102
 msgid "Calendar"
@@ -13140,12 +13240,12 @@ msgstr "Fehler bei der POP3-Sitzung\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP-Befehl nicht unterstützt\n"
 
-#: src/prefs_account.c:332 src/prefs_account.c:1430 src/prefs_account.c:2416
-#: src/wizard.c:1549
+#: src/prefs_account.c:332 src/prefs_account.c:1426 src/prefs_account.c:2408
+#: src/wizard.c:1361
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1543 src/prefs_account.c:2431
+#: src/prefs_account.c:335 src/prefs_account.c:1539 src/prefs_account.c:2423
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -13153,7 +13253,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:337 src/wizard.c:1551
+#: src/prefs_account.c:337 src/wizard.c:1363
 msgid "Local mbox file"
 msgstr "Lokale Mbox-Datei"
 
@@ -13201,344 +13301,344 @@ msgstr "Dieser Server erfordert Authentifizierung"
 msgid "Authenticate on connect"
 msgstr "Bei Verbinden authentifizieren"
 
-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1216
 msgid "News server"
 msgstr "Newsserver"
 
-#: src/prefs_account.c:1226
+#: src/prefs_account.c:1222
 msgid "Server for receiving"
 msgstr "Server zum Empfangen"
 
-#: src/prefs_account.c:1232
+#: src/prefs_account.c:1228
 msgid "Local mailbox"
 msgstr "Lokale Mailbox"
 
-#: src/prefs_account.c:1239
+#: src/prefs_account.c:1235
 msgid "SMTP server (send)"
 msgstr "SMTP-Server (Senden)"
 
-#: src/prefs_account.c:1247
+#: src/prefs_account.c:1243
 msgid "Use mail command rather than SMTP server"
 msgstr "Mail-Befehl anstelle eines SMTP-Servers verwenden"
 
-#: src/prefs_account.c:1256
+#: src/prefs_account.c:1252
 msgid "command to send mails"
 msgstr "Befehl für Mail-Versand"
 
-#: src/prefs_account.c:1318
+#: src/prefs_account.c:1314
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account.c:1404
+#: src/prefs_account.c:1400
 msgid "Local"
 msgstr "Lokal"
 
-#: src/prefs_account.c:1410 src/prefs_account.c:1499
+#: src/prefs_account.c:1406 src/prefs_account.c:1495
 msgid "Default Inbox"
 msgstr "Standard-Eingangsordner"
 
-#: src/prefs_account.c:1417 src/prefs_account.c:1424 src/prefs_account.c:1506
-#: src/prefs_account.c:1513
+#: src/prefs_account.c:1413 src/prefs_account.c:1420 src/prefs_account.c:1502
+#: src/prefs_account.c:1509
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ungefilterte Nachrichten werden in diesem Ordner gespeichert"
 
-#: src/prefs_account.c:1421 src/prefs_account.c:1510 src/prefs_account.c:1974
+#: src/prefs_account.c:1417 src/prefs_account.c:1506 src/prefs_account.c:1966
 #: src/prefs_customheader.c:237
 msgid "Bro_wse"
 msgstr "Durchsuchen"
 
-#: src/prefs_account.c:1432
+#: src/prefs_account.c:1428
 msgid "Use secure authentication (APOP)"
 msgstr "Sichere Authentifizierung verwenden (APOP)"
 
-#: src/prefs_account.c:1435
+#: src/prefs_account.c:1431
 msgid "Remove messages on server when received"
-msgstr "Nachrichten nach Erhalt vom Server löschen"
+msgstr "Nachrichten nach Empfang vom Server löschen"
 
-#: src/prefs_account.c:1446
+#: src/prefs_account.c:1442
 msgid "Remove after"
 msgstr "Löschen nach"
 
-#: src/prefs_account.c:1453 src/prefs_account.c:1463
+#: src/prefs_account.c:1449 src/prefs_account.c:1459
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 Tage und 0 Stunden: Sofort löschen"
 
-#: src/prefs_account.c:1466 src/prefs_matcher.c:333
+#: src/prefs_account.c:1462 src/prefs_matcher.c:333
 msgid "hours"
 msgstr "Stunden"
 
-#: src/prefs_account.c:1476
+#: src/prefs_account.c:1472
 msgid "Receive size limit"
 msgstr "Größenbeschränkung beim Empfangen"
 
-#: src/prefs_account.c:1479
+#: src/prefs_account.c:1475
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgstr ""
-"Nachrichten über dieser Grenze werden teilweise geladen. Wenn Sie sie "
+"Nachrichten über diesem Limit werden teilweise abgerufen. Wenn Sie sie "
 "auswählen, können sie vollständig heruntergeladen oder gelöscht werden."
 
-#: src/prefs_account.c:1519 src/prefs_account.c:2446
+#: src/prefs_account.c:1515 src/prefs_account.c:2438
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1526
+#: src/prefs_account.c:1522
 msgid "Maximum number of articles to download"
 msgstr "Höchstzahl herunterzuladender Artikel"
 
-#: src/prefs_account.c:1536
+#: src/prefs_account.c:1532
 msgid "unlimited if 0 is specified"
 msgstr "unbegrenzt, wenn 0 angegeben"
 
-#: src/prefs_account.c:1549 src/prefs_account.c:1742
+#: src/prefs_account.c:1545 src/prefs_account.c:1738
 msgid "Authentication method"
 msgstr "Authentifizierungsverfahren"
 
-#: src/prefs_account.c:1559 src/prefs_account.c:1751 src/prefs_send.c:286
+#: src/prefs_account.c:1555 src/prefs_account.c:1747 src/prefs_send.c:290
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/prefs_account.c:1571
+#: src/prefs_account.c:1567
 msgid "IMAP server directory"
 msgstr "IMAP Serververzeichnis"
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1571
 msgid "(usually empty)"
 msgstr "(gewöhnlich leer)"
 
-#: src/prefs_account.c:1589
+#: src/prefs_account.c:1585
 msgid "Show subscribed folders only"
 msgstr "Nur abonnierte Ordner anzeigen"
 
-#: src/prefs_account.c:1596
+#: src/prefs_account.c:1592
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Bandbreiteneffizienter Modus (lädt keine ferngelegenen Marken)"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1594
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Dieser Modus nutzt weniger Bandbreite, kann aber bei manchen Servern "
 "langsamer sein."
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1601
 msgid "Filter messages on receiving"
 msgstr "Nachrichten bei Empfang filtern"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1608
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filtern über Plugins bei Empfang möglich"
 
-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1612
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Abrufen' überprüft dieses Konto auf neue Nachrichten"
 
-#: src/prefs_account.c:1697 src/prefs_customheader.c:209
-#: src/prefs_matcher.c:620 src/prefs_matcher.c:1952 src/prefs_matcher.c:1974
+#: src/prefs_account.c:1693 src/prefs_customheader.c:209
+#: src/prefs_matcher.c:620 src/prefs_matcher.c:1958 src/prefs_matcher.c:1980
 msgid "Header"
 msgstr "Kopfzeile"
 
-#: src/prefs_account.c:1699
+#: src/prefs_account.c:1695
 msgid "Generate Message-ID"
 msgstr "Message-ID erzeugen"
 
-#: src/prefs_account.c:1702
+#: src/prefs_account.c:1698
 msgid "Send account mail address in Message-ID"
 msgstr "Mailadresse des Kontos in Message-ID senden"
 
-#: src/prefs_account.c:1705
+#: src/prefs_account.c:1701
 msgid "Generate X-Mailer header"
 msgstr "Kopfzeile für X-Mailer erzeugen"
 
-#: src/prefs_account.c:1712
+#: src/prefs_account.c:1708
 msgid "Add user-defined header"
 msgstr "Nutzerdefinierte Kopfzeile einfügen"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1723
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Authentifizierung (SMTP AUTH)"
 
-#: src/prefs_account.c:1816
+#: src/prefs_account.c:1808
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
-"Wenn diese Felder leer bleiben, werden gleiche User-ID und gleiches Kennwort "
-"wie für Empfang verwendet."
+"Wenn diese Felder leer bleiben, werden die selbe User-ID und das selbe "
+"Kennwort wie beim Empfang verwendet."
 
-#: src/prefs_account.c:1827
+#: src/prefs_account.c:1819
 msgid "Authenticate with POP3 before sending"
 msgstr "Vor dem Senden mit POP3 authentifizieren"
 
-#: src/prefs_account.c:1842
+#: src/prefs_account.c:1834
 msgid "POP authentication timeout: "
 msgstr "Zeitlimit für POP-Authentifizierung:"
 
-#: src/prefs_account.c:1850
+#: src/prefs_account.c:1842
 msgid "minutes"
 msgstr "Minuten"
 
-#: src/prefs_account.c:1920 src/prefs_account.c:1966
+#: src/prefs_account.c:1912 src/prefs_account.c:1958
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/prefs_account.c:1923
+#: src/prefs_account.c:1915
 msgid "Automatically insert signature"
 msgstr "Signatur automatisch einfügen"
 
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1920
 msgid "Signature separator"
 msgstr "Signatur-Trenner"
 
-#: src/prefs_account.c:1953
+#: src/prefs_account.c:1945
 msgid "Command output"
 msgstr "Befehlsausgabe"
 
-#: src/prefs_account.c:1986
+#: src/prefs_account.c:1978
 msgid "Automatically set the following addresses"
 msgstr "Automatisch folgende Adressen eintragen"
 
-#: src/prefs_account.c:2038
+#: src/prefs_account.c:2030
 msgid "Spell check dictionaries"
 msgstr "Wörterbücher für Rechtschreibung"
 
-#: src/prefs_account.c:2048 src/prefs_folder_item.c:1094
+#: src/prefs_account.c:2040 src/prefs_folder_item.c:1094
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Standard-Wörterbuch"
 
-#: src/prefs_account.c:2061 src/prefs_folder_item.c:1128
+#: src/prefs_account.c:2053 src/prefs_folder_item.c:1128
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Alternatives Standard-Wörterbuch"
 
-#: src/prefs_account.c:2147 src/prefs_account.c:3263
+#: src/prefs_account.c:2139 src/prefs_account.c:3255
 #: src/prefs_compose_writing.c:350 src/prefs_folder_item.c:1443
 #: src/prefs_folder_item.c:1834 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/prefs_account.c:2162 src/prefs_folder_item.c:1471 src/prefs_quote.c:134
-#: src/toolbar.c:407
+#: src/prefs_account.c:2154 src/prefs_folder_item.c:1471 src/prefs_quote.c:134
+#: src/toolbar.c:408
 msgid "Reply"
 msgstr "Antwort"
 
-#: src/prefs_account.c:2177 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1499 src/prefs_quote.c:149 src/toolbar.c:411
+#: src/prefs_account.c:2169 src/prefs_filtering_action.c:191
+#: src/prefs_folder_item.c:1499 src/prefs_quote.c:149 src/toolbar.c:412
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: src/prefs_account.c:2224
+#: src/prefs_account.c:2216
 msgid "Default privacy system"
 msgstr "Standard-Datenschutzssystem"
 
-#: src/prefs_account.c:2253
+#: src/prefs_account.c:2245
 msgid "Always sign messages"
 msgstr "Nachrichten immer signieren"
 
-#: src/prefs_account.c:2255
+#: src/prefs_account.c:2247
 msgid "Always encrypt messages"
 msgstr "Nachrichten immer verschlüsseln"
 
-#: src/prefs_account.c:2257
+#: src/prefs_account.c:2249
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
 "Nachrichten stets signieren, wenn eine signierte Nachricht beantwortet wird"
 
-#: src/prefs_account.c:2260
+#: src/prefs_account.c:2252
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 "Nachrichten stets verschlüsseln, wenn eine verschlüsselte Nachricht "
 "beantwortet wird"
 
-#: src/prefs_account.c:2263
+#: src/prefs_account.c:2255
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Nachrichten zusätzlich zum fremden mit eigenem Schlüssel chiffrieren"
 
-#: src/prefs_account.c:2265
+#: src/prefs_account.c:2257
 msgid "Save sent encrypted messages as clear text"
 msgstr "Verschlüsselt versandte Nachrichten im Klartext speichern"
 
-#: src/prefs_account.c:2420 src/prefs_account.c:2435 src/prefs_account.c:2449
+#: src/prefs_account.c:2412 src/prefs_account.c:2427 src/prefs_account.c:2441
 msgid "Don't use SSL"
 msgstr "Kein SSL verwenden"
 
-#: src/prefs_account.c:2423
+#: src/prefs_account.c:2415
 msgid "Use SSL for POP3 connection"
 msgstr "SSL für POP3-Verbindung verwenden"
 
-#: src/prefs_account.c:2426 src/prefs_account.c:2441 src/prefs_account.c:2472
+#: src/prefs_account.c:2418 src/prefs_account.c:2433 src/prefs_account.c:2464
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Mittels STARTTLS-Befehl eine SSL-Sitzung einleiten"
 
-#: src/prefs_account.c:2438
+#: src/prefs_account.c:2430
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL für IMAP-Verbindung verwenden"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2450
 msgid "Use SSL for NNTP connection"
 msgstr "SSL für NNTP-Verbindung verwenden"
 
-#: src/prefs_account.c:2462
+#: src/prefs_account.c:2454
 msgid "Send (SMTP)"
 msgstr "Senden (SMTP)"
 
-#: src/prefs_account.c:2466
+#: src/prefs_account.c:2458
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Kein SSL verwenden (aber nötigenfalls STARTTLS)"
 
-#: src/prefs_account.c:2469
+#: src/prefs_account.c:2461
 msgid "Use SSL for SMTP connection"
 msgstr "SSL für SMTP-Verbindung verwenden"
 
-#: src/prefs_account.c:2477
+#: src/prefs_account.c:2469
 msgid "Client certificates"
 msgstr "Benutzerzertifikate"
 
-#: src/prefs_account.c:2485
+#: src/prefs_account.c:2477
 msgid "Certificate for receiving"
 msgstr "Zertifikat zum Empfangen"
 
-#: src/prefs_account.c:2490 src/prefs_account.c:2492 src/prefs_account.c:2512
-#: src/prefs_account.c:2514
+#: src/prefs_account.c:2482 src/prefs_account.c:2484 src/prefs_account.c:2504
+#: src/prefs_account.c:2506
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Benutzerzertifikat als PKCS12 oder PEM-Datei"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2499
 msgid "Certificate for sending"
 msgstr "Zertifikat zum Senden"
 
-#: src/prefs_account.c:2540
+#: src/prefs_account.c:2532
 msgid "Use non-blocking SSL"
 msgstr "Nicht-blockierendes SSL verwenden"
 
-#: src/prefs_account.c:2552
+#: src/prefs_account.c:2544
 msgid "Turn this off if you have SSL connection problems"
-msgstr "Diese Option bei SSL-Verbindungsproblemen dektivieren."
+msgstr "Diese Option bei SSL-Verbindungsproblemen deaktivieren."
 
-#: src/prefs_account.c:2668
+#: src/prefs_account.c:2660
 msgid "SMTP port"
 msgstr "SMTP-Port"
 
-#: src/prefs_account.c:2675
+#: src/prefs_account.c:2667
 msgid "POP3 port"
 msgstr "POP3-Port"
 
-#: src/prefs_account.c:2682
+#: src/prefs_account.c:2674
 msgid "IMAP4 port"
 msgstr "IMAP-Port"
 
-#: src/prefs_account.c:2689
+#: src/prefs_account.c:2681
 msgid "NNTP port"
 msgstr "NNTP-Port"
 
-#: src/prefs_account.c:2695
+#: src/prefs_account.c:2687
 msgid "Domain name"
 msgstr "Domain-Name"
 
-#: src/prefs_account.c:2698
+#: src/prefs_account.c:2690
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -13546,15 +13646,15 @@ msgstr ""
 "Der Domain-Name wird in der erzeugten Message-ID und beim Verbinden mit SMTP-"
 "Servern verwendet"
 
-#: src/prefs_account.c:2712
+#: src/prefs_account.c:2704
 msgid "Use command to communicate with server"
 msgstr "Befehl zur Kommunikation mit dem Server verwenden"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2712
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Gelöschte Mails in den Papierkorb schieben und sofort löschen."
 
-#: src/prefs_account.c:2722
+#: src/prefs_account.c:2714
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -13562,75 +13662,75 @@ msgstr ""
 "Verschiebt gelöschte Mails in den Papierkorb, statt die \\Gelöscht-Merker zu "
 "setzen, ohne zu löschen."
 
-#: src/prefs_account.c:2726
+#: src/prefs_account.c:2718
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Crosspostings als gelesen und farblich markieren:"
 
-#: src/prefs_account.c:2782
+#: src/prefs_account.c:2774
 msgid "Put sent messages in"
 msgstr "Gesendete Nachrichten ablegen in"
 
-#: src/prefs_account.c:2784
+#: src/prefs_account.c:2776
 msgid "Put queued messages in"
 msgstr "Nachrichten vorspeichern in"
 
-#: src/prefs_account.c:2786
+#: src/prefs_account.c:2778
 msgid "Put draft messages in"
 msgstr "Entwürfe ablegen in"
 
-#: src/prefs_account.c:2788
+#: src/prefs_account.c:2780
 msgid "Put deleted messages in"
 msgstr "Gelöschte Nachrichten ablegen in"
 
-#: src/prefs_account.c:2846
+#: src/prefs_account.c:2838
 msgid "Account name is not entered."
 msgstr "Kein Kontoname eingetragen."
 
-#: src/prefs_account.c:2850
+#: src/prefs_account.c:2842
 msgid "Mail address is not entered."
 msgstr "Keine E-Mail-Adresse eingetragen."
 
-#: src/prefs_account.c:2857
+#: src/prefs_account.c:2849
 msgid "SMTP server is not entered."
 msgstr "Kein SMTP-Server angegeben."
 
-#: src/prefs_account.c:2862
+#: src/prefs_account.c:2854
 msgid "User ID is not entered."
 msgstr "Keine Benutzer-ID eingetragen."
 
-#: src/prefs_account.c:2867
+#: src/prefs_account.c:2859
 msgid "POP3 server is not entered."
 msgstr "Kein POP3-Server eingetragen."
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2879
 msgid "The default Inbox folder doesn't exist."
 msgstr "Der Standard-Eingangsordner existiert nicht."
 
-#: src/prefs_account.c:2893
+#: src/prefs_account.c:2885
 msgid "IMAP4 server is not entered."
 msgstr "Kein IMAP4-Server angegeben."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2890
 msgid "NNTP server is not entered."
 msgstr "Kein NNTP-Server eingetragen."
 
-#: src/prefs_account.c:2904
+#: src/prefs_account.c:2896
 msgid "local mailbox filename is not entered."
 msgstr "Name der lokalen Mailbox-Datei fehlt."
 
-#: src/prefs_account.c:2910
+#: src/prefs_account.c:2902
 msgid "mail command is not entered."
 msgstr "Kein Mail-Befehl eingetragen."
 
-#: src/prefs_account.c:3227
+#: src/prefs_account.c:3219
 msgid "Receive"
 msgstr "Empfangen"
 
-#: src/prefs_account.c:3281 src/prefs_folder_item.c:1850 src/prefs_quote.c:238
+#: src/prefs_account.c:3273 src/prefs_folder_item.c:1850 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: src/prefs_account.c:3299
+#: src/prefs_account.c:3291
 msgid "Privacy"
 msgstr "Datenschutz"
 
@@ -13647,19 +13747,19 @@ msgstr "Einstellungen für neues Konto"
 msgid "%s - Account preferences"
 msgstr "%s - Kontoeinstellungen"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3794
 msgid "Select signature file"
 msgstr "Signatur-Datei auswählen"
 
-#: src/prefs_account.c:3813 src/prefs_account.c:3830 src/wizard.c:1237
+#: src/prefs_account.c:3812 src/prefs_account.c:3829 src/wizard.c:1053
 msgid "Select certificate file"
 msgstr "Zertifikat auswählen"
 
-#: src/prefs_account.c:3926
+#: src/prefs_account.c:3925
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/prefs_account.c:4066
+#: src/prefs_account.c:4065
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (Plugin nicht geladen)"
@@ -13688,72 +13788,72 @@ msgstr "Aktion bearbeiten"
 msgid "Append the new action above to the list"
 msgstr "Obige neue Aktion zur Liste hinzufügen"
 
-#: src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:768 src/prefs_template.c:309
-#: src/prefs_toolbar.c:1043
-msgid "Replace"
-msgstr "Ersetzen"
-
 #: src/prefs_actions.c:335
 msgid "Replace the selected action in list with the action above"
 msgstr "In der Liste markierte Aktion durch Obige ersetzen"
 
-#: src/prefs_actions.c:343
+#: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:778 src/prefs_template.c:318
+#: src/prefs_toolbar.c:1056
+msgid "Re_move"
+msgstr "Entfernen"
+
+#: src/prefs_actions.c:345
 msgid "Delete the selected action from the list"
 msgstr "Markierte Aktion aus der Liste löschen"
 
-#: src/prefs_actions.c:351 src/prefs_filtering.c:500 src/prefs_template.c:332
+#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:336
 msgid "Clear all the input fields in the dialog"
 msgstr "Alle Dialog-Eingabefelder löschen"
 
-#: src/prefs_actions.c:359
+#: src/prefs_actions.c:363
 msgid "Show information on configuring actions"
 msgstr "Informationen zum Konfigurieren von Aktionen"
 
-#: src/prefs_actions.c:390
+#: src/prefs_actions.c:394
 msgid "Move the selected action up"
 msgstr "Markierte Aktion aufwärts bewegen"
 
-#: src/prefs_actions.c:398
+#: src/prefs_actions.c:402
 msgid "Move selected action down"
 msgstr "Markierte Aktion abwärts bewegen"
 
-#: src/prefs_actions.c:531 src/prefs_filtering_action.c:702
-#: src/prefs_filtering.c:833 src/prefs_filtering.c:835
-#: src/prefs_filtering.c:836 src/prefs_filtering.c:946 src/prefs_matcher.c:891
-#: src/prefs_template.c:465
+#: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
+#: src/prefs_filtering.c:836 src/prefs_filtering.c:838
+#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:897
+#: src/prefs_template.c:469
 msgid "(New)"
 msgstr "(Neu)"
 
-#: src/prefs_actions.c:596
+#: src/prefs_actions.c:600
 msgid "Menu name is not set."
 msgstr "Menüname nicht gesetzt."
 
-#: src/prefs_actions.c:601
+#: src/prefs_actions.c:605
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "Der Name des Menüs darf nicht mit '/' beginnen"
 
-#: src/prefs_actions.c:606
+#: src/prefs_actions.c:610
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Doppelpunkt ':' ist in Menünamen nicht erlaubt."
 
-#: src/prefs_actions.c:612
+#: src/prefs_actions.c:616
 msgid "There is an action with this name already."
 msgstr "Eine Aktion mit diesem Name existiert bereits."
 
-#: src/prefs_actions.c:631
+#: src/prefs_actions.c:635
 msgid "Menu name is too long."
 msgstr "Menüname ist zu lang."
 
-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:644
 msgid "Command-line not set."
 msgstr "Befehlszeile nicht gesetzt."
 
-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:649
 msgid "Menu name and command are too long."
 msgstr "Menüname und Befehl sind zu lang."
 
-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:655
 #, c-format
 msgid ""
 "The command\n"
@@ -13764,140 +13864,141 @@ msgstr ""
 "%s\n"
 "hat einen Syntaxfehler."
 
-#: src/prefs_actions.c:709
+#: src/prefs_actions.c:713
 msgid "Delete action"
 msgstr "Aktion entfernen"
 
-#: src/prefs_actions.c:710
+#: src/prefs_actions.c:714
 msgid "Do you really want to delete this action?"
 msgstr "Soll diese Aktion wirklich entfernt werden?"
 
-#: src/prefs_actions.c:730
+#: src/prefs_actions.c:734
 msgid "Delete all actions"
 msgstr "Alle Aktionen entfernen"
 
-#: src/prefs_actions.c:731
+#: src/prefs_actions.c:735
 msgid "Do you really want to delete all the actions?"
 msgstr "Möchten Sie wirklich alle Aktionen entfernen?"
 
-#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1496
-#: src/prefs_filtering.c:1518 src/prefs_matcher.c:2103
-#: src/prefs_template.c:565 src/prefs_template.c:590
+#: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1499
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2109
+#: src/prefs_template.c:569 src/prefs_template.c:594
 msgid "Entry not saved"
 msgstr "Eintrag nicht gespeichert"
 
-#: src/prefs_actions.c:895 src/prefs_actions.c:926 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_template.c:566
-#: src/prefs_template.c:591
+#: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1522 src/prefs_template.c:570
+#: src/prefs_template.c:595
 msgid "The entry was not saved. Close anyway?"
 msgstr "Der Eintrag wurde nicht gespeichert. Trotzdem schließen?"
 
-#: src/prefs_actions.c:896 src/prefs_actions.c:901 src/prefs_actions.c:927
-#: src/prefs_filtering.c:1476 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_matcher.c:2105
-#: src/prefs_template.c:567 src/prefs_template.c:592 src/prefs_template.c:597
+#: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
+#: src/prefs_filtering.c:1479 src/prefs_filtering.c:1501
+#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2111
+#: src/prefs_template.c:571 src/prefs_template.c:596 src/prefs_template.c:601
 msgid "+_Continue editing"
 msgstr "+Mit dem Editieren fortfahren"
 
-#: src/prefs_actions.c:899
+#: src/prefs_actions.c:903
 msgid "Actions list not saved"
 msgstr "Aktionsliste nicht gespeichert"
 
-#: src/prefs_actions.c:900
+#: src/prefs_actions.c:904
 msgid "The actions list has been modified. Close anyway?"
 msgstr "Die Aktionsliste wurde geändert. Trotzdem schließen?"
 
-#: src/prefs_actions.c:970
+#: src/prefs_actions.c:974
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Menüname:</span>"
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:975
 msgid "Use / in menu name to make submenus."
 msgstr "Ein '/' im Menünamen erzeugt Untermenüs."
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:977
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Befehlszeile:</span>"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:978
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Beginnt mit:</span>"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:979
 msgid "to send message body or selection to command's standard input"
-msgstr "um Textkörper oder Auswahl zur Standardeingabe des Befehls zu leiten"
+msgstr ""
+"um Nachrichtenkörper oder Auswahl zur Standardeingabe des Befehls zu leiten"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:980
 msgid "to send user provided text to command's standard input"
 msgstr "um Texteingabe des Benutzers zur Standardeingabe des Befehls zu leiten"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:981
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "um verborgene Texteingabe des Benutzers zur Standardeingabe des Befehls zu "
 "leiten"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:982
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Endet mit:</span>"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:983
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "um Nachrichtentext oder Auswahl durch die Standardausgabe des Befehls zu "
 "ersetzen"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:984
 msgid "to insert command's standard output without replacing old text"
 msgstr ""
 "um die Standardausgabe des Befehls einzufügen, ohne alten Text zu ersetzen"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:985
 msgid "to run command asynchronously"
 msgstr "um den Befehl asynchron auszuführen"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:986
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Verwende:</span>"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:987
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "für die Datei der gewählten Nachricht im RFC822/2822-Format "
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:988
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "für die Dateiliste der ausgewählten Nachrichten im RFC822/2822-Format"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:989
 msgid "for the file of the selected decoded message MIME part"
 msgstr "für die Datei des ausgewählten dekodierten MIME-Teils"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:990
 msgid "for a user provided argument"
 msgstr "für ein vom Benutzer angegebenes Argument"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:991
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "für ein vom Benutzer eingegebenes verstecktes Argument (z.B. Kennwort)"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:992
 msgid "for the text selection"
 msgstr "für den ausgewählten Text"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:993
 msgid "apply filtering actions between {} to selected messages"
 msgstr "Filteraktionen zwischen {} auf gewählte Nachrichten anwenden"
 
-#: src/prefs_actions.c:990
+#: src/prefs_actions.c:994
 msgid "for a literal %"
 msgstr "Symbol für %"
 
-#: src/prefs_actions.c:1000 src/prefs_themes.c:959
+#: src/prefs_actions.c:1004 src/prefs_themes.c:959
 msgid "Actions"
 msgstr "Aktionen"
 
-#: src/prefs_actions.c:1001
+#: src/prefs_actions.c:1005
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
@@ -13905,29 +14006,29 @@ msgstr ""
 "Über Aktionen hat der Benutzer die Möglichkeit, externe Befehle auszuführen, "
 "die eine Nachricht ganz oder teilweise bearbeiten."
 
-#: src/prefs_actions.c:1088 src/prefs_filtering.c:1694
-#: src/prefs_template.c:1097
+#: src/prefs_actions.c:1092 src/prefs_filtering.c:1697
+#: src/prefs_template.c:1101
 msgid "D_uplicate"
 msgstr "d_uplizieren"
 
-#: src/prefs_actions.c:1215
+#: src/prefs_actions.c:1212
 msgid "Current actions"
 msgstr "Aktuelle Aktionen"
 
-#: src/prefs_actions.c:1314 src/prefs_filtering.c:1071
-#: src/prefs_filtering.c:1129
+#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074
+#: src/prefs_filtering.c:1132
 msgid "Action string is not valid."
 msgstr "Zeichenfolge der Aktion ist ungültig."
 
-#: src/prefs_common.c:230 src/prefs_quote.c:69
+#: src/prefs_common.c:220 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hallo,\\n"
 
-#: src/prefs_common.c:304
+#: src/prefs_common.c:294
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "Am %d\\nschrieb %f:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:310 src/prefs_quote.c:85
+#: src/prefs_common.c:300 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -13936,7 +14037,7 @@ msgstr ""
 "\\n}?t{An: %t\\n}?c{Cc: %c\\n}?n{Newsgruppen: %n\\n}?s{Betreff: %s\\n}\\n\\n"
 "%M"
 
-#: src/prefs_common.c:450
+#: src/prefs_common.c:440
 msgid "%x(%a) %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M"
 
@@ -14016,11 +14117,11 @@ msgstr "Wenn Dateien ins Editor-Fenster gezogen wurden"
 msgid "Ask"
 msgstr "Nachfragen"
 
-#: src/prefs_compose_writing.c:230 src/toolbar.c:425
+#: src/prefs_compose_writing.c:230 src/toolbar.c:426
 msgid "Insert"
 msgstr "Einfügen"
 
-#: src/prefs_compose_writing.c:231 src/toolbar.c:426
+#: src/prefs_compose_writing.c:231 src/toolbar.c:427
 msgid "Attach"
 msgstr "Anhängen"
 
@@ -14033,7 +14134,7 @@ msgid "Custom header configuration"
 msgstr "Einrichtung nutzerdefinierter Kopfzeilen"
 
 #: src/prefs_customheader.c:507 src/prefs_display_header.c:599
-#: src/prefs_matcher.c:1577 src/prefs_matcher.c:1592
+#: src/prefs_matcher.c:1583 src/prefs_matcher.c:1598
 msgid "Header name is not set."
 msgstr "Kopfzeilenname ist nicht gesetzt."
 
@@ -14075,7 +14176,8 @@ msgstr "Das Bild ist nicht im richtigen Format (XBM)."
 
 #: src/prefs_customheader.c:615
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
-msgstr "konnte `compface` nicht aufrufen. Es muß sich in Ihrem $PATH befinden."
+msgstr ""
+"konnte `compface` nicht aufrufen. Es muss sich in Ihrem $PATH befinden."
 
 #: src/prefs_customheader.c:621
 #, c-format
@@ -14131,19 +14233,19 @@ msgstr "%s wird ersetzt durch Dateinamen / URI"
 msgid "Use system defaults when possible"
 msgstr "Benutze Systemvorgaben, wenn möglich"
 
-#: src/prefs_ext_prog.c:146
+#: src/prefs_ext_prog.c:141
 msgid "Web browser"
 msgstr "Webbrowser"
 
-#: src/prefs_ext_prog.c:180
+#: src/prefs_ext_prog.c:169
 msgid "Text editor"
 msgstr "Texteditor"
 
-#: src/prefs_ext_prog.c:208
+#: src/prefs_ext_prog.c:197
 msgid "Command for 'Display as text'"
 msgstr "Befehl für 'Darstellen als Text'"
 
-#: src/prefs_ext_prog.c:221
+#: src/prefs_ext_prog.c:210
 msgid ""
 "This option enables MIME parts to be displayed in the message view via a "
 "script when using the 'Display as text' contextual menu item"
@@ -14151,12 +14253,12 @@ msgstr ""
 "Diese Option erlaubt, MIME Teile mit einem Script anzuzeigen, wenn 'Anzeigen "
 "als Text' in der Nachrichtenansicht gewählt wird."
 
-#: src/prefs_ext_prog.c:280 src/prefs_image_viewer.c:138
+#: src/prefs_ext_prog.c:269 src/prefs_image_viewer.c:138
 #: src/prefs_message.c:354
 msgid "Message View"
 msgstr "Nachrichtenansicht"
 
-#: src/prefs_ext_prog.c:281
+#: src/prefs_ext_prog.c:270
 msgid "External Programs"
 msgstr "Externe Programme"
 
@@ -14200,8 +14302,8 @@ msgstr "Als _Spam markieren"
 msgid "Mark as ham"
 msgstr "Als N_icht-Spam markieren"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1436
-#: src/toolbar.c:204 src/toolbar.c:435 src/toolbar.c:2106
+#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1438
+#: src/toolbar.c:205 src/toolbar.c:436 src/toolbar.c:2107
 msgid "Execute"
 msgstr "Ausführen"
 
@@ -14219,7 +14321,7 @@ msgid "Redirect"
 msgstr "Umleiten"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1440 src/prefs_matcher.c:626
+#: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:626
 #: src/prefs_summary_column.c:87 src/summaryview.c:449
 msgid "Score"
 msgstr "Bewertung"
@@ -14262,7 +14364,7 @@ msgstr "Filtern beenden"
 msgid "Action configuration"
 msgstr "Aktionskonfiguration"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1892
+#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1888
 #: src/prefs_matcher.c:583
 msgid "Rule"
 msgstr "Regel"
@@ -14271,92 +14373,92 @@ msgstr "Regel"
 msgid "Action"
 msgstr "Aktion"
 
-#: src/prefs_filtering_action.c:933
+#: src/prefs_filtering_action.c:935
 msgid "Command-line not set"
 msgstr "Befehlszeile nicht gesetzt"
 
-#: src/prefs_filtering_action.c:934
+#: src/prefs_filtering_action.c:936
 msgid "Destination is not set."
 msgstr "Ziel nicht gesetzt."
 
-#: src/prefs_filtering_action.c:945
+#: src/prefs_filtering_action.c:947
 msgid "Recipient is not set."
 msgstr "Empfänger nicht gesetzt."
 
-#: src/prefs_filtering_action.c:963
+#: src/prefs_filtering_action.c:965
 msgid "Score is not set"
 msgstr "Bewertung nicht gesetzt"
 
 # Bei Gelegenheit nochmal überprüfen. in NL ist auch "Name" im übersetzten String...
-#: src/prefs_filtering_action.c:971
+#: src/prefs_filtering_action.c:973
 msgid "Header is not set."
 msgstr "Kopfzeilenname ist nicht gesetzt."
 
-#: src/prefs_filtering_action.c:978
+#: src/prefs_filtering_action.c:980
 msgid "Target addressbook/folder is not set."
 msgstr "Zieladressbuch/-ordner ist nicht gesetzt."
 
-#: src/prefs_filtering_action.c:992
+#: src/prefs_filtering_action.c:994
 msgid "Tag name is empty."
 msgstr "Name der Marke ist leer."
 
-#: src/prefs_filtering_action.c:1214
+#: src/prefs_filtering_action.c:1216
 msgid "No action was defined."
 msgstr "Keine Aktion definiert."
 
-#: src/prefs_filtering_action.c:1252 src/prefs_matcher.c:2147
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2153
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "Symbol für %"
 
-#: src/prefs_filtering_action.c:1261 src/prefs_matcher.c:2156
+#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2162
 msgid "filename (should not be modified)"
 msgstr "Dateiname (sollte nicht geändert werden)"
 
-#: src/prefs_filtering_action.c:1262 src/prefs_matcher.c:2157
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2163
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "neue Zeile"
 
-#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2158
+#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2164
 msgid "escape character for quotes"
 msgstr "Escape-Zeichen für Zitate"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2159
+#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2165
 msgid "quote character"
 msgstr "Zitatzeichen"
 
-#: src/prefs_filtering_action.c:1273
+#: src/prefs_filtering_action.c:1275
 msgid "Filtering Action: 'Execute'"
 msgstr "Filteraktion: 'Ausführen'"
 
-#: src/prefs_filtering_action.c:1274
+#: src/prefs_filtering_action.c:1276
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
 "The following symbols can be used:"
 msgstr ""
-"'Ausführen' ermöglich Ihnen, eine Nachricht oder einen Teil davon an ein "
+"'Ausführen' ermöglicht Ihnen, eine Nachricht oder einen Teil davon an ein "
 "externes Programm oder Skript zu senden.\n"
 "Folgende Symbole können verwendet werden:"
 
-#: src/prefs_filtering_action.c:1420
+#: src/prefs_filtering_action.c:1422
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: src/prefs_filtering_action.c:1424
+#: src/prefs_filtering_action.c:1426
 msgid "Book/Folder"
 msgstr "Adressbuch/Ordner"
 
-#: src/prefs_filtering_action.c:1428
+#: src/prefs_filtering_action.c:1430
 msgid "Destination"
 msgstr "Ziel"
 
-#: src/prefs_filtering_action.c:1432
+#: src/prefs_filtering_action.c:1434
 msgid "Color"
 msgstr "Farbe"
 
-#: src/prefs_filtering_action.c:1518
+#: src/prefs_filtering_action.c:1520
 msgid "Current action list"
 msgstr "Aktuelle Aktionsliste"
 
@@ -14364,8 +14466,8 @@ msgstr "Aktuelle Aktionsliste"
 msgid "Filtering/Processing configuration"
 msgstr "Filter-/Verarbeitungseinstellungen"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:864
-#: src/prefs_filtering.c:978
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
+#: src/prefs_filtering.c:981
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Alle"
@@ -14374,8 +14476,12 @@ msgstr "Alle"
 msgid "Condition"
 msgstr "Bedingung"
 
-#: src/prefs_filtering.c:424 src/prefs_filtering.c:446
-msgid " Define... "
+#: src/prefs_filtering.c:424
+msgid " D_efine... "
+msgstr "Definieren..."
+
+#: src/prefs_filtering.c:446
+msgid " De_fine... "
 msgstr "Definieren..."
 
 #: src/prefs_filtering.c:475
@@ -14386,87 +14492,87 @@ msgstr "Obige neue Regel zur Liste hinzufügen"
 msgid "Replace the selected rule in list with the rule above"
 msgstr "In der Liste markierte Regel durch obige Regel ersetzen"
 
-#: src/prefs_filtering.c:492
+#: src/prefs_filtering.c:493
 msgid "Delete the selected rule from the list"
 msgstr "Markierte Regel löschen"
 
-#: src/prefs_filtering.c:529
+#: src/prefs_filtering.c:532
 msgid "Move the selected rule to the top"
 msgstr "Markierte Regel ganz nach oben bewegen"
 
-#: src/prefs_filtering.c:532
-msgid "Page up"
+#: src/prefs_filtering.c:535
+msgid "Page u_p"
 msgstr "Seite aufwärts"
 
-#: src/prefs_filtering.c:540
+#: src/prefs_filtering.c:543
 msgid "Move the selected rule one page up"
 msgstr "Markierte Regel eine Seite nach oben bewegen"
 
-#: src/prefs_filtering.c:549
+#: src/prefs_filtering.c:552
 msgid "Move the selected rule up"
 msgstr "Markierte Regel aufwärts bewegen"
 
-#: src/prefs_filtering.c:557
+#: src/prefs_filtering.c:560
 msgid "Move the selected rule down"
 msgstr "Markierte Regel abwärts bewegen"
 
-#: src/prefs_filtering.c:560
-msgid "Page down"
+#: src/prefs_filtering.c:563
+msgid "Page dow_n"
 msgstr "Seite abwärts"
 
-#: src/prefs_filtering.c:568
+#: src/prefs_filtering.c:571
 msgid "Move the selected rule one page down"
 msgstr "Markierte Regel eine Seite nach unten bewegen"
 
-#: src/prefs_filtering.c:577
+#: src/prefs_filtering.c:580
 msgid "Move the selected rule to the bottom"
 msgstr "Markierte Regel ganz nach unten bewegen"
 
-#: src/prefs_filtering.c:1035 src/prefs_filtering.c:1121
+#: src/prefs_filtering.c:1038 src/prefs_filtering.c:1124
 msgid "Condition string is not valid."
 msgstr "Bedingungszeichenfolge ist nicht gültig."
 
-#: src/prefs_filtering.c:1108
+#: src/prefs_filtering.c:1111
 msgid "Condition string is empty."
 msgstr "Bedingungszeichenfolge ist leer."
 
-#: src/prefs_filtering.c:1114
+#: src/prefs_filtering.c:1117
 msgid "Action string is empty."
 msgstr "Aktionszeichenfolge ist leer."
 
-#: src/prefs_filtering.c:1202
+#: src/prefs_filtering.c:1205
 msgid "Delete rule"
 msgstr "Regel löschen"
 
-#: src/prefs_filtering.c:1203
+#: src/prefs_filtering.c:1206
 msgid "Do you really want to delete this rule?"
 msgstr "Möchten Sie diese Regel wirklich löschen?"
 
-#: src/prefs_filtering.c:1221
+#: src/prefs_filtering.c:1224
 msgid "Delete all rules"
 msgstr "alle Regeln löschen"
 
-#: src/prefs_filtering.c:1222
+#: src/prefs_filtering.c:1225
 msgid "Do you really want to delete all the rules?"
 msgstr "Möchten Sie wirklich alle Regeln löschen?"
 
-#: src/prefs_filtering.c:1474
+#: src/prefs_filtering.c:1477
 msgid "Filtering rules not saved"
 msgstr "Filterregeln nicht gespeichert"
 
-#: src/prefs_filtering.c:1475
+#: src/prefs_filtering.c:1478
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "Die Liste der Filterregeln wurde verändert. Trotzdem schließen?"
 
-#: src/prefs_filtering.c:1697
+#: src/prefs_filtering.c:1700
 msgid "Move one page up"
 msgstr "Um eine Seite nach oben bewegen"
 
-#: src/prefs_filtering.c:1698
+#: src/prefs_filtering.c:1701
 msgid "Move one page down"
 msgstr "Um eine Seite nach unten bewegen"
 
-#: src/prefs_filtering.c:1860
+#: src/prefs_filtering.c:1856
 msgid "Enable"
 msgstr "Aktivieren"
 
@@ -14493,7 +14599,7 @@ msgid "Displayed columns"
 msgstr "Angezeigte Spalten"
 
 #: src/prefs_folder_column.c:329 src/prefs_msg_colors.c:494
-#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1055
+#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1064
 msgid " Use default "
 msgstr " Standard verwenden "
 
@@ -14655,7 +14761,7 @@ msgstr "Einstellungen für Ordner %s"
 msgid "Folder and Message Lists"
 msgstr "Ordner und Nachrichtenlisten"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2024
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2030
 msgid "Message"
 msgstr "Nachricht"
 
@@ -14689,7 +14795,7 @@ msgstr "Anzeige"
 msgid "Fonts"
 msgstr "Schriften"
 
-#: src/prefs_gtk.c:938 src/toolbar.c:212 src/toolbar.c:421
+#: src/prefs_gtk.c:938 src/toolbar.c:213 src/toolbar.c:422
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -14731,7 +14837,7 @@ msgstr "Zeilen"
 
 #: src/prefs_logging.c:171
 msgid "Filtering/processing log"
-msgstr "Filter-/Verarbeitungprotokoll"
+msgstr "Filter-/Verarbeitungsprotokoll"
 
 #: src/prefs_logging.c:174
 msgid "Enable logging of filtering/processing rules"
@@ -14839,7 +14945,7 @@ msgstr "Fehlermeldungen"
 
 #: src/prefs_logging.c:296
 msgid "Status messages for filtering/processing log"
-msgstr "Statusmeldungen für Filter-/Verarbeitungprotokoll"
+msgstr "Statusmeldungen für Filter-/Verarbeitungsprotokoll"
 
 #: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:689
 msgid "Other"
@@ -14913,11 +15019,11 @@ msgstr "Textbereich"
 msgid "whole message"
 msgstr "Ganze Nachricht"
 
-#: src/prefs_matcher.c:389 src/summaryview.c:6302
+#: src/prefs_matcher.c:389 src/summaryview.c:6298
 msgid "Marked"
 msgstr "Markiert"
 
-#: src/prefs_matcher.c:390 src/summaryview.c:6300
+#: src/prefs_matcher.c:390 src/summaryview.c:6296
 msgid "Deleted"
 msgstr "Gelöscht"
 
@@ -14925,12 +15031,12 @@ msgstr "Gelöscht"
 msgid "Replied"
 msgstr "Beantwortet"
 
-#: src/prefs_matcher.c:392 src/summaryview.c:6294
+#: src/prefs_matcher.c:392 src/summaryview.c:6290
 msgid "Forwarded"
 msgstr "Weitergeleitet"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6284 src/toolbar.c:414
-#: src/toolbar.c:950 src/toolbar.c:1996
+#: src/prefs_matcher.c:394 src/summaryview.c:6280 src/toolbar.c:415
+#: src/toolbar.c:951 src/toolbar.c:1997
 msgid "Spam"
 msgstr "Spam"
 
@@ -14938,7 +15044,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Mit Anhang"
 
-#: src/prefs_matcher.c:396 src/summaryview.c:6320
+#: src/prefs_matcher.c:396 src/summaryview.c:6316
 msgid "Signed"
 msgstr "Signiert"
 
@@ -15038,54 +15144,54 @@ msgstr "Teilweise geladen"
 msgid "External program test"
 msgstr "Externer Programmtest"
 
-#: src/prefs_matcher.c:707 src/prefs_matcher.c:1598 src/prefs_matcher.c:1613
-#: src/prefs_matcher.c:2495
+#: src/prefs_matcher.c:707 src/prefs_matcher.c:1604 src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:2501
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Alle"
 
-#: src/prefs_matcher.c:739
+#: src/prefs_matcher.c:741
 msgid "Use regexp"
 msgstr "Regexp verwenden"
 
-#: src/prefs_matcher.c:812
+#: src/prefs_matcher.c:818
 msgid "Message must match"
 msgstr "Nachricht muss auf"
 
-#: src/prefs_matcher.c:816
+#: src/prefs_matcher.c:822
 msgid "at least one"
 msgstr "mindestens eine"
 
-#: src/prefs_matcher.c:817
+#: src/prefs_matcher.c:823
 msgid "all"
 msgstr "alle"
 
-#: src/prefs_matcher.c:820
+#: src/prefs_matcher.c:826
 msgid "of above rules"
 msgstr "der obigen Regeln passen"
 
-#: src/prefs_matcher.c:1516 src/prefs_matcher.c:1582
+#: src/prefs_matcher.c:1522 src/prefs_matcher.c:1588
 msgid "Search pattern is not set."
 msgstr "Suchmuster ist nicht gesetzt."
 
-#: src/prefs_matcher.c:1525
+#: src/prefs_matcher.c:1531
 msgid "Test command is not set."
 msgstr "Test-Befehl ist nicht eingetragen."
 
-#: src/prefs_matcher.c:1599
+#: src/prefs_matcher.c:1605
 msgid "all addresses in all headers"
 msgstr "alle Adressen in allen Kopfzeilen"
 
-#: src/prefs_matcher.c:1602
+#: src/prefs_matcher.c:1608
 msgid "any address in any header"
 msgstr "beliebige Adresse in beliebiger Kopfzeile"
 
-#: src/prefs_matcher.c:1604
+#: src/prefs_matcher.c:1610
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "Die Adresse(n) in der Kopfzeile '%s'"
 
-#: src/prefs_matcher.c:1605
+#: src/prefs_matcher.c:1611
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -15098,82 +15204,82 @@ msgstr ""
 "Wenn %s gegen das gesamte Adressbuch verglichen werden soll, muss '%s' in "
 "der Adressbuch/Ordner Auswahl gewählt werden."
 
-#: src/prefs_matcher.c:1824
+#: src/prefs_matcher.c:1830
 msgid "Headers part"
 msgstr "Kopfbereich"
 
-#: src/prefs_matcher.c:1828
+#: src/prefs_matcher.c:1834
 msgid "Body part"
 msgstr "Textbereich"
 
-#: src/prefs_matcher.c:1832
+#: src/prefs_matcher.c:1838
 msgid "Whole message"
 msgstr "Ganzer Nachricht"
 
-#: src/prefs_matcher.c:1951 src/prefs_matcher.c:1995
+#: src/prefs_matcher.c:1957 src/prefs_matcher.c:2001
 msgid "in"
 msgstr "in"
 
-#: src/prefs_matcher.c:1953
+#: src/prefs_matcher.c:1959
 msgid "content is"
 msgstr "Inhalt wird"
 
 # UI adapted
-#: src/prefs_matcher.c:1962
+#: src/prefs_matcher.c:1968
 msgid "Age is"
 msgstr "Alter von"
 
-#: src/prefs_matcher.c:1967
+#: src/prefs_matcher.c:1973
 msgid "Flag"
 msgstr "Merker"
 
-#: src/prefs_matcher.c:1968 src/prefs_matcher.c:1985
+#: src/prefs_matcher.c:1974 src/prefs_matcher.c:1991
 msgid "is"
 msgstr "ist"
 
-#: src/prefs_matcher.c:1973
+#: src/prefs_matcher.c:1979
 msgid "Name:"
 msgstr "Name:"
 
-#: src/prefs_matcher.c:1984
+#: src/prefs_matcher.c:1990
 msgid "Label"
 msgstr "Farbe"
 
-#: src/prefs_matcher.c:1990
+#: src/prefs_matcher.c:1996
 msgid "Value:"
 msgstr "Wert:"
 
-#: src/prefs_matcher.c:2007
+#: src/prefs_matcher.c:2013
 msgid "Score is"
 msgstr "Bewertung ist"
 
-#: src/prefs_matcher.c:2008
+#: src/prefs_matcher.c:2014
 msgid "points"
 msgstr "Punkte"
 
 # UI adapted
-#: src/prefs_matcher.c:2018
+#: src/prefs_matcher.c:2024
 msgid "Size is"
 msgstr "Nachricht ist"
 
-#: src/prefs_matcher.c:2023
+#: src/prefs_matcher.c:2029
 msgid "Scope:"
 msgstr "Umfang:"
 
-#: src/prefs_matcher.c:2025
+#: src/prefs_matcher.c:2031
 msgid "tags"
 msgstr "Marken"
 
 # UI adapted
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2036
 msgid "type is"
 msgstr "ist vom Typ"
 
-#: src/prefs_matcher.c:2034
+#: src/prefs_matcher.c:2040
 msgid "Program returns"
 msgstr "Rückgabewert"
 
-#: src/prefs_matcher.c:2104
+#: src/prefs_matcher.c:2110
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -15181,11 +15287,11 @@ msgstr ""
 "Der Eintrag wurde nicht gespeichert.\n"
 "Trotzdem schließen?"
 
-#: src/prefs_matcher.c:2168
+#: src/prefs_matcher.c:2174
 msgid "Match Type: 'Test'"
 msgstr "Treffertyp: 'Test'"
 
-#: src/prefs_matcher.c:2169
+#: src/prefs_matcher.c:2175
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -15197,7 +15303,7 @@ msgstr ""
 "\n"
 "Die folgenden Symbole können verwendet werden:"
 
-#: src/prefs_matcher.c:2268
+#: src/prefs_matcher.c:2274
 msgid "Current condition rules"
 msgstr "Aktuelle Bedingungsregeln"
 
@@ -15366,10 +15472,6 @@ msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Farbe für Signaturen wählen"
 
-#: src/prefs_msg_colors.c:362
-msgid "Signatures"
-msgstr "Signaturen"
-
 #: src/prefs_msg_colors.c:367 src/prefs_summaries.c:354
 msgid "Folder list"
 msgstr "Ordnerliste"
@@ -15596,71 +15698,71 @@ msgstr "Vermischtes"
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Am %d\\nschrieb %f:\\n\\n%q"
 
-#: src/prefs_receive.c:137
+#: src/prefs_receive.c:123
 msgid "External incorporation program"
 msgstr "Externes Programm einbinden"
 
-#: src/prefs_receive.c:140
+#: src/prefs_receive.c:126
 msgid "Use external program for receiving mail"
 msgstr "Zum Mail-Empfang externes Programm benutzen"
 
-#: src/prefs_receive.c:156
+#: src/prefs_receive.c:142
 msgid "Automatic checking"
 msgstr "Automatisches Abrufen"
 
-#: src/prefs_receive.c:163
+#: src/prefs_receive.c:149
 msgid "Check for new mail every"
 msgstr "Auf neue Nachrichten prüfen alle"
 
-#: src/prefs_receive.c:181
+#: src/prefs_receive.c:167
 msgid "Check for new mail on start-up"
 msgstr "Beim Programmstart auf neue Nachrichten prüfen"
 
-#: src/prefs_receive.c:184
+#: src/prefs_receive.c:170
 msgid "Dialogs"
 msgstr "Dialoge"
 
-#: src/prefs_receive.c:186
+#: src/prefs_receive.c:172
 msgid "Show receive dialog"
 msgstr "Empfangsdialog anzeigen"
 
-#: src/prefs_receive.c:196
+#: src/prefs_receive.c:182
 msgid "Only on manual receiving"
 msgstr "Nur bei manuellem Empfang"
 
-#: src/prefs_receive.c:207
+#: src/prefs_receive.c:193
 msgid "Close receive dialog when finished"
 msgstr "Wenn fertig, Empfangsdialog schließen"
 
-#: src/prefs_receive.c:210
+#: src/prefs_receive.c:196
 msgid "Don't popup error dialog on receive error"
 msgstr "Kein Popup-Fenster bei Empfangsfehlern"
 
-#: src/prefs_receive.c:213
-msgid "After checking for new mail"
+#: src/prefs_receive.c:199
+msgid "After receiving new mail"
 msgstr "Nach Empfang neuer Nachrichten"
 
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:201
 msgid "Go to Inbox"
 msgstr "Zum Posteingang wechseln"
 
-#: src/prefs_receive.c:217
+#: src/prefs_receive.c:203
 msgid "Update all local folders"
 msgstr "Alle lokalen Ordner aktualisieren"
 
-#: src/prefs_receive.c:220
+#: src/prefs_receive.c:205
 msgid "Run command"
 msgstr "Befehl ausführen"
 
-#: src/prefs_receive.c:225
+#: src/prefs_receive.c:210
 msgid "after automatic check"
 msgstr "nach automatischem Abrufen"
 
-#: src/prefs_receive.c:227
+#: src/prefs_receive.c:212
 msgid "after manual check"
 msgstr "nach manuellem Abrufen"
 
-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:220
 #, c-format
 msgid ""
 "Command to execute:\n"
@@ -15669,47 +15771,39 @@ msgstr ""
 "Auszuführender Befehl:\n"
 "(%d = Anzahl neuer Nachrichten)"
 
-#: src/prefs_receive.c:260
-msgid "Blink LED"
-msgstr "LED blinken"
-
-#: src/prefs_receive.c:261
-msgid "Play sound"
-msgstr "Klang abspielen"
-
-#: src/prefs_receive.c:263
-msgid "Show info banner"
-msgstr "Info-Banner anzeigen"
-
-#: src/prefs_receive.c:397 src/prefs_send.c:348
+#: src/prefs_receive.c:343 src/prefs_send.c:357
 msgid "Mail Handling"
 msgstr "Mail-Handling"
 
-#: src/prefs_receive.c:398
+#: src/prefs_receive.c:344
 msgid "Receiving"
 msgstr "Empfangen"
 
-#: src/prefs_send.c:159
+#: src/prefs_send.c:161
 msgid "Save sent messages to Sent folder"
 msgstr "Gesendete Nachrichten in 'Gesendet' speichern"
 
-#: src/prefs_send.c:162
+#: src/prefs_send.c:164
 msgid "Confirm before sending queued messages"
 msgstr "Bestätigung beim Senden vorgespeicherter Nachrichten"
 
-#: src/prefs_send.c:165
+#: src/prefs_send.c:167
 msgid "Never send Return Receipts"
 msgstr "Nie Empfangsbestätigungen senden"
 
-#: src/prefs_send.c:168
+#: src/prefs_send.c:170
 msgid "Show send dialog"
 msgstr "Sendedialog anzeigen"
 
-#: src/prefs_send.c:176
+#: src/prefs_send.c:172
+msgid "Warn when Subject is empty"
+msgstr "Warne, wenn die Betreff-Zeile leer ist."
+
+#: src/prefs_send.c:180
 msgid "Outgoing encoding"
 msgstr "Ausgehende Zeichenkodierung"
 
-#: src/prefs_send.c:201
+#: src/prefs_send.c:205
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
@@ -15717,140 +15811,140 @@ msgstr ""
 "Wenn 'Automatisch' gewählt ist, wird die beste Kodierung für die aktuell "
 "Lokalisierung verwendet"
 
-#: src/prefs_send.c:216
+#: src/prefs_send.c:220
 msgid "Automatic (Recommended)"
 msgstr "Automatisch (empfohlen)"
 
-#: src/prefs_send.c:218
+#: src/prefs_send.c:222
 msgid "7bit ASCII (US-ASCII)"
 msgstr "7bit ASCII (US-ASCII)"
 
-#: src/prefs_send.c:219
+#: src/prefs_send.c:223
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_send.c:221
+#: src/prefs_send.c:225
 msgid "Western European (ISO-8859-1)"
 msgstr "Westeuropäisch (ISO-8859-1)"
 
-#: src/prefs_send.c:222
+#: src/prefs_send.c:226
 msgid "Western European (ISO-8859-15)"
 msgstr "Westeuropäisch (ISO-8859-15)"
 
-#: src/prefs_send.c:224
+#: src/prefs_send.c:228
 msgid "Central European (ISO-8859-2)"
 msgstr "Mitteleuropäisch (ISO-8859-2)"
 
-#: src/prefs_send.c:226
+#: src/prefs_send.c:230
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
-#: src/prefs_send.c:227
+#: src/prefs_send.c:231
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
-#: src/prefs_send.c:229
+#: src/prefs_send.c:233
 msgid "Greek (ISO-8859-7)"
 msgstr "Griechisch (ISO-8859-7)"
 
-#: src/prefs_send.c:231
+#: src/prefs_send.c:235
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebräisch (ISO-8859-8)"
 
-#: src/prefs_send.c:232
+#: src/prefs_send.c:236
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebräisch (Windows-1255)"
 
-#: src/prefs_send.c:234
+#: src/prefs_send.c:238
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabisch (ISO-8859-6)"
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:239
 msgid "Arabic (Windows-1256)"
 msgstr "Arabisch (Windows-1256)"
 
-#: src/prefs_send.c:237
+#: src/prefs_send.c:241
 msgid "Turkish (ISO-8859-9)"
 msgstr "Türkisch (ISO-8859-9)"
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:243
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kyrillisch (ISO-8859-5)"
 
-#: src/prefs_send.c:240
+#: src/prefs_send.c:244
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kyrillisch (KOI8-R)"
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:245
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kyrillisch (KOI8-U)"
 
-#: src/prefs_send.c:242
+#: src/prefs_send.c:246
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kyrillisch (Windows-1251)"
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:248
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanisch (ISO-2022-JP)"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:250
 msgid "Japanese (EUC-JP)"
 msgstr "Japanisch (EUC-JP)"
 
-#: src/prefs_send.c:247
+#: src/prefs_send.c:251
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanisch (Shift_JIS)"
 
-#: src/prefs_send.c:250
+#: src/prefs_send.c:254
 msgid "Simplified Chinese (GB18030)"
 msgstr "Vereinfachtes Chinesisch (GB18030)"
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:255
 msgid "Simplified Chinese (GB2312)"
 msgstr "Vereinfachtes Chinesisch (GB2312)"
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:256
 msgid "Simplified Chinese (GBK)"
 msgstr "Vereinfachtes Chinesisch (GBK)"
 
-#: src/prefs_send.c:253
+#: src/prefs_send.c:257
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditionelles Chinesisch (Big5)"
 
-#: src/prefs_send.c:255
+#: src/prefs_send.c:259
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditionelles Chinesisch (EUC-TW)"
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:260
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinesisch (ISO-2022-CN)"
 
-#: src/prefs_send.c:259
+#: src/prefs_send.c:263
 msgid "Korean (EUC-KR)"
 msgstr "Koreanisch (EUC-KR)"
 
-#: src/prefs_send.c:261
+#: src/prefs_send.c:265
 msgid "Thai (TIS-620)"
 msgstr "Thailändisch (TIS-620)"
 
-#: src/prefs_send.c:262
+#: src/prefs_send.c:266
 msgid "Thai (Windows-874)"
 msgstr "Thailändisch (Windows-874)"
 
-#: src/prefs_send.c:266
+#: src/prefs_send.c:270
 msgid "Transfer encoding"
 msgstr "Übertragungskodierung"
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:281
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgstr ""
-"Übertragungskodierung auswählen, die verwendet wird, wenn der Textkörper "
-"Nicht-ASCII-Zeichen enthält."
+"Übertragungskodierung auswählen, die verwendet wird, wenn der "
+"Nachrichtenkörper Nicht-ASCII-Zeichen enthält."
 
-#: src/prefs_send.c:349 src/send_message.c:483 src/send_message.c:487
-#: src/send_message.c:492
+#: src/prefs_send.c:358 src/send_message.c:491 src/send_message.c:495
+#: src/send_message.c:500
 msgid "Sending"
 msgstr "Senden"
 
@@ -16182,87 +16276,87 @@ msgstr "Obige neue Vorlage zur Liste hinzufügen"
 msgid "Replace the selected template in list with the template above"
 msgstr "Markierte Vorlage in der Liste durch obige Vorlage ersetzen"
 
-#: src/prefs_template.c:324
+#: src/prefs_template.c:326
 msgid "Delete the selected template from the list"
 msgstr "Markierte Vorlage aus der Liste löschen"
 
-#: src/prefs_template.c:340
+#: src/prefs_template.c:344
 msgid "Show information on configuring templates"
 msgstr "Informationen zum Konfigurieren von Vorlagen"
 
-#: src/prefs_template.c:364
+#: src/prefs_template.c:368
 msgid "Move the selected template to the top"
 msgstr "Markierte Vorlage ganz nach oben bewegen"
 
-#: src/prefs_template.c:374
+#: src/prefs_template.c:378
 msgid "Move the selected template up"
 msgstr "Markierte Vorlage aufwärts bewegen"
 
-#: src/prefs_template.c:382
+#: src/prefs_template.c:386
 msgid "Move the selected template down"
 msgstr "Markierte Vorlage abwärts bewegen"
 
-#: src/prefs_template.c:392
+#: src/prefs_template.c:396
 msgid "Move the selected template to the bottom"
 msgstr "Markierte Vorlage ganz nach unten bewegen"
 
-#: src/prefs_template.c:408
+#: src/prefs_template.c:412
 msgid "Template configuration"
 msgstr "Vorlagenkonfiguration"
 
-#: src/prefs_template.c:595
+#: src/prefs_template.c:599
 msgid "Templates list not saved"
 msgstr "Vorlagenliste nicht gespeichert"
 
-#: src/prefs_template.c:596
+#: src/prefs_template.c:600
 msgid "The templates list has been modified. Close anyway?"
 msgstr "Die Vorlagenliste wurde geändert. Trotzdem schließen?"
 
-#: src/prefs_template.c:757
+#: src/prefs_template.c:761
 msgid "The template's name is not set."
 msgstr "Vorlagenname ist nicht gesetzt."
 
-#: src/prefs_template.c:794
+#: src/prefs_template.c:798
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "Das \"Von\"-Feld der Vorlage enthält eine ungültige E-Mailadresse."
 
-#: src/prefs_template.c:800
+#: src/prefs_template.c:804
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "das \"An\"-Feld der Vorlage enthält eine ungültige E-Mailadresse."
 
-#: src/prefs_template.c:806
+#: src/prefs_template.c:810
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "das \"Cc\"-Feld der Vorlage enthält eine ungültige E-Mailadresse."
 
-#: src/prefs_template.c:812
+#: src/prefs_template.c:816
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "das \"Bcc\"-Feld der Vorlage enthält eine ungültige E-Mailadresse."
 
-#: src/prefs_template.c:818
+#: src/prefs_template.c:822
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "das \"Betreff\"-Feld der Vorlage ist ungültig."
 
-#: src/prefs_template.c:888
+#: src/prefs_template.c:892
 msgid "Delete template"
 msgstr "Vorlage löschen"
 
-#: src/prefs_template.c:889
+#: src/prefs_template.c:893
 msgid "Do you really want to delete this template?"
 msgstr "Möchten Sie diese Vorlage wirklich löschen?"
 
-#: src/prefs_template.c:901
+#: src/prefs_template.c:905
 msgid "Delete all templates"
 msgstr "Alle Vorlagen löschen"
 
-#: src/prefs_template.c:902
+#: src/prefs_template.c:906
 msgid "Do you really want to delete all the templates?"
 msgstr "Möchten Sie wirklich alle Vorlagen löschen?"
 
-#: src/prefs_template.c:1224
+#: src/prefs_template.c:1221
 msgid "Current templates"
 msgstr "Aktuelle Vorlagen"
 
-#: src/prefs_template.c:1252
+#: src/prefs_template.c:1249
 msgid "Template"
 msgstr "Vorlage"
 
@@ -16323,7 +16417,7 @@ msgid ""
 "This folder doesn't seem to be a theme folder.\n"
 "Install anyway?"
 msgstr ""
-"Dieser Ordner scheint kein Theme-Ordner zu sein.\n"
+"Dieser Ordner scheint kein Thema-Ordner zu sein.\n"
 "Trotzdem installieren?"
 
 #: src/prefs_themes.c:530
@@ -16404,6 +16498,10 @@ msgstr "Auswahl"
 msgid "Install new..."
 msgstr "Neu installieren..."
 
+#: src/prefs_themes.c:843
+msgid "Get more..."
+msgstr "Weitere holen..."
+
 #: src/prefs_themes.c:854
 msgid "Information"
 msgstr "Information"
@@ -16440,63 +16538,67 @@ msgstr "Element hat kein Symbol definiert."
 msgid "Item has no text defined."
 msgstr "Element hat keinen Text definiert"
 
-#: src/prefs_toolbar.c:911
+#: src/prefs_toolbar.c:916
 msgid "Toolbar item"
 msgstr "Werkzeugleisten-Element"
 
-#: src/prefs_toolbar.c:927
+#: src/prefs_toolbar.c:932
 msgid "Item type"
 msgstr "Elementart"
 
-#: src/prefs_toolbar.c:937
+#: src/prefs_toolbar.c:942
 msgid "Internal Function"
 msgstr "Interne Funktion"
 
-#: src/prefs_toolbar.c:938
+#: src/prefs_toolbar.c:943
 msgid "User Action"
 msgstr "Benutzer-Funktion"
 
-#: src/prefs_toolbar.c:940 src/toolbar.c:232
+#: src/prefs_toolbar.c:945 src/toolbar.c:233
 msgid "Separator"
 msgstr "Trenner"
 
-#: src/prefs_toolbar.c:947
+#: src/prefs_toolbar.c:952
 msgid "Event executed on click"
 msgstr "Auszuführender Vorgang"
 
-#: src/prefs_toolbar.c:986
+#: src/prefs_toolbar.c:991
 msgid "Toolbar text"
 msgstr "Werkzeugleisten-Text"
 
-#: src/prefs_toolbar.c:1001 src/prefs_toolbar.c:1372
+#: src/prefs_toolbar.c:1006 src/prefs_toolbar.c:1381
 msgid "Icon"
 msgstr "Symbol"
 
-#: src/prefs_toolbar.c:1252 src/prefs_toolbar.c:1266 src/prefs_toolbar.c:1280
+#: src/prefs_toolbar.c:1042
+msgid "A_dd"
+msgstr "Hinzufügen"
+
+#: src/prefs_toolbar.c:1261 src/prefs_toolbar.c:1275 src/prefs_toolbar.c:1289
 msgid "Toolbars"
 msgstr "Werkzeugleisten"
 
-#: src/prefs_toolbar.c:1253
+#: src/prefs_toolbar.c:1262
 msgid "Main Window"
 msgstr "Hauptfenster"
 
-#: src/prefs_toolbar.c:1267
+#: src/prefs_toolbar.c:1276
 msgid "Message Window"
 msgstr "Nachrichtenfenster"
 
-#: src/prefs_toolbar.c:1281
+#: src/prefs_toolbar.c:1290
 msgid "Compose Window"
 msgstr "Editor-Fenster"
 
-#: src/prefs_toolbar.c:1395
+#: src/prefs_toolbar.c:1404
 msgid "Icon text"
 msgstr "Symboltext"
 
-#: src/prefs_toolbar.c:1404
+#: src/prefs_toolbar.c:1413
 msgid "Mapped event"
 msgstr "Abgebildeter Vorgang"
 
-#: src/prefs_toolbar.c:1701
+#: src/prefs_toolbar.c:1710
 msgid "Toolbar item icon"
 msgstr "Symbol für Werkzeugleistenelement"
 
@@ -16565,7 +16667,7 @@ msgstr "Keine Informationen verfügbar"
 msgid "No recipient keys defined."
 msgstr "Kein Empfängerschlüssel definiert."
 
-#: src/procmime.c:419 src/procmime.c:421 src/procmime.c:422
+#: src/procmime.c:422 src/procmime.c:424 src/procmime.c:425
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fehler beim BASE64-Entschlüsseln]\n"
 
@@ -16601,11 +16703,11 @@ msgstr ""
 
 #: src/procmsg.c:1732
 msgid ""
-"Couldn't determine sending informations. Maybe the email hasn't been "
+"Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
 "Es fehlen Informationen zum Senden. Möglicherweise wurde diese Mail nicht "
-"von Claws Mail erstellt."
+"mit Claws Mail erstellt."
 
 #: src/procmsg.c:1750
 msgid "Couldn't create temporary file for news sending."
@@ -16942,73 +17044,73 @@ msgstr "Befehl konnte nicht ausgeführt werden: %s"
 msgid "Error occurred while executing command: %s"
 msgstr "Fehler beim Ausführen des Befehls: %s"
 
-#: src/send_message.c:331
+#: src/send_message.c:339
 msgid "Connecting"
 msgstr "Verbinden..."
 
-#: src/send_message.c:336
+#: src/send_message.c:344
 msgid "Doing POP before SMTP..."
 msgstr "Es erfolgt POP vor SMTP..."
 
-#: src/send_message.c:339
+#: src/send_message.c:347
 msgid "POP before SMTP"
 msgstr "POP vor SMTP"
 
-#: src/send_message.c:344
+#: src/send_message.c:352
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Konto: '%s': Verbinde mit SMTP-Server: %s:%d..."
 
-#: src/send_message.c:401
+#: src/send_message.c:409
 msgid "Mail sent successfully."
 msgstr "E-Mail erfolgreich gesendet."
 
-#: src/send_message.c:468
+#: src/send_message.c:476
 msgid "Sending HELO..."
 msgstr "Sende HELO..."
 
-#: src/send_message.c:469 src/send_message.c:474 src/send_message.c:479
+#: src/send_message.c:477 src/send_message.c:482 src/send_message.c:487
 msgid "Authenticating"
 msgstr "Authentifizierung erfolgt"
 
-#: src/send_message.c:470 src/send_message.c:475
+#: src/send_message.c:478 src/send_message.c:483
 msgid "Sending message..."
 msgstr "Nachricht wird gesendet..."
 
-#: src/send_message.c:473
+#: src/send_message.c:481
 msgid "Sending EHLO..."
 msgstr "EHLO wird gesendet..."
 
-#: src/send_message.c:482
+#: src/send_message.c:490
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM wird gesendet..."
 
-#: src/send_message.c:486
+#: src/send_message.c:494
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO wird gesendet..."
 
-#: src/send_message.c:491
+#: src/send_message.c:499
 msgid "Sending DATA..."
 msgstr "DATA wird gesendet..."
 
-#: src/send_message.c:495
+#: src/send_message.c:503
 msgid "Quitting..."
 msgstr "Beenden..."
 
-#: src/send_message.c:524
+#: src/send_message.c:532
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Nachricht wird gesendet (%d / %d bytes)"
 
-#: src/send_message.c:577
+#: src/send_message.c:585
 msgid "Sending message"
 msgstr "Nachricht wird gesendet"
 
-#: src/send_message.c:646 src/send_message.c:666
+#: src/send_message.c:654 src/send_message.c:674
 msgid "Error occurred while sending the message."
 msgstr "Fehler beim Senden der Nachricht."
 
-#: src/send_message.c:649
+#: src/send_message.c:657
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -17053,40 +17155,40 @@ msgstr "Zertifikat löschen"
 msgid "Do you really want to delete this certificate?"
 msgstr "Möchten Sie dieses Zertifikat wirklich löschen?"
 
-#: src/summary_search.c:266
+#: src/summary_search.c:271
 msgid "Search messages"
 msgstr "Nachrichten durchsuchen"
 
-#: src/summary_search.c:292
+#: src/summary_search.c:293
 msgid "Match any of the following"
 msgstr "Enthält beliebiges der folgenden Elemente"
 
-#: src/summary_search.c:294
+#: src/summary_search.c:295
 msgid "Match all of the following"
 msgstr "Enthält alle der folgenden Elemente"
 
-#: src/summary_search.c:433
+#: src/summary_search.c:459
 msgid "Body:"
 msgstr "Text:"
 
-#: src/summary_search.c:440
+#: src/summary_search.c:466
 msgid "Condition:"
 msgstr "Bedingung:"
 
-#: src/summary_search.c:470
+#: src/summary_search.c:496
 msgid "Find _all"
 msgstr "_Alle finden"
 
-#: src/summary_search.c:679 src/summaryview.c:1105 src/summaryview.c:1366
+#: src/summary_search.c:702 src/summaryview.c:1105 src/summaryview.c:1366
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Suche in %s... \n"
 
-#: src/summary_search.c:776
+#: src/summary_search.c:799
 msgid "Beginning of list reached; continue from end?"
 msgstr "Anfang der Liste erreicht. Weiter vom Ende?"
 
-#: src/summary_search.c:778
+#: src/summary_search.c:801
 msgid "End of list reached; continue from beginning?"
 msgstr "Ende der Liste erreicht. Weiter vom Anfang?"
 
@@ -17289,72 +17391,72 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>An: %s, am %s</span>"
 
-#: src/summaryview.c:4290
+#: src/summaryview.c:4286
 msgid "You're not the author of the article.\n"
 msgstr "Sie sind nicht der Autor dieses Artikels.\n"
 
-#: src/summaryview.c:4383
+#: src/summaryview.c:4379
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "Soll die ausgewählte Nachricht wirklich gelöscht werden?"
 msgstr[1] "Sollen die %d ausgewählten Nachrichten wirklich gelöscht werden?"
 
-#: src/summaryview.c:4386
+#: src/summaryview.c:4382
 msgid "Delete message(s)"
 msgstr "Nachricht(en) löschen"
 
-#: src/summaryview.c:4549
+#: src/summaryview.c:4545
 msgid "Destination is same as current folder."
 msgstr "Ziel ist der aktuelle Ordner."
 
-#: src/summaryview.c:4648
+#: src/summaryview.c:4644
 msgid "Destination to copy is same as current folder."
 msgstr "Ziel der Kopie ist der aktuelle Ordner."
 
-#: src/summaryview.c:4821
+#: src/summaryview.c:4817
 msgid "Append or Overwrite"
 msgstr "Anhängen oder Überschreiben"
 
-#: src/summaryview.c:4822
+#: src/summaryview.c:4818
 msgid "Append or overwrite existing file?"
 msgstr "Vorhandene Datei anhängen oder überschreiben?"
 
-#: src/summaryview.c:4823
+#: src/summaryview.c:4819
 msgid "_Append"
 msgstr "_Anhängen"
 
-#: src/summaryview.c:4823
+#: src/summaryview.c:4819
 msgid "_Overwrite"
 msgstr "_Überschreiben"
 
-#: src/summaryview.c:4864
+#: src/summaryview.c:4860
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "Sie sind dabei, %d Nachrichten zu drucken. Möchten Sie fortfahren?"
 
-#: src/summaryview.c:5341
+#: src/summaryview.c:5337
 msgid "Building threads..."
 msgstr "Diskurse werden erstellt..."
 
-#: src/summaryview.c:5587
+#: src/summaryview.c:5583
 msgid "Skip these rules"
 msgstr "Diese Regeln überspringen"
 
-#: src/summaryview.c:5590
+#: src/summaryview.c:5586
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Diese Regeln anwenden, auch wenn sie nicht zum Konto gehören"
 
-#: src/summaryview.c:5593
+#: src/summaryview.c:5589
 msgid "Apply these rules if they apply to the current account"
 msgstr "Diese Regeln anwenden, wenn sie zum aktuellen Konto gehören"
 
-#: src/summaryview.c:5622
+#: src/summaryview.c:5618
 msgid "Filtering"
 msgstr "Filter"
 
-#: src/summaryview.c:5623
+#: src/summaryview.c:5619
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -17362,60 +17464,60 @@ msgstr ""
 "Einige Filterregeln gehören zu einem bestimmtem Konto.\n"
 "Bitte wählen was mit diesen geschehen soll:"
 
-#: src/summaryview.c:5625
+#: src/summaryview.c:5621
 msgid "_Filter"
 msgstr "_Filtern"
 
-#: src/summaryview.c:5653
+#: src/summaryview.c:5649
 msgid "Filtering..."
 msgstr "Filtern läuft..."
 
-#: src/summaryview.c:5732
+#: src/summaryview.c:5728
 msgid "Processing configuration"
 msgstr "Verarbeitungsregeln"
 
-#: src/summaryview.c:6280
+#: src/summaryview.c:6276
 msgid "Ignored thread"
 msgstr "Ignorierter Diskurs"
 
-#: src/summaryview.c:6282
+#: src/summaryview.c:6278
 msgid "Watched thread"
 msgstr "Beobachteter Diskurs"
 
-#: src/summaryview.c:6290
+#: src/summaryview.c:6286
 msgid "Replied but also forwarded - click to see reply"
 msgstr ""
 "Beantwortet, aber auch weitergeleitet - klicken, um die Antwort zu sehen"
 
-#: src/summaryview.c:6292
+#: src/summaryview.c:6288
 msgid "Replied - click to see reply"
 msgstr "Beantwortet - klicken, um die Antwort zu sehen"
 
-#: src/summaryview.c:6304
+#: src/summaryview.c:6300
 msgid "To be moved"
 msgstr "Zu verschieben"
 
-#: src/summaryview.c:6306
+#: src/summaryview.c:6302
 msgid "To be copied"
 msgstr "Zu kopieren"
 
-#: src/summaryview.c:6318
+#: src/summaryview.c:6314
 msgid "Signed, has attachment(s)"
 msgstr "Signiert, hat Anhänge"
 
-#: src/summaryview.c:6322
+#: src/summaryview.c:6318
 msgid "Encrypted, has attachment(s)"
 msgstr "Verschlüsselt, hat Anhänge"
 
-#: src/summaryview.c:6324
+#: src/summaryview.c:6320
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
-#: src/summaryview.c:6326
+#: src/summaryview.c:6322
 msgid "Has attachment(s)"
 msgstr "Hat Anhänge"
 
-#: src/summaryview.c:7963
+#: src/summaryview.c:7952
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -17424,11 +17526,11 @@ msgstr ""
 "Fehler in Regulärem Ausdruck (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8071
+#: src/summaryview.c:8060
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Zurück zur Ordnerliste (Es gibt ungelesene Nachrichten)"
 
-#: src/summaryview.c:8076
+#: src/summaryview.c:8065
 msgid "Go back to the folder list"
 msgstr "Zurück zur Ordnerliste"
 
@@ -17587,278 +17689,278 @@ msgstr "Warnung vor Phishing-Versuch"
 msgid "_Open URL"
 msgstr "_URL Öffnen"
 
-#: src/toolbar.c:191 src/toolbar.c:1948
+#: src/toolbar.c:192 src/toolbar.c:1949
 msgid "Receive Mail from all Accounts"
 msgstr "E-Mails aller Konten empfangen"
 
-#: src/toolbar.c:192 src/toolbar.c:1953
+#: src/toolbar.c:193 src/toolbar.c:1954
 msgid "Receive Mail from current Account"
 msgstr "E-Mails vom aktuellen Konto empfangen"
 
-#: src/toolbar.c:193 src/toolbar.c:1957
+#: src/toolbar.c:194 src/toolbar.c:1958
 msgid "Send Queued Messages"
 msgstr "Vorgespeicherte Nachrichten senden"
 
-#: src/toolbar.c:194 src/toolbar.c:918 src/toolbar.c:1975 src/toolbar.c:1986
+#: src/toolbar.c:195 src/toolbar.c:919 src/toolbar.c:1976 src/toolbar.c:1987
 msgid "Compose Email"
 msgstr "E-Mail verfassen"
 
-#: src/toolbar.c:195
+#: src/toolbar.c:196
 msgid "Compose News"
 msgstr "News verfassen"
 
-#: src/toolbar.c:196 src/toolbar.c:2014 src/toolbar.c:2024
+#: src/toolbar.c:197 src/toolbar.c:2015 src/toolbar.c:2025
 msgid "Reply to Message"
 msgstr "Nachricht beantworten"
 
-#: src/toolbar.c:197 src/toolbar.c:2031 src/toolbar.c:2041
+#: src/toolbar.c:198 src/toolbar.c:2032 src/toolbar.c:2042
 msgid "Reply to Sender"
 msgstr "Antwort an Absender"
 
-#: src/toolbar.c:198 src/toolbar.c:2048 src/toolbar.c:2058
+#: src/toolbar.c:199 src/toolbar.c:2049 src/toolbar.c:2059
 msgid "Reply to All"
 msgstr "Antwort an alle"
 
-#: src/toolbar.c:199 src/toolbar.c:2065 src/toolbar.c:2075
+#: src/toolbar.c:200 src/toolbar.c:2066 src/toolbar.c:2076
 msgid "Reply to Mailing-list"
 msgstr "Antwort an Mailingliste"
 
-#: src/toolbar.c:200 src/toolbar.c:1969
+#: src/toolbar.c:201 src/toolbar.c:1970
 msgid "Open email"
 msgstr "E-Mail öffnen"
 
-#: src/toolbar.c:201 src/toolbar.c:2082 src/toolbar.c:2093
+#: src/toolbar.c:202 src/toolbar.c:2083 src/toolbar.c:2094
 msgid "Forward Message"
 msgstr "Nachricht weiterleiten"
 
-#: src/toolbar.c:202 src/toolbar.c:2098
+#: src/toolbar.c:203 src/toolbar.c:2099
 msgid "Trash Message"
 msgstr "Nachricht verwerfen"
 
-#: src/toolbar.c:203 src/toolbar.c:2102
+#: src/toolbar.c:204 src/toolbar.c:2103
 msgid "Delete Message"
 msgstr "Nachricht löschen"
 
-#: src/toolbar.c:205 src/toolbar.c:2110
+#: src/toolbar.c:206 src/toolbar.c:2111
 msgid "Go to Previous Unread Message"
 msgstr "Zurück zur vorherigen ungelesenen Nachricht"
 
-#: src/toolbar.c:206 src/toolbar.c:2114
+#: src/toolbar.c:207 src/toolbar.c:2115
 msgid "Go to Next Unread Message"
 msgstr "Weiter zur nächsten ungelesenen Nachricht"
 
-#: src/toolbar.c:209 src/toolbar.c:419
+#: src/toolbar.c:210 src/toolbar.c:420
 msgid "Print"
 msgstr "Drucken"
 
-#: src/toolbar.c:210
+#: src/toolbar.c:211
 msgid "Learn Spam or Ham"
 msgstr "Lerne Spam oder Nicht-Spam"
 
-#: src/toolbar.c:211
+#: src/toolbar.c:212
 msgid "Open folder/Go to folder list"
 msgstr "Ordner öffnen/Weiter zur Ordnerliste"
 
-#: src/toolbar.c:214 src/toolbar.c:2120
+#: src/toolbar.c:215 src/toolbar.c:2121
 msgid "Send Message"
 msgstr "Nachricht senden"
 
-#: src/toolbar.c:215 src/toolbar.c:2124
+#: src/toolbar.c:216 src/toolbar.c:2125
 msgid "Put into queue folder and send later"
 msgstr "Im Postausgang ablegen und später senden"
 
-#: src/toolbar.c:216 src/toolbar.c:2128
+#: src/toolbar.c:217 src/toolbar.c:2129
 msgid "Save to draft folder"
 msgstr "Im Entwurfsordner speichern"
 
-#: src/toolbar.c:217 src/toolbar.c:2132
+#: src/toolbar.c:218 src/toolbar.c:2133
 msgid "Insert file"
 msgstr "Datei einfügen"
 
-#: src/toolbar.c:218 src/toolbar.c:2136
+#: src/toolbar.c:219 src/toolbar.c:2137
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#: src/toolbar.c:219 src/toolbar.c:2140
+#: src/toolbar.c:220 src/toolbar.c:2141
 msgid "Insert signature"
 msgstr "Signatur einfügen"
 
-#: src/toolbar.c:220 src/toolbar.c:2144
+#: src/toolbar.c:221 src/toolbar.c:2145
 msgid "Edit with external editor"
 msgstr "Mit externem Editor bearbeiten"
 
-#: src/toolbar.c:221 src/toolbar.c:2148
+#: src/toolbar.c:222 src/toolbar.c:2149
 msgid "Wrap long lines of current paragraph"
 msgstr "Lange Zeilen in diesem Absatz umbrechen"
 
-#: src/toolbar.c:222 src/toolbar.c:2152
+#: src/toolbar.c:223 src/toolbar.c:2153
 msgid "Wrap all long lines"
 msgstr "Alle langen _Zeilen umbrechen"
 
-#: src/toolbar.c:225 src/toolbar.c:437 src/toolbar.c:2161
+#: src/toolbar.c:226 src/toolbar.c:438 src/toolbar.c:2162
 msgid "Check spelling"
 msgstr "Rechtschreibung prüfen"
 
-#: src/toolbar.c:227
+#: src/toolbar.c:228
 msgid "Claws Mail Actions Feature"
 msgstr "Claws Mail-Aktionsfunktion"
 
-#: src/toolbar.c:228 src/toolbar.c:2177
+#: src/toolbar.c:229 src/toolbar.c:2178
 msgid "Cancel receiving"
 msgstr "Empfang abbrechen"
 
-#: src/toolbar.c:230 src/toolbar.c:2185
+#: src/toolbar.c:231 src/toolbar.c:2186
 msgid "Cancel receiving/sending"
 msgstr "Empfang/Versand abbrechen"
 
-#: src/toolbar.c:231 src/toolbar.c:1961
+#: src/toolbar.c:232 src/toolbar.c:1962
 msgid "Close window"
 msgstr "Fenster schließen"
 
-#: src/toolbar.c:233
+#: src/toolbar.c:234
 msgid "Claws Mail Plugins"
 msgstr "Claws Mail-Plugins"
 
-#: src/toolbar.c:377 src/toolbar.c:412
+#: src/toolbar.c:378 src/toolbar.c:413
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/toolbar.c:400
+#: src/toolbar.c:401
 msgid "Folders"
 msgstr "Ordner"
 
-#: src/toolbar.c:402
+#: src/toolbar.c:403
 msgid "Get Mail"
 msgstr "Abrufen"
 
-#: src/toolbar.c:403
+#: src/toolbar.c:404
 msgid "Get"
 msgstr "Holen"
 
-#: src/toolbar.c:405 src/toolbar.c:406
+#: src/toolbar.c:406 src/toolbar.c:407
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/toolbar.c:408
+#: src/toolbar.c:409
 msgid "All"
 msgstr "Alle"
 
-#: src/toolbar.c:409
+#: src/toolbar.c:410
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "Absender"
 
-#: src/toolbar.c:410
+#: src/toolbar.c:411
 msgid "List"
 msgstr "Liste"
 
-#: src/toolbar.c:415
+#: src/toolbar.c:416
 msgid "Prev"
 msgstr "Vorige"
 
-#: src/toolbar.c:416
+#: src/toolbar.c:417
 msgid "Next"
 msgstr "Nächste"
 
-#: src/toolbar.c:424
+#: src/toolbar.c:425
 msgid "Draft"
 msgstr "Entwurf"
 
-#: src/toolbar.c:427
+#: src/toolbar.c:428
 msgid "Insert sig."
 msgstr "Signatur einf."
 
-#: src/toolbar.c:428
+#: src/toolbar.c:429
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: src/toolbar.c:429
+#: src/toolbar.c:430
 msgid "Wrap para."
 msgstr "Absatz umbr."
 
-#: src/toolbar.c:430
+#: src/toolbar.c:431
 msgid "Wrap all"
 msgstr "Alles umbrechen"
 
-#: src/toolbar.c:432 src/toolbar.c:433
+#: src/toolbar.c:433 src/toolbar.c:434
 msgid "Stop"
 msgstr "Beenden"
 
-#: src/toolbar.c:434
+#: src/toolbar.c:435
 msgid "Stop all"
 msgstr "Alles beenden"
 
-#: src/toolbar.c:910
+#: src/toolbar.c:911
 msgid "Compose News message"
 msgstr "News-Nachricht verfassen"
 
-#: src/toolbar.c:952
+#: src/toolbar.c:953
 msgid "Learn spam"
 msgstr "Lerne Spam"
 
-#: src/toolbar.c:961
+#: src/toolbar.c:962
 msgid "Ham"
 msgstr "Nicht-Spam"
 
-#: src/toolbar.c:963
+#: src/toolbar.c:964
 msgid "Learn ham"
 msgstr "Lerne Nicht-Spam"
 
-#: src/toolbar.c:1943
+#: src/toolbar.c:1944
 msgid "Go to folder list"
 msgstr "Gehe zur Ordnerliste"
 
-#: src/toolbar.c:1949
+#: src/toolbar.c:1950
 msgid "Receive Mail from selected Account"
 msgstr "E-Mails des gewählten Kontos empfangen"
 
-#: src/toolbar.c:1965
+#: src/toolbar.c:1966
 msgid "Open preferences"
 msgstr "Einstellungen öffnen"
 
-#: src/toolbar.c:1976
+#: src/toolbar.c:1977
 msgid "Compose with selected Account"
 msgstr "Mit gewähltem Konto verfassen"
 
-#: src/toolbar.c:1997
+#: src/toolbar.c:1998
 msgid "Learn as..."
 msgstr "lernen als..."
 
-#: src/toolbar.c:2007
+#: src/toolbar.c:2008
 msgid "Learn as _Spam"
 msgstr "lernen als _Spam"
 
-#: src/toolbar.c:2008
+#: src/toolbar.c:2009
 msgid "Learn as _Ham"
 msgstr "Lernen als _Nicht-Spam"
 
-#: src/toolbar.c:2015
+#: src/toolbar.c:2016
 msgid "Reply to Message options"
 msgstr "Auf Nachricht antworten (Optionen)"
 
-#: src/toolbar.c:2019 src/toolbar.c:2036 src/toolbar.c:2053 src/toolbar.c:2070
+#: src/toolbar.c:2020 src/toolbar.c:2037 src/toolbar.c:2054 src/toolbar.c:2071
 msgid "_Reply with quote"
 msgstr "Antwort mit _Zitat"
 
-#: src/toolbar.c:2020 src/toolbar.c:2037 src/toolbar.c:2054 src/toolbar.c:2071
+#: src/toolbar.c:2021 src/toolbar.c:2038 src/toolbar.c:2055 src/toolbar.c:2072
 msgid "Reply without _quote"
 msgstr "_Antwort ohne Zitat"
 
-#: src/toolbar.c:2032
+#: src/toolbar.c:2033
 msgid "Reply to Sender options"
 msgstr "An Absender antworten  (Optionen)"
 
-#: src/toolbar.c:2049
+#: src/toolbar.c:2050
 msgid "Reply to All options"
 msgstr "An Alle antworten  (Optionen)"
 
-#: src/toolbar.c:2066
+#: src/toolbar.c:2067
 msgid "Reply to Mailing-list options"
 msgstr "An Mailingliste antworten  (Optionen)"
 
-#: src/toolbar.c:2083
+#: src/toolbar.c:2084
 msgid "Forward Message options"
 msgstr "Nachricht weiterleiten  (Optionen)"
 
@@ -17883,12 +17985,12 @@ msgstr "Bitte eine URL zum Öffnen wählen"
 msgid "Select All"
 msgstr "Alle auswählen"
 
-#: src/wizard.c:539
+#: src/wizard.c:517
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Willkommen zu Claws Mail"
 
-#: src/wizard.c:562
+#: src/wizard.c:540
 #, c-format
 msgid ""
 "\n"
@@ -17981,47 +18083,47 @@ msgstr ""
 "das unter <%s> tun.\n"
 "\n"
 
-#: src/wizard.c:638
+#: src/wizard.c:616
 msgid "Please enter the mailbox name."
 msgstr "Bitte den Namen der Mailbox eingeben."
 
-#: src/wizard.c:681
+#: src/wizard.c:644
 msgid "Please enter your name and email address."
 msgstr "Bitten geben Sie Ihren Namen und Ihre E-Mail-Adresse ein."
 
-#: src/wizard.c:692
+#: src/wizard.c:655
 msgid "Please enter your receiving server and username."
 msgstr "Bitte geben Sie Posteingangsserver und Benutzernamen an."
 
-#: src/wizard.c:702
+#: src/wizard.c:665
 msgid "Please enter your username."
 msgstr "Bitte geben Sie Ihren Benutzernamen ein."
 
-#: src/wizard.c:712
+#: src/wizard.c:675
 msgid "Please enter your SMTP server."
 msgstr "Bitte geben Sie Ihren Postausgangsserver (SMTP) ein."
 
-#: src/wizard.c:723
+#: src/wizard.c:686
 msgid "Please enter your SMTP username."
 msgstr "Bitte geben Sie Ihren SMTP-Benutzernamen ein."
 
-#: src/wizard.c:1013
+#: src/wizard.c:965
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Ihr Name:</span>"
 
-#: src/wizard.c:1023
+#: src/wizard.c:975
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Ihre E-Mail-Adresse:</span>"
 
-#: src/wizard.c:1033
+#: src/wizard.c:985
 msgid "Your organization:"
 msgstr "Ihre Organisation: "
 
-#: src/wizard.c:1141
+#: src/wizard.c:1018
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Mailbox-Name:</span>"
 
-#: src/wizard.c:1149
+#: src/wizard.c:1026
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -18029,23 +18131,7 @@ msgstr ""
 "Sie können auch einen absoluten Pfad angeben, z.B.: \"/home/white/Documents/"
 "Mail\""
 
-#: src/wizard.c:1157
-msgid "on internal memory"
-msgstr "auf internem Speicher"
-
-#: src/wizard.c:1160
-msgid "on external memory card"
-msgstr "auf externer Speicherkarte"
-
-#: src/wizard.c:1163
-msgid "on internal memory card"
-msgstr "auf interner Speicherkarte"
-
-#: src/wizard.c:1213
-msgid "<span weight=\"bold\">Store data</span>"
-msgstr "<span weight=\"bold\">Speicherort</span>"
-
-#: src/wizard.c:1281
+#: src/wizard.c:1097
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -18053,58 +18139,58 @@ msgstr ""
 "Ein Port kann am Ende durch einen Doppelpunkt getrennt angegeben werden, z."
 "B.: \"mail.example.com:25\""
 
-#: src/wizard.c:1284
+#: src/wizard.c:1100
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Adresse des Postausgangsservers (SMTP):</span>"
 
-#: src/wizard.c:1290
+#: src/wizard.c:1106
 msgid "Use authentication"
 msgstr "Benutze Authentifizierung"
 
-#: src/wizard.c:1298
+#: src/wizard.c:1114
 msgid "<span size=\"small\">(empty to use the same as receive)</span>"
 msgstr ""
 "SMTP-Benutzername:\n"
-"<span size=\"small\">(leer lassen, um den selben wie beim Empfangen zu "
+"<span size=\"small\">(leer lassen, um den selben wie beim Empfang zu "
 "verwenden)</span>"
 
-#: src/wizard.c:1312
+#: src/wizard.c:1128
 msgid "SMTP username:"
 msgstr "SMTP-Benutzername:"
 
-#: src/wizard.c:1323
+#: src/wizard.c:1139
 msgid "SMTP password:"
 msgstr "SMTP-Kennwort:"
 
-#: src/wizard.c:1340
+#: src/wizard.c:1152
 msgid "Use SSL to connect to SMTP server"
 msgstr "Für Verbindungen zum SMTP-Server SSL verwenden"
 
-#: src/wizard.c:1351 src/wizard.c:1630
+#: src/wizard.c:1163 src/wizard.c:1437
 msgid "Use SSL via STARTTLS"
 msgstr "SSL über STARTTLS benutzen"
 
-#: src/wizard.c:1363 src/wizard.c:1642
+#: src/wizard.c:1175 src/wizard.c:1449
 msgid "Client SSL certificate (optional)"
 msgstr "SSL Benutzerzertifikat (optional)"
 
-#: src/wizard.c:1425 src/wizard.c:1450 src/wizard.c:1573
+#: src/wizard.c:1237 src/wizard.c:1262 src/wizard.c:1385
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Server-Adresse:</span>"
 
-#: src/wizard.c:1480
+#: src/wizard.c:1292
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Lokale Mailbox:</span>"
 
-#: src/wizard.c:1540
+#: src/wizard.c:1352
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Servertyp:</span>"
 
-#: src/wizard.c:1550
+#: src/wizard.c:1362
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1584
+#: src/wizard.c:1396
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -18112,23 +18198,23 @@ msgstr ""
 "Ein Port kann am Ende durch einen Doppelpunkt getrennt angegeben werden, z."
 "B.: \"mail.example.com:110\""
 
-#: src/wizard.c:1589
+#: src/wizard.c:1401
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Benutzername:</span>"
 
-#: src/wizard.c:1619
+#: src/wizard.c:1426
 msgid "Use SSL to connect to receiving server"
 msgstr "SSL bei Verbindungen zum POP3-Server verwenden"
 
-#: src/wizard.c:1684
+#: src/wizard.c:1491
 msgid "IMAP server directory:"
 msgstr "IMAP-Serververzeichnis:"
 
-#: src/wizard.c:1695
+#: src/wizard.c:1502
 msgid "Show only subscribed folders"
 msgstr "Nur abonnierte Ordner anzeigen"
 
-#: src/wizard.c:1703
+#: src/wizard.c:1510
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"
@@ -18136,15 +18222,15 @@ msgstr ""
 "<span weight=\"bold\">Achtung: diese Version von Claws Mail\n"
 "wurde ohne IMAP Support kompiliert.</span>"
 
-#: src/wizard.c:1823
+#: src/wizard.c:1628
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws Mail Setup-Assistent"
 
-#: src/wizard.c:1857
+#: src/wizard.c:1662
 msgid "Welcome to Claws Mail"
 msgstr "Willkommen zu Claws Mail"
 
-#: src/wizard.c:1865
+#: src/wizard.c:1670
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -18155,108 +18241,39 @@ msgstr ""
 "Willkommen im Claws Mail Setup-Assistenten.\n"
 "\n"
 "Offenbar verwenden Sie Claws Mail zum ersten\n"
-"Mal. Es sind nun einige grundlegende Einstellungen\n"
+"Mal. Es sind nun einige grundlegende Angaben\n"
 "über Sie und Ihr E-Mail-Konto zu machen, so dass\n"
 "Sie Claws Mail in weniger als fünf Minuten\n"
 "benutzen können."
 
-#: src/wizard.c:1888
+#: src/wizard.c:1683
 msgid "About You"
 msgstr "Über Sie"
 
-#: src/wizard.c:1896 src/wizard.c:1911 src/wizard.c:1926 src/wizard.c:1942
+#: src/wizard.c:1691 src/wizard.c:1706 src/wizard.c:1721 src/wizard.c:1737
 msgid "Bold fields must be completed"
 msgstr "Felder in Fettschrift sind auszufüllen"
 
-#: src/wizard.c:1903
+#: src/wizard.c:1698
 msgid "Receiving mail"
 msgstr "E-Mail empfangen"
 
-#: src/wizard.c:1918
+#: src/wizard.c:1713
 msgid "Sending mail"
 msgstr "E-Mail versenden"
 
-#: src/wizard.c:1934
+#: src/wizard.c:1729
 msgid "Saving mail on disk"
 msgstr "Abspeichern der Mail"
 
-#: src/wizard.c:1950
+#: src/wizard.c:1745
 msgid "Configuration finished"
 msgstr "Konfiguration beendet"
 
-#: src/wizard.c:1958
+#: src/wizard.c:1753
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
 "Claws Mail ist jetzt bereit.\n"
 "Zum Starten 'Speichern' klicken."
-
-#~ msgid "`%c' can't be included in folder name."
-#~ msgstr "'%c' darf nicht im Ordnernamen enthalten sein."
-
-#~ msgid "Select ..."
-#~ msgstr "Auswählen ..."
-
-#~ msgid "The mailbox `%s' already exists."
-#~ msgstr "Die Mailbox '%s' existiert bereits."
-
-#~ msgid "The folder `%s' already exists."
-#~ msgstr "Der Ordner '%s' existiert bereits."
-
-#~ msgid "Can't create the folder `%s'."
-#~ msgstr "Ordner '%s' kann nicht erstellt werden."
-
-#~ msgid ""
-#~ "Really remove the mailbox `%s' ?\n"
-#~ "(The messages are NOT deleted from the disk)"
-#~ msgstr ""
-#~ "Mailbox '%s' wirklich entfernen?\n"
-#~ "(Nachrichten werden NICHT vom Datenträger gelöscht)"
-
-#~ msgid "Can't remove the folder `%s'."
-#~ msgstr "Ordner '%s' kann nicht entfernt werden."
-
-#~ msgid "Input new name for `%s':"
-#~ msgstr "Neuer Name für '%s':"
-
-#, fuzzy
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ " %s"
-#~ msgstr "Datensignierung schlug fehl, %s"
-
-#, fuzzy
-#~ msgid "Filename is null."
-#~ msgstr "Dateiname:"
-
-#, fuzzy
-#~ msgid "Conversion to postscript failed."
-#~ msgstr "Verbindung zu %s:%d fehlgeschlagen."
-
-#, fuzzy
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Authentifizierung schlug fehl:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Proxy Setting"
-#~ msgstr "Mailbox-Einstellung"
-
-#, fuzzy
-#~ msgid "Auto-Load images"
-#~ msgstr "Bild laden"
-
-#, fuzzy
-#~ msgid "Block external content"
-#~ msgstr "Inhalt des Eintrags löschen"
-
-#, fuzzy
-#~ msgid "Newmail plugin unloaded\n"
-#~ msgstr "%s (Plugin nicht geladen)"
-
-#~ msgid "Dillo Browser"
-#~ msgstr "Dillo-Browser"
diff --git a/po/es.po b/po/es.po
index 85e3917..7219b7e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,19 +4,19 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: claws mail 3.9.0\n"
+"Project-Id-Version: claws mail 3.9.3\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2013-04-29 10:32+0100\n"
-"PO-Revision-Date: 2013-14-29 21:27+0100\n"
+"POT-Creation-Date: 2013-12-12 21:03+0100\n"
+"PO-Revision-Date: 2013-12-13 21:27+0100\n"
 "Last-Translator: Ricardo Mones <ricardo at mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo at mones.org>\n"
-"Language: Spanish\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/account.c:393
+#: src/account.c:392
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -24,15 +24,15 @@ msgstr ""
 "Hay ventanas de composición abiertas.\n"
 "Cierre todas las ventanas de composición antes de editar las cuentas."
 
-#: src/account.c:438
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "No se puede crear la carpeta."
 
-#: src/account.c:719
+#: src/account.c:717
 msgid "Edit accounts"
 msgstr "Editar cuentas"
 
-#: src/account.c:740
+#: src/account.c:734
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -42,57 +42,57 @@ msgstr ""
 "orden dado, la casilla indica que cuentas se incluirán. El texto en negrita "
 "indica la cuenta por defecto."
 
-#: src/account.c:811
+#: src/account.c:805
 msgid " _Set as default account "
 msgstr " _Establecer como primaria "
 
-#: src/account.c:906
+#: src/account.c:897
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Las cuentas con carpetas remotas no se pueden copiar."
 
-#: src/account.c:913
+#: src/account.c:904
 #, c-format
 msgid "Copy of %s"
 msgstr "Copia de %s"
 
-#: src/account.c:1073
+#: src/account.c:1064
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "¿Realmente quiere borrar la cuenta «%s»?"
 
-#: src/account.c:1075
+#: src/account.c:1066
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
-#: src/account.c:1076
+#: src/account.c:1067
 msgid "Delete account"
 msgstr "Borrar cuenta"
 
-#: src/account.c:1546
+#: src/account.c:1536
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "R"
 
-#: src/account.c:1552
+#: src/account.c:1542
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "«Recibir correo» recupera el correo de las cuentas marcadas"
 
-#: src/account.c:1559 src/addressadd.c:215 src/addressbook.c:125
-#: src/addrduplicates.c:481 src/compose.c:6984 src/editaddress.c:1270
-#: src/editaddress.c:1327 src/editaddress.c:1347 src/editbook.c:170
+#: src/account.c:1549 src/addressadd.c:215 src/addressbook.c:125
+#: src/addrduplicates.c:481 src/compose.c:7073 src/editaddress.c:1263
+#: src/editaddress.c:1320 src/editaddress.c:1340 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:284 src/plugins/pdf_viewer/poppler_viewer.c:1784
-#: src/plugins/pgpcore/select-keys.c:398 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1872 src/prefs_template.c:78
+#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1800
+#: src/plugins/pgpcore/select-keys.c:394 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1868 src/prefs_template.c:78
 msgid "Name"
 msgstr "Nombre"
 
-#: src/account.c:1567 src/prefs_account.c:1097 src/prefs_account.c:3922
+#: src/account.c:1557 src/prefs_account.c:1097 src/prefs_account.c:3921
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/account.c:1575 src/ssl_manager.c:102
+#: src/account.c:1565 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Servidor"
 
@@ -132,7 +132,7 @@ msgstr ""
 "Acciones de filtrado inválidas:\n"
 "%s"
 
-#: src/action.c:978
+#: src/action.c:988
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -143,7 +143,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:980 src/plugins/bogofilter/bogofilter.c:875
+#: src/action.c:990 src/plugins/bogofilter/bogofilter.c:875
 #: src/plugins/rssyl/feed.c:1734 src/plugins/rssyl/feed.c:1738
 #: src/plugins/tnef_parse/tnef_parse.c:67
 #: src/plugins/vcalendar/vcal_folder.c:1800
@@ -153,25 +153,25 @@ msgstr ""
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/action.c:1198 src/action.c:1368
+#: src/action.c:1208 src/action.c:1373
 msgid "Completed"
 msgstr "Completado"
 
-#: src/action.c:1234
+#: src/action.c:1244
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Ejecutando: %s\n"
 
-#: src/action.c:1238
+#: src/action.c:1248
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Finalizado: %s\n"
 
-#: src/action.c:1271
+#: src/action.c:1281
 msgid "Action's input/output"
 msgstr "Entrada/salida de la acción"
 
-#: src/action.c:1604
+#: src/action.c:1609
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -182,11 +182,11 @@ msgstr ""
 "(«%%h» será sustituido con el parámetro)\n"
 "  %s"
 
-#: src/action.c:1609
+#: src/action.c:1614
 msgid "Action's hidden user argument"
 msgstr "Parámetro de usuario oculto para la acción"
 
-#: src/action.c:1613
+#: src/action.c:1618
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -197,11 +197,11 @@ msgstr ""
 "(«%%u» será sustituido con el parámetro)\n"
 "  %s"
 
-#: src/action.c:1618
+#: src/action.c:1623
 msgid "Action's user argument"
 msgstr "Parámetro de usuario para la acción"
 
-#: src/addr_compl.c:600 src/addressbook.c:4881
+#: src/addr_compl.c:610 src/addressbook.c:4870
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:314
 msgid "Group"
 msgstr "Grupo"
@@ -276,13 +276,13 @@ msgstr ""
 
 #: src/addrcustomattr.c:212 src/addressbook.c:435 src/addressbook.c:463
 #: src/addressbook.c:480 src/edittags.c:271
-#: src/plugins/archive/archiver_gtk.c:1193 src/prefs_actions.c:1086
-#: src/prefs_filtering.c:1692 src/prefs_template.c:1095
+#: src/plugins/archive/archiver_gtk.c:1193 src/prefs_actions.c:1090
+#: src/prefs_filtering.c:1695 src/prefs_template.c:1099
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: src/addrcustomattr.c:213 src/edittags.c:272 src/prefs_actions.c:1087
-#: src/prefs_filtering.c:1693 src/prefs_template.c:1096
+#: src/addrcustomattr.c:213 src/edittags.c:272 src/prefs_actions.c:1091
+#: src/prefs_filtering.c:1696 src/prefs_template.c:1100
 msgid "Delete _all"
 msgstr "_Borrar todo"
 
@@ -290,20 +290,20 @@ msgstr "_Borrar todo"
 msgid "_Reset to default"
 msgstr "_Valores por defecto"
 
-#: src/addrcustomattr.c:410
+#: src/addrcustomattr.c:403
 msgid "Attribute name is not set."
 msgstr "No se estableció el nombre del atributo."
 
-#: src/addrcustomattr.c:469
+#: src/addrcustomattr.c:462
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Editar nombres de atributos"
 
-#: src/addrcustomattr.c:483
+#: src/addrcustomattr.c:476
 msgid "New attribute name:"
 msgstr "Nombre del nuevo atributo:"
 
-#: src/addrcustomattr.c:520
+#: src/addrcustomattr.c:513
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -320,12 +320,12 @@ msgid "Contact"
 msgstr "Contacto"
 
 #: src/addressadd.c:227 src/addrduplicates.c:452
-#: src/plugins/pgpcore/select-keys.c:399 src/toolbar.c:431
+#: src/plugins/pgpcore/select-keys.c:395 src/toolbar.c:432
 msgid "Address"
 msgstr "Dirección"
 
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1062
-#: src/editaddress.c:1137 src/editgroup.c:290
+#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1055
+#: src/editaddress.c:1130 src/editgroup.c:290
 msgid "Remarks"
 msgstr "Notas"
 
@@ -333,7 +333,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressadd.c:483 src/editaddress.c:1585 src/headerview.c:348
+#: src/addressadd.c:483 src/editaddress.c:1582 src/headerview.c:348
 #: src/textview.c:2110
 #, c-format
 msgid ""
@@ -343,7 +343,7 @@ msgstr ""
 "Fallo al guardar la imagen: \n"
 "%s"
 
-#: src/addressadd.c:532 src/addressbook.c:3221 src/addressbook.c:3272
+#: src/addressadd.c:532 src/addressbook.c:3210 src/addressbook.c:3261
 msgid "Add address(es)"
 msgstr "Añadir dirección(es)"
 
@@ -351,8 +351,8 @@ msgstr "Añadir dirección(es)"
 msgid "Can't add the specified address"
 msgstr "No se puede añadir la dirección especificada"
 
-#: src/addressbook.c:126 src/addressbook.c:4869 src/editaddress.c:1059
-#: src/editaddress.c:1120 src/editgroup.c:289 src/expldifdlg.c:517
+#: src/addressbook.c:126 src/addressbook.c:4858 src/editaddress.c:1052
+#: src/editaddress.c:1113 src/editgroup.c:289 src/expldifdlg.c:517
 #: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:782
 msgid "Email Address"
 msgstr "Dirección de correo"
@@ -362,18 +362,18 @@ msgid "_Book"
 msgstr "_Agenda"
 
 #: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
-#: src/addressbook.c:479 src/compose.c:576 src/gtk/quicksearch.c:799
-#: src/gtk/quicksearch.c:814 src/mainwindow.c:504 src/messageview.c:211
+#: src/addressbook.c:479 src/compose.c:578 src/mainwindow.c:504
+#: src/messageview.c:209
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/addressbook.c:404 src/compose.c:581 src/mainwindow.c:507
-#: src/messageview.c:214
+#: src/addressbook.c:404 src/compose.c:583 src/mainwindow.c:507
+#: src/messageview.c:212
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: src/addressbook.c:405 src/compose.c:582 src/mainwindow.c:509
-#: src/messageview.c:215
+#: src/addressbook.c:405 src/compose.c:584 src/mainwindow.c:509
+#: src/messageview.c:213
 msgid "_Help"
 msgstr "_Ayuda"
 
@@ -405,15 +405,15 @@ msgstr "_Editar agenda"
 msgid "_Delete book"
 msgstr "_Borrar agenda"
 
-#: src/addressbook.c:424 src/compose.c:592
+#: src/addressbook.c:424 src/compose.c:595
 msgid "_Save"
 msgstr "_Guardar..."
 
-#: src/addressbook.c:425 src/compose.c:596 src/messageview.c:224
+#: src/addressbook.c:425 src/compose.c:599 src/messageview.c:222
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:228
+#: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:226
 msgid "_Select all"
 msgstr "_Seleccionar todo"
 
@@ -422,12 +422,12 @@ msgid "C_ut"
 msgstr "C_ortar"
 
 #: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:604 src/mainwindow.c:538 src/messageview.c:227
+#: src/compose.c:607 src/mainwindow.c:538 src/messageview.c:225
 msgid "_Copy"
 msgstr "_Copiar"
 
 #: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:605
+#: src/compose.c:608
 msgid "_Paste"
 msgstr "_Pegar"
 
@@ -471,8 +471,8 @@ msgstr "Buscar duplicados..."
 msgid "Edit custom attributes..."
 msgstr "Editar atributos de usuario..."
 
-#: src/addressbook.c:455 src/compose.c:684 src/mainwindow.c:801
-#: src/messageview.c:340
+#: src/addressbook.c:455 src/compose.c:687 src/mainwindow.c:801
+#: src/messageview.c:338
 msgid "_About"
 msgstr "_Acerca de"
 
@@ -481,7 +481,7 @@ msgid "_Browse Entry"
 msgstr "_Ver entrada"
 
 #: src/addressbook.c:504 src/crash.c:451 src/crash.c:470 src/importldif.c:115
-#: src/plugins/pgpcore/select-keys.c:255 src/plugins/pgpcore/sgpgme.c:140
+#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:140
 #: src/plugins/vcalendar/day-view.c:410 src/plugins/vcalendar/month-view.c:431
 #: src/prefs_themes.c:705 src/prefs_themes.c:737 src/prefs_themes.c:738
 msgid "Unknown"
@@ -583,32 +583,32 @@ msgstr "Ya existe un contacto con esa clave"
 msgid "Strong(er) authentication required"
 msgstr "Se necesita autentificación (más) fuerte"
 
-#: src/addressbook.c:913
+#: src/addressbook.c:910
 msgid "Sources"
 msgstr "Fuentes"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:629 src/prefs_other.c:475
-#: src/toolbar.c:223 src/toolbar.c:2156
+#: src/addressbook.c:914 src/prefs_matcher.c:629 src/prefs_other.c:475
+#: src/toolbar.c:224 src/toolbar.c:2157
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:1120
+#: src/addressbook.c:1109
 msgid "Lookup name:"
 msgstr "Buscar nombre:"
 
-#: src/addressbook.c:1444 src/addressbook.c:1497 src/addrduplicates.c:803
+#: src/addressbook.c:1433 src/addressbook.c:1486 src/addrduplicates.c:803
 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 
-#: src/addressbook.c:1445 src/addrduplicates.c:853
+#: src/addressbook.c:1434 src/addrduplicates.c:853
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Esta dirección es solo de lectura y no se puede borrar."
 
-#: src/addressbook.c:1489
+#: src/addressbook.c:1478
 msgid "Delete group"
 msgstr "Borrar grupo"
 
-#: src/addressbook.c:1490
+#: src/addressbook.c:1479
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -616,30 +616,30 @@ msgstr ""
 "¿Quiere borrar el(los) grupo(s)?\n"
 "Las direcciones que contienen no se perderán."
 
-#: src/addressbook.c:1498 src/addrduplicates.c:804
+#: src/addressbook.c:1487 src/addrduplicates.c:804
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
-#: src/addressbook.c:2201
+#: src/addressbook.c:2190
 msgid "Cannot paste. Target address book is readonly."
 msgstr "No puedo pegar. El libro de direcciones destino es solo de lectura."
 
-#: src/addressbook.c:2211
+#: src/addressbook.c:2200
 msgid "Cannot paste into an address group."
 msgstr "No se puede pegar dentro de un grupo de direcciones."
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2906
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "¿Quiere borrar los resultados de la búsqueda y direcciones en «%s»?"
 
-#: src/addressbook.c:2920 src/addressbook.c:2946 src/addressbook.c:2953
+#: src/addressbook.c:2909 src/addressbook.c:2935 src/addressbook.c:2942
 #: src/plugins/archive/archiver_prefs.c:337 src/prefs_filtering_action.c:177
-#: src/toolbar.c:413
+#: src/toolbar.c:414
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2918
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -648,21 +648,21 @@ msgstr ""
 "¿Quiere borrar «%s»? Si borra sólo la carpeta las direcciones que contenga "
 "se moverán a la carpeta padre."
 
-#: src/addressbook.c:2932 src/imap_gtk.c:363 src/mh_gtk.c:202
-#: src/plugins/mailmbox/plugin_gtk.c:325 src/plugins/rssyl/rssyl_cb_menu.c:237
-#: src/plugins/vcalendar/vcal_folder.c:1953
+#: src/addressbook.c:2921 src/imap_gtk.c:363 src/mh_gtk.c:202
+#: src/plugins/mailmbox/plugin_gtk.c:324 src/plugins/rssyl/rssyl_cb_menu.c:237
+#: src/plugins/vcalendar/vcal_folder.c:1951
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "+Delete _folder only"
 msgstr "+Borrar sólo _carpeta"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "Delete folder and _addresses"
 msgstr "Borrar carpeta y _direcciones"
 
-#: src/addressbook.c:2944
+#: src/addressbook.c:2933
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -671,7 +671,7 @@ msgstr ""
 "¿Quiere borrar «%s»?\n"
 "Las direcciones que contiene no se perderán."
 
-#: src/addressbook.c:2951
+#: src/addressbook.c:2940
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -680,28 +680,28 @@ msgstr ""
 "¿Quiere borrar «%s»?\n"
 "Las direcciones que contiene se perderán."
 
-#: src/addressbook.c:3065
+#: src/addressbook.c:3054
 #, c-format
 msgid "Search '%s'"
 msgstr " Buscar «%s»"
 
-#: src/addressbook.c:3203 src/addressbook.c:3253
+#: src/addressbook.c:3192 src/addressbook.c:3242
 msgid "New Contacts"
 msgstr "Nuevos contactos"
 
-#: src/addressbook.c:4035
+#: src/addressbook.c:4024
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se puede guardar el fichero índice."
 
-#: src/addressbook.c:4039
+#: src/addressbook.c:4028
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pueden guardar los ficheros de direcciones"
 
-#: src/addressbook.c:4049
+#: src/addressbook.c:4038
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:4054
+#: src/addressbook.c:4043
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -709,7 +709,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se puede guardar el nuevo fichero índice."
 
-#: src/addressbook.c:4067
+#: src/addressbook.c:4056
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -717,7 +717,7 @@ msgstr ""
 "No se puede convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:4073
+#: src/addressbook.c:4062
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -725,7 +725,7 @@ msgstr ""
 "No se puede convertir la antigua agenda,\n"
 "no se pudo guardar el fichero índice para la nueva."
 
-#: src/addressbook.c:4078
+#: src/addressbook.c:4067
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -733,53 +733,53 @@ msgstr ""
 "No se puede convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para la nueva."
 
-#: src/addressbook.c:4085 src/addressbook.c:4091
+#: src/addressbook.c:4074 src/addressbook.c:4080
 msgid "Addressbook conversion error"
 msgstr "Error en la conversión de la agenda de Sylpheed"
 
-#: src/addressbook.c:4198
+#: src/addressbook.c:4187
 msgid "Addressbook Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:4199
+#: src/addressbook.c:4188
 msgid "Could not read address index"
 msgstr "No se puede leer el índice de direcciones"
 
-#: src/addressbook.c:4530
+#: src/addressbook.c:4519
 msgid "Busy searching..."
 msgstr "Buscando..."
 
-#: src/addressbook.c:4833
+#: src/addressbook.c:4822
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:4845 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
+#: src/addressbook.c:4834 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
 #: src/expldifdlg.c:388 src/exporthtml.c:984 src/importldif.c:657
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:4857
+#: src/addressbook.c:4846
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:4893 src/exporthtml.c:884 src/folderview.c:338
-#: src/folderview.c:426 src/prefs_account.c:2746 src/prefs_folder_column.c:78
+#: src/addressbook.c:4882 src/exporthtml.c:884 src/folderview.c:338
+#: src/folderview.c:426 src/prefs_account.c:2738 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:4905
+#: src/addressbook.c:4894
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4917 src/addressbook.c:4929
+#: src/addressbook.c:4906 src/addressbook.c:4918
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4941
+#: src/addressbook.c:4930
 msgid "LDAP servers"
 msgstr "Servidores LDAP"
 
-#: src/addressbook.c:4953
+#: src/addressbook.c:4942
 msgid "LDAP Query"
 msgstr "Petición LDAP"
 
@@ -794,9 +794,9 @@ msgstr "Petición LDAP"
 #: src/plugins/spamassassin/spamassassin_gtk.c:443
 #: src/plugins/spamassassin/spamassassin_gtk.c:490
 #: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:672
-#: src/prefs_matcher.c:707 src/prefs_matcher.c:1601 src/prefs_matcher.c:1608
-#: src/prefs_matcher.c:1616 src/prefs_matcher.c:1618 src/prefs_matcher.c:2498
-#: src/prefs_matcher.c:2502
+#: src/prefs_matcher.c:707 src/prefs_matcher.c:1607 src/prefs_matcher.c:1614
+#: src/prefs_matcher.c:1622 src/prefs_matcher.c:1624 src/prefs_matcher.c:2504
+#: src/prefs_matcher.c:2508
 msgid "Any"
 msgstr "Cualquiera"
 
@@ -849,7 +849,7 @@ msgstr "Procesar las siguientes cabeceras"
 msgid "Include subfolders"
 msgstr "Incluir subcarpetas"
 
-#: src/addrgather.c:456 src/prefs_filtering_action.c:1423
+#: src/addrgather.c:456 src/prefs_filtering_action.c:1425
 msgid "Header Name"
 msgstr "Nombre cabecera"
 
@@ -933,18 +933,19 @@ msgstr "Ruta a la agenda de direcciones"
 msgid "Delete address"
 msgstr "Borrar dirección"
 
-#: src/alertpanel.c:146 src/compose.c:9160
+#: src/alertpanel.c:146 src/compose.c:9217
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:159 src/compose.c:5556 src/compose.c:6022
-#: src/compose.c:11468 src/messageview.c:874 src/messageview.c:887
+#: src/alertpanel.c:159 src/compose.c:5597 src/compose.c:6063
+#: src/compose.c:11533 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:852 src/messageview.c:865
 #: src/plugins/pgpcore/sgpgme.c:706 src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4869
+#: src/summaryview.c:4865
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5497 src/inc.c:666
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5538 src/inc.c:665
 #: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:246
 msgid "Error"
 msgstr "Error"
@@ -1214,595 +1215,599 @@ msgstr "<no en el certificado>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Asunto vacío por expr. reg.)"
 
-#: src/common/utils.c:371
+#: src/common/utils.c:362
 #, c-format
 msgid "%dB"
 msgstr "%d b"
 
-#: src/common/utils.c:372
+#: src/common/utils.c:363
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02d Kb"
 
-#: src/common/utils.c:373
+#: src/common/utils.c:364
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02d Mb"
 
-#: src/common/utils.c:374
+#: src/common/utils.c:365
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2f Gb"
 
-#: src/common/utils.c:4974
+#: src/common/utils.c:4946
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/common/utils.c:4975
+#: src/common/utils.c:4947
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Lunes"
 
-#: src/common/utils.c:4976
+#: src/common/utils.c:4948
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Martes"
 
-#: src/common/utils.c:4977
+#: src/common/utils.c:4949
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: src/common/utils.c:4978
+#: src/common/utils.c:4950
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Jueves"
 
-#: src/common/utils.c:4979
+#: src/common/utils.c:4951
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Viernes"
 
-#: src/common/utils.c:4980
+#: src/common/utils.c:4952
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/common/utils.c:4982
+#: src/common/utils.c:4954
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Enero"
 
-#: src/common/utils.c:4983
+#: src/common/utils.c:4955
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Febrero"
 
-#: src/common/utils.c:4984
+#: src/common/utils.c:4956
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marzo"
 
-#: src/common/utils.c:4985
+#: src/common/utils.c:4957
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Abril"
 
-#: src/common/utils.c:4986
+#: src/common/utils.c:4958
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mayo"
 
-#: src/common/utils.c:4987
+#: src/common/utils.c:4959
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Junio"
 
-#: src/common/utils.c:4988
+#: src/common/utils.c:4960
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Julio"
 
-#: src/common/utils.c:4989
+#: src/common/utils.c:4961
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Agosto"
 
-#: src/common/utils.c:4990
+#: src/common/utils.c:4962
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Septiembre"
 
-#: src/common/utils.c:4991
+#: src/common/utils.c:4963
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octubre"
 
-#: src/common/utils.c:4992
+#: src/common/utils.c:4964
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Noviembre"
 
-#: src/common/utils.c:4993
+#: src/common/utils.c:4965
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Diciembre"
 
-#: src/common/utils.c:4995
+#: src/common/utils.c:4967
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dom"
 
-#: src/common/utils.c:4996
+#: src/common/utils.c:4968
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Lun"
 
-#: src/common/utils.c:4997
+#: src/common/utils.c:4969
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Mar"
 
-#: src/common/utils.c:4998
+#: src/common/utils.c:4970
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mié"
 
-#: src/common/utils.c:4999
+#: src/common/utils.c:4971
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Jue"
 
-#: src/common/utils.c:5000
+#: src/common/utils.c:4972
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Vie"
 
-#: src/common/utils.c:5001
+#: src/common/utils.c:4973
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sáb"
 
-#: src/common/utils.c:5003
+#: src/common/utils.c:4975
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Ene"
 
-#: src/common/utils.c:5004
+#: src/common/utils.c:4976
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:5005
+#: src/common/utils.c:4977
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:5006
+#: src/common/utils.c:4978
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Abr"
 
-#: src/common/utils.c:5007
+#: src/common/utils.c:4979
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "May"
 
-#: src/common/utils.c:5008
+#: src/common/utils.c:4980
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:5009
+#: src/common/utils.c:4981
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:5010
+#: src/common/utils.c:4982
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ago"
 
-#: src/common/utils.c:5011
+#: src/common/utils.c:4983
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:5012
+#: src/common/utils.c:4984
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Oct"
 
-#: src/common/utils.c:5013
+#: src/common/utils.c:4985
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:5014
+#: src/common/utils.c:4986
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dic"
 
-#: src/common/utils.c:5025
+#: src/common/utils.c:4997
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:5026
+#: src/common/utils.c:4998
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:5027
+#: src/common/utils.c:4999
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:5028
+#: src/common/utils.c:5000
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/common/utils.c:5035
+#: src/common/utils.c:5007
 msgctxt "For use by strftime (default date+time format)"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %d %b %Y %H:%M:%S"
 
-#: src/common/utils.c:5036
+#: src/common/utils.c:5008
 msgctxt "For use by strftime (default date format)"
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: src/common/utils.c:5037
+#: src/common/utils.c:5009
 msgctxt "For use by strftime (default time format)"
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
-#: src/common/utils.c:5039
+#: src/common/utils.c:5011
 msgctxt "For use by strftime (default 12-hour time format)"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
-#: src/compose.c:565
+#: src/compose.c:567
 msgid "_Add..."
 msgstr "_Añadir..."
 
-#: src/compose.c:566 src/mh_gtk.c:361 src/plugins/mailmbox/plugin_gtk.c:293
+#: src/compose.c:568 src/mh_gtk.c:361 src/plugins/mailmbox/plugin_gtk.c:293
 #: src/plugins/rssyl/rssyl_cb_menu.c:140
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: src/compose.c:568 src/folderview.c:234
+#: src/compose.c:570 src/folderview.c:234
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: src/compose.c:575 src/mainwindow.c:506 src/messageview.c:213
+#: src/compose.c:577 src/mainwindow.c:506 src/messageview.c:211
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: src/compose.c:578
+#: src/compose.c:580
 msgid "_Spelling"
 msgstr "_Ortografía"
 
-#: src/compose.c:580 src/compose.c:646
+#: src/compose.c:582 src/compose.c:649
 msgid "_Options"
 msgstr "_Opciones"
 
-#: src/compose.c:584
+#: src/compose.c:586
 msgid "S_end"
 msgstr "_Enviar"
 
-#: src/compose.c:585
+#: src/compose.c:587
 msgid "Send _later"
 msgstr "Enviar _después"
 
-#: src/compose.c:588
+#: src/compose.c:590
 msgid "_Attach file"
 msgstr "_Adjuntar fichero"
 
-#: src/compose.c:589
+#: src/compose.c:591
 msgid "_Insert file"
 msgstr "_Insertar fichero"
 
-#: src/compose.c:590
+#: src/compose.c:592
 msgid "Insert si_gnature"
 msgstr "Insertar _firma"
 
-#: src/compose.c:594
+#: src/compose.c:593
+msgid "_Replace signature"
+msgstr "_Reemplazar firma"
+
+#: src/compose.c:597
 msgid "_Print"
 msgstr "I_mprimir"
 
-#: src/compose.c:599
+#: src/compose.c:602
 msgid "_Undo"
 msgstr "_Deshacer"
 
-#: src/compose.c:600
+#: src/compose.c:603
 msgid "_Redo"
 msgstr "_Rehacer"
 
-#: src/compose.c:603
+#: src/compose.c:606
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/compose.c:607
+#: src/compose.c:610
 msgid "_Special paste"
 msgstr "Pegar e_special"
 
-#: src/compose.c:608
+#: src/compose.c:611
 msgid "As _quotation"
 msgstr "Como _citación"
 
-#: src/compose.c:609
+#: src/compose.c:612
 msgid "_Wrapped"
 msgstr "_Recortado"
 
-#: src/compose.c:610
+#: src/compose.c:613
 msgid "_Unwrapped"
 msgstr "_Sin recortar"
 
-#: src/compose.c:612 src/mainwindow.c:539
+#: src/compose.c:615 src/mainwindow.c:539
 msgid "Select _all"
 msgstr "_Seleccionar todo"
 
-#: src/compose.c:614
+#: src/compose.c:617
 msgid "A_dvanced"
 msgstr "Avanza_das"
 
-#: src/compose.c:615
+#: src/compose.c:618
 msgid "Move a character backward"
 msgstr "Ir al carácter anterior"
 
-#: src/compose.c:616
+#: src/compose.c:619
 msgid "Move a character forward"
 msgstr "Ir al carácter siguiente"
 
-#: src/compose.c:617
+#: src/compose.c:620
 msgid "Move a word backward"
 msgstr "Ir a la palabra anterior"
 
-#: src/compose.c:618
+#: src/compose.c:621
 msgid "Move a word forward"
 msgstr "Ir a la palabra siguiente"
 
-#: src/compose.c:619
+#: src/compose.c:622
 msgid "Move to beginning of line"
 msgstr "Ir al principio de la línea"
 
-#: src/compose.c:620
+#: src/compose.c:623
 msgid "Move to end of line"
 msgstr "Ir al final de la línea"
 
-#: src/compose.c:621
+#: src/compose.c:624
 msgid "Move to previous line"
 msgstr "Ir a la línea anterior"
 
-#: src/compose.c:622
+#: src/compose.c:625
 msgid "Move to next line"
 msgstr "Ir a la línea siguiente"
 
-#: src/compose.c:623
+#: src/compose.c:626
 msgid "Delete a character backward"
 msgstr "Borrar el carácter anterior"
 
-#: src/compose.c:624
+#: src/compose.c:627
 msgid "Delete a character forward"
 msgstr "Borrar el carácter siguiente"
 
-#: src/compose.c:625
+#: src/compose.c:628
 msgid "Delete a word backward"
 msgstr "Borrar la palabra anterior"
 
-#: src/compose.c:626
+#: src/compose.c:629
 msgid "Delete a word forward"
 msgstr "Borrar la palabra siguiente"
 
-#: src/compose.c:627
+#: src/compose.c:630
 msgid "Delete line"
 msgstr "Borrar línea"
 
-#: src/compose.c:628
+#: src/compose.c:631
 msgid "Delete to end of line"
 msgstr "Borrar hasta el final de la línea"
 
-#: src/compose.c:631 src/messageview.c:230
+#: src/compose.c:634 src/messageview.c:228
 msgid "_Find"
 msgstr "_Buscar"
 
-#: src/compose.c:634
+#: src/compose.c:637
 msgid "_Wrap current paragraph"
 msgstr "_Recortar el párrafo actual"
 
-#: src/compose.c:635
+#: src/compose.c:638
 msgid "Wrap all long _lines"
 msgstr "Recortar todas las líneas largas"
 
-#: src/compose.c:637
+#: src/compose.c:640
 msgid "Edit with e_xternal editor"
 msgstr "Editar con un editor e_xterno"
 
-#: src/compose.c:640
+#: src/compose.c:643
 msgid "_Check all or check selection"
 msgstr "_Comprobar todo o la selección"
 
-#: src/compose.c:641
+#: src/compose.c:644
 msgid "_Highlight all misspelled words"
 msgstr "_Resaltar todas las faltas ortográficas"
 
-#: src/compose.c:642
+#: src/compose.c:645
 msgid "Check _backwards misspelled word"
 msgstr "Comprobar faltas hacia _atrás"
 
-#: src/compose.c:643
+#: src/compose.c:646
 msgid "_Forward to next misspelled word"
 msgstr "Avanzar hasta la siguiente _falta"
 
-#: src/compose.c:651
+#: src/compose.c:654
 msgid "Reply _mode"
 msgstr "_Modo de respuesta"
 
-#: src/compose.c:653
+#: src/compose.c:656
 msgid "Privacy _System"
 msgstr "_Sistema de privacidad"
 
-#: src/compose.c:658
+#: src/compose.c:661
 msgid "_Priority"
 msgstr "_Prioridad"
 
-#: src/compose.c:660 src/mainwindow.c:603 src/messageview.c:266
+#: src/compose.c:663 src/mainwindow.c:603 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "Codificación de caract_eres"
 
-#: src/compose.c:665 src/mainwindow.c:608 src/messageview.c:271
+#: src/compose.c:668 src/mainwindow.c:608 src/messageview.c:269
 msgid "Western European"
 msgstr "Europeo Occidental"
 
-#: src/compose.c:666 src/mainwindow.c:609 src/messageview.c:272
+#: src/compose.c:669 src/mainwindow.c:609 src/messageview.c:270
 msgid "Baltic"
 msgstr "Báltico"
 
-#: src/compose.c:667 src/mainwindow.c:610 src/messageview.c:273
+#: src/compose.c:670 src/mainwindow.c:610 src/messageview.c:271
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: src/compose.c:668 src/mainwindow.c:611 src/messageview.c:274
+#: src/compose.c:671 src/mainwindow.c:611 src/messageview.c:272
 msgid "Arabic"
 msgstr "Árabe"
 
-#: src/compose.c:669 src/mainwindow.c:612 src/messageview.c:275
+#: src/compose.c:672 src/mainwindow.c:612 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: src/compose.c:670 src/mainwindow.c:613 src/messageview.c:276
+#: src/compose.c:673 src/mainwindow.c:613 src/messageview.c:274
 msgid "Japanese"
 msgstr "Japonés"
 
-#: src/compose.c:671 src/mainwindow.c:614 src/messageview.c:277
+#: src/compose.c:674 src/mainwindow.c:614 src/messageview.c:275
 msgid "Chinese"
 msgstr "Chino"
 
-#: src/compose.c:672 src/mainwindow.c:615 src/messageview.c:278
+#: src/compose.c:675 src/mainwindow.c:615 src/messageview.c:276
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/compose.c:673 src/mainwindow.c:616 src/messageview.c:279
+#: src/compose.c:676 src/mainwindow.c:616 src/messageview.c:277
 msgid "Thai"
 msgstr "Tailandés"
 
-#: src/compose.c:676 src/mainwindow.c:723 src/messageview.c:315
+#: src/compose.c:679 src/mainwindow.c:723 src/messageview.c:313
 msgid "_Address book"
 msgstr "_Agenda de direcciones"
 
-#: src/compose.c:678
+#: src/compose.c:681
 msgid "_Template"
 msgstr "Plan_tilla"
 
-#: src/compose.c:680 src/mainwindow.c:751 src/messageview.c:336
+#: src/compose.c:683 src/mainwindow.c:751 src/messageview.c:334
 msgid "Actio_ns"
 msgstr "Accio_nes"
 
-#: src/compose.c:689
+#: src/compose.c:692
 msgid "Aut_o wrapping"
 msgstr "Aut_o-recorte"
 
-#: src/compose.c:690
+#: src/compose.c:693
 msgid "Auto _indent"
 msgstr "Auto-_sangrado"
 
-#: src/compose.c:691
+#: src/compose.c:694
 msgid "Si_gn"
 msgstr "Fir_mar"
 
-#: src/compose.c:692
+#: src/compose.c:695
 msgid "_Encrypt"
 msgstr "_Cifrado"
 
-#: src/compose.c:693
+#: src/compose.c:696
 msgid "_Request Return Receipt"
 msgstr "Solicitar acuse de _recibo"
 
-#: src/compose.c:694
+#: src/compose.c:697
 msgid "Remo_ve references"
 msgstr "Eliminar re_ferencias"
 
-#: src/compose.c:695
+#: src/compose.c:698
 msgid "Show _ruler"
 msgstr "Mostrar _regleta"
 
-#: src/compose.c:700 src/compose.c:710
+#: src/compose.c:703 src/compose.c:713
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:701 src/mainwindow.c:657 src/messageview.c:304
+#: src/compose.c:704 src/mainwindow.c:657 src/messageview.c:302
 msgid "_All"
 msgstr "_Todo"
 
-#: src/compose.c:702 src/mainwindow.c:658 src/messageview.c:305
+#: src/compose.c:705 src/mainwindow.c:658 src/messageview.c:303
 msgid "_Sender"
 msgstr "_Remitente"
 
-#: src/compose.c:703
+#: src/compose.c:706
 msgid "_Mailing-list"
 msgstr "_Lista-Correo"
 
-#: src/compose.c:708
+#: src/compose.c:711
 msgid "_Highest"
 msgstr "_Muy alta"
 
-#: src/compose.c:709
+#: src/compose.c:712
 msgid "Hi_gh"
 msgstr "_Alta"
 
-#: src/compose.c:711
+#: src/compose.c:714
 msgid "Lo_w"
 msgstr "_Baja"
 
-#: src/compose.c:712
+#: src/compose.c:715
 msgid "_Lowest"
 msgstr "M_uy baja"
 
-#: src/compose.c:717 src/mainwindow.c:867 src/messageview.c:353
+#: src/compose.c:720 src/mainwindow.c:865 src/messageview.c:351
 msgid "_Automatic"
 msgstr "_Automático"
 
-#: src/compose.c:718 src/mainwindow.c:868 src/messageview.c:354
+#: src/compose.c:721 src/mainwindow.c:866 src/messageview.c:352
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:719 src/mainwindow.c:869 src/messageview.c:355
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:353
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:723 src/mainwindow.c:873 src/messageview.c:359
+#: src/compose.c:726 src/mainwindow.c:871 src/messageview.c:357
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:726 src/mainwindow.c:876 src/messageview.c:362
+#: src/compose.c:729 src/mainwindow.c:874 src/messageview.c:360
 msgid "Greek (ISO-8859-_7)"
 msgstr "Griego (ISO-8859-_7)"
 
-#: src/compose.c:731 src/mainwindow.c:881 src/messageview.c:367
+#: src/compose.c:734 src/mainwindow.c:879 src/messageview.c:365
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turco (ISO-8859-_9)"
 
-#: src/compose.c:1034
+#: src/compose.c:1062
 msgid "New message From format error."
 msgstr "Error de formato en el Desde del mensaje nuevo."
 
-#: src/compose.c:1126
+#: src/compose.c:1154
 msgid "New message subject format error."
 msgstr "Error de formato en el asunto del mensaje nuevo."
 
-#: src/compose.c:1157 src/quote_fmt.c:563
+#: src/compose.c:1185 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Componer» en la línea %d."
 
-#: src/compose.c:1413
+#: src/compose.c:1439
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "No se puede responder. El correo original probablemente no existe."
 
-#: src/compose.c:1596 src/quote_fmt.c:580
+#: src/compose.c:1622 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
@@ -1810,12 +1815,12 @@ msgstr ""
 "El campo «Desde» de la plantilla «Responder» contiene una dirección de "
 "correo inválida."
 
-#: src/compose.c:1644 src/quote_fmt.c:583
+#: src/compose.c:1670 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Responder» en la línea %d."
 
-#: src/compose.c:1780 src/compose.c:1972 src/quote_fmt.c:600
+#: src/compose.c:1806 src/compose.c:1998 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1823,55 +1828,55 @@ msgstr ""
 "El campo «Desde» de la plantilla «Reenviar» contiene una dirección de correo "
 "inválida."
 
-#: src/compose.c:1840 src/quote_fmt.c:603
+#: src/compose.c:1866 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Reenviar» en la línea %d."
 
-#: src/compose.c:2014
+#: src/compose.c:2040
 msgid "Fw: multiple emails"
 msgstr "Fw: múltiples correos"
 
-#: src/compose.c:2456
+#: src/compose.c:2482
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Redirijir» en la línea %d."
 
-#: src/compose.c:2522 src/gtk/headers.h:13
+#: src/compose.c:2549 src/gtk/headers.h:13
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2525 src/gtk/headers.h:14
+#: src/compose.c:2552 src/gtk/headers.h:14
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2528 src/gtk/headers.h:11
+#: src/compose.c:2555 src/gtk/headers.h:11
 msgid "Reply-To:"
 msgstr "Responder a:"
 
-#: src/compose.c:2531 src/compose.c:4818 src/compose.c:4820
+#: src/compose.c:2558 src/compose.c:4854 src/compose.c:4856
 #: src/gtk/headers.h:32
 msgid "Newsgroups:"
 msgstr "Grupos de noticias:"
 
-#: src/compose.c:2534 src/gtk/headers.h:33
+#: src/compose.c:2561 src/gtk/headers.h:33
 msgid "Followup-To:"
 msgstr "Enviar a:"
 
-#: src/compose.c:2537 src/gtk/headers.h:16
+#: src/compose.c:2564 src/gtk/headers.h:16
 msgid "In-Reply-To:"
 msgstr "En-Respuesta-A:"
 
-#: src/compose.c:2541 src/compose.c:4815 src/compose.c:4823
-#: src/gtk/headers.h:12 src/summary_search.c:419
+#: src/compose.c:2568 src/compose.c:4851 src/compose.c:4859
+#: src/gtk/headers.h:12 src/summary_search.c:445
 msgid "To:"
 msgstr "Para:"
 
-#: src/compose.c:2747
+#: src/compose.c:2774
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "No se pudo adjuntar un fichero (falló la conversión de caracteres)."
 
-#: src/compose.c:2753
+#: src/compose.c:2780
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1886,16 +1891,16 @@ msgstr[1] ""
 "Se han adjuntado los siguientes ficheros: \n"
 "%s"
 
-#: src/compose.c:3026
+#: src/compose.c:3053
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "La «marca de cita» de la plantilla no es válida."
 
-#: src/compose.c:3514
+#: src/compose.c:3542
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "No se puede obtener el tamaño del fichero «%s»."
 
-#: src/compose.c:3525
+#: src/compose.c:3553
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1904,48 +1909,48 @@ msgstr ""
 "Está a punto de insertar un fichero de %s en el cuerpo del mensaje. ¿Está "
 "seguro de que desea hacerlo?"
 
-#: src/compose.c:3528
+#: src/compose.c:3556
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
-#: src/compose.c:3529 src/compose.c:10962
+#: src/compose.c:3557 src/compose.c:11027
 msgid "+_Insert"
 msgstr "+_Insertar"
 
-#: src/compose.c:3639
+#: src/compose.c:3672
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:3643
+#: src/compose.c:3676
 #, c-format
 msgid "Can't read %s."
 msgstr "No puedo leer %s."
 
-#: src/compose.c:3670
+#: src/compose.c:3703
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:4658 src/plugins/python/composewindowtype.c:428
+#: src/compose.c:4691 src/plugins/python/composewindowtype.c:432
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:4665 src/plugins/python/composewindowtype.c:431
+#: src/compose.c:4698 src/plugins/python/composewindowtype.c:435
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 
-#: src/compose.c:4668 src/plugins/python/composewindowtype.c:434
+#: src/compose.c:4701 src/plugins/python/composewindowtype.c:438
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sin asunto] - Componer mensaje%s"
 
-#: src/compose.c:4670 src/plugins/python/composewindowtype.c:422
+#: src/compose.c:4703 src/plugins/python/composewindowtype.c:426
 msgid "Compose message"
 msgstr "Componer un mensaje nuevo"
 
-#: src/compose.c:4697 src/messageview.c:909
+#: src/compose.c:4730 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1953,55 +1958,55 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
-#: src/compose.c:4914 src/compose.c:4946 src/compose.c:4988
-#: src/plugins/attachwarner/attachwarner.c:219 src/prefs_account.c:3245
-#: src/toolbar.c:404 src/toolbar.c:422
+#: src/compose.c:4950 src/compose.c:4982 src/compose.c:5024
+#: src/plugins/attachwarner/attachwarner.c:219 src/prefs_account.c:3237
+#: src/toolbar.c:405 src/toolbar.c:423
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4915
+#: src/compose.c:4951
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 "El único destinatario es la dirección CC por omisión. ¿Enviar de todas "
 "formas?"
 
-#: src/compose.c:4916 src/compose.c:4948 src/compose.c:4981 src/compose.c:5497
+#: src/compose.c:4952 src/compose.c:4984 src/compose.c:5017 src/compose.c:5538
 #: src/plugins/attachwarner/attachwarner.c:211
 msgid "+_Send"
 msgstr "+_Enviar"
 
-#: src/compose.c:4947
+#: src/compose.c:4983
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 "El único destinatario es la dirección BCC por omisión. ¿Enviar de todas "
 "formas?"
 
-#: src/compose.c:4964
+#: src/compose.c:5000
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:4983 src/plugins/attachwarner/attachwarner.c:213
+#: src/compose.c:5019 src/plugins/attachwarner/attachwarner.c:213
 msgid "+_Queue"
 msgstr "+_A la cola"
 
-#: src/compose.c:4984
+#: src/compose.c:5020
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "El asunto esta vacío. %s"
 
-#: src/compose.c:4985
+#: src/compose.c:5021
 msgid "Send it anyway?"
 msgstr "¿Enviarlo igualmente?"
 
-#: src/compose.c:4986
+#: src/compose.c:5022
 msgid "Queue it anyway?"
 msgstr "¿Ponerlo en la cola igualmente?"
 
-#: src/compose.c:4988 src/toolbar.c:423
+#: src/compose.c:5024 src/toolbar.c:424
 msgid "Send later"
 msgstr "Enviar después"
 
-#: src/compose.c:5036 src/compose.c:9585
+#: src/compose.c:5077 src/compose.c:9643
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2011,7 +2016,7 @@ msgstr ""
 "\n"
 "Falló la conversión del conjunto caracteres."
 
-#: src/compose.c:5039 src/compose.c:9588
+#: src/compose.c:5080 src/compose.c:9646
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2021,7 +2026,7 @@ msgstr ""
 "\n"
 "No se pudo obtener la clave de cifrado del destinatario."
 
-#: src/compose.c:5045 src/compose.c:9582
+#: src/compose.c:5086 src/compose.c:9640
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2032,7 +2037,7 @@ msgstr ""
 "\n"
 "Falló la firma: %s"
 
-#: src/compose.c:5048
+#: src/compose.c:5089
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2043,11 +2048,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5050
+#: src/compose.c:5091
 msgid "Could not queue message for sending."
 msgstr "No se puede poner en la cola el mensaje para enviar."
 
-#: src/compose.c:5065 src/compose.c:5125
+#: src/compose.c:5106 src/compose.c:5166
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2055,7 +2060,7 @@ msgstr ""
 "El mensaje está en la cola pero no se pudo enviar.\n"
 "Utilize «Enviar mensaje(s) en cola» en la ventana principal para enviarlo"
 
-#: src/compose.c:5121
+#: src/compose.c:5162
 #, c-format
 msgid ""
 "%s\n"
@@ -2064,7 +2069,7 @@ msgstr ""
 "%s\n"
 "Utilize «Enviar mensaje(s) en cola» en la ventana principal para reintentar."
 
-#: src/compose.c:5494
+#: src/compose.c:5535
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2075,7 +2080,7 @@ msgstr ""
 "al conjunto de caracteres %s especificado.\n"
 "¿Enviarlo como %s?"
 
-#: src/compose.c:5552
+#: src/compose.c:5593
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2088,67 +2093,67 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:5733
+#: src/compose.c:5774
 msgid "Encryption warning"
 msgstr "Aviso de cifrado"
 
-#: src/compose.c:5734
+#: src/compose.c:5775
 msgid "+C_ontinue"
 msgstr "+C_ontinuar"
 
-#: src/compose.c:5783
+#: src/compose.c:5824
 msgid "No account for sending mails available!"
 msgstr "¡No hay ninguna cuenta disponible para enviar correos!"
 
-#: src/compose.c:5792
+#: src/compose.c:5833
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "La cuenta seleccionada no es NNTP: es imposible enviar el post."
 
-#: src/compose.c:6021
+#: src/compose.c:6062
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "El adjunto %s ya no existe. ¿Ignorar?"
 
-#: src/compose.c:6022 src/mainwindow.c:648 src/toolbar.c:229
-#: src/toolbar.c:2181
+#: src/compose.c:6063 src/mainwindow.c:648 src/toolbar.c:230
+#: src/toolbar.c:2182
 msgid "Cancel sending"
 msgstr "Cancelar envío"
 
-#: src/compose.c:6022
+#: src/compose.c:6063
 msgid "Ignore attachment"
 msgstr "Ignorar adjunto"
 
-#: src/compose.c:6061
+#: src/compose.c:6102
 #, c-format
 msgid "Original %s part"
 msgstr "Parte original %s"
 
-#: src/compose.c:6592
+#: src/compose.c:6681
 msgid "Add to address _book"
 msgstr "Añadir a la agen_da"
 
-#: src/compose.c:6748
+#: src/compose.c:6837
 msgid "Delete entry contents"
 msgstr "Borrar contenidos de la cuenta"
 
-#: src/compose.c:6752 src/plugins/vcalendar/vcal_meeting_gtk.c:295
+#: src/compose.c:6841 src/plugins/vcalendar/vcal_meeting_gtk.c:295
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Usar «tab» para autocompletar con la agenda"
 
-#: src/compose.c:6972
+#: src/compose.c:7061
 msgid "Mime type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:6978 src/mimeview.c:283 src/plugins/pgpcore/select-keys.c:396
+#: src/compose.c:7067 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:392
 #: src/prefs_matcher.c:627 src/prefs_summary_column.c:85 src/summaryview.c:447
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:7048
+#: src/compose.c:7130
 msgid "Save Message to "
 msgstr "Guardar mensaje en "
 
-#: src/compose.c:7081 src/editjpilot.c:276 src/editldap.c:520
+#: src/compose.c:7167 src/editjpilot.c:276 src/editldap.c:520
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1028
 #: src/plugins/bogofilter/bogofilter_gtk.c:188
@@ -2159,24 +2164,24 @@ msgstr "Guardar mensaje en "
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: src/compose.c:7569
+#: src/compose.c:7643
 msgid "Hea_der"
 msgstr "_Cabecera"
 
-#: src/compose.c:7574
+#: src/compose.c:7648
 msgid "_Attachments"
 msgstr "_Adjuntos"
 
-#: src/compose.c:7588
+#: src/compose.c:7662
 msgid "Othe_rs"
 msgstr "Ot_ros"
 
-#: src/compose.c:7603 src/gtk/headers.h:18
-#: src/plugins/pdf_viewer/poppler_viewer.c:704 src/summary_search.c:426
+#: src/compose.c:7677 src/gtk/headers.h:18
+#: src/plugins/pdf_viewer/poppler_viewer.c:704 src/summary_search.c:452
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: src/compose.c:7830
+#: src/compose.c:7891
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2185,20 +2190,20 @@ msgstr ""
 "No se puede iniciar el corrector ortográfico.\n"
 "%s"
 
-#: src/compose.c:7943
+#: src/compose.c:8000
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Desde: <i>%s</i>"
 
-#: src/compose.c:7977
+#: src/compose.c:8034
 msgid "Account to use for this email"
 msgstr "Cuenta a usar para este correo"
 
-#: src/compose.c:7979
+#: src/compose.c:8036
 msgid "Sender address to be used"
 msgstr "Dirección del remitente a usar"
 
-#: src/compose.c:8143
+#: src/compose.c:8200
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2207,64 +2212,64 @@ msgstr ""
 "No se ha podido cargar el sistema de privacidad «%s». No será posible firmar "
 "o cifrar este mensaje."
 
-#: src/compose.c:8243 src/plugins/archive/archiver_gtk.c:1082
+#: src/compose.c:8300 src/plugins/archive/archiver_gtk.c:1082
 msgid "_None"
 msgstr "_Ninguno"
 
-#: src/compose.c:8344 src/prefs_template.c:749
+#: src/compose.c:8401 src/prefs_template.c:753
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla en la línea %d."
 
-#: src/compose.c:8460
+#: src/compose.c:8517
 msgid "Template From format error."
 msgstr "Error de formato en el Desde de la plantilla."
 
-#: src/compose.c:8478
+#: src/compose.c:8535
 msgid "Template To format error."
 msgstr "Error de formato en el Para de la plantilla."
 
-#: src/compose.c:8496
+#: src/compose.c:8553
 msgid "Template Cc format error."
 msgstr "Error de formato en el Cc de la plantilla."
 
-#: src/compose.c:8514
+#: src/compose.c:8571
 msgid "Template Bcc format error."
 msgstr "Error de formato en el Bcc de la plantilla."
 
-#: src/compose.c:8533
+#: src/compose.c:8590
 msgid "Template subject format error."
 msgstr "Error de formato en el asunto de la plantilla."
 
-#: src/compose.c:8797
+#: src/compose.c:8854
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:8812
+#: src/compose.c:8869
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:8886
+#: src/compose.c:8943
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:8903
+#: src/compose.c:8960
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:8944
+#: src/compose.c:9001
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:8964
+#: src/compose.c:9021
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:8965
+#: src/compose.c:9022
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:9157
+#: src/compose.c:9214
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2275,15 +2280,15 @@ msgstr ""
 "¿Desea terminar el proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:9551 src/messageview.c:1116
+#: src/compose.c:9609 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail necesita acceso a la red para poder enviar este correo."
 
-#: src/compose.c:9577
+#: src/compose.c:9635
 msgid "Could not queue message."
 msgstr "El mensaje no se pudo poner en la cola."
 
-#: src/compose.c:9579
+#: src/compose.c:9637
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2294,15 +2299,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:9747
+#: src/compose.c:9805
 msgid "Could not save draft."
 msgstr "No se puede guardar el borrador."
 
-#: src/compose.c:9751
+#: src/compose.c:9809
 msgid "Could not save draft"
 msgstr "No se puede guardar el borrador"
 
-#: src/compose.c:9752
+#: src/compose.c:9810
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2310,24 +2315,24 @@ msgstr ""
 "No se ha podido guardar el borrador.\n"
 "¿Desea cancelar la salida o descartar este correo?"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Cancel exit"
 msgstr "_Cancelar salida"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Discard email"
 msgstr "_Descartar correo"
 
-#: src/compose.c:9914 src/compose.c:9928
+#: src/compose.c:9972 src/compose.c:9986
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:9942
+#: src/compose.c:10000
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No se puede leer el fichero «%s»."
 
-#: src/compose.c:9944
+#: src/compose.c:10002
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2336,60 +2341,62 @@ msgstr ""
 "El fichero «%s» contenía caracteres inválidos para\n"
 "la codificación actual, la inserción puede ser incorrecta."
 
-#: src/compose.c:10016
+#: src/compose.c:10081
 msgid "Discard message"
 msgstr "Descartar mensaje"
 
-#: src/compose.c:10017
+#: src/compose.c:10082
 msgid "This message has been modified. Discard it?"
 msgstr "Este mensaje se ha modificado. ¿Desea descartarlo?"
 
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Save to Drafts"
 msgstr "Guardar en _Borradores"
 
-#: src/compose.c:10020
+#: src/compose.c:10085
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: src/compose.c:10021
+#: src/compose.c:10086
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Este mensaje se ha modificado. ¿Guardar los últimos cambios?"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "_Don't save"
 msgstr "_No guardar"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "+_Save to Drafts"
 msgstr "+Guardar en _Borradores"
 
-#: src/compose.c:10092
+#: src/compose.c:10157
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:10094
+#: src/compose.c:10159
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:10095
+#: src/compose.c:10160 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:772 src/prefs_template.c:309 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:10095
+#: src/compose.c:10160
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: src/compose.c:10959
+#: src/compose.c:11024
 msgid "Insert or attach?"
 msgstr "¿Insertar o adjuntar?"
 
-#: src/compose.c:10960
+#: src/compose.c:11025
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2397,16 +2404,16 @@ msgstr ""
 "¿Quiere insertar el contenido de este/os fichero/s en el cuerpo del correo o "
 "prefiere adjuntarlo/s al mismo?"
 
-#: src/compose.c:10962
+#: src/compose.c:11027
 msgid "_Attach"
 msgstr "_Adjuntar"
 
-#: src/compose.c:11178
+#: src/compose.c:11243
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Error de formato de cita en la línea %d."
 
-#: src/compose.c:11462
+#: src/compose.c:11527
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2437,7 +2444,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Traza de depuración"
 
-#: src/crash.c:252 src/toolbar.c:420
+#: src/crash.c:252 src/toolbar.c:421
 msgid "Close"
 msgstr "Cerrar"
 
@@ -2554,41 +2561,41 @@ msgstr "Q_uitar imagen asociada"
 msgid "Photo"
 msgstr "Foto"
 
-#: src/editaddress.c:959 src/editaddress.c:961 src/expldifdlg.c:516
+#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:516
 #: src/exporthtml.c:761 src/ldif.c:766
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
-#: src/editaddress.c:968 src/editaddress.c:972 src/ldif.c:774
+#: src/editaddress.c:961 src/editaddress.c:965 src/ldif.c:774
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: src/editaddress.c:969 src/editaddress.c:971 src/ldif.c:770
+#: src/editaddress.c:962 src/editaddress.c:964 src/ldif.c:770
 msgid "First Name"
 msgstr "Nombre"
 
-#: src/editaddress.c:975 src/editaddress.c:977
+#: src/editaddress.c:968 src/editaddress.c:970
 msgid "Nickname"
 msgstr "Apodo"
 
-#: src/editaddress.c:1061 src/editaddress.c:1129
+#: src/editaddress.c:1054 src/editaddress.c:1122
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1271 src/editaddress.c:1340 src/editaddress.c:1360
+#: src/editaddress.c:1264 src/editaddress.c:1333 src/editaddress.c:1353
 #: src/prefs_customheader.c:223
 msgid "Value"
 msgstr "Valor"
 
-#: src/editaddress.c:1427
+#: src/editaddress.c:1424
 msgid "_User Data"
 msgstr "Datos de _usuario"
 
-#: src/editaddress.c:1428
+#: src/editaddress.c:1425
 msgid "_Email Addresses"
 msgstr "_Direcciones de correo"
 
-#: src/editaddress.c:1431 src/editaddress.c:1434
+#: src/editaddress.c:1428 src/editaddress.c:1431
 msgid "O_ther Attributes"
 msgstr "O_tros atributos"
 
@@ -2613,8 +2620,8 @@ msgid " Check File "
 msgstr " Comprobar fichero "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1942
-#: src/wizard.c:1371 src/wizard.c:1650
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1934
+#: src/wizard.c:1183 src/wizard.c:1457
 msgid "File"
 msgstr "Fichero"
 
@@ -2662,12 +2669,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:556 src/foldersel.c:552 src/imap_gtk.c:195 src/mh_gtk.c:145
+#: src/editgroup.c:556 src/foldersel.c:572 src/imap_gtk.c:195 src/mh_gtk.c:145
 #: src/plugins/mailmbox/plugin_gtk.c:239 src/plugins/rssyl/rssyl_cb_menu.c:89
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:557 src/foldersel.c:553 src/mh_gtk.c:146
+#: src/editgroup.c:557 src/foldersel.c:573 src/mh_gtk.c:146
 #: src/plugins/mailmbox/plugin_gtk.c:240 src/plugins/rssyl/rssyl_cb_menu.c:90
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
@@ -2738,7 +2745,7 @@ msgstr "Debe proporcionar al menos un atributo de búsqueda LDAP."
 msgid "Connected successfully to server"
 msgstr "Conectado con éxito al servidor"
 
-#: src/editldap.c:336 src/editldap.c:980
+#: src/editldap.c:336 src/editldap.c:976
 msgid "Edit LDAP Server"
 msgstr "Editar servidor LDAP"
 
@@ -2762,7 +2769,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3318
+#: src/editldap.c:471 src/prefs_account.c:3310
 msgid "SSL"
 msgstr "SSL"
 
@@ -2923,46 +2930,46 @@ msgstr ""
 msgid "Bind Password"
 msgstr "Asociar contraseña"
 
-#: src/editldap.c:733
+#: src/editldap.c:729
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "La contraseña a usar al conectar como el usuario \"Asociar DN\"."
 
-#: src/editldap.c:738
+#: src/editldap.c:734
 msgid "Timeout (secs)"
 msgstr "Tiempo límite (seg.)"
 
-#: src/editldap.c:752
+#: src/editldap.c:748
 msgid "The timeout period in seconds."
 msgstr "El tiempo máximo en segundos."
 
-#: src/editldap.c:756
+#: src/editldap.c:752
 msgid "Maximum Entries"
 msgstr "Nº entradas máximas"
 
-#: src/editldap.c:770
+#: src/editldap.c:766
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 "El número máximo de entradas que deberían retornarse en los resultados de la "
 "búsqueda."
 
-#: src/editldap.c:785 src/prefs_account.c:3209
+#: src/editldap.c:781 src/prefs_account.c:3201
 msgid "Basic"
 msgstr "Básicas"
 
-#: src/editldap.c:786
+#: src/editldap.c:782
 msgid "Search"
 msgstr "Buscar"
 
-#: src/editldap.c:787 src/gtk/quicksearch.c:661
+#: src/editldap.c:783 src/gtk/quicksearch.c:670
 msgid "Extended"
 msgstr "Extendido"
 
-#: src/editldap.c:985
+#: src/editldap.c:981
 msgid "Add New LDAP Server"
 msgstr "Añadir nuevo servidor LDAP"
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1444
+#: src/edittags.c:187 src/prefs_filtering_action.c:1446
 msgid "Tag"
 msgstr "Etiqueta"
 
@@ -2982,24 +2989,24 @@ msgstr "Borrar todas las etiquetas"
 msgid "Do you really want to delete all tags?"
 msgstr "¿Quiere borrar realmente todas las etiquetas?"
 
-#: src/edittags.c:422
+#: src/edittags.c:415
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr "El nombre de etiqueta introducido está reservado, elija uno distinto."
 
-#: src/edittags.c:464
+#: src/edittags.c:457
 msgid "Tag is not set."
 msgstr "Etiqueta no establecida."
 
-#: src/edittags.c:529
+#: src/edittags.c:522
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "Aplicar etiquetas"
 
-#: src/edittags.c:543
+#: src/edittags.c:536
 msgid "New tag:"
 msgstr "Nueva etiqueta:"
 
-#: src/edittags.c:576
+#: src/edittags.c:569
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr ""
 "Seleccione las etiquetas a aplicar/eliminar. Los cambios son inmediatos."
@@ -3084,9 +3091,9 @@ msgid "Stylesheet"
 msgstr "Hoja de estilos"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:133 src/mainwindow.c:1175
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1173
 #: src/plugins/archive/archiver_prefs.c:241 src/prefs_account.c:946
-#: src/prefs_toolbar.c:775 src/prefs_toolbar.c:1456 src/summaryview.c:6010
+#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1465 src/summaryview.c:6006
 msgid "None"
 msgstr "Ninguno"
 
@@ -3095,7 +3102,7 @@ msgstr "Ninguno"
 msgid "Default"
 msgstr "Por omisión"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:248
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
 #: src/plugins/pgpcore/sgpgme.c:148
 msgid "Full"
 msgstr "Completo"
@@ -3323,7 +3330,7 @@ msgstr "Exportar agenda a un fichero LDIF"
 msgid "Distinguished Name"
 msgstr "Nombre distinguido"
 
-#: src/export.c:113 src/summaryview.c:8154
+#: src/export.c:113 src/summaryview.c:8143
 msgid "Export to mbox file"
 msgstr "Exportar a fichero mbox"
 
@@ -3384,85 +3391,104 @@ msgstr "El nombre es demasiado largo."
 msgid "Not specified."
 msgstr "Sin especificar."
 
-#: src/folder.c:1571 src/foldersel.c:374 src/prefs_folder_item.c:308
+#: src/file_checker.c:76
+#, c-format
+msgid "The file %s is missing! Do you want to use the backup file from %s?"
+msgstr "¡Falta el fichero «%s»! ¿Desea usar la copia de respaldo de «%s»?"
+
+#: src/file_checker.c:84 src/file_checker.c:106
+#, c-format
+msgid "Could not copy %s to %s"
+msgstr "No se puede copiar «%s» a «%s»"
+
+#: src/file_checker.c:98
+#, c-format
+msgid ""
+"The file %s is empty or corrupted! Do you want to use the backup file from "
+"%s?"
+msgstr ""
+"¡El fichero «%s» está vacío o corrompido! ¿Desea usar la copia de respaldo "
+"de «%s»?"
+
+#: src/folder.c:1577 src/foldersel.c:394 src/prefs_folder_item.c:308
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/folder.c:1575 src/foldersel.c:378
+#: src/folder.c:1581 src/foldersel.c:398
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/folder.c:1579 src/foldersel.c:382
+#: src/folder.c:1585 src/foldersel.c:402
 #: src/plugins/attachwarner/attachwarner.c:219 src/prefs_folder_item.c:311
 msgid "Queue"
 msgstr "Cola"
 
-#: src/folder.c:1583 src/foldersel.c:386 src/prefs_folder_item.c:312
+#: src/folder.c:1589 src/foldersel.c:406 src/prefs_folder_item.c:312
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/folder.c:1587 src/foldersel.c:390 src/prefs_folder_item.c:310
+#: src/folder.c:1593 src/foldersel.c:410 src/prefs_folder_item.c:310
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/folder.c:2017
+#: src/folder.c:2023
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Procesando (%s)...\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copiando %s a %s...\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Moviendo %s a %s...\n"
 
-#: src/folder.c:3563
+#: src/folder.c:3569
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Actualizando cache para %s..."
 
-#: src/folder.c:4435
+#: src/folder.c:4443
 msgid "Processing messages..."
 msgstr "Procesando mensajes..."
 
-#: src/folder.c:4571
+#: src/folder.c:4579
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Sincronizando %s para uso sin conexión...\n"
 
-#: src/foldersel.c:221
+#: src/foldersel.c:239
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:554 src/imap_gtk.c:199 src/mh_gtk.c:147
+#: src/foldersel.c:574 src/imap_gtk.c:199 src/mh_gtk.c:147
 #: src/plugins/mailmbox/plugin_gtk.c:241 src/plugins/rssyl/rssyl_cb_menu.c:91
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:562 src/imap_gtk.c:210 src/imap_gtk.c:216
+#: src/foldersel.c:582 src/imap_gtk.c:210 src/imap_gtk.c:216
 #: src/imap_gtk.c:272 src/imap_gtk.c:277 src/mh_gtk.c:155 src/mh_gtk.c:259
 #: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:249
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:97
+#: src/plugins/mailmbox/plugin_gtk.c:416 src/plugins/rssyl/rssyl_cb_menu.c:97
 #: src/plugins/rssyl/rssyl_cb_menu.c:341
-#: src/plugins/vcalendar/vcal_folder.c:2028
+#: src/plugins/vcalendar/vcal_folder.c:2026
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "No se puede usar «%c» en el nombre de la carpeta."
 
-#: src/foldersel.c:572 src/imap_gtk.c:226 src/imap_gtk.c:284 src/mh_gtk.c:165
+#: src/foldersel.c:592 src/imap_gtk.c:226 src/imap_gtk.c:284 src/mh_gtk.c:165
 #: src/mh_gtk.c:266 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:261
-#: src/plugins/mailmbox/plugin_gtk.c:428 src/plugins/rssyl/rssyl_cb_menu.c:107
+#: src/plugins/mailmbox/plugin_gtk.c:425 src/plugins/rssyl/rssyl_cb_menu.c:107
 #: src/plugins/rssyl/rssyl_cb_menu.c:348
-#: src/plugins/vcalendar/vcal_folder.c:2035
+#: src/plugins/vcalendar/vcal_folder.c:2033
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La carpeta «%s» ya existe."
 
-#: src/foldersel.c:579 src/imap_gtk.c:232 src/mh_gtk.c:171
+#: src/foldersel.c:599 src/imap_gtk.c:232 src/mh_gtk.c:171
 #: src/plugins/mailmbox/plugin_gtk.c:268 src/plugins/rssyl/rssyl_cb_menu.c:113
 #, c-format
 msgid "Can't create the folder '%s'."
@@ -3494,13 +3520,13 @@ msgstr "Enviar _cola..."
 
 #: src/folderview.c:380 src/folderview.c:427
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:388 src/summaryview.c:6286
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:388 src/summaryview.c:6282
 msgid "New"
 msgstr "Nuevos"
 
 #: src/folderview.c:381 src/folderview.c:428
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:387 src/summaryview.c:6288
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:387 src/summaryview.c:6284
 msgid "Unread"
 msgstr "No leídos"
 
@@ -3514,107 +3540,107 @@ msgstr "Total"
 msgid "#"
 msgstr "Nº"
 
-#: src/folderview.c:734
+#: src/folderview.c:727
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 
-#: src/folderview.c:797 src/summaryview.c:4113 src/summaryview.c:4115
+#: src/folderview.c:790 src/summaryview.c:4109 src/summaryview.c:4111
 msgid "Mark all as read"
 msgstr "Marcar todo como leído"
 
-#: src/folderview.c:798 src/summaryview.c:4114
+#: src/folderview.c:791 src/summaryview.c:4110
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "¿Quiere realmente marcar todos los correos en la carpeta como leídos?"
 
-#: src/folderview.c:1021 src/imap.c:4490 src/mainwindow.c:5308 src/setup.c:91
+#: src/folderview.c:1014 src/imap.c:4497 src/mainwindow.c:5128 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Revisando carpeta %s%c%s..."
 
-#: src/folderview.c:1025 src/imap.c:4495 src/mainwindow.c:5313 src/setup.c:96
+#: src/folderview.c:1018 src/imap.c:4502 src/mainwindow.c:5133 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Revisando carpeta %s..."
 
-#: src/folderview.c:1056
+#: src/folderview.c:1049
 msgid "Rebuild folder tree"
 msgstr "Reconstruir árbol de carpetas"
 
-#: src/folderview.c:1057
+#: src/folderview.c:1050
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Reconstruir el árbol de carpetas eliminará la caché local. ¿Desea continuar?"
 
-#: src/folderview.c:1067
+#: src/folderview.c:1060
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo árbol de carpetas..."
 
-#: src/folderview.c:1069 src/folderview.c:1110
+#: src/folderview.c:1062 src/folderview.c:1103
 msgid "Scanning folder tree..."
 msgstr "Explorando árbol de carpetas..."
 
-#: src/folderview.c:1201
+#: src/folderview.c:1194
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "No se puede explorar la carpeta %s\n"
 
-#: src/folderview.c:1255
+#: src/folderview.c:1248
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:2083
+#: src/folderview.c:2076
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Cerrando carpeta %s..."
 
-#: src/folderview.c:2178
+#: src/folderview.c:2171
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Abriendo carpeta %s..."
 
-#: src/folderview.c:2196
+#: src/folderview.c:2189
 msgid "Folder could not be opened."
 msgstr "No se puede abrir la carpeta."
 
-#: src/folderview.c:2337 src/mainwindow.c:3059 src/mainwindow.c:3063
+#: src/folderview.c:2330 src/mainwindow.c:2877 src/mainwindow.c:2881
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2331
 msgid "Delete all messages in trash?"
 msgstr "¿Borrar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2339
+#: src/folderview.c:2332
 msgid "+_Empty trash"
 msgstr "+_Vaciar papelera"
 
-#: src/folderview.c:2383 src/inc.c:1620 src/toolbar.c:2689
+#: src/folderview.c:2376 src/inc.c:1538 src/toolbar.c:2678
 msgid "Offline warning"
 msgstr "Notificación conexión"
 
-#: src/folderview.c:2384 src/toolbar.c:2690
+#: src/folderview.c:2377 src/toolbar.c:2679
 msgid "You're working offline. Override?"
 msgstr "Está trabajando sin conexión ¿Ignorar?"
 
-#: src/folderview.c:2395 src/toolbar.c:2709
+#: src/folderview.c:2388 src/toolbar.c:2698
 msgid "Send queued messages"
 msgstr "Enviar mensajes en la cola"
 
-#: src/folderview.c:2396 src/toolbar.c:2710
+#: src/folderview.c:2389 src/toolbar.c:2699
 msgid "Send all queued messages?"
 msgstr "¿Enviar todos los mensajes en la cola?"
 
-#: src/folderview.c:2397 src/messageview.c:875 src/messageview.c:892
-#: src/toolbar.c:2711
+#: src/folderview.c:2390 src/messageview.c:853 src/messageview.c:870
+#: src/toolbar.c:2700
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/folderview.c:2405 src/toolbar.c:2729
+#: src/folderview.c:2398 src/toolbar.c:2718
 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocurrieron algunos errores enviando los mensajes en la cola."
 
-#: src/folderview.c:2408 src/main.c:2862 src/toolbar.c:2732
+#: src/folderview.c:2401 src/main.c:2689 src/toolbar.c:2721
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3623,64 +3649,64 @@ msgstr ""
 "Hubo algún error enviando los mensajes en la cola:\n"
 "%s"
 
-#: src/folderview.c:2485
+#: src/folderview.c:2478
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "¿Quiere realmente copiar la carpeta «%s» a «%s»?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2479
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "¿Quiere realmente hacer de la carpeta «%s» una subcarpeta de «%s»?"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Copy folder"
 msgstr "Copiar carpeta"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Move folder"
 msgstr "Mover carpeta"
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s a %s..."
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Moviendo %s a %s..."
 
-#: src/folderview.c:2530
+#: src/folderview.c:2523
 msgid "Source and destination are the same."
 msgstr "El destino y el origen son la misma."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2526
 msgid "Can't copy a folder to one of its children."
 msgstr "No se puede copiar una carpeta a una de sus subcarpetas."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2527
 msgid "Can't move a folder to one of its children."
 msgstr "No se puede mover la carpeta a una de sus subcarpetas."
 
-#: src/folderview.c:2537
+#: src/folderview.c:2530
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "No se pueden mover carpetas entre buzones distintos."
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Copy failed!"
 msgstr "¡Copiar falló!"
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Move failed!"
 msgstr "¡Mover falló!"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2584
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuración de procesamiento para la carpeta «%s»"
 
-#: src/folderview.c:3018 src/summaryview.c:4554 src/summaryview.c:4653
+#: src/folderview.c:3011 src/summaryview.c:4550 src/summaryview.c:4649
 msgid "The destination folder can only be used to store subfolders."
 msgstr "La carpeta destino sólo puede usarse para almacenar subcarpetas."
 
@@ -3828,7 +3854,7 @@ msgstr ""
 "Localización: %s (caracteres: %s)\n"
 "Sistema operativo: desconocido"
 
-#: src/gtk/about.c:243 src/prefs_themes.c:728 src/wizard.c:545
+#: src/gtk/about.c:243 src/prefs_themes.c:728 src/wizard.c:523
 msgid "The Claws Mail Team"
 msgstr "El equipo de Claws Mail"
 
@@ -3956,44 +3982,44 @@ msgstr ""
 ">. \n"
 "\n"
 
-#: src/gtk/about.c:699 src/main.c:2689
+#: src/gtk/about.c:699 src/main.c:2516
 msgid "Session statistics\n"
 msgstr "Estadísticas de sesión\n"
 
-#: src/gtk/about.c:709 src/gtk/about.c:712 src/main.c:2699 src/main.c:2702
+#: src/gtk/about.c:709 src/gtk/about.c:712 src/main.c:2526 src/main.c:2529
 #, c-format
 msgid "Started: %s\n"
 msgstr "Iniciado: %s\n"
 
-#: src/gtk/about.c:719 src/main.c:2708
+#: src/gtk/about.c:719 src/main.c:2535
 msgid "Incoming traffic\n"
 msgstr "Tráfico entrante\n"
 
-#: src/gtk/about.c:722 src/main.c:2711
+#: src/gtk/about.c:722 src/main.c:2538
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Mensajes recibidos: %d\n"
 
-#: src/gtk/about.c:729 src/main.c:2717
+#: src/gtk/about.c:729 src/main.c:2544
 msgid "Outgoing traffic\n"
 msgstr "Tráfico saliente\n"
 
-#: src/gtk/about.c:732 src/main.c:2720
+#: src/gtk/about.c:732 src/main.c:2547
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Mensajes nuevos/redirijidos: %d\n"
 
-#: src/gtk/about.c:737 src/main.c:2724
+#: src/gtk/about.c:737 src/main.c:2551
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Mensajes respondidos: %d\n"
 
-#: src/gtk/about.c:742 src/main.c:2728
+#: src/gtk/about.c:742 src/main.c:2555
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Mensajes reenviados: %d\n"
 
-#: src/gtk/about.c:747 src/main.c:2732
+#: src/gtk/about.c:747 src/main.c:2559
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total mensajes salientes: %d\n"
@@ -4036,63 +4062,63 @@ msgstr "_Notas de la versión"
 msgid "_Statistics"
 msgstr "E_stadísticas"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:358
 msgid "Orange"
 msgstr "Naranja"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:362
 msgid "Red"
 msgstr "Rojo"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:366
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:370
 msgid "Sky blue"
 msgstr "Azul cielo"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:374
 msgid "Blue"
 msgstr "Azul"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:378
 msgid "Green"
 msgstr "Verde"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:382
 msgid "Brown"
 msgstr "Marrón"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:386
 msgid "Grey"
 msgstr "Gris"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:390
 msgid "Light brown"
 msgstr "Marrón claro"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:394
 msgid "Dark red"
 msgstr "Rojo oscuro"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:398
 msgid "Dark pink"
 msgstr "Rosa oscuro"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:402
 msgid "Steel blue"
 msgstr "Azul acero"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:406
 msgid "Gold"
 msgstr "Dorado"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:410
 msgid "Bright green"
 msgstr "Verde brillante"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:424
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:414
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -4219,8 +4245,8 @@ msgstr ""
 "El corrector ortográfico no pudo cambiar el diccionario alternativo.\n"
 "%s"
 
-#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1257
-#: src/prefs_matcher.c:2152 src/prefs_summary_column.c:84 src/quote_fmt.c:49
+#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1259
+#: src/prefs_matcher.c:2158 src/prefs_summary_column.c:84 src/quote_fmt.c:49
 #: src/summaryview.c:446
 msgid "Date"
 msgstr "Fecha"
@@ -4229,13 +4255,13 @@ msgstr "Fecha"
 msgid "Date:"
 msgstr "Fecha:"
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1254
-#: src/prefs_matcher.c:2149 src/prefs_summary_column.c:82 src/quote_fmt.c:50
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1256
+#: src/prefs_matcher.c:2155 src/prefs_summary_column.c:82 src/quote_fmt.c:50
 #: src/summaryview.c:444
 msgid "From"
 msgstr "Desde"
 
-#: src/gtk/headers.h:9 src/summary_search.c:412
+#: src/gtk/headers.h:9 src/summary_search.c:438
 msgid "From:"
 msgstr "Desde:"
 
@@ -4251,14 +4277,14 @@ msgstr "Remitente:"
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2150 src/prefs_summary_column.c:83 src/quote_fmt.c:57
+#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1257
+#: src/prefs_matcher.c:2156 src/prefs_summary_column.c:83 src/quote_fmt.c:57
 #: src/summaryview.c:445
 msgid "To"
 msgstr "Para"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2151 src/quote_fmt.c:58
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1258
+#: src/prefs_matcher.c:2157 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
@@ -4266,8 +4292,8 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1258
-#: src/prefs_matcher.c:2153 src/quote_fmt.c:61
+#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1260
+#: src/prefs_matcher.c:2159 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "ID-Mensaje"
 
@@ -4279,8 +4305,8 @@ msgstr "ID-Mensaje:"
 msgid "In-Reply-To"
 msgstr "En-Respuesta-A"
 
-#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2155 src/quote_fmt.c:60
+#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1262
+#: src/prefs_matcher.c:2161 src/quote_fmt.c:60
 msgid "References"
 msgstr "Referencias"
 
@@ -4288,8 +4314,8 @@ msgstr "Referencias"
 msgid "References:"
 msgstr "Referencias:"
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1253
-#: src/prefs_matcher.c:2148 src/prefs_summary_column.c:81 src/quote_fmt.c:56
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1255
+#: src/prefs_matcher.c:2154 src/prefs_summary_column.c:81 src/quote_fmt.c:56
 #: src/summaryview.c:443
 msgid "Subject"
 msgstr "Asunto"
@@ -4382,8 +4408,8 @@ msgstr "Recibido"
 msgid "Received:"
 msgstr "Recibido:"
 
-#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2154 src/quote_fmt.c:59
+#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1261
+#: src/prefs_matcher.c:2160 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
@@ -4705,39 +4731,39 @@ msgstr ""
 "<span weight=\"bold\">Los siguientes iconos se usan para mostrar el estado "
 "de los mensajes y las carpetas:</span>"
 
-#: src/gtk/inputdialog.c:246 src/gtk/inputdialog.c:268
+#: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Contraseña para %s en %s:"
 
-#: src/gtk/inputdialog.c:249 src/gtk/inputdialog.c:252
-#: src/gtk/inputdialog.c:271 src/gtk/inputdialog.c:274
+#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
+#: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
 #, c-format
 msgid "Input password for %s:"
 msgstr "Introduzca contraseña para %s:"
 
-#: src/gtk/inputdialog.c:255 src/gtk/inputdialog.c:277
+#: src/gtk/inputdialog.c:242 src/gtk/inputdialog.c:264
 msgid "Input password:"
 msgstr "Introduzca contraseña:"
 
-#: src/gtk/inputdialog.c:256 src/gtk/inputdialog.c:284
-#: src/gtk/inputdialog.c:296
+#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
+#: src/gtk/inputdialog.c:283
 msgid "Input password"
 msgstr "Introducir contraseña"
 
-#: src/gtk/inputdialog.c:286
+#: src/gtk/inputdialog.c:273
 msgid "Remember password for this session"
 msgstr "Recordar la contraseña para esta sesión"
 
-#: src/gtk/inputdialog.c:385 src/gtk/inputdialog.c:434
+#: src/gtk/inputdialog.c:372 src/gtk/inputdialog.c:421
 msgid "Remember this"
 msgstr "Recordar esto"
 
-#: src/gtk/logwindow.c:451
+#: src/gtk/logwindow.c:447
 msgid "Clear _Log"
 msgstr "_Limpiar traza"
 
-#: src/gtk/menu.c:145
+#: src/gtk/menu.c:137
 msgid ""
 "<span><b>Warning:</b> This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -4782,8 +4808,7 @@ msgstr ""
 
 #: src/gtk/pluginwindow.c:304 src/plugins/acpi_notifier/acpi_notifier.c:790
 #: src/plugins/archive/archiver_prefs.c:92
-#: src/plugins/att_remover/att_remover.c:519
-#: src/plugins/attachwarner/attachwarner_prefs.c:201
+#: src/plugins/attachwarner/attachwarner_prefs.c:228
 #: src/plugins/address_keeper/address_keeper_prefs.c:248
 #: src/plugins/bogofilter/bogofilter_gtk.c:457
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
@@ -4802,7 +4827,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:557 src/plugins/rssyl/rssyl_prefs.c:63
 #: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:648
-#: src/plugins/vcalendar/vcal_prefs.c:645 src/prefs_toolbar.c:939
+#: src/plugins/vcalendar/vcal_prefs.c:647 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Módulos"
 
@@ -4818,238 +4843,239 @@ msgstr "Descargar"
 msgid "Description"
 msgstr "Descripción"
 
-#: src/gtk/pluginwindow.c:373
-msgid "More plugins are available from the Claws Mail website."
-msgstr "Hay más módulos disponibles en el sitio web de Claws Mail."
-
-#: src/gtk/pluginwindow.c:379 src/prefs_themes.c:843
-msgid "Get more..."
-msgstr "Obtener más..."
+#: src/gtk/pluginwindow.c:374
+#, c-format
+msgid ""
+"For more information about plugins see the <a href=\"%s\"><span underline="
+"\"none\">Claws Mail website</span></a>."
+msgstr ""
+"Para más información sobre los módulos vea el <a href=\"%s\"><span "
+"underline=\"none\">sitio web de Claws Mail</a>."
 
-#: src/gtk/pluginwindow.c:415
+#: src/gtk/pluginwindow.c:414
 msgid "Click here to load one or more plugins"
 msgstr "Pulse aquí para cargar uno o más módulos"
 
-#: src/gtk/pluginwindow.c:418
+#: src/gtk/pluginwindow.c:417
 msgid "Unload the selected plugin"
 msgstr "Descargar el módulo seleccionado"
 
-#: src/gtk/pluginwindow.c:483
+#: src/gtk/pluginwindow.c:482
 msgid "Loaded plugins"
 msgstr "Módulos cargados"
 
-#: src/gtk/prefswindow.c:679
+#: src/gtk/prefswindow.c:671
 msgid "Page Index"
 msgstr "Página índice"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:830
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:828
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: src/gtk/progressdialog.c:141 src/prefs_account.c:3208
-#: src/prefs_account.c:3226 src/prefs_account.c:3244 src/prefs_account.c:3262
-#: src/prefs_account.c:3280 src/prefs_account.c:3298 src/prefs_account.c:3317
-#: src/prefs_account.c:3399 src/prefs_filtering_action.c:1419
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1881
+#: src/gtk/progressdialog.c:141 src/prefs_account.c:3200
+#: src/prefs_account.c:3218 src/prefs_account.c:3236 src/prefs_account.c:3254
+#: src/prefs_account.c:3272 src/prefs_account.c:3290 src/prefs_account.c:3309
+#: src/prefs_account.c:3399 src/prefs_filtering_action.c:1421
+#: src/prefs_filtering.c:397 src/prefs_filtering.c:1877
 msgid "Account"
 msgstr "Cuenta"
 
-#: src/gtk/quicksearch.c:433
+#: src/gtk/quicksearch.c:442
 msgid "all messages"
 msgstr "todos los mensajes"
 
-#: src/gtk/quicksearch.c:434
+#: src/gtk/quicksearch.c:443
 msgid "messages whose age is greater than # days"
 msgstr "mensajes cuya edad es mayor que # días"
 
-#: src/gtk/quicksearch.c:435
+#: src/gtk/quicksearch.c:444
 msgid "messages whose age is less than # days"
 msgstr "mensajes cuya edad es menor que # días"
 
-#: src/gtk/quicksearch.c:436
+#: src/gtk/quicksearch.c:445
 msgid "messages whose age is greater than # hours"
 msgstr "mensajes cuya edad es mayor que # horas"
 
-#: src/gtk/quicksearch.c:437
+#: src/gtk/quicksearch.c:446
 msgid "messages whose age is less than # hours"
 msgstr "mensajes cuya edad es menor que # horas"
 
-#: src/gtk/quicksearch.c:438
+#: src/gtk/quicksearch.c:447
 msgid "messages which contain S in the message body"
 msgstr "mensajes que contienen S en el cuerpo del mensaje"
 
-#: src/gtk/quicksearch.c:439
+#: src/gtk/quicksearch.c:448
 msgid "messages which contain S in the whole message"
 msgstr "mensajes que contienen S en el mensaje completo"
 
-#: src/gtk/quicksearch.c:440
+#: src/gtk/quicksearch.c:449
 msgid "messages carbon-copied to S"
 msgstr "mensajes con copia-carbón a S"
 
-#: src/gtk/quicksearch.c:441
+#: src/gtk/quicksearch.c:450
 msgid "message is either to: or cc: to S"
 msgstr "mensaje con Para: o Cc: a S"
 
-#: src/gtk/quicksearch.c:442
+#: src/gtk/quicksearch.c:451
 msgid "deleted messages"
 msgstr "mensajes borrados"
 
-#: src/gtk/quicksearch.c:443
+#: src/gtk/quicksearch.c:452
 msgid "messages which contain S in the Sender field"
 msgstr "mensajes que contienen S en el campo remitente"
 
-#: src/gtk/quicksearch.c:444
+#: src/gtk/quicksearch.c:453
 msgid "true if execute \"S\" succeeds"
 msgstr "cierto si ejecutar \"S\" tiene éxito"
 
-#: src/gtk/quicksearch.c:445
+#: src/gtk/quicksearch.c:454
 msgid "messages originating from user S"
 msgstr "mensajes provinientes del usuario S"
 
-#: src/gtk/quicksearch.c:446
+#: src/gtk/quicksearch.c:455
 msgid "forwarded messages"
 msgstr "mensajes reenviados"
 
-#: src/gtk/quicksearch.c:447
+#: src/gtk/quicksearch.c:456
 msgid "messages which have attachments"
 msgstr "mensajes que tienen adjuntos"
 
-#: src/gtk/quicksearch.c:448
+#: src/gtk/quicksearch.c:457
 msgid "messages which contain header S"
 msgstr "mensajes que contienen la cabecera S"
 
-#: src/gtk/quicksearch.c:449
+#: src/gtk/quicksearch.c:458
 msgid "messages which contain S in Message-ID header"
 msgstr "mensajes que contienen S en la cabecera Message-ID"
 
-#: src/gtk/quicksearch.c:450
+#: src/gtk/quicksearch.c:459
 msgid "messages which contain S in In-Reply-To header"
 msgstr "mensajes que contienen S en la cabecera In-Reply-To"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:460
 msgid "messages which are marked with color #"
 msgstr "mensajes que están marcados con el color nº"
 
-#: src/gtk/quicksearch.c:452
+#: src/gtk/quicksearch.c:461
 msgid "locked messages"
 msgstr "mensajes bloqueados"
 
-#: src/gtk/quicksearch.c:453
+#: src/gtk/quicksearch.c:462
 msgid "messages which are in newsgroup S"
 msgstr "mensajes que están en el grupo de noticias S"
 
-#: src/gtk/quicksearch.c:454
+#: src/gtk/quicksearch.c:463
 msgid "new messages"
 msgstr "mensajes nuevos"
 
-#: src/gtk/quicksearch.c:455
+#: src/gtk/quicksearch.c:464
 msgid "old messages"
 msgstr "mensajes antiguos"
 
-#: src/gtk/quicksearch.c:456
+#: src/gtk/quicksearch.c:465
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "mensajes incompletos (no descargados por completo)"
 
-#: src/gtk/quicksearch.c:457
+#: src/gtk/quicksearch.c:466
 msgid "messages which have been replied to"
 msgstr "mensajes que han sido respondidos"
 
-#: src/gtk/quicksearch.c:458
+#: src/gtk/quicksearch.c:467
 msgid "read messages"
 msgstr "mensajes leídos"
 
-#: src/gtk/quicksearch.c:459
+#: src/gtk/quicksearch.c:468
 msgid "messages which contain S in subject"
 msgstr "mensajes que contienen S en el asunto"
 
-#: src/gtk/quicksearch.c:460
+#: src/gtk/quicksearch.c:469
 msgid "messages whose score is equal to # points"
 msgstr "mensajes con puntuación igual a # puntos"
 
-#: src/gtk/quicksearch.c:461
+#: src/gtk/quicksearch.c:470
 msgid "messages whose score is greater than # points"
 msgstr "mensajes con puntuación mayor que # puntos"
 
-#: src/gtk/quicksearch.c:462
+#: src/gtk/quicksearch.c:471
 msgid "messages whose score is lower than # points"
 msgstr "mensajes con puntuación menor que # puntos"
 
-#: src/gtk/quicksearch.c:463
+#: src/gtk/quicksearch.c:472
 msgid "messages whose size is equal to # bytes"
 msgstr "mensajes con tamaño igual a # bytes"
 
-#: src/gtk/quicksearch.c:464
+#: src/gtk/quicksearch.c:473
 msgid "messages whose size is greater than # bytes"
 msgstr "mensajes con tamaño mayor que # bytes"
 
-#: src/gtk/quicksearch.c:465
+#: src/gtk/quicksearch.c:474
 msgid "messages whose size is smaller than # bytes"
 msgstr "mensajes con tamaño menor que # bytes"
 
-#: src/gtk/quicksearch.c:466
+#: src/gtk/quicksearch.c:475
 msgid "messages which have been sent to S"
 msgstr "mensajes que han sido enviados a S"
 
-#: src/gtk/quicksearch.c:467
+#: src/gtk/quicksearch.c:476
 msgid "messages which tags contain S"
 msgstr "mensajes cuyas etiquetas contienen S"
 
-#: src/gtk/quicksearch.c:468
+#: src/gtk/quicksearch.c:477
 msgid "messages which have tag(s)"
 msgstr "mensajes que tienen etiqueta(s)"
 
-#: src/gtk/quicksearch.c:469
+#: src/gtk/quicksearch.c:478
 msgid "marked messages"
 msgstr "mensajes marcados"
 
-#: src/gtk/quicksearch.c:470
+#: src/gtk/quicksearch.c:479
 msgid "unread messages"
 msgstr "mensajes sin leer"
 
-#: src/gtk/quicksearch.c:471
+#: src/gtk/quicksearch.c:480
 msgid "messages which contain S in References header"
 msgstr "mensajes que contienen S en la cabecera References"
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:481
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "mensajes que devuelven 0 al pasarlos a una orden - %F es el fichero del "
 "mensaje"
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:482
 msgid "messages which contain S in X-Label header"
 msgstr "mensajes que contienen S en la cabecera X-Label"
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:484
 msgid "logical AND operator"
 msgstr "operador Y lógico"
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:485
 msgid "logical OR operator"
 msgstr "operador O lógico"
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:486
 msgid "logical NOT operator"
 msgstr "operador NO lógico"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:487
 msgid "case sensitive search"
 msgstr "sensible a mayús./minús."
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:488
 msgid "match using regular expressions instead of substring search"
 msgstr "buscar coindidencias con expresiones regulares en lugar de subcadenas"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:490
 msgid "all filtering expressions are allowed"
 msgstr "se admite cualquier expresión de filtrado"
 
-#: src/gtk/quicksearch.c:490 src/summary_search.c:457
+#: src/gtk/quicksearch.c:499 src/summary_search.c:483
 msgid "Extended Search"
 msgstr "Búsqueda extendida"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:500
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
@@ -5059,47 +5085,52 @@ msgstr ""
 "para los mensajes mostrados en la lista de mensajes.\n"
 "Se pueden utilizar los siguientes símbolos:"
 
-#: src/gtk/quicksearch.c:591
+#: src/gtk/quicksearch.c:600
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Algo falló durante la búsqueda. Por favor compruebe la traza."
 
-#: src/gtk/quicksearch.c:657
+#: src/gtk/quicksearch.c:666
 msgid "From/To/Subject/Tag"
 msgstr "Desde/Para/Asunto/Etiqueta"
 
-#: src/gtk/quicksearch.c:668 src/plugins/archive/archiver_prefs.c:322
+#: src/gtk/quicksearch.c:677 src/plugins/archive/archiver_prefs.c:322
 msgid "Recursive"
 msgstr "Recursivo"
 
-#: src/gtk/quicksearch.c:677
+#: src/gtk/quicksearch.c:686
 msgid "Sticky"
 msgstr "Pegajoso"
 
-#: src/gtk/quicksearch.c:687
+#: src/gtk/quicksearch.c:696
 msgid "Type-ahead"
 msgstr "Mientras teclea"
 
-#: src/gtk/quicksearch.c:699
+#: src/gtk/quicksearch.c:708
 msgid "Run on select"
 msgstr "Ejecutar sobre la selección"
 
-#: src/gtk/quicksearch.c:741
+#: src/gtk/quicksearch.c:750
 msgid "Clear the current search"
 msgstr "Limpiar la búsqueda actual"
 
-#: src/gtk/quicksearch.c:751 src/summary_search.c:410
+#: src/gtk/quicksearch.c:760 src/summary_search.c:436
 msgid "Edit search criteria"
 msgstr "Editar el criterio de búsqueda"
 
-#: src/gtk/quicksearch.c:760
+#: src/gtk/quicksearch.c:769
 msgid "Information about extended symbols"
 msgstr "Información sobre los símbolos extendidos"
 
-#: src/gtk/quicksearch.c:798 src/gtk/quicksearch.c:813
+#: src/gtk/quicksearch.c:807 src/gtk/quicksearch.c:822
 msgid "_Information"
 msgstr "_Información"
 
-#: src/gtk/quicksearch.c:800 src/gtk/quicksearch.c:815
+#: src/gtk/quicksearch.c:808 src/gtk/quicksearch.c:823
+msgid "E_dit"
+msgstr "E_ditar"
+
+#: src/gtk/quicksearch.c:809 src/gtk/quicksearch.c:824 src/prefs_actions.c:347
+#: src/prefs_filtering.c:495 src/prefs_template.c:328
 msgid "C_lear"
 msgstr "_Limpiar"
 
@@ -5264,7 +5295,7 @@ msgstr "(Sin asunto)"
 msgid "Error:"
 msgstr "Error:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2578
+#: src/image_viewer.c:299 src/mimeview.c:2546
 #: src/plugins/pdf_viewer/poppler_viewer.c:700
 msgid "Filename:"
 msgstr "Nombre:"
@@ -5543,17 +5574,17 @@ msgstr "Falló la conexión con %s"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La conexión IMAP4 con %s se ha desconectado. Reconectando...\n"
 
-#: src/imap.c:992 src/imap.c:3539 src/imap.c:4199 src/imap.c:4296
-#: src/imap.c:4479 src/imap.c:5276
+#: src/imap.c:992 src/imap.c:3546 src/imap.c:4206 src/imap.c:4303
+#: src/imap.c:4486 src/imap.c:5283
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail necesita acceso a la red para poder acceder al servidor IMAP."
 
-#: src/imap.c:1086 src/inc.c:816 src/news.c:394 src/send_message.c:308
+#: src/imap.c:1086 src/inc.c:814 src/news.c:388 src/send_message.c:269
 msgid "Insecure connection"
 msgstr "Conexión insegura"
 
-#: src/imap.c:1087 src/inc.c:817 src/news.c:395 src/send_message.c:309
+#: src/imap.c:1087 src/inc.c:815 src/news.c:389 src/send_message.c:270
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5566,7 +5597,7 @@ msgstr ""
 "\n"
 "¿Quiere seguir conectando con este servidor? La comunicación no sería segura."
 
-#: src/imap.c:1093 src/inc.c:823 src/news.c:401 src/send_message.c:315
+#: src/imap.c:1093 src/inc.c:821 src/news.c:395 src/send_message.c:276
 msgid "Con_tinue connecting"
 msgstr "Seguir conec_tando"
 
@@ -5585,91 +5616,91 @@ msgstr "No se puede conectar al servidor IMAP4: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No se puede conectar al servidor IMAP4: %s:%d\n"
 
-#: src/imap.c:1187 src/imap.c:3961
+#: src/imap.c:1187 src/imap.c:3968
 msgid "Can't start TLS session.\n"
 msgstr "No se puede iniciar la sesión TLS.\n"
 
-#: src/imap.c:1243
+#: src/imap.c:1250
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "No se puede entrar al servidor IMAP %s.\n"
 
-#: src/imap.c:1246
+#: src/imap.c:1253
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "No se puede entrar al servidor IMAP %s."
 
-#: src/imap.c:1640
+#: src/imap.c:1647
 msgid "Adding messages..."
 msgstr "Añadiendo mensajes..."
 
-#: src/imap.c:1842 src/mh.c:520
+#: src/imap.c:1849 src/mh.c:520
 msgid "Copying messages..."
 msgstr "Copiando mensajes..."
 
-#: src/imap.c:2421
+#: src/imap.c:2428
 msgid "can't set deleted flags\n"
 msgstr "no se pueden establecer los flags «borrado»\n"
 
-#: src/imap.c:2428 src/imap.c:4906
+#: src/imap.c:2435 src/imap.c:4913
 msgid "can't expunge\n"
 msgstr "no puedo purgar\n"
 
-#: src/imap.c:2779
+#: src/imap.c:2786
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscando carpetas no suscritas en %s..."
 
-#: src/imap.c:2782
+#: src/imap.c:2789
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscando subcarpetas de %s..."
 
-#: src/imap.c:3078
+#: src/imap.c:3085
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 
-#: src/imap.c:3093
+#: src/imap.c:3100
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 
-#: src/imap.c:3184
+#: src/imap.c:3191
 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 "El nuevo nombre de la carpeta no debe contener el separador del espacio de "
 "nombres"
 
-#: src/imap.c:3221
+#: src/imap.c:3228
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "no puedo renombrar el buzón: %s a %s\n"
 
-#: src/imap.c:3333
+#: src/imap.c:3340
 msgid "can't delete mailbox\n"
 msgstr "no se puede borrar el buzón\n"
 
-#: src/imap.c:3620
+#: src/imap.c:3627
 msgid "LIST failed\n"
 msgstr "LIST falló\n"
 
-#: src/imap.c:3705
+#: src/imap.c:3712
 msgid "Flagging messages..."
 msgstr "Etiquetando mensajes..."
 
-#: src/imap.c:3806
+#: src/imap.c:3813
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: src/imap.c:3958
+#: src/imap.c:3965
 msgid "Server requires TLS to log in.\n"
 msgstr "El servidor necesita TLS para acceder a él.\n"
 
-#: src/imap.c:3968
+#: src/imap.c:3975
 msgid "Can't refresh capabilities.\n"
 msgstr "No se pueden refrescar las capacidades.\n"
 
-#: src/imap.c:3973
+#: src/imap.c:3980
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5678,20 +5709,20 @@ msgstr ""
 "La conexión con %s falló: el servidor necesita TLS, pero Claws Mail ha sido "
 "compilado sin soporte OpenSSL.\n"
 
-#: src/imap.c:3981
+#: src/imap.c:3988
 msgid "Server logins are disabled.\n"
 msgstr "Los accesos al servidor están deshabilitados.\n"
 
-#: src/imap.c:4204
+#: src/imap.c:4211
 msgid "Fetching message..."
 msgstr "Recuperando mensaje..."
 
-#: src/imap.c:4899
+#: src/imap.c:4906
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no se pueden establecer los flags 'borrado': %d\n"
 
-#: src/imap.c:5932
+#: src/imap.c:5939
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -5779,21 +5810,21 @@ msgid "Inherit properties from parent folder"
 msgstr "Heredar las propiedades de la carpeta padre"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:249 src/news_gtk.c:305
-#: src/plugins/mailmbox/plugin_gtk.c:408 src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/vcalendar/vcal_folder.c:2020
+#: src/plugins/mailmbox/plugin_gtk.c:405 src/plugins/rssyl/rssyl_cb_menu.c:333
+#: src/plugins/vcalendar/vcal_folder.c:2018
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Introduzca el nuevo nombre para «%s»:"
 
-#: src/imap_gtk.c:263 src/mh_gtk.c:251 src/plugins/mailmbox/plugin_gtk.c:409
+#: src/imap_gtk.c:263 src/mh_gtk.c:251 src/plugins/mailmbox/plugin_gtk.c:406
 #: src/plugins/rssyl/rssyl_cb_menu.c:334
-#: src/plugins/vcalendar/vcal_folder.c:2021
+#: src/plugins/vcalendar/vcal_folder.c:2019
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
 #: src/imap_gtk.c:292 src/mh_gtk.c:274 src/news_gtk.c:327
-#: src/plugins/mailmbox/plugin_gtk.c:438 src/plugins/rssyl/rssyl_cb_menu.c:354
-#: src/plugins/vcalendar/vcal_folder.c:2041
+#: src/plugins/mailmbox/plugin_gtk.c:433 src/plugins/rssyl/rssyl_cb_menu.c:354
+#: src/plugins/vcalendar/vcal_folder.c:2039
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -5815,8 +5846,8 @@ msgstr ""
 "¿Está seguro de que quiere borrarlos?"
 
 #: src/imap_gtk.c:381 src/mh_gtk.c:220 src/news_gtk.c:280
-#: src/plugins/mailmbox/plugin_gtk.c:343 src/plugins/rssyl/rssyl_cb_menu.c:256
-#: src/plugins/vcalendar/vcal_folder.c:1974
+#: src/plugins/mailmbox/plugin_gtk.c:341 src/plugins/rssyl/rssyl_cb_menu.c:256
+#: src/plugins/vcalendar/vcal_folder.c:1972
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No se puede eliminar la carpeta «%s»."
@@ -6071,141 +6102,141 @@ msgstr "Seleccionar fichero Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Importar fichero Pine a la agenda"
 
-#: src/inc.c:205 src/inc.c:312 src/inc.c:339
+#: src/inc.c:186 src/inc.c:293 src/inc.c:320
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail necesita acceso a la red para poder obtener el correo."
 
-#: src/inc.c:361
+#: src/inc.c:342
 #, c-format
 msgid "%s failed\n"
 msgstr "%s falló\n"
 
-#: src/inc.c:432
+#: src/inc.c:413
 msgid "Retrieving new messages"
 msgstr "Obteniendo nuevos mensajes"
 
-#: src/inc.c:493
+#: src/inc.c:474
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:618 src/inc.c:672
+#: src/inc.c:617 src/inc.c:671
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:629
+#: src/inc.c:628
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:638
+#: src/inc.c:637
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Hecho (%d mensaje (%s) recibido)"
 msgstr[1] "Hecho (%d mensajes (%s) recibidos)"
 
-#: src/inc.c:644
+#: src/inc.c:643
 msgid "Done (no new messages)"
 msgstr "Hecho (no hay mensajes nuevos)"
 
-#: src/inc.c:649
+#: src/inc.c:648
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Auth failed"
 msgstr "Authorización fallida"
 
-#: src/inc.c:659 src/prefs_matcher.c:393 src/prefs_summary_column.c:88
-#: src/summaryview.c:2782 src/summaryview.c:6312
+#: src/inc.c:658 src/prefs_matcher.c:393 src/prefs_summary_column.c:88
+#: src/summaryview.c:2782 src/summaryview.c:6308
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:669 src/plugins/spamassassin/spamassassin_gtk.c:378
+#: src/inc.c:668 src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Timeout"
 msgstr "Tiempo límite"
 
-#: src/inc.c:756
+#: src/inc.c:755
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Finalizado (%d mensaje nuevo)"
 msgstr[1] "Finalizado (%d mensajes nuevos)"
 
-#: src/inc.c:760
+#: src/inc.c:759
 msgid "Finished (no new messages)"
 msgstr "Finalizado (no hay mensajes nuevos)"
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando nuevos mensajes"
 
-#: src/inc.c:832
+#: src/inc.c:828
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Cuenta «%s»: Conectando al servidor POP3: %s:%d..."
 
-#: src/inc.c:850
+#: src/inc.c:846
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "No se puede conectar al servidor POP3: %s:%d"
 
-#: src/inc.c:854
+#: src/inc.c:850
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servidor POP3: %s:%d\n"
 
-#: src/inc.c:934 src/send_message.c:478
+#: src/inc.c:930 src/send_message.c:486
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
-#: src/inc.c:936
+#: src/inc.c:932
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Obteniendo mensajes de %s (%s)..."
 
-#: src/inc.c:942
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
 
-#: src/inc.c:946
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obteniendo el número de nuevos mensajes (LAST)..."
 
-#: src/inc.c:950
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
 
-#: src/inc.c:954
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obteniendo el tamaño de los mensajes (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:496
+#: src/inc.c:957 src/send_message.c:504
 msgid "Quitting"
 msgstr "Saliendo"
 
-#: src/inc.c:986
+#: src/inc.c:982
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:999
+#: src/inc.c:995
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Recuperando (%d mensaje (%s) recibido)"
 msgstr[1] "Recuperando (%d mensajes (%s) recibidos)"
 
-#: src/inc.c:1158
+#: src/inc.c:1154
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Ha fallado la conexión con %s:%d."
 
-#: src/inc.c:1163
+#: src/inc.c:1159
 msgid "Error occurred while processing mail."
 msgstr "Ocurrió un error mientras se procesaba el correo."
 
-#: src/inc.c:1169
+#: src/inc.c:1165
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6214,37 +6245,37 @@ msgstr ""
 "Ocurrió un error mientras se procesaba el correo:\n"
 "%s"
 
-#: src/inc.c:1175
+#: src/inc.c:1171
 msgid "No disk space left."
 msgstr "No hay espacio libre en disco."
 
-#: src/inc.c:1180
+#: src/inc.c:1176
 msgid "Can't write file."
 msgstr "No se puede escribir el fichero."
 
-#: src/inc.c:1185
+#: src/inc.c:1181
 msgid "Socket error."
 msgstr "Error de socket."
 
-#: src/inc.c:1188
+#: src/inc.c:1184
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Error de socket conectando con %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:406 src/send_message.c:670
+#: src/inc.c:1189 src/send_message.c:414 src/send_message.c:678
 msgid "Connection closed by the remote host."
 msgstr "Conexión cerrada por la máquina remota."
 
-#: src/inc.c:1196
+#: src/inc.c:1192
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Conexión con %s:%d cerrada por la máquina remota."
 
-#: src/inc.c:1201
+#: src/inc.c:1197
 msgid "Mailbox is locked."
 msgstr "El buzón está bloqueado."
 
-#: src/inc.c:1205
+#: src/inc.c:1201
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6253,11 +6284,11 @@ msgstr ""
 "El buzón está bloqueado:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:655
+#: src/inc.c:1207 src/send_message.c:663
 msgid "Authentication failed."
 msgstr "La autentificación falló."
 
-#: src/inc.c:1217 src/send_message.c:658
+#: src/inc.c:1213 src/send_message.c:666
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6266,7 +6297,7 @@ msgstr ""
 "La autentificación falló:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:674
+#: src/inc.c:1218 src/send_message.c:682
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6274,37 +6305,26 @@ msgstr ""
 "La sesión ha expirado. Puede ser capaz de recuperarla incrementando el "
 "tiempo límite de la sesión en «Preferencias/Otras/Miscelánea»."
 
-#: src/inc.c:1227
+#: src/inc.c:1223
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "La conexión con %s:%d excedió el límite de tiempo."
 
-#: src/inc.c:1265
+#: src/inc.c:1261
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1457
-#, c-format
-msgid "Claws Mail: %d new message"
-msgid_plural "Claws Mail: %d new messages"
-msgstr[0] "Claws Mail: %d mensaje nuevo"
-msgstr[1] "Claws Mail: %d mensajes nuevos"
-
-#: src/inc.c:1584
-msgid "Unable to connect: you are offline."
-msgstr "No puedo conectar: está trabajando sin conexión."
-
-#: src/inc.c:1610
+#: src/inc.c:1528
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sEstá trabajando sin conexión. ¿Ignorarlo durante %d minutos?"
 
-#: src/inc.c:1616
+#: src/inc.c:1534
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sEstá trabajando sin conexión ¿Ignorar?"
 
-#: src/inc.c:1623
+#: src/inc.c:1541
 msgid "On_ly once"
 msgstr "Só_lo una vez"
 
@@ -6312,7 +6332,7 @@ msgstr "Só_lo una vez"
 msgid "Nick Name"
 msgstr "Apodo"
 
-#: src/main.c:272
+#: src/main.c:241
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6321,11 +6341,7 @@ msgstr ""
 "El fichero «%s» ya existe.\n"
 "No se puede crear la carpeta."
 
-#: src/main.c:294 src/main.c:307
-msgid "Exiting..."
-msgstr "Saliendo..."
-
-#: src/main.c:438
+#: src/main.c:362
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6334,7 +6350,7 @@ msgstr ""
 "Encontrada configuración para %s.\n"
 "¿Desea migrar esta configuración?"
 
-#: src/main.c:440
+#: src/main.c:364
 #, c-format
 msgid ""
 "\n"
@@ -6347,11 +6363,11 @@ msgstr ""
 "Sus reglas de filtrado de Sylpheed se pueden convertir\n"
 "con un script que encontrará en %s."
 
-#: src/main.c:452
+#: src/main.c:376
 msgid "Keep old configuration"
 msgstr "Conservar la configuración antigua"
 
-#: src/main.c:455
+#: src/main.c:379
 msgid ""
 "Keeping a backup will allow you to go back to an older version, but may take "
 "a while if you have cached IMAP or News data, and will take some extra room "
@@ -6361,47 +6377,47 @@ msgstr ""
 "pero puede tardar cierto tiempo si tiene datos de Noticias o IMAP cacheados "
 "y ocupará espacio adicional en el disco."
 
-#: src/main.c:463
+#: src/main.c:387
 msgid "Migration of configuration"
 msgstr "Migración de la configuración"
 
-#: src/main.c:474
+#: src/main.c:398
 msgid "Copying configuration... This may take a while..."
 msgstr "Copiando configuración... Esto puede tardar un rato..."
 
-#: src/main.c:483
+#: src/main.c:407
 msgid "Migration failed!"
 msgstr "¡La migración falló!"
 
-#: src/main.c:492
+#: src/main.c:416
 msgid "Migrating configuration..."
 msgstr "Migrando la configuración..."
 
-#: src/main.c:1039
+#: src/main.c:934
 msgid "Failed to register folder item update hook"
 msgstr "Falló el registro del enlace de actualización de elementos de carpeta"
 
-#: src/main.c:1046
+#: src/main.c:941
 msgid "Failed to register folder update hook"
 msgstr "Falló el registro del enlace de actualización de carpetas"
 
-#: src/main.c:1226
+#: src/main.c:1110
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread no está soportado por glib.\n"
 
-#: src/main.c:1245
+#: src/main.c:1129
 msgid "Sylpheed-Claws 2.6.0 (or older)"
 msgstr "Sylpheed-Claws 2.6.0 (o anterior)"
 
-#: src/main.c:1248
+#: src/main.c:1132
 msgid "Sylpheed-Claws 1.9.15 (or older)"
 msgstr "Sylpheed-Claws 1.9.15 (o anterior)"
 
-#: src/main.c:1251
+#: src/main.c:1135
 msgid "Sylpheed-Claws 1.0.5 (or older)"
 msgstr "Sylpheed-Claws 1.0.5 (o anterior)"
 
-#: src/main.c:1574
+#: src/main.c:1434
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6420,7 +6436,7 @@ msgstr[1] ""
 "de los módulos para más información:\n"
 "%s"
 
-#: src/main.c:1602
+#: src/main.c:1462
 msgid ""
 "Claws Mail has detected a configured mailbox, but it is incomplete. It is "
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
@@ -6430,7 +6446,7 @@ msgstr ""
 "ser debido a una cuenta IMAP que esté fallando. Utilize «Reconstruir árbol "
 "de carpetas» en la carpeta padre del buzón para intentar arreglarlo."
 
-#: src/main.c:1608
+#: src/main.c:1468
 msgid ""
 "Claws Mail has detected a configured mailbox, but could not load it. It is "
 "probably provided by an out-of-date external plugin. Please reinstall the "
@@ -6440,41 +6456,36 @@ msgstr ""
 "probable que esté soportado por un módulo externo desactualizado. Por favor "
 "reinstale el módulo e inténtelo de nuevo."
 
-#: src/main.c:1637
-#, c-format
-msgid "Claws Mail can not start without its data volume (%s)."
-msgstr "Claws Mail no puede iniciarse sin su volumen de datos (%s)."
-
-#: src/main.c:1884
+#: src/main.c:1711
 msgid "Missing filename\n"
 msgstr "Falta el nombre de fichero\n"
 
-#: src/main.c:1891
+#: src/main.c:1718
 msgid "Cannot open filename for reading\n"
 msgstr "No se puede abrir el fichero para lectura\n"
 
-#: src/main.c:1902
+#: src/main.c:1729
 msgid "Malformed header\n"
 msgstr "Cabecera mal formada\n"
 
-#: src/main.c:1909
+#: src/main.c:1736
 msgid "Duplicated 'To:' header\n"
 msgstr "Cabecera «To:» duplicada\n"
 
-#: src/main.c:1924
+#: src/main.c:1751
 msgid "Missing required 'To:' header\n"
 msgstr "Falta la cabecera «To:» obligatoria\n"
 
-#: src/main.c:2071
+#: src/main.c:1898
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:2073
+#: src/main.c:1900
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre la ventana de edición"
 
-#: src/main.c:2074
+#: src/main.c:1901
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6492,11 +6503,11 @@ msgstr ""
 "vacía,\n"
 "                         después el cuerpo hasta fin de fichero."
 
-#: src/main.c:2079
+#: src/main.c:1906
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      suscribirse a la URI dada si es posible"
 
-#: src/main.c:2080
+#: src/main.c:1907
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6506,23 +6517,23 @@ msgstr ""
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados como adjuntos"
 
-#: src/main.c:2083
+#: src/main.c:1910
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recibe los mensajes nuevos"
 
-#: src/main.c:2084
+#: src/main.c:1911
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe mensajes nuevos de todas las cuentas"
 
-#: src/main.c:2085
+#: src/main.c:1912
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     cancela la recepción de mensajes en curso"
 
-#: src/main.c:2086
+#: src/main.c:1913
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       cancela el envío de mensajes en curso"
 
-#: src/main.c:2087
+#: src/main.c:1914
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6542,15 +6553,15 @@ msgstr ""
 "                         recursivo: falso si parám. empieza por: 0, n, N, f "
 "o F"
 
-#: src/main.c:2094
+#: src/main.c:1921
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todos los mensajes en la cola"
 
-#: src/main.c:2095
+#: src/main.c:1922
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  muestra el número total de mensajes"
 
-#: src/main.c:2096
+#: src/main.c:1923
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6558,15 +6569,15 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         muestra el estado de cada carpeta"
 
-#: src/main.c:2098
+#: src/main.c:1925
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           muestra las estadísticas de la sesión"
 
-#: src/main.c:2099
+#: src/main.c:1926
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     reinicializa las estadísticas de la sesión"
 
-#: src/main.c:2100
+#: src/main.c:1927
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6574,35 +6585,35 @@ msgstr ""
 "  --select carpt[/mnsj]  va a la carpeta/mensaje especificados\n"
 "                         carpt es un identificador como «carpeta/subcarpeta»"
 
-#: src/main.c:2102
+#: src/main.c:1929
 msgid "  --online               switch to online mode"
 msgstr "  --online               cambiar a modo de trabajo con conexión"
 
-#: src/main.c:2103
+#: src/main.c:1930
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              cambiar a modo de trabajo sin conexión"
 
-#: src/main.c:2104
+#: src/main.c:1931
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       salir de Claws Mail"
 
-#: src/main.c:2105
+#: src/main.c:1932
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:2106
+#: src/main.c:1933
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         activa o desactiva el modo de depuración"
 
-#: src/main.c:2107
+#: src/main.c:1934
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              presenta esta ayuda y finaliza"
 
-#: src/main.c:2108
+#: src/main.c:1935
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           informa de la versión y finaliza"
 
-#: src/main.c:2109
+#: src/main.c:1936
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6610,11 +6621,11 @@ msgstr ""
 "  --version-full -V      informa de la versión y características incluidas y "
 "finaliza"
 
-#: src/main.c:2110
+#: src/main.c:1937
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           muestra el directorio del configuración"
 
-#: src/main.c:2111
+#: src/main.c:1938
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6622,40 +6633,40 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                         usa el directorio del configuración especificado"
 
-#: src/main.c:2161
+#: src/main.c:1988
 msgid "Unknown option\n"
 msgstr "Error desconocido\n"
 
-#: src/main.c:2179
+#: src/main.c:2006
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Procesando (%s)..."
 
-#: src/main.c:2182
+#: src/main.c:2009
 msgid "top level folder"
 msgstr "carpeta superior"
 
-#: src/main.c:2265
+#: src/main.c:2092
 msgid "Queued messages"
 msgstr "Mensajes en cola"
 
-#: src/main.c:2266
+#: src/main.c:2093
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
 
-#: src/main.c:2999
+#: src/main.c:2818
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: la red está conectada.\n"
 
-#: src/main.c:3005
+#: src/main.c:2824
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: la red está desconectada.\n"
 
-#: src/mainwindow.c:503 src/messageview.c:210
+#: src/mainwindow.c:503 src/messageview.c:208
 msgid "_File"
 msgstr "_Fichero"
 
-#: src/mainwindow.c:505 src/messageview.c:212 src/summaryview.c:436
+#: src/mainwindow.c:505 src/messageview.c:210 src/summaryview.c:436
 msgid "_View"
 msgstr "_Ver"
 
@@ -6691,19 +6702,19 @@ msgstr "_Exportar la selección a un fichero mbox..."
 msgid "Empty all _Trash folders"
 msgstr "Vaciar _todas las papeleras"
 
-#: src/mainwindow.c:526 src/messageview.c:219
+#: src/mainwindow.c:526 src/messageview.c:217
 msgid "_Save email as..."
 msgstr "_Guardar mensaje como..."
 
-#: src/mainwindow.c:527 src/messageview.c:220
+#: src/mainwindow.c:527 src/messageview.c:218
 msgid "_Save part as..."
 msgstr "_Guardar parte como..."
 
-#: src/mainwindow.c:530 src/messageview.c:221
+#: src/mainwindow.c:530 src/messageview.c:219
 msgid "Page setup..."
 msgstr "Configurar página..."
 
-#: src/mainwindow.c:531 src/messageview.c:222
+#: src/mainwindow.c:531 src/messageview.c:220
 msgid "_Print..."
 msgstr "_Imprimir..."
 
@@ -6771,99 +6782,99 @@ msgstr "E_xpandir todos los hilos"
 msgid "Co_llapse all threads"
 msgstr "Co_lapsar todos los hilos"
 
-#: src/mainwindow.c:568 src/messageview.c:233
+#: src/mainwindow.c:568 src/messageview.c:231
 msgid "_Go to"
 msgstr "_Ir a"
 
-#: src/mainwindow.c:569 src/messageview.c:234
+#: src/mainwindow.c:569 src/messageview.c:232
 msgid "_Previous message"
 msgstr "Mensaje _anterior"
 
-#: src/mainwindow.c:570 src/messageview.c:235
+#: src/mainwindow.c:570 src/messageview.c:233
 msgid "_Next message"
 msgstr "Mensaje _siguiente"
 
-#: src/mainwindow.c:572 src/messageview.c:237
+#: src/mainwindow.c:572 src/messageview.c:235
 msgid "P_revious unread message"
 msgstr "Mensaje a_nterior no leído"
 
-#: src/mainwindow.c:573 src/messageview.c:238
+#: src/mainwindow.c:573 src/messageview.c:236
 msgid "N_ext unread message"
 msgstr "Mensaje s_iguiente no leído"
 
-#: src/mainwindow.c:575 src/messageview.c:240
+#: src/mainwindow.c:575 src/messageview.c:238
 msgid "Previous ne_w message"
 msgstr "Mensaje nue_vo anterior"
 
-#: src/mainwindow.c:576 src/messageview.c:241
+#: src/mainwindow.c:576 src/messageview.c:239
 msgid "Ne_xt new message"
 msgstr "Mensaje nuev_o siguiente"
 
-#: src/mainwindow.c:578 src/messageview.c:243
+#: src/mainwindow.c:578 src/messageview.c:241
 msgid "Previous _marked message"
 msgstr "Mensaje _marcado anterior"
 
-#: src/mainwindow.c:579 src/messageview.c:244
+#: src/mainwindow.c:579 src/messageview.c:242
 msgid "Next m_arked message"
 msgstr "Mensaje m_arcado siguiente"
 
-#: src/mainwindow.c:581 src/messageview.c:246
+#: src/mainwindow.c:581 src/messageview.c:244
 msgid "Previous _labeled message"
 msgstr "Mensaje _etiquetado anterior"
 
-#: src/mainwindow.c:582 src/messageview.c:247
+#: src/mainwindow.c:582 src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "Mensaje e_tiquetado siguiente"
 
-#: src/mainwindow.c:584 src/messageview.c:249
+#: src/mainwindow.c:584 src/messageview.c:247
 msgid "Previous opened message"
 msgstr "Mensaje abierto anterior"
 
-#: src/mainwindow.c:585 src/messageview.c:250
+#: src/mainwindow.c:585 src/messageview.c:248
 msgid "Next opened message"
 msgstr "Mensaje abierto siguiente"
 
-#: src/mainwindow.c:587 src/messageview.c:252
+#: src/mainwindow.c:587 src/messageview.c:250
 msgid "Parent message"
 msgstr "Mensaje padre"
 
-#: src/mainwindow.c:589 src/messageview.c:254
+#: src/mainwindow.c:589 src/messageview.c:252
 msgid "Next unread _folder"
 msgstr "Siguiente _carpeta sin leer"
 
-#: src/mainwindow.c:590 src/messageview.c:255
+#: src/mainwindow.c:590 src/messageview.c:253
 msgid "_Other folder..."
 msgstr "_Otra carpeta..."
 
-#: src/mainwindow.c:592 src/messageview.c:257 src/mimeview.c:210
+#: src/mainwindow.c:592 src/messageview.c:255 src/mimeview.c:201
 msgid "Next part"
 msgstr "Parte siguiente"
 
-#: src/mainwindow.c:593 src/messageview.c:258 src/mimeview.c:211
+#: src/mainwindow.c:593 src/messageview.c:256 src/mimeview.c:202
 msgid "Previous part"
 msgstr "Parte anterior"
 
-#: src/mainwindow.c:596 src/messageview.c:259
+#: src/mainwindow.c:596 src/messageview.c:257
 msgid "Message scroll"
 msgstr "Desplazamiento del mensaje"
 
-#: src/mainwindow.c:597 src/messageview.c:260
+#: src/mainwindow.c:597 src/messageview.c:258
 msgid "Previous line"
 msgstr "Línea anterior"
 
-#: src/mainwindow.c:598 src/messageview.c:261
+#: src/mainwindow.c:598 src/messageview.c:259
 msgid "Next line"
 msgstr "Línea siguiente"
 
-#: src/mainwindow.c:599 src/messageview.c:262 src/printing.c:487
+#: src/mainwindow.c:599 src/messageview.c:260 src/printing.c:487
 msgid "Previous page"
 msgstr "Página anterior"
 
-#: src/mainwindow.c:600 src/messageview.c:263 src/printing.c:494
+#: src/mainwindow.c:600 src/messageview.c:261 src/printing.c:494
 msgid "Next page"
 msgstr "Página siguiente"
 
-#: src/mainwindow.c:618 src/messageview.c:281
+#: src/mainwindow.c:618 src/messageview.c:279
 msgid "Decode"
 msgstr "Decodificar"
 
@@ -6871,27 +6882,27 @@ msgstr "Decodificar"
 msgid "Open in new _window"
 msgstr "Abrir en ventana _nueva"
 
-#: src/mainwindow.c:626 src/messageview.c:288
+#: src/mainwindow.c:626 src/messageview.c:286
 msgid "Mess_age source"
 msgstr "Fuente del mens_aje"
 
-#: src/mainwindow.c:628 src/messageview.c:289
+#: src/mainwindow.c:628 src/messageview.c:287
 msgid "Message part"
 msgstr "Parte del mensaje"
 
-#: src/mainwindow.c:629 src/messageview.c:290
+#: src/mainwindow.c:629 src/messageview.c:288
 msgid "View as text"
 msgstr "Mostrar como texto"
 
-#: src/mainwindow.c:630 src/messageview.c:291 src/toolbar.c:401
+#: src/mainwindow.c:630 src/messageview.c:289 src/toolbar.c:402
 msgid "Open"
 msgstr "Abrir"
 
-#: src/mainwindow.c:632 src/messageview.c:293
+#: src/mainwindow.c:632 src/messageview.c:291
 msgid "Open with..."
 msgstr "Abrir con..."
 
-#: src/mainwindow.c:636 src/messageview.c:296
+#: src/mainwindow.c:636 src/messageview.c:294
 msgid "Quotes"
 msgstr "Citas"
 
@@ -6927,16 +6938,16 @@ msgstr "Compo_ner un mensaje de correo"
 msgid "Compose a news message"
 msgstr "Componer un mensaje de noticias"
 
-#: src/mainwindow.c:655 src/messageview.c:302
+#: src/mainwindow.c:655 src/messageview.c:300
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Responder"
 
-#: src/mainwindow.c:656 src/messageview.c:303 src/summaryview.c:428
+#: src/mainwindow.c:656 src/messageview.c:301 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "Respon_der a"
 
-#: src/mainwindow.c:659 src/messageview.c:306
+#: src/mainwindow.c:659 src/messageview.c:304
 msgid "Mailing _list"
 msgstr "_Lista-Correo"
 
@@ -6944,15 +6955,15 @@ msgstr "_Lista-Correo"
 msgid "Follow-up and reply to"
 msgstr "Seguir y responder a"
 
-#: src/mainwindow.c:663 src/messageview.c:309 src/toolbar.c:2087
+#: src/mainwindow.c:663 src/messageview.c:307 src/toolbar.c:2088
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: src/mainwindow.c:664 src/messageview.c:310 src/toolbar.c:2088
+#: src/mainwindow.c:664 src/messageview.c:308 src/toolbar.c:2089
 msgid "For_ward as attachment"
 msgstr "Reen_viar como adjunto"
 
-#: src/mainwindow.c:665 src/messageview.c:311 src/toolbar.c:2089
+#: src/mainwindow.c:665 src/messageview.c:309 src/toolbar.c:2090
 msgid "Redirec_t"
 msgstr "Redirigi_r"
 
@@ -7020,8 +7031,8 @@ msgstr "Marcar como _leído"
 msgid "Mark all read"
 msgstr "Marcar todos como leídos"
 
-#: src/mainwindow.c:699 src/prefs_filtering_action.c:199 src/toolbar.c:207
-#: src/toolbar.c:417
+#: src/mainwindow.c:699 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/toolbar.c:418
 msgid "Ignore thread"
 msgstr "Ignorar hilo"
 
@@ -7029,8 +7040,8 @@ msgstr "Ignorar hilo"
 msgid "Unignore thread"
 msgstr "Dejar de ignorar hilo"
 
-#: src/mainwindow.c:701 src/prefs_filtering_action.c:200 src/toolbar.c:208
-#: src/toolbar.c:418
+#: src/mainwindow.c:701 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/toolbar.c:419
 msgid "Watch thread"
 msgstr "Observar hilo"
 
@@ -7066,11 +7077,11 @@ msgstr "Eti_quetas"
 msgid "Re-_edit"
 msgstr "Re_editar"
 
-#: src/mainwindow.c:719 src/messageview.c:312 src/mimeview.c:1039
+#: src/mainwindow.c:719 src/messageview.c:310 src/mimeview.c:1030
 msgid "Check signature"
 msgstr "Verificar firma"
 
-#: src/mainwindow.c:724 src/messageview.c:316
+#: src/mainwindow.c:724 src/messageview.c:314
 msgid "Add sender to address boo_k"
 msgstr "Añadir _remitente a la agenda"
 
@@ -7098,35 +7109,35 @@ msgstr "_Filtrar los mensajes seleccionados"
 msgid "Run folder pr_ocessing rules"
 msgstr "Ejecutar reglas de procesamiento de la carpeta"
 
-#: src/mainwindow.c:735 src/messageview.c:319
+#: src/mainwindow.c:735 src/messageview.c:317
 msgid "_Create filter rule"
 msgstr "Crear regla de f_iltrado"
 
-#: src/mainwindow.c:736 src/mainwindow.c:742 src/messageview.c:320
-#: src/messageview.c:326
+#: src/mainwindow.c:736 src/mainwindow.c:742 src/messageview.c:318
+#: src/messageview.c:324
 msgid "_Automatically"
 msgstr "_Automático"
 
-#: src/mainwindow.c:737 src/mainwindow.c:743 src/mainwindow.c:847
-#: src/messageview.c:321 src/messageview.c:327
+#: src/mainwindow.c:737 src/mainwindow.c:743 src/mainwindow.c:845
+#: src/messageview.c:319 src/messageview.c:325
 msgid "By _From"
 msgstr "Por el Desde"
 
-#: src/mainwindow.c:738 src/mainwindow.c:744 src/mainwindow.c:848
-#: src/messageview.c:322 src/messageview.c:328
+#: src/mainwindow.c:738 src/mainwindow.c:744 src/mainwindow.c:846
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _To"
 msgstr "Por el Para"
 
-#: src/mainwindow.c:739 src/mainwindow.c:745 src/messageview.c:323
-#: src/messageview.c:329
+#: src/mainwindow.c:739 src/mainwindow.c:745 src/messageview.c:321
+#: src/messageview.c:327
 msgid "By _Subject"
 msgstr "Por el Asunto"
 
-#: src/mainwindow.c:741 src/messageview.c:325 src/summaryview.c:434
+#: src/mainwindow.c:741 src/messageview.c:323 src/summaryview.c:434
 msgid "Create processing rule"
 msgstr "Crear regla de procesamiento"
 
-#: src/mainwindow.c:748 src/messageview.c:333
+#: src/mainwindow.c:748 src/messageview.c:331
 msgid "List _URLs..."
 msgstr "Listar _URLs..."
 
@@ -7266,186 +7277,186 @@ msgstr "_Esconder los mensajes leídos"
 msgid "Hide deleted messages"
 msgstr "Ocultar mensajes borrados"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:815
 msgid "_Fullscreen"
 msgstr "Pantalla _completa"
 
-#: src/mainwindow.c:818 src/messageview.c:345
+#: src/mainwindow.c:816 src/messageview.c:343
 msgid "Show all _headers"
 msgstr "Mostrar todas las ca_beceras"
 
-#: src/mainwindow.c:819 src/messageview.c:346
+#: src/mainwindow.c:817 src/messageview.c:344
 msgid "_Collapse all"
 msgstr "Co_lapsar todos"
 
-#: src/mainwindow.c:820 src/messageview.c:347
+#: src/mainwindow.c:818 src/messageview.c:345
 msgid "Collapse from level _2"
 msgstr "Colapsar desde el nivel _2"
 
-#: src/mainwindow.c:821 src/messageview.c:348
+#: src/mainwindow.c:819 src/messageview.c:346
 msgid "Collapse from level _3"
 msgstr "Colapsar desde el nivel _3"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:823
 msgid "Text _below icons"
 msgstr "Texto _bajo los iconos"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:824
 msgid "Text be_side icons"
 msgstr "Texto _junto a los iconos"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:825
 msgid "_Icons only"
 msgstr "Sólo _iconos"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:826
 msgid "_Text only"
 msgstr "Sólo _texto"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:833
 msgid "_Standard"
 msgstr "_Estándar"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:834
 msgid "_Three columns"
 msgstr "_Tres columnas"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:835
 msgid "_Wide message"
 msgstr "Mensaje _ancho"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:836
 msgid "W_ide message list"
 msgstr "L_ista de mensajes ancha"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:837
 msgid "S_mall screen"
 msgstr "_Pantalla pequeña"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:841
 msgid "By _number"
 msgstr "Por _número"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:842
 msgid "By s_ize"
 msgstr "Por _tamaño"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:843
 msgid "By _date"
 msgstr "Por _fecha"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:844
 msgid "By thread date"
 msgstr "Por fecha del hilo"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:847
 msgid "By s_ubject"
 msgstr "Por el as_unto"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:848
 msgid "By _color label"
 msgstr "Por el _color"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:849
 msgid "By tag"
 msgstr "Por la etiqueta"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:850
 msgid "By _mark"
 msgstr "Por _marca"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:851
 msgid "By _status"
 msgstr "Por e_stado"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:852
 msgid "By a_ttachment"
 msgstr "Por adjun_to"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:853
 msgid "By score"
 msgstr "Por puntuación"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:854
 msgid "By locked"
 msgstr "Por bloqueado"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:855
 msgid "D_on't sort"
 msgstr "N_o ordenar"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:859
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:860
 msgid "Descending"
 msgstr "Descendente"
 
-#: src/mainwindow.c:903 src/messageview.c:389
+#: src/mainwindow.c:901 src/messageview.c:387
 msgid "_Auto detect"
 msgstr "_Auto detectar"
 
-#: src/mainwindow.c:1299 src/summaryview.c:6238
+#: src/mainwindow.c:1297 src/summaryview.c:6234
 msgid "Apply tags..."
 msgstr "Aplicar etiquetas..."
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:1935
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Ocurrió algún error. Pulse aquí para ver la traza registrada."
 
-#: src/mainwindow.c:2127
+#: src/mainwindow.c:1950
 msgid "You are online. Click the icon to go offline"
 msgstr "Esta conectado. Pulse en el icono para desconectarse"
 
-#: src/mainwindow.c:2130
+#: src/mainwindow.c:1953
 msgid "You are offline. Click the icon to go online"
 msgstr "Esta desconectado. Pulse en el icono para conectarse"
 
-#: src/mainwindow.c:2144
+#: src/mainwindow.c:1967
 msgid "Select account"
 msgstr "Seleccionar cuenta"
 
-#: src/mainwindow.c:2171 src/prefs_logging.c:140
+#: src/mainwindow.c:1994 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Traza del protocolo"
 
-#: src/mainwindow.c:2175
+#: src/mainwindow.c:1998
 msgid "Filtering/Processing debug log"
 msgstr "Traza de depuración de filtrado/procesamiento"
 
-#: src/mainwindow.c:2194 src/prefs_logging.c:392
+#: src/mainwindow.c:2017 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "traza de filtrado activada\n"
 
-#: src/mainwindow.c:2196 src/prefs_logging.c:394
+#: src/mainwindow.c:2019 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "traza de filtrado desactivada\n"
 
-#: src/mainwindow.c:2642 src/mainwindow.c:2649 src/mainwindow.c:2692
-#: src/mainwindow.c:2725 src/mainwindow.c:2757 src/mainwindow.c:2802
+#: src/mainwindow.c:2460 src/mainwindow.c:2467 src/mainwindow.c:2510
+#: src/mainwindow.c:2543 src/mainwindow.c:2575 src/mainwindow.c:2620
 #: src/plugins/notification/notification_trayicon.c:363
 #: src/prefs_folder_item.c:1067
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/mainwindow.c:2803 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2621 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:3060 src/mainwindow.c:3064
+#: src/mainwindow.c:2878 src/mainwindow.c:2882
 msgid "Delete all messages in trash folders?"
 msgstr "¿Borrar todos los mensajes de las papeleras?"
 
-#: src/mainwindow.c:3061
+#: src/mainwindow.c:2879
 msgid "Don't quit"
 msgstr "No salir"
 
-#: src/mainwindow.c:3090 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2908 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: src/mainwindow.c:3091
+#: src/mainwindow.c:2909
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7455,18 +7466,18 @@ msgstr ""
 "Si especifica un buzón existente será\n"
 "escaneado automáticamente."
 
-#: src/mainwindow.c:3097 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:158
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
-#: src/mainwindow.c:3102 src/plugins/mailmbox/plugin_gtk.c:202 src/setup.c:52
-#: src/wizard.c:774
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:202 src/setup.c:52
+#: src/wizard.c:737
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:3107 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:55
+#: src/mainwindow.c:2925 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7476,79 +7487,79 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:3553
+#: src/mainwindow.c:3373
 msgid "No posting allowed"
 msgstr "No esta permitido enviar"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "La importación de mbox ha fallado."
 
-#: src/mainwindow.c:4140 src/mainwindow.c:4149
+#: src/mainwindow.c:3960 src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "La exportación a mbox ha fallado."
 
-#: src/mainwindow.c:4190 src/plugins/notification/notification_trayicon.c:518
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:518
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:4190 src/plugins/notification/notification_trayicon.c:518
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:518
 msgid "Exit Claws Mail?"
 msgstr "¿Salir de Claws Mail?"
 
-#: src/mainwindow.c:4379
+#: src/mainwindow.c:4199
 msgid "Folder synchronisation"
 msgstr "Sincronización de carpeta"
 
-#: src/mainwindow.c:4380
+#: src/mainwindow.c:4200
 msgid "Do you want to synchronise your folders now?"
 msgstr "¿Quiere sincronizar sus carpetas ahora?"
 
-#: src/mainwindow.c:4381
+#: src/mainwindow.c:4201
 msgid "+_Synchronise"
 msgstr "+_Sincronizar"
 
-#: src/mainwindow.c:4810
+#: src/mainwindow.c:4630
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/mainwindow.c:4847
+#: src/mainwindow.c:4667
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Borrado %d mensaje repetido en %d carpetas.\n"
 msgstr[1] "Borrados %d mensajes repetidos en %d carpetas.\n"
 
-#: src/mainwindow.c:5102 src/summaryview.c:5727
+#: src/mainwindow.c:4922 src/summaryview.c:5723
 msgid "Processing rules to apply before folder rules"
 msgstr "Reglas de procesamiento a aplicar antes de las de las carpetas"
 
-#: src/mainwindow.c:5110
+#: src/mainwindow.c:4930
 msgid "Processing rules to apply after folder rules"
 msgstr "Reglas de procesamiento a aplicar después de las de las carpetas"
 
-#: src/mainwindow.c:5118 src/summaryview.c:5738
+#: src/mainwindow.c:4938 src/summaryview.c:5734
 msgid "Filtering configuration"
 msgstr "Configuración de filtrado"
 
-#: src/mainwindow.c:5233
+#: src/mainwindow.c:5053
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "No se puede registrar como cliente por defecto: imposible obtener la ruta al "
 "ejecutable."
 
-#: src/mainwindow.c:5292
+#: src/mainwindow.c:5112
 msgid "Claws Mail has been registered as default client."
 msgstr "Se har registrado Claws Mail como cliente por defecto."
 
-#: src/mainwindow.c:5294
+#: src/mainwindow.c:5114
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "No se puede registrar como cliente por defecto: imposible escribir en el "
 "registro."
 
-#: src/mainwindow.c:5452
+#: src/mainwindow.c:5272
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7577,30 +7588,30 @@ msgstr "línea de cuerpo"
 msgid "tag"
 msgstr "etiqueta"
 
-#: src/matcher.c:517 src/matcher.c:522 src/matcher.c:542 src/matcher.c:547
-#: src/message_search.c:212 src/prefs_matcher.c:737 src/summary_search.c:452
+#: src/matcher.c:523 src/matcher.c:528 src/matcher.c:548 src/matcher.c:553
+#: src/message_search.c:217 src/prefs_matcher.c:739 src/summary_search.c:478
 msgid "Case sensitive"
 msgstr "Sensible a caja"
 
-#: src/matcher.c:517 src/matcher.c:522 src/matcher.c:542 src/matcher.c:547
+#: src/matcher.c:523 src/matcher.c:528 src/matcher.c:548 src/matcher.c:553
 msgid "Case insensitive"
 msgstr "Ignorar caja"
 
-#: src/matcher.c:1809
+#: src/matcher.c:1819
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "comprobando si el mensaje coincide [ %s ]\n"
 
-#: src/matcher.c:1878 src/matcher.c:1897 src/matcher.c:1910
+#: src/matcher.c:1888 src/matcher.c:1907 src/matcher.c:1920
 msgid "message matches\n"
 msgstr "el mensaje coincide\n"
 
-#: src/matcher.c:1885 src/matcher.c:1903 src/matcher.c:1912
+#: src/matcher.c:1895 src/matcher.c:1913 src/matcher.c:1922
 msgid "message does not match\n"
 msgstr "el mensaje no coincide\n"
 
-#: src/matcher.c:2175 src/matcher.c:2176 src/matcher.c:2177 src/matcher.c:2178
-#: src/matcher.c:2179 src/matcher.c:2180 src/matcher.c:2181 src/matcher.c:2182
+#: src/matcher.c:2185 src/matcher.c:2186 src/matcher.c:2187 src/matcher.c:2188
+#: src/matcher.c:2189 src/matcher.c:2190 src/matcher.c:2191 src/matcher.c:2192
 msgid "(none)"
 msgstr "(ninguna)"
 
@@ -7628,7 +7639,7 @@ msgstr "Sobreescribir fichero mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Este fichero ya existe. ¿Desea sobreescribir su contenido?"
 
-#: src/mbox.c:555 src/messageview.c:1868 src/mimeview.c:1850
+#: src/mbox.c:555 src/messageview.c:1843 src/mimeview.c:1844
 #: src/prefs_themes.c:553 src/textview.c:3120
 msgid "Overwrite"
 msgstr "Sobreescribir"
@@ -7654,39 +7665,39 @@ msgstr "Buscar en el mensaje actual"
 msgid "Find text:"
 msgstr "Buscar texto:"
 
-#: src/message_search.c:332 src/summary_search.c:768
+#: src/message_search.c:346 src/summary_search.c:791
 msgid "Search failed"
 msgstr "Búsqueda fallida"
 
-#: src/message_search.c:333 src/summary_search.c:769
+#: src/message_search.c:347 src/summary_search.c:792
 msgid "Search string not found."
 msgstr "Cadena no encontrada."
 
-#: src/message_search.c:342
+#: src/message_search.c:356
 msgid "Beginning of message reached; continue from end?"
 msgstr "Se llegó al principio del mensaje. ¿Seguir desde el final?"
 
-#: src/message_search.c:345
+#: src/message_search.c:359
 msgid "End of message reached; continue from beginning?"
 msgstr "Se llegó al final del mensaje. ¿Seguir desde el principio?"
 
-#: src/message_search.c:348 src/summary_search.c:780
+#: src/message_search.c:362 src/summary_search.c:803
 msgid "Search finished"
 msgstr "Búsqueda concluida"
 
-#: src/messageview.c:299 src/textview.c:245
+#: src/messageview.c:297 src/textview.c:245
 msgid "Compose _new message"
 msgstr "Componer un mensaje _nuevo"
 
-#: src/messageview.c:729 src/messageview.c:1413 src/messageview.c:1610
+#: src/messageview.c:711 src/messageview.c:1388 src/messageview.c:1585
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Vista de mensaje"
 
-#: src/messageview.c:860
+#: src/messageview.c:838
 msgid "<No Return-Path found>"
 msgstr "<No se encontró Return-Path>"
 
-#: src/messageview.c:868
+#: src/messageview.c:846
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7701,11 +7712,11 @@ msgstr ""
 "Dirección de retorno: %s\n"
 "Se recomienda no enviar el acuse de recibo."
 
-#: src/messageview.c:875 src/messageview.c:892
+#: src/messageview.c:853 src/messageview.c:870
 msgid "_Don't Send"
 msgstr "_No enviar"
 
-#: src/messageview.c:888
+#: src/messageview.c:866
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7717,47 +7728,47 @@ msgstr ""
 "oficialmente dirigido a usted.\n"
 "Se recomienda no enviar el acuse de recibo."
 
-#: src/messageview.c:1341
+#: src/messageview.c:1319
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Recuperando mensaje (%s)..."
 
-#: src/messageview.c:1377 src/procmime.c:983
+#: src/messageview.c:1355 src/procmime.c:986
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "No se puede descifrar: %s"
 
-#: src/messageview.c:1460 src/messageview.c:1468
+#: src/messageview.c:1435 src/messageview.c:1443
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "El mensaje no cumple el estándar MIME. Puede mostrarse incorrectamente."
 
-#: src/messageview.c:1860 src/messageview.c:1863 src/mimeview.c:2003
-#: src/plugins/fancy/fancy_viewer.c:667 src/summaryview.c:4814
-#: src/summaryview.c:4817 src/textview.c:3108
+#: src/messageview.c:1835 src/messageview.c:1838 src/mimeview.c:1997
+#: src/plugins/fancy/fancy_viewer.c:668 src/summaryview.c:4810
+#: src/summaryview.c:4813 src/textview.c:3108
 msgid "Save as"
 msgstr "Guardar como"
 
-#: src/messageview.c:1869
+#: src/messageview.c:1844
 msgid "Overwrite existing file?"
 msgstr "¿Sobreescribir el fichero existente?"
 
-#: src/messageview.c:1877 src/summaryview.c:4834 src/summaryview.c:4837
-#: src/summaryview.c:4852
+#: src/messageview.c:1852 src/summaryview.c:4830 src/summaryview.c:4833
+#: src/summaryview.c:4848
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "No se pudo guardar el fichero «%s»."
 
-#: src/messageview.c:1931
+#: src/messageview.c:1905
 #, c-format
 msgid "Show all %s."
 msgstr "Mostrar todo %s."
 
-#: src/messageview.c:1933
+#: src/messageview.c:1907
 msgid "Only the first megabyte of text is shown."
 msgstr "Mostrar sólo el primer megabyte de texto."
 
-#: src/messageview.c:1964
+#: src/messageview.c:1938
 msgid ""
 "You got a return receipt for this message : it has been displayed by the "
 "recipient."
@@ -7765,19 +7776,19 @@ msgstr ""
 "Recibió un acuse de recibo en este mensaje: éste ha sido visualizado por el "
 "destinatario."
 
-#: src/messageview.c:1967
+#: src/messageview.c:1941
 msgid "You asked for a return receipt in this message."
 msgstr "Usted solicitó acuse de recibo en este mensaje."
 
-#: src/messageview.c:1973
+#: src/messageview.c:1947
 msgid "This message asks for a return receipt."
 msgstr "Este mensaje solicita acuse de recibo."
 
-#: src/messageview.c:1974
+#: src/messageview.c:1948
 msgid "Send receipt"
 msgstr "Enviar acuse de recibo"
 
-#: src/messageview.c:2017
+#: src/messageview.c:1991
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -7785,7 +7796,7 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente,\n"
 "y ha sido eliminado del servidor."
 
-#: src/messageview.c:2023
+#: src/messageview.c:1997
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7794,15 +7805,15 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s."
 
-#: src/messageview.c:2027 src/messageview.c:2049
+#: src/messageview.c:2001 src/messageview.c:2023
 msgid "Mark for download"
 msgstr "Marcar para descargar"
 
-#: src/messageview.c:2028 src/messageview.c:2040
+#: src/messageview.c:2002 src/messageview.c:2014
 msgid "Mark for deletion"
 msgstr "Marcar para eliminar"
 
-#: src/messageview.c:2033
+#: src/messageview.c:2007
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7811,12 +7822,12 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s y será descargado."
 
-#: src/messageview.c:2038 src/messageview.c:2051
+#: src/messageview.c:2012 src/messageview.c:2025
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Desmarca"
 
-#: src/messageview.c:2044
+#: src/messageview.c:2018
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7825,11 +7836,11 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s y será eliminado."
 
-#: src/messageview.c:2117
+#: src/messageview.c:2091
 msgid "Return Receipt Notification"
 msgstr "Notificación de acuse de recibo"
 
-#: src/messageview.c:2118
+#: src/messageview.c:2092
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -7841,19 +7852,19 @@ msgstr ""
 "Por favor, elija la cuenta que desea utilizar para enviar la notificación de "
 "acuse de recibo:"
 
-#: src/messageview.c:2122 src/plugins/rssyl/rssyl_gtk.c:480
+#: src/messageview.c:2096 src/plugins/rssyl/rssyl_gtk.c:480
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/messageview.c:2122
+#: src/messageview.c:2096
 msgid "_Send Notification"
 msgstr "_Enviar notificación"
 
-#: src/messageview.c:2189
+#: src/messageview.c:2163
 msgid "Cannot print: the message doesn't contain text."
 msgstr "No se puede imprimir: el mensaje no contiene texto."
 
-#: src/messageview.c:2958
+#: src/messageview.c:2932
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -7861,7 +7872,7 @@ msgstr ""
 "\n"
 "  No hay mensajes en esta carpeta"
 
-#: src/messageview.c:2966
+#: src/messageview.c:2940
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -7869,7 +7880,7 @@ msgstr ""
 "\n"
 "  El mensaje se ha borrado"
 
-#: src/messageview.c:2967
+#: src/messageview.c:2941
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -7877,8 +7888,8 @@ msgstr ""
 "\n"
 "  El mensaje se ha borrado o movido a otra carpeta"
 
-#: src/messageview.c:3000 src/messageview.c:3006 src/summaryview.c:4187
-#: src/summaryview.c:6975
+#: src/messageview.c:2974 src/messageview.c:2980 src/summaryview.c:4183
+#: src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "Ocurrió un error mientras se aprendía.\n"
 
@@ -7912,59 +7923,59 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Eliminar buzón"
 
-#: src/mimeview.c:202
+#: src/mimeview.c:193
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/mimeview.c:204
+#: src/mimeview.c:195
 msgid "Open _with..."
 msgstr "Abrir _con..."
 
-#: src/mimeview.c:206
+#: src/mimeview.c:197
 msgid "Send to..."
 msgstr "Enviar a..."
 
-#: src/mimeview.c:207
+#: src/mimeview.c:198
 msgid "_Display as text"
 msgstr "_Mostrar como texto"
 
-#: src/mimeview.c:208
+#: src/mimeview.c:199
 msgid "_Save as..."
 msgstr "_Guardar como..."
 
-#: src/mimeview.c:209
+#: src/mimeview.c:200
 msgid "Save _all..."
 msgstr "Gu_ardar todo..."
 
-#: src/mimeview.c:282
+#: src/mimeview.c:273
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: src/mimeview.c:1044 src/mimeview.c:1049 src/mimeview.c:1054
-#: src/mimeview.c:1059
+#: src/mimeview.c:1035 src/mimeview.c:1040 src/mimeview.c:1045
+#: src/mimeview.c:1050
 msgid "View full information"
 msgstr "Ver la información completa"
 
-#: src/mimeview.c:1065
+#: src/mimeview.c:1056
 msgid "Check again"
 msgstr "Verificar de nuevo"
 
-#: src/mimeview.c:1077
+#: src/mimeview.c:1068
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Pulse en el icono para comprobarla."
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1070
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Pulse en el icono o la tecla «%s» para comprobarla."
 
-#: src/mimeview.c:1089
+#: src/mimeview.c:1080
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Expiró el tiempo comprobando la firma. Pulse en el icono para reintentarlo."
 
-#: src/mimeview.c:1091
+#: src/mimeview.c:1082
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -7972,44 +7983,40 @@ msgstr ""
 "Expiró el tiempo comprobando la firma. Pulse en el icono o la tecla «%s» "
 "para reintentarlo."
 
-#: src/mimeview.c:1330
+#: src/mimeview.c:1322
 msgid "Checking signature..."
 msgstr "Verificando firma..."
 
-#: src/mimeview.c:1373
+#: src/mimeview.c:1363
 msgid "Go back to email"
 msgstr "Volver al correo"
 
-#: src/mimeview.c:1769 src/mimeview.c:1858 src/mimeview.c:2050
-#: src/mimeview.c:2093 src/mimeview.c:2224
-#: src/plugins/fancy/fancy_viewer.c:420
+#: src/mimeview.c:1763 src/mimeview.c:1852 src/mimeview.c:2044
+#: src/mimeview.c:2080 src/mimeview.c:2192
+#: src/plugins/fancy/fancy_viewer.c:421
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "No se pudo guardar la parte del mensaje multipartes: %s"
 
-#: src/mimeview.c:1847 src/textview.c:3118
+#: src/mimeview.c:1841 src/textview.c:3118
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "¿Sobreescribir el fichero existente «%s»?"
 
-#: src/mimeview.c:1889 src/plugins/archive/archiver_prefs.c:128
+#: src/mimeview.c:1883 src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
 msgstr "Seleccionar carpeta destino"
 
-#: src/mimeview.c:1896 src/plugins/archive/archiver_prefs.c:134
+#: src/mimeview.c:1890 src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "«%s» no es un directorio."
 
-#: src/mimeview.c:2125
-msgid "No registered viewer for this file type."
-msgstr "No hay visor registrado para este tipo de ficheros."
-
-#: src/mimeview.c:2157 src/mimeview.c:2164 src/textview.c:3039
+#: src/mimeview.c:2127 src/mimeview.c:2134 src/textview.c:3039
 msgid "Open with"
 msgstr "Abrir con"
 
-#: src/mimeview.c:2158 src/mimeview.c:2165 src/textview.c:3040
+#: src/mimeview.c:2128 src/mimeview.c:2135 src/textview.c:3040
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8018,11 +8025,11 @@ msgstr ""
 "Teclee la orden para abrir el fichero:\n"
 "(«%s» será sustituido por el fichero)"
 
-#: src/mimeview.c:2258
+#: src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "¿Ejecutar binario no fiable?"
 
-#: src/mimeview.c:2259
+#: src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8034,98 +8041,98 @@ msgstr ""
 "\n"
 "¿Desea ejecutar este fichero?"
 
-#: src/mimeview.c:2263
+#: src/mimeview.c:2231
 msgid "Run binary"
 msgstr "Ejecutar binario"
 
-#: src/mimeview.c:2565
+#: src/mimeview.c:2533
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/mimeview.c:2566 src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/mimeview.c:2534 src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: src/mimeview.c:2578 src/plugins/vcalendar/vcalendar.c:1271
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1730
+#: src/mimeview.c:2546 src/plugins/vcalendar/vcalendar.c:1271
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1741
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1751
 msgid "Description:"
 msgstr "Descripción:"
 
-#: src/news.c:300
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "La conexión NNTP con %s:%d se ha desconectado.\n"
 
-#: src/news.c:333
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Cuenta «%s»: Conectando al servidor NNTP: %s:%d...\n"
 
-#: src/news.c:354
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Error entrando en %s:%d...\n"
 
-#: src/news.c:432
+#: src/news.c:438
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan no soporta el código de retorno 480 por ahora, escogemos continuar\n"
 
-#: src/news.c:441
+#: src/news.c:447
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Falló el modo «reader», se continúa sin embargo\n"
 
-#: src/news.c:445
+#: src/news.c:451
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Error creando sesión con %s:%d\n"
 
-#: src/news.c:459
+#: src/news.c:466
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Error autentificándose en %s:%d...\n"
 
-#: src/news.c:484
+#: src/news.c:491
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "Claws Mail necesita acceso a la red para poder acceder al servidor de "
 "noticias."
 
-#: src/news.c:853
+#: src/news.c:862
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "no se pudo seleccionar el grupo: %s\n"
 
-#: src/news.c:1042 src/news.c:1212
+#: src/news.c:1051 src/news.c:1221
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "no se pudo establecer el grupo: %s\n"
 
-#: src/news.c:1051
+#: src/news.c:1060
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rango de artículos inválido: %d - %d\n"
 
-#: src/news.c:1121 src/news.c:1145 src/news.c:1169
+#: src/news.c:1130 src/news.c:1154 src/news.c:1178
 msgid "couldn't get xhdr\n"
 msgstr "no se pudo obtener xhdr\n"
 
-#: src/news.c:1205
+#: src/news.c:1214
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obteniendo xover %d - %d en %s...\n"
 
-#: src/news.c:1220
+#: src/news.c:1229
 msgid "couldn't get xover\n"
 msgstr "no se pudo obtener xover\n"
 
-#: src/news.c:1235
+#: src/news.c:1244
 msgid "invalid xover line\n"
 msgstr "línea xover inválida\n"
 
-#: src/news.c:1450
+#: src/news.c:1459
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -8313,9 +8320,9 @@ msgstr ""
 "Este módulo añade funcionalidad de archivado a Claws Mail.\n"
 "\n"
 "Le permite seleccionar una carpeta de correo que desee archivar, escoger un "
-"nombre, un formato y una ubicación para el archivo. Las subcarpetas se pueden "
-"incluir, así como una suma MD5 para cada fichero del archivo. También están "
-"disponibles varias opciones de archivado.\n"
+"nombre, un formato y una ubicación para el archivo. Las subcarpetas se "
+"pueden incluir, así como una suma MD5 para cada fichero del archivo. También "
+"están disponibles varias opciones de archivado.\n"
 "\n"
 "El archivo se puede almacenar como:\n"
 "\tTAR\n"
@@ -8523,7 +8530,7 @@ msgstr "Ubicación y nombre del archivo"
 
 #: src/plugins/archive/archiver_gtk.c:1045
 #: src/plugins/archive/archiver_prefs.c:198
-#: src/plugins/pgpcore/select-keys.c:424
+#: src/plugins/pgpcore/select-keys.c:420
 msgid "_Select"
 msgstr "_Seleccionar"
 
@@ -8750,7 +8757,8 @@ msgid ""
 "\n"
 "The deleted data will be unrecoverable."
 msgstr ""
-"¿Quiere realmente eliminar todos los adjuntos de los mensajes seleccionados?\n"
+"¿Quiere realmente eliminar todos los adjuntos de los mensajes "
+"seleccionados?\n"
 "\n"
 "Los datos borrados no se podrán recuperar."
 
@@ -8762,12 +8770,12 @@ msgstr "Este mensaje no tiene ningún adjunto"
 msgid "Remove attachments..."
 msgstr "Eliminar adjuntos..."
 
-#: src/plugins/att_remover/att_remover.c:507
-#: src/plugins/att_remover/att_remover.c:574
+#: src/plugins/att_remover/att_remover.c:506
+#: src/plugins/att_remover/att_remover.c:566
 msgid "AttRemover"
 msgstr "Eliminador de adjuntos"
 
-#: src/plugins/att_remover/att_remover.c:579
+#: src/plugins/att_remover/att_remover.c:571
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -8779,7 +8787,7 @@ msgstr ""
 "Aviso: esta operación es completamente irreversible y los adjuntos borrados "
 "se perderán para siempre jamás."
 
-#: src/plugins/att_remover/att_remover.c:603
+#: src/plugins/att_remover/att_remover.c:595
 msgid "Attachment handling"
 msgstr "Gestión de adjuntos"
 
@@ -8821,42 +8829,51 @@ msgstr ""
 "Avisa al usuario si se encuentra alguna referencia a adjuntos en el texto "
 "del mensaje pero no hay ningún fichero adjunto"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:53
+#: src/plugins/attachwarner/attachwarner_prefs.c:54
 msgid "attach"
 msgstr "adjunt"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:80
-msgid ""
-"Warn when matching the following regular expressions:\n"
-"(one per line)"
-msgstr ""
-"Avisar cuando coincida con alguna de las siguientes expresiones regulares:\n"
-"(una por cada línea)"
+#: src/plugins/attachwarner/attachwarner_prefs.c:85
+msgid "One of the following regular expressions is matched (one per line):"
+msgstr "Alguna de las siguientes expresiones regulares coincide (una por línea):"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:89
+msgid "Expressions are case sensitive"
+msgstr "Expresiones diferencian mayúsculas y minúsculas"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:99
-msgid "Skip quoted lines"
-msgstr "Obviar las líneas citadas"
+#: src/plugins/attachwarner/attachwarner_prefs.c:96
+msgid "Case sensitive when matching for the regular expressions in the list"
+msgstr "Sensible a la caja cuando se busca con las expresiones regulares de la lista"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:106
-msgid "Exclude quoted lines from checking for the regular expressions above"
+#: src/plugins/attachwarner/attachwarner_prefs.c:114
+msgid "Lines starting with quotation marks"
+msgstr "Líneas que comienzan con marcas de citación"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:121
+msgid ""
+"Exclude quoted lines from checking for the regular expressions above. Note "
+"that handmade quotes cannot be distinguished from quotes generated by "
+"replying."
 msgstr ""
 "Excluye las líneas citadas de la comprobación con las expresiones regulares "
-"anteriores"
+"anteriores. Nota: las citaciones hechas manualmente no se pueden distinguir "
+"de las generadas al responder."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:109
-msgid "Skip forwards and redirections"
-msgstr "No comprobar reenvíos ni redirecciones"
+#: src/plugins/attachwarner/attachwarner_prefs.c:124
+msgid "Forwarded or redirected messages"
+msgstr "Mensajes reenviados o redirigidos"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:116
+#: src/plugins/attachwarner/attachwarner_prefs.c:131
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr "No comprueba si faltan adjuntos al reenviar o redirijir mensajes"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:119
-msgid "Skip signature"
-msgstr "No comprobar firma"
+#: src/plugins/attachwarner/attachwarner_prefs.c:134
+#: src/prefs_msg_colors.c:362
+msgid "Signatures"
+msgstr "Firmas"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:126
+#: src/plugins/attachwarner/attachwarner_prefs.c:141
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
@@ -8864,7 +8881,15 @@ msgstr ""
 "Excluye las líneas a partir del primer separador de firma de la comprobación "
 "con las expresiones regulares anteriores"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:202
+#: src/plugins/attachwarner/attachwarner_prefs.c:147
+msgid "Warn when"
+msgstr "Avisar cuando"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:151
+msgid "Excluding"
+msgstr "Excluyendo"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:229
 msgid "Attach Warner"
 msgstr "Aviso de adjuntos"
 
@@ -9046,7 +9071,7 @@ msgstr "No se comprobarán los mensajes mayores de este tamaño"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:170
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1487
+#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1483
 msgid "KB"
 msgstr "Kb"
 
@@ -9517,93 +9542,93 @@ msgstr ""
 "\n"
 "No es realmente útil."
 
-#: src/plugins/fancy/fancy_viewer.c:391
+#: src/plugins/fancy/fancy_viewer.c:392
 msgid "Remote content loading is disabled."
 msgstr "Carga de contenidos remotos desactivada."
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:469
 msgid "Load images"
 msgstr "Cargar imágenes"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:471
 msgid "Enable remote content"
 msgstr "Activar contenidos remotos"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:473
 msgid "Enable Javascript"
 msgstr "Activar Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:475
 msgid "Enable Plugins"
 msgstr "Activar módulos"
 
-#: src/plugins/fancy/fancy_viewer.c:476
+#: src/plugins/fancy/fancy_viewer.c:477
 msgid "Enable Java"
 msgstr "Activar Java"
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:479
 msgid "Open links with external browser"
 msgstr "Abrir enlaces con el navegador externo"
 
-#: src/plugins/fancy/fancy_viewer.c:647
+#: src/plugins/fancy/fancy_viewer.c:648
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ocurrió un error: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:698
+#: src/plugins/fancy/fancy_viewer.c:704
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s es un canal mal formado o no soportado"
 
-#: src/plugins/fancy/fancy_viewer.c:709
+#: src/plugins/fancy/fancy_viewer.c:715
 msgid "Search the Web"
 msgstr "Buscar en la web"
 
-#: src/plugins/fancy/fancy_viewer.c:721
+#: src/plugins/fancy/fancy_viewer.c:727
 msgid "Open in Viewer"
 msgstr "Abrir en el visor"
 
-#: src/plugins/fancy/fancy_viewer.c:723
+#: src/plugins/fancy/fancy_viewer.c:729
 msgid "Open in Viewer (enable remote content)"
 msgstr "Abrir en el visor (activar contenidos remotos)"
 
-#: src/plugins/fancy/fancy_viewer.c:732
+#: src/plugins/fancy/fancy_viewer.c:738
 msgid "Open in Browser"
 msgstr "Abrir con el navegador"
 
-#: src/plugins/fancy/fancy_viewer.c:742
+#: src/plugins/fancy/fancy_viewer.c:748
 msgid "Open Image"
 msgstr "Abrir imagen"
 
-#: src/plugins/fancy/fancy_viewer.c:751
+#: src/plugins/fancy/fancy_viewer.c:757
 msgid "Copy Link"
 msgstr "Copiar enlace"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:761
 msgid "Download Link"
 msgstr "Descargar enlace"
 
-#: src/plugins/fancy/fancy_viewer.c:766
+#: src/plugins/fancy/fancy_viewer.c:772
 msgid "Save Image As"
 msgstr "Descargar imagen como"
 
-#: src/plugins/fancy/fancy_viewer.c:776
+#: src/plugins/fancy/fancy_viewer.c:782
 msgid "Copy Image"
 msgstr "Copiar imagen"
 
-#: src/plugins/fancy/fancy_viewer.c:794
+#: src/plugins/fancy/fancy_viewer.c:800
 msgid "Import feed"
 msgstr "Importar canal"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1013
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1032
+#: src/plugins/fancy/fancy_viewer.c:1038
 msgid "Fancy HTML Viewer"
 msgstr "Visor HTML Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1037
+#: src/plugins/fancy/fancy_viewer.c:1043
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -9803,7 +9828,7 @@ msgstr "Módulo GData: identificado\n"
 msgid "GData plugin: Starting async authentication\n"
 msgstr "Módulo GData: comenzando la identificación asíncrona\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:78 src/prefs_account.c:1724
+#: src/plugins/gdata/cm_gdata_prefs.c:78 src/prefs_account.c:1720
 msgid "Authentication"
 msgstr "Autentificación"
 
@@ -9813,7 +9838,7 @@ msgid "Username:"
 msgstr "Usuario:"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:91
-#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1601
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1413
 msgid "Password:"
 msgstr "Contraseña:"
 
@@ -9894,7 +9919,7 @@ msgstr ""
 "Si especifica un buzón existente será\n"
 "escaneado automáticamente."
 
-#: src/plugins/mailmbox/plugin_gtk.c:323
+#: src/plugins/mailmbox/plugin_gtk.c:322
 #, c-format
 msgid ""
 "All folder(s) and message(s) under '%s' will be deleted.\n"
@@ -9903,20 +9928,20 @@ msgstr ""
 "Se borrarán todas las carpetas y mensajes bajo «%s».\n"
 "¿Está seguro de que quiere borrarlos?"
 
-#: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
+#: src/plugins/newmail/newmail.c:111 src/plugins/newmail/newmail.c:162
 msgid "NewMail"
 msgstr "Registro de correo nuevo"
 
-#: src/plugins/newmail/newmail.c:115
+#: src/plugins/newmail/newmail.c:116
 msgid "Failed to register newmail hook"
 msgstr "Falló el registro de la función de registro de correo nuevo"
 
-#: src/plugins/newmail/newmail.c:132
+#: src/plugins/newmail/newmail.c:137 src/plugins/newmail/newmail.c:140
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "No se puede abrir el fichero de registro %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:145
+#: src/plugins/newmail/newmail.c:154
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -9933,7 +9958,7 @@ msgstr ""
 "\n"
 "El registro actual esta en %s"
 
-#: src/plugins/newmail/newmail.c:179
+#: src/plugins/newmail/newmail.c:188
 msgid "Log file"
 msgstr "Fichero de registro"
 
@@ -10075,6 +10100,11 @@ msgstr "Nuevo mensaje desconocido"
 msgid "Unknown message type arrived"
 msgstr "Ha llegado un mensaje de tipo desconocido"
 
+#: src/plugins/notification/notification_popup.c:381
+#: src/plugins/notification/notification_trayicon.c:647
+msgid "Present main window"
+msgstr "Abrir la ventana principal"
+
 #: src/plugins/notification/notification_popup.c:491
 msgid "Mail message"
 msgstr "Mensaje de correo"
@@ -10134,7 +10164,7 @@ msgid "Popup"
 msgstr "Emergente"
 
 #: src/plugins/notification/notification_prefs.c:464 src/prefs_actions.c:263
-#: src/prefs_receive.c:147
+#: src/prefs_receive.c:133
 msgid "Command"
 msgstr "Orden"
 
@@ -10209,12 +10239,12 @@ msgid "Show banner"
 msgstr "Mostrar panel"
 
 #: src/plugins/notification/notification_prefs.c:746
-#: src/plugins/pgpcore/select-keys.c:242 src/plugins/pgpcore/sgpgme.c:144
-#: src/prefs_receive.c:197 src/prefs_summaries.c:462
+#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:144
+#: src/prefs_receive.c:183 src/prefs_summaries.c:462
 msgid "Never"
 msgstr "Nunca"
 
-#: src/plugins/notification/notification_prefs.c:748 src/prefs_receive.c:195
+#: src/plugins/notification/notification_prefs.c:748 src/prefs_receive.c:181
 #: src/prefs_summaries.c:444 src/prefs_summaries.c:463
 msgid "Always"
 msgstr "Siempre"
@@ -10524,82 +10554,82 @@ msgstr "Formato:"
 msgid "Optimized:"
 msgstr "Optimizado:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1165
+#: src/plugins/pdf_viewer/poppler_viewer.c:1181
 msgid "PDF properties"
 msgstr "Propiedades del PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1263
+#: src/plugins/pdf_viewer/poppler_viewer.c:1279
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1322
+#: src/plugins/pdf_viewer/poppler_viewer.c:1338
 #, c-format
 msgid "%s Document"
 msgstr "%s documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1328
+#: src/plugins/pdf_viewer/poppler_viewer.c:1344
 #, c-format
 msgid "of %d"
 msgstr "de %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1705
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1721
+#: src/plugins/pdf_viewer/poppler_viewer.c:1943
 msgid "Document Index"
 msgstr "Índice del documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1895
+#: src/plugins/pdf_viewer/poppler_viewer.c:1911
 msgid "First Page"
 msgstr "Primera página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1898
+#: src/plugins/pdf_viewer/poppler_viewer.c:1914
 msgid "Previous Page"
 msgstr "Página anterior"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1901
+#: src/plugins/pdf_viewer/poppler_viewer.c:1917
 msgid "Next Page"
 msgstr "Página siguiente"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1904
+#: src/plugins/pdf_viewer/poppler_viewer.c:1920
 msgid "Last Page"
 msgstr "Última página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1907
+#: src/plugins/pdf_viewer/poppler_viewer.c:1923
 msgid "Zoom In"
 msgstr "Aumentar"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1909
+#: src/plugins/pdf_viewer/poppler_viewer.c:1925
 msgid "Zoom Out"
 msgstr "Disminuir"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1912
+#: src/plugins/pdf_viewer/poppler_viewer.c:1928
 msgid "Fit Page"
 msgstr "Ajustar página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1915
+#: src/plugins/pdf_viewer/poppler_viewer.c:1931
 msgid "Fit Page Width"
 msgstr "Ajustar ancho"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1918
+#: src/plugins/pdf_viewer/poppler_viewer.c:1934
 msgid "Rotate Left"
 msgstr "Rotar izquierda"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1921
+#: src/plugins/pdf_viewer/poppler_viewer.c:1937
 msgid "Rotate Right"
 msgstr "Rotar derecha"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1940
 msgid "Document Info"
 msgstr "Información del documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1929
+#: src/plugins/pdf_viewer/poppler_viewer.c:1945
 msgid "Page Number"
 msgstr "Número de página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1931
+#: src/plugins/pdf_viewer/poppler_viewer.c:1947
 msgid "Zoom Factor"
 msgstr "Factor de aumento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2036
+#: src/plugins/pdf_viewer/poppler_viewer.c:2052
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -10612,13 +10642,13 @@ msgstr ""
 "\n"
 "Cualquier comentario será bienvenido: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2042
-#: src/plugins/pdf_viewer/poppler_viewer.c:2050
-#: src/plugins/pdf_viewer/poppler_viewer.c:2070
+#: src/plugins/pdf_viewer/poppler_viewer.c:2058
+#: src/plugins/pdf_viewer/poppler_viewer.c:2066
+#: src/plugins/pdf_viewer/poppler_viewer.c:2086
 msgid "PDF Viewer"
 msgstr "Visor PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2046
+#: src/plugins/pdf_viewer/poppler_viewer.c:2062
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -10633,43 +10663,72 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/python/python_plugin.c:338
-#: src/plugins/python/python_plugin.c:482
+#: src/plugins/python/python_plugin.c:358
+#: src/plugins/python/python_plugin.c:502
 msgid "Python scripts"
 msgstr "Scripts Python"
 
-#: src/plugins/python/python_plugin.c:477
+#: src/plugins/python/python_plugin.c:497
 msgid "Show Python console..."
 msgstr "Mostrar la consola de Python..."
 
-#: src/plugins/python/python_plugin.c:483
+#: src/plugins/python/python_plugin.c:503
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: src/plugins/python/python_plugin.c:485 src/prefs_account.c:2488
-#: src/prefs_account.c:2510 src/prefs_account.c:2769 src/wizard.c:1379
-#: src/wizard.c:1658
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2480
+#: src/prefs_account.c:2502 src/prefs_account.c:2761 src/wizard.c:1191
+#: src/wizard.c:1465
 msgid "Browse"
 msgstr "Explorar"
 
-#: src/plugins/python/python_plugin.c:548
-#: src/plugins/python/python_plugin.c:602
+#: src/plugins/python/python_plugin.c:646
+#: src/plugins/python/python_plugin.c:725
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:554
+#: src/plugins/python/python_plugin.c:652
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Error al registrar el «compose create hook» en el módulo Python"
 
-#: src/plugins/python/python_plugin.c:607
+#: src/plugins/python/python_plugin.c:730
 msgid ""
 "This plugin provides Python integration features.\n"
+"Python code can be entered interactively into an embedded Python console, "
+"under Tools -> Show Python console, or stored in scripts.\n"
+"\n"
+"These scripts are then available via the menu. You can assign keyboard "
+"shortcuts to them just like it is done with other menu items. You can also "
+"put buttons for script invokation into the toolbars using Claws Mail's "
+"builtin toolbar editor.\n"
+"\n"
+"You can provide scripts working on the main window by placing files into ~/."
+"claws-mail/python-scripts/main.\n"
+"\n"
+"You can also provide scripts working on an open compose window by placing "
+"files into ~/.claws-mail/python-scripts/compose.\n"
+"\n"
+"The folder ~/.claws-mail/python-scripts/auto/ may contain some scripts that "
+"are automatically executed when certain events occur. Currently, the "
+"following files in this directory are recognised:\n"
+"\n"
+"compose_any\n"
+"Gets executed whenever a compose window is opened, no matterif that opening "
+"happened as a result of composing a new message,replying or forwarding a "
+"message.\n"
+"\n"
+"startup\n"
+"Executed at plugin load\n"
+"\n"
+"shutdown\n"
+"Executed at plugin unload\n"
+"\n"
 "\n"
 "For the most up-to-date API documentation, type\n"
 "\n"
 " help(clawsmail)\n"
 "\n"
-"in the interactive Python console under Tools -> Show Python console.\n"
+"in the interactive Python console.\n"
 "\n"
 "The source distribution of this plugin comes with various example scripts in "
 "the \"examples\" subdirectory. If you wrote a script that you would be "
@@ -10678,23 +10737,50 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"Este módulo proporciona funcionalidades de integración con Python.\n"
+"Este módulo proporciona integración con Python.\n"
+"El código Python se puede introducir de manera interactiva a través de una "
+"consola incrustada (bajo «Herramientas/Mostrar la consola de Python») o "
+"almacenados en ficheros de órdenes (scripts).\n"
+"\n"
+"Estos scripts estarán disponibles a través del menú. También se les pueden "
+"asignar atajos de teclado, como cualquier otro menú. Puede incluso crear "
+"botones en las barras de herramientas para ejecutarlos, usando el editor de "
+"barras de herramientas incluido en Claws Mail.\n"
 "\n"
-"Para la documentación más actualizada del API, teclee\n"
+"Los scripts que trabajen sobre la ventana principal deberán guardarse en "
+"el directorio «~/.claws-mail/python-scripts/main».\n"
+"\n"
+"Los scripts que trabajen sobre la ventana de composición estarán en el "
+"directorio «~/.claws-mail/python-scripts/compose».\n"
+"\n"
+"El directorio «~/.claws-mail/python-scripts/auto» puede contener scripts "
+"que serán ejecutados automáticamente si ocurren ciertos eventos. Los "
+"siguientes nombre de ficheros son reconocidos actualmente:\n"
+"compose_any\n"
+"Se ejecutará cuando se abra una ventana de composición, no importa si es "
+"por crear un nuevo mensaje o por reenviar o responder a un mensaje.\n"
+"\n"
+"startup\n"
+"Se ejecutará al cargar el módulo.\n"
+"\n"
+"shutdown\n"
+"Se ejecutará al descargar el módulo.\n"
+"\n"
+"\n"
+"Para la obtener la documentación más actualizada del API, teclee:\n"
 "\n"
 " help(clawsmail)\n"
 "\n"
-"en la consola interactiva disponible en Herramientas/Mostrar la consola de "
-"Python)\n"
+"en la consola interactiva de Python.\n"
 "\n"
-"Las fuentes de este módulo incluyen varios ejemplos en el subdirectorio\n"
-"«examples». Si ha escrito algún script y está interesado en compartirlo "
-"puede\n"
-"enviármelo para evaluar su inclusión en los ejemplos.\n"
+"Las fuentes originales de este módulo contienen varios scripts de ejemplo en "
+"el subdirectorio «examples». Si ha escrito algún script que pudiera estar "
+"interesado en compartir, no dude en enviármelo para considerar su inclusión "
+"en los ejemplos.\n"
 "\n"
-"Sugerencias para <berndth at gmx.de> serán bienvenidas."
+"Comentarios para <berndth at gmx.de> serán bienvenidos."
 
-#: src/plugins/python/python_plugin.c:636
+#: src/plugins/python/python_plugin.c:781
 msgid "Python integration"
 msgstr "Integración con Python"
 
@@ -10702,11 +10788,11 @@ msgstr "Integración con Python"
 msgid "Passphrase"
 msgstr "Frase contraseña"
 
-#: src/plugins/pgpcore/passphrase.c:253
+#: src/plugins/pgpcore/passphrase.c:249
 msgid "[no user id]"
 msgstr "[sin id usuario]"
 
-#: src/plugins/pgpcore/passphrase.c:264
+#: src/plugins/pgpcore/passphrase.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the "
@@ -10719,11 +10805,11 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:267
+#: src/plugins/pgpcore/passphrase.c:263
 msgid "Passphrases did not match.\n"
 msgstr "Las contraseñas no coinciden.\n"
 
-#: src/plugins/pgpcore/passphrase.c:270
+#: src/plugins/pgpcore/passphrase.c:266
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the "
@@ -10736,7 +10822,7 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:274
+#: src/plugins/pgpcore/passphrase.c:270
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
@@ -10749,7 +10835,7 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:277
+#: src/plugins/pgpcore/passphrase.c:273
 msgid "Bad passphrase.\n"
 msgstr "Contraseña errónea.\n"
 
@@ -10887,7 +10973,7 @@ msgstr "Caduca después de"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Estableciendolo a '0' guarda la contraseña durante toda la sesión"
 
-#: src/plugins/pgpcore/prefs_gpg.c:145 src/prefs_receive.c:173
+#: src/plugins/pgpcore/prefs_gpg.c:145 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -10941,52 +11027,52 @@ msgstr "No hay coincidencia exacta para «%s», por favor seleccione la clave."
 msgid "Collecting info for '%s' ... %c"
 msgstr "Recogiendo información para «%s» ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:142
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:146
+#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:146
 msgid "Marginal"
 msgstr "Marginal"
 
-#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:150
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:150
 msgid "Ultimate"
 msgstr "Absoluta"
 
-#: src/plugins/pgpcore/select-keys.c:370
+#: src/plugins/pgpcore/select-keys.c:366
 msgid "Select Keys"
 msgstr "Seleccione claves"
 
-#: src/plugins/pgpcore/select-keys.c:397
+#: src/plugins/pgpcore/select-keys.c:393
 msgid "Key ID"
 msgstr "ID de clave"
 
-#: src/plugins/pgpcore/select-keys.c:400
+#: src/plugins/pgpcore/select-keys.c:396
 msgid "Trust"
 msgstr "Confianza"
 
-#: src/plugins/pgpcore/select-keys.c:425
+#: src/plugins/pgpcore/select-keys.c:421
 msgid "_Other"
 msgstr "_Otras"
 
-#: src/plugins/pgpcore/select-keys.c:426
+#: src/plugins/pgpcore/select-keys.c:422
 msgid "Do_n't encrypt"
 msgstr "_No cifrar"
 
-#: src/plugins/pgpcore/select-keys.c:585
+#: src/plugins/pgpcore/select-keys.c:581
 msgid "Add key"
 msgstr "Añadir clave"
 
-#: src/plugins/pgpcore/select-keys.c:586
+#: src/plugins/pgpcore/select-keys.c:582
 msgid "Enter another user or key ID:"
 msgstr "Teclee otro usuario o ID-clave:"
 
-#: src/plugins/pgpcore/select-keys.c:608
+#: src/plugins/pgpcore/select-keys.c:604
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Cifrar para %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:609
+#: src/plugins/pgpcore/select-keys.c:605
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -11224,50 +11310,50 @@ msgstr "No se pudo exportar la clave."
 msgid "Key export isn't implemented in Windows."
 msgstr "La exportación de claves no está implementada en Windows."
 
-#: src/plugins/pgpinline/pgpinline.c:258
+#: src/plugins/pgpinline/pgpinline.c:156
 msgid "Incorrect part"
 msgstr "Parte incorrecta"
 
-#: src/plugins/pgpinline/pgpinline.c:262
+#: src/plugins/pgpinline/pgpinline.c:160
 msgid "Not a text part"
 msgstr "No es una parte de texto"
 
-#: src/plugins/pgpinline/pgpinline.c:273 src/plugins/pgpinline/pgpinline.c:430
+#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
 msgid "Couldn't get text data."
 msgstr "No se puede obtener el texto."
 
-#: src/plugins/pgpinline/pgpinline.c:291
+#: src/plugins/pgpinline/pgpinline.c:189
 msgid "Couldn't convert text data to any sane charset."
 msgstr "No se puede convertir el texto a un conjunto de caracteres válido."
 
-#: src/plugins/pgpinline/pgpinline.c:299 src/plugins/pgpinline/pgpinline.c:624
-#: src/plugins/pgpinline/pgpinline.c:763 src/plugins/pgpinline/pgpinline.c:819
-#: src/plugins/pgpmime/pgpmime.c:73 src/plugins/pgpmime/pgpmime.c:182
-#: src/plugins/pgpmime/pgpmime.c:322 src/plugins/pgpmime/pgpmime.c:500
-#: src/plugins/pgpmime/pgpmime.c:644 src/plugins/smime/smime.c:406
+#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:517
+#: src/plugins/pgpinline/pgpinline.c:656 src/plugins/pgpinline/pgpinline.c:712
+#: src/plugins/pgpmime/pgpmime.c:74 src/plugins/pgpmime/pgpmime.c:183
+#: src/plugins/pgpmime/pgpmime.c:329 src/plugins/pgpmime/pgpmime.c:507
+#: src/plugins/pgpmime/pgpmime.c:651 src/plugins/smime/smime.c:395
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "No se pudo inicializar el contexto GPG, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:423
+#: src/plugins/pgpinline/pgpinline.c:316
 msgid "Couldn't parse mime part."
 msgstr "No se puede procesar la parte mime."
 
-#: src/plugins/pgpinline/pgpinline.c:453 src/plugins/pgpmime/pgpmime.c:345
+#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:352
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "No se puede abrir el fichero descifrado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:470 src/plugins/pgpinline/pgpinline.c:479
-#: src/plugins/pgpinline/pgpinline.c:488 src/plugins/pgpinline/pgpinline.c:496
-#: src/plugins/pgpinline/pgpinline.c:506 src/plugins/pgpinline/pgpinline.c:515
-#: src/plugins/pgpmime/pgpmime.c:356 src/plugins/pgpmime/pgpmime.c:370
+#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
+#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
+#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
+#: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "No se puede escribir al fichero descifrado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:484 src/plugins/pgpinline/pgpinline.c:485
-#: src/plugins/pgpinline/pgpinline.c:486
+#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:379
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -11275,51 +11361,51 @@ msgstr ""
 "\n"
 "--- Inicio de los datos cifrados PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:502 src/plugins/pgpinline/pgpinline.c:503
-#: src/plugins/pgpinline/pgpinline.c:504
+#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:397
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Fin de los datos cifrados PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:523 src/plugins/pgpmime/pgpmime.c:382
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:389
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "No se puede cerrar el fichero descifrado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:535
+#: src/plugins/pgpinline/pgpinline.c:428
 msgid "Couldn't scan decrypted file."
 msgstr "No se puede escanear el fichero descifrado."
 
-#: src/plugins/pgpinline/pgpinline.c:543
+#: src/plugins/pgpinline/pgpinline.c:436
 msgid "Couldn't scan decrypted file parts."
 msgstr "No se pueden escanear las partes del fichero descifrado ."
 
-#: src/plugins/pgpinline/pgpinline.c:598 src/plugins/pgpinline/pgpinline.c:790
+#: src/plugins/pgpinline/pgpinline.c:491 src/plugins/pgpinline/pgpinline.c:683
 msgid "Malformed message"
 msgstr "Mensaje malformado"
 
-#: src/plugins/pgpinline/pgpinline.c:609
+#: src/plugins/pgpinline/pgpinline.c:502
 msgid "Couldn't create temporary file."
 msgstr "No se puede crear el fichero temporal."
 
-#: src/plugins/pgpinline/pgpinline.c:648 src/plugins/pgpmime/pgpmime.c:527
+#: src/plugins/pgpinline/pgpinline.c:541 src/plugins/pgpmime/pgpmime.c:534
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Falló la firma de los datos, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:666 src/plugins/pgpmime/pgpmime.c:552
+#: src/plugins/pgpinline/pgpinline.c:559 src/plugins/pgpmime/pgpmime.c:559
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "La firma de los datos fallño debido a un firmante inválido: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:675 src/plugins/pgpmime/pgpmime.c:561
+#: src/plugins/pgpinline/pgpinline.c:568 src/plugins/pgpmime/pgpmime.c:568
 msgid "Data signing failed, no results."
 msgstr "Falló la firma de los datos, no hay resultados."
 
-#: src/plugins/pgpinline/pgpinline.c:685 src/plugins/pgpmime/pgpmime.c:572
+#: src/plugins/pgpinline/pgpinline.c:578 src/plugins/pgpmime/pgpmime.c:579
 msgid "Data signing failed, no contents."
 msgstr "Falló la firma de los datos, no hay contenido."
 
-#: src/plugins/pgpinline/pgpinline.c:729
+#: src/plugins/pgpinline/pgpinline.c:622
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
@@ -11327,22 +11413,22 @@ msgstr ""
 "Por favor, tenga en cuenta que los adjuntos no serán cifrados por el sistema "
 "PGP/Inline, ni tampoco las cabeceras de correo, como el Asunto."
 
-#: src/plugins/pgpinline/pgpinline.c:773 src/plugins/pgpmime/pgpmime.c:654
+#: src/plugins/pgpinline/pgpinline.c:666 src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "No se pudo añadir la clave GPG %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:801 src/plugins/pgpmime/pgpmime.c:683
+#: src/plugins/pgpinline/pgpinline.c:694 src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "No se puede crear el fichero temporal, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:832 src/plugins/pgpmime/pgpmime.c:710
+#: src/plugins/pgpinline/pgpinline.c:725 src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Falló el cifrado, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:899
+#: src/plugins/pgpinline/pgpinline.c:793
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
@@ -11376,24 +11462,24 @@ msgstr ""
 "\n"
 "GPGME es copyright 2001 por Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:202
+#: src/plugins/pgpmime/pgpmime.c:203
 msgid "Signature boundary not found."
 msgstr "No se encontró el delimitador de la firma."
 
-#: src/plugins/pgpmime/pgpmime.c:394 src/plugins/smime/smime.c:487
+#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:476
 msgid "Couldn't parse decrypted file."
 msgstr "No se puede interpretar el fichero descifrado."
 
-#: src/plugins/pgpmime/pgpmime.c:400 src/plugins/smime/smime.c:494
+#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:483
 msgid "Couldn't parse decrypted file parts."
 msgstr "No se pueden interpretar las partes del fichero."
 
-#: src/plugins/pgpmime/pgpmime.c:446 src/plugins/pgpmime/pgpmime.c:485
+#: src/plugins/pgpmime/pgpmime.c:453 src/plugins/pgpmime/pgpmime.c:492
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "No se puede crear el fichero temporal: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:610
+#: src/plugins/pgpmime/pgpmime.c:617
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -11401,7 +11487,7 @@ msgstr ""
 "Por favor, tenga en cuenta que las cabeceras de correo, como el Asunto, no "
 "serán cifradas por el sistema PGP/MIME."
 
-#: src/plugins/pgpmime/pgpmime.c:780
+#: src/plugins/pgpmime/pgpmime.c:788
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -11557,8 +11643,8 @@ msgid ""
 "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
 msgstr ""
 "<b>Intervalo de refresco en minutos:</b>\n"
-"<small>(Establecer a 0 para desactivar el refresco automático de este canal)"
-"</small>"
+"<small>(Establecer a 0 para desactivar el refresco automático de este "
+"canal)</small>"
 
 #: src/plugins/rssyl/rssyl_gtk.c:407
 msgid ""
@@ -11797,7 +11883,7 @@ msgid "Can't subscribe feed '%s'."
 msgstr "No puedo suscribir el canal «%s»."
 
 #: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:924
+#: src/plugins/smime/smime.c:883
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -11837,24 +11923,24 @@ msgstr ""
 "\n"
 "GPGME es copyright 2001 por Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:414
+#: src/plugins/smime/smime.c:403
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "No se pudo establecer el protocolo GPG, %s"
 
-#: src/plugins/smime/smime.c:442
+#: src/plugins/smime/smime.c:431
 msgid "Couldn't open temporary file"
 msgstr "No se pudo abrir el fichero temporal"
 
-#: src/plugins/smime/smime.c:453 src/plugins/smime/smime.c:468
+#: src/plugins/smime/smime.c:442 src/plugins/smime/smime.c:457
 msgid "Couldn't write to temporary file"
 msgstr "No se pudo escribir en el fichero temporal"
 
-#: src/plugins/smime/smime.c:479
+#: src/plugins/smime/smime.c:468
 msgid "Couldn't close temporary file"
 msgstr "No se pudo cerrar el fichero temporal"
 
-#: src/plugins/smime/smime.c:695
+#: src/plugins/smime/smime.c:684
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
@@ -11863,8 +11949,8 @@ msgstr ""
 "serán cifradas por el sistema S/MIME."
 
 #: src/plugins/spam_report/spam_report_prefs.c:80
-#: src/plugins/spam_report/spam_report.c:340
-#: src/plugins/spam_report/spam_report.c:380
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
 msgid "SpamReport"
 msgstr "Informe de correo basura"
 
@@ -11876,15 +11962,15 @@ msgstr "Habilitado"
 msgid "Forward to:"
 msgstr "Reenviar a:"
 
-#: src/plugins/spam_report/spam_report.c:294
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Informando de correo basura..."
 
-#: src/plugins/spam_report/spam_report.c:329
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Informar de correo basura en línea..."
 
-#: src/plugins/spam_report/spam_report.c:385
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -11900,7 +11986,7 @@ msgstr ""
 " * spamcop.net\n"
 " * sistema de nominación de lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:410
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Informe de correo basura"
 
@@ -12239,25 +12325,25 @@ msgid "You are already busy at this time."
 msgstr "Usted ya está ocupado a esa hora."
 
 #: src/plugins/vcalendar/vcalendar.c:1265
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1759
 msgid "Event:"
 msgstr "Evento:"
 
 #: src/plugins/vcalendar/vcalendar.c:1266
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1727
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1737
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1748
 msgid "Organizer:"
 msgstr "Organizador:"
 
 #: src/plugins/vcalendar/vcalendar.c:1267
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1729
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1740
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1750
 msgid "Location:"
 msgstr "Ubicación:"
 
 #: src/plugins/vcalendar/vcalendar.c:1268
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1717
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1728
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1749
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -12270,8 +12356,8 @@ msgid "Ending:"
 msgstr "Finaliza:"
 
 #: src/plugins/vcalendar/vcalendar.c:1272
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1752
 msgid "Attendees:"
 msgstr "Convocados:"
 
@@ -12279,85 +12365,85 @@ msgstr "Convocados:"
 msgid "Action:"
 msgstr "Acción:"
 
-#: src/plugins/vcalendar/vcal_prefs.c:256
+#: src/plugins/vcalendar/vcal_prefs.c:258
 msgid "Reminders"
 msgstr "Recordatorios"
 
-#: src/plugins/vcalendar/vcal_prefs.c:265
+#: src/plugins/vcalendar/vcal_prefs.c:267
 msgid "Alert me"
 msgstr "Avisarme"
 
-#: src/plugins/vcalendar/vcal_prefs.c:277
+#: src/plugins/vcalendar/vcal_prefs.c:279
 msgid "minutes before an event"
 msgstr "minutos antes de un evento"
 
-#: src/plugins/vcalendar/vcal_prefs.c:289
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Calendar export"
 msgstr "Exportación de calendario"
 
-#: src/plugins/vcalendar/vcal_prefs.c:300
+#: src/plugins/vcalendar/vcal_prefs.c:302
 msgid "Automatically export calendar to"
 msgstr "Exportar automáticamente el calendario a"
 
-#: src/plugins/vcalendar/vcal_prefs.c:309
-#: src/plugins/vcalendar/vcal_prefs.c:415
+#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:417
 msgid "You can export to a local file or URL"
 msgstr "Puede exportarlo a un fichero local o URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:313
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Especifique un fichero local o URL (http://servidor/ruta/fichero.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:319
-#: src/plugins/vcalendar/vcal_prefs.c:425 src/prefs_account.c:1263
-#: src/prefs_account.c:1770
+#: src/plugins/vcalendar/vcal_prefs.c:321
+#: src/plugins/vcalendar/vcal_prefs.c:427 src/prefs_account.c:1259
+#: src/prefs_account.c:1766
 msgid "User ID"
 msgstr "Usuario"
 
-#: src/plugins/vcalendar/vcal_prefs.c:327
-#: src/plugins/vcalendar/vcal_prefs.c:433 src/prefs_account.c:1269
-#: src/prefs_account.c:1790 src/prefs_account.c:2499 src/prefs_account.c:2521
-#: src/wizard.c:1389 src/wizard.c:1668
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1265
+#: src/prefs_account.c:1786 src/prefs_account.c:2491 src/prefs_account.c:2513
+#: src/wizard.c:1201 src/wizard.c:1475
 msgid "Password"
 msgstr "Contraseña"
 
-#: src/plugins/vcalendar/vcal_prefs.c:341
+#: src/plugins/vcalendar/vcal_prefs.c:343
 msgid "Include webcal subscriptions in export"
 msgstr "Incluir las suscripciones webcal en la exportación"
 
-#: src/plugins/vcalendar/vcal_prefs.c:351
+#: src/plugins/vcalendar/vcal_prefs.c:353
 msgid "Command to run after calendar export"
 msgstr "Orden a ejecutar tras la exportación del calendario"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:382
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Registrar el calendario de Claws en el reloj Orage de XFCE"
 
-#: src/plugins/vcalendar/vcal_prefs.c:382
+#: src/plugins/vcalendar/vcal_prefs.c:384
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr "Permite a Orage (versión 4.4 o mayor) ver el calendario de Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:394
+#: src/plugins/vcalendar/vcal_prefs.c:396
 msgid "Free/Busy information"
 msgstr "Información libre/ocupado"
 
-#: src/plugins/vcalendar/vcal_prefs.c:406
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Automatically export free/busy status to"
 msgstr "Exportar automáticamente el estado de libre/ocupado a"
 
-#: src/plugins/vcalendar/vcal_prefs.c:417
+#: src/plugins/vcalendar/vcal_prefs.c:419
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Especifique un fichero local o URL (http://servidor/ruta/fichero.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:447
+#: src/plugins/vcalendar/vcal_prefs.c:449
 msgid "Command to run after free/busy status export"
 msgstr "Orden a ejecutar tras la exportación del estado de libre/ocupado"
 
-#: src/plugins/vcalendar/vcal_prefs.c:474
+#: src/plugins/vcalendar/vcal_prefs.c:476
 msgid "Get free/busy status of others from"
 msgstr "Obtener el estado de libre/ocupado de otros desde"
 
-#: src/plugins/vcalendar/vcal_prefs.c:482
+#: src/plugins/vcalendar/vcal_prefs.c:484
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -12366,7 +12452,7 @@ msgstr ""
 "Especifique un fichero local o URL (http://servidor/ruta/fichero.ifb). Use "
 "%u para la parte izquierda de la dirección de correo, %d para el dominio"
 
-#: src/plugins/vcalendar/vcal_prefs.c:646 src/plugins/vcalendar/plugin.c:43
+#: src/plugins/vcalendar/vcal_prefs.c:648 src/plugins/vcalendar/plugin.c:43
 #: src/plugins/vcalendar/plugin.c:64
 msgid "vCalendar"
 msgstr "vCalendar"
@@ -12403,6 +12489,10 @@ msgstr "Vista _semanal"
 msgid "_Month view"
 msgstr "Vista _mensual"
 
+#: src/plugins/vcalendar/vcal_folder.c:1091
+msgid "Meetings"
+msgstr "Reuniones"
+
 #: src/plugins/vcalendar/vcal_folder.c:1475
 msgid "in the past"
 msgstr "en el pasado"
@@ -12513,11 +12603,11 @@ msgstr "Suscribirse a un calendario web"
 msgid "Enter the WebCal URL:"
 msgstr "Introduzca la URL del calendario web:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1923
+#: src/plugins/vcalendar/vcal_folder.c:1921
 msgid "Could not parse the URL."
 msgstr "No se pudo procesar la URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1952
+#: src/plugins/vcalendar/vcal_folder.c:1950
 msgid "Do you really want to unsubscribe?"
 msgstr "¿Desea realmente desuscribirse?"
 
@@ -12670,7 +12760,7 @@ msgid "available"
 msgstr "disponible"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:899
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1150
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1151
 msgid "Free/busy retrieval failed"
 msgstr "Falló la recuperación de libre/ocupado"
 
@@ -12687,22 +12777,22 @@ msgid "Not everyone is available. See tooltips for more info..."
 msgstr ""
 "No todos están disponibles. Vea las notas flotantes para más información..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1132
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1133
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "Recuperando la planificación para %s..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1159
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1160
 msgid "Available"
 msgstr "Disponible"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1172
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1179
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1187
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1180
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
 msgid "Everyone is available."
 msgstr "Todos están disponibles."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1189
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
@@ -12710,7 +12800,7 @@ msgstr ""
 "Todos parecen estar disponibles, pero no se pudo recuperar alguna "
 "información de libre/ocupado."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1360
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1361
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -12718,61 +12808,61 @@ msgstr ""
 "No se pudo enviar la invitación de reunión.\n"
 "Compruebe los destinatarios."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1476
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1493
 msgid "Save & Send"
 msgstr "Guardar y enviar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1494
 msgid "Check availability"
 msgstr "Comprobar disponibilidad"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1600
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "<b>Starts at:</b> "
 msgstr "<b>Comienza a las:</b> "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1627
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1623
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1647
 msgid "<b> on:</b>"
 msgstr "<b> en:</b> "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1641
 msgid "<b>Ends at:</b> "
 msgstr "<b>Finaliza a las:</b> "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1661
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1682
 msgid "New meeting"
 msgstr "Nueva reunión"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1663
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1684
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Editar reunión"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1763
 msgid "Time:"
 msgstr "Hora:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1878
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1896
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1881
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1899
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1892
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Evento inminente: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1893
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1911
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -12789,39 +12879,39 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1928
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "Recuérdamelo en %d minuto"
 msgstr[1] "Recuérdamelo en %d minutos"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2036
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2054
 msgid "Empty calendar"
 msgstr "Calendario vacío"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2037
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2055
 msgid "There is nothing to export."
 msgstr "No hay nada que exportar."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2077
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2095
 msgid "Could not export the calendar."
 msgstr "No se puede exportar el calendario."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2112
 msgid "Export calendar to ICS"
 msgstr "Exportar calendario a ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2135
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "No se puede exportar el calendario a «%s»\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2232
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2251
 msgid "Could not export the freebusy info."
 msgstr "No se puede exportar la información de libre/ocupado."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2263
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2283
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "No se puede exportar la información de libre/ocupado a «%s»\n"
@@ -12899,7 +12989,7 @@ msgid "Show"
 msgstr "Mostrar"
 
 #: src/plugins/vcalendar/day-view.c:622 src/plugins/vcalendar/month-view.c:722
-#: src/prefs_account.c:1456 src/prefs_folder_item.c:562
+#: src/prefs_account.c:1452 src/prefs_folder_item.c:562
 #: src/prefs_matcher.c:334
 msgid "days"
 msgstr "días"
@@ -13077,12 +13167,12 @@ msgstr "hubo un error en la sesión POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "orden TOP no soportada\n"
 
-#: src/prefs_account.c:332 src/prefs_account.c:1430 src/prefs_account.c:2416
-#: src/wizard.c:1549
+#: src/prefs_account.c:332 src/prefs_account.c:1426 src/prefs_account.c:2408
+#: src/wizard.c:1361
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1543 src/prefs_account.c:2431
+#: src/prefs_account.c:335 src/prefs_account.c:1539 src/prefs_account.c:2423
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -13090,7 +13180,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "Noticias (NNTP)"
 
-#: src/prefs_account.c:337 src/wizard.c:1551
+#: src/prefs_account.c:337 src/wizard.c:1363
 msgid "Local mbox file"
 msgstr "Fichero mbox local"
 
@@ -13138,78 +13228,78 @@ msgstr "Este servidor requiere autentificación"
 msgid "Authenticate on connect"
 msgstr "Autentificación al conectar"
 
-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1216
 msgid "News server"
 msgstr "Servidor de news"
 
-#: src/prefs_account.c:1226
+#: src/prefs_account.c:1222
 msgid "Server for receiving"
 msgstr "Servidor de recepción"
 
-#: src/prefs_account.c:1232
+#: src/prefs_account.c:1228
 msgid "Local mailbox"
 msgstr "Buzón local"
 
-#: src/prefs_account.c:1239
+#: src/prefs_account.c:1235
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account.c:1247
+#: src/prefs_account.c:1243
 msgid "Use mail command rather than SMTP server"
 msgstr "Usar mandato para correo en vez de servidor SMTP"
 
-#: src/prefs_account.c:1256
+#: src/prefs_account.c:1252
 msgid "command to send mails"
 msgstr "orden para enviar los correos"
 
-#: src/prefs_account.c:1318
+#: src/prefs_account.c:1314
 #, c-format
 msgid "Account%d"
 msgstr "Cuenta%d"
 
-#: src/prefs_account.c:1404
+#: src/prefs_account.c:1400
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1410 src/prefs_account.c:1499
+#: src/prefs_account.c:1406 src/prefs_account.c:1495
 msgid "Default Inbox"
 msgstr "Entrada por defecto"
 
-#: src/prefs_account.c:1417 src/prefs_account.c:1424 src/prefs_account.c:1506
-#: src/prefs_account.c:1513
+#: src/prefs_account.c:1413 src/prefs_account.c:1420 src/prefs_account.c:1502
+#: src/prefs_account.c:1509
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Los mensajes sin filtrar se guardarán en esta carpeta"
 
-#: src/prefs_account.c:1421 src/prefs_account.c:1510 src/prefs_account.c:1974
+#: src/prefs_account.c:1417 src/prefs_account.c:1506 src/prefs_account.c:1966
 #: src/prefs_customheader.c:237
 msgid "Bro_wse"
 msgstr "E_xplorar"
 
-#: src/prefs_account.c:1432
+#: src/prefs_account.c:1428
 msgid "Use secure authentication (APOP)"
 msgstr "Utilizar autentificación segura (APOP)"
 
-#: src/prefs_account.c:1435
+#: src/prefs_account.c:1431
 msgid "Remove messages on server when received"
 msgstr "Eliminar los mensajes del servidor al recibirlos"
 
-#: src/prefs_account.c:1446
+#: src/prefs_account.c:1442
 msgid "Remove after"
 msgstr "Eliminar después de"
 
-#: src/prefs_account.c:1453 src/prefs_account.c:1463
+#: src/prefs_account.c:1449 src/prefs_account.c:1459
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 días y 0 horas: borrar inmediatamente"
 
-#: src/prefs_account.c:1466 src/prefs_matcher.c:333
+#: src/prefs_account.c:1462 src/prefs_matcher.c:333
 msgid "hours"
 msgstr "horas"
 
-#: src/prefs_account.c:1476
+#: src/prefs_account.c:1472
 msgid "Receive size limit"
 msgstr "Límite de tamaño al recibir"
 
-#: src/prefs_account.c:1479
+#: src/prefs_account.c:1475
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -13217,87 +13307,87 @@ msgstr ""
 "Los mensajes que sobrepasen este límite serán recuperados parcialmente. Al "
 "seleccionarlos podrá descargarlos por completo o borrarlos."
 
-#: src/prefs_account.c:1519 src/prefs_account.c:2446
+#: src/prefs_account.c:1515 src/prefs_account.c:2438
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1526
+#: src/prefs_account.c:1522
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artículos a descargar"
 
-#: src/prefs_account.c:1536
+#: src/prefs_account.c:1532
 msgid "unlimited if 0 is specified"
 msgstr "sin límite si se especifica 0"
 
-#: src/prefs_account.c:1549 src/prefs_account.c:1742
+#: src/prefs_account.c:1545 src/prefs_account.c:1738
 msgid "Authentication method"
 msgstr "Método de autentificación"
 
-#: src/prefs_account.c:1559 src/prefs_account.c:1751 src/prefs_send.c:286
+#: src/prefs_account.c:1555 src/prefs_account.c:1747 src/prefs_send.c:290
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/prefs_account.c:1571
+#: src/prefs_account.c:1567
 msgid "IMAP server directory"
 msgstr "Directorio del servidor IMAP"
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1571
 msgid "(usually empty)"
 msgstr "(vacío habitualmente)"
 
-#: src/prefs_account.c:1589
+#: src/prefs_account.c:1585
 msgid "Show subscribed folders only"
 msgstr "Mostrar sólo carpetas suscritas"
 
-#: src/prefs_account.c:1596
+#: src/prefs_account.c:1592
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 "Modo de ancho de banda eficiente (evita recuperar las etiquetas remotas)"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1594
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Este modo usa menos ancho de banda, pero puede ser más lento con algunos "
 "servidores."
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1601
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensajes al recibir"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1608
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permitir el filtrado usando módulos al recibir"
 
-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1612
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "«Recibir correo» comprueba si hay nuevos mensajes en esta cuenta"
 
-#: src/prefs_account.c:1697 src/prefs_customheader.c:209
-#: src/prefs_matcher.c:620 src/prefs_matcher.c:1952 src/prefs_matcher.c:1974
+#: src/prefs_account.c:1693 src/prefs_customheader.c:209
+#: src/prefs_matcher.c:620 src/prefs_matcher.c:1958 src/prefs_matcher.c:1980
 msgid "Header"
 msgstr "Cabecera"
 
-#: src/prefs_account.c:1699
+#: src/prefs_account.c:1695
 msgid "Generate Message-ID"
 msgstr "Generar identificador de mensaje"
 
-#: src/prefs_account.c:1702
+#: src/prefs_account.c:1698
 msgid "Send account mail address in Message-ID"
 msgstr "Enviar la dirección de correo de la cuenta en el «Message-Id»"
 
-#: src/prefs_account.c:1705
+#: src/prefs_account.c:1701
 msgid "Generate X-Mailer header"
 msgstr "Generar cabecera X-Mailer"
 
-#: src/prefs_account.c:1712
+#: src/prefs_account.c:1708
 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1723
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificación SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:1816
+#: src/prefs_account.c:1808
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -13305,177 +13395,177 @@ msgstr ""
 "Si deja estos campos vacíos, se utilizarán el mismo identificador de usuario "
 "y contraseña usados para la recepción."
 
-#: src/prefs_account.c:1827
+#: src/prefs_account.c:1819
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentificación con POP3 antes de enviar"
 
-#: src/prefs_account.c:1842
+#: src/prefs_account.c:1834
 msgid "POP authentication timeout: "
 msgstr "Tiempo límite para autentificación POP: "
 
-#: src/prefs_account.c:1850
+#: src/prefs_account.c:1842
 msgid "minutes"
 msgstr "minutos"
 
-#: src/prefs_account.c:1920 src/prefs_account.c:1966
+#: src/prefs_account.c:1912 src/prefs_account.c:1958
 msgid "Signature"
 msgstr "Firma"
 
-#: src/prefs_account.c:1923
+#: src/prefs_account.c:1915
 msgid "Automatically insert signature"
 msgstr "Insertar la firma automáticamente"
 
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1920
 msgid "Signature separator"
 msgstr "Separador de la firma"
 
-#: src/prefs_account.c:1953
+#: src/prefs_account.c:1945
 msgid "Command output"
 msgstr "Salida de la orden"
 
-#: src/prefs_account.c:1986
+#: src/prefs_account.c:1978
 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
-#: src/prefs_account.c:2038
+#: src/prefs_account.c:2030
 msgid "Spell check dictionaries"
 msgstr "Diccionarios de correción ortográfica"
 
-#: src/prefs_account.c:2048 src/prefs_folder_item.c:1094
+#: src/prefs_account.c:2040 src/prefs_folder_item.c:1094
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Diccionario por omisión"
 
-#: src/prefs_account.c:2061 src/prefs_folder_item.c:1128
+#: src/prefs_account.c:2053 src/prefs_folder_item.c:1128
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Diccionario alternativo predeterminado"
 
-#: src/prefs_account.c:2147 src/prefs_account.c:3263
+#: src/prefs_account.c:2139 src/prefs_account.c:3255
 #: src/prefs_compose_writing.c:350 src/prefs_folder_item.c:1443
 #: src/prefs_folder_item.c:1834 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Componer"
 
-#: src/prefs_account.c:2162 src/prefs_folder_item.c:1471 src/prefs_quote.c:134
-#: src/toolbar.c:407
+#: src/prefs_account.c:2154 src/prefs_folder_item.c:1471 src/prefs_quote.c:134
+#: src/toolbar.c:408
 msgid "Reply"
 msgstr "Responder"
 
-#: src/prefs_account.c:2177 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1499 src/prefs_quote.c:149 src/toolbar.c:411
+#: src/prefs_account.c:2169 src/prefs_filtering_action.c:191
+#: src/prefs_folder_item.c:1499 src/prefs_quote.c:149 src/toolbar.c:412
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/prefs_account.c:2224
+#: src/prefs_account.c:2216
 msgid "Default privacy system"
 msgstr "Sistema de privacidad por omisión"
 
-#: src/prefs_account.c:2253
+#: src/prefs_account.c:2245
 msgid "Always sign messages"
 msgstr "Firmar siempre los mensajes"
 
-#: src/prefs_account.c:2255
+#: src/prefs_account.c:2247
 msgid "Always encrypt messages"
 msgstr "Cifrar siempre los mensajes"
 
-#: src/prefs_account.c:2257
+#: src/prefs_account.c:2249
 msgid "Always sign messages when replying to a signed message"
 msgstr "Firmar siempre los mensajes al responder a un mensaje firmado"
 
-#: src/prefs_account.c:2260
+#: src/prefs_account.c:2252
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Cifrar siempre los mensajes al responder a un mensaje cifrado"
 
-#: src/prefs_account.c:2263
+#: src/prefs_account.c:2255
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Cifrar los mensajes enviados con la clave propia además de las del "
 "destinatario"
 
-#: src/prefs_account.c:2265
+#: src/prefs_account.c:2257
 msgid "Save sent encrypted messages as clear text"
 msgstr "Guardar en claro los mensajes enviados cifrados"
 
-#: src/prefs_account.c:2420 src/prefs_account.c:2435 src/prefs_account.c:2449
+#: src/prefs_account.c:2412 src/prefs_account.c:2427 src/prefs_account.c:2441
 msgid "Don't use SSL"
 msgstr "No usar SSL"
 
-#: src/prefs_account.c:2423
+#: src/prefs_account.c:2415
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para la conexión POP3"
 
-#: src/prefs_account.c:2426 src/prefs_account.c:2441 src/prefs_account.c:2472
+#: src/prefs_account.c:2418 src/prefs_account.c:2433 src/prefs_account.c:2464
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar la orden STARTTLS para abrir la sesión SSL"
 
-#: src/prefs_account.c:2438
+#: src/prefs_account.c:2430
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para la conexión IMAP4"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2450
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para la conexión NNTP"
 
-#: src/prefs_account.c:2462
+#: src/prefs_account.c:2454
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account.c:2466
+#: src/prefs_account.c:2458
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "No usar SSL (pero usar STARTTLS si es necesario)"
 
-#: src/prefs_account.c:2469
+#: src/prefs_account.c:2461
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para la conexión SMTP"
 
-#: src/prefs_account.c:2477
+#: src/prefs_account.c:2469
 msgid "Client certificates"
 msgstr "Certificados de cliente"
 
-#: src/prefs_account.c:2485
+#: src/prefs_account.c:2477
 msgid "Certificate for receiving"
 msgstr "Certificado para recepción"
 
-#: src/prefs_account.c:2490 src/prefs_account.c:2492 src/prefs_account.c:2512
-#: src/prefs_account.c:2514
+#: src/prefs_account.c:2482 src/prefs_account.c:2484 src/prefs_account.c:2504
+#: src/prefs_account.c:2506
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Certificado de cliente como fichero PKCS12 o PEM"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2499
 msgid "Certificate for sending"
 msgstr "Certificado para envío"
 
-#: src/prefs_account.c:2540
+#: src/prefs_account.c:2532
 msgid "Use non-blocking SSL"
 msgstr "Usar SSL no-bloqueante"
 
-#: src/prefs_account.c:2552
+#: src/prefs_account.c:2544
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Desactive esto si tiene problemas de conexión con SSL"
 
-#: src/prefs_account.c:2668
+#: src/prefs_account.c:2660
 msgid "SMTP port"
 msgstr "Puerto SMTP"
 
-#: src/prefs_account.c:2675
+#: src/prefs_account.c:2667
 msgid "POP3 port"
 msgstr "Puerto POP3"
 
-#: src/prefs_account.c:2682
+#: src/prefs_account.c:2674
 msgid "IMAP4 port"
 msgstr "Puerto IMAP4"
 
-#: src/prefs_account.c:2689
+#: src/prefs_account.c:2681
 msgid "NNTP port"
 msgstr "Puerto NNTP"
 
-#: src/prefs_account.c:2695
+#: src/prefs_account.c:2687
 msgid "Domain name"
 msgstr "Nombre de dominio"
 
-#: src/prefs_account.c:2698
+#: src/prefs_account.c:2690
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -13483,15 +13573,15 @@ msgstr ""
 "El nombre de dominio se usará en la parte derecha de los identificadores de "
 "mensaje generados («Message-Id») y al conectar a servidores SMTP."
 
-#: src/prefs_account.c:2712
+#: src/prefs_account.c:2704
 msgid "Use command to communicate with server"
 msgstr "Usar orden para comunicarse con el servidor"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2712
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Mover los correos borrados a la papelera y purgarlos inmediatamente"
 
-#: src/prefs_account.c:2722
+#: src/prefs_account.c:2714
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -13499,75 +13589,75 @@ msgstr ""
 "Mueve los correos borrados a la papelera en lugar de usar la marca "
 "«\\Deleted» sin purgarlos."
 
-#: src/prefs_account.c:2726
+#: src/prefs_account.c:2718
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar los mensajes cruzados como leídos y de color:"
 
-#: src/prefs_account.c:2782
+#: src/prefs_account.c:2774
 msgid "Put sent messages in"
 msgstr "Poner mensajes enviados en"
 
-#: src/prefs_account.c:2784
+#: src/prefs_account.c:2776
 msgid "Put queued messages in"
 msgstr "Poner mensajes para la cola en"
 
-#: src/prefs_account.c:2786
+#: src/prefs_account.c:2778
 msgid "Put draft messages in"
 msgstr "Poner borradores de mensajes en"
 
-#: src/prefs_account.c:2788
+#: src/prefs_account.c:2780
 msgid "Put deleted messages in"
 msgstr "Poner mensajes borrados en"
 
-#: src/prefs_account.c:2846
+#: src/prefs_account.c:2838
 msgid "Account name is not entered."
 msgstr "No se especificó el nombre de la cuenta."
 
-#: src/prefs_account.c:2850
+#: src/prefs_account.c:2842
 msgid "Mail address is not entered."
 msgstr "No se especificó la dirección de correo."
 
-#: src/prefs_account.c:2857
+#: src/prefs_account.c:2849
 msgid "SMTP server is not entered."
 msgstr "No se especificó el servidor SMTP."
 
-#: src/prefs_account.c:2862
+#: src/prefs_account.c:2854
 msgid "User ID is not entered."
 msgstr "No se especificó el usuario."
 
-#: src/prefs_account.c:2867
+#: src/prefs_account.c:2859
 msgid "POP3 server is not entered."
 msgstr "No se especificó el servidor POP3."
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2879
 msgid "The default Inbox folder doesn't exist."
 msgstr "La carpeta de entrada por omisión no existe."
 
-#: src/prefs_account.c:2893
+#: src/prefs_account.c:2885
 msgid "IMAP4 server is not entered."
 msgstr "No se especificó el servidor IMAP4."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2890
 msgid "NNTP server is not entered."
 msgstr "No se especificó el servidor NNTP."
 
-#: src/prefs_account.c:2904
+#: src/prefs_account.c:2896
 msgid "local mailbox filename is not entered."
 msgstr "no se especificó el nombre de fichero del buzón local."
 
-#: src/prefs_account.c:2910
+#: src/prefs_account.c:2902
 msgid "mail command is not entered."
 msgstr "no se especificó el mandato de correo."
 
-#: src/prefs_account.c:3227
+#: src/prefs_account.c:3219
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account.c:3281 src/prefs_folder_item.c:1850 src/prefs_quote.c:238
+#: src/prefs_account.c:3273 src/prefs_folder_item.c:1850 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Plantillas"
 
-#: src/prefs_account.c:3299
+#: src/prefs_account.c:3291
 msgid "Privacy"
 msgstr "Privacidad"
 
@@ -13584,19 +13674,19 @@ msgstr "Preferencias para una nueva cuenta"
 msgid "%s - Account preferences"
 msgstr "%s - Preferencias de la cuenta"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3794
 msgid "Select signature file"
 msgstr "Seleccionar fichero de firma"
 
-#: src/prefs_account.c:3813 src/prefs_account.c:3830 src/wizard.c:1237
+#: src/prefs_account.c:3812 src/prefs_account.c:3829 src/wizard.c:1053
 msgid "Select certificate file"
 msgstr "Seleccionar fichero del certificado"
 
-#: src/prefs_account.c:3926
+#: src/prefs_account.c:3925
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/prefs_account.c:4066
+#: src/prefs_account.c:4065
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (módulo no cargado)"
@@ -13625,72 +13715,72 @@ msgstr "Editar acción de filtrado"
 msgid "Append the new action above to the list"
 msgstr "Añadir la nueva acción de arriba a la lista"
 
-#: src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:768 src/prefs_template.c:309
-#: src/prefs_toolbar.c:1043
-msgid "Replace"
-msgstr "Reemplazar"
-
 #: src/prefs_actions.c:335
 msgid "Replace the selected action in list with the action above"
 msgstr "Sustituir la acción seleccionada en la lista con la acción de arriba"
 
-#: src/prefs_actions.c:343
+#: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:778 src/prefs_template.c:318
+#: src/prefs_toolbar.c:1056
+msgid "Re_move"
+msgstr "Eli_minar"
+
+#: src/prefs_actions.c:345
 msgid "Delete the selected action from the list"
 msgstr "Borrar la acción seleccionada de la lista"
 
-#: src/prefs_actions.c:351 src/prefs_filtering.c:500 src/prefs_template.c:332
+#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:336
 msgid "Clear all the input fields in the dialog"
 msgstr "Limpiar todos los campos de entrada en el diálogo"
 
-#: src/prefs_actions.c:359
+#: src/prefs_actions.c:363
 msgid "Show information on configuring actions"
 msgstr "Muestra información sobre la configuración de las acciones"
 
-#: src/prefs_actions.c:390
+#: src/prefs_actions.c:394
 msgid "Move the selected action up"
 msgstr "Mover arriba la acción seleccionada"
 
-#: src/prefs_actions.c:398
+#: src/prefs_actions.c:402
 msgid "Move selected action down"
 msgstr "Mover abajo la acción seleccionada"
 
-#: src/prefs_actions.c:531 src/prefs_filtering_action.c:702
-#: src/prefs_filtering.c:833 src/prefs_filtering.c:835
-#: src/prefs_filtering.c:836 src/prefs_filtering.c:946 src/prefs_matcher.c:891
-#: src/prefs_template.c:465
+#: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
+#: src/prefs_filtering.c:836 src/prefs_filtering.c:838
+#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:897
+#: src/prefs_template.c:469
 msgid "(New)"
 msgstr "(Nueva)"
 
-#: src/prefs_actions.c:596
+#: src/prefs_actions.c:600
 msgid "Menu name is not set."
 msgstr "No se estableció el nombre del menú."
 
-#: src/prefs_actions.c:601
+#: src/prefs_actions.c:605
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "No se permite «/» al inicio del nombre del menú."
 
-#: src/prefs_actions.c:606
+#: src/prefs_actions.c:610
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "No se permite «:» (dos puntos) en el nombre del menú."
 
-#: src/prefs_actions.c:612
+#: src/prefs_actions.c:616
 msgid "There is an action with this name already."
 msgstr "Ya existe una acción con ese nombre."
 
-#: src/prefs_actions.c:631
+#: src/prefs_actions.c:635
 msgid "Menu name is too long."
 msgstr "El nombre del menú es demasiado largo."
 
-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:644
 msgid "Command-line not set."
 msgstr "No se especificó la orden a ejecutar."
 
-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:649
 msgid "Menu name and command are too long."
 msgstr "El nombre del menú y la orden son demasiado largos."
 
-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:655
 #, c-format
 msgid ""
 "The command\n"
@@ -13701,140 +13791,140 @@ msgstr ""
 "%s\n"
 "tiene errores sintácticos."
 
-#: src/prefs_actions.c:709
+#: src/prefs_actions.c:713
 msgid "Delete action"
 msgstr "Borrar acción"
 
-#: src/prefs_actions.c:710
+#: src/prefs_actions.c:714
 msgid "Do you really want to delete this action?"
 msgstr "¿Realmente quiere borrar esta acción?"
 
-#: src/prefs_actions.c:730
+#: src/prefs_actions.c:734
 msgid "Delete all actions"
 msgstr "Borrar todas las acciones"
 
-#: src/prefs_actions.c:731
+#: src/prefs_actions.c:735
 msgid "Do you really want to delete all the actions?"
 msgstr "¿Realmente quiere borrar todas las acciones?"
 
-#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1496
-#: src/prefs_filtering.c:1518 src/prefs_matcher.c:2103
-#: src/prefs_template.c:565 src/prefs_template.c:590
+#: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1499
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2109
+#: src/prefs_template.c:569 src/prefs_template.c:594
 msgid "Entry not saved"
 msgstr "Entrada no guardada"
 
-#: src/prefs_actions.c:895 src/prefs_actions.c:926 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_template.c:566
-#: src/prefs_template.c:591
+#: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1522 src/prefs_template.c:570
+#: src/prefs_template.c:595
 msgid "The entry was not saved. Close anyway?"
 msgstr "La entrada no fue guardada. ¿Cerrar igualmente?"
 
-#: src/prefs_actions.c:896 src/prefs_actions.c:901 src/prefs_actions.c:927
-#: src/prefs_filtering.c:1476 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_matcher.c:2105
-#: src/prefs_template.c:567 src/prefs_template.c:592 src/prefs_template.c:597
+#: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
+#: src/prefs_filtering.c:1479 src/prefs_filtering.c:1501
+#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2111
+#: src/prefs_template.c:571 src/prefs_template.c:596 src/prefs_template.c:601
 msgid "+_Continue editing"
 msgstr "+_Seguir editando"
 
-#: src/prefs_actions.c:899
+#: src/prefs_actions.c:903
 msgid "Actions list not saved"
 msgstr "Lista de acciones no guardada"
 
-#: src/prefs_actions.c:900
+#: src/prefs_actions.c:904
 msgid "The actions list has been modified. Close anyway?"
 msgstr "La lista de acciones no fue guardada. ¿Cerrar igualmente?"
 
-#: src/prefs_actions.c:970
+#: src/prefs_actions.c:974
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Nombre de menú:</span>"
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:975
 msgid "Use / in menu name to make submenus."
 msgstr "Utilize / en el nombre de menú para crear submenús."
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:977
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Línea de orden:</span>"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:978
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Comenzar con:</span>"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:979
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "para enviar el mensaje o la selección a la entrada estándar de la orden"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:980
 msgid "to send user provided text to command's standard input"
 msgstr "para enviar el texto de usuario a la entrada estándar de la orden"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:981
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "para enviar el texto de usuario oculto a la entrada estándar de la orden"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:982
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Finalizar con:</span>"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:983
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "para reemplazar el mensaje o selección con la salida estándar de la orden"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:984
 msgid "to insert command's standard output without replacing old text"
 msgstr "para insertar la salida estándar de la orden sin reemplazar el texto"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:985
 msgid "to run command asynchronously"
 msgstr "para ejecutar la orden de manera asíncrona"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:986
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Usar:</span>"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:987
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "para el fichero del mensaje seleccionado en formato RFC822/2822 "
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:988
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 "para la lista de nombres de los mensajes seleccionados en formato RFC822/2822"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:989
 msgid "for the file of the selected decoded message MIME part"
 msgstr "para el fichero de la parte MIME seleccionada del mensaje decodificada"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:990
 msgid "for a user provided argument"
 msgstr "para un parámetro introducido por el usuario"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:991
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr ""
 "para un parámetro introducido por el usuario y oculto (p.ej. contraseña)"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:992
 msgid "for the text selection"
 msgstr "para la parte seleccionada del texto"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:993
 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplicar acciones de filtrado entre {} a los mensajes seleccionados"
 
-#: src/prefs_actions.c:990
+#: src/prefs_actions.c:994
 msgid "for a literal %"
 msgstr "para un carácter %"
 
-#: src/prefs_actions.c:1000 src/prefs_themes.c:959
+#: src/prefs_actions.c:1004 src/prefs_themes.c:959
 msgid "Actions"
 msgstr "Acciones"
 
-#: src/prefs_actions.c:1001
+#: src/prefs_actions.c:1005
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
@@ -13842,38 +13932,38 @@ msgstr ""
 "Las acciones son una forma de que el usuario pueda lanzar órdenes externas "
 "que procesen un fichero de mensaje o alguna de sus partes."
 
-#: src/prefs_actions.c:1088 src/prefs_filtering.c:1694
-#: src/prefs_template.c:1097
+#: src/prefs_actions.c:1092 src/prefs_filtering.c:1697
+#: src/prefs_template.c:1101
 msgid "D_uplicate"
 msgstr "D_uplicar"
 
-#: src/prefs_actions.c:1215
+#: src/prefs_actions.c:1212
 msgid "Current actions"
 msgstr "Acciones actuales"
 
-#: src/prefs_actions.c:1314 src/prefs_filtering.c:1071
-#: src/prefs_filtering.c:1129
+#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074
+#: src/prefs_filtering.c:1132
 msgid "Action string is not valid."
 msgstr "La cadena de la acción no es válida."
 
-#: src/prefs_common.c:230 src/prefs_quote.c:69
+#: src/prefs_common.c:220 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hola,\\n"
 
-#: src/prefs_common.c:304
+#: src/prefs_common.c:294
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "El %d\\n%f escribió:\\n%q\\n%X"
 
-#: src/prefs_common.c:310 src/prefs_quote.c:85
+#: src/prefs_common.c:300 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
 msgstr ""
-"\\n\\nInicio del mensaje redirigido:\\n\\n?d{Fecha: %d\\n}?f{Desde: %f\\n}?t"
-"{Para: %t\\n}?c{Cc: %c\\n}?n{Grupos de noticias: %n\\n}?s{Asunto: %s\\n}\\n"
+"\\n\\nInicio del mensaje redirigido:\\n\\n?d{Fecha: %d\\n}?f{Desde: %f\\n}?"
+"t{Para: %t\\n}?c{Cc: %c\\n}?n{Grupos de noticias: %n\\n}?s{Asunto: %s\\n}\\n"
 "\\n%M"
 
-#: src/prefs_common.c:450
+#: src/prefs_common.c:440
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -13953,11 +14043,11 @@ msgstr "Al soltar ficheros en la ventana de composición"
 msgid "Ask"
 msgstr "Preguntar"
 
-#: src/prefs_compose_writing.c:230 src/toolbar.c:425
+#: src/prefs_compose_writing.c:230 src/toolbar.c:426
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/prefs_compose_writing.c:231 src/toolbar.c:426
+#: src/prefs_compose_writing.c:231 src/toolbar.c:427
 msgid "Attach"
 msgstr "Adjuntar"
 
@@ -13970,7 +14060,7 @@ msgid "Custom header configuration"
 msgstr "Configuración de cabeceras de usuario"
 
 #: src/prefs_customheader.c:507 src/prefs_display_header.c:599
-#: src/prefs_matcher.c:1577 src/prefs_matcher.c:1592
+#: src/prefs_matcher.c:1583 src/prefs_matcher.c:1598
 msgid "Header name is not set."
 msgstr "No se estableció el nombre de cabecera"
 
@@ -14068,19 +14158,19 @@ msgstr "%s se sustituirá con el nombre de fichero / URI"
 msgid "Use system defaults when possible"
 msgstr "Usar los valores del sistema cuando sea posible"
 
-#: src/prefs_ext_prog.c:146
+#: src/prefs_ext_prog.c:141
 msgid "Web browser"
 msgstr "Navegador web"
 
-#: src/prefs_ext_prog.c:180
+#: src/prefs_ext_prog.c:169
 msgid "Text editor"
 msgstr "Editor de texto"
 
-#: src/prefs_ext_prog.c:208
+#: src/prefs_ext_prog.c:197
 msgid "Command for 'Display as text'"
 msgstr "Orden para «Mostrar como texto»"
 
-#: src/prefs_ext_prog.c:221
+#: src/prefs_ext_prog.c:210
 msgid ""
 "This option enables MIME parts to be displayed in the message view via a "
 "script when using the 'Display as text' contextual menu item"
@@ -14088,12 +14178,12 @@ msgstr ""
 "Esta opción permite mostrar partes MIME en la vista de mensajes a través de "
 "un script cuando se usa la opción «Mostrar como texto» del menú contextual"
 
-#: src/prefs_ext_prog.c:280 src/prefs_image_viewer.c:138
+#: src/prefs_ext_prog.c:269 src/prefs_image_viewer.c:138
 #: src/prefs_message.c:354
 msgid "Message View"
 msgstr "Vista de mensaje"
 
-#: src/prefs_ext_prog.c:281
+#: src/prefs_ext_prog.c:270
 msgid "External Programs"
 msgstr "Programas externos"
 
@@ -14137,8 +14227,8 @@ msgstr "Marcar como basura"
 msgid "Mark as ham"
 msgstr "Marcar como bueno"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1436
-#: src/toolbar.c:204 src/toolbar.c:435 src/toolbar.c:2106
+#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1438
+#: src/toolbar.c:205 src/toolbar.c:436 src/toolbar.c:2107
 msgid "Execute"
 msgstr "Ejecutar"
 
@@ -14156,7 +14246,7 @@ msgid "Redirect"
 msgstr "Redirigir"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1440 src/prefs_matcher.c:626
+#: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:626
 #: src/prefs_summary_column.c:87 src/summaryview.c:449
 msgid "Score"
 msgstr "Puntos"
@@ -14199,7 +14289,7 @@ msgstr "Detener filtro"
 msgid "Action configuration"
 msgstr "Configuración de la acción"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1892
+#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1888
 #: src/prefs_matcher.c:583
 msgid "Rule"
 msgstr "Regla"
@@ -14208,65 +14298,65 @@ msgstr "Regla"
 msgid "Action"
 msgstr "Acción"
 
-#: src/prefs_filtering_action.c:933
+#: src/prefs_filtering_action.c:935
 msgid "Command-line not set"
 msgstr "Orden no establecida"
 
-#: src/prefs_filtering_action.c:934
+#: src/prefs_filtering_action.c:936
 msgid "Destination is not set."
 msgstr "Destino no establecido."
 
-#: src/prefs_filtering_action.c:945
+#: src/prefs_filtering_action.c:947
 msgid "Recipient is not set."
 msgstr "Destinatario no establecido."
 
-#: src/prefs_filtering_action.c:963
+#: src/prefs_filtering_action.c:965
 msgid "Score is not set"
 msgstr "Puntuación no establecida"
 
-#: src/prefs_filtering_action.c:971
+#: src/prefs_filtering_action.c:973
 msgid "Header is not set."
 msgstr "No se estableció la cabecera."
 
-#: src/prefs_filtering_action.c:978
+#: src/prefs_filtering_action.c:980
 msgid "Target addressbook/folder is not set."
 msgstr "No se especificó agenda/carpeta de destino."
 
-#: src/prefs_filtering_action.c:992
+#: src/prefs_filtering_action.c:994
 msgid "Tag name is empty."
 msgstr "El nombre de la etiqueta está vacío."
 
-#: src/prefs_filtering_action.c:1214
+#: src/prefs_filtering_action.c:1216
 msgid "No action was defined."
 msgstr "No se definió ninguna acción."
 
-#: src/prefs_filtering_action.c:1252 src/prefs_matcher.c:2147
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2153
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "carácter %"
 
-#: src/prefs_filtering_action.c:1261 src/prefs_matcher.c:2156
+#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2162
 msgid "filename (should not be modified)"
 msgstr "nombre de fichero (no debe modificarse)"
 
-#: src/prefs_filtering_action.c:1262 src/prefs_matcher.c:2157
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2163
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "nueva línea"
 
-#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2158
+#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2164
 msgid "escape character for quotes"
 msgstr "carácter de escape para citas"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2159
+#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2165
 msgid "quote character"
 msgstr "carácter de cita"
 
-#: src/prefs_filtering_action.c:1273
+#: src/prefs_filtering_action.c:1275
 msgid "Filtering Action: 'Execute'"
 msgstr "Acción de filtrado: «Ejecutar»"
 
-#: src/prefs_filtering_action.c:1274
+#: src/prefs_filtering_action.c:1276
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
@@ -14276,23 +14366,23 @@ msgstr ""
 "externo o script.\n"
 "Se puden usar los siguientes símbolos:"
 
-#: src/prefs_filtering_action.c:1420
+#: src/prefs_filtering_action.c:1422
 msgid "Recipient"
 msgstr "Destinatario"
 
-#: src/prefs_filtering_action.c:1424
+#: src/prefs_filtering_action.c:1426
 msgid "Book/Folder"
 msgstr "Agenda/carpeta"
 
-#: src/prefs_filtering_action.c:1428
+#: src/prefs_filtering_action.c:1430
 msgid "Destination"
 msgstr "Destino"
 
-#: src/prefs_filtering_action.c:1432
+#: src/prefs_filtering_action.c:1434
 msgid "Color"
 msgstr "Colorear"
 
-#: src/prefs_filtering_action.c:1518
+#: src/prefs_filtering_action.c:1520
 msgid "Current action list"
 msgstr "Lista actual de acciones"
 
@@ -14300,8 +14390,8 @@ msgstr "Lista actual de acciones"
 msgid "Filtering/Processing configuration"
 msgstr "Configuración de filtrado/procesamiento"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:864
-#: src/prefs_filtering.c:978
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
+#: src/prefs_filtering.c:981
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Cualquiera"
@@ -14310,9 +14400,13 @@ msgstr "Cualquiera"
 msgid "Condition"
 msgstr "Condición"
 
-#: src/prefs_filtering.c:424 src/prefs_filtering.c:446
-msgid " Define... "
-msgstr " Definir... "
+#: src/prefs_filtering.c:424
+msgid " D_efine... "
+msgstr " D_efinir... "
+
+#: src/prefs_filtering.c:446
+msgid " De_fine... "
+msgstr " De_finir... "
 
 #: src/prefs_filtering.c:475
 msgid "Append the new rule above to the list"
@@ -14322,87 +14416,87 @@ msgstr "Añadir la nueva regla de arriba a la lista"
 msgid "Replace the selected rule in list with the rule above"
 msgstr "Sustituir la regla seleccionada en la lista con la regla de arriba"
 
-#: src/prefs_filtering.c:492
+#: src/prefs_filtering.c:493
 msgid "Delete the selected rule from the list"
 msgstr "Borrar la relga seleccionada de la lista"
 
-#: src/prefs_filtering.c:529
+#: src/prefs_filtering.c:532
 msgid "Move the selected rule to the top"
 msgstr "Mover la regla seleccionada encima de todas"
 
-#: src/prefs_filtering.c:532
-msgid "Page up"
-msgstr "Página arriba"
+#: src/prefs_filtering.c:535
+msgid "Page u_p"
+msgstr "Página _arriba"
 
-#: src/prefs_filtering.c:540
+#: src/prefs_filtering.c:543
 msgid "Move the selected rule one page up"
 msgstr "Mover la regla seleccionada una página hacia arriba"
 
-#: src/prefs_filtering.c:549
+#: src/prefs_filtering.c:552
 msgid "Move the selected rule up"
 msgstr "Mover la regla seleccionada arriba"
 
-#: src/prefs_filtering.c:557
+#: src/prefs_filtering.c:560
 msgid "Move the selected rule down"
 msgstr "Mover la regla seleccionada abajo"
 
-#: src/prefs_filtering.c:560
-msgid "Page down"
-msgstr "Página abajo"
+#: src/prefs_filtering.c:563
+msgid "Page dow_n"
+msgstr "Página a_bajo"
 
-#: src/prefs_filtering.c:568
+#: src/prefs_filtering.c:571
 msgid "Move the selected rule one page down"
 msgstr "Mover la regla seleccionada una página hacia abajo"
 
-#: src/prefs_filtering.c:577
+#: src/prefs_filtering.c:580
 msgid "Move the selected rule to the bottom"
 msgstr "Mover la regla seleccionada al fondo"
 
-#: src/prefs_filtering.c:1035 src/prefs_filtering.c:1121
+#: src/prefs_filtering.c:1038 src/prefs_filtering.c:1124
 msgid "Condition string is not valid."
 msgstr "La cadena de condición no es válida."
 
-#: src/prefs_filtering.c:1108
+#: src/prefs_filtering.c:1111
 msgid "Condition string is empty."
 msgstr "La cadena de condición esta vacía."
 
-#: src/prefs_filtering.c:1114
+#: src/prefs_filtering.c:1117
 msgid "Action string is empty."
 msgstr "La cadena de la acción esta vacía."
 
-#: src/prefs_filtering.c:1202
+#: src/prefs_filtering.c:1205
 msgid "Delete rule"
 msgstr "Borrar regla"
 
-#: src/prefs_filtering.c:1203
+#: src/prefs_filtering.c:1206
 msgid "Do you really want to delete this rule?"
 msgstr "¿Quiere borrar realmente esta regla?"
 
-#: src/prefs_filtering.c:1221
+#: src/prefs_filtering.c:1224
 msgid "Delete all rules"
 msgstr "Borrar todas las reglas"
 
-#: src/prefs_filtering.c:1222
+#: src/prefs_filtering.c:1225
 msgid "Do you really want to delete all the rules?"
 msgstr "¿Quiere borrar realmente todas las reglas?"
 
-#: src/prefs_filtering.c:1474
+#: src/prefs_filtering.c:1477
 msgid "Filtering rules not saved"
 msgstr "Reglas de filtrado no guardadas"
 
-#: src/prefs_filtering.c:1475
+#: src/prefs_filtering.c:1478
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "La lista de reglas de filtrado ha sido modificada. ¿Cerrar igualmente?"
 
-#: src/prefs_filtering.c:1697
+#: src/prefs_filtering.c:1700
 msgid "Move one page up"
 msgstr "Mover una página arriba"
 
-#: src/prefs_filtering.c:1698
+#: src/prefs_filtering.c:1701
 msgid "Move one page down"
 msgstr "Mover una página abajo"
 
-#: src/prefs_filtering.c:1860
+#: src/prefs_filtering.c:1856
 msgid "Enable"
 msgstr "Activar"
 
@@ -14428,7 +14522,7 @@ msgid "Displayed columns"
 msgstr "Columnas visibles"
 
 #: src/prefs_folder_column.c:329 src/prefs_msg_colors.c:494
-#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1055
+#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1064
 msgid " Use default "
 msgstr " Usar configuración inicial "
 
@@ -14586,7 +14680,7 @@ msgstr "Propiedades de la carpeta «%s»"
 msgid "Folder and Message Lists"
 msgstr "Carpeta y listas de mensajes"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2024
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2030
 msgid "Message"
 msgstr "Mensaje"
 
@@ -14621,7 +14715,7 @@ msgstr "Ver"
 msgid "Fonts"
 msgstr "Tipografías"
 
-#: src/prefs_gtk.c:938 src/toolbar.c:212 src/toolbar.c:421
+#: src/prefs_gtk.c:938 src/toolbar.c:213 src/toolbar.c:422
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -14838,11 +14932,11 @@ msgstr "sección cuerpo"
 msgid "whole message"
 msgstr "mensaje completo"
 
-#: src/prefs_matcher.c:389 src/summaryview.c:6302
+#: src/prefs_matcher.c:389 src/summaryview.c:6298
 msgid "Marked"
 msgstr "Marcado"
 
-#: src/prefs_matcher.c:390 src/summaryview.c:6300
+#: src/prefs_matcher.c:390 src/summaryview.c:6296
 msgid "Deleted"
 msgstr "Borrado"
 
@@ -14850,12 +14944,12 @@ msgstr "Borrado"
 msgid "Replied"
 msgstr "Respondido"
 
-#: src/prefs_matcher.c:392 src/summaryview.c:6294
+#: src/prefs_matcher.c:392 src/summaryview.c:6290
 msgid "Forwarded"
 msgstr "Reenviado"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6284 src/toolbar.c:414
-#: src/toolbar.c:950 src/toolbar.c:1996
+#: src/prefs_matcher.c:394 src/summaryview.c:6280 src/toolbar.c:415
+#: src/toolbar.c:951 src/toolbar.c:1997
 msgid "Spam"
 msgstr "Basura"
 
@@ -14863,7 +14957,7 @@ msgstr "Basura"
 msgid "Has attachment"
 msgstr "Tiene adjunto"
 
-#: src/prefs_matcher.c:396 src/summaryview.c:6320
+#: src/prefs_matcher.c:396 src/summaryview.c:6316
 msgid "Signed"
 msgstr "Firmado"
 
@@ -14963,54 +15057,54 @@ msgstr "Parcialmente descargado"
 msgid "External program test"
 msgstr "Prueba con un programa externo"
 
-#: src/prefs_matcher.c:707 src/prefs_matcher.c:1598 src/prefs_matcher.c:1613
-#: src/prefs_matcher.c:2495
+#: src/prefs_matcher.c:707 src/prefs_matcher.c:1604 src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:2501
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Todos"
 
-#: src/prefs_matcher.c:739
+#: src/prefs_matcher.c:741
 msgid "Use regexp"
 msgstr "Usar exp.reg."
 
-#: src/prefs_matcher.c:812
+#: src/prefs_matcher.c:818
 msgid "Message must match"
 msgstr "El mensaje debe cumplir"
 
-#: src/prefs_matcher.c:816
+#: src/prefs_matcher.c:822
 msgid "at least one"
 msgstr "al menos una de"
 
-#: src/prefs_matcher.c:817
+#: src/prefs_matcher.c:823
 msgid "all"
 msgstr "todas"
 
-#: src/prefs_matcher.c:820
+#: src/prefs_matcher.c:826
 msgid "of above rules"
 msgstr "las reglas anteriores"
 
-#: src/prefs_matcher.c:1516 src/prefs_matcher.c:1582
+#: src/prefs_matcher.c:1522 src/prefs_matcher.c:1588
 msgid "Search pattern is not set."
 msgstr "No se estableció el patrón de búsqueda."
 
-#: src/prefs_matcher.c:1525
+#: src/prefs_matcher.c:1531
 msgid "Test command is not set."
 msgstr "No se estableció la orden de prueba."
 
-#: src/prefs_matcher.c:1599
+#: src/prefs_matcher.c:1605
 msgid "all addresses in all headers"
 msgstr "todas las direcciones en todas las cabeceras"
 
-#: src/prefs_matcher.c:1602
+#: src/prefs_matcher.c:1608
 msgid "any address in any header"
 msgstr "cualquier dirección en cualquier cabecera"
 
-#: src/prefs_matcher.c:1604
+#: src/prefs_matcher.c:1610
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "la(s) dirección(es) en la cabecera «%s»"
 
-#: src/prefs_matcher.c:1605
+#: src/prefs_matcher.c:1611
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -15023,79 +15117,79 @@ msgstr ""
 "Si quiere encontrar coincidencias de «%s» en todo el libro de direcciones "
 "deberá seleccionar «%s» en la lista desplegable de agenda/carpeta."
 
-#: src/prefs_matcher.c:1824
+#: src/prefs_matcher.c:1830
 msgid "Headers part"
 msgstr "Sección cabeceras"
 
-#: src/prefs_matcher.c:1828
+#: src/prefs_matcher.c:1834
 msgid "Body part"
 msgstr "Sección cuerpo"
 
-#: src/prefs_matcher.c:1832
+#: src/prefs_matcher.c:1838
 msgid "Whole message"
 msgstr "Mensaje completo"
 
-#: src/prefs_matcher.c:1951 src/prefs_matcher.c:1995
+#: src/prefs_matcher.c:1957 src/prefs_matcher.c:2001
 msgid "in"
 msgstr "en"
 
-#: src/prefs_matcher.c:1953
+#: src/prefs_matcher.c:1959
 msgid "content is"
 msgstr "contenido es"
 
-#: src/prefs_matcher.c:1962
+#: src/prefs_matcher.c:1968
 msgid "Age is"
 msgstr "Edad es"
 
-#: src/prefs_matcher.c:1967
+#: src/prefs_matcher.c:1973
 msgid "Flag"
 msgstr "Marca"
 
-#: src/prefs_matcher.c:1968 src/prefs_matcher.c:1985
+#: src/prefs_matcher.c:1974 src/prefs_matcher.c:1991
 msgid "is"
 msgstr "es"
 
-#: src/prefs_matcher.c:1973
+#: src/prefs_matcher.c:1979
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/prefs_matcher.c:1984
+#: src/prefs_matcher.c:1990
 msgid "Label"
 msgstr "Etiqueta"
 
-#: src/prefs_matcher.c:1990
+#: src/prefs_matcher.c:1996
 msgid "Value:"
 msgstr "Valor:"
 
-#: src/prefs_matcher.c:2007
+#: src/prefs_matcher.c:2013
 msgid "Score is"
 msgstr "Puntuación es"
 
-#: src/prefs_matcher.c:2008
+#: src/prefs_matcher.c:2014
 msgid "points"
 msgstr "puntos"
 
-#: src/prefs_matcher.c:2018
+#: src/prefs_matcher.c:2024
 msgid "Size is"
 msgstr "Tamaño es"
 
-#: src/prefs_matcher.c:2023
+#: src/prefs_matcher.c:2029
 msgid "Scope:"
 msgstr "Alcance:"
 
-#: src/prefs_matcher.c:2025
+#: src/prefs_matcher.c:2031
 msgid "tags"
 msgstr "etiquetas"
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2036
 msgid "type is"
 msgstr "tipo es"
 
-#: src/prefs_matcher.c:2034
+#: src/prefs_matcher.c:2040
 msgid "Program returns"
 msgstr "El programa devuelve"
 
-#: src/prefs_matcher.c:2104
+#: src/prefs_matcher.c:2110
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -15103,11 +15197,11 @@ msgstr ""
 "La entrada no fue guardada.\n"
 "¿Cerrar igualmente?"
 
-#: src/prefs_matcher.c:2168
+#: src/prefs_matcher.c:2174
 msgid "Match Type: 'Test'"
 msgstr "Tipo de coincidencia: «Probar»"
 
-#: src/prefs_matcher.c:2169
+#: src/prefs_matcher.c:2175
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -15119,7 +15213,7 @@ msgstr ""
 "\n"
 "Se pueden usar los siguientes símbolos:"
 
-#: src/prefs_matcher.c:2268
+#: src/prefs_matcher.c:2274
 msgid "Current condition rules"
 msgstr "Reglas de condición actuales"
 
@@ -15288,10 +15382,6 @@ msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Elejir el color para las firmas"
 
-#: src/prefs_msg_colors.c:362
-msgid "Signatures"
-msgstr "Firmas"
-
 #: src/prefs_msg_colors.c:367 src/prefs_summaries.c:354
 msgid "Folder list"
 msgstr "Lista de carpetas"
@@ -15521,71 +15611,71 @@ msgstr "Miscelánea"
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "El %d\\n%f escribió:\\n\\n%q"
 
-#: src/prefs_receive.c:137
+#: src/prefs_receive.c:123
 msgid "External incorporation program"
 msgstr "Programa externo para incorporación"
 
-#: src/prefs_receive.c:140
+#: src/prefs_receive.c:126
 msgid "Use external program for receiving mail"
 msgstr "Usar un programa externo para recibir correo"
 
-#: src/prefs_receive.c:156
+#: src/prefs_receive.c:142
 msgid "Automatic checking"
 msgstr "Comprobación automática"
 
-#: src/prefs_receive.c:163
+#: src/prefs_receive.c:149
 msgid "Check for new mail every"
 msgstr "Comprobar si hay correo nuevo cada"
 
-#: src/prefs_receive.c:181
+#: src/prefs_receive.c:167
 msgid "Check for new mail on start-up"
 msgstr "Comprobar si hay correo nuevo al inicio"
 
-#: src/prefs_receive.c:184
+#: src/prefs_receive.c:170
 msgid "Dialogs"
 msgstr "Diálogos"
 
-#: src/prefs_receive.c:186
+#: src/prefs_receive.c:172
 msgid "Show receive dialog"
 msgstr "Mostrar diálogo de recepción"
 
-#: src/prefs_receive.c:196
+#: src/prefs_receive.c:182
 msgid "Only on manual receiving"
 msgstr "Sólo al recibir manualmente"
 
-#: src/prefs_receive.c:207
+#: src/prefs_receive.c:193
 msgid "Close receive dialog when finished"
 msgstr "Cerrar el diálogo de recepción al finalizar"
 
-#: src/prefs_receive.c:210
+#: src/prefs_receive.c:196
 msgid "Don't popup error dialog on receive error"
 msgstr "No mostrar diálogo de error si hay error de recepción"
 
-#: src/prefs_receive.c:213
-msgid "After checking for new mail"
-msgstr "Después de comprobar el correo nuevo"
+#: src/prefs_receive.c:199
+msgid "After receiving new mail"
+msgstr "Después de recibir correo nuevo"
 
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:201
 msgid "Go to Inbox"
 msgstr "Ir a Entrada"
 
-#: src/prefs_receive.c:217
+#: src/prefs_receive.c:203
 msgid "Update all local folders"
 msgstr "Actualizar todas las carpetas locales"
 
-#: src/prefs_receive.c:220
+#: src/prefs_receive.c:205
 msgid "Run command"
 msgstr "Ejecutar una orden"
 
-#: src/prefs_receive.c:225
+#: src/prefs_receive.c:210
 msgid "after automatic check"
 msgstr "después de la comprobación automática"
 
-#: src/prefs_receive.c:227
+#: src/prefs_receive.c:212
 msgid "after manual check"
 msgstr "después de la comprobación manual"
 
-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:220
 #, c-format
 msgid ""
 "Command to execute:\n"
@@ -15594,47 +15684,39 @@ msgstr ""
 "Orden a ejecutar:\n"
 "(usar %d como nº de mensajes nuevos)"
 
-#: src/prefs_receive.c:260
-msgid "Blink LED"
-msgstr "Parpadear LED"
-
-#: src/prefs_receive.c:261
-msgid "Play sound"
-msgstr "Reproducir sonido"
-
-#: src/prefs_receive.c:263
-msgid "Show info banner"
-msgstr "Mostrar panel de información"
-
-#: src/prefs_receive.c:397 src/prefs_send.c:348
+#: src/prefs_receive.c:343 src/prefs_send.c:357
 msgid "Mail Handling"
 msgstr "Manejo de correo"
 
-#: src/prefs_receive.c:398
+#: src/prefs_receive.c:344
 msgid "Receiving"
 msgstr "Recepción"
 
-#: src/prefs_send.c:159
+#: src/prefs_send.c:161
 msgid "Save sent messages to Sent folder"
 msgstr "Guardar mensajes enviados en la carpeta Enviado"
 
-#: src/prefs_send.c:162
+#: src/prefs_send.c:164
 msgid "Confirm before sending queued messages"
 msgstr "Confirmar antes de enviar los mensajes en la cola"
 
-#: src/prefs_send.c:165
+#: src/prefs_send.c:167
 msgid "Never send Return Receipts"
 msgstr "No enviar nunca acuses de recibo"
 
-#: src/prefs_send.c:168
+#: src/prefs_send.c:170
 msgid "Show send dialog"
 msgstr "Mostrar diálogo de envío"
 
-#: src/prefs_send.c:176
+#: src/prefs_send.c:172
+msgid "Warn when Subject is empty"
+msgstr "Avisar cuando el asunto esta vacío"
+
+#: src/prefs_send.c:180
 msgid "Outgoing encoding"
 msgstr "Codificación de caracteres para enviar"
 
-#: src/prefs_send.c:201
+#: src/prefs_send.c:205
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
@@ -15642,131 +15724,131 @@ msgstr ""
 "Si selecciona «Automático» se utilizará la codificación óptima para la "
 "localización actual."
 
-#: src/prefs_send.c:216
+#: src/prefs_send.c:220
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
-#: src/prefs_send.c:218
+#: src/prefs_send.c:222
 msgid "7bit ASCII (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASCII)"
 
-#: src/prefs_send.c:219
+#: src/prefs_send.c:223
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_send.c:221
+#: src/prefs_send.c:225
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeo Occidental (ISO-8859-1)"
 
-#: src/prefs_send.c:222
+#: src/prefs_send.c:226
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 
-#: src/prefs_send.c:224
+#: src/prefs_send.c:228
 msgid "Central European (ISO-8859-2)"
 msgstr "Centroeuropeo (ISO-8859-2)"
 
-#: src/prefs_send.c:226
+#: src/prefs_send.c:230
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: src/prefs_send.c:227
+#: src/prefs_send.c:231
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_send.c:229
+#: src/prefs_send.c:233
 msgid "Greek (ISO-8859-7)"
 msgstr "Griego (ISO-8859-7)"
 
-#: src/prefs_send.c:231
+#: src/prefs_send.c:235
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreo (ISO-8859-8)"
 
-#: src/prefs_send.c:232
+#: src/prefs_send.c:236
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreo (Windows-1255)"
 
-#: src/prefs_send.c:234
+#: src/prefs_send.c:238
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arábigo (ISO-8859-6)"
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:239
 msgid "Arabic (Windows-1256)"
 msgstr "Arábigo (Windows-1256)"
 
-#: src/prefs_send.c:237
+#: src/prefs_send.c:241
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:243
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_send.c:240
+#: src/prefs_send.c:244
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:245
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_send.c:242
+#: src/prefs_send.c:246
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:248
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonés (ISO-2022-JP)"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:250
 msgid "Japanese (EUC-JP)"
 msgstr "Japonés (EUC-JP)"
 
-#: src/prefs_send.c:247
+#: src/prefs_send.c:251
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonés (Shift_JIS)"
 
-#: src/prefs_send.c:250
+#: src/prefs_send.c:254
 msgid "Simplified Chinese (GB18030)"
 msgstr "Chino simplificado (GB18030)"
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:255
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chino simplificado (GB2312)"
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:256
 msgid "Simplified Chinese (GBK)"
 msgstr "Chino simplificado (GBK)"
 
-#: src/prefs_send.c:253
+#: src/prefs_send.c:257
 msgid "Traditional Chinese (Big5)"
 msgstr "Chino tradicional (Big5)"
 
-#: src/prefs_send.c:255
+#: src/prefs_send.c:259
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chino tradicional (EUC-TW)"
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:260
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chino (ISO-2022-CN)"
 
-#: src/prefs_send.c:259
+#: src/prefs_send.c:263
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_send.c:261
+#: src/prefs_send.c:265
 msgid "Thai (TIS-620)"
 msgstr "Tailandés (TIS-620)"
 
-#: src/prefs_send.c:262
+#: src/prefs_send.c:266
 msgid "Thai (Windows-874)"
 msgstr "Tailandés (Windows-874)"
 
-#: src/prefs_send.c:266
+#: src/prefs_send.c:270
 msgid "Transfer encoding"
 msgstr "Codificación de envío"
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:281
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
@@ -15774,8 +15856,8 @@ msgstr ""
 "Especificar la codificación de envío (Content-Transfer-Encoding) usada "
 "cuando el cuerpo del mensaje contiene caracteres no-ASCII"
 
-#: src/prefs_send.c:349 src/send_message.c:483 src/send_message.c:487
-#: src/send_message.c:492
+#: src/prefs_send.c:358 src/send_message.c:491 src/send_message.c:495
+#: src/send_message.c:500
 msgid "Sending"
 msgstr "Enviando"
 
@@ -16101,91 +16183,91 @@ msgid "Replace the selected template in list with the template above"
 msgstr ""
 "Sustituir la plantilla seleccionada en la lista con la plantilla de arriba"
 
-#: src/prefs_template.c:324
+#: src/prefs_template.c:326
 msgid "Delete the selected template from the list"
 msgstr "Borrar la plantilla seleccionada de la lista"
 
-#: src/prefs_template.c:340
+#: src/prefs_template.c:344
 msgid "Show information on configuring templates"
 msgstr "Mostrar información sobre cómo configurar plantillas"
 
-#: src/prefs_template.c:364
+#: src/prefs_template.c:368
 msgid "Move the selected template to the top"
 msgstr "Mover la plantilla seleccionada encima de todas"
 
-#: src/prefs_template.c:374
+#: src/prefs_template.c:378
 msgid "Move the selected template up"
 msgstr "Mover la plantilla seleccionada arriba"
 
-#: src/prefs_template.c:382
+#: src/prefs_template.c:386
 msgid "Move the selected template down"
 msgstr "Mover la plantilla seleccionada abajo"
 
-#: src/prefs_template.c:392
+#: src/prefs_template.c:396
 msgid "Move the selected template to the bottom"
 msgstr "Mover la plantilla seleccionada al fondo"
 
-#: src/prefs_template.c:408
+#: src/prefs_template.c:412
 msgid "Template configuration"
 msgstr "Configuración de plantilla"
 
-#: src/prefs_template.c:595
+#: src/prefs_template.c:599
 msgid "Templates list not saved"
 msgstr "Lista de plantillas no guardada"
 
-#: src/prefs_template.c:596
+#: src/prefs_template.c:600
 msgid "The templates list has been modified. Close anyway?"
 msgstr "La lista de plantillas ha sido modificada. ¿Cerrar igualmente?"
 
-#: src/prefs_template.c:757
+#: src/prefs_template.c:761
 msgid "The template's name is not set."
 msgstr "No se estableció el nombre de la plantilla."
 
-#: src/prefs_template.c:794
+#: src/prefs_template.c:798
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr ""
 "El campo «Desde» de la plantilla contiene una dirección de correo inválida"
 
-#: src/prefs_template.c:800
+#: src/prefs_template.c:804
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr ""
 "El campo «Para» de la plantilla contiene una dirección de correo inválida"
 
-#: src/prefs_template.c:806
+#: src/prefs_template.c:810
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr ""
 "El campo «Cc» de la plantilla contiene una dirección de correo inválida"
 
-#: src/prefs_template.c:812
+#: src/prefs_template.c:816
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr ""
 "El campo «Bcc» de la plantilla contiene una dirección de correo inválida"
 
-#: src/prefs_template.c:818
+#: src/prefs_template.c:822
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "El campo «Asunto» de la plantilla no es válido."
 
-#: src/prefs_template.c:888
+#: src/prefs_template.c:892
 msgid "Delete template"
 msgstr "Borrar plantilla"
 
-#: src/prefs_template.c:889
+#: src/prefs_template.c:893
 msgid "Do you really want to delete this template?"
 msgstr "¿Quiere borrar realmente esta plantilla?"
 
-#: src/prefs_template.c:901
+#: src/prefs_template.c:905
 msgid "Delete all templates"
 msgstr "Borrar todas las plantillas"
 
-#: src/prefs_template.c:902
+#: src/prefs_template.c:906
 msgid "Do you really want to delete all the templates?"
 msgstr "¿Quiere borrar realmente todas las plantillas?"
 
-#: src/prefs_template.c:1224
+#: src/prefs_template.c:1221
 msgid "Current templates"
 msgstr "Plantillas actuales"
 
-#: src/prefs_template.c:1252
+#: src/prefs_template.c:1249
 msgid "Template"
 msgstr "Plantilla"
 
@@ -16327,6 +16409,10 @@ msgstr "Selector"
 msgid "Install new..."
 msgstr "Instalar nuevo..."
 
+#: src/prefs_themes.c:843
+msgid "Get more..."
+msgstr "Obtener más..."
+
 #: src/prefs_themes.c:854
 msgid "Information"
 msgstr "Información"
@@ -16363,63 +16449,67 @@ msgstr "El elemento no tiene un icono definido."
 msgid "Item has no text defined."
 msgstr "El elemento no tiene un texto definido."
 
-#: src/prefs_toolbar.c:911
+#: src/prefs_toolbar.c:916
 msgid "Toolbar item"
 msgstr "Item de herramientas"
 
-#: src/prefs_toolbar.c:927
+#: src/prefs_toolbar.c:932
 msgid "Item type"
 msgstr "Tipo de item"
 
-#: src/prefs_toolbar.c:937
+#: src/prefs_toolbar.c:942
 msgid "Internal Function"
 msgstr "Función interna"
 
-#: src/prefs_toolbar.c:938
+#: src/prefs_toolbar.c:943
 msgid "User Action"
 msgstr "Acción de usuario"
 
-#: src/prefs_toolbar.c:940 src/toolbar.c:232
+#: src/prefs_toolbar.c:945 src/toolbar.c:233
 msgid "Separator"
 msgstr "Separador"
 
-#: src/prefs_toolbar.c:947
+#: src/prefs_toolbar.c:952
 msgid "Event executed on click"
 msgstr "Evento ejecutado al pulsar"
 
-#: src/prefs_toolbar.c:986
+#: src/prefs_toolbar.c:991
 msgid "Toolbar text"
 msgstr "Texto de herramientas"
 
-#: src/prefs_toolbar.c:1001 src/prefs_toolbar.c:1372
+#: src/prefs_toolbar.c:1006 src/prefs_toolbar.c:1381
 msgid "Icon"
 msgstr "Icono"
 
-#: src/prefs_toolbar.c:1252 src/prefs_toolbar.c:1266 src/prefs_toolbar.c:1280
+#: src/prefs_toolbar.c:1042
+msgid "A_dd"
+msgstr "Aña_dir"
+
+#: src/prefs_toolbar.c:1261 src/prefs_toolbar.c:1275 src/prefs_toolbar.c:1289
 msgid "Toolbars"
 msgstr "Barras de herramientas"
 
-#: src/prefs_toolbar.c:1253
+#: src/prefs_toolbar.c:1262
 msgid "Main Window"
 msgstr "Ventana principal"
 
-#: src/prefs_toolbar.c:1267
+#: src/prefs_toolbar.c:1276
 msgid "Message Window"
 msgstr "Ventana de mensaje"
 
-#: src/prefs_toolbar.c:1281
+#: src/prefs_toolbar.c:1290
 msgid "Compose Window"
 msgstr "Ventana de composición"
 
-#: src/prefs_toolbar.c:1395
+#: src/prefs_toolbar.c:1404
 msgid "Icon text"
 msgstr "Texto del icono"
 
-#: src/prefs_toolbar.c:1404
+#: src/prefs_toolbar.c:1413
 msgid "Mapped event"
 msgstr "Evento mapeado"
 
-#: src/prefs_toolbar.c:1701
+#: src/prefs_toolbar.c:1710
 msgid "Toolbar item icon"
 msgstr "Icono de item de herramientas"
 
@@ -16488,7 +16578,7 @@ msgstr "No hay información disponible"
 msgid "No recipient keys defined."
 msgstr "No se definió ninguna clave para el destinatario."
 
-#: src/procmime.c:419 src/procmime.c:421 src/procmime.c:422
+#: src/procmime.c:422 src/procmime.c:424 src/procmime.c:425
 msgid "[Error decoding BASE64]\n"
 msgstr "[Error decodificando BASE64]\n"
 
@@ -16524,11 +16614,11 @@ msgstr ""
 
 #: src/procmsg.c:1732
 msgid ""
-"Couldn't determine sending informations. Maybe the email hasn't been "
+"Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
-"No se encontró la información de envío. Quizás el correo no se generó con "
-"Claws Mail."
+"No se pudo determinar la información de envío. Quizás el correo no se generó "
+"con Claws Mail."
 
 #: src/procmsg.c:1750
 msgid "Couldn't create temporary file for news sending."
@@ -16866,73 +16956,73 @@ msgstr "No se pudo ejecutar la orden: %s"
 msgid "Error occurred while executing command: %s"
 msgstr "Ha habido un error ejecutando la orden: %s"
 
-#: src/send_message.c:331
+#: src/send_message.c:339
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/send_message.c:336
+#: src/send_message.c:344
 msgid "Doing POP before SMTP..."
 msgstr "Haciendo POP antes de SMTP..."
 
-#: src/send_message.c:339
+#: src/send_message.c:347
 msgid "POP before SMTP"
 msgstr "POP antes de SMTP"
 
-#: src/send_message.c:344
+#: src/send_message.c:352
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Cuenta «%s»: Conectando al servidor SMTP: %s:%d..."
 
-#: src/send_message.c:401
+#: src/send_message.c:409
 msgid "Mail sent successfully."
 msgstr "Correo enviado con éxito."
 
-#: src/send_message.c:468
+#: src/send_message.c:476
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:469 src/send_message.c:474 src/send_message.c:479
+#: src/send_message.c:477 src/send_message.c:482 src/send_message.c:487
 msgid "Authenticating"
 msgstr "Autentificándose"
 
-#: src/send_message.c:470 src/send_message.c:475
+#: src/send_message.c:478 src/send_message.c:483
 msgid "Sending message..."
 msgstr "Enviando mensaje..."
 
-#: src/send_message.c:473
+#: src/send_message.c:481
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:482
+#: src/send_message.c:490
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:486
+#: src/send_message.c:494
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:491
+#: src/send_message.c:499
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:495
+#: src/send_message.c:503
 msgid "Quitting..."
 msgstr "Saliendo..."
 
-#: src/send_message.c:524
+#: src/send_message.c:532
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensaje (%d / %d bytes)"
 
-#: src/send_message.c:577
+#: src/send_message.c:585
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: src/send_message.c:646 src/send_message.c:666
+#: src/send_message.c:654 src/send_message.c:674
 msgid "Error occurred while sending the message."
 msgstr "Ocurrió un error enviando los mensajes."
 
-#: src/send_message.c:649
+#: src/send_message.c:657
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -16978,40 +17068,40 @@ msgstr "Eliminar certificado"
 msgid "Do you really want to delete this certificate?"
 msgstr "¿Quiere borrar realmente este certificado?"
 
-#: src/summary_search.c:266
+#: src/summary_search.c:271
 msgid "Search messages"
 msgstr "Buscar en los mensajes"
 
-#: src/summary_search.c:292
+#: src/summary_search.c:293
 msgid "Match any of the following"
 msgstr "Coincidir con alguno de los siguientes"
 
-#: src/summary_search.c:294
+#: src/summary_search.c:295
 msgid "Match all of the following"
 msgstr "Coincidir con todos los siguientes"
 
-#: src/summary_search.c:433
+#: src/summary_search.c:459
 msgid "Body:"
 msgstr "Cuerpo:"
 
-#: src/summary_search.c:440
+#: src/summary_search.c:466
 msgid "Condition:"
 msgstr "Condición:"
 
-#: src/summary_search.c:470
+#: src/summary_search.c:496
 msgid "Find _all"
 msgstr "Encontrar _todos"
 
-#: src/summary_search.c:679 src/summaryview.c:1105 src/summaryview.c:1366
+#: src/summary_search.c:702 src/summaryview.c:1105 src/summaryview.c:1366
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Buscando en %s...\n"
 
-#: src/summary_search.c:776
+#: src/summary_search.c:799
 msgid "Beginning of list reached; continue from end?"
 msgstr "Se llegó al principio de la lista, ¿siguir desde el final?"
 
-#: src/summary_search.c:778
+#: src/summary_search.c:801
 msgid "End of list reached; continue from beginning?"
 msgstr "Se terminó la lista, ¿comenzar desde el principio?"
 
@@ -17213,73 +17303,73 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Desde: %s, en %s</span>"
 
-#: src/summaryview.c:4290
+#: src/summaryview.c:4286
 msgid "You're not the author of the article.\n"
 msgstr "Usted no es el autor del artículo.\n"
 
-#: src/summaryview.c:4383
+#: src/summaryview.c:4379
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "¿Quiere borrar realmente el mensaje seleccionado?"
 msgstr[1] "¿Quiere borrar realmente los %d mensajes seleccionados?"
 
-#: src/summaryview.c:4386
+#: src/summaryview.c:4382
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
-#: src/summaryview.c:4549
+#: src/summaryview.c:4545
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:4648
+#: src/summaryview.c:4644
 msgid "Destination to copy is same as current folder."
 msgstr "El destino de copia es la carpeta actual."
 
-#: src/summaryview.c:4821
+#: src/summaryview.c:4817
 msgid "Append or Overwrite"
 msgstr "Añadir o sobreescribir"
 
-#: src/summaryview.c:4822
+#: src/summaryview.c:4818
 msgid "Append or overwrite existing file?"
 msgstr "¿Añadir o sobreescribir el fichero existente?"
 
-#: src/summaryview.c:4823
+#: src/summaryview.c:4819
 msgid "_Append"
 msgstr "_Añadir"
 
-#: src/summaryview.c:4823
+#: src/summaryview.c:4819
 msgid "_Overwrite"
 msgstr "S_obreescribir"
 
-#: src/summaryview.c:4864
+#: src/summaryview.c:4860
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "Está a punto de imprimir %d mensajes, uno a uno. ¿Desea continuar?"
 
-#: src/summaryview.c:5341
+#: src/summaryview.c:5337
 msgid "Building threads..."
 msgstr "Construyendo jerarquía..."
 
-#: src/summaryview.c:5587
+#: src/summaryview.c:5583
 msgid "Skip these rules"
 msgstr "Saltarse estas reglas"
 
-#: src/summaryview.c:5590
+#: src/summaryview.c:5586
 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 "Aplicar estas reglas independientemente de la cuenta a la que pertenecen"
 
-#: src/summaryview.c:5593
+#: src/summaryview.c:5589
 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplicar estas reglas si se aplican a la cuenta actual"
 
-#: src/summaryview.c:5622
+#: src/summaryview.c:5618
 msgid "Filtering"
 msgstr "Filtrando"
 
-#: src/summaryview.c:5623
+#: src/summaryview.c:5619
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -17287,59 +17377,59 @@ msgstr ""
 "Hay ciertas reglas de filtrado que pertenecen a una cuenta.\n"
 "Por favor seleccione que quiere hacer con ellas:"
 
-#: src/summaryview.c:5625
+#: src/summaryview.c:5621
 msgid "_Filter"
 msgstr "_Filtrar"
 
-#: src/summaryview.c:5653
+#: src/summaryview.c:5649
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:5732
+#: src/summaryview.c:5728
 msgid "Processing configuration"
 msgstr "Configuración de procesamiento"
 
-#: src/summaryview.c:6280
+#: src/summaryview.c:6276
 msgid "Ignored thread"
 msgstr "Hilo ignorado"
 
-#: src/summaryview.c:6282
+#: src/summaryview.c:6278
 msgid "Watched thread"
 msgstr "Hilo observado"
 
-#: src/summaryview.c:6290
+#: src/summaryview.c:6286
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Respondido y también reenviado - pulse para ver la respuesta"
 
-#: src/summaryview.c:6292
+#: src/summaryview.c:6288
 msgid "Replied - click to see reply"
 msgstr "Respondido - pulse para ver la respuesta"
 
-#: src/summaryview.c:6304
+#: src/summaryview.c:6300
 msgid "To be moved"
 msgstr "Será movido"
 
-#: src/summaryview.c:6306
+#: src/summaryview.c:6302
 msgid "To be copied"
 msgstr "Será copiado"
 
-#: src/summaryview.c:6318
+#: src/summaryview.c:6314
 msgid "Signed, has attachment(s)"
 msgstr "Firmado, tiene adjunto(s)"
 
-#: src/summaryview.c:6322
+#: src/summaryview.c:6318
 msgid "Encrypted, has attachment(s)"
 msgstr "Cifrado, tiene adjunto(s)"
 
-#: src/summaryview.c:6324
+#: src/summaryview.c:6320
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: src/summaryview.c:6326
+#: src/summaryview.c:6322
 msgid "Has attachment(s)"
 msgstr "Tiene adjunto(s)"
 
-#: src/summaryview.c:7963
+#: src/summaryview.c:7952
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -17348,11 +17438,11 @@ msgstr ""
 "Error en la expresión regular (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8071
+#: src/summaryview.c:8060
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Volver a la lista de carpetas (tiene mensajes sin leer)"
 
-#: src/summaryview.c:8076
+#: src/summaryview.c:8065
 msgid "Go back to the folder list"
 msgstr "Volver a la lista de carpetas"
 
@@ -17512,278 +17602,278 @@ msgstr "Aviso de intento de «phishing»"
 msgid "_Open URL"
 msgstr "_Abrir URL"
 
-#: src/toolbar.c:191 src/toolbar.c:1948
+#: src/toolbar.c:192 src/toolbar.c:1949
 msgid "Receive Mail from all Accounts"
 msgstr "Recibir correo para todas las cuentas"
 
-#: src/toolbar.c:192 src/toolbar.c:1953
+#: src/toolbar.c:193 src/toolbar.c:1954
 msgid "Receive Mail from current Account"
 msgstr "Recibir correo para la cuenta actual"
 
-#: src/toolbar.c:193 src/toolbar.c:1957
+#: src/toolbar.c:194 src/toolbar.c:1958
 msgid "Send Queued Messages"
 msgstr "Enviar mensajes en la cola"
 
-#: src/toolbar.c:194 src/toolbar.c:918 src/toolbar.c:1975 src/toolbar.c:1986
+#: src/toolbar.c:195 src/toolbar.c:919 src/toolbar.c:1976 src/toolbar.c:1987
 msgid "Compose Email"
 msgstr "Componer correo"
 
-#: src/toolbar.c:195
+#: src/toolbar.c:196
 msgid "Compose News"
 msgstr "Componer noticia"
 
-#: src/toolbar.c:196 src/toolbar.c:2014 src/toolbar.c:2024
+#: src/toolbar.c:197 src/toolbar.c:2015 src/toolbar.c:2025
 msgid "Reply to Message"
 msgstr "Responder al mensaje"
 
-#: src/toolbar.c:197 src/toolbar.c:2031 src/toolbar.c:2041
+#: src/toolbar.c:198 src/toolbar.c:2032 src/toolbar.c:2042
 msgid "Reply to Sender"
 msgstr "Responder al remitente"
 
-#: src/toolbar.c:198 src/toolbar.c:2048 src/toolbar.c:2058
+#: src/toolbar.c:199 src/toolbar.c:2049 src/toolbar.c:2059
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: src/toolbar.c:199 src/toolbar.c:2065 src/toolbar.c:2075
+#: src/toolbar.c:200 src/toolbar.c:2066 src/toolbar.c:2076
 msgid "Reply to Mailing-list"
 msgstr "Responder a la lista de correo"
 
-#: src/toolbar.c:200 src/toolbar.c:1969
+#: src/toolbar.c:201 src/toolbar.c:1970
 msgid "Open email"
 msgstr "Abrir correo"
 
-#: src/toolbar.c:201 src/toolbar.c:2082 src/toolbar.c:2093
+#: src/toolbar.c:202 src/toolbar.c:2083 src/toolbar.c:2094
 msgid "Forward Message"
 msgstr "Reenviar mensaje"
 
-#: src/toolbar.c:202 src/toolbar.c:2098
+#: src/toolbar.c:203 src/toolbar.c:2099
 msgid "Trash Message"
 msgstr "Mensaje a la papelera"
 
-#: src/toolbar.c:203 src/toolbar.c:2102
+#: src/toolbar.c:204 src/toolbar.c:2103
 msgid "Delete Message"
 msgstr "Borrar mensaje"
 
-#: src/toolbar.c:205 src/toolbar.c:2110
+#: src/toolbar.c:206 src/toolbar.c:2111
 msgid "Go to Previous Unread Message"
 msgstr "Ir al mensaje anterior no leído"
 
-#: src/toolbar.c:206 src/toolbar.c:2114
+#: src/toolbar.c:207 src/toolbar.c:2115
 msgid "Go to Next Unread Message"
 msgstr "Ir al mensaje siguiente no leído"
 
-#: src/toolbar.c:209 src/toolbar.c:419
+#: src/toolbar.c:210 src/toolbar.c:420
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/toolbar.c:210
+#: src/toolbar.c:211
 msgid "Learn Spam or Ham"
 msgstr "Aprender correo basura o bueno"
 
-#: src/toolbar.c:211
+#: src/toolbar.c:212
 msgid "Open folder/Go to folder list"
 msgstr "Abrir carpeta/Ir a la lista de carpetas"
 
-#: src/toolbar.c:214 src/toolbar.c:2120
+#: src/toolbar.c:215 src/toolbar.c:2121
 msgid "Send Message"
 msgstr "Enviar mensaje"
 
-#: src/toolbar.c:215 src/toolbar.c:2124
+#: src/toolbar.c:216 src/toolbar.c:2125
 msgid "Put into queue folder and send later"
 msgstr "Poner en la cola y enviar después"
 
-#: src/toolbar.c:216 src/toolbar.c:2128
+#: src/toolbar.c:217 src/toolbar.c:2129
 msgid "Save to draft folder"
 msgstr "Guardar como borrador"
 
-#: src/toolbar.c:217 src/toolbar.c:2132
+#: src/toolbar.c:218 src/toolbar.c:2133
 msgid "Insert file"
 msgstr "Insertar fichero"
 
-#: src/toolbar.c:218 src/toolbar.c:2136
+#: src/toolbar.c:219 src/toolbar.c:2137
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
-#: src/toolbar.c:219 src/toolbar.c:2140
+#: src/toolbar.c:220 src/toolbar.c:2141
 msgid "Insert signature"
 msgstr "Insertar firma"
 
-#: src/toolbar.c:220 src/toolbar.c:2144
+#: src/toolbar.c:221 src/toolbar.c:2145
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/toolbar.c:221 src/toolbar.c:2148
+#: src/toolbar.c:222 src/toolbar.c:2149
 msgid "Wrap long lines of current paragraph"
 msgstr "Cortar líneas largas del párrafo actual"
 
-#: src/toolbar.c:222 src/toolbar.c:2152
+#: src/toolbar.c:223 src/toolbar.c:2153
 msgid "Wrap all long lines"
 msgstr "Cortar todas las líneas largas"
 
-#: src/toolbar.c:225 src/toolbar.c:437 src/toolbar.c:2161
+#: src/toolbar.c:226 src/toolbar.c:438 src/toolbar.c:2162
 msgid "Check spelling"
 msgstr "Verificar ortografía"
 
-#: src/toolbar.c:227
+#: src/toolbar.c:228
 msgid "Claws Mail Actions Feature"
 msgstr "Acciones de Claws Mail"
 
-#: src/toolbar.c:228 src/toolbar.c:2177
+#: src/toolbar.c:229 src/toolbar.c:2178
 msgid "Cancel receiving"
 msgstr "Cancelar recepción"
 
-#: src/toolbar.c:230 src/toolbar.c:2185
+#: src/toolbar.c:231 src/toolbar.c:2186
 msgid "Cancel receiving/sending"
 msgstr "Cancelar recepción/envío"
 
-#: src/toolbar.c:231 src/toolbar.c:1961
+#: src/toolbar.c:232 src/toolbar.c:1962
 msgid "Close window"
 msgstr "Cerrar ventana"
 
-#: src/toolbar.c:233
+#: src/toolbar.c:234
 msgid "Claws Mail Plugins"
 msgstr "Módulos de Claws Mail"
 
-#: src/toolbar.c:377 src/toolbar.c:412
+#: src/toolbar.c:378 src/toolbar.c:413
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/toolbar.c:400
+#: src/toolbar.c:401
 msgid "Folders"
 msgstr "Carpetas"
 
-#: src/toolbar.c:402
+#: src/toolbar.c:403
 msgid "Get Mail"
 msgstr "Recibir correo"
 
-#: src/toolbar.c:403
+#: src/toolbar.c:404
 msgid "Get"
 msgstr "Recibir"
 
-#: src/toolbar.c:405 src/toolbar.c:406
+#: src/toolbar.c:406 src/toolbar.c:407
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Componer"
 
-#: src/toolbar.c:408
+#: src/toolbar.c:409
 msgid "All"
 msgstr "Todo"
 
-#: src/toolbar.c:409
+#: src/toolbar.c:410
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "Remitente"
 
-#: src/toolbar.c:410
+#: src/toolbar.c:411
 msgid "List"
 msgstr "Lista"
 
-#: src/toolbar.c:415
+#: src/toolbar.c:416
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/toolbar.c:416
+#: src/toolbar.c:417
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/toolbar.c:424
+#: src/toolbar.c:425
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/toolbar.c:427
+#: src/toolbar.c:428
 msgid "Insert sig."
 msgstr "Insertar firma"
 
-#: src/toolbar.c:428
+#: src/toolbar.c:429
 msgid "Edit"
 msgstr "Editar"
 
-#: src/toolbar.c:429
+#: src/toolbar.c:430
 msgid "Wrap para."
 msgstr "Recorta párr."
 
-#: src/toolbar.c:430
+#: src/toolbar.c:431
 msgid "Wrap all"
 msgstr "Recorta todo"
 
-#: src/toolbar.c:432 src/toolbar.c:433
+#: src/toolbar.c:433 src/toolbar.c:434
 msgid "Stop"
 msgstr "Detener"
 
-#: src/toolbar.c:434
+#: src/toolbar.c:435
 msgid "Stop all"
 msgstr "Detener todo"
 
-#: src/toolbar.c:910
+#: src/toolbar.c:911
 msgid "Compose News message"
 msgstr "Componer un mensaje _nuevo"
 
-#: src/toolbar.c:952
+#: src/toolbar.c:953
 msgid "Learn spam"
 msgstr "Aprender correo basura"
 
-#: src/toolbar.c:961
+#: src/toolbar.c:962
 msgid "Ham"
 msgstr "Bueno"
 
-#: src/toolbar.c:963
+#: src/toolbar.c:964
 msgid "Learn ham"
 msgstr "Aprender correo bueno"
 
-#: src/toolbar.c:1943
+#: src/toolbar.c:1944
 msgid "Go to folder list"
 msgstr "Ir a la lista de carpetas"
 
-#: src/toolbar.c:1949
+#: src/toolbar.c:1950
 msgid "Receive Mail from selected Account"
 msgstr "Recibir correo para la cuenta seleccionada"
 
-#: src/toolbar.c:1965
+#: src/toolbar.c:1966
 msgid "Open preferences"
 msgstr "Abrir preferencias"
 
-#: src/toolbar.c:1976
+#: src/toolbar.c:1977
 msgid "Compose with selected Account"
 msgstr "Componer correo con la cuenta seleccionada"
 
-#: src/toolbar.c:1997
+#: src/toolbar.c:1998
 msgid "Learn as..."
 msgstr "Aprender como..."
 
-#: src/toolbar.c:2007
+#: src/toolbar.c:2008
 msgid "Learn as _Spam"
 msgstr "Aprender como correo basura"
 
-#: src/toolbar.c:2008
+#: src/toolbar.c:2009
 msgid "Learn as _Ham"
 msgstr "Aprender como bueno"
 
-#: src/toolbar.c:2015
+#: src/toolbar.c:2016
 msgid "Reply to Message options"
 msgstr "Opciones de responder al mensaje"
 
-#: src/toolbar.c:2019 src/toolbar.c:2036 src/toolbar.c:2053 src/toolbar.c:2070
+#: src/toolbar.c:2020 src/toolbar.c:2037 src/toolbar.c:2054 src/toolbar.c:2071
 msgid "_Reply with quote"
 msgstr "Responder con _cita"
 
-#: src/toolbar.c:2020 src/toolbar.c:2037 src/toolbar.c:2054 src/toolbar.c:2071
+#: src/toolbar.c:2021 src/toolbar.c:2038 src/toolbar.c:2055 src/toolbar.c:2072
 msgid "Reply without _quote"
 msgstr "_Responder sin cita"
 
-#: src/toolbar.c:2032
+#: src/toolbar.c:2033
 msgid "Reply to Sender options"
 msgstr "Opciones de responder al remitente"
 
-#: src/toolbar.c:2049
+#: src/toolbar.c:2050
 msgid "Reply to All options"
 msgstr "Opciones de responder a todos"
 
-#: src/toolbar.c:2066
+#: src/toolbar.c:2067
 msgid "Reply to Mailing-list options"
 msgstr "Opciones de responder a la lista de correo"
 
-#: src/toolbar.c:2083
+#: src/toolbar.c:2084
 msgid "Forward Message options"
 msgstr "Opciones de reenviar mensaje"
 
@@ -17808,12 +17898,12 @@ msgstr "Por favor seleccione la URL a abrir."
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/wizard.c:539
+#: src/wizard.c:517
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Bienvenido a Claws Mail"
 
-#: src/wizard.c:562
+#: src/wizard.c:540
 #, c-format
 msgid ""
 "\n"
@@ -17907,47 +17997,47 @@ msgstr ""
 "hacerlo en «%s».\n"
 "\n"
 
-#: src/wizard.c:638
+#: src/wizard.c:616
 msgid "Please enter the mailbox name."
 msgstr "Por favor introduzca el nombre del buzón."
 
-#: src/wizard.c:681
+#: src/wizard.c:644
 msgid "Please enter your name and email address."
 msgstr "Por favor introduzca su nombre y dirección de correo."
 
-#: src/wizard.c:692
+#: src/wizard.c:655
 msgid "Please enter your receiving server and username."
 msgstr "Por favor introduzca su servidor de recepción y nombre de usuario."
 
-#: src/wizard.c:702
+#: src/wizard.c:665
 msgid "Please enter your username."
 msgstr "Por favor introduzca su nombre de usuario."
 
-#: src/wizard.c:712
+#: src/wizard.c:675
 msgid "Please enter your SMTP server."
 msgstr "Por favor introduzca su servidor SMTP."
 
-#: src/wizard.c:723
+#: src/wizard.c:686
 msgid "Please enter your SMTP username."
 msgstr "Por favor introduzca su nombre de usuario SMTP."
 
-#: src/wizard.c:1013
+#: src/wizard.c:965
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Su nombre:</span>"
 
-#: src/wizard.c:1023
+#: src/wizard.c:975
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Su dirección de correo:</span>"
 
-#: src/wizard.c:1033
+#: src/wizard.c:985
 msgid "Your organization:"
 msgstr "Su organización:"
 
-#: src/wizard.c:1141
+#: src/wizard.c:1018
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Nombre del buzón:</span>"
 
-#: src/wizard.c:1149
+#: src/wizard.c:1026
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -17955,23 +18045,7 @@ msgstr ""
 "Puede especificar también una ruta absoluta, por ejemplo: «/home/usuario/"
 "Documentos/Correo»"
 
-#: src/wizard.c:1157
-msgid "on internal memory"
-msgstr "en la memoria interna"
-
-#: src/wizard.c:1160
-msgid "on external memory card"
-msgstr "en la tarjeta de memoria externa"
-
-#: src/wizard.c:1163
-msgid "on internal memory card"
-msgstr "en la tarjeta de memoria interna"
-
-#: src/wizard.c:1213
-msgid "<span weight=\"bold\">Store data</span>"
-msgstr "<span weight=\"bold\">Almacenar datos</span>"
-
-#: src/wizard.c:1281
+#: src/wizard.c:1097
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -17979,56 +18053,56 @@ msgstr ""
 "Puede especificar el número de puerto añadiéndolo al final: «correo.ejemplo."
 "com:25»"
 
-#: src/wizard.c:1284
+#: src/wizard.c:1100
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Dirección del servidor SMTP:</span>"
 
-#: src/wizard.c:1290
+#: src/wizard.c:1106
 msgid "Use authentication"
 msgstr "Usar autentificación"
 
-#: src/wizard.c:1298
+#: src/wizard.c:1114
 msgid "<span size=\"small\">(empty to use the same as receive)</span>"
 msgstr ""
 "<span size=\"small\">(vacío para usar el mismo que en la recepción)</span>"
 
-#: src/wizard.c:1312
+#: src/wizard.c:1128
 msgid "SMTP username:"
 msgstr "Usuario SMTP:"
 
-#: src/wizard.c:1323
+#: src/wizard.c:1139
 msgid "SMTP password:"
 msgstr "Contraseña SMTP:"
 
-#: src/wizard.c:1340
+#: src/wizard.c:1152
 msgid "Use SSL to connect to SMTP server"
 msgstr "Usar SSL para conectar al servidor SMTP"
 
-#: src/wizard.c:1351 src/wizard.c:1630
+#: src/wizard.c:1163 src/wizard.c:1437
 msgid "Use SSL via STARTTLS"
 msgstr "Usar SSL a través de STARTTLS"
 
-#: src/wizard.c:1363 src/wizard.c:1642
+#: src/wizard.c:1175 src/wizard.c:1449
 msgid "Client SSL certificate (optional)"
 msgstr "Certificado SSL de cliente (opcional)"
 
-#: src/wizard.c:1425 src/wizard.c:1450 src/wizard.c:1573
+#: src/wizard.c:1237 src/wizard.c:1262 src/wizard.c:1385
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Dirección del servidor:</span>"
 
-#: src/wizard.c:1480
+#: src/wizard.c:1292
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Buzón local:</span>"
 
-#: src/wizard.c:1540
+#: src/wizard.c:1352
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Tipo de servidor:</span>"
 
-#: src/wizard.c:1550
+#: src/wizard.c:1362
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1584
+#: src/wizard.c:1396
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -18036,23 +18110,23 @@ msgstr ""
 "Puede especificar el número de puerto añadiéndolo al final: «correo.ejemplo."
 "com:110»"
 
-#: src/wizard.c:1589
+#: src/wizard.c:1401
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Nombre de usuario:</span>"
 
-#: src/wizard.c:1619
+#: src/wizard.c:1426
 msgid "Use SSL to connect to receiving server"
 msgstr "Usar SSL para conectar al servidor de recepción"
 
-#: src/wizard.c:1684
+#: src/wizard.c:1491
 msgid "IMAP server directory:"
 msgstr "Directorio del servidor IMAP:"
 
-#: src/wizard.c:1695
+#: src/wizard.c:1502
 msgid "Show only subscribed folders"
 msgstr "Mostrar sólo las carpetas suscritas"
 
-#: src/wizard.c:1703
+#: src/wizard.c:1510
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"
@@ -18060,15 +18134,15 @@ msgstr ""
 "<span weight=\"bold\">Aviso: esta versión de Claws Mail\n"
 "se construyó sin soporte IMAP.</span>"
 
-#: src/wizard.c:1823
+#: src/wizard.c:1628
 msgid "Claws Mail Setup Wizard"
 msgstr "Ayudante de configuración de Claws Mail"
 
-#: src/wizard.c:1857
+#: src/wizard.c:1662
 msgid "Welcome to Claws Mail"
 msgstr "Bienvenido a Claws Mail "
 
-#: src/wizard.c:1865
+#: src/wizard.c:1670
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -18082,34 +18156,35 @@ msgstr ""
 "correo más comunes de manera que pueda comenzar a usar Claws Mail en menos "
 "de cinco minutos."
 
-#: src/wizard.c:1888
+#: src/wizard.c:1683
 msgid "About You"
 msgstr "Sobre usted"
 
-#: src/wizard.c:1896 src/wizard.c:1911 src/wizard.c:1926 src/wizard.c:1942
+#: src/wizard.c:1691 src/wizard.c:1706 src/wizard.c:1721 src/wizard.c:1737
 msgid "Bold fields must be completed"
 msgstr "Los campos en etiquetados en negrilla deben ser completados"
 
-#: src/wizard.c:1903
+#: src/wizard.c:1698
 msgid "Receiving mail"
 msgstr "Recibiendo correo"
 
-#: src/wizard.c:1918
+#: src/wizard.c:1713
 msgid "Sending mail"
 msgstr "Enviando correo"
 
-#: src/wizard.c:1934
+#: src/wizard.c:1729
 msgid "Saving mail on disk"
 msgstr "Guardando el correo en el disco"
 
-#: src/wizard.c:1950
+#: src/wizard.c:1745
 msgid "Configuration finished"
 msgstr "Configuración finalizada."
 
-#: src/wizard.c:1958
+#: src/wizard.c:1753
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
 "Claws Mail ya está preparado.\n"
 "Pulse «Guardar» para comenzar."
+
diff --git a/po/fr.po b/po/fr.po
index cd7f9a4..7040a30 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -641,11 +641,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2013-04-29 13:54+0200\n"
-"PO-Revision-Date: 2013-04-29 13:58+0100\n"
+"POT-Creation-Date: 2013-12-08 10:33+0100\n"
+"PO-Revision-Date: 2013-12-08 10:35+0100\n"
 "Last-Translator: Colin Leroy <colin at colino.net>\n"
 "Language-Team: Claws Mail translators <translators at lists.claws-mail.org>\n"
-"Language: \n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -653,7 +653,7 @@ msgstr ""
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: src/account.c:393
+#: src/account.c:392
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -661,61 +661,61 @@ msgstr ""
 "Des fenêtres de composition de message sont ouvertes.\n"
 "Veuillez toutes les fermer avant de pouvoir configurer les comptes."
 
-#: src/account.c:438
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Impossible de créer le dossier."
 
-#: src/account.c:719
+#: src/account.c:717
 msgid "Edit accounts"
 msgstr "Édition des comptes"
 
-#: src/account.c:740
+#: src/account.c:734
 msgid "Using 'Get Mail' will retrieve messages from your Accounts in the order given, the checkbox indicates which accounts will be included. Bold text indicates the default account."
 msgstr "La fonctionnalité « Relever » va récupérer le courrier selon l'ordre des comptes suivants, les cases à cocher de la colonne 'R' indiquant lesquels seront concernés par cette relève. Le compte en gras est celui par défaut."
 
-#: src/account.c:811
+#: src/account.c:805
 msgid " _Set as default account "
 msgstr "Définir comme comp_te par défaut"
 
-#: src/account.c:906
+#: src/account.c:897
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Les comptes avec des dossiers distants ne peuvent pas être copiés."
 
-#: src/account.c:913
+#: src/account.c:904
 #, c-format
 msgid "Copy of %s"
 msgstr "Copie de %s"
 
-#: src/account.c:1073
+#: src/account.c:1064
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Voulez-vous vraiment supprimer le compte '%s' ?"
 
-#: src/account.c:1075
+#: src/account.c:1066
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
-#: src/account.c:1076
+#: src/account.c:1067
 msgid "Delete account"
 msgstr "Supprimer le compte"
 
-#: src/account.c:1546
+#: src/account.c:1536
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "R"
 
-#: src/account.c:1552
+#: src/account.c:1542
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "La fonctionnalité « Relever » récupèrera le courrier des comptes cochés"
 
-#: src/account.c:1559
+#: src/account.c:1549
 #: src/addressadd.c:215
 #: src/addressbook.c:125
 #: src/addrduplicates.c:481
-#: src/compose.c:6984
-#: src/editaddress.c:1270
-#: src/editaddress.c:1327
-#: src/editaddress.c:1347
+#: src/compose.c:7073
+#: src/editaddress.c:1263
+#: src/editaddress.c:1320
+#: src/editaddress.c:1340
 #: src/editbook.c:170
 #: src/editgroup.c:288
 #: src/editjpilot.c:257
@@ -723,22 +723,22 @@ msgstr "La fonctionnalité « Relever » récupèrera le courrier des comptes co
 #: src/editvcard.c:173
 #: src/importmutt.c:223
 #: src/importpine.c:222
-#: src/mimeview.c:284
-#: src/plugins/pdf_viewer/poppler_viewer.c:1784
-#: src/plugins/pgpcore/select-keys.c:398
+#: src/mimeview.c:275
+#: src/plugins/pdf_viewer/poppler_viewer.c:1800
+#: src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1872
+#: src/prefs_filtering.c:1868
 #: src/prefs_template.c:78
 msgid "Name"
 msgstr "Nom"
 
-#: src/account.c:1567
+#: src/account.c:1557
 #: src/prefs_account.c:1097
-#: src/prefs_account.c:3922
+#: src/prefs_account.c:3921
 msgid "Protocol"
 msgstr "Protocole"
 
-#: src/account.c:1575
+#: src/account.c:1565
 #: src/ssl_manager.c:102
 msgid "Server"
 msgstr "Serveur"
@@ -779,7 +779,7 @@ msgstr ""
 "Action(s) de filtrage non valide(s) :\n"
 "%s"
 
-#: src/action.c:978
+#: src/action.c:988
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -790,7 +790,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:980
+#: src/action.c:990
 #: src/plugins/bogofilter/bogofilter.c:875
 #: src/plugins/rssyl/feed.c:1734
 #: src/plugins/rssyl/feed.c:1738
@@ -803,26 +803,26 @@ msgstr ""
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: src/action.c:1198
-#: src/action.c:1368
+#: src/action.c:1208
+#: src/action.c:1373
 msgid "Completed"
 msgstr "Terminé"
 
-#: src/action.c:1234
+#: src/action.c:1244
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- En cours : %s\n"
 
-#: src/action.c:1238
+#: src/action.c:1248
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Terminé : %s\n"
 
-#: src/action.c:1271
+#: src/action.c:1281
 msgid "Action's input/output"
 msgstr "Entrées/Sorties d'Actions"
 
-#: src/action.c:1604
+#: src/action.c:1609
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -833,11 +833,11 @@ msgstr ""
 "(L'argument remplacera « %%h »)\n"
 "  %s"
 
-#: src/action.c:1609
+#: src/action.c:1614
 msgid "Action's hidden user argument"
 msgstr "Argument caché de l'action"
 
-#: src/action.c:1613
+#: src/action.c:1618
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -848,12 +848,12 @@ msgstr ""
 "(L'argument remplacera « %%u »)\n"
 "  %s"
 
-#: src/action.c:1618
+#: src/action.c:1623
 msgid "Action's user argument"
 msgstr "Argument pour l'action"
 
 #: src/addr_compl.c:600
-#: src/addressbook.c:4881
+#: src/addressbook.c:4870
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:314
 msgid "Group"
 msgstr "Groupe"
@@ -932,17 +932,17 @@ msgstr ""
 #: src/addressbook.c:480
 #: src/edittags.c:271
 #: src/plugins/archive/archiver_gtk.c:1193
-#: src/prefs_actions.c:1086
-#: src/prefs_filtering.c:1692
-#: src/prefs_template.c:1095
+#: src/prefs_actions.c:1090
+#: src/prefs_filtering.c:1695
+#: src/prefs_template.c:1099
 msgid "_Delete"
 msgstr "_Supprimer"
 
 #: src/addrcustomattr.c:213
 #: src/edittags.c:272
-#: src/prefs_actions.c:1087
-#: src/prefs_filtering.c:1693
-#: src/prefs_template.c:1096
+#: src/prefs_actions.c:1091
+#: src/prefs_filtering.c:1696
+#: src/prefs_template.c:1100
 msgid "Delete _all"
 msgstr "_Tous supprimer.."
 
@@ -950,20 +950,20 @@ msgstr "_Tous supprimer.."
 msgid "_Reset to default"
 msgstr "_Réinitialiser par défaut.."
 
-#: src/addrcustomattr.c:410
+#: src/addrcustomattr.c:403
 msgid "Attribute name is not set."
 msgstr "Le nom d'attribut n'est pas défini."
 
-#: src/addrcustomattr.c:469
+#: src/addrcustomattr.c:462
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Édition des noms d'attributs"
 
-#: src/addrcustomattr.c:483
+#: src/addrcustomattr.c:476
 msgid "New attribute name:"
 msgstr "Nouvel attribut :"
 
-#: src/addrcustomattr.c:520
+#: src/addrcustomattr.c:513
 msgid "Adding or removing attribute names won't affect attributes already set for contacts."
 msgstr "L'ajout ou la suppression de noms d'attributs n'affectera pas ceux déjà définis dans des contacts."
 
@@ -978,15 +978,15 @@ msgstr "Contact"
 
 #: src/addressadd.c:227
 #: src/addrduplicates.c:452
-#: src/plugins/pgpcore/select-keys.c:399
-#: src/toolbar.c:431
+#: src/plugins/pgpcore/select-keys.c:395
+#: src/toolbar.c:432
 msgid "Address"
 msgstr "Adresse"
 
 #: src/addressadd.c:238
 #: src/addressbook.c:127
-#: src/editaddress.c:1062
-#: src/editaddress.c:1137
+#: src/editaddress.c:1055
+#: src/editaddress.c:1130
 #: src/editgroup.c:290
 msgid "Remarks"
 msgstr "Remarques"
@@ -997,7 +997,7 @@ msgid "Select Address Book Folder"
 msgstr "Veuillez sélectionner un dossier"
 
 #: src/addressadd.c:483
-#: src/editaddress.c:1585
+#: src/editaddress.c:1582
 #: src/headerview.c:348
 #: src/textview.c:2110
 #, c-format
@@ -1009,8 +1009,8 @@ msgstr ""
 "%s"
 
 #: src/addressadd.c:532
-#: src/addressbook.c:3221
-#: src/addressbook.c:3272
+#: src/addressbook.c:3210
+#: src/addressbook.c:3261
 msgid "Add address(es)"
 msgstr "Ajout d'adresse(s)"
 
@@ -1019,9 +1019,9 @@ msgid "Can't add the specified address"
 msgstr "Impossible d'ajouter l'adresse spécifiée."
 
 #: src/addressbook.c:126
-#: src/addressbook.c:4869
-#: src/editaddress.c:1059
-#: src/editaddress.c:1120
+#: src/addressbook.c:4858
+#: src/editaddress.c:1052
+#: src/editaddress.c:1113
 #: src/editgroup.c:289
 #: src/expldifdlg.c:517
 #: src/exporthtml.c:600
@@ -1038,25 +1038,23 @@ msgstr "_Carnet"
 #: src/addressbook.c:434
 #: src/addressbook.c:462
 #: src/addressbook.c:479
-#: src/compose.c:576
-#: src/gtk/quicksearch.c:799
-#: src/gtk/quicksearch.c:814
+#: src/compose.c:578
 #: src/mainwindow.c:504
-#: src/messageview.c:211
+#: src/messageview.c:209
 msgid "_Edit"
 msgstr "_Edition"
 
 #: src/addressbook.c:404
-#: src/compose.c:581
+#: src/compose.c:583
 #: src/mainwindow.c:507
-#: src/messageview.c:214
+#: src/messageview.c:212
 msgid "_Tools"
 msgstr "Ou_tils"
 
 #: src/addressbook.c:405
-#: src/compose.c:582
+#: src/compose.c:584
 #: src/mainwindow.c:509
-#: src/messageview.c:215
+#: src/messageview.c:213
 msgid "_Help"
 msgstr "_Aide"
 
@@ -1091,19 +1089,19 @@ msgid "_Delete book"
 msgstr "Supp_rimer le carnet"
 
 #: src/addressbook.c:424
-#: src/compose.c:592
+#: src/compose.c:595
 msgid "_Save"
 msgstr "Enregi_strer"
 
 #: src/addressbook.c:425
-#: src/compose.c:596
-#: src/messageview.c:224
+#: src/compose.c:599
+#: src/messageview.c:222
 msgid "_Close"
 msgstr "_Fermer"
 
 #: src/addressbook.c:428
 #: src/addressbook.c:477
-#: src/messageview.c:228
+#: src/messageview.c:226
 msgid "_Select all"
 msgstr "_Sélectionner tout"
 
@@ -1116,16 +1114,16 @@ msgstr "Co_uper"
 #: src/addressbook.c:431
 #: src/addressbook.c:470
 #: src/addressbook.c:486
-#: src/compose.c:604
+#: src/compose.c:607
 #: src/mainwindow.c:538
-#: src/messageview.c:227
+#: src/messageview.c:225
 msgid "_Copy"
 msgstr "_Copier"
 
 #: src/addressbook.c:432
 #: src/addressbook.c:471
 #: src/addressbook.c:487
-#: src/compose.c:605
+#: src/compose.c:608
 msgid "_Paste"
 msgstr "Co_ller"
 
@@ -1174,9 +1172,9 @@ msgid "Edit custom attributes..."
 msgstr "Personnaliser les _attributs.."
 
 #: src/addressbook.c:455
-#: src/compose.c:684
+#: src/compose.c:687
 #: src/mainwindow.c:801
-#: src/messageview.c:340
+#: src/messageview.c:338
 msgid "_About"
 msgstr "À _propos"
 
@@ -1188,7 +1186,7 @@ msgstr "_Parcourir l'entrée"
 #: src/crash.c:451
 #: src/crash.c:470
 #: src/importldif.c:115
-#: src/plugins/pgpcore/select-keys.c:255
+#: src/plugins/pgpcore/select-keys.c:251
 #: src/plugins/pgpcore/sgpgme.c:140
 #: src/plugins/vcalendar/day-view.c:410
 #: src/plugins/vcalendar/month-view.c:431
@@ -1306,40 +1304,40 @@ msgstr "Un autre contact existe avec cette clé"
 msgid "Strong(er) authentication required"
 msgstr "Forte authentification obligatoire"
 
-#: src/addressbook.c:913
+#: src/addressbook.c:910
 msgid "Sources"
 msgstr "Sources"
 
-#: src/addressbook.c:917
+#: src/addressbook.c:914
 #: src/prefs_matcher.c:629
 #: src/prefs_other.c:475
-#: src/toolbar.c:223
-#: src/toolbar.c:2156
+#: src/toolbar.c:224
+#: src/toolbar.c:2157
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:1120
+#: src/addressbook.c:1109
 msgid "Lookup name:"
 msgstr "Nom complet :"
 
-#: src/addressbook.c:1444
-#: src/addressbook.c:1497
+#: src/addressbook.c:1433
+#: src/addressbook.c:1486
 #: src/addrduplicates.c:803
 msgid "Delete address(es)"
 msgstr "Suppression d'adresse(s)"
 
-#: src/addressbook.c:1445
+#: src/addressbook.c:1434
 #: src/addrduplicates.c:853
 msgid "This address data is readonly and cannot be deleted."
 msgstr ""
 "Les données de cette adresse sont en lecture seule \n"
 "et ne peuvent pas être supprimées."
 
-#: src/addressbook.c:1489
+#: src/addressbook.c:1478
 msgid "Delete group"
 msgstr "Suppression de groupe(s)"
 
-#: src/addressbook.c:1490
+#: src/addressbook.c:1479
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -1347,56 +1345,56 @@ msgstr ""
 "Voulez-vous supprimer ce(s) groupe(s) ?\n"
 "Les adresses contenues seront CONSERVEES."
 
-#: src/addressbook.c:1498
+#: src/addressbook.c:1487
 #: src/addrduplicates.c:804
 msgid "Really delete the address(es)?"
 msgstr "Voulez-vous supprimer la(les) adresse(s) ou groupe(s) sélectionnée(s) ?"
 
-#: src/addressbook.c:2201
+#: src/addressbook.c:2190
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Impossible de coller. Le carnet d'adresse de destination est en lecture seule."
 
-#: src/addressbook.c:2211
+#: src/addressbook.c:2200
 msgid "Cannot paste into an address group."
 msgstr "Impossible de coller dans une adresse de groupe."
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2906
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Voulez-vous effacer les résultats de la recherche et les adresses dans « %s » ?"
 
-#: src/addressbook.c:2920
-#: src/addressbook.c:2946
-#: src/addressbook.c:2953
+#: src/addressbook.c:2909
+#: src/addressbook.c:2935
+#: src/addressbook.c:2942
 #: src/plugins/archive/archiver_prefs.c:337
 #: src/prefs_filtering_action.c:177
-#: src/toolbar.c:413
+#: src/toolbar.c:414
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2918
 #, c-format
 msgid "Do you want to delete '%s'? If you delete the folder only, the addresses it contains will be moved into the parent folder."
 msgstr "Voulez-vous vraiment supprimer le dossier '%s' ? Si vous supprimez uniquement le dossier, les adresses qu'il contient seront déplacées dans le dossier parent."
 
-#: src/addressbook.c:2932
+#: src/addressbook.c:2921
 #: src/imap_gtk.c:363
 #: src/mh_gtk.c:202
-#: src/plugins/mailmbox/plugin_gtk.c:325
+#: src/plugins/mailmbox/plugin_gtk.c:324
 #: src/plugins/rssyl/rssyl_cb_menu.c:237
-#: src/plugins/vcalendar/vcal_folder.c:1953
+#: src/plugins/vcalendar/vcal_folder.c:1951
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "+Delete _folder only"
 msgstr "+_Dossier uniquement"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "Delete folder and _addresses"
 msgstr "Dossier et _adresses"
 
-#: src/addressbook.c:2944
+#: src/addressbook.c:2933
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -1405,7 +1403,7 @@ msgstr ""
 "Voulez-vous vraiment supprimer '%s' ?\n"
 "Les adresses contenues seront CONSERVEES."
 
-#: src/addressbook.c:2951
+#: src/addressbook.c:2940
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -1414,29 +1412,29 @@ msgstr ""
 "Voulez-vous vraiment supprimer '%s' ?\n"
 "Les adresses contenues seront définitivement perdues."
 
-#: src/addressbook.c:3065
+#: src/addressbook.c:3054
 #, c-format
 msgid "Search '%s'"
 msgstr "Recherche « %s »"
 
-#: src/addressbook.c:3203
-#: src/addressbook.c:3253
+#: src/addressbook.c:3192
+#: src/addressbook.c:3242
 msgid "New Contacts"
 msgstr "Nouveaux contacts"
 
-#: src/addressbook.c:4035
+#: src/addressbook.c:4024
 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur. Impossible d'enregistrer le fichier index."
 
-#: src/addressbook.c:4039
+#: src/addressbook.c:4028
 msgid "New user, could not save address book files."
 msgstr "Nouvel utilisateur. Impossible d'enregistrer le fichier de carnet d'adresses."
 
-#: src/addressbook.c:4049
+#: src/addressbook.c:4038
 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 
-#: src/addressbook.c:4054
+#: src/addressbook.c:4043
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -1444,7 +1442,7 @@ msgstr ""
 "Ancien carnet d'adresses converti :\n"
 "Mais impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:4067
+#: src/addressbook.c:4056
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1452,7 +1450,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:4073
+#: src/addressbook.c:4062
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -1460,7 +1458,7 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses :\n"
 "Impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:4078
+#: src/addressbook.c:4067
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1468,28 +1466,28 @@ 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:4085
-#: src/addressbook.c:4091
+#: src/addressbook.c:4074
+#: src/addressbook.c:4080
 msgid "Addressbook conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:4198
+#: src/addressbook.c:4187
 msgid "Addressbook Error"
 msgstr "Erreur dans le carnet d'adresses"
 
-#: src/addressbook.c:4199
+#: src/addressbook.c:4188
 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:4530
+#: src/addressbook.c:4519
 msgid "Busy searching..."
 msgstr "Recherche.."
 
-#: src/addressbook.c:4833
+#: src/addressbook.c:4822
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4845
+#: src/addressbook.c:4834
 #: src/addressbook_foldersel.c:182
 #: src/exphtmldlg.c:371
 #: src/expldifdlg.c:388
@@ -1498,33 +1496,33 @@ msgstr "Interface"
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:4857
+#: src/addressbook.c:4846
 msgid "Person"
 msgstr "Contact"
 
-#: src/addressbook.c:4893
+#: src/addressbook.c:4882
 #: src/exporthtml.c:884
 #: src/folderview.c:338
 #: src/folderview.c:426
-#: src/prefs_account.c:2746
+#: src/prefs_account.c:2738
 #: src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Dossier"
 
-#: src/addressbook.c:4905
+#: src/addressbook.c:4894
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4917
-#: src/addressbook.c:4929
+#: src/addressbook.c:4906
+#: src/addressbook.c:4918
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4941
+#: src/addressbook.c:4930
 msgid "LDAP servers"
 msgstr "Serveurs LDAP"
 
-#: src/addressbook.c:4953
+#: src/addressbook.c:4942
 msgid "LDAP Query"
 msgstr "Requête LDAP"
 
@@ -1543,12 +1541,12 @@ msgstr "Requête LDAP"
 #: src/plugins/spamassassin/spamassassin_gtk.c:613
 #: src/prefs_matcher.c:672
 #: src/prefs_matcher.c:707
-#: src/prefs_matcher.c:1601
-#: src/prefs_matcher.c:1608
-#: src/prefs_matcher.c:1616
-#: src/prefs_matcher.c:1618
-#: src/prefs_matcher.c:2498
-#: src/prefs_matcher.c:2502
+#: src/prefs_matcher.c:1607
+#: src/prefs_matcher.c:1614
+#: src/prefs_matcher.c:1622
+#: src/prefs_matcher.c:1624
+#: src/prefs_matcher.c:2504
+#: src/prefs_matcher.c:2508
 msgid "Any"
 msgstr "Quelconque"
 
@@ -1602,7 +1600,7 @@ msgid "Include subfolders"
 msgstr "Inclure les sous-dossiers"
 
 #: src/addrgather.c:456
-#: src/prefs_filtering_action.c:1423
+#: src/prefs_filtering_action.c:1425
 msgid "Header Name"
 msgstr "En-tête"
 
@@ -1686,26 +1684,28 @@ msgid "Delete address"
 msgstr "Supprimer l'adresse"
 
 #: src/alertpanel.c:146
-#: src/compose.c:9160
+#: src/compose.c:9217
 msgid "Notice"
 msgstr "Information"
 
 #: src/alertpanel.c:159
-#: src/compose.c:5556
-#: src/compose.c:6022
-#: src/compose.c:11468
-#: src/messageview.c:874
-#: src/messageview.c:887
+#: src/compose.c:5597
+#: src/compose.c:6063
+#: src/compose.c:11533
+#: src/file_checker.c:78
+#: src/file_checker.c:100
+#: src/messageview.c:852
+#: src/messageview.c:865
 #: src/plugins/pgpcore/sgpgme.c:706
 #: src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4869
+#: src/summaryview.c:4865
 msgid "Warning"
 msgstr "Alerte"
 
 #: src/alertpanel.c:172
 #: src/alertpanel.c:195
-#: src/compose.c:5497
-#: src/inc.c:666
+#: src/compose.c:5538
+#: src/inc.c:665
 #: src/plugins/pgpcore/sgpgme.c:152
 #: src/plugins/pgpcore/sgpgme.c:246
 msgid "Error"
@@ -1976,721 +1976,725 @@ msgstr "<non spécifié dans le certificat>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Sujet supprimé par RegExp)"
 
-#: src/common/utils.c:371
+#: src/common/utils.c:362
 #, c-format
 msgid "%dB"
 msgstr "%do"
 
-#: src/common/utils.c:372
+#: src/common/utils.c:363
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dko"
 
-#: src/common/utils.c:373
+#: src/common/utils.c:364
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMo"
 
-#: src/common/utils.c:374
+#: src/common/utils.c:365
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGo"
 
-#: src/common/utils.c:4974
+#: src/common/utils.c:4946
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: src/common/utils.c:4975
+#: src/common/utils.c:4947
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Lundi"
 
-#: src/common/utils.c:4976
+#: src/common/utils.c:4948
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: src/common/utils.c:4977
+#: src/common/utils.c:4949
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: src/common/utils.c:4978
+#: src/common/utils.c:4950
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: src/common/utils.c:4979
+#: src/common/utils.c:4951
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Vendredi"
 
-#: src/common/utils.c:4980
+#: src/common/utils.c:4952
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Samedi"
 
-#: src/common/utils.c:4982
+#: src/common/utils.c:4954
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Janvier"
 
-#: src/common/utils.c:4983
+#: src/common/utils.c:4955
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Février"
 
-#: src/common/utils.c:4984
+#: src/common/utils.c:4956
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Mars"
 
-#: src/common/utils.c:4985
+#: src/common/utils.c:4957
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Avril"
 
-#: src/common/utils.c:4986
+#: src/common/utils.c:4958
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4987
+#: src/common/utils.c:4959
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Juin"
 
-#: src/common/utils.c:4988
+#: src/common/utils.c:4960
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Juillet"
 
-#: src/common/utils.c:4989
+#: src/common/utils.c:4961
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Août"
 
-#: src/common/utils.c:4990
+#: src/common/utils.c:4962
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Septembre"
 
-#: src/common/utils.c:4991
+#: src/common/utils.c:4963
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octobre"
 
-#: src/common/utils.c:4992
+#: src/common/utils.c:4964
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Novembre"
 
-#: src/common/utils.c:4993
+#: src/common/utils.c:4965
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Décembre"
 
-#: src/common/utils.c:4995
+#: src/common/utils.c:4967
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dim"
 
-#: src/common/utils.c:4996
+#: src/common/utils.c:4968
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Lun"
 
-#: src/common/utils.c:4997
+#: src/common/utils.c:4969
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Mar"
 
-#: src/common/utils.c:4998
+#: src/common/utils.c:4970
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mer"
 
-#: src/common/utils.c:4999
+#: src/common/utils.c:4971
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Jeu"
 
-#: src/common/utils.c:5000
+#: src/common/utils.c:4972
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Ven"
 
-#: src/common/utils.c:5001
+#: src/common/utils.c:4973
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sam"
 
-#: src/common/utils.c:5003
+#: src/common/utils.c:4975
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:5004
+#: src/common/utils.c:4976
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Fév"
 
-#: src/common/utils.c:5005
+#: src/common/utils.c:4977
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:5006
+#: src/common/utils.c:4978
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Avr"
 
-#: src/common/utils.c:5007
+#: src/common/utils.c:4979
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:5008
+#: src/common/utils.c:4980
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:5009
+#: src/common/utils.c:4981
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jui"
 
-#: src/common/utils.c:5010
+#: src/common/utils.c:4982
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aoû"
 
-#: src/common/utils.c:5011
+#: src/common/utils.c:4983
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:5012
+#: src/common/utils.c:4984
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Oct"
 
-#: src/common/utils.c:5013
+#: src/common/utils.c:4985
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:5014
+#: src/common/utils.c:4986
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Déc"
 
-#: src/common/utils.c:5025
+#: src/common/utils.c:4997
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:5026
+#: src/common/utils.c:4998
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:5027
+#: src/common/utils.c:4999
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:5028
+#: src/common/utils.c:5000
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/common/utils.c:5035
+#: src/common/utils.c:5007
 msgctxt "For use by strftime (default date+time format)"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %b %e %H:%M:%S %Y"
 
-#: src/common/utils.c:5036
+#: src/common/utils.c:5008
 msgctxt "For use by strftime (default date format)"
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: src/common/utils.c:5037
+#: src/common/utils.c:5009
 msgctxt "For use by strftime (default time format)"
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
-#: src/common/utils.c:5039
+#: src/common/utils.c:5011
 msgctxt "For use by strftime (default 12-hour time format)"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
-#: src/compose.c:565
+#: src/compose.c:567
 msgid "_Add..."
 msgstr "_Ajouter.."
 
-#: src/compose.c:566
+#: src/compose.c:568
 #: src/mh_gtk.c:361
 #: src/plugins/mailmbox/plugin_gtk.c:293
 #: src/plugins/rssyl/rssyl_cb_menu.c:140
 msgid "_Remove"
 msgstr "Enleve_r"
 
-#: src/compose.c:568
+#: src/compose.c:570
 #: src/folderview.c:234
 msgid "_Properties..."
 msgstr "_Propriétés.."
 
-#: src/compose.c:575
+#: src/compose.c:577
 #: src/mainwindow.c:506
-#: src/messageview.c:213
+#: src/messageview.c:211
 msgid "_Message"
 msgstr "_Message"
 
-#: src/compose.c:578
+#: src/compose.c:580
 msgid "_Spelling"
 msgstr "O_rthographe"
 
-#: src/compose.c:580
-#: src/compose.c:646
+#: src/compose.c:582
+#: src/compose.c:649
 msgid "_Options"
 msgstr "_Options"
 
-#: src/compose.c:584
+#: src/compose.c:586
 msgid "S_end"
 msgstr "_Envoyer"
 
-#: src/compose.c:585
+#: src/compose.c:587
 msgid "Send _later"
 msgstr "Envoyer _ultérieurement"
 
-#: src/compose.c:588
+#: src/compose.c:590
 msgid "_Attach file"
 msgstr "_Joindre un fichier"
 
-#: src/compose.c:589
+#: src/compose.c:591
 msgid "_Insert file"
 msgstr "_Insérer un fichier"
 
-#: src/compose.c:590
+#: src/compose.c:592
 msgid "Insert si_gnature"
 msgstr "Insérer la si_gnature"
 
-#: src/compose.c:594
+#: src/compose.c:593
+msgid "_Replace signature"
+msgstr "_Remplacer la signature"
+
+#: src/compose.c:597
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: src/compose.c:599
+#: src/compose.c:602
 msgid "_Undo"
 msgstr "Ann_uler"
 
-#: src/compose.c:600
+#: src/compose.c:603
 msgid "_Redo"
 msgstr "_Refaire"
 
-#: src/compose.c:603
+#: src/compose.c:606
 msgid "Cu_t"
 msgstr "Co_uper"
 
-#: src/compose.c:607
+#: src/compose.c:610
 msgid "_Special paste"
 msgstr "Coller c_omme"
 
-#: src/compose.c:608
+#: src/compose.c:611
 msgid "As _quotation"
 msgstr "_Citation"
 
-#: src/compose.c:609
+#: src/compose.c:612
 msgid "_Wrapped"
 msgstr "Texte _justifié"
 
-#: src/compose.c:610
+#: src/compose.c:613
 msgid "_Unwrapped"
 msgstr "Texte _non justifié"
 
-#: src/compose.c:612
+#: src/compose.c:615
 #: src/mainwindow.c:539
 msgid "Select _all"
 msgstr "_Sélectionner tout"
 
-#: src/compose.c:614
+#: src/compose.c:617
 msgid "A_dvanced"
 msgstr "A_vancé"
 
-#: src/compose.c:615
+#: src/compose.c:618
 msgid "Move a character backward"
 msgstr "Reculer d'un _caractère"
 
-#: src/compose.c:616
+#: src/compose.c:619
 msgid "Move a character forward"
 msgstr "Avancer d'un c_aractère"
 
-#: src/compose.c:617
+#: src/compose.c:620
 msgid "Move a word backward"
 msgstr "Reculer d'un _mot"
 
-#: src/compose.c:618
+#: src/compose.c:621
 msgid "Move a word forward"
 msgstr "Avancer d'un m_ot"
 
-#: src/compose.c:619
+#: src/compose.c:622
 msgid "Move to beginning of line"
 msgstr "Aller en _début de ligne"
 
-#: src/compose.c:620
+#: src/compose.c:623
 msgid "Move to end of line"
 msgstr "Aller en _fin de ligne"
 
-#: src/compose.c:621
+#: src/compose.c:624
 msgid "Move to previous line"
 msgstr "Aller à la _ligne précédente"
 
-#: src/compose.c:622
+#: src/compose.c:625
 msgid "Move to next line"
 msgstr "Aller à la l_igne suivante"
 
-#: src/compose.c:623
+#: src/compose.c:626
 msgid "Delete a character backward"
 msgstr "Supprimer le caractère _précédent"
 
-#: src/compose.c:624
+#: src/compose.c:627
 msgid "Delete a character forward"
 msgstr "Supprimer le caractère _suivant"
 
-#: src/compose.c:625
+#: src/compose.c:628
 msgid "Delete a word backward"
 msgstr "Supprimer le mot p_récédent"
 
-#: src/compose.c:626
+#: src/compose.c:629
 msgid "Delete a word forward"
 msgstr "Supprimer le mot s_uivant"
 
-#: src/compose.c:627
+#: src/compose.c:630
 msgid "Delete line"
 msgstr "_Effacer la ligne"
 
-#: src/compose.c:628
+#: src/compose.c:631
 msgid "Delete to end of line"
 msgstr "Supprimer _jusqu'à la fin de la ligne"
 
-#: src/compose.c:631
-#: src/messageview.c:230
+#: src/compose.c:634
+#: src/messageview.c:228
 msgid "_Find"
 msgstr "Chercher dans le _message.."
 
-#: src/compose.c:634
+#: src/compose.c:637
 msgid "_Wrap current paragraph"
 msgstr "Justifier le _paragraphe actuel"
 
-#: src/compose.c:635
+#: src/compose.c:638
 msgid "Wrap all long _lines"
 msgstr "_Justifier tout le message"
 
-#: src/compose.c:637
+#: src/compose.c:640
 msgid "Edit with e_xternal editor"
 msgstr "Éditer avec un éditeur au_xiliaire"
 
-#: src/compose.c:640
+#: src/compose.c:643
 msgid "_Check all or check selection"
 msgstr "_Vérifier la sélection ou tout le texte"
 
-#: src/compose.c:641
+#: src/compose.c:644
 msgid "_Highlight all misspelled words"
 msgstr "Montrer les mots _inconnus"
 
-#: src/compose.c:642
+#: src/compose.c:645
 msgid "Check _backwards misspelled word"
 msgstr "Vérifier les mots _précédents"
 
-#: src/compose.c:643
+#: src/compose.c:646
 msgid "_Forward to next misspelled word"
 msgstr "Vérifier les mots _suivants et avancer"
 
-#: src/compose.c:651
+#: src/compose.c:654
 msgid "Reply _mode"
 msgstr "_Mode de réponse"
 
-#: src/compose.c:653
+#: src/compose.c:656
 msgid "Privacy _System"
 msgstr "S_ystème de confidentialité"
 
-#: src/compose.c:658
+#: src/compose.c:661
 msgid "_Priority"
 msgstr "_Priorité"
 
-#: src/compose.c:660
+#: src/compose.c:663
 #: src/mainwindow.c:603
-#: src/messageview.c:266
+#: src/messageview.c:264
 msgid "Character _encoding"
 msgstr "_Jeux de caractères"
 
-#: src/compose.c:665
+#: src/compose.c:668
 #: src/mainwindow.c:608
-#: src/messageview.c:271
+#: src/messageview.c:269
 msgid "Western European"
 msgstr "Europe de l'Ouest"
 
-#: src/compose.c:666
+#: src/compose.c:669
 #: src/mainwindow.c:609
-#: src/messageview.c:272
+#: src/messageview.c:270
 msgid "Baltic"
 msgstr "Baltique"
 
-#: src/compose.c:667
+#: src/compose.c:670
 #: src/mainwindow.c:610
-#: src/messageview.c:273
+#: src/messageview.c:271
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: src/compose.c:668
+#: src/compose.c:671
 #: src/mainwindow.c:611
-#: src/messageview.c:274
+#: src/messageview.c:272
 msgid "Arabic"
 msgstr "Arabe"
 
-#: src/compose.c:669
+#: src/compose.c:672
 #: src/mainwindow.c:612
-#: src/messageview.c:275
+#: src/messageview.c:273
 msgid "Cyrillic"
 msgstr "Cyrillique"
 
-#: src/compose.c:670
+#: src/compose.c:673
 #: src/mainwindow.c:613
-#: src/messageview.c:276
+#: src/messageview.c:274
 msgid "Japanese"
 msgstr "Japonais"
 
-#: src/compose.c:671
+#: src/compose.c:674
 #: src/mainwindow.c:614
-#: src/messageview.c:277
+#: src/messageview.c:275
 msgid "Chinese"
 msgstr "Chinois"
 
-#: src/compose.c:672
+#: src/compose.c:675
 #: src/mainwindow.c:615
-#: src/messageview.c:278
+#: src/messageview.c:276
 msgid "Korean"
 msgstr "Coréen"
 
-#: src/compose.c:673
+#: src/compose.c:676
 #: src/mainwindow.c:616
-#: src/messageview.c:279
+#: src/messageview.c:277
 msgid "Thai"
 msgstr "Thaïlandais"
 
-#: src/compose.c:676
+#: src/compose.c:679
 #: src/mainwindow.c:723
-#: src/messageview.c:315
+#: src/messageview.c:313
 msgid "_Address book"
 msgstr "_Carnet d'adresses"
 
-#: src/compose.c:678
+#: src/compose.c:681
 msgid "_Template"
 msgstr "_Modèles"
 
-#: src/compose.c:680
+#: src/compose.c:683
 #: src/mainwindow.c:751
-#: src/messageview.c:336
+#: src/messageview.c:334
 msgid "Actio_ns"
 msgstr "_Actions"
 
-#: src/compose.c:689
+#: src/compose.c:692
 msgid "Aut_o wrapping"
 msgstr "Justifier aut_omatiquement pendant la saisie"
 
-#: src/compose.c:690
+#: src/compose.c:693
 msgid "Auto _indent"
 msgstr "_Indentation automatique"
 
-#: src/compose.c:691
+#: src/compose.c:694
 msgid "Si_gn"
 msgstr "_signer"
 
-#: src/compose.c:692
+#: src/compose.c:695
 msgid "_Encrypt"
 msgstr "_Chiffrer"
 
-#: src/compose.c:693
+#: src/compose.c:696
 msgid "_Request Return Receipt"
 msgstr "Demander un _accusé de réception"
 
-#: src/compose.c:694
+#: src/compose.c:697
 msgid "Remo_ve references"
 msgstr "Supprimer les _références"
 
-#: src/compose.c:695
+#: src/compose.c:698
 msgid "Show _ruler"
 msgstr "Afficher la _règle"
 
-#: src/compose.c:700
-#: src/compose.c:710
+#: src/compose.c:703
+#: src/compose.c:713
 msgid "_Normal"
 msgstr "_Normale"
 
-#: src/compose.c:701
+#: src/compose.c:704
 #: src/mainwindow.c:657
-#: src/messageview.c:304
+#: src/messageview.c:302
 msgid "_All"
 msgstr "À _tous"
 
-#: src/compose.c:702
+#: src/compose.c:705
 #: src/mainwindow.c:658
-#: src/messageview.c:305
+#: src/messageview.c:303
 msgid "_Sender"
 msgstr "À l'_expéditeur"
 
-#: src/compose.c:703
+#: src/compose.c:706
 msgid "_Mailing-list"
 msgstr "La _liste"
 
-#: src/compose.c:708
+#: src/compose.c:711
 msgid "_Highest"
 msgstr "La plus _haute"
 
-#: src/compose.c:709
+#: src/compose.c:712
 msgid "Hi_gh"
 msgstr "Haute"
 
-#: src/compose.c:711
+#: src/compose.c:714
 msgid "Lo_w"
 msgstr "Ba_sse"
 
-#: src/compose.c:712
+#: src/compose.c:715
 msgid "_Lowest"
 msgstr "La plus _basse"
 
-#: src/compose.c:717
-#: src/mainwindow.c:867
-#: src/messageview.c:353
+#: src/compose.c:720
+#: src/mainwindow.c:865
+#: src/messageview.c:351
 msgid "_Automatic"
 msgstr "_Détection automatique"
 
-#: src/compose.c:718
-#: src/mainwindow.c:868
-#: src/messageview.c:354
+#: src/compose.c:721
+#: src/mainwindow.c:866
+#: src/messageview.c:352
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASC_II 7 bits (US-ASCII)"
 
-#: src/compose.c:719
-#: src/mainwindow.c:869
-#: src/messageview.c:355
+#: src/compose.c:722
+#: src/mainwindow.c:867
+#: src/messageview.c:353
 msgid "Unicode (_UTF-8)"
 msgstr "_Unicode (UTF-8)"
 
-#: src/compose.c:723
-#: src/mainwindow.c:873
-#: src/messageview.c:359
+#: src/compose.c:726
+#: src/mainwindow.c:871
+#: src/messageview.c:357
 msgid "Central European (ISO-8859-_2)"
 msgstr "Europe Centrale (ISO-8859-_2)"
 
-#: src/compose.c:726
-#: src/mainwindow.c:876
-#: src/messageview.c:362
+#: src/compose.c:729
+#: src/mainwindow.c:874
+#: src/messageview.c:360
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grec (ISO-8859-_7)"
 
-#: src/compose.c:731
-#: src/mainwindow.c:881
-#: src/messageview.c:367
+#: src/compose.c:734
+#: src/mainwindow.c:879
+#: src/messageview.c:365
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turc (ISO-8859-_9)"
 
-#: src/compose.c:1034
+#: src/compose.c:1062
 msgid "New message From format error."
 msgstr "Erreur de formatage du modèle d'expéditeur des nouveaux messages."
 
-#: src/compose.c:1126
+#: src/compose.c:1154
 msgid "New message subject format error."
 msgstr "Erreur de formatage du modèle de sujet des nouveaux messages."
 
-#: src/compose.c:1157
+#: src/compose.c:1185
 #: src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Le corps du modèle \"Nouveau message\" a une erreur à la ligne %d."
 
-#: src/compose.c:1413
+#: src/compose.c:1439
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Impossible de répondre. Le message original n'existe probablement pas."
 
-#: src/compose.c:1596
+#: src/compose.c:1622
 #: src/quote_fmt.c:580
 msgid "The \"From\" field of the \"Reply\" template contains an invalid email address."
 msgstr "Le champ \"De\" du modèle \"Réponse\" contient une adresse email invalide."
 
-#: src/compose.c:1644
+#: src/compose.c:1670
 #: src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Le corps du modèle \"Réponse\" a une erreur à la ligne %d."
 
-#: src/compose.c:1780
-#: src/compose.c:1972
+#: src/compose.c:1806
+#: src/compose.c:1998
 #: src/quote_fmt.c:600
 msgid "The \"From\" field of the \"Forward\" template contains an invalid email address."
 msgstr "Le champ \"De\" du modèle \"Transfert\" contient une adresse email invalide."
 
-#: src/compose.c:1840
+#: src/compose.c:1866
 #: src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Le corps du modèle \"Transfert\" a une erreur à la ligne %d."
 
-#: src/compose.c:2014
+#: src/compose.c:2040
 msgid "Fw: multiple emails"
 msgstr "Fw: emails multiples"
 
-#: src/compose.c:2456
+#: src/compose.c:2482
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Le corps du modèle \"Redirection\" a une erreur à la ligne %d."
 
-#: src/compose.c:2522
+#: src/compose.c:2549
 #: src/gtk/headers.h:13
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2525
+#: src/compose.c:2552
 #: src/gtk/headers.h:14
 msgid "Bcc:"
 msgstr "Cci:"
 
-#: src/compose.c:2528
+#: src/compose.c:2555
 #: src/gtk/headers.h:11
 msgid "Reply-To:"
 msgstr "Répondre à:"
 
-#: src/compose.c:2531
-#: src/compose.c:4818
-#: src/compose.c:4820
+#: src/compose.c:2558
+#: src/compose.c:4854
+#: src/compose.c:4856
 #: src/gtk/headers.h:32
 msgid "Newsgroups:"
 msgstr "Groupe de discussion:"
 
-#: src/compose.c:2534
+#: src/compose.c:2561
 #: src/gtk/headers.h:33
 msgid "Followup-To:"
 msgstr "Donnant suite à:"
 
-#: src/compose.c:2537
+#: src/compose.c:2564
 #: src/gtk/headers.h:16
 msgid "In-Reply-To:"
 msgstr "En réponse à:"
 
-#: src/compose.c:2541
-#: src/compose.c:4815
-#: src/compose.c:4823
+#: src/compose.c:2568
+#: src/compose.c:4851
+#: src/compose.c:4859
 #: src/gtk/headers.h:12
-#: src/summary_search.c:419
+#: src/summary_search.c:445
 msgid "To:"
 msgstr "À:"
 
-#: src/compose.c:2747
+#: src/compose.c:2774
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Impossible de joindre le fichier au message (échec de conversion de jeu de caractères)."
 
-#: src/compose.c:2753
+#: src/compose.c:2780
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2705,68 +2709,68 @@ msgstr[1] ""
 "Les fichiers suivants ont été joints au message :\n"
 "%s"
 
-#: src/compose.c:3026
+#: src/compose.c:3053
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Le \"préfixe de citation\" du modèle est invalide."
 
-#: src/compose.c:3514
+#: src/compose.c:3542
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Impossible de récupérer la taille du fichier '%s'."
 
-#: src/compose.c:3525
+#: src/compose.c:3553
 #, c-format
 msgid "You are about to insert a file of %s in the message body. Are you sure you want to do that?"
 msgstr "Vous êtes sur le point d'insérer un fichier de %s dans le corps du message. Êtes-vous sûr de vouloir faire cela ?"
 
-#: src/compose.c:3528
+#: src/compose.c:3556
 msgid "Are you sure?"
 msgstr "Êtes-vous sûr ?"
 
-#: src/compose.c:3529
-#: src/compose.c:10962
+#: src/compose.c:3557
+#: src/compose.c:11027
 msgid "+_Insert"
 msgstr "+_Insérer"
 
-#: src/compose.c:3639
+#: src/compose.c:3672
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:3643
+#: src/compose.c:3676
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:3670
+#: src/compose.c:3703
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:4658
-#: src/plugins/python/composewindowtype.c:428
+#: src/compose.c:4691
+#: src/plugins/python/composewindowtype.c:432
 msgid " [Edited]"
 msgstr " [modifié]"
 
-#: src/compose.c:4665
-#: src/plugins/python/composewindowtype.c:431
+#: src/compose.c:4698
+#: src/plugins/python/composewindowtype.c:435
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composition d'un message%s"
 
-#: src/compose.c:4668
-#: src/plugins/python/composewindowtype.c:434
+#: src/compose.c:4701
+#: src/plugins/python/composewindowtype.c:438
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[Pas de sujet] - Composition d'un message%s"
 
-#: src/compose.c:4670
-#: src/plugins/python/composewindowtype.c:422
+#: src/compose.c:4703
+#: src/plugins/python/composewindowtype.c:426
 msgid "Compose message"
 msgstr "Composition d'un message"
 
-#: src/compose.c:4697
-#: src/messageview.c:909
+#: src/compose.c:4730
+#: src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2774,61 +2778,61 @@ msgstr ""
 "Aucun compte n'a été spécifié pour l'envoi.\n"
 "Veuillez en sélectionner un avant d'envoyer du courrier."
 
-#: src/compose.c:4914
-#: src/compose.c:4946
-#: src/compose.c:4988
+#: src/compose.c:4950
+#: src/compose.c:4982
+#: src/compose.c:5024
 #: src/plugins/attachwarner/attachwarner.c:219
-#: src/prefs_account.c:3245
-#: src/toolbar.c:404
-#: src/toolbar.c:422
+#: src/prefs_account.c:3237
+#: src/toolbar.c:405
+#: src/toolbar.c:423
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/compose.c:4915
+#: src/compose.c:4951
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Le seul destinataire est l'adresse « Cc: » par défaut. Voulez-vous quand même envoyer le message ?"
 
-#: src/compose.c:4916
-#: src/compose.c:4948
-#: src/compose.c:4981
-#: src/compose.c:5497
+#: src/compose.c:4952
+#: src/compose.c:4984
+#: src/compose.c:5017
+#: src/compose.c:5538
 #: src/plugins/attachwarner/attachwarner.c:211
 msgid "+_Send"
 msgstr "+_Envoyer"
 
-#: src/compose.c:4947
+#: src/compose.c:4983
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Le seul destinataire est l'adresse « Cci: » par défaut. Voulez-vous quand même envoyer le message ?"
 
-#: src/compose.c:4964
+#: src/compose.c:5000
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:4983
+#: src/compose.c:5019
 #: src/plugins/attachwarner/attachwarner.c:213
 msgid "+_Queue"
 msgstr "_Mettre en file d'attente"
 
-#: src/compose.c:4984
+#: src/compose.c:5020
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Le sujet est vide. %s"
 
-#: src/compose.c:4985
+#: src/compose.c:5021
 msgid "Send it anyway?"
 msgstr "Voulez-vous quand même l'envoyer ?"
 
-#: src/compose.c:4986
+#: src/compose.c:5022
 msgid "Queue it anyway?"
 msgstr "Voulez-vous quand même le mettre en file d'attente d'envoi ?"
 
-#: src/compose.c:4988
-#: src/toolbar.c:423
+#: src/compose.c:5024
+#: src/toolbar.c:424
 msgid "Send later"
 msgstr "Plus tard"
 
-#: src/compose.c:5036
-#: src/compose.c:9585
+#: src/compose.c:5077
+#: src/compose.c:9643
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2838,8 +2842,8 @@ msgstr ""
 "\n"
 "La conversion de jeu de caractères a échoué."
 
-#: src/compose.c:5039
-#: src/compose.c:9588
+#: src/compose.c:5080
+#: src/compose.c:9646
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2849,8 +2853,8 @@ msgstr ""
 "\n"
 "La clé de chiffrement du destinataire n'est pas disponible."
 
-#: src/compose.c:5045
-#: src/compose.c:9582
+#: src/compose.c:5086
+#: src/compose.c:9640
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2861,7 +2865,7 @@ msgstr ""
 "\n"
 "Sa signature a échoué : %s"
 
-#: src/compose.c:5048
+#: src/compose.c:5089
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2872,12 +2876,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5050
+#: src/compose.c:5091
 msgid "Could not queue message for sending."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 
-#: src/compose.c:5065
-#: src/compose.c:5125
+#: src/compose.c:5106
+#: src/compose.c:5166
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2885,7 +2889,7 @@ msgstr ""
 "Le message a été mis dans la file d'attente mais n'a pas pu être envoyé.\n"
 "Utilisez « Message / Envoyer les messages en file d'attente » pour réessayer."
 
-#: src/compose.c:5121
+#: src/compose.c:5162
 #, c-format
 msgid ""
 "%s\n"
@@ -2894,7 +2898,7 @@ msgstr ""
 "%s\n"
 "Utilisez « Message / Envoyer les messages en file d'attente » pour réessayer."
 
-#: src/compose.c:5494
+#: src/compose.c:5535
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2905,7 +2909,7 @@ msgstr ""
 "message vers le jeu de caractères spécifié (%s).\n"
 "Voulez-vous l'envoyer en %s ?"
 
-#: src/compose.c:5552
+#: src/compose.c:5593
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2918,74 +2922,74 @@ msgstr ""
 "\n"
 "Voulez-vous quand même l'envoyer ?"
 
-#: src/compose.c:5733
+#: src/compose.c:5774
 msgid "Encryption warning"
 msgstr "Avertissement pour le chiffrement"
 
-#: src/compose.c:5734
+#: src/compose.c:5775
 msgid "+C_ontinue"
 msgstr "+_Poursuivre"
 
-#: src/compose.c:5783
+#: src/compose.c:5824
 msgid "No account for sending mails available!"
 msgstr "Il n'existe pas de compte pour l'envoi de messages."
 
-#: src/compose.c:5792
+#: src/compose.c:5833
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Le compte sélectionné n'est pas un compte NNTP : Poster est impossible."
 
-#: src/compose.c:6021
+#: src/compose.c:6062
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "La pièce jointe %s n'existe plus. Ignorer ?"
 
-#: src/compose.c:6022
+#: src/compose.c:6063
 #: src/mainwindow.c:648
-#: src/toolbar.c:229
-#: src/toolbar.c:2181
+#: src/toolbar.c:230
+#: src/toolbar.c:2182
 msgid "Cancel sending"
 msgstr "Interrompre l'envoi"
 
-#: src/compose.c:6022
+#: src/compose.c:6063
 msgid "Ignore attachment"
 msgstr "Ignorer cette pièce jointe"
 
-#: src/compose.c:6061
+#: src/compose.c:6102
 #, c-format
 msgid "Original %s part"
 msgstr "Partie %s originale"
 
-#: src/compose.c:6592
+#: src/compose.c:6681
 msgid "Add to address _book"
 msgstr "Ajouter au carnet d'_adresses"
 
-#: src/compose.c:6748
+#: src/compose.c:6837
 msgid "Delete entry contents"
 msgstr "Effacer le contenu du champ"
 
-#: src/compose.c:6752
+#: src/compose.c:6841
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:295
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Veuillez saisir <tab> pour procéder à la complétion depuis le carnet d'adresse"
 
-#: src/compose.c:6972
+#: src/compose.c:7061
 msgid "Mime type"
 msgstr "Type Mime"
 
-#: src/compose.c:6978
-#: src/mimeview.c:283
-#: src/plugins/pgpcore/select-keys.c:396
+#: src/compose.c:7067
+#: src/mimeview.c:274
+#: src/plugins/pgpcore/select-keys.c:392
 #: src/prefs_matcher.c:627
 #: src/prefs_summary_column.c:85
 #: src/summaryview.c:447
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:7048
+#: src/compose.c:7130
 msgid "Save Message to "
 msgstr "Enregistrer le message dans "
 
-#: src/compose.c:7081
+#: src/compose.c:7167
 #: src/editjpilot.c:276
 #: src/editldap.c:520
 #: src/editvcard.c:192
@@ -3002,26 +3006,26 @@ msgstr "Enregistrer le message dans "
 msgid "_Browse"
 msgstr "_Parcourir"
 
-#: src/compose.c:7569
+#: src/compose.c:7643
 msgid "Hea_der"
 msgstr "E_n-tête"
 
-#: src/compose.c:7574
+#: src/compose.c:7648
 msgid "_Attachments"
 msgstr "Pièces _jointes"
 
-#: src/compose.c:7588
+#: src/compose.c:7662
 msgid "Othe_rs"
 msgstr "A_utres"
 
-#: src/compose.c:7603
+#: src/compose.c:7677
 #: src/gtk/headers.h:18
 #: src/plugins/pdf_viewer/poppler_viewer.c:704
-#: src/summary_search.c:426
+#: src/summary_search.c:452
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: src/compose.c:7830
+#: src/compose.c:7891
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -3030,84 +3034,84 @@ msgstr ""
 "Le correcteur orthographique n'a pu être lancé.\n"
 "%s"
 
-#: src/compose.c:7943
+#: src/compose.c:8000
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "De: <i>%s</i>"
 
-#: src/compose.c:7977
+#: src/compose.c:8034
 msgid "Account to use for this email"
 msgstr "Compte à utiliser pour l'envoi de ce message"
 
-#: src/compose.c:7979
+#: src/compose.c:8036
 msgid "Sender address to be used"
 msgstr "Adresse email à utiliser en tant qu'expéditeur"
 
-#: src/compose.c:8143
+#: src/compose.c:8200
 #, c-format
 msgid "The privacy system '%s' cannot be loaded. You will not be able to sign or encrypt this message."
 msgstr "Le système de confidentialité '%s' ne peut être chargé. Il sera impossible de signer ou chiffrer ce message."
 
-#: src/compose.c:8243
+#: src/compose.c:8300
 #: src/plugins/archive/archiver_gtk.c:1082
 msgid "_None"
 msgstr "_Aucun"
 
-#: src/compose.c:8344
-#: src/prefs_template.c:749
+#: src/compose.c:8401
+#: src/prefs_template.c:753
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Le corps du modèle a une erreur à la ligne %d."
 
-#: src/compose.c:8460
+#: src/compose.c:8517
 msgid "Template From format error."
 msgstr "Erreur de formatage dans l'en-tête « De: » du modèle."
 
-#: src/compose.c:8478
+#: src/compose.c:8535
 msgid "Template To format error."
 msgstr "Erreur de formatage dans l'en-tête « À: » du modèle."
 
-#: src/compose.c:8496
+#: src/compose.c:8553
 msgid "Template Cc format error."
 msgstr "Erreur de formatage dans l'en-tête « Cc: » du modèle."
 
-#: src/compose.c:8514
+#: src/compose.c:8571
 msgid "Template Bcc format error."
 msgstr "Erreur de formatage dans l'en-tête « Cci: » du modèle."
 
-#: src/compose.c:8533
+#: src/compose.c:8590
 msgid "Template subject format error."
 msgstr "Erreur de formatage dans le sujet du modèle."
 
-#: src/compose.c:8797
+#: src/compose.c:8854
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:8812
+#: src/compose.c:8869
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:8886
+#: src/compose.c:8943
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:8903
+#: src/compose.c:8960
 msgid "MIME type"
 msgstr "Type MIME"
 
-#: src/compose.c:8944
+#: src/compose.c:9001
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:8964
+#: src/compose.c:9021
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:8965
+#: src/compose.c:9022
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:9157
+#: src/compose.c:9214
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -3118,16 +3122,16 @@ msgstr ""
 "Voulez-vous forcer sa fermeture ?\n"
 "Identifiant du groupe de processus : %d"
 
-#: src/compose.c:9551
-#: src/messageview.c:1116
+#: src/compose.c:9609
+#: src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail nécessite un accès réseau pour envoyer ce message."
 
-#: src/compose.c:9577
+#: src/compose.c:9635
 msgid "Could not queue message."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 
-#: src/compose.c:9579
+#: src/compose.c:9637
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -3138,15 +3142,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:9747
+#: src/compose.c:9805
 msgid "Could not save draft."
 msgstr "Impossible d'enregistrer le brouillon."
 
-#: src/compose.c:9751
+#: src/compose.c:9809
 msgid "Could not save draft"
 msgstr "Enregistrement impossible du brouillon"
 
-#: src/compose.c:9752
+#: src/compose.c:9810
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -3154,25 +3158,25 @@ msgstr ""
 "Il est impossible d'enregistrer le brouillon.\n"
 "Souhaitez-vous annuler la fermeture de l'application ou simplement interrompre l'édition de ce message ?"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Cancel exit"
 msgstr "A_nnuler"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Discard email"
 msgstr "_Interrompre"
 
-#: src/compose.c:9914
-#: src/compose.c:9928
+#: src/compose.c:9972
+#: src/compose.c:9986
 msgid "Select file"
 msgstr "Veuillez sélectionner un fichier"
 
-#: src/compose.c:9942
+#: src/compose.c:10000
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Échec lors de la lecture de « %s »."
 
-#: src/compose.c:9944
+#: src/compose.c:10002
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -3181,73 +3185,79 @@ msgstr ""
 "Le fichier « %s » contient des caractères n'appartenant pas\n"
 "à l'encodage courant : l'insertion peut être incorrecte."
 
-#: src/compose.c:10016
+#: src/compose.c:10081
 msgid "Discard message"
 msgstr "Interruption de la composition du message"
 
-#: src/compose.c:10017
+#: src/compose.c:10082
 msgid "This message has been modified. Discard it?"
 msgstr "Ce message a été modifié mais non envoyé. Voulez-vous interrompre sa composition ?"
 
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Discard"
 msgstr "_Interrompre"
 
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Save to Drafts"
 msgstr "Enregi_strer un brouillon"
 
-#: src/compose.c:10020
+#: src/compose.c:10085
 msgid "Save changes"
 msgstr "Enregistrer les modifications"
 
-#: src/compose.c:10021
+#: src/compose.c:10086
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Ce message a été modifié. Souhaitez-vous enregistrer les dernières modifications ?"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "_Don't save"
 msgstr "_Ne pas enregistrer"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "+_Save to Drafts"
 msgstr "Enregi_strer un brouillon"
 
-#: src/compose.c:10092
+#: src/compose.c:10157
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Voulez-vous utiliser le modèle « %s » ?"
 
-#: src/compose.c:10094
+#: src/compose.c:10159
 msgid "Apply template"
 msgstr "Utiliser le modèle"
 
-#: src/compose.c:10095
+#: src/compose.c:10160
+#: src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610
+#: src/prefs_filtering.c:477
+#: src/prefs_matcher.c:772
+#: src/prefs_template.c:309
+#: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:10095
+#: src/compose.c:10160
 msgid "_Insert"
 msgstr "_Insérer"
 
-#: src/compose.c:10959
+#: src/compose.c:11024
 msgid "Insert or attach?"
 msgstr "Insérer ou joindre ?"
 
-#: src/compose.c:10960
+#: src/compose.c:11025
 msgid "Do you want to insert the contents of the file(s) into the message body, or attach it to the email?"
 msgstr "Voulez-vous insérer le contenu du(des) fichier(s) directement dans le corps du message ou le(s) joindre en tant que pièce(s) jointe(s) ?"
 
-#: src/compose.c:10962
+#: src/compose.c:11027
 msgid "_Attach"
 msgstr "_Joindre"
 
-#: src/compose.c:11178
+#: src/compose.c:11243
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erreur de formatage de la citation à la ligne %d."
 
-#: src/compose.c:11462
+#: src/compose.c:11527
 #, c-format
 msgid "You are about to reply to %d messages. Opening the windows could take some time. Do you want to continue?"
 msgstr "Vous êtes sur le point de répondre à %d messages et donc par là même d'ouvrir autant de fenêtres de composition. Voulez-vous continuer ?"
@@ -3275,7 +3285,7 @@ msgid "Debug log"
 msgstr "Traces de débogage"
 
 #: src/crash.c:252
-#: src/toolbar.c:420
+#: src/toolbar.c:421
 msgid "Close"
 msgstr "Fermer"
 
@@ -3392,53 +3402,53 @@ msgstr "_Supprimer la photo"
 msgid "Photo"
 msgstr "Photo"
 
-#: src/editaddress.c:959
-#: src/editaddress.c:961
+#: src/editaddress.c:952
+#: src/editaddress.c:954
 #: src/expldifdlg.c:516
 #: src/exporthtml.c:761
 #: src/ldif.c:766
 msgid "Display Name"
 msgstr "Nom affiché"
 
-#: src/editaddress.c:968
-#: src/editaddress.c:972
+#: src/editaddress.c:961
+#: src/editaddress.c:965
 #: src/ldif.c:774
 msgid "Last Name"
 msgstr "Nom"
 
-#: src/editaddress.c:969
-#: src/editaddress.c:971
+#: src/editaddress.c:962
+#: src/editaddress.c:964
 #: src/ldif.c:770
 msgid "First Name"
 msgstr "Prénom"
 
-#: src/editaddress.c:975
-#: src/editaddress.c:977
+#: src/editaddress.c:968
+#: src/editaddress.c:970
 msgid "Nickname"
 msgstr "Surnom"
 
-#: src/editaddress.c:1061
-#: src/editaddress.c:1129
+#: src/editaddress.c:1054
+#: src/editaddress.c:1122
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1271
-#: src/editaddress.c:1340
-#: src/editaddress.c:1360
+#: src/editaddress.c:1264
+#: src/editaddress.c:1333
+#: src/editaddress.c:1353
 #: src/prefs_customheader.c:223
 msgid "Value"
 msgstr "Valeur"
 
-#: src/editaddress.c:1427
+#: src/editaddress.c:1424
 msgid "_User Data"
 msgstr "Nom d'_utilisateur"
 
-#: src/editaddress.c:1428
+#: src/editaddress.c:1425
 msgid "_Email Addresses"
 msgstr "_Adresses Email"
 
+#: src/editaddress.c:1428
 #: src/editaddress.c:1431
-#: src/editaddress.c:1434
 msgid "O_ther Attributes"
 msgstr "Données _supplémentaires"
 
@@ -3472,9 +3482,9 @@ msgstr " Verifier le fichier "
 #: src/editvcard.c:185
 #: src/importmutt.c:232
 #: src/importpine.c:231
-#: src/prefs_account.c:1942
-#: src/wizard.c:1371
-#: src/wizard.c:1650
+#: src/prefs_account.c:1934
+#: src/wizard.c:1183
+#: src/wizard.c:1457
 msgid "File"
 msgstr "Fichier"
 
@@ -3612,7 +3622,7 @@ msgid "Connected successfully to server"
 msgstr "Connexion réussie vers le serveur"
 
 #: src/editldap.c:336
-#: src/editldap.c:980
+#: src/editldap.c:976
 msgid "Edit LDAP Server"
 msgstr "Édition du serveur LDAP"
 
@@ -3629,7 +3639,7 @@ msgid "TLS"
 msgstr "TLS"
 
 #: src/editldap.c:471
-#: src/prefs_account.c:3318
+#: src/prefs_account.c:3310
 msgid "SSL"
 msgstr "SSL"
 
@@ -3722,46 +3732,46 @@ msgstr "Le nom d'utilisateur pour se connecter au serveur LDAP. Ce nom est en g
 msgid "Bind Password"
 msgstr "Mot de passe de connexion"
 
-#: src/editldap.c:733
+#: src/editldap.c:729
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "Le mot de passe de l'utilisateur « Bind DN »."
 
-#: src/editldap.c:738
+#: src/editldap.c:734
 msgid "Timeout (secs)"
 msgstr "Délai d'attente (secs)"
 
-#: src/editldap.c:752
+#: src/editldap.c:748
 msgid "The timeout period in seconds."
 msgstr "Durée maximale d'attente."
 
-#: src/editldap.c:756
+#: src/editldap.c:752
 msgid "Maximum Entries"
 msgstr "Nombre maximal d'entrées"
 
-#: src/editldap.c:770
+#: src/editldap.c:766
 msgid "The maximum number of entries that should be returned in the search result."
 msgstr "Le nombre maximal d'entrées à retourner lors d'une recherche."
 
-#: src/editldap.c:785
-#: src/prefs_account.c:3209
+#: src/editldap.c:781
+#: src/prefs_account.c:3201
 msgid "Basic"
 msgstr "Général"
 
-#: src/editldap.c:786
+#: src/editldap.c:782
 msgid "Search"
 msgstr "Chercher"
 
-#: src/editldap.c:787
-#: src/gtk/quicksearch.c:661
+#: src/editldap.c:783
+#: src/gtk/quicksearch.c:670
 msgid "Extended"
 msgstr "Avancé"
 
-#: src/editldap.c:985
+#: src/editldap.c:981
 msgid "Add New LDAP Server"
 msgstr "Configuration d'un nouveau serveur LDAP"
 
 #: src/edittags.c:187
-#: src/prefs_filtering_action.c:1444
+#: src/prefs_filtering_action.c:1446
 msgid "Tag"
 msgstr "Label"
 
@@ -3781,24 +3791,24 @@ msgstr "Suppression des labels"
 msgid "Do you really want to delete all tags?"
 msgstr "Voulez-vous vraiment supprimer tous les labels ?"
 
-#: src/edittags.c:422
+#: src/edittags.c:415
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr "Vous avez saisi un nom de tag réservé, veuillez en saisir un autre."
 
-#: src/edittags.c:464
+#: src/edittags.c:457
 msgid "Tag is not set."
 msgstr "Le nom du label n'est pas défini."
 
-#: src/edittags.c:529
+#: src/edittags.c:522
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "Appliquer des labels"
 
-#: src/edittags.c:543
+#: src/edittags.c:536
 msgid "New tag:"
 msgstr "Nouveau label :"
 
-#: src/edittags.c:576
+#: src/edittags.c:569
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr ""
 "Veuillez choisir le(s) tag(s) à appliquer/enlever aux messages actuellement\n"
@@ -3895,13 +3905,13 @@ msgstr "Feuille de style"
 #: src/gtk/colorlabel.c:406
 #: src/gtk/gtkaspell.c:1571
 #: src/gtk/gtkaspell.c:2231
-#: src/gtk/menu.c:133
-#: src/mainwindow.c:1175
+#: src/gtk/menu.c:125
+#: src/mainwindow.c:1173
 #: src/plugins/archive/archiver_prefs.c:241
 #: src/prefs_account.c:946
-#: src/prefs_toolbar.c:775
-#: src/prefs_toolbar.c:1456
-#: src/summaryview.c:6010
+#: src/prefs_toolbar.c:780
+#: src/prefs_toolbar.c:1465
+#: src/summaryview.c:6006
 msgid "None"
 msgstr "Aucun"
 
@@ -3913,7 +3923,7 @@ msgid "Default"
 msgstr "Par défaut"
 
 #: src/exphtmldlg.c:455
-#: src/plugins/pgpcore/select-keys.c:248
+#: src/plugins/pgpcore/select-keys.c:244
 #: src/plugins/pgpcore/sgpgme.c:148
 msgid "Full"
 msgstr "Complet"
@@ -4111,7 +4121,7 @@ msgid "Distinguished Name"
 msgstr "Nom absolu (DN)"
 
 #: src/export.c:113
-#: src/summaryview.c:8154
+#: src/summaryview.c:8143
 msgid "Export to mbox file"
 msgstr "Exporter la sélection en fichier mbox"
 
@@ -4178,61 +4188,77 @@ msgstr "Le nom est trop long."
 msgid "Not specified."
 msgstr "Non spécifié."
 
-#: src/folder.c:1571
+#: src/file_checker.c:76
+#, c-format
+msgid "The file %s is missing! Do you want to use the backup file from %s?"
+msgstr "Le fichier %s est manquant ! Voulez-vous utiliser le fichier de sauvegarde du %s ?"
+
+#: src/file_checker.c:84
+#: src/file_checker.c:106
+#, c-format
+msgid "Could not copy %s to %s"
+msgstr "Impossible de copier %s vers %s"
+
+#: src/file_checker.c:98
+#, c-format
+msgid "The file %s is empty or corrupted! Do you want to use the backup file from %s?"
+msgstr "Le fichier %s est vide ou corrompu ! Voulez-vous utiliser le fichier de sauvegarde du %s ?"
+
+#: src/folder.c:1577
 #: src/foldersel.c:374
 #: src/prefs_folder_item.c:308
 msgid "Inbox"
 msgstr "Réception"
 
-#: src/folder.c:1575
+#: src/folder.c:1581
 #: src/foldersel.c:378
 msgid "Sent"
 msgstr "Envoyés"
 
-#: src/folder.c:1579
+#: src/folder.c:1585
 #: src/foldersel.c:382
 #: src/plugins/attachwarner/attachwarner.c:219
 #: src/prefs_folder_item.c:311
 msgid "Queue"
 msgstr "File d'attente"
 
-#: src/folder.c:1583
+#: src/folder.c:1589
 #: src/foldersel.c:386
 #: src/prefs_folder_item.c:312
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/folder.c:1587
+#: src/folder.c:1593
 #: src/foldersel.c:390
 #: src/prefs_folder_item.c:310
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/folder.c:2017
+#: src/folder.c:2023
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Traitement (%s)..\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copie de %s vers %s..\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Déplacement de %s vers %s..\n"
 
-#: src/folder.c:3563
+#: src/folder.c:3569
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Mise à jour du cache pour %s.."
 
-#: src/folder.c:4435
+#: src/folder.c:4443
 msgid "Processing messages..."
 msgstr "Traitement des messages.."
 
-#: src/folder.c:4571
+#: src/folder.c:4579
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchroniser %s pour une utilisation hors-ligne..\n"
@@ -4258,10 +4284,10 @@ msgstr "NouveauDossier"
 #: src/mh_gtk.c:259
 #: src/news_gtk.c:314
 #: src/plugins/mailmbox/plugin_gtk.c:249
-#: src/plugins/mailmbox/plugin_gtk.c:419
+#: src/plugins/mailmbox/plugin_gtk.c:416
 #: src/plugins/rssyl/rssyl_cb_menu.c:97
 #: src/plugins/rssyl/rssyl_cb_menu.c:341
-#: src/plugins/vcalendar/vcal_folder.c:2028
+#: src/plugins/vcalendar/vcal_folder.c:2026
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' n'est pas un caractère valide dans le nom d'un dossier."
@@ -4273,10 +4299,10 @@ msgstr "'%c' n'est pas un caractère valide dans le nom d'un dossier."
 #: src/mh_gtk.c:266
 #: src/news_gtk.c:321
 #: src/plugins/mailmbox/plugin_gtk.c:261
-#: src/plugins/mailmbox/plugin_gtk.c:428
+#: src/plugins/mailmbox/plugin_gtk.c:425
 #: src/plugins/rssyl/rssyl_cb_menu.c:107
 #: src/plugins/rssyl/rssyl_cb_menu.c:348
-#: src/plugins/vcalendar/vcal_folder.c:2035
+#: src/plugins/vcalendar/vcal_folder.c:2033
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Le dossier '%s' existe déjà."
@@ -4320,7 +4346,7 @@ msgstr "_Envoyer les messages.."
 #: src/plugins/notification/notification_lcdproc.c:141
 #: src/prefs_folder_column.c:79
 #: src/prefs_matcher.c:388
-#: src/summaryview.c:6286
+#: src/summaryview.c:6282
 msgid "New"
 msgstr "Nouveau"
 
@@ -4329,7 +4355,7 @@ msgstr "Nouveau"
 #: src/plugins/notification/notification_lcdproc.c:145
 #: src/prefs_folder_column.c:80
 #: src/prefs_matcher.c:387
-#: src/summaryview.c:6288
+#: src/summaryview.c:6284
 msgid "Unread"
 msgstr "Non lu"
 
@@ -4345,127 +4371,127 @@ msgstr "Total"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:734
+#: src/folderview.c:727
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers.."
 
-#: src/folderview.c:797
-#: src/summaryview.c:4113
-#: src/summaryview.c:4115
+#: src/folderview.c:790
+#: src/summaryview.c:4109
+#: src/summaryview.c:4111
 msgid "Mark all as read"
 msgstr "Marquer tous les messages comme lus"
 
-#: src/folderview.c:798
-#: src/summaryview.c:4114
+#: src/folderview.c:791
+#: src/summaryview.c:4110
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Voulez-vous vraiment marquer tous les messages de ce dossier comme lus ?"
 
-#: src/folderview.c:1021
-#: src/imap.c:4490
-#: src/mainwindow.c:5308
+#: src/folderview.c:1014
+#: src/imap.c:4497
+#: src/mainwindow.c:5128
 #: src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Analyse du dossier %s%c%s..."
 
-#: src/folderview.c:1025
-#: src/imap.c:4495
-#: src/mainwindow.c:5313
+#: src/folderview.c:1018
+#: src/imap.c:4502
+#: src/mainwindow.c:5133
 #: src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Analyse du dossier %s..."
 
-#: src/folderview.c:1056
+#: src/folderview.c:1049
 msgid "Rebuild folder tree"
 msgstr "Reconstruction de l'arborescence"
 
-#: src/folderview.c:1057
+#: src/folderview.c:1050
 msgid "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr "La reconstruction de l'arborescence supprimera les caches locaux. Voulez-vous continuer ?"
 
-#: src/folderview.c:1067
+#: src/folderview.c:1060
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence.."
 
-#: src/folderview.c:1069
-#: src/folderview.c:1110
+#: src/folderview.c:1062
+#: src/folderview.c:1103
 msgid "Scanning folder tree..."
 msgstr "Analyse de l'arborescence.."
 
-#: src/folderview.c:1201
+#: src/folderview.c:1194
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Impossible d'ouvrir le dossier '%s'\n"
 
-#: src/folderview.c:1255
+#: src/folderview.c:1248
 msgid "Checking for new messages in all folders..."
 msgstr "Examiner tous les dossiers pour nouveaux messages.."
 
-#: src/folderview.c:2083
+#: src/folderview.c:2076
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Fermeture du dossier %s.."
 
-#: src/folderview.c:2178
+#: src/folderview.c:2171
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Ouverture du dossier %s.."
 
-#: src/folderview.c:2196
+#: src/folderview.c:2189
 msgid "Folder could not be opened."
 msgstr "Le dossier n'a pu être ouvert."
 
-#: src/folderview.c:2337
-#: src/mainwindow.c:3059
-#: src/mainwindow.c:3063
+#: src/folderview.c:2330
+#: src/mainwindow.c:2877
+#: src/mainwindow.c:2881
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2331
 msgid "Delete all messages in trash?"
 msgstr "Voulez-vous vraiment supprimer tous les messages de la corbeille ?"
 
-#: src/folderview.c:2339
+#: src/folderview.c:2332
 msgid "+_Empty trash"
 msgstr "+_Vider"
 
-#: src/folderview.c:2383
-#: src/inc.c:1620
-#: src/toolbar.c:2689
+#: src/folderview.c:2376
+#: src/inc.c:1538
+#: src/toolbar.c:2678
 msgid "Offline warning"
 msgstr "Travail hors-ligne"
 
-#: src/folderview.c:2384
-#: src/toolbar.c:2690
+#: src/folderview.c:2377
+#: src/toolbar.c:2679
 msgid "You're working offline. Override?"
 msgstr "Attention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer l'avertissement ?"
 
-#: src/folderview.c:2395
-#: src/toolbar.c:2709
+#: src/folderview.c:2388
+#: src/toolbar.c:2698
 msgid "Send queued messages"
 msgstr "Envoyer les messages en file d'attente"
 
-#: src/folderview.c:2396
-#: src/toolbar.c:2710
+#: src/folderview.c:2389
+#: src/toolbar.c:2699
 msgid "Send all queued messages?"
 msgstr "Voulez-vous envoyer l'ensemble des messages en file d'attente ?"
 
-#: src/folderview.c:2397
-#: src/messageview.c:875
-#: src/messageview.c:892
-#: src/toolbar.c:2711
+#: src/folderview.c:2390
+#: src/messageview.c:853
+#: src/messageview.c:870
+#: src/toolbar.c:2700
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: src/folderview.c:2405
-#: src/toolbar.c:2729
+#: src/folderview.c:2398
+#: src/toolbar.c:2718
 msgid "Some errors occurred while sending queued messages."
 msgstr "Une erreur est survenue pendant l'envoi de messages en attente."
 
-#: src/folderview.c:2408
-#: src/main.c:2862
-#: src/toolbar.c:2732
+#: src/folderview.c:2401
+#: src/main.c:2689
+#: src/toolbar.c:2721
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4474,66 +4500,66 @@ msgstr ""
 "Une erreur est survenue pendant l'envoi de messages en attente :\n"
 "%s"
 
-#: src/folderview.c:2485
+#: src/folderview.c:2478
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Voulez-vous vraiment copier le dossier '%s' dans '%s' ?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2479
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Voulez-vous vraiment faire du dossier '%s' un sous-dossier de '%s' ?"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Copy folder"
 msgstr "Copie du dossier"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Move folder"
 msgstr "Déplacement du dossier"
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copie de %s vers %s.."
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Déplacement de %s vers %s.."
 
-#: src/folderview.c:2530
+#: src/folderview.c:2523
 msgid "Source and destination are the same."
 msgstr "Source et destination identiques."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2526
 msgid "Can't copy a folder to one of its children."
 msgstr "Il n'est pas possible de copier un dossier vers un de ses SOUS-DOSSIERS."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2527
 msgid "Can't move a folder to one of its children."
 msgstr "Il n'est pas possible de déplacer un dossier vers un de ses SOUS-DOSSIERS."
 
-#: src/folderview.c:2537
+#: src/folderview.c:2530
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Un dossier ne peut être déplacé à travers différentes boîtes aux lettres."
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Copy failed!"
 msgstr "La copie a échoué."
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Move failed!"
 msgstr "Le déplacement a échoué."
 
-#: src/folderview.c:2591
+#: src/folderview.c:2584
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Options de filtrage/traitement du dossier %s"
 
-#: src/folderview.c:3018
-#: src/summaryview.c:4554
-#: src/summaryview.c:4653
+#: src/folderview.c:3011
+#: src/summaryview.c:4550
+#: src/summaryview.c:4649
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Le dossier de destination ne peut être utilisé seulement pour stocker des sous-dossiers."
 
@@ -4687,7 +4713,7 @@ msgstr ""
 
 #: src/gtk/about.c:243
 #: src/prefs_themes.c:728
-#: src/wizard.c:545
+#: src/wizard.c:523
 msgid "The Claws Mail Team"
 msgstr "L'équipe de Claws Mail"
 
@@ -4800,54 +4826,54 @@ msgstr ""
 "\n"
 
 #: src/gtk/about.c:699
-#: src/main.c:2689
+#: src/main.c:2516
 msgid "Session statistics\n"
 msgstr "Statistiques de la session\n"
 
 #: src/gtk/about.c:709
 #: src/gtk/about.c:712
-#: src/main.c:2699
-#: src/main.c:2702
+#: src/main.c:2526
+#: src/main.c:2529
 #, c-format
 msgid "Started: %s\n"
 msgstr "Démarrée le : %s\n"
 
 #: src/gtk/about.c:719
-#: src/main.c:2708
+#: src/main.c:2535
 msgid "Incoming traffic\n"
 msgstr "Trafic entrant\n"
 
 #: src/gtk/about.c:722
-#: src/main.c:2711
+#: src/main.c:2538
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Messages reçus: %d\n"
 
 #: src/gtk/about.c:729
-#: src/main.c:2717
+#: src/main.c:2544
 msgid "Outgoing traffic\n"
 msgstr "Trafic sortant\n"
 
 #: src/gtk/about.c:732
-#: src/main.c:2720
+#: src/main.c:2547
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nouveaux messages et redirections: %d\n"
 
 #: src/gtk/about.c:737
-#: src/main.c:2724
+#: src/main.c:2551
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Réponses: %d\n"
 
 #: src/gtk/about.c:742
-#: src/main.c:2728
+#: src/main.c:2555
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Messages transférés: %d\n"
 
 #: src/gtk/about.c:747
-#: src/main.c:2732
+#: src/main.c:2559
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total des messages sortants: %d\n"
@@ -4891,77 +4917,77 @@ msgid "_Statistics"
 msgstr "_Statistiques"
 
 #: src/gtk/colorlabel.c:38
-#: src/prefs_common.c:368
+#: src/prefs_common.c:358
 msgid "Orange"
 msgstr "Orange"
 
 #: src/gtk/colorlabel.c:39
-#: src/prefs_common.c:372
+#: src/prefs_common.c:362
 msgid "Red"
 msgstr "Rouge"
 
 #: src/gtk/colorlabel.c:40
-#: src/prefs_common.c:376
+#: src/prefs_common.c:366
 msgid "Pink"
 msgstr "Rose"
 
 #: src/gtk/colorlabel.c:41
-#: src/prefs_common.c:380
+#: src/prefs_common.c:370
 msgid "Sky blue"
 msgstr "Bleu ciel"
 
 #: src/gtk/colorlabel.c:42
-#: src/prefs_common.c:384
+#: src/prefs_common.c:374
 msgid "Blue"
 msgstr "Bleu"
 
 #: src/gtk/colorlabel.c:43
-#: src/prefs_common.c:388
+#: src/prefs_common.c:378
 msgid "Green"
 msgstr "Vert"
 
 #: src/gtk/colorlabel.c:44
-#: src/prefs_common.c:392
+#: src/prefs_common.c:382
 msgid "Brown"
 msgstr "Brun"
 
 #: src/gtk/colorlabel.c:45
-#: src/prefs_common.c:396
+#: src/prefs_common.c:386
 msgid "Grey"
 msgstr "Gris"
 
 #: src/gtk/colorlabel.c:46
-#: src/prefs_common.c:400
+#: src/prefs_common.c:390
 msgid "Light brown"
 msgstr "Marron clair"
 
 #: src/gtk/colorlabel.c:47
-#: src/prefs_common.c:404
+#: src/prefs_common.c:394
 msgid "Dark red"
 msgstr "Rouge foncé"
 
 #: src/gtk/colorlabel.c:48
-#: src/prefs_common.c:408
+#: src/prefs_common.c:398
 msgid "Dark pink"
 msgstr "Rose foncé"
 
 #: src/gtk/colorlabel.c:49
-#: src/prefs_common.c:412
+#: src/prefs_common.c:402
 msgid "Steel blue"
 msgstr "Bleu acier"
 
 #: src/gtk/colorlabel.c:50
-#: src/prefs_common.c:416
+#: src/prefs_common.c:406
 msgid "Gold"
 msgstr "Or"
 
 #: src/gtk/colorlabel.c:51
-#: src/prefs_common.c:420
+#: src/prefs_common.c:410
 msgid "Bright green"
 msgstr "Vert clair"
 
 #: src/gtk/colorlabel.c:52
-#: src/prefs_common.c:424
+#: src/prefs_common.c:414
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -5091,8 +5117,8 @@ msgstr ""
 "%s"
 
 #: src/gtk/headers.h:8
-#: src/prefs_filtering_action.c:1257
-#: src/prefs_matcher.c:2152
+#: src/prefs_filtering_action.c:1259
+#: src/prefs_matcher.c:2158
 #: src/prefs_summary_column.c:84
 #: src/quote_fmt.c:49
 #: src/summaryview.c:446
@@ -5104,8 +5130,8 @@ msgid "Date:"
 msgstr "Date :"
 
 #: src/gtk/headers.h:9
-#: src/prefs_filtering_action.c:1254
-#: src/prefs_matcher.c:2149
+#: src/prefs_filtering_action.c:1256
+#: src/prefs_matcher.c:2155
 #: src/prefs_summary_column.c:82
 #: src/quote_fmt.c:50
 #: src/summaryview.c:444
@@ -5113,7 +5139,7 @@ msgid "From"
 msgstr "De"
 
 #: src/gtk/headers.h:9
-#: src/summary_search.c:412
+#: src/summary_search.c:438
 msgid "From:"
 msgstr "De :"
 
@@ -5130,8 +5156,8 @@ msgid "Reply-To"
 msgstr "Répondre à"
 
 #: src/gtk/headers.h:12
-#: src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2150
+#: src/prefs_filtering_action.c:1257
+#: src/prefs_matcher.c:2156
 #: src/prefs_summary_column.c:83
 #: src/quote_fmt.c:57
 #: src/summaryview.c:445
@@ -5139,8 +5165,8 @@ msgid "To"
 msgstr "À"
 
 #: src/gtk/headers.h:13
-#: src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2151
+#: src/prefs_filtering_action.c:1258
+#: src/prefs_matcher.c:2157
 #: src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
@@ -5150,8 +5176,8 @@ msgid "Bcc"
 msgstr "Cci"
 
 #: src/gtk/headers.h:15
-#: src/prefs_filtering_action.c:1258
-#: src/prefs_matcher.c:2153
+#: src/prefs_filtering_action.c:1260
+#: src/prefs_matcher.c:2159
 #: src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Identifiant du message"
@@ -5165,8 +5191,8 @@ msgid "In-Reply-To"
 msgstr "En réponse à"
 
 #: src/gtk/headers.h:17
-#: src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2155
+#: src/prefs_filtering_action.c:1262
+#: src/prefs_matcher.c:2161
 #: src/quote_fmt.c:60
 msgid "References"
 msgstr "Références"
@@ -5176,8 +5202,8 @@ msgid "References:"
 msgstr "Références:"
 
 #: src/gtk/headers.h:18
-#: src/prefs_filtering_action.c:1253
-#: src/prefs_matcher.c:2148
+#: src/prefs_filtering_action.c:1255
+#: src/prefs_matcher.c:2154
 #: src/prefs_summary_column.c:81
 #: src/quote_fmt.c:56
 #: src/summaryview.c:443
@@ -5274,8 +5300,8 @@ msgid "Received:"
 msgstr "Reçu :"
 
 #: src/gtk/headers.h:32
-#: src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2154
+#: src/prefs_filtering_action.c:1261
+#: src/prefs_matcher.c:2160
 #: src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Groupe de discussion"
@@ -5599,45 +5625,45 @@ msgstr "Légende des icônes"
 msgid "<span weight=\"bold\">The following icons are used to show the status of messages and folders:</span>"
 msgstr "<span weight=\"bold\">Les icônes suivantes décrivent l'état des messages et des dossiers :</span>"
 
-#: src/gtk/inputdialog.c:246
-#: src/gtk/inputdialog.c:268
+#: src/gtk/inputdialog.c:233
+#: src/gtk/inputdialog.c:255
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Veuillez saisir le mot de passe du compte %s sur le serveur %s :"
 
-#: src/gtk/inputdialog.c:249
-#: src/gtk/inputdialog.c:252
-#: src/gtk/inputdialog.c:271
-#: src/gtk/inputdialog.c:274
+#: src/gtk/inputdialog.c:236
+#: src/gtk/inputdialog.c:239
+#: src/gtk/inputdialog.c:258
+#: src/gtk/inputdialog.c:261
 #, c-format
 msgid "Input password for %s:"
 msgstr "Saisie du mot de passe pour %s :"
 
-#: src/gtk/inputdialog.c:255
-#: src/gtk/inputdialog.c:277
+#: src/gtk/inputdialog.c:242
+#: src/gtk/inputdialog.c:264
 msgid "Input password:"
 msgstr "Saisie du mot de passe :"
 
-#: src/gtk/inputdialog.c:256
-#: src/gtk/inputdialog.c:284
-#: src/gtk/inputdialog.c:296
+#: src/gtk/inputdialog.c:243
+#: src/gtk/inputdialog.c:271
+#: src/gtk/inputdialog.c:283
 msgid "Input password"
 msgstr "Saisie du mot de passe"
 
-#: src/gtk/inputdialog.c:286
+#: src/gtk/inputdialog.c:273
 msgid "Remember password for this session"
 msgstr "Retenir le mot de passe pour cette session"
 
-#: src/gtk/inputdialog.c:385
-#: src/gtk/inputdialog.c:434
+#: src/gtk/inputdialog.c:372
+#: src/gtk/inputdialog.c:421
 msgid "Remember this"
 msgstr "S'en souvenir"
 
-#: src/gtk/logwindow.c:451
+#: src/gtk/logwindow.c:447
 msgid "Clear _Log"
 msgstr "_Effacer les traces"
 
-#: src/gtk/menu.c:145
+#: src/gtk/menu.c:137
 msgid ""
 "<span><b>Warning:</b> This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -5684,8 +5710,7 @@ msgstr ""
 #: src/gtk/pluginwindow.c:304
 #: src/plugins/acpi_notifier/acpi_notifier.c:790
 #: src/plugins/archive/archiver_prefs.c:92
-#: src/plugins/att_remover/att_remover.c:519
-#: src/plugins/attachwarner/attachwarner_prefs.c:201
+#: src/plugins/attachwarner/attachwarner_prefs.c:228
 #: src/plugins/address_keeper/address_keeper_prefs.c:248
 #: src/plugins/bogofilter/bogofilter_gtk.c:457
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
@@ -5705,8 +5730,8 @@ msgstr ""
 #: src/plugins/rssyl/rssyl_prefs.c:63
 #: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:648
-#: src/plugins/vcalendar/vcal_prefs.c:645
-#: src/prefs_toolbar.c:939
+#: src/plugins/vcalendar/vcal_prefs.c:647
+#: src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Modules"
 
@@ -5723,248 +5748,244 @@ msgstr "Enlever"
 msgid "Description"
 msgstr "Description"
 
-#: src/gtk/pluginwindow.c:373
-msgid "More plugins are available from the Claws Mail website."
-msgstr "Plus de modules sont disponibles depuis le site internet de Claws Mail."
-
-#: src/gtk/pluginwindow.c:379
-#: src/prefs_themes.c:843
-msgid "Get more..."
-msgstr "Autres.."
+#: src/gtk/pluginwindow.c:374
+#, c-format
+msgid "For more information about plugins see the <a href=\"%s\"><span underline=\"none\">Claws Mail website</span></a>."
+msgstr "Pour plus d'informations au sujet des modules, voir <a href=\"%s\"><span underline=\"none\">le site web de Claws Mail</span></a>."
 
-#: src/gtk/pluginwindow.c:415
+#: src/gtk/pluginwindow.c:414
 msgid "Click here to load one or more plugins"
 msgstr "Cliquez ici pour charger un ou plusieurs modules"
 
-#: src/gtk/pluginwindow.c:418
+#: src/gtk/pluginwindow.c:417
 msgid "Unload the selected plugin"
 msgstr "Enlever le module sélectionné"
 
-#: src/gtk/pluginwindow.c:483
+#: src/gtk/pluginwindow.c:482
 msgid "Loaded plugins"
 msgstr "Modules chargés"
 
-#: src/gtk/prefswindow.c:679
+#: src/gtk/prefswindow.c:671
 msgid "Page Index"
 msgstr "Préférences"
 
 #: src/gtk/progressdialog.c:91
-#: src/mainwindow.c:830
+#: src/mainwindow.c:828
 msgid "_Hide"
 msgstr "_Pas de barre d'outils"
 
 #: src/gtk/progressdialog.c:141
-#: src/prefs_account.c:3208
-#: src/prefs_account.c:3226
-#: src/prefs_account.c:3244
-#: src/prefs_account.c:3262
-#: src/prefs_account.c:3280
-#: src/prefs_account.c:3298
-#: src/prefs_account.c:3317
+#: src/prefs_account.c:3200
+#: src/prefs_account.c:3218
+#: src/prefs_account.c:3236
+#: src/prefs_account.c:3254
+#: src/prefs_account.c:3272
+#: src/prefs_account.c:3290
+#: src/prefs_account.c:3309
 #: src/prefs_account.c:3399
-#: src/prefs_filtering_action.c:1419
+#: src/prefs_filtering_action.c:1421
 #: src/prefs_filtering.c:397
-#: src/prefs_filtering.c:1881
+#: src/prefs_filtering.c:1877
 msgid "Account"
 msgstr "Compte"
 
-#: src/gtk/quicksearch.c:433
+#: src/gtk/quicksearch.c:442
 msgid "all messages"
 msgstr "tous les messages"
 
-#: src/gtk/quicksearch.c:434
+#: src/gtk/quicksearch.c:443
 msgid "messages whose age is greater than # days"
 msgstr "messages âgés de plus de # jours"
 
-#: src/gtk/quicksearch.c:435
+#: src/gtk/quicksearch.c:444
 msgid "messages whose age is less than # days"
 msgstr "messages agés de moins de # jours"
 
-#: src/gtk/quicksearch.c:436
+#: src/gtk/quicksearch.c:445
 msgid "messages whose age is greater than # hours"
 msgstr "messages âgés de plus de # heures"
 
-#: src/gtk/quicksearch.c:437
+#: src/gtk/quicksearch.c:446
 msgid "messages whose age is less than # hours"
 msgstr "messages agés de moins de # heures"
 
-#: src/gtk/quicksearch.c:438
+#: src/gtk/quicksearch.c:447
 msgid "messages which contain S in the message body"
 msgstr "messages contenant S dans leur corps"
 
-#: src/gtk/quicksearch.c:439
+#: src/gtk/quicksearch.c:448
 msgid "messages which contain S in the whole message"
 msgstr "message contenant S"
 
-#: src/gtk/quicksearch.c:440
+#: src/gtk/quicksearch.c:449
 msgid "messages carbon-copied to S"
 msgstr "messages contenant S dans l'en-tête « Cc: »"
 
-#: src/gtk/quicksearch.c:441
+#: src/gtk/quicksearch.c:450
 msgid "message is either to: or cc: to S"
 msgstr "messages contenant S dans les en-têtes « À: » ou « Cc: »"
 
-#: src/gtk/quicksearch.c:442
+#: src/gtk/quicksearch.c:451
 msgid "deleted messages"
 msgstr "messages supprimés"
 
-#: src/gtk/quicksearch.c:443
+#: src/gtk/quicksearch.c:452
 msgid "messages which contain S in the Sender field"
 msgstr "messages contenant S dans l'en-tête d'expéditeur (en-tête « Sender: »)"
 
-#: src/gtk/quicksearch.c:444
+#: src/gtk/quicksearch.c:453
 msgid "true if execute \"S\" succeeds"
 msgstr "vrai si l'éxecution de « S » réussi"
 
-#: src/gtk/quicksearch.c:445
+#: src/gtk/quicksearch.c:454
 msgid "messages originating from user S"
 msgstr "messages venant de l'expéditeur S"
 
-#: src/gtk/quicksearch.c:446
+#: src/gtk/quicksearch.c:455
 msgid "forwarded messages"
 msgstr "messages transférés"
 
-#: src/gtk/quicksearch.c:447
+#: src/gtk/quicksearch.c:456
 msgid "messages which have attachments"
 msgstr "messages avec pièces jointes"
 
-#: src/gtk/quicksearch.c:448
+#: src/gtk/quicksearch.c:457
 msgid "messages which contain header S"
 msgstr "messages contenant l'en-tête S"
 
-#: src/gtk/quicksearch.c:449
+#: src/gtk/quicksearch.c:458
 msgid "messages which contain S in Message-ID header"
 msgstr "messages contenant S dans l'en-tête « Message-Id: »"
 
-#: src/gtk/quicksearch.c:450
+#: src/gtk/quicksearch.c:459
 msgid "messages which contain S in In-Reply-To header"
 msgstr "messages contenant S dans l'en-tête « In-Reply-To: »"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:460
 msgid "messages which are marked with color #"
 msgstr "messages marqués de la couleur n°#"
 
-#: src/gtk/quicksearch.c:452
+#: src/gtk/quicksearch.c:461
 msgid "locked messages"
 msgstr "messages bloqués"
 
-#: src/gtk/quicksearch.c:453
+#: src/gtk/quicksearch.c:462
 msgid "messages which are in newsgroup S"
 msgstr "messages appartenant au groupe de discussion S"
 
-#: src/gtk/quicksearch.c:454
+#: src/gtk/quicksearch.c:463
 msgid "new messages"
 msgstr "nouveaux messages"
 
-#: src/gtk/quicksearch.c:455
+#: src/gtk/quicksearch.c:464
 msgid "old messages"
 msgstr "messages anciens"
 
-#: src/gtk/quicksearch.c:456
+#: src/gtk/quicksearch.c:465
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "messages incomplets (partiellement téléchargés)"
 
-#: src/gtk/quicksearch.c:457
+#: src/gtk/quicksearch.c:466
 msgid "messages which have been replied to"
 msgstr "messages pour lesquels une réponse a été envoyée"
 
-#: src/gtk/quicksearch.c:458
+#: src/gtk/quicksearch.c:467
 msgid "read messages"
 msgstr "messages lus"
 
-#: src/gtk/quicksearch.c:459
+#: src/gtk/quicksearch.c:468
 msgid "messages which contain S in subject"
 msgstr "messages contenant S dans le sujet"
 
-#: src/gtk/quicksearch.c:460
+#: src/gtk/quicksearch.c:469
 msgid "messages whose score is equal to # points"
 msgstr "messages dont le score est égal à # points"
 
-#: src/gtk/quicksearch.c:461
+#: src/gtk/quicksearch.c:470
 msgid "messages whose score is greater than # points"
 msgstr "messages dont le score est plus grand que # points"
 
-#: src/gtk/quicksearch.c:462
+#: src/gtk/quicksearch.c:471
 msgid "messages whose score is lower than # points"
 msgstr "messages dont le score est plus petit que # points"
 
-#: src/gtk/quicksearch.c:463
+#: src/gtk/quicksearch.c:472
 msgid "messages whose size is equal to # bytes"
 msgstr "messages dont la taille est égale à # octets"
 
-#: src/gtk/quicksearch.c:464
+#: src/gtk/quicksearch.c:473
 msgid "messages whose size is greater than # bytes"
 msgstr "messages dont la taille est plus grande que # octets"
 
-#: src/gtk/quicksearch.c:465
+#: src/gtk/quicksearch.c:474
 msgid "messages whose size is smaller than # bytes"
 msgstr "messages dont la taille est plus petite que # octets"
 
-#: src/gtk/quicksearch.c:466
+#: src/gtk/quicksearch.c:475
 msgid "messages which have been sent to S"
 msgstr "messages qui ont été envoyés à S"
 
-#: src/gtk/quicksearch.c:467
+#: src/gtk/quicksearch.c:476
 msgid "messages which tags contain S"
 msgstr "messages dont les labels contiennent S"
 
-#: src/gtk/quicksearch.c:468
+#: src/gtk/quicksearch.c:477
 msgid "messages which have tag(s)"
 msgstr "messages labellisés"
 
-#: src/gtk/quicksearch.c:469
+#: src/gtk/quicksearch.c:478
 msgid "marked messages"
 msgstr "messages marqués"
 
-#: src/gtk/quicksearch.c:470
+#: src/gtk/quicksearch.c:479
 msgid "unread messages"
 msgstr "messages non lus"
 
-#: src/gtk/quicksearch.c:471
+#: src/gtk/quicksearch.c:480
 msgid "messages which contain S in References header"
 msgstr "messages contenant S dans l'en-tête « References: »"
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:481
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "messages qui, passés à la commande « cmd », lui font faire\n"
 "retourner 0 (%F étant le fichier correspondant au message)."
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:482
 msgid "messages which contain S in X-Label header"
 msgstr "messages contenant S dans l'en-tête « X-Label: »"
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:484
 msgid "logical AND operator"
 msgstr "opérateur logique ET"
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:485
 msgid "logical OR operator"
 msgstr "opérateur logique OU"
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:486
 msgid "logical NOT operator"
 msgstr "opérateur logique NON"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:487
 msgid "case sensitive search"
 msgstr "recherche sensible à la casse"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:488
 msgid "match using regular expressions instead of substring search"
 msgstr "correspondance à l'aide d'expressions régulières au lieu de recherche de sous-chaînes"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:490
 msgid "all filtering expressions are allowed"
 msgstr "L'ensemble des conditions de filtrage est utilisable."
 
-#: src/gtk/quicksearch.c:490
-#: src/summary_search.c:457
+#: src/gtk/quicksearch.c:499
+#: src/summary_search.c:483
 msgid "Extended Search"
 msgstr "Recherche avancée"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:500
 msgid ""
 "Extended Search allows the user to define criteria that messages must have in order to match and be displayed in the message list.\n"
 "The following symbols can be used:"
@@ -5972,51 +5993,59 @@ msgstr ""
 "La recherche avancée permet à l'utilisateur de définir des critères de recherche précis en vue de restreindre la liste d'affichage aux messages répondant à ces critères.\n"
 "Il est possible d'utiliser les symboles suivants :"
 
-#: src/gtk/quicksearch.c:591
+#: src/gtk/quicksearch.c:600
 msgid "Something went wrong during search. Please check your logs."
 msgstr "La recherche a échoué. Consultez les traces d'activités."
 
-#: src/gtk/quicksearch.c:657
+#: src/gtk/quicksearch.c:666
 msgid "From/To/Subject/Tag"
 msgstr "De/À/Sujet/Label"
 
-#: src/gtk/quicksearch.c:668
+#: src/gtk/quicksearch.c:677
 #: src/plugins/archive/archiver_prefs.c:322
 msgid "Recursive"
 msgstr "Récursif"
 
-#: src/gtk/quicksearch.c:677
+#: src/gtk/quicksearch.c:686
 msgid "Sticky"
 msgstr "Permanent"
 
-#: src/gtk/quicksearch.c:687
+#: src/gtk/quicksearch.c:696
 msgid "Type-ahead"
 msgstr "Dynamique"
 
-#: src/gtk/quicksearch.c:699
+#: src/gtk/quicksearch.c:708
 msgid "Run on select"
 msgstr "Sélection validante"
 
-#: src/gtk/quicksearch.c:741
+#: src/gtk/quicksearch.c:750
 msgid "Clear the current search"
 msgstr "Effacement de la recherche courante"
 
-#: src/gtk/quicksearch.c:751
-#: src/summary_search.c:410
+#: src/gtk/quicksearch.c:760
+#: src/summary_search.c:436
 msgid "Edit search criteria"
 msgstr "Édition des critères de recherche"
 
-#: src/gtk/quicksearch.c:760
+#: src/gtk/quicksearch.c:769
 msgid "Information about extended symbols"
 msgstr "Informations sur la syntaxe avancée"
 
-#: src/gtk/quicksearch.c:798
-#: src/gtk/quicksearch.c:813
+#: src/gtk/quicksearch.c:807
+#: src/gtk/quicksearch.c:822
 msgid "_Information"
 msgstr "_Information"
 
-#: src/gtk/quicksearch.c:800
-#: src/gtk/quicksearch.c:815
+#: src/gtk/quicksearch.c:808
+#: src/gtk/quicksearch.c:823
+msgid "E_dit"
+msgstr "E_dition"
+
+#: src/gtk/quicksearch.c:809
+#: src/gtk/quicksearch.c:824
+#: src/prefs_actions.c:347
+#: src/prefs_filtering.c:495
+#: src/prefs_template.c:328
 msgid "C_lear"
 msgstr "_Effacer"
 
@@ -6197,7 +6226,7 @@ msgid "Error:"
 msgstr "Erreur : "
 
 #: src/image_viewer.c:299
-#: src/mimeview.c:2578
+#: src/mimeview.c:2546
 #: src/plugins/pdf_viewer/poppler_viewer.c:700
 msgid "Filename:"
 msgstr "Nom du fichier :"
@@ -6466,25 +6495,25 @@ msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexion IMAP4 vers %s a été coupée. Reconnexion..\n"
 
 #: src/imap.c:992
-#: src/imap.c:3539
-#: src/imap.c:4199
-#: src/imap.c:4296
-#: src/imap.c:4479
-#: src/imap.c:5276
+#: src/imap.c:3546
+#: src/imap.c:4206
+#: src/imap.c:4303
+#: src/imap.c:4486
+#: src/imap.c:5283
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail nécessite un accès réseau pour accéder au serveur IMAP."
 
 #: src/imap.c:1086
-#: src/inc.c:816
-#: src/news.c:394
-#: src/send_message.c:308
+#: src/inc.c:814
+#: src/news.c:388
+#: src/send_message.c:269
 msgid "Insecure connection"
 msgstr "Connexion non sécurisée"
 
 #: src/imap.c:1087
-#: src/inc.c:817
-#: src/news.c:395
-#: src/send_message.c:309
+#: src/inc.c:815
+#: src/news.c:389
+#: src/send_message.c:270
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not available in this build of Claws Mail. \n"
 "\n"
@@ -6495,9 +6524,9 @@ msgstr ""
 "Comme la communication ne peut pas être sécurisée, voulez-vous quand même poursuivre la connexion à ce serveur ?"
 
 #: src/imap.c:1093
-#: src/inc.c:823
-#: src/news.c:401
-#: src/send_message.c:315
+#: src/inc.c:821
+#: src/news.c:395
+#: src/send_message.c:276
 msgid "Con_tinue connecting"
 msgstr "_Poursuivre la connexion"
 
@@ -6517,109 +6546,109 @@ msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur IMAP4 : %s:%d\n"
 
 #: src/imap.c:1187
-#: src/imap.c:3961
+#: src/imap.c:3968
 msgid "Can't start TLS session.\n"
 msgstr "Impossible d'initier la session TLS.\n"
 
-#: src/imap.c:1243
+#: src/imap.c:1250
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Connexion impossible au serveur IMAP %s.\n"
 
-#: src/imap.c:1246
+#: src/imap.c:1253
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Authentification impossible au serveur IMAP %s."
 
-#: src/imap.c:1640
+#: src/imap.c:1647
 msgid "Adding messages..."
 msgstr "Ajout des messages en cours.."
 
-#: src/imap.c:1842
+#: src/imap.c:1849
 #: src/mh.c:520
 msgid "Copying messages..."
 msgstr "Copie des messages en cours.."
 
-#: src/imap.c:2421
+#: src/imap.c:2428
 msgid "can't set deleted flags\n"
 msgstr "Impossible de marquer pour la suppression\n"
 
-#: src/imap.c:2428
-#: src/imap.c:4906
+#: src/imap.c:2435
+#: src/imap.c:4913
 msgid "can't expunge\n"
 msgstr "Impossible de purger\n"
 
-#: src/imap.c:2779
+#: src/imap.c:2786
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Recherche des dossiers non inscrits dans %s.."
 
-#: src/imap.c:2782
+#: src/imap.c:2789
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Recherche des sous-dossiers de %s.."
 
-#: src/imap.c:3078
+#: src/imap.c:3085
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Impossible de créer la boîte aux lettres : LIST échoué.\n"
 
-#: src/imap.c:3093
+#: src/imap.c:3100
 msgid "can't create mailbox\n"
 msgstr "Impossible de créer la boîte aux lettres\n"
 
-#: src/imap.c:3184
+#: src/imap.c:3191
 msgid "New folder name must not contain the namespace path separator"
 msgstr "Le nouveau nom de dossier ne doit pas contenir le séparateur de chemin."
 
-#: src/imap.c:3221
+#: src/imap.c:3228
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "Impossible de renommer la boîte aux lettres %s en %s.\n"
 
-#: src/imap.c:3333
+#: src/imap.c:3340
 msgid "can't delete mailbox\n"
 msgstr "Impossible de supprimer la boîte aux lettres.\n"
 
-#: src/imap.c:3620
+#: src/imap.c:3627
 msgid "LIST failed\n"
 msgstr "commande LIST échouée\n"
 
-#: src/imap.c:3705
+#: src/imap.c:3712
 msgid "Flagging messages..."
 msgstr "Marquage des messages en cours.."
 
-#: src/imap.c:3806
+#: src/imap.c:3813
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Impossible de sélectionner le dossier : %s.\n"
 
-#: src/imap.c:3958
+#: src/imap.c:3965
 msgid "Server requires TLS to log in.\n"
 msgstr "Le serveur nécessite TLS pour s'y connecter.\n"
 
-#: src/imap.c:3968
+#: src/imap.c:3975
 msgid "Can't refresh capabilities.\n"
 msgstr "Impossible de rafraîchir la liste des facilités IMAP.\n"
 
-#: src/imap.c:3973
+#: src/imap.c:3980
 #, c-format
 msgid "Connection to %s failed: server requires TLS, but Claws Mail has been compiled without OpenSSL support.\n"
 msgstr "La connection vers %s a échoué : le serveur nécessite TLS, mais Claws Mail a été compilé sans le support OpenSSL.\n"
 
-#: src/imap.c:3981
+#: src/imap.c:3988
 msgid "Server logins are disabled.\n"
 msgstr "Les connections au serveur sont désactivées.\n"
 
-#: src/imap.c:4204
+#: src/imap.c:4211
 msgid "Fetching message..."
 msgstr "Lecture du message en cours.."
 
-#: src/imap.c:4899
+#: src/imap.c:4906
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Impossible de marquer pour la suppression : %d.\n"
 
-#: src/imap.c:5932
+#: src/imap.c:5939
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws Mail has been built without IMAP support; your IMAP account(s) are disabled.\n"
 "\n"
@@ -6725,27 +6754,27 @@ msgstr "Hériter des options du dossier parent"
 #: src/imap_gtk.c:261
 #: src/mh_gtk.c:249
 #: src/news_gtk.c:305
-#: src/plugins/mailmbox/plugin_gtk.c:408
+#: src/plugins/mailmbox/plugin_gtk.c:405
 #: src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/vcalendar/vcal_folder.c:2020
+#: src/plugins/vcalendar/vcal_folder.c:2018
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Veuillez saisir le nouveau nom pour '%s' :"
 
 #: src/imap_gtk.c:263
 #: src/mh_gtk.c:251
-#: src/plugins/mailmbox/plugin_gtk.c:409
+#: src/plugins/mailmbox/plugin_gtk.c:406
 #: src/plugins/rssyl/rssyl_cb_menu.c:334
-#: src/plugins/vcalendar/vcal_folder.c:2021
+#: src/plugins/vcalendar/vcal_folder.c:2019
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
 #: src/imap_gtk.c:292
 #: src/mh_gtk.c:274
 #: src/news_gtk.c:327
-#: src/plugins/mailmbox/plugin_gtk.c:438
+#: src/plugins/mailmbox/plugin_gtk.c:433
 #: src/plugins/rssyl/rssyl_cb_menu.c:354
-#: src/plugins/vcalendar/vcal_folder.c:2041
+#: src/plugins/vcalendar/vcal_folder.c:2039
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6769,9 +6798,9 @@ msgstr ""
 #: src/imap_gtk.c:381
 #: src/mh_gtk.c:220
 #: src/news_gtk.c:280
-#: src/plugins/mailmbox/plugin_gtk.c:343
+#: src/plugins/mailmbox/plugin_gtk.c:341
 #: src/plugins/rssyl/rssyl_cb_menu.c:256
-#: src/plugins/vcalendar/vcal_folder.c:1974
+#: src/plugins/vcalendar/vcal_folder.c:1972
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossible de supprimer le dossier '%s'."
@@ -7015,150 +7044,150 @@ msgstr "Sélection d'un carnet d'adresses Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Importation d'un carnet d'adresses Pine"
 
-#: src/inc.c:205
-#: src/inc.c:312
-#: src/inc.c:339
+#: src/inc.c:186
+#: src/inc.c:293
+#: src/inc.c:320
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail nécessite un accès réseau pour relever le courrier."
 
-#: src/inc.c:361
+#: src/inc.c:342
 #, c-format
 msgid "%s failed\n"
 msgstr "%s a échoué\n"
 
-#: src/inc.c:432
+#: src/inc.c:413
 msgid "Retrieving new messages"
 msgstr "Récupération des nouveaux messages"
 
-#: src/inc.c:493
+#: src/inc.c:474
 msgid "Standby"
 msgstr "Attente"
 
-#: src/inc.c:618
-#: src/inc.c:672
+#: src/inc.c:617
+#: src/inc.c:671
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: src/inc.c:629
+#: src/inc.c:628
 msgid "Retrieving"
 msgstr "Récupération"
 
-#: src/inc.c:638
+#: src/inc.c:637
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Terminé (%d message (%s) reçu)"
 msgstr[1] "Terminé (%d messages (%s) reçus)"
 
-#: src/inc.c:644
+#: src/inc.c:643
 msgid "Done (no new messages)"
 msgstr "Terminé (aucun nouveau message)"
 
-#: src/inc.c:649
+#: src/inc.c:648
 msgid "Connection failed"
 msgstr "La connexion a échoué"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Auth failed"
 msgstr "Authorisation échouée"
 
-#: src/inc.c:659
+#: src/inc.c:658
 #: src/prefs_matcher.c:393
 #: src/prefs_summary_column.c:88
 #: src/summaryview.c:2782
-#: src/summaryview.c:6312
+#: src/summaryview.c:6308
 msgid "Locked"
 msgstr "Bloqués"
 
-#: src/inc.c:669
+#: src/inc.c:668
 #: src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Timeout"
 msgstr "Délai d'attente dépassé"
 
-#: src/inc.c:756
+#: src/inc.c:755
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Terminé (%d nouveau message)"
 msgstr[1] "Terminé (%d nouveaux messages)"
 
-#: src/inc.c:760
+#: src/inc.c:759
 msgid "Finished (no new messages)"
 msgstr "Terminé (aucun nouveau message)"
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Récupération des nouveaux messages"
 
-#: src/inc.c:832
+#: src/inc.c:828
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Compte '%s' : Connexion au serveur POP3 : %s:%d.."
 
-#: src/inc.c:850
+#: src/inc.c:846
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d."
 
-#: src/inc.c:854
+#: src/inc.c:850
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d.\n"
 
-#: src/inc.c:934
-#: src/send_message.c:478
+#: src/inc.c:930
+#: src/send_message.c:486
 msgid "Authenticating..."
 msgstr "Authentification.."
 
-#: src/inc.c:936
+#: src/inc.c:932
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Réception des messages de %s (%s)..."
 
-#: src/inc.c:942
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Récupération du nombre de nouveaux messages (STAT).."
 
-#: src/inc.c:946
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Récupération du nombre de nouveaux messages (LAST).."
 
-#: src/inc.c:950
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Récupération du nombre de nouveaux messages (UIDL).."
 
-#: src/inc.c:954
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Récupération de la taille des messages"
 
-#: src/inc.c:961
-#: src/send_message.c:496
+#: src/inc.c:957
+#: src/send_message.c:504
 msgid "Quitting"
 msgstr "Fermeture"
 
-#: src/inc.c:986
+#: src/inc.c:982
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Récupération du message (%d / %d) (%s / %s octets)"
 
-#: src/inc.c:999
+#: src/inc.c:995
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Récupération (%d message (%s) reçu)"
 msgstr[1] "Récupération (%d messages (%s) reçus)"
 
-#: src/inc.c:1158
+#: src/inc.c:1154
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "La connexion vers %s:%d a échoué."
 
-#: src/inc.c:1163
+#: src/inc.c:1159
 msgid "Error occurred while processing mail."
 msgstr "Une erreur est survenue pendant le traitement du message."
 
-#: src/inc.c:1169
+#: src/inc.c:1165
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -7167,39 +7196,39 @@ msgstr ""
 "Une erreur est survenue pendant le traitement du message :\n"
 "%s"
 
-#: src/inc.c:1175
+#: src/inc.c:1171
 msgid "No disk space left."
 msgstr "Plus de place disponible sur le disque."
 
-#: src/inc.c:1180
+#: src/inc.c:1176
 msgid "Can't write file."
 msgstr "Impossible d'enregistrer le fichier."
 
-#: src/inc.c:1185
+#: src/inc.c:1181
 msgid "Socket error."
 msgstr "Erreur de « socket »."
 
-#: src/inc.c:1188
+#: src/inc.c:1184
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Erreur de socket lors de la connexion vers %s:%d."
 
-#: src/inc.c:1193
-#: src/send_message.c:406
-#: src/send_message.c:670
+#: src/inc.c:1189
+#: src/send_message.c:414
+#: src/send_message.c:678
 msgid "Connection closed by the remote host."
 msgstr "Connexion fermée par l'hôte distant."
 
-#: src/inc.c:1196
+#: src/inc.c:1192
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Connexion vers %s:%d fermée par l'hôte distant."
 
-#: src/inc.c:1201
+#: src/inc.c:1197
 msgid "Mailbox is locked."
 msgstr "Boîte aux lettres bloquée."
 
-#: src/inc.c:1205
+#: src/inc.c:1201
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -7208,13 +7237,13 @@ msgstr ""
 "La boîte aux lettres bloquée :\n"
 "%s"
 
-#: src/inc.c:1211
-#: src/send_message.c:655
+#: src/inc.c:1207
+#: src/send_message.c:663
 msgid "Authentication failed."
 msgstr "L'authentification a échoué."
 
-#: src/inc.c:1217
-#: src/send_message.c:658
+#: src/inc.c:1213
+#: src/send_message.c:666
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -7223,42 +7252,31 @@ msgstr ""
 "L'authentification a échoué\n"
 "%s"
 
-#: src/inc.c:1222
-#: src/send_message.c:674
+#: src/inc.c:1218
+#: src/send_message.c:682
 msgid "Session timed out. You may be able to recover by increasing the timeout value in Preferences/Other/Miscellaneous."
 msgstr "La session a expiré. Augmenter la valeur du délai d'expiration dans Préférences/Autres/Divers peut dans certains cas être une solution."
 
-#: src/inc.c:1227
+#: src/inc.c:1223
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "La connexion vers %s:%d a échoué."
 
-#: src/inc.c:1265
+#: src/inc.c:1261
 msgid "Incorporation cancelled\n"
 msgstr "Relève annulée\n"
 
-#: src/inc.c:1457
-#, c-format
-msgid "Claws Mail: %d new message"
-msgid_plural "Claws Mail: %d new messages"
-msgstr[0] "Claws Mail : %d nouveau message"
-msgstr[1] "Claws Mail : %d nouveaux messages"
-
-#: src/inc.c:1584
-msgid "Unable to connect: you are offline."
-msgstr "Connexion impossible : vous êtes hors-ligne."
-
-#: src/inc.c:1610
+#: src/inc.c:1528
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sAttention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer l'avertissement pour %d minutes ?"
 
-#: src/inc.c:1616
+#: src/inc.c:1534
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sAttention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer l'avertissement ?"
 
-#: src/inc.c:1623
+#: src/inc.c:1541
 msgid "On_ly once"
 msgstr "_Seulement pour cette fois-ci"
 
@@ -7266,7 +7284,7 @@ msgstr "_Seulement pour cette fois-ci"
 msgid "Nick Name"
 msgstr "Surnom"
 
-#: src/main.c:272
+#: src/main.c:241
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -7275,12 +7293,7 @@ msgstr ""
 "Le fichier '%s' existe déjà.\n"
 "Impossible de créer le dossier."
 
-#: src/main.c:294
-#: src/main.c:307
-msgid "Exiting..."
-msgstr "Fermeture.."
-
-#: src/main.c:438
+#: src/main.c:362
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -7289,7 +7302,7 @@ msgstr ""
 "Une configuration pour %s a été trouvée.\n"
 "Voulez-vous faire migrer cette configuration ?"
 
-#: src/main.c:440
+#: src/main.c:364
 #, c-format
 msgid ""
 "\n"
@@ -7302,55 +7315,55 @@ msgstr ""
 "Vos règles de filtrage pour Sylpheed peuvent être converties\n"
 "par un script disponible ici : %s."
 
-#: src/main.c:452
+#: src/main.c:376
 msgid "Keep old configuration"
 msgstr "Conserver l'ancienne configuration"
 
-#: src/main.c:455
+#: src/main.c:379
 msgid "Keeping a backup will allow you to go back to an older version, but may take a while if you have cached IMAP or News data, and will take some extra room on your disk."
 msgstr "Conserver une sauvegarde vous permettra de pouvoir revenir à une version antérieure, mais peut prendre du temps si vous avez en cache des données IMAP ou provenant de serveurs de discussions, et occupera un espace supplémentaire sur votre disque."
 
-#: src/main.c:463
+#: src/main.c:387
 msgid "Migration of configuration"
 msgstr "Migration de la configuration"
 
-#: src/main.c:474
+#: src/main.c:398
 msgid "Copying configuration... This may take a while..."
 msgstr "Copie de la configuration.. Cela peut prendre du temps.."
 
-#: src/main.c:483
+#: src/main.c:407
 msgid "Migration failed!"
 msgstr "La migration a échoué !"
 
-#: src/main.c:492
+#: src/main.c:416
 msgid "Migrating configuration..."
 msgstr "Migration de la configuration.."
 
-#: src/main.c:1039
+#: src/main.c:934
 msgid "Failed to register folder item update hook"
 msgstr "Échec lors de la déclaration du hook de mise à jour d'un élément de dossier"
 
-#: src/main.c:1046
+#: src/main.c:941
 msgid "Failed to register folder update hook"
 msgstr "Échec lors de la déclaration du hook de mise à jour d'un dossier"
 
-#: src/main.c:1226
+#: src/main.c:1110
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non supporté par glib.\n"
 
-#: src/main.c:1245
+#: src/main.c:1129
 msgid "Sylpheed-Claws 2.6.0 (or older)"
 msgstr "Sylpheed-Claws 2.6.0 (ou antérieur)"
 
-#: src/main.c:1248
+#: src/main.c:1132
 msgid "Sylpheed-Claws 1.9.15 (or older)"
 msgstr "Sylpheed-Claws 1.9.15 (ou antérieur)"
 
-#: src/main.c:1251
+#: src/main.c:1135
 msgid "Sylpheed-Claws 1.0.5 (or older)"
 msgstr "Sylpheed-Claws 1.0.5 (ou antérieur)"
 
-#: src/main.c:1574
+#: src/main.c:1434
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for more information:\n"
@@ -7365,49 +7378,44 @@ msgstr[1] ""
 "Les modules suivants n'ont pas pu être chargés. Veuillez vous référer à la configuration des modules pour de plus amples informations :\n"
 "%s"
 
-#: src/main.c:1602
+#: src/main.c:1462
 msgid "Claws Mail has detected a configured mailbox, but it is incomplete. It is possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the mailbox parent folder's context menu to try to fix it."
 msgstr "Claws Mail a détecté une boîte aux lettres existante, mais qui semble être incomplète. Cela est probablement dû à un problème dans un compte IMAP. Veuillez utiliser \"/Reconstruire l'_arborescence\" depuis le menu contextuel du dossier principal de la boîte aux lettres pour tenter de le résoudre."
 
-#: src/main.c:1608
+#: src/main.c:1468
 msgid "Claws Mail has detected a configured mailbox, but could not load it. It is probably provided by an out-of-date external plugin. Please reinstall the plugin and try again."
 msgstr "Claws Mail a tenté de charger une boîte aux lettres existante en vain. Cela est probablement dû à la caducité d'un module externe. Veuillez ré-installer le module et essayer à nouveau."
 
-#: src/main.c:1637
-#, c-format
-msgid "Claws Mail can not start without its data volume (%s)."
-msgstr "Claws Mail ne peut démarrer sans son volume de données (%s)."
-
-#: src/main.c:1884
+#: src/main.c:1711
 msgid "Missing filename\n"
 msgstr "Nom de fichier manquant\n"
 
-#: src/main.c:1891
+#: src/main.c:1718
 msgid "Cannot open filename for reading\n"
 msgstr "Impossible d'ouvrir le fichier en lecture\n"
 
-#: src/main.c:1902
+#: src/main.c:1729
 msgid "Malformed header\n"
 msgstr "En-tête non conforme\n"
 
-#: src/main.c:1909
+#: src/main.c:1736
 msgid "Duplicated 'To:' header\n"
 msgstr "En-tête 'À:' en plusieurs exemplaires\n"
 
-#: src/main.c:1924
+#: src/main.c:1751
 msgid "Missing required 'To:' header\n"
 msgstr "L'en-tête 'To:' est manquant\n"
 
-#: src/main.c:2071
+#: src/main.c:1898
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation : %s [OPTION]..\n"
 
-#: src/main.c:2073
+#: src/main.c:1900
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    ouvrir une fenêtre de composition de message"
 
-#: src/main.c:2074
+#: src/main.c:1901
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -7421,7 +7429,7 @@ msgstr ""
 "                         format du contenu de fichier : en-têtes en anglais en premier (To: nécessaire) jusqu'à une,\n"
 "                         ligne vide, puis le corps de message jusqu'à la fin de fichier."
 
-#: src/main.c:2079
+#: src/main.c:1906
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe [uri]      s'abonner au flux RSS ou WebCal donné (requiert\n"
@@ -7429,7 +7437,7 @@ msgstr ""
 "                         de nouvelles, ou « vCalendar » , gestionnaire de\n"
 "                         rendez-vous et calendriers en ligne)"
 
-#: src/main.c:2080
+#: src/main.c:1907
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7439,23 +7447,23 @@ msgstr ""
 "                         ouvrir une fenêtre de composition avec les\n"
 "                         fichiers spécifiés attachés"
 
-#: src/main.c:2083
+#: src/main.c:1910
 msgid "  --receive              receive new messages"
 msgstr "  --receive              récupérer les nouveaux messages (du compte courant)"
 
-#: src/main.c:2084
+#: src/main.c:1911
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          récupérer les nouveaux messages de tous les comptes"
 
-#: src/main.c:2085
+#: src/main.c:1912
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving   annuler la récupération des messages"
 
-#: src/main.c:2086
+#: src/main.c:1913
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending      annuler l'envoi des messages"
 
-#: src/main.c:2087
+#: src/main.c:1914
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -7471,17 +7479,17 @@ msgstr ""
 "                         texte: chaîne de texte à chercher\n"
 "                         récursif: aucune si l'argument commence par 0, n, N, f ou F"
 
-#: src/main.c:2094
+#: src/main.c:1921
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envoyer les messages en attente"
 
-#: src/main.c:2095
+#: src/main.c:1922
 msgid "  --status [folder]...   show the total number of messages"
 msgstr ""
 "  --status [dossier]...  afficher le nombre de messages\n"
 "                         (nouveaux, non lus, total)"
 
-#: src/main.c:2096
+#: src/main.c:1923
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -7489,15 +7497,15 @@ msgstr ""
 "  --status-full [dossier]...\n"
 "                         afficher le nombre de messages de chaque dossier"
 
-#: src/main.c:2098
+#: src/main.c:1925
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           affiche les statistiques de la session"
 
-#: src/main.c:2099
+#: src/main.c:1926
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     réinitialise les statistiques de la session"
 
-#: src/main.c:2100
+#: src/main.c:1927
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -7507,45 +7515,45 @@ msgstr ""
 "                         « dossier » est un identifiant de dossier dont voici\n"
 "                         un exemple de syntaxe : 'dossier/sous_dossier'."
 
-#: src/main.c:2102
+#: src/main.c:1929
 msgid "  --online               switch to online mode"
 msgstr "  --online               travailler en ligne"
 
-#: src/main.c:2103
+#: src/main.c:1930
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              travailler hors-ligne"
 
-#: src/main.c:2104
+#: src/main.c:1931
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       quitter Claws Mail"
 
-#: src/main.c:2105
+#: src/main.c:1932
 msgid "  --debug                debug mode"
 msgstr "  --debug                lancer Claws Mail en mode de déboguage"
 
-#: src/main.c:2106
+#: src/main.c:1933
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug       changer le mode debug"
 
-#: src/main.c:2107
+#: src/main.c:1934
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              afficher cette aide et terminer"
 
-#: src/main.c:2108
+#: src/main.c:1935
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           afficher la version et terminer"
 
-#: src/main.c:2109
+#: src/main.c:1936
 msgid "  --version-full -V      output version and built-in features information and exit"
 msgstr ""
 "  --version-full -V      afficher la version et les informations concernant\n"
 "                         les options intégrées et terminer"
 
-#: src/main.c:2110
+#: src/main.c:1937
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           afficher le dossier contenant la configuration"
 
-#: src/main.c:2111
+#: src/main.c:1938
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -7553,44 +7561,44 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                         utiliser le dossier de configuration spécifié"
 
-#: src/main.c:2161
+#: src/main.c:1988
 msgid "Unknown option\n"
 msgstr ""
 "claws-mail: option non reconnue.\n"
 "Pour en savoir davantage, faites: « claws-mail --help ».\n"
 
-#: src/main.c:2179
+#: src/main.c:2006
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Traitement (%s).."
 
-#: src/main.c:2182
+#: src/main.c:2009
 msgid "top level folder"
 msgstr "dossier racine"
 
-#: src/main.c:2265
+#: src/main.c:2092
 msgid "Queued messages"
 msgstr "Messages en file d'attente"
 
-#: src/main.c:2266
+#: src/main.c:2093
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Quelques messages non envoyés sont dans la file d'attente. Voulez-vous quitter maintenant ?"
 
-#: src/main.c:2999
+#: src/main.c:2818
 msgid "NetworkManager: network is online.\n"
 msgstr "Gestionnaire réseau : le réseau est activé.\n"
 
-#: src/main.c:3005
+#: src/main.c:2824
 msgid "NetworkManager: network is offline.\n"
 msgstr "Gestionnaire réseau : le réseau est désactivé.\n"
 
 #: src/mainwindow.c:503
-#: src/messageview.c:210
+#: src/messageview.c:208
 msgid "_File"
 msgstr "_Fichier"
 
 #: src/mainwindow.c:505
-#: src/messageview.c:212
+#: src/messageview.c:210
 #: src/summaryview.c:436
 msgid "_View"
 msgstr "_Vue"
@@ -7628,22 +7636,22 @@ msgid "Empty all _Trash folders"
 msgstr "_Vider toutes les corbeilles"
 
 #: src/mainwindow.c:526
-#: src/messageview.c:219
+#: src/messageview.c:217
 msgid "_Save email as..."
 msgstr "Enregi_strer le message sous.."
 
 #: src/mainwindow.c:527
-#: src/messageview.c:220
+#: src/messageview.c:218
 msgid "_Save part as..."
 msgstr "Enregi_strer la partie sous.."
 
 #: src/mainwindow.c:530
-#: src/messageview.c:221
+#: src/messageview.c:219
 msgid "Page setup..."
 msgstr "Mise en _page.."
 
 #: src/mainwindow.c:531
-#: src/messageview.c:222
+#: src/messageview.c:220
 msgid "_Print..."
 msgstr "_Imprimer.."
 
@@ -7712,126 +7720,126 @@ msgid "Co_llapse all threads"
 msgstr "Com_pacter les fils de discussion"
 
 #: src/mainwindow.c:568
-#: src/messageview.c:233
+#: src/messageview.c:231
 msgid "_Go to"
 msgstr "_Aller à"
 
 #: src/mainwindow.c:569
-#: src/messageview.c:234
+#: src/messageview.c:232
 msgid "_Previous message"
 msgstr "Message _précédent"
 
 #: src/mainwindow.c:570
-#: src/messageview.c:235
+#: src/messageview.c:233
 msgid "_Next message"
 msgstr "Message suiva_nt"
 
 #: src/mainwindow.c:572
-#: src/messageview.c:237
+#: src/messageview.c:235
 msgid "P_revious unread message"
 msgstr "Non l_u précédent"
 
 #: src/mainwindow.c:573
-#: src/messageview.c:238
+#: src/messageview.c:236
 msgid "N_ext unread message"
 msgstr "Non _lu suivant"
 
 #: src/mainwindow.c:575
-#: src/messageview.c:240
+#: src/messageview.c:238
 msgid "Previous ne_w message"
 msgstr "Message nouv_eau précédent"
 
 #: src/mainwindow.c:576
-#: src/messageview.c:241
+#: src/messageview.c:239
 msgid "Ne_xt new message"
 msgstr "Message nou_veau suivant"
 
 #: src/mainwindow.c:578
-#: src/messageview.c:243
+#: src/messageview.c:241
 msgid "Previous _marked message"
 msgstr "M_arqué précédent"
 
 #: src/mainwindow.c:579
-#: src/messageview.c:244
+#: src/messageview.c:242
 msgid "Next m_arked message"
 msgstr "_Marqué suivant"
 
 #: src/mainwindow.c:581
-#: src/messageview.c:246
+#: src/messageview.c:244
 msgid "Previous _labeled message"
 msgstr "C_olorié précédent"
 
 #: src/mainwindow.c:582
-#: src/messageview.c:247
+#: src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "_Colorié suivant"
 
 #: src/mainwindow.c:584
-#: src/messageview.c:249
+#: src/messageview.c:247
 msgid "Previous opened message"
 msgstr "Message ouvert précédent"
 
 #: src/mainwindow.c:585
-#: src/messageview.c:250
+#: src/messageview.c:248
 msgid "Next opened message"
 msgstr "Message ouvert suivant"
 
 #: src/mainwindow.c:587
-#: src/messageview.c:252
+#: src/messageview.c:250
 msgid "Parent message"
 msgstr "Message paren_t"
 
 #: src/mainwindow.c:589
-#: src/messageview.c:254
+#: src/messageview.c:252
 msgid "Next unread _folder"
 msgstr "Do_ssier non lu suivant"
 
 #: src/mainwindow.c:590
-#: src/messageview.c:255
+#: src/messageview.c:253
 msgid "_Other folder..."
 msgstr "_Chercher dans le dossier.."
 
 #: src/mainwindow.c:592
-#: src/messageview.c:257
-#: src/mimeview.c:210
+#: src/messageview.c:255
+#: src/mimeview.c:201
 msgid "Next part"
 msgstr "Partie suivante"
 
 #: src/mainwindow.c:593
-#: src/messageview.c:258
-#: src/mimeview.c:211
+#: src/messageview.c:256
+#: src/mimeview.c:202
 msgid "Previous part"
 msgstr "Partie précédente"
 
 #: src/mainwindow.c:596
-#: src/messageview.c:259
+#: src/messageview.c:257
 msgid "Message scroll"
 msgstr "Défilement du message"
 
 #: src/mainwindow.c:597
-#: src/messageview.c:260
+#: src/messageview.c:258
 msgid "Previous line"
 msgstr "Ligne précédente"
 
 #: src/mainwindow.c:598
-#: src/messageview.c:261
+#: src/messageview.c:259
 msgid "Next line"
 msgstr "Ligne suivante"
 
 #: src/mainwindow.c:599
-#: src/messageview.c:262
+#: src/messageview.c:260
 #: src/printing.c:487
 msgid "Previous page"
 msgstr "Page précédente"
 
 #: src/mainwindow.c:600
-#: src/messageview.c:263
+#: src/messageview.c:261
 #: src/printing.c:494
 msgid "Next page"
 msgstr "Page suivante"
 
 #: src/mainwindow.c:618
-#: src/messageview.c:281
+#: src/messageview.c:279
 msgid "Decode"
 msgstr "Décoda_ge"
 
@@ -7840,33 +7848,33 @@ msgid "Open in new _window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
 #: src/mainwindow.c:626
-#: src/messageview.c:288
+#: src/messageview.c:286
 msgid "Mess_age source"
 msgstr "Code _source du message.."
 
 #: src/mainwindow.c:628
-#: src/messageview.c:289
+#: src/messageview.c:287
 msgid "Message part"
 msgstr "Message"
 
 #: src/mainwindow.c:629
-#: src/messageview.c:290
+#: src/messageview.c:288
 msgid "View as text"
 msgstr "Afficher comme du texte"
 
 #: src/mainwindow.c:630
-#: src/messageview.c:291
-#: src/toolbar.c:401
+#: src/messageview.c:289
+#: src/toolbar.c:402
 msgid "Open"
 msgstr "Ouvrir"
 
 #: src/mainwindow.c:632
-#: src/messageview.c:293
+#: src/messageview.c:291
 msgid "Open with..."
 msgstr "Ouvrir avec.."
 
 #: src/mainwindow.c:636
-#: src/messageview.c:296
+#: src/messageview.c:294
 msgid "Quotes"
 msgstr "_Citations"
 
@@ -7903,19 +7911,19 @@ msgid "Compose a news message"
 msgstr "Composer un _article de groupe de discussion"
 
 #: src/mainwindow.c:655
-#: src/messageview.c:302
+#: src/messageview.c:300
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Répondre"
 
 #: src/mainwindow.c:656
-#: src/messageview.c:303
+#: src/messageview.c:301
 #: src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "Rép_ondre à"
 
 #: src/mainwindow.c:659
-#: src/messageview.c:306
+#: src/messageview.c:304
 msgid "Mailing _list"
 msgstr "_Liste de diffusion"
 
@@ -7924,20 +7932,20 @@ msgid "Follow-up and reply to"
 msgstr "Donner suite _et répondre à"
 
 #: src/mainwindow.c:663
-#: src/messageview.c:309
-#: src/toolbar.c:2087
+#: src/messageview.c:307
+#: src/toolbar.c:2088
 msgid "_Forward"
 msgstr "_Transférer"
 
 #: src/mainwindow.c:664
-#: src/messageview.c:310
-#: src/toolbar.c:2088
+#: src/messageview.c:308
+#: src/toolbar.c:2089
 msgid "For_ward as attachment"
 msgstr "Transférer en _pièce jointe"
 
 #: src/mainwindow.c:665
-#: src/messageview.c:311
-#: src/toolbar.c:2089
+#: src/messageview.c:309
+#: src/toolbar.c:2090
 msgid "Redirec_t"
 msgstr "Rediri_ger"
 
@@ -8009,8 +8017,8 @@ msgstr "Marquer _tous comme lus"
 
 #: src/mainwindow.c:699
 #: src/prefs_filtering_action.c:199
-#: src/toolbar.c:207
-#: src/toolbar.c:417
+#: src/toolbar.c:208
+#: src/toolbar.c:418
 msgid "Ignore thread"
 msgstr "Ignorer du f_il de discussion"
 
@@ -8020,8 +8028,8 @@ msgstr "Inclure dans _fil de discussion"
 
 #: src/mainwindow.c:701
 #: src/prefs_filtering_action.c:200
-#: src/toolbar.c:208
-#: src/toolbar.c:418
+#: src/toolbar.c:209
+#: src/toolbar.c:419
 msgid "Watch thread"
 msgstr "_Suivre le fil de discussion"
 
@@ -8062,13 +8070,13 @@ msgid "Re-_edit"
 msgstr "Rééd_iter"
 
 #: src/mainwindow.c:719
-#: src/messageview.c:312
-#: src/mimeview.c:1039
+#: src/messageview.c:310
+#: src/mimeview.c:1030
 msgid "Check signature"
 msgstr "Vérifier la signature"
 
 #: src/mainwindow.c:724
-#: src/messageview.c:316
+#: src/messageview.c:314
 msgid "Add sender to address boo_k"
 msgstr "A_jouter l'expéditeur au carnet d'adresses"
 
@@ -8097,48 +8105,48 @@ msgid "Run folder pr_ocessing rules"
 msgstr "Exéc_uter les règles de traitement du dossier courant"
 
 #: src/mainwindow.c:735
-#: src/messageview.c:319
+#: src/messageview.c:317
 msgid "_Create filter rule"
 msgstr "Créer une _règle de filtrage"
 
 #: src/mainwindow.c:736
 #: src/mainwindow.c:742
-#: src/messageview.c:320
-#: src/messageview.c:326
+#: src/messageview.c:318
+#: src/messageview.c:324
 msgid "_Automatically"
 msgstr "_Automatiquement"
 
 #: src/mainwindow.c:737
 #: src/mainwindow.c:743
-#: src/mainwindow.c:847
-#: src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:845
+#: src/messageview.c:319
+#: src/messageview.c:325
 msgid "By _From"
 msgstr "Par _De"
 
 #: src/mainwindow.c:738
 #: src/mainwindow.c:744
-#: src/mainwindow.c:848
-#: src/messageview.c:322
-#: src/messageview.c:328
+#: src/mainwindow.c:846
+#: src/messageview.c:320
+#: src/messageview.c:326
 msgid "By _To"
 msgstr "A_vec « À: »"
 
 #: src/mainwindow.c:739
 #: src/mainwindow.c:745
-#: src/messageview.c:323
-#: src/messageview.c:329
+#: src/messageview.c:321
+#: src/messageview.c:327
 msgid "By _Subject"
 msgstr "Par _Sujet"
 
 #: src/mainwindow.c:741
-#: src/messageview.c:325
+#: src/messageview.c:323
 #: src/summaryview.c:434
 msgid "Create processing rule"
 msgstr "Créer une règle de traite_ment"
 
 #: src/mainwindow.c:748
-#: src/messageview.c:333
+#: src/messageview.c:331
 msgid "List _URLs..."
 msgstr "_Liste d'URLs.."
 
@@ -8278,202 +8286,202 @@ msgstr "Cacher les messages _lus"
 msgid "Hide deleted messages"
 msgstr "Cacher les messages supprimés"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:815
 msgid "_Fullscreen"
 msgstr "Plei_n écran"
 
-#: src/mainwindow.c:818
-#: src/messageview.c:345
+#: src/mainwindow.c:816
+#: src/messageview.c:343
 msgid "Show all _headers"
 msgstr "Tous les _en-têtes"
 
-#: src/mainwindow.c:819
-#: src/messageview.c:346
+#: src/mainwindow.c:817
+#: src/messageview.c:344
 msgid "_Collapse all"
 msgstr "Re_plier tout"
 
-#: src/mainwindow.c:820
-#: src/messageview.c:347
+#: src/mainwindow.c:818
+#: src/messageview.c:345
 msgid "Collapse from level _2"
 msgstr "Replier à partir du niveau _2"
 
-#: src/mainwindow.c:821
-#: src/messageview.c:348
+#: src/mainwindow.c:819
+#: src/messageview.c:346
 msgid "Collapse from level _3"
 msgstr "Replier à partir du niveau _3"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:823
 msgid "Text _below icons"
 msgstr "Texte _sous les icônes"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:824
 msgid "Text be_side icons"
 msgstr "Texte _contre les icônes"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:825
 msgid "_Icons only"
 msgstr "_Icônes seules"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:826
 msgid "_Text only"
 msgstr "_Texte seul"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:833
 msgid "_Standard"
 msgstr "_Classique"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:834
 msgid "_Three columns"
 msgstr "_Trois colonnes"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:835
 msgid "_Wide message"
 msgstr "Vue des _messages étendue"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:836
 msgid "W_ide message list"
 msgstr "_Liste des messages étendue"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:837
 msgid "S_mall screen"
 msgstr "_Petit écran"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:841
 msgid "By _number"
 msgstr "Par _numéro"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:842
 msgid "By s_ize"
 msgstr "Par taille"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:843
 msgid "By _date"
 msgstr "Par da_te"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:844
 msgid "By thread date"
 msgstr "Par date du _fil"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:847
 msgid "By s_ubject"
 msgstr "Par s_ujet"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:848
 msgid "By _color label"
 msgstr "Par _couleur"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:849
 msgid "By tag"
 msgstr "Par _label"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:850
 msgid "By _mark"
 msgstr "Par _marque"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:851
 msgid "By _status"
 msgstr "Par ét_at"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:852
 msgid "By a_ttachment"
 msgstr "Par _pièce jointe"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:853
 msgid "By score"
 msgstr "Par sc_ore"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:854
 msgid "By locked"
 msgstr "Par _bloqués"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:855
 msgid "D_on't sort"
 msgstr "Ne pas tr_ier"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:859
 msgid "Ascending"
 msgstr "Ascendant"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:860
 msgid "Descending"
 msgstr "Descendant"
 
-#: src/mainwindow.c:903
-#: src/messageview.c:389
+#: src/mainwindow.c:901
+#: src/messageview.c:387
 msgid "_Auto detect"
 msgstr "Détection _automatique"
 
-#: src/mainwindow.c:1299
-#: src/summaryview.c:6238
+#: src/mainwindow.c:1297
+#: src/summaryview.c:6234
 msgid "Apply tags..."
 msgstr "Appliquer des labels.."
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:1935
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Une ou plusieurs erreurs sont survenues. Cliquez-ici pour voir les traces."
 
-#: src/mainwindow.c:2127
+#: src/mainwindow.c:1950
 msgid "You are online. Click the icon to go offline"
 msgstr "Vous êtes en ligne. Veuillez cliquer sur l'icône pour aller hors-ligne."
 
-#: src/mainwindow.c:2130
+#: src/mainwindow.c:1953
 msgid "You are offline. Click the icon to go online"
 msgstr "Vous êtes hors-ligne. Veuillez cliquer sur l'icône pour aller en ligne."
 
-#: src/mainwindow.c:2144
+#: src/mainwindow.c:1967
 msgid "Select account"
 msgstr "Sélectionner un compte"
 
-#: src/mainwindow.c:2171
+#: src/mainwindow.c:1994
 #: src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Traces réseaux"
 
-#: src/mainwindow.c:2175
+#: src/mainwindow.c:1998
 msgid "Filtering/Processing debug log"
 msgstr "Traces de débogage du filtrage/traitement"
 
-#: src/mainwindow.c:2194
+#: src/mainwindow.c:2017
 #: src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "Le traçage du filtrage est activé.\n"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2019
 #: src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "Le traçage du filtrage est désactivé.\n"
 
-#: src/mainwindow.c:2642
-#: src/mainwindow.c:2649
-#: src/mainwindow.c:2692
-#: src/mainwindow.c:2725
-#: src/mainwindow.c:2757
-#: src/mainwindow.c:2802
+#: src/mainwindow.c:2460
+#: src/mainwindow.c:2467
+#: src/mainwindow.c:2510
+#: src/mainwindow.c:2543
+#: src/mainwindow.c:2575
+#: src/mainwindow.c:2620
 #: src/plugins/notification/notification_trayicon.c:363
 #: src/prefs_folder_item.c:1067
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/mainwindow.c:2803
+#: src/mainwindow.c:2621
 #: src/prefs_summary_open.c:114
 msgid "none"
 msgstr "rien"
 
-#: src/mainwindow.c:3060
-#: src/mainwindow.c:3064
+#: src/mainwindow.c:2878
+#: src/mainwindow.c:2882
 msgid "Delete all messages in trash folders?"
 msgstr "Voulez-vous vraiment supprimer tous les messages de toutes les corbeilles ?"
 
-#: src/mainwindow.c:3061
+#: src/mainwindow.c:2879
 msgid "Don't quit"
 msgstr "Ne pas quitter"
 
-#: src/mainwindow.c:3090
+#: src/mainwindow.c:2908
 #: src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Nouvelle boîte aux lettres"
 
-#: src/mainwindow.c:3091
+#: src/mainwindow.c:2909
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -8482,21 +8490,21 @@ msgstr ""
 "Veuillez saisir le chemin vers la boîte aux lettres :\n"
 "(Si elle existe déjà, elle sera automatiquement analysée.)"
 
-#: src/mainwindow.c:3097
+#: src/mainwindow.c:2915
 #: src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:158
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "La boîte aux lettres '%s' existe déjà."
 
-#: src/mainwindow.c:3102
+#: src/mainwindow.c:2920
 #: src/plugins/mailmbox/plugin_gtk.c:202
 #: src/setup.c:52
-#: src/wizard.c:774
+#: src/wizard.c:737
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:3107
+#: src/mainwindow.c:2925
 #: src/plugins/mailmbox/plugin_gtk.c:209
 #: src/setup.c:55
 msgid ""
@@ -8506,79 +8514,79 @@ msgstr ""
 "Échec de la création de boîte.\n"
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits en écriture."
 
-#: src/mainwindow.c:3553
+#: src/mainwindow.c:3373
 msgid "No posting allowed"
 msgstr "Envoi de message non autorisé"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "L'importation mbox a échoué."
 
-#: src/mainwindow.c:4140
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:3960
+#: src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "L'exportation mbox a échoué."
 
-#: src/mainwindow.c:4190
+#: src/mainwindow.c:4010
 #: src/plugins/notification/notification_trayicon.c:518
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:4190
+#: src/mainwindow.c:4010
 #: src/plugins/notification/notification_trayicon.c:518
 msgid "Exit Claws Mail?"
 msgstr "Voulez-vous vraiment quitter Claws Mail ?"
 
-#: src/mainwindow.c:4379
+#: src/mainwindow.c:4199
 msgid "Folder synchronisation"
 msgstr "Synchronisation de dossiers distants"
 
-#: src/mainwindow.c:4380
+#: src/mainwindow.c:4200
 msgid "Do you want to synchronise your folders now?"
 msgstr "Voulez-vous vraiment synchroniser vos dossiers distants ?"
 
-#: src/mainwindow.c:4381
+#: src/mainwindow.c:4201
 msgid "+_Synchronise"
 msgstr "+S_ynchroniser"
 
-#: src/mainwindow.c:4810
+#: src/mainwindow.c:4630
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double.."
 
-#: src/mainwindow.c:4847
+#: src/mainwindow.c:4667
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d message en double supprimé dans %d dossier.\n"
 msgstr[1] "%d messages en double supprimés dans %d dossiers.\n"
 
-#: src/mainwindow.c:5102
-#: src/summaryview.c:5727
+#: src/mainwindow.c:4922
+#: src/summaryview.c:5723
 msgid "Processing rules to apply before folder rules"
 msgstr "Règles de traitement à appliquer avant le filtrage des dossiers"
 
-#: src/mainwindow.c:5110
+#: src/mainwindow.c:4930
 msgid "Processing rules to apply after folder rules"
 msgstr "Règles de traitement à appliquer après le filtrage des dossiers"
 
-#: src/mainwindow.c:5118
-#: src/summaryview.c:5738
+#: src/mainwindow.c:4938
+#: src/summaryview.c:5734
 msgid "Filtering configuration"
 msgstr "Règles de filtrage"
 
-#: src/mainwindow.c:5233
+#: src/mainwindow.c:5053
 msgid "Can not register as default client: impossible to get executable path."
 msgstr "Impossible d'enregistrer le client par défaut : impossible de récupérer le chemin du binaire."
 
-#: src/mainwindow.c:5292
+#: src/mainwindow.c:5112
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail est maintenant le client par défaut."
 
-#: src/mainwindow.c:5294
+#: src/mainwindow.c:5114
 msgid "Can not register as default client: impossible to write to the registry."
 msgstr "Impossible d'enregistrer le client par défaut : écriture impossible dans la base de registre."
 
-#: src/mainwindow.c:5452
+#: src/mainwindow.c:5272
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8612,48 +8620,48 @@ msgstr "Ligne du corps"
 msgid "tag"
 msgstr "label"
 
-#: src/matcher.c:517
-#: src/matcher.c:522
-#: src/matcher.c:542
-#: src/matcher.c:547
-#: src/message_search.c:212
-#: src/prefs_matcher.c:737
-#: src/summary_search.c:452
+#: src/matcher.c:523
+#: src/matcher.c:528
+#: src/matcher.c:548
+#: src/matcher.c:553
+#: src/message_search.c:217
+#: src/prefs_matcher.c:739
+#: src/summary_search.c:478
 msgid "Case sensitive"
 msgstr "Sensible à la casse"
 
-#: src/matcher.c:517
-#: src/matcher.c:522
-#: src/matcher.c:542
-#: src/matcher.c:547
+#: src/matcher.c:523
+#: src/matcher.c:528
+#: src/matcher.c:548
+#: src/matcher.c:553
 msgid "Case insensitive"
 msgstr "Non sensible à la casse"
 
-#: src/matcher.c:1809
+#: src/matcher.c:1819
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "Teste si le message valide la condition [ %s ]\n"
 
-#: src/matcher.c:1878
-#: src/matcher.c:1897
-#: src/matcher.c:1910
+#: src/matcher.c:1888
+#: src/matcher.c:1907
+#: src/matcher.c:1920
 msgid "message matches\n"
 msgstr "Le message correspond.\n"
 
-#: src/matcher.c:1885
-#: src/matcher.c:1903
-#: src/matcher.c:1912
+#: src/matcher.c:1895
+#: src/matcher.c:1913
+#: src/matcher.c:1922
 msgid "message does not match\n"
 msgstr "Le message ne correspond pas.\n"
 
-#: src/matcher.c:2175
-#: src/matcher.c:2176
-#: src/matcher.c:2177
-#: src/matcher.c:2178
-#: src/matcher.c:2179
-#: src/matcher.c:2180
-#: src/matcher.c:2181
-#: src/matcher.c:2182
+#: src/matcher.c:2185
+#: src/matcher.c:2186
+#: src/matcher.c:2187
+#: src/matcher.c:2188
+#: src/matcher.c:2189
+#: src/matcher.c:2190
+#: src/matcher.c:2191
+#: src/matcher.c:2192
 msgid "(none)"
 msgstr "(aucun)"
 
@@ -8682,8 +8690,8 @@ msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Ce fichier existe déjà. Voulez-vous l'écraser ?"
 
 #: src/mbox.c:555
-#: src/messageview.c:1868
-#: src/mimeview.c:1850
+#: src/messageview.c:1843
+#: src/mimeview.c:1844
 #: src/prefs_themes.c:553
 #: src/textview.c:3120
 msgid "Overwrite"
@@ -8710,45 +8718,45 @@ msgstr "Chercher dans le message"
 msgid "Find text:"
 msgstr "Chercher :"
 
-#: src/message_search.c:332
-#: src/summary_search.c:768
+#: src/message_search.c:346
+#: src/summary_search.c:791
 msgid "Search failed"
 msgstr "Recherche échouée"
 
-#: src/message_search.c:333
-#: src/summary_search.c:769
+#: src/message_search.c:347
+#: src/summary_search.c:792
 msgid "Search string not found."
 msgstr "Texte recherché introuvable."
 
-#: src/message_search.c:342
+#: src/message_search.c:356
 msgid "Beginning of message reached; continue from end?"
 msgstr "Début de message atteint, reprendre depuis la fin ?"
 
-#: src/message_search.c:345
+#: src/message_search.c:359
 msgid "End of message reached; continue from beginning?"
 msgstr "Fin de message atteint, reprendre depuis le début ?"
 
-#: src/message_search.c:348
-#: src/summary_search.c:780
+#: src/message_search.c:362
+#: src/summary_search.c:803
 msgid "Search finished"
 msgstr "Recherche terminée"
 
-#: src/messageview.c:299
+#: src/messageview.c:297
 #: src/textview.c:245
 msgid "Compose _new message"
 msgstr "Composer un _nouveau message"
 
-#: src/messageview.c:729
-#: src/messageview.c:1413
-#: src/messageview.c:1610
+#: src/messageview.c:711
+#: src/messageview.c:1388
+#: src/messageview.c:1585
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Message"
 
-#: src/messageview.c:860
+#: src/messageview.c:838
 msgid "<No Return-Path found>"
 msgstr "< « Return-Path: » introuvable>"
 
-#: src/messageview.c:868
+#: src/messageview.c:846
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8763,12 +8771,12 @@ msgstr ""
 "Return-Path: %s\n"
 "Il est conseillé de ne pas envoyer cet accusé de réception."
 
-#: src/messageview.c:875
-#: src/messageview.c:892
+#: src/messageview.c:853
+#: src/messageview.c:870
 msgid "_Don't Send"
 msgstr "_Ne pas envoyer"
 
-#: src/messageview.c:888
+#: src/messageview.c:866
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -8780,70 +8788,70 @@ msgstr ""
 "destinataire officiel.\n"
 "Il est conseillé de ne pas envoyer cet accusé de réception."
 
-#: src/messageview.c:1341
+#: src/messageview.c:1319
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Lecture du message (%s) en cours.."
 
-#: src/messageview.c:1377
-#: src/procmime.c:983
+#: src/messageview.c:1355
+#: src/procmime.c:986
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Déchiffrement impossible : %s"
 
-#: src/messageview.c:1460
-#: src/messageview.c:1468
+#: src/messageview.c:1435
+#: src/messageview.c:1443
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Le message n'est pas conforme au standard MIME. Il pourrait être mal affiché."
 
-#: src/messageview.c:1860
-#: src/messageview.c:1863
-#: src/mimeview.c:2003
-#: src/plugins/fancy/fancy_viewer.c:667
-#: src/summaryview.c:4814
-#: src/summaryview.c:4817
+#: src/messageview.c:1835
+#: src/messageview.c:1838
+#: src/mimeview.c:1997
+#: src/plugins/fancy/fancy_viewer.c:668
+#: src/summaryview.c:4810
+#: src/summaryview.c:4813
 #: src/textview.c:3108
 msgid "Save as"
 msgstr "Enregistrer sous"
 
-#: src/messageview.c:1869
+#: src/messageview.c:1844
 msgid "Overwrite existing file?"
 msgstr "Écraser le fichier existant ?"
 
-#: src/messageview.c:1877
-#: src/summaryview.c:4834
-#: src/summaryview.c:4837
-#: src/summaryview.c:4852
+#: src/messageview.c:1852
+#: src/summaryview.c:4830
+#: src/summaryview.c:4833
+#: src/summaryview.c:4848
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
 
-#: src/messageview.c:1931
+#: src/messageview.c:1905
 #, c-format
 msgid "Show all %s."
 msgstr "Afficher l'ensemble des %s."
 
-#: src/messageview.c:1933
+#: src/messageview.c:1907
 msgid "Only the first megabyte of text is shown."
 msgstr "Seul le premier méga-octet de texte est affiché."
 
-#: src/messageview.c:1964
+#: src/messageview.c:1938
 msgid "You got a return receipt for this message : it has been displayed by the recipient."
 msgstr "Vous avez demandé un accusé de réception pour ce message : cela a été mis en évidence pour le destinataire."
 
-#: src/messageview.c:1967
+#: src/messageview.c:1941
 msgid "You asked for a return receipt in this message."
 msgstr "Vous avez demandé un accusé de réception pour ce message."
 
-#: src/messageview.c:1973
+#: src/messageview.c:1947
 msgid "This message asks for a return receipt."
 msgstr "Ce message demande l'envoi d'un accusé de réception."
 
-#: src/messageview.c:1974
+#: src/messageview.c:1948
 msgid "Send receipt"
 msgstr "Envoyer"
 
-#: src/messageview.c:2017
+#: src/messageview.c:1991
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8851,7 +8859,7 @@ msgstr ""
 "Ce message a été partiellement récupéré,\n"
 "et a été supprimé du serveur."
 
-#: src/messageview.c:2023
+#: src/messageview.c:1997
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8860,18 +8868,18 @@ msgstr "Ce message a été partiellement récupéré ; il fait %s au total."
 
 # NDT : problème de longueur de la chaîne "Marquer pour téléchargement" :
 # la chaîne est coupée des 2 côtés (bouton trop petit) -> idée : tooltips
-#: src/messageview.c:2027
-#: src/messageview.c:2049
+#: src/messageview.c:2001
+#: src/messageview.c:2023
 msgid "Mark for download"
 msgstr "Télécharger"
 
 # NDT : même pb qu'avec "Mark for download" pr chaîne "Marquer pour suppression"
-#: src/messageview.c:2028
-#: src/messageview.c:2040
+#: src/messageview.c:2002
+#: src/messageview.c:2014
 msgid "Mark for deletion"
 msgstr "Supprimer"
 
-#: src/messageview.c:2033
+#: src/messageview.c:2007
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8880,13 +8888,13 @@ msgstr ""
 "Ce message a été partiellement récupéré ;\n"
 "il fait %s au total et est marqué pour être téléchargé ultérieurement."
 
-#: src/messageview.c:2038
-#: src/messageview.c:2051
+#: src/messageview.c:2012
+#: src/messageview.c:2025
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Démarquer"
 
-#: src/messageview.c:2044
+#: src/messageview.c:2018
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8895,11 +8903,11 @@ msgstr ""
 "Ce message a été partiellement récupéré ;\n"
 "il fait %s au total et est marqué pour être supprimé ultérieurement."
 
-#: src/messageview.c:2117
+#: src/messageview.c:2091
 msgid "Return Receipt Notification"
 msgstr "Accusé de réception."
 
-#: src/messageview.c:2118
+#: src/messageview.c:2092
 msgid ""
 "More than one of your accounts uses the address that this message was sent to.\n"
 "Please choose which account you want to use for sending the receipt notification:"
@@ -8907,20 +8915,20 @@ msgstr ""
 "Plusieurs de vos comptes utilisent l'adresse à laquelle ce message a été envoyé.\n"
 "Veuillez choisir le compte que vous voulez utiliser pour l'envoi de l'accusé de réception :"
 
-#: src/messageview.c:2122
+#: src/messageview.c:2096
 #: src/plugins/rssyl/rssyl_gtk.c:480
 msgid "_Cancel"
 msgstr "A_nnuler"
 
-#: src/messageview.c:2122
+#: src/messageview.c:2096
 msgid "_Send Notification"
 msgstr "_Envoyer"
 
-#: src/messageview.c:2189
+#: src/messageview.c:2163
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Impossible d'imprimer : le message ne contient pas de texte."
 
-#: src/messageview.c:2958
+#: src/messageview.c:2932
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8928,7 +8936,7 @@ msgstr ""
 "\n"
 " Il n'y a pas de messages dans ce dossier"
 
-#: src/messageview.c:2966
+#: src/messageview.c:2940
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8936,7 +8944,7 @@ msgstr ""
 "\n"
 " Le message a été supprimé"
 
-#: src/messageview.c:2967
+#: src/messageview.c:2941
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8944,10 +8952,10 @@ msgstr ""
 "\n"
 " Le message a été supprimé ou déplacé vers un autre dossier"
 
-#: src/messageview.c:3000
-#: src/messageview.c:3006
-#: src/summaryview.c:4187
-#: src/summaryview.c:6975
+#: src/messageview.c:2974
+#: src/messageview.c:2980
+#: src/summaryview.c:4183
+#: src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "Erreur lors de l'opération d'apprentissage du module SpamAssassin.\n"
 
@@ -8986,111 +8994,107 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Enlèvement de boîte aux lettres"
 
-#: src/mimeview.c:202
+#: src/mimeview.c:193
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: src/mimeview.c:204
+#: src/mimeview.c:195
 msgid "Open _with..."
 msgstr "Ouvrir a_vec.."
 
-#: src/mimeview.c:206
+#: src/mimeview.c:197
 msgid "Send to..."
 msgstr "Envoyer à.."
 
-#: src/mimeview.c:207
+#: src/mimeview.c:198
 msgid "_Display as text"
 msgstr "_Afficher comme du texte"
 
-#: src/mimeview.c:208
+#: src/mimeview.c:199
 msgid "_Save as..."
 msgstr "Enregi_strer sous.."
 
-#: src/mimeview.c:209
+#: src/mimeview.c:200
 msgid "Save _all..."
 msgstr "_Enregistrer tout sous.."
 
-#: src/mimeview.c:282
+#: src/mimeview.c:273
 msgid "MIME Type"
 msgstr "Type MIME"
 
-#: src/mimeview.c:1044
-#: src/mimeview.c:1049
-#: src/mimeview.c:1054
-#: src/mimeview.c:1059
+#: src/mimeview.c:1035
+#: src/mimeview.c:1040
+#: src/mimeview.c:1045
+#: src/mimeview.c:1050
 msgid "View full information"
 msgstr "Voir l'ensemble des informations"
 
-#: src/mimeview.c:1065
+#: src/mimeview.c:1056
 msgid "Check again"
 msgstr "Vérifier à nouveau"
 
-#: src/mimeview.c:1077
+#: src/mimeview.c:1068
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Veuillez cliquer sur l'icône pour la vérifier."
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1070
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Veuillez cliquer sur l'icône ou presser la touche '%s' pour la vérifier."
 
-#: src/mimeview.c:1089
+#: src/mimeview.c:1080
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr "Délai d'attente dépassé durant la vérification de la signature. Veuillez cliquer sur l'icône pour essayer à nouveau."
 
-#: src/mimeview.c:1091
+#: src/mimeview.c:1082
 #, c-format
 msgid "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr "Délai d'attente dépassé durant la vérification de la signature. Veuillez cliquer sur l'icône ou appuyer sur '%s' pour essayer à nouveau."
 
-#: src/mimeview.c:1330
+#: src/mimeview.c:1322
 msgid "Checking signature..."
 msgstr "Vérification de la signature en cours.."
 
-#: src/mimeview.c:1373
+#: src/mimeview.c:1363
 msgid "Go back to email"
 msgstr "Revenir à l'email"
 
-#: src/mimeview.c:1769
-#: src/mimeview.c:1858
-#: src/mimeview.c:2050
-#: src/mimeview.c:2093
-#: src/mimeview.c:2224
-#: src/plugins/fancy/fancy_viewer.c:420
+#: src/mimeview.c:1763
+#: src/mimeview.c:1852
+#: src/mimeview.c:2044
+#: src/mimeview.c:2080
+#: src/mimeview.c:2192
+#: src/plugins/fancy/fancy_viewer.c:421
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Échec lors de l'enregistrement d'une partie d'un message multipart : %s"
 
-#: src/mimeview.c:1847
+#: src/mimeview.c:1841
 #: src/textview.c:3118
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Écraser le fichier existant « %s » ?"
 
-#: src/mimeview.c:1889
+#: src/mimeview.c:1883
 #: src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
 msgstr "Sélection du dossier de destination"
 
-#: src/mimeview.c:1896
+#: src/mimeview.c:1890
 #: src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "« %s » n'est pas un dossier."
 
-#: src/mimeview.c:2125
-msgid "No registered viewer for this file type."
-msgstr "Aucun programme n'est référencé pour afficher ce type de fichier."
-
-#: src/mimeview.c:2157
-#: src/mimeview.c:2164
+#: src/mimeview.c:2127
+#: src/mimeview.c:2134
 #: src/textview.c:3039
 msgid "Open with"
 msgstr "Ouvrir avec"
 
-#: src/mimeview.c:2158
-#: src/mimeview.c:2165
+#: src/mimeview.c:2128
+#: src/mimeview.c:2135
 #: src/textview.c:3040
 #, c-format
 msgid ""
@@ -9100,11 +9104,11 @@ msgstr ""
 "Veuillez saisir la ligne de commande pour ouvrir le fichier :\n"
 "('%s' sera remplacé par le chemin du fichier)"
 
-#: src/mimeview.c:2258
+#: src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "Exécuter un binaire inconnu ?"
 
-#: src/mimeview.c:2259
+#: src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is dangerous and could probably lead to compromission of your computer.\n"
 "\n"
@@ -9114,99 +9118,99 @@ msgstr ""
 "\n"
 "Voulez-vous exécuter ce binaire ?"
 
-#: src/mimeview.c:2263
+#: src/mimeview.c:2231
 msgid "Run binary"
 msgstr "Exécuter le binaire"
 
-#: src/mimeview.c:2565
+#: src/mimeview.c:2533
 msgid "Type:"
 msgstr "Type :"
 
-#: src/mimeview.c:2566
+#: src/mimeview.c:2534
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Size:"
 msgstr "Taille :"
 
-#: src/mimeview.c:2578
+#: src/mimeview.c:2546
 #: src/plugins/vcalendar/vcalendar.c:1271
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1730
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1741
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1751
 msgid "Description:"
 msgstr "Description :"
 
-#: src/news.c:300
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "La connexion NNTP vers %s:%d a été coupée.\n"
 
-#: src/news.c:333
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Compte '%s' : Connexion au serveur SMTP : %s:%d..\n"
 
-#: src/news.c:354
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Erreur de connexion à %s:%d...\n"
 
-#: src/news.c:432
+#: src/news.c:438
 msgid "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr "Libetpan ne supporte pas le code retour 480 donc nous choisissons de continuer\n"
 
-#: src/news.c:441
+#: src/news.c:447
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Le mode de lecture a échoué, erreur ignorée\n"
 
-#: src/news.c:445
+#: src/news.c:451
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Erreur de création de session avec %s:%d\n"
 
-#: src/news.c:459
+#: src/news.c:466
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Erreur d'authentification à %s:%d...\n"
 
-#: src/news.c:484
+#: src/news.c:491
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr "Claws Mail nécessite un accès réseau pour accéder au serveur de groupes de discussion."
 
-#: src/news.c:853
+#: src/news.c:862
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "Impossible de sélectionner le groupe : %s\n"
 
-#: src/news.c:1042
-#: src/news.c:1212
+#: src/news.c:1051
+#: src/news.c:1221
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "Impossible de définir le groupe : %s\n"
 
-#: src/news.c:1051
+#: src/news.c:1060
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "Intervalle d'articles invalide : %d - %d\n"
 
-#: src/news.c:1121
-#: src/news.c:1145
-#: src/news.c:1169
+#: src/news.c:1130
+#: src/news.c:1154
+#: src/news.c:1178
 msgid "couldn't get xhdr\n"
 msgstr "Impossible d'obtenir xhdr\n"
 
-#: src/news.c:1205
+#: src/news.c:1214
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "Exécution de xover %d - %d sur %s..\n"
 
-#: src/news.c:1220
+#: src/news.c:1229
 msgid "couldn't get xover\n"
 msgstr "Impossible de faire un xover.\n"
 
-#: src/news.c:1235
+#: src/news.c:1244
 msgid "invalid xover line\n"
 msgstr "Ligne xover invalide\n"
 
-#: src/news.c:1450
+#: src/news.c:1459
 msgid ""
 "You have one or more News accounts defined. However this version of Claws Mail has been built without News support; your News account(s) are disabled.\n"
 "\n"
@@ -9598,7 +9602,7 @@ msgstr "Chemin et nom de l'archive"
 
 #: src/plugins/archive/archiver_gtk.c:1045
 #: src/plugins/archive/archiver_prefs.c:198
-#: src/plugins/pgpcore/select-keys.c:424
+#: src/plugins/pgpcore/select-keys.c:420
 msgid "_Select"
 msgstr "_Sélectionner"
 
@@ -9833,12 +9837,12 @@ msgstr "Ce message n'a pas de pièces jointes."
 msgid "Remove attachments..."
 msgstr "Supprimer les pièces jointes..."
 
-#: src/plugins/att_remover/att_remover.c:507
-#: src/plugins/att_remover/att_remover.c:574
+#: src/plugins/att_remover/att_remover.c:506
+#: src/plugins/att_remover/att_remover.c:566
 msgid "AttRemover"
 msgstr "AttRemover"
 
-#: src/plugins/att_remover/att_remover.c:579
+#: src/plugins/att_remover/att_remover.c:571
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -9848,7 +9852,7 @@ msgstr ""
 "\n"
 "Attention : cette opération est définitive et les pièces jointes supprimées seront perdues pour toujours."
 
-#: src/plugins/att_remover/att_remover.c:603
+#: src/plugins/att_remover/att_remover.c:595
 msgid "Attachment handling"
 msgstr "Gestion des pièces jointes"
 
@@ -9882,43 +9886,58 @@ msgstr "Impossible d'enregistrer le connecteur 'check before send' dans le modul
 msgid "Warns user if some reference to attachments is found in the message text and no file is attached."
 msgstr "Vérifie la présence de fichiers joints lorsqu'ils sont mentionnés dans le texte."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:53
+#: src/plugins/attachwarner/attachwarner_prefs.c:54
 msgid "attach"
 msgstr "attach"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:80
-msgid ""
-"Warn when matching the following regular expressions:\n"
-"(one per line)"
+#: src/plugins/attachwarner/attachwarner_prefs.c:85
+msgid "One of the following regular expressions is matched (one per line):"
 msgstr ""
-"Prévenir lorsque les expressions régulières suivantes sont présentes:\n"
+"Une ou plusieurs des expressions régulières suivantes sont présentes:\n"
 "(une par ligne)"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:99
-msgid "Skip quoted lines"
-msgstr "Ne pas vérifier les citations"
+#: src/plugins/attachwarner/attachwarner_prefs.c:89
+msgid "Expressions are case sensitive"
+msgstr "Les expressions sont sensibles à la casse"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:96
+msgid "Case sensitive when matching for the regular expressions in the list"
+msgstr "Vérifier les expressions régulières en différençiant majuscules et minuscules"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:114
+msgid "Lines starting with quotation marks"
+msgstr "Lignes commençant par les caractères de citation"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:106
-msgid "Exclude quoted lines from checking for the regular expressions above"
-msgstr "Les expressions régulières ci-dessus ne seront pas vérifiées dans les citations"
+#: src/plugins/attachwarner/attachwarner_prefs.c:121
+msgid "Exclude quoted lines from checking for the regular expressions above. Note that handmade quotes cannot be distinguished from quotes generated by replying."
+msgstr "Exclure les lignes de citation lors de la vérification. Notez que les citations faites manuellement ne peuvent pas être distinguées des citations automatiquement générées lors de la réponse."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:109
-msgid "Skip forwards and redirections"
-msgstr "Ne pas vérifier les messages transférés ou redirigés"
+#: src/plugins/attachwarner/attachwarner_prefs.c:124
+msgid "Forwarded or redirected messages"
+msgstr "Messages transférés ou redirigés"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:116
+#: src/plugins/attachwarner/attachwarner_prefs.c:131
 msgid "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr "Les expressions régulières ci-dessus ne seront pas vérifiées dans les messages transférés ainsi que dans les redirections"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:119
-msgid "Skip signature"
-msgstr "Ignorer la signature"
+#: src/plugins/attachwarner/attachwarner_prefs.c:134
+#: src/prefs_msg_colors.c:362
+msgid "Signatures"
+msgstr "Signature"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:126
+#: src/plugins/attachwarner/attachwarner_prefs.c:141
 msgid "Exclude lines from the first signature-separator onwards from checking for the regular expressions above"
 msgstr "Exclure les lignes qui suivent le premier séparateur de signature rencontré lors de la recherche des expressions régulières ci-dessus"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:202
+#: src/plugins/attachwarner/attachwarner_prefs.c:147
+msgid "Warn when"
+msgstr "Alerter lorsque"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:151
+msgid "Excluding"
+msgstr "Exclure"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:229
 msgid "Attach Warner"
 msgstr "Attach Warner"
 
@@ -10091,7 +10110,7 @@ msgstr "Les messages d'un volume supérieur ne seront pas analysés."
 #: src/plugins/bogofilter/bogofilter_gtk.c:170
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
 #: src/plugins/spamassassin/spamassassin_gtk.c:370
-#: src/prefs_account.c:1487
+#: src/prefs_account.c:1483
 msgid "KB"
 msgstr "ko"
 
@@ -10495,93 +10514,93 @@ msgstr ""
 "\n"
 "Il n'est pas vraiment utile."
 
-#: src/plugins/fancy/fancy_viewer.c:391
+#: src/plugins/fancy/fancy_viewer.c:392
 msgid "Remote content loading is disabled."
 msgstr "Le chargement de données distantes est désactivé."
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:469
 msgid "Load images"
 msgstr "Charger les images"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:471
 msgid "Enable remote content"
 msgstr "Activer le chargement du contenu distant"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:473
 msgid "Enable Javascript"
 msgstr "Activer JavaScript"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:475
 msgid "Enable Plugins"
 msgstr "Activer les modules"
 
-#: src/plugins/fancy/fancy_viewer.c:476
+#: src/plugins/fancy/fancy_viewer.c:477
 msgid "Enable Java"
 msgstr "Activer Java"
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:479
 msgid "Open links with external browser"
 msgstr "Ouvrir les liens avec le navigateur externe"
 
-#: src/plugins/fancy/fancy_viewer.c:647
+#: src/plugins/fancy/fancy_viewer.c:648
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Une erreur s'est produite : %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:698
+#: src/plugins/fancy/fancy_viewer.c:704
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s est un flux invalide ou non supporté"
 
-#: src/plugins/fancy/fancy_viewer.c:709
+#: src/plugins/fancy/fancy_viewer.c:715
 msgid "Search the Web"
 msgstr "Chercher sur le Web"
 
-#: src/plugins/fancy/fancy_viewer.c:721
+#: src/plugins/fancy/fancy_viewer.c:727
 msgid "Open in Viewer"
 msgstr "Ouvrir ici"
 
-#: src/plugins/fancy/fancy_viewer.c:723
+#: src/plugins/fancy/fancy_viewer.c:729
 msgid "Open in Viewer (enable remote content)"
 msgstr "Ouvrir ici (activez le contenu distant)"
 
-#: src/plugins/fancy/fancy_viewer.c:732
+#: src/plugins/fancy/fancy_viewer.c:738
 msgid "Open in Browser"
 msgstr "Ouvrir avec le navigateur"
 
-#: src/plugins/fancy/fancy_viewer.c:742
+#: src/plugins/fancy/fancy_viewer.c:748
 msgid "Open Image"
 msgstr "Ouvrir l'image"
 
-#: src/plugins/fancy/fancy_viewer.c:751
+#: src/plugins/fancy/fancy_viewer.c:757
 msgid "Copy Link"
 msgstr "Copier le lien"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:761
 msgid "Download Link"
 msgstr "Télécharger le lien"
 
-#: src/plugins/fancy/fancy_viewer.c:766
+#: src/plugins/fancy/fancy_viewer.c:772
 msgid "Save Image As"
 msgstr "Enregistrer l'image sous"
 
-#: src/plugins/fancy/fancy_viewer.c:776
+#: src/plugins/fancy/fancy_viewer.c:782
 msgid "Copy Image"
 msgstr "Copier l'image"
 
-#: src/plugins/fancy/fancy_viewer.c:794
+#: src/plugins/fancy/fancy_viewer.c:800
 msgid "Import feed"
 msgstr "Importer le flux"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1013
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1032
+#: src/plugins/fancy/fancy_viewer.c:1038
 msgid "Fancy HTML Viewer"
 msgstr "Fancy - rendu HTML"
 
-#: src/plugins/fancy/fancy_viewer.c:1037
+#: src/plugins/fancy/fancy_viewer.c:1043
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10778,7 +10797,7 @@ msgid "GData plugin: Starting async authentication\n"
 msgstr "Module GData : lancement asynchrone de l'identification\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/prefs_account.c:1724
+#: src/prefs_account.c:1720
 msgid "Authentication"
 msgstr "Authentification"
 
@@ -10789,7 +10808,7 @@ msgstr "Utilisateur :"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:91
 #: src/plugins/spam_report/spam_report_prefs.c:165
-#: src/wizard.c:1601
+#: src/wizard.c:1413
 msgid "Password:"
 msgstr "Mot de passe :"
 
@@ -10869,7 +10888,7 @@ msgstr ""
 "Veuillez saisir le chemin vers la boîte aux lettres.\n"
 "(Si elle existe déjà, elle sera automatiquement analysée.)"
 
-#: src/plugins/mailmbox/plugin_gtk.c:323
+#: src/plugins/mailmbox/plugin_gtk.c:322
 #, c-format
 msgid ""
 "All folder(s) and message(s) under '%s' will be deleted.\n"
@@ -10879,21 +10898,22 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment les supprimer ?"
 
-#: src/plugins/newmail/newmail.c:110
-#: src/plugins/newmail/newmail.c:153
+#: src/plugins/newmail/newmail.c:111
+#: src/plugins/newmail/newmail.c:162
 msgid "NewMail"
 msgstr "NewMail"
 
-#: src/plugins/newmail/newmail.c:115
+#: src/plugins/newmail/newmail.c:116
 msgid "Failed to register newmail hook"
 msgstr "Échec lors de la déclaration du hook de newmail"
 
-#: src/plugins/newmail/newmail.c:132
+#: src/plugins/newmail/newmail.c:137
+#: src/plugins/newmail/newmail.c:140
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "Impossible d'ouvrir le fichier de log %s : %s\n"
 
-#: src/plugins/newmail/newmail.c:145
+#: src/plugins/newmail/newmail.c:154
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received after sorting.\n"
@@ -10909,7 +10929,7 @@ msgstr ""
 "\n"
 "Le fichier courant est %s"
 
-#: src/plugins/newmail/newmail.c:179
+#: src/plugins/newmail/newmail.c:188
 msgid "Log file"
 msgstr "Fichier de log"
 
@@ -11031,6 +11051,11 @@ msgstr "Nouveau message inconnu"
 msgid "Unknown message type arrived"
 msgstr "Un nouveau message de type inconnu est arrivé"
 
+#: src/plugins/notification/notification_popup.c:381
+#: src/plugins/notification/notification_trayicon.c:647
+msgid "Present main window"
+msgstr "Présenter la fenêtre principale"
+
 #: src/plugins/notification/notification_popup.c:491
 msgid "Mail message"
 msgstr "Message email"
@@ -11091,7 +11116,7 @@ msgstr "Popup"
 
 #: src/plugins/notification/notification_prefs.c:464
 #: src/prefs_actions.c:263
-#: src/prefs_receive.c:147
+#: src/prefs_receive.c:133
 msgid "Command"
 msgstr "Commande"
 
@@ -11160,15 +11185,15 @@ msgid "Show banner"
 msgstr "Montrer la bannière"
 
 #: src/plugins/notification/notification_prefs.c:746
-#: src/plugins/pgpcore/select-keys.c:242
+#: src/plugins/pgpcore/select-keys.c:238
 #: src/plugins/pgpcore/sgpgme.c:144
-#: src/prefs_receive.c:197
+#: src/prefs_receive.c:183
 #: src/prefs_summaries.c:462
 msgid "Never"
 msgstr "Jamais"
 
 #: src/plugins/notification/notification_prefs.c:748
-#: src/prefs_receive.c:195
+#: src/prefs_receive.c:181
 #: src/prefs_summaries.c:444
 #: src/prefs_summaries.c:463
 msgid "Always"
@@ -11481,82 +11506,82 @@ msgstr "Format :"
 msgid "Optimized:"
 msgstr "Optimisé :"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1165
+#: src/plugins/pdf_viewer/poppler_viewer.c:1181
 msgid "PDF properties"
 msgstr "Propriétés du PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1263
+#: src/plugins/pdf_viewer/poppler_viewer.c:1279
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1322
+#: src/plugins/pdf_viewer/poppler_viewer.c:1338
 #, c-format
 msgid "%s Document"
 msgstr "Document %s"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1328
+#: src/plugins/pdf_viewer/poppler_viewer.c:1344
 #, c-format
 msgid "of %d"
 msgstr "sur %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1705
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1721
+#: src/plugins/pdf_viewer/poppler_viewer.c:1943
 msgid "Document Index"
 msgstr "Index du document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1895
+#: src/plugins/pdf_viewer/poppler_viewer.c:1911
 msgid "First Page"
 msgstr "Première page"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1898
+#: src/plugins/pdf_viewer/poppler_viewer.c:1914
 msgid "Previous Page"
 msgstr "Page précédente"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1901
+#: src/plugins/pdf_viewer/poppler_viewer.c:1917
 msgid "Next Page"
 msgstr "Page suivante"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1904
+#: src/plugins/pdf_viewer/poppler_viewer.c:1920
 msgid "Last Page"
 msgstr "Dernière page"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1907
+#: src/plugins/pdf_viewer/poppler_viewer.c:1923
 msgid "Zoom In"
 msgstr "Zoomer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1909
+#: src/plugins/pdf_viewer/poppler_viewer.c:1925
 msgid "Zoom Out"
 msgstr "Dézoomer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1912
+#: src/plugins/pdf_viewer/poppler_viewer.c:1928
 msgid "Fit Page"
 msgstr "Adapter à la taille"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1915
+#: src/plugins/pdf_viewer/poppler_viewer.c:1931
 msgid "Fit Page Width"
 msgstr "Adapter à la largeur"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1918
+#: src/plugins/pdf_viewer/poppler_viewer.c:1934
 msgid "Rotate Left"
 msgstr "Pivoter à gauche"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1921
+#: src/plugins/pdf_viewer/poppler_viewer.c:1937
 msgid "Rotate Right"
 msgstr "Pivoter à droite"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1940
 msgid "Document Info"
 msgstr "Informations"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1929
+#: src/plugins/pdf_viewer/poppler_viewer.c:1945
 msgid "Page Number"
 msgstr "Numéro de page"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1931
+#: src/plugins/pdf_viewer/poppler_viewer.c:1947
 msgid "Zoom Factor"
 msgstr "Facteur de zoom"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2036
+#: src/plugins/pdf_viewer/poppler_viewer.c:2052
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the Poppler %s Lib and the gs tool.\n"
@@ -11567,13 +11592,13 @@ msgstr ""
 "\n"
 "Retours bienvenus: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2042
-#: src/plugins/pdf_viewer/poppler_viewer.c:2050
-#: src/plugins/pdf_viewer/poppler_viewer.c:2070
+#: src/plugins/pdf_viewer/poppler_viewer.c:2058
+#: src/plugins/pdf_viewer/poppler_viewer.c:2066
+#: src/plugins/pdf_viewer/poppler_viewer.c:2086
 msgid "PDF Viewer"
 msgstr "Lecteur PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2046
+#: src/plugins/pdf_viewer/poppler_viewer.c:2062
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to process PostScript attachments, only PDF attachments will be displayed. To enable PostScript support please install gs program.\n"
@@ -11584,64 +11609,100 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/python/python_plugin.c:338
-#: src/plugins/python/python_plugin.c:482
+#: src/plugins/python/python_plugin.c:358
+#: src/plugins/python/python_plugin.c:502
 msgid "Python scripts"
 msgstr "Scripts Python"
 
-#: src/plugins/python/python_plugin.c:477
+#: src/plugins/python/python_plugin.c:497
 msgid "Show Python console..."
 msgstr "Afficher la console Python.."
 
-#: src/plugins/python/python_plugin.c:483
+#: src/plugins/python/python_plugin.c:503
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: src/plugins/python/python_plugin.c:485
-#: src/prefs_account.c:2488
-#: src/prefs_account.c:2510
-#: src/prefs_account.c:2769
-#: src/wizard.c:1379
-#: src/wizard.c:1658
+#: src/plugins/python/python_plugin.c:505
+#: src/prefs_account.c:2480
+#: src/prefs_account.c:2502
+#: src/prefs_account.c:2761
+#: src/wizard.c:1191
+#: src/wizard.c:1465
 msgid "Browse"
 msgstr "Pa_rcourir"
 
-#: src/plugins/python/python_plugin.c:548
-#: src/plugins/python/python_plugin.c:602
+#: src/plugins/python/python_plugin.c:646
+#: src/plugins/python/python_plugin.c:725
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:554
+#: src/plugins/python/python_plugin.c:652
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Impossible d'enregistrer le connecteur 'compose create hook' dans le module Python"
 
-#: src/plugins/python/python_plugin.c:607
+#: src/plugins/python/python_plugin.c:730
 msgid ""
 "This plugin provides Python integration features.\n"
+"Python code can be entered interactively into an embedded Python console, under Tools -> Show Python console, or stored in scripts.\n"
+"\n"
+"These scripts are then available via the menu. You can assign keyboard shortcuts to them just like it is done with other menu items. You can also put buttons for script invokation into the toolbars using Claws Mail's builtin toolbar editor.\n"
+"\n"
+"You can provide scripts working on the main window by placing files into ~/.claws-mail/python-scripts/main.\n"
+"\n"
+"You can also provide scripts working on an open compose window by placing files into ~/.claws-mail/python-scripts/compose.\n"
+"\n"
+"The folder ~/.claws-mail/python-scripts/auto/ may contain some scripts that are automatically executed when certain events occur. Currently, the following files in this directory are recognised:\n"
+"\n"
+"compose_any\n"
+"Gets executed whenever a compose window is opened, no matterif that opening happened as a result of composing a new message,replying or forwarding a message.\n"
+"\n"
+"startup\n"
+"Executed at plugin load\n"
+"\n"
+"shutdown\n"
+"Executed at plugin unload\n"
+"\n"
 "\n"
 "For the most up-to-date API documentation, type\n"
 "\n"
 " help(clawsmail)\n"
 "\n"
-"in the interactive Python console under Tools -> Show Python console.\n"
+"in the interactive Python console.\n"
 "\n"
 "The source distribution of this plugin comes with various example scripts in the \"examples\" subdirectory. If you wrote a script that you would be interested in sharing, feel free to send it to me to have it considered for inclusion in the examples.\n"
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"Ce module permet l'intégration de fonctionnalités Python.\n"
+"Ce module fournit une intégration avec Python.\n"
+"Du code Python peut être saisi de manière interactive dans une console Python (menu Outils -> Montrer la console Python) ou bien enregistré dans des scripts.\n"
 "\n"
-"Pour consulter la documentation de l'API, tapez\n"
+"Ces scripts sont ensuite disponibles dans le menu. Vous pouvez leur assigner des raccourcis claviers comme pour les autres entrées de menu. Vous pouvez aussi créer des boutons dans les barres d'outils pour invoquer vos scripts, en utilisant l'éditeur de barres d'outils de Claws Mail.\n"
 "\n"
-" help(clawsmail)\n"
+"Vous pouvez fournir au module Python des scripts fonctionnant sur la fenêtre principale en les enregistrant dans ~/.claws-mail/python-scripts/main/.\n"
 "\n"
-"dans la console interactive Python disponible dans Outils -> Afficher la console Python.\n"
+"Pour des scripts fonctionnant sur les fenêtres de composition de messaage, enregistrez-les dans ~/.claws-mail/python-scripts/compose/.\n"
 "\n"
-"Vous trouverez de nombreux exemples de scripts Python dans le répertoire \"examples\" contenu dans les sources de ce module. Si vous avez écrit un script Python et souhaitez en faire bénéficier les autres utilisateurs, envoyez-le moi et je l'ajouterai volontiers dans le répertoire des exemples.\n"
+"Le dossier ~/.claws-mail/python-scripts/auto/ est l'endroit où enregistrer des scripts à exécuter automatiquement lors de certains évènements. Actuellement, les fichiers suivants dans le répertoire \"auto\" sont gérés :\n"
 "\n"
-"Vos commentaires et retours sont les bienvenus auprès de <berndth at gmx.de>."
+"compose_any\n"
+"Exécuté lorsqu'une fenêtre de composition de message est ouverte (nouveau message, réponse ou bien transfert).\n"
+"\n"
+"startup\n"
+"Exécuté au chargement du module.\n"
+"\n"
+"shutdown\n"
+"Exécuté au déchargement du module.\n"
+"\n"
+"\n"
+"Pour une documentation à jour, dans la console Python, vous pouvez taper\n"
+"\n"
+" help(clawsmail)\n"
+"\n"
+"Avec le code source de ce module sont fournis divers scripts d'exemples dans le sous-répertoire \"examples\". Si vous écrivez un script que vous voudriez partager, vous pouvez me l'envoyer pour intégration dans les exemples.\n"
+"\n"
+"Les remarques et suggestions sont les bienvenues à l'adresse <berndth at gmx.de>."
 
-#: src/plugins/python/python_plugin.c:636
+#: src/plugins/python/python_plugin.c:781
 msgid "Python integration"
 msgstr "Intégration à Python"
 
@@ -11650,11 +11711,11 @@ msgstr "Intégration à Python"
 msgid "Passphrase"
 msgstr "Phrase secrète"
 
-#: src/plugins/pgpcore/passphrase.c:253
+#: src/plugins/pgpcore/passphrase.c:249
 msgid "[no user id]"
 msgstr "[pas d'ID utilisateur]"
 
-#: src/plugins/pgpcore/passphrase.c:264
+#: src/plugins/pgpcore/passphrase.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the new key:</span>\n"
@@ -11665,11 +11726,11 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:267
+#: src/plugins/pgpcore/passphrase.c:263
 msgid "Passphrases did not match.\n"
 msgstr "Les phrases secrètes ne correspondent pas.\n"
 
-#: src/plugins/pgpcore/passphrase.c:270
+#: src/plugins/pgpcore/passphrase.c:266
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the new key:</span>\n"
@@ -11680,7 +11741,7 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:274
+#: src/plugins/pgpcore/passphrase.c:270
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</span>\n"
@@ -11691,7 +11752,7 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:277
+#: src/plugins/pgpcore/passphrase.c:273
 msgid "Bad passphrase.\n"
 msgstr "Phrase secrète incorrecte.\n"
 
@@ -11824,7 +11885,7 @@ msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Mettre 0 pour la mémoriser pendant toute la session"
 
 #: src/plugins/pgpcore/prefs_gpg.c:145
-#: src/prefs_receive.c:173
+#: src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "minute(s)"
 
@@ -11878,55 +11939,55 @@ msgstr "Pas de correspondance exacte pour '%s' ; veuillez sélectionner la clé.
 msgid "Collecting info for '%s' ... %c"
 msgstr "Récupération d'infos pour '%s' .. %c"
 
-#: src/plugins/pgpcore/select-keys.c:239
+#: src/plugins/pgpcore/select-keys.c:235
 #: src/plugins/pgpcore/sgpgme.c:142
 msgid "Undefined"
 msgstr "Indéfinie"
 
-#: src/plugins/pgpcore/select-keys.c:245
+#: src/plugins/pgpcore/select-keys.c:241
 #: src/plugins/pgpcore/sgpgme.c:146
 msgid "Marginal"
 msgstr "Marginale"
 
-#: src/plugins/pgpcore/select-keys.c:251
+#: src/plugins/pgpcore/select-keys.c:247
 #: src/plugins/pgpcore/sgpgme.c:150
 msgid "Ultimate"
 msgstr "Ultime"
 
-#: src/plugins/pgpcore/select-keys.c:370
+#: src/plugins/pgpcore/select-keys.c:366
 msgid "Select Keys"
 msgstr "Sélection de clés"
 
-#: src/plugins/pgpcore/select-keys.c:397
+#: src/plugins/pgpcore/select-keys.c:393
 msgid "Key ID"
 msgstr "ID de la clé"
 
-#: src/plugins/pgpcore/select-keys.c:400
+#: src/plugins/pgpcore/select-keys.c:396
 msgid "Trust"
 msgstr "Confiance"
 
-#: src/plugins/pgpcore/select-keys.c:425
+#: src/plugins/pgpcore/select-keys.c:421
 msgid "_Other"
 msgstr "_Autres"
 
-#: src/plugins/pgpcore/select-keys.c:426
+#: src/plugins/pgpcore/select-keys.c:422
 msgid "Do_n't encrypt"
 msgstr "_Ne pas chiffrer"
 
-#: src/plugins/pgpcore/select-keys.c:585
+#: src/plugins/pgpcore/select-keys.c:581
 msgid "Add key"
 msgstr "Ajouter une clé"
 
-#: src/plugins/pgpcore/select-keys.c:586
+#: src/plugins/pgpcore/select-keys.c:582
 msgid "Enter another user or key ID:"
 msgstr "Veuillez saisir un autre utilisateur ou l'ID de la clé :"
 
-#: src/plugins/pgpcore/select-keys.c:608
+#: src/plugins/pgpcore/select-keys.c:604
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Chiffrement vers %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:609
+#: src/plugins/pgpcore/select-keys.c:605
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -12154,62 +12215,62 @@ msgstr "Échec lors de l'exportation de la clé."
 msgid "Key export isn't implemented in Windows."
 msgstr "L'exportation de clés n'est pas implémentée sous Windows."
 
-#: src/plugins/pgpinline/pgpinline.c:258
+#: src/plugins/pgpinline/pgpinline.c:156
 msgid "Incorrect part"
 msgstr "Partie incorrecte"
 
-#: src/plugins/pgpinline/pgpinline.c:262
+#: src/plugins/pgpinline/pgpinline.c:160
 msgid "Not a text part"
 msgstr "N'est pas une partie texte"
 
-#: src/plugins/pgpinline/pgpinline.c:273
-#: src/plugins/pgpinline/pgpinline.c:430
+#: src/plugins/pgpinline/pgpinline.c:171
+#: src/plugins/pgpinline/pgpinline.c:323
 msgid "Couldn't get text data."
 msgstr "Échec lors de la récupération du texte."
 
-#: src/plugins/pgpinline/pgpinline.c:291
+#: src/plugins/pgpinline/pgpinline.c:189
 msgid "Couldn't convert text data to any sane charset."
 msgstr "Échec lors de la conversion du texte dans un jeu de caractère adapté."
 
-#: src/plugins/pgpinline/pgpinline.c:299
-#: src/plugins/pgpinline/pgpinline.c:624
-#: src/plugins/pgpinline/pgpinline.c:763
-#: src/plugins/pgpinline/pgpinline.c:819
-#: src/plugins/pgpmime/pgpmime.c:73
-#: src/plugins/pgpmime/pgpmime.c:182
-#: src/plugins/pgpmime/pgpmime.c:322
-#: src/plugins/pgpmime/pgpmime.c:500
-#: src/plugins/pgpmime/pgpmime.c:644
-#: src/plugins/smime/smime.c:406
+#: src/plugins/pgpinline/pgpinline.c:197
+#: src/plugins/pgpinline/pgpinline.c:517
+#: src/plugins/pgpinline/pgpinline.c:656
+#: src/plugins/pgpinline/pgpinline.c:712
+#: src/plugins/pgpmime/pgpmime.c:74
+#: src/plugins/pgpmime/pgpmime.c:183
+#: src/plugins/pgpmime/pgpmime.c:329
+#: src/plugins/pgpmime/pgpmime.c:507
+#: src/plugins/pgpmime/pgpmime.c:651
+#: src/plugins/smime/smime.c:395
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Impossible d'initialiser le contexte GPG, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:423
+#: src/plugins/pgpinline/pgpinline.c:316
 msgid "Couldn't parse mime part."
 msgstr "Impossible d'analyser la partie MIME."
 
-#: src/plugins/pgpinline/pgpinline.c:453
-#: src/plugins/pgpmime/pgpmime.c:345
+#: src/plugins/pgpinline/pgpinline.c:346
+#: src/plugins/pgpmime/pgpmime.c:352
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Impossible d'ouvrir le fichier déchiffré %s"
 
-#: src/plugins/pgpinline/pgpinline.c:470
-#: src/plugins/pgpinline/pgpinline.c:479
-#: src/plugins/pgpinline/pgpinline.c:488
-#: src/plugins/pgpinline/pgpinline.c:496
-#: src/plugins/pgpinline/pgpinline.c:506
-#: src/plugins/pgpinline/pgpinline.c:515
-#: src/plugins/pgpmime/pgpmime.c:356
-#: src/plugins/pgpmime/pgpmime.c:370
+#: src/plugins/pgpinline/pgpinline.c:363
+#: src/plugins/pgpinline/pgpinline.c:372
+#: src/plugins/pgpinline/pgpinline.c:381
+#: src/plugins/pgpinline/pgpinline.c:389
+#: src/plugins/pgpinline/pgpinline.c:399
+#: src/plugins/pgpinline/pgpinline.c:408
+#: src/plugins/pgpmime/pgpmime.c:363
+#: src/plugins/pgpmime/pgpmime.c:377
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "Impossible d'écrire dans le fichier déchiffré %s"
 
-#: src/plugins/pgpinline/pgpinline.c:484
-#: src/plugins/pgpinline/pgpinline.c:485
-#: src/plugins/pgpinline/pgpinline.c:486
+#: src/plugins/pgpinline/pgpinline.c:377
+#: src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:379
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -12217,80 +12278,80 @@ msgstr ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:502
-#: src/plugins/pgpinline/pgpinline.c:503
-#: src/plugins/pgpinline/pgpinline.c:504
+#: src/plugins/pgpinline/pgpinline.c:395
+#: src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:397
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- End of PGP/Inline encrypted data ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:523
-#: src/plugins/pgpmime/pgpmime.c:382
+#: src/plugins/pgpinline/pgpinline.c:416
+#: src/plugins/pgpmime/pgpmime.c:389
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "Impossible de fermer le fichier déchiffré %s"
 
-#: src/plugins/pgpinline/pgpinline.c:535
+#: src/plugins/pgpinline/pgpinline.c:428
 msgid "Couldn't scan decrypted file."
 msgstr "Impossible d'analyser le fichier déchiffré."
 
-#: src/plugins/pgpinline/pgpinline.c:543
+#: src/plugins/pgpinline/pgpinline.c:436
 msgid "Couldn't scan decrypted file parts."
 msgstr "Impossible d'analyser les parties du fichier déchiffré."
 
-#: src/plugins/pgpinline/pgpinline.c:598
-#: src/plugins/pgpinline/pgpinline.c:790
+#: src/plugins/pgpinline/pgpinline.c:491
+#: src/plugins/pgpinline/pgpinline.c:683
 msgid "Malformed message"
 msgstr "Message non conforme"
 
-#: src/plugins/pgpinline/pgpinline.c:609
+#: src/plugins/pgpinline/pgpinline.c:502
 msgid "Couldn't create temporary file."
 msgstr "Impossible de créer un fichier temporaire."
 
-#: src/plugins/pgpinline/pgpinline.c:648
-#: src/plugins/pgpmime/pgpmime.c:527
+#: src/plugins/pgpinline/pgpinline.c:541
+#: src/plugins/pgpmime/pgpmime.c:534
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "La signature des données a échoué, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:666
-#: src/plugins/pgpmime/pgpmime.c:552
+#: src/plugins/pgpinline/pgpinline.c:559
+#: src/plugins/pgpmime/pgpmime.c:559
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "La signature des données a échoué à cause d'un signataire non valide : %s"
 
-#: src/plugins/pgpinline/pgpinline.c:675
-#: src/plugins/pgpmime/pgpmime.c:561
+#: src/plugins/pgpinline/pgpinline.c:568
+#: src/plugins/pgpmime/pgpmime.c:568
 msgid "Data signing failed, no results."
 msgstr "La signature des données a échoué. Il n'y a pas de résultats."
 
-#: src/plugins/pgpinline/pgpinline.c:685
-#: src/plugins/pgpmime/pgpmime.c:572
+#: src/plugins/pgpinline/pgpinline.c:578
+#: src/plugins/pgpmime/pgpmime.c:579
 msgid "Data signing failed, no contents."
 msgstr "La signature des données a échoué. Il n'y a pas de contenu."
 
-#: src/plugins/pgpinline/pgpinline.c:729
+#: src/plugins/pgpinline/pgpinline.c:622
 msgid "Please note that attachments are not encrypted by the PGP/Inline system, nor are email headers, like Subject."
 msgstr "Veuillez prendre en compte que les pièces jointes ne sont pas chiffrées par le système PGP/Inline, ni les en-têtes de message, comme par exemple l'entête Sujet."
 
-#: src/plugins/pgpinline/pgpinline.c:773
-#: src/plugins/pgpmime/pgpmime.c:654
+#: src/plugins/pgpinline/pgpinline.c:666
+#: src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Impossible d'ajouter la clé GPG %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:801
-#: src/plugins/pgpmime/pgpmime.c:683
+#: src/plugins/pgpinline/pgpinline.c:694
+#: src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Impossible de créer un fichier temporaire, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:832
-#: src/plugins/pgpmime/pgpmime.c:710
+#: src/plugins/pgpinline/pgpinline.c:725
+#: src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Le chiffrement a échoué, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:899
+#: src/plugins/pgpinline/pgpinline.c:793
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
@@ -12316,31 +12377,31 @@ msgstr ""
 "\n"
 "GPGME est copyright 2001 par Werner Koch <dd9jn at gnu.org>."
 
-#: src/plugins/pgpmime/pgpmime.c:202
+#: src/plugins/pgpmime/pgpmime.c:203
 msgid "Signature boundary not found."
 msgstr "Séparateur de signature non trouvé."
 
-#: src/plugins/pgpmime/pgpmime.c:394
-#: src/plugins/smime/smime.c:487
+#: src/plugins/pgpmime/pgpmime.c:401
+#: src/plugins/smime/smime.c:476
 msgid "Couldn't parse decrypted file."
 msgstr "Impossible d'analyser le fichier déchiffré."
 
-#: src/plugins/pgpmime/pgpmime.c:400
-#: src/plugins/smime/smime.c:494
+#: src/plugins/pgpmime/pgpmime.c:407
+#: src/plugins/smime/smime.c:483
 msgid "Couldn't parse decrypted file parts."
 msgstr "Impossible d'analyser les parties du fichier déchiffré."
 
-#: src/plugins/pgpmime/pgpmime.c:446
-#: src/plugins/pgpmime/pgpmime.c:485
+#: src/plugins/pgpmime/pgpmime.c:453
+#: src/plugins/pgpmime/pgpmime.c:492
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Impossible de créer un fichier temporaire : %s"
 
-#: src/plugins/pgpmime/pgpmime.c:610
+#: src/plugins/pgpmime/pgpmime.c:617
 msgid "Please note that email headers, like Subject, are not encrypted by the PGP/Mime system."
 msgstr "Veuillez prendre en compte que les en-têtes de message, comme par exemple l'en-tête Sujet, ne sont pas chiffrés par le système PGP/Mime."
 
-#: src/plugins/pgpmime/pgpmime.c:780
+#: src/plugins/pgpmime/pgpmime.c:788
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -12726,7 +12787,7 @@ msgstr "Impossible de s'abonner au flux '%s'."
 
 #: src/plugins/smime/plugin.c:38
 #: src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:924
+#: src/plugins/smime/smime.c:883
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -12756,31 +12817,31 @@ msgstr ""
 "\n"
 "GPGME est copyright 2001 par Werner Koch <dd9jn at gnu.org>."
 
-#: src/plugins/smime/smime.c:414
+#: src/plugins/smime/smime.c:403
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "Impossible d'initialiser le contexte GPG, %s"
 
-#: src/plugins/smime/smime.c:442
+#: src/plugins/smime/smime.c:431
 msgid "Couldn't open temporary file"
 msgstr "Impossible de créer un fichier temporaire"
 
-#: src/plugins/smime/smime.c:453
-#: src/plugins/smime/smime.c:468
+#: src/plugins/smime/smime.c:442
+#: src/plugins/smime/smime.c:457
 msgid "Couldn't write to temporary file"
 msgstr "Impossible d'écrire dans un fichier temporaire"
 
-#: src/plugins/smime/smime.c:479
+#: src/plugins/smime/smime.c:468
 msgid "Couldn't close temporary file"
 msgstr "Impossible de fermer un fichier temporaire"
 
-#: src/plugins/smime/smime.c:695
+#: src/plugins/smime/smime.c:684
 msgid "Please note that email headers, like Subject, are not encrypted by the S/MIME system."
 msgstr "Veuillez prendre en compte que les en-têtes de message, comme par exemple l'en-tête Sujet, ne sont pas signés par le système S/Mime."
 
 #: src/plugins/spam_report/spam_report_prefs.c:80
-#: src/plugins/spam_report/spam_report.c:340
-#: src/plugins/spam_report/spam_report.c:380
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
 msgid "SpamReport"
 msgstr "SpamReport"
 
@@ -12792,15 +12853,15 @@ msgstr "Activé"
 msgid "Forward to:"
 msgstr "Transférer à :"
 
-#: src/plugins/spam_report/spam_report.c:294
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Soumission du pourriel.."
 
-#: src/plugins/spam_report/spam_report.c:329
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Soumettre le(s) pourriel(s) en ligne"
 
-#: src/plugins/spam_report/spam_report.c:385
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12815,7 +12876,7 @@ msgstr ""
 " * spamcop.net\n"
 " * Système de nomination de lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:410
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Soumission de pourriel"
 
@@ -13130,25 +13191,25 @@ msgid "You are already busy at this time."
 msgstr "Vous n'êtes pas disponible actuellement."
 
 #: src/plugins/vcalendar/vcalendar.c:1265
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1759
 msgid "Event:"
 msgstr "Évènement :"
 
 #: src/plugins/vcalendar/vcalendar.c:1266
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1727
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1737
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1748
 msgid "Organizer:"
 msgstr "Organisateur :"
 
 #: src/plugins/vcalendar/vcalendar.c:1267
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1729
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1740
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1750
 msgid "Location:"
 msgstr "Endroit :"
 
 #: src/plugins/vcalendar/vcalendar.c:1268
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1717
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1728
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1749
 msgid "Summary:"
 msgstr "Résumé :"
 
@@ -13161,8 +13222,8 @@ msgid "Ending:"
 msgstr "Fin :"
 
 #: src/plugins/vcalendar/vcalendar.c:1272
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1752
 msgid "Attendees:"
 msgstr "Invités :"
 
@@ -13170,95 +13231,95 @@ msgstr "Invités :"
 msgid "Action:"
 msgstr "Action :"
 
-#: src/plugins/vcalendar/vcal_prefs.c:256
+#: src/plugins/vcalendar/vcal_prefs.c:258
 msgid "Reminders"
 msgstr "Rappels"
 
-#: src/plugins/vcalendar/vcal_prefs.c:265
+#: src/plugins/vcalendar/vcal_prefs.c:267
 msgid "Alert me"
 msgstr "M'alerter"
 
-#: src/plugins/vcalendar/vcal_prefs.c:277
+#: src/plugins/vcalendar/vcal_prefs.c:279
 msgid "minutes before an event"
 msgstr "minutes avant un rendez-vous"
 
-#: src/plugins/vcalendar/vcal_prefs.c:289
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Calendar export"
 msgstr "Export de calendrier"
 
-#: src/plugins/vcalendar/vcal_prefs.c:300
+#: src/plugins/vcalendar/vcal_prefs.c:302
 msgid "Automatically export calendar to"
 msgstr "Exporter le calendrier automatiquement vers"
 
-#: src/plugins/vcalendar/vcal_prefs.c:309
-#: src/plugins/vcalendar/vcal_prefs.c:415
+#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:417
 msgid "You can export to a local file or URL"
 msgstr "Vous pouvez exporter vers un fichier ou un URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:313
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Veuillez saisir le chemin d'un fichier ou d'une URL (http://server/path/file.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:319
-#: src/plugins/vcalendar/vcal_prefs.c:425
-#: src/prefs_account.c:1263
-#: src/prefs_account.c:1770
+#: src/plugins/vcalendar/vcal_prefs.c:321
+#: src/plugins/vcalendar/vcal_prefs.c:427
+#: src/prefs_account.c:1259
+#: src/prefs_account.c:1766
 msgid "User ID"
 msgstr "Nom d'utilisateur"
 
-#: src/plugins/vcalendar/vcal_prefs.c:327
-#: src/plugins/vcalendar/vcal_prefs.c:433
-#: src/prefs_account.c:1269
-#: src/prefs_account.c:1790
-#: src/prefs_account.c:2499
-#: src/prefs_account.c:2521
-#: src/wizard.c:1389
-#: src/wizard.c:1668
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435
+#: src/prefs_account.c:1265
+#: src/prefs_account.c:1786
+#: src/prefs_account.c:2491
+#: src/prefs_account.c:2513
+#: src/wizard.c:1201
+#: src/wizard.c:1475
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/plugins/vcalendar/vcal_prefs.c:341
+#: src/plugins/vcalendar/vcal_prefs.c:343
 msgid "Include webcal subscriptions in export"
 msgstr "Inclure les inscriptions au(x) calendrier(s) en ligne (WebCal) dans l'export"
 
-#: src/plugins/vcalendar/vcal_prefs.c:351
+#: src/plugins/vcalendar/vcal_prefs.c:353
 msgid "Command to run after calendar export"
 msgstr "Commande à exécuter après l'export"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:382
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Enregistrer le calendrier de Claws dans l'horloge Orage d'XFCE"
 
-#: src/plugins/vcalendar/vcal_prefs.c:382
+#: src/plugins/vcalendar/vcal_prefs.c:384
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr "Permet à Orage (version supérieure à 4.4) de voir le calendrier de Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:394
+#: src/plugins/vcalendar/vcal_prefs.c:396
 msgid "Free/Busy information"
 msgstr "Informations de disponibilité"
 
-#: src/plugins/vcalendar/vcal_prefs.c:406
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Automatically export free/busy status to"
 msgstr "Exporter automatiquement l'état de disponibilité vers"
 
-#: src/plugins/vcalendar/vcal_prefs.c:417
+#: src/plugins/vcalendar/vcal_prefs.c:419
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Veuillez saisir le chemin d'un fichier ou d'une URL (http://server/path/file.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:447
+#: src/plugins/vcalendar/vcal_prefs.c:449
 msgid "Command to run after free/busy status export"
 msgstr "Commande à exécuter après l'export de l'état de disponibilité"
 
-#: src/plugins/vcalendar/vcal_prefs.c:474
+#: src/plugins/vcalendar/vcal_prefs.c:476
 msgid "Get free/busy status of others from"
 msgstr "Récupérer les informations de disponibilité des autres sur"
 
-#: src/plugins/vcalendar/vcal_prefs.c:482
+#: src/plugins/vcalendar/vcal_prefs.c:484
 #, c-format
 msgid "Specify a local file or URL (http://server/path/file.ifb). Use %u for the left part of the email address, %d for the domain"
 msgstr "Veuillez saisir le chemin d'un fichier ou d'un URL (http://@server/path/file.ifb). Utilisez %u pour la partie gauche de l'adresse email, %d pour le domaine"
 
-#: src/plugins/vcalendar/vcal_prefs.c:646
+#: src/plugins/vcalendar/vcal_prefs.c:648
 #: src/plugins/vcalendar/plugin.c:43
 #: src/plugins/vcalendar/plugin.c:64
 msgid "vCalendar"
@@ -13296,6 +13357,10 @@ msgstr "Vue _hebdomadaire"
 msgid "_Month view"
 msgstr "Vue _mensuelle"
 
+#: src/plugins/vcalendar/vcal_folder.c:1091
+msgid "Meetings"
+msgstr "Rendez-vous"
+
 #: src/plugins/vcalendar/vcal_folder.c:1475
 msgid "in the past"
 msgstr "dans le passé"
@@ -13403,11 +13468,11 @@ msgstr "S'inscrire à un calendrier en ligne (WebCal)"
 msgid "Enter the WebCal URL:"
 msgstr "Veuillez saisir l'URL du calendrier en ligne (WebCal) :"
 
-#: src/plugins/vcalendar/vcal_folder.c:1923
+#: src/plugins/vcalendar/vcal_folder.c:1921
 msgid "Could not parse the URL."
 msgstr "Impossible de comprendre l'URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1952
+#: src/plugins/vcalendar/vcal_folder.c:1950
 msgid "Do you really want to unsubscribe?"
 msgstr "Voulez-vous vraiment vous désinscrire ?"
 
@@ -13557,7 +13622,7 @@ msgid "available"
 msgstr "disponible"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:899
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1150
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1151
 msgid "Free/busy retrieval failed"
 msgstr "Echec de la vérification de disponibilité"
 
@@ -13573,26 +13638,26 @@ msgstr "Envoyer tout de même"
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr "Pas tout le monde n'est disponible. Voir les bulles d'aide pour plus d'info..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1132
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1133
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "Récupération du planning pour %s..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1159
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1160
 msgid "Available"
 msgstr "Disponible"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1172
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1179
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1187
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1180
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
 msgid "Everyone is available."
 msgstr "Tout le monde est disponible."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1189
 msgid "Everyone seems available, but some free/busy information failed to be retrieved."
 msgstr "Tout le monde semble disponible, mais un ou des statuts de disponibilité n'ontpu être récupérés."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1360
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1361
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -13600,61 +13665,61 @@ msgstr ""
 "Impossible d'envoyer l'invitation.\n"
 "Veuillez vérifier les destinataires."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1476
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1493
 msgid "Save & Send"
 msgstr "Enregistrer & envoyer"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1494
 msgid "Check availability"
 msgstr "Vérifier la disponibilité"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1600
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "<b>Starts at:</b> "
 msgstr "<b>Débute à :</b>"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1627
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1623
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1647
 msgid "<b> on:</b>"
 msgstr "<b> le :</b>"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1641
 msgid "<b>Ends at:</b> "
 msgstr "<b>Se termine à :</b>"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1661
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1682
 msgid "New meeting"
 msgstr "Nouveau rendez-vous"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1663
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1684
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Modifier le rendez-vous"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1763
 msgid "Time:"
 msgstr "Période :"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1878
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1896
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1881
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1899
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1892
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Évènement en instance : %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1893
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1911
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -13671,39 +13736,39 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1928
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "M'avertir à nouveau dans %d minute"
 msgstr[1] "M'avertir à nouveau dans %d minutes"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2036
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2054
 msgid "Empty calendar"
 msgstr "Calendrier vide"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2037
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2055
 msgid "There is nothing to export."
 msgstr "Il n'y a rien à exporter."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2077
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2095
 msgid "Could not export the calendar."
 msgstr "Impossible d'exporter le calendrier."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2112
 msgid "Export calendar to ICS"
 msgstr "Exporter le calendrier au format ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2135
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "Impossible d'exporter le calendrier vers '%s'.\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2232
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2251
 msgid "Could not export the freebusy info."
 msgstr "Impossible d'exporter les informations de disponibilité."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2263
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2283
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Impossible d'exporter les informations de disponibilité vers '%s'\n"
@@ -13784,7 +13849,7 @@ msgstr "Montrer"
 
 #: src/plugins/vcalendar/day-view.c:622
 #: src/plugins/vcalendar/month-view.c:722
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1452
 #: src/prefs_folder_item.c:562
 #: src/prefs_matcher.c:334
 msgid "days"
@@ -13953,15 +14018,15 @@ msgid "TOP command unsupported\n"
 msgstr "Commande TOP non supportée\n"
 
 #: src/prefs_account.c:332
-#: src/prefs_account.c:1430
-#: src/prefs_account.c:2416
-#: src/wizard.c:1549
+#: src/prefs_account.c:1426
+#: src/prefs_account.c:2408
+#: src/wizard.c:1361
 msgid "POP3"
 msgstr "POP3"
 
 #: src/prefs_account.c:335
-#: src/prefs_account.c:1543
-#: src/prefs_account.c:2431
+#: src/prefs_account.c:1539
+#: src/prefs_account.c:2423
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -13970,7 +14035,7 @@ msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 #: src/prefs_account.c:337
-#: src/wizard.c:1551
+#: src/wizard.c:1363
 msgid "Local mbox file"
 msgstr "Fichier mbox local"
 
@@ -14018,227 +14083,227 @@ msgstr "Ce serveur nécessite une authentification"
 msgid "Authenticate on connect"
 msgstr "Authentification à la connexion"
 
-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1216
 msgid "News server"
 msgstr "Serveur de groupes de discussion"
 
-#: src/prefs_account.c:1226
+#: src/prefs_account.c:1222
 msgid "Server for receiving"
 msgstr "Serveur de réception"
 
-#: src/prefs_account.c:1232
+#: src/prefs_account.c:1228
 msgid "Local mailbox"
 msgstr "Fichier mbox local"
 
-#: src/prefs_account.c:1239
+#: src/prefs_account.c:1235
 msgid "SMTP server (send)"
 msgstr "Serveur d'envoi (SMTP)"
 
-#: src/prefs_account.c:1247
+#: src/prefs_account.c:1243
 msgid "Use mail command rather than SMTP server"
 msgstr "Utiliser une commande externe plutôt que le serveur SMTP"
 
-#: src/prefs_account.c:1256
+#: src/prefs_account.c:1252
 msgid "command to send mails"
 msgstr "Commande externe :"
 
-#: src/prefs_account.c:1318
+#: src/prefs_account.c:1314
 #, c-format
 msgid "Account%d"
 msgstr "Compte%d"
 
-#: src/prefs_account.c:1404
+#: src/prefs_account.c:1400
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1410
-#: src/prefs_account.c:1499
+#: src/prefs_account.c:1406
+#: src/prefs_account.c:1495
 msgid "Default Inbox"
 msgstr "Dossier de réception par défaut"
 
-#: src/prefs_account.c:1417
-#: src/prefs_account.c:1424
-#: src/prefs_account.c:1506
-#: src/prefs_account.c:1513
+#: src/prefs_account.c:1413
+#: src/prefs_account.c:1420
+#: src/prefs_account.c:1502
+#: src/prefs_account.c:1509
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Les messages non filtrés seront placés dans ce dossier"
 
-#: src/prefs_account.c:1421
-#: src/prefs_account.c:1510
-#: src/prefs_account.c:1974
+#: src/prefs_account.c:1417
+#: src/prefs_account.c:1506
+#: src/prefs_account.c:1966
 #: src/prefs_customheader.c:237
 msgid "Bro_wse"
 msgstr "Pa_rcourir"
 
-#: src/prefs_account.c:1432
+#: src/prefs_account.c:1428
 msgid "Use secure authentication (APOP)"
 msgstr "Authentification sécurisée (APOP)"
 
-#: src/prefs_account.c:1435
+#: src/prefs_account.c:1431
 msgid "Remove messages on server when received"
 msgstr "Suppression des messages du serveur après réception"
 
-#: src/prefs_account.c:1446
+#: src/prefs_account.c:1442
 msgid "Remove after"
 msgstr "Suppression après"
 
-#: src/prefs_account.c:1453
-#: src/prefs_account.c:1463
+#: src/prefs_account.c:1449
+#: src/prefs_account.c:1459
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 jour et 0 heure : suppression immédiate"
 
-#: src/prefs_account.c:1466
+#: src/prefs_account.c:1462
 #: src/prefs_matcher.c:333
 msgid "hours"
 msgstr "heures"
 
-#: src/prefs_account.c:1476
+#: src/prefs_account.c:1472
 msgid "Receive size limit"
 msgstr "Taille maximale pour la réception"
 
-#: src/prefs_account.c:1479
+#: src/prefs_account.c:1475
 msgid "Messages over this limit will be partially retrieved. When selecting them you will be able to download them fully or delete them."
 msgstr "Les messages dépassant cette limite ne seront que partiellement récupérés. Il est toutefois possible, après leur récupération et en les sélectionnant, de les marquer pour un téléchargement complet ou une suppression (effectif qu'à la relève suivante)."
 
-#: src/prefs_account.c:1519
-#: src/prefs_account.c:2446
+#: src/prefs_account.c:1515
+#: src/prefs_account.c:2438
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1526
+#: src/prefs_account.c:1522
 msgid "Maximum number of articles to download"
 msgstr "Nombre maximum d'articles à récupérer"
 
-#: src/prefs_account.c:1536
+#: src/prefs_account.c:1532
 msgid "unlimited if 0 is specified"
 msgstr "pas de limite si 0 est spécifié"
 
-#: src/prefs_account.c:1549
-#: src/prefs_account.c:1742
+#: src/prefs_account.c:1545
+#: src/prefs_account.c:1738
 msgid "Authentication method"
 msgstr "Authentification"
 
-#: src/prefs_account.c:1559
-#: src/prefs_account.c:1751
-#: src/prefs_send.c:286
+#: src/prefs_account.c:1555
+#: src/prefs_account.c:1747
+#: src/prefs_send.c:290
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/prefs_account.c:1571
+#: src/prefs_account.c:1567
 msgid "IMAP server directory"
 msgstr "Répertoire sur le serveur IMAP4"
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1571
 msgid "(usually empty)"
 msgstr "(généralement nul)"
 
-#: src/prefs_account.c:1589
+#: src/prefs_account.c:1585
 msgid "Show subscribed folders only"
 msgstr "Afficher seulement les dossiers inscrits"
 
-#: src/prefs_account.c:1596
+#: src/prefs_account.c:1592
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Mode économique en bande passante (évite récupération des tags distants)"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1594
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr "Ce mode utilise moins de bande passante mais peut apporter un ralentissement avec certains serveurs."
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1601
 msgid "Filter messages on receiving"
 msgstr "Filtrage des messages à la réception"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1608
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permission aux modules de filtrer les messages à la réception"
 
-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1612
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "Le bouton « Relever » de la barre d'outil principale relève le courrier pour ce compte"
 
-#: src/prefs_account.c:1697
+#: src/prefs_account.c:1693
 #: src/prefs_customheader.c:209
 #: src/prefs_matcher.c:620
-#: src/prefs_matcher.c:1952
-#: src/prefs_matcher.c:1974
+#: src/prefs_matcher.c:1958
+#: src/prefs_matcher.c:1980
 msgid "Header"
 msgstr "En-tête"
 
-#: src/prefs_account.c:1699
+#: src/prefs_account.c:1695
 msgid "Generate Message-ID"
 msgstr "Génération de l'en-tête « Message-Id: »"
 
-#: src/prefs_account.c:1702
+#: src/prefs_account.c:1698
 msgid "Send account mail address in Message-ID"
 msgstr "Mettre l'adresse email dans le Message-ID"
 
-#: src/prefs_account.c:1705
+#: src/prefs_account.c:1701
 msgid "Generate X-Mailer header"
 msgstr "Générer l'en-tête X-Mailer"
 
-#: src/prefs_account.c:1712
+#: src/prefs_account.c:1708
 msgid "Add user-defined header"
 msgstr "Ajouter des en-têtes supplémentaires"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1723
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Authentification SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:1816
+#: src/prefs_account.c:1808
 msgid "If you leave these entries empty, the same user ID and password as receiving will be used."
 msgstr "Veuillez laisser ces champs vides pour utiliser le nom d'utilisateur et le mot de passe spécifiés pour la réception."
 
-#: src/prefs_account.c:1827
+#: src/prefs_account.c:1819
 msgid "Authenticate with POP3 before sending"
 msgstr "S'authentifier sur le POP3 avant l'envoi"
 
-#: src/prefs_account.c:1842
+#: src/prefs_account.c:1834
 msgid "POP authentication timeout: "
 msgstr "Délai maximal pour l'authentification POP :"
 
-#: src/prefs_account.c:1850
+#: src/prefs_account.c:1842
 msgid "minutes"
 msgstr "minute(s)"
 
-#: src/prefs_account.c:1920
-#: src/prefs_account.c:1966
+#: src/prefs_account.c:1912
+#: src/prefs_account.c:1958
 msgid "Signature"
 msgstr "Signature"
 
-#: src/prefs_account.c:1923
+#: src/prefs_account.c:1915
 msgid "Automatically insert signature"
 msgstr "Insérer automatiquement la signature"
 
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1920
 msgid "Signature separator"
 msgstr "Séparateur de signature"
 
-#: src/prefs_account.c:1953
+#: src/prefs_account.c:1945
 msgid "Command output"
 msgstr "Résultat d'une commande"
 
-#: src/prefs_account.c:1986
+#: src/prefs_account.c:1978
 msgid "Automatically set the following addresses"
 msgstr "Définition automatique des adresses suivantes"
 
-#: src/prefs_account.c:2038
+#: src/prefs_account.c:2030
 msgid "Spell check dictionaries"
 msgstr "Dictionnaires de correction orthographique"
 
-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2040
 #: src/prefs_folder_item.c:1094
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Dictionnaire par défaut"
 
-#: src/prefs_account.c:2061
+#: src/prefs_account.c:2053
 #: src/prefs_folder_item.c:1128
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Dictionnaire alternatif par défaut"
 
-#: src/prefs_account.c:2147
-#: src/prefs_account.c:3263
+#: src/prefs_account.c:2139
+#: src/prefs_account.c:3255
 #: src/prefs_compose_writing.c:350
 #: src/prefs_folder_item.c:1443
 #: src/prefs_folder_item.c:1834
@@ -14249,219 +14314,219 @@ msgstr "Dictionnaire alternatif par défaut"
 msgid "Compose"
 msgstr "Composition"
 
-#: src/prefs_account.c:2162
+#: src/prefs_account.c:2154
 #: src/prefs_folder_item.c:1471
 #: src/prefs_quote.c:134
-#: src/toolbar.c:407
+#: src/toolbar.c:408
 msgid "Reply"
 msgstr "Répondre"
 
-#: src/prefs_account.c:2177
+#: src/prefs_account.c:2169
 #: src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1499
 #: src/prefs_quote.c:149
-#: src/toolbar.c:411
+#: src/toolbar.c:412
 msgid "Forward"
 msgstr "Transférer"
 
-#: src/prefs_account.c:2224
+#: src/prefs_account.c:2216
 msgid "Default privacy system"
 msgstr "Système de confidentialité par défaut"
 
-#: src/prefs_account.c:2253
+#: src/prefs_account.c:2245
 msgid "Always sign messages"
 msgstr "Toujours signer les messages"
 
-#: src/prefs_account.c:2255
+#: src/prefs_account.c:2247
 msgid "Always encrypt messages"
 msgstr "Toujours chiffrer les messages"
 
-#: src/prefs_account.c:2257
+#: src/prefs_account.c:2249
 msgid "Always sign messages when replying to a signed message"
 msgstr "Toujours signer la réponse à un message signé"
 
-#: src/prefs_account.c:2260
+#: src/prefs_account.c:2252
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Toujours chiffrer la réponse à un message chiffré"
 
-#: src/prefs_account.c:2263
+#: src/prefs_account.c:2255
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Chiffrer les messages envoyés avec votre propre clé en plus de celle du destinataire"
 
-#: src/prefs_account.c:2265
+#: src/prefs_account.c:2257
 msgid "Save sent encrypted messages as clear text"
 msgstr "Enregistrer les messages chiffrés envoyés en texte clair"
 
-#: src/prefs_account.c:2420
-#: src/prefs_account.c:2435
-#: src/prefs_account.c:2449
+#: src/prefs_account.c:2412
+#: src/prefs_account.c:2427
+#: src/prefs_account.c:2441
 msgid "Don't use SSL"
 msgstr "Ne pas utiliser SSL"
 
-#: src/prefs_account.c:2423
+#: src/prefs_account.c:2415
 msgid "Use SSL for POP3 connection"
 msgstr "Utiliser SSL pour les connexions POP3"
 
-#: src/prefs_account.c:2426
-#: src/prefs_account.c:2441
-#: src/prefs_account.c:2472
+#: src/prefs_account.c:2418
+#: src/prefs_account.c:2433
+#: src/prefs_account.c:2464
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utiliser la commande STARTTLS pour commencer une session SSL"
 
-#: src/prefs_account.c:2438
+#: src/prefs_account.c:2430
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utiliser SSL pour les connexions IMAP4"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2450
 msgid "Use SSL for NNTP connection"
 msgstr "Utiliser SSL pour les connexions NNTP"
 
-#: src/prefs_account.c:2462
+#: src/prefs_account.c:2454
 msgid "Send (SMTP)"
 msgstr "Envoi (SMTP)"
 
-#: src/prefs_account.c:2466
+#: src/prefs_account.c:2458
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Ne pas utiliser SSL (mais utiliser STARTTLS si nécessaire)"
 
-#: src/prefs_account.c:2469
+#: src/prefs_account.c:2461
 msgid "Use SSL for SMTP connection"
 msgstr "Utiliser SSL pour les connexions SMTP"
 
-#: src/prefs_account.c:2477
+#: src/prefs_account.c:2469
 msgid "Client certificates"
 msgstr "Certificats client"
 
-#: src/prefs_account.c:2485
+#: src/prefs_account.c:2477
 msgid "Certificate for receiving"
 msgstr "Certificat pour la réception"
 
-#: src/prefs_account.c:2490
-#: src/prefs_account.c:2492
-#: src/prefs_account.c:2512
-#: src/prefs_account.c:2514
+#: src/prefs_account.c:2482
+#: src/prefs_account.c:2484
+#: src/prefs_account.c:2504
+#: src/prefs_account.c:2506
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Fichier certificat client tel qu'un fichier PKCS12 ou PEM"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2499
 msgid "Certificate for sending"
 msgstr "Certificat pour l'envoi"
 
-#: src/prefs_account.c:2540
+#: src/prefs_account.c:2532
 msgid "Use non-blocking SSL"
 msgstr "Utiliser la communication SSL non bloquante"
 
-#: src/prefs_account.c:2552
+#: src/prefs_account.c:2544
 msgid "Turn this off if you have SSL connection problems"
 msgstr "À désactiver en cas de problèmes de connexion SSL"
 
-#: src/prefs_account.c:2668
+#: src/prefs_account.c:2660
 msgid "SMTP port"
 msgstr "Port SMTP"
 
-#: src/prefs_account.c:2675
+#: src/prefs_account.c:2667
 msgid "POP3 port"
 msgstr "Port POP3"
 
-#: src/prefs_account.c:2682
+#: src/prefs_account.c:2674
 msgid "IMAP4 port"
 msgstr "Port IMAP4"
 
-#: src/prefs_account.c:2689
+#: src/prefs_account.c:2681
 msgid "NNTP port"
 msgstr "Port NNTP"
 
-#: src/prefs_account.c:2695
+#: src/prefs_account.c:2687
 msgid "Domain name"
 msgstr "Nom de domaine"
 
-#: src/prefs_account.c:2698
+#: src/prefs_account.c:2690
 msgid "The domain name will be used in the generated Message-ID, and when connecting to SMTP servers."
 msgstr "Le nom de domaine sera utilisé dans la partie droite des identifiants de messages générés (Message-ID) et lors de la connexion aux serveurs SMTP."
 
-#: src/prefs_account.c:2712
+#: src/prefs_account.c:2704
 msgid "Use command to communicate with server"
 msgstr "Utiliser une commande externe pour communiquer avec le serveur"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2712
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Déplacer les mails supprimés à la corbeille, et purger immédiatement"
 
-#: src/prefs_account.c:2722
+#: src/prefs_account.c:2714
 msgid "Moves deleted mails to trash instead of using the \\Deleted flag without expunging."
 msgstr "Met les messages supprimés à la corbeille au lieu d'utiliser le drapeau \\Deleted sans purger."
 
-#: src/prefs_account.c:2726
+#: src/prefs_account.c:2718
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marquer les articles croisés comme lus et les colorier en"
 
-#: src/prefs_account.c:2782
+#: src/prefs_account.c:2774
 msgid "Put sent messages in"
 msgstr "Sauvegarder les messages envoyés dans "
 
-#: src/prefs_account.c:2784
+#: src/prefs_account.c:2776
 msgid "Put queued messages in"
 msgstr "Sauvegarder les messages à envoyer (file d'attente) dans "
 
-#: src/prefs_account.c:2786
+#: src/prefs_account.c:2778
 msgid "Put draft messages in"
 msgstr "Sauvegarder les brouillons dans "
 
-#: src/prefs_account.c:2788
+#: src/prefs_account.c:2780
 msgid "Put deleted messages in"
 msgstr "Sauvegarder les messages supprimés dans "
 
-#: src/prefs_account.c:2846
+#: src/prefs_account.c:2838
 msgid "Account name is not entered."
 msgstr "Le nom du compte est non spécifié."
 
-#: src/prefs_account.c:2850
+#: src/prefs_account.c:2842
 msgid "Mail address is not entered."
 msgstr "L'adresse email est non spécifiée."
 
-#: src/prefs_account.c:2857
+#: src/prefs_account.c:2849
 msgid "SMTP server is not entered."
 msgstr "Le serveur d'envoi (SMTP) est non spécifié."
 
-#: src/prefs_account.c:2862
+#: src/prefs_account.c:2854
 msgid "User ID is not entered."
 msgstr "Le nom d'utilisateur est non spécifié."
 
-#: src/prefs_account.c:2867
+#: src/prefs_account.c:2859
 msgid "POP3 server is not entered."
 msgstr "Le serveur POP3 est non spécifié."
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2879
 msgid "The default Inbox folder doesn't exist."
 msgstr "Le dossier de réception par défaut n'existe pas."
 
-#: src/prefs_account.c:2893
+#: src/prefs_account.c:2885
 msgid "IMAP4 server is not entered."
 msgstr "Le serveur IMAP4 est non spécifié."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2890
 msgid "NNTP server is not entered."
 msgstr "Le serveur NNTP est non spécifié."
 
-#: src/prefs_account.c:2904
+#: src/prefs_account.c:2896
 msgid "local mailbox filename is not entered."
 msgstr "Le fichier local mbox est non spécifié."
 
-#: src/prefs_account.c:2910
+#: src/prefs_account.c:2902
 msgid "mail command is not entered."
 msgstr "La commande externe d'envoi est non spécifiée."
 
-#: src/prefs_account.c:3227
+#: src/prefs_account.c:3219
 msgid "Receive"
 msgstr "Réception"
 
-#: src/prefs_account.c:3281
+#: src/prefs_account.c:3273
 #: src/prefs_folder_item.c:1850
 #: src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Modèles"
 
-#: src/prefs_account.c:3299
+#: src/prefs_account.c:3291
 msgid "Privacy"
 msgstr "Confidentialité"
 
@@ -14478,21 +14543,21 @@ msgstr "Configuration du nouveau compte"
 msgid "%s - Account preferences"
 msgstr "%s - Configuration du compte"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3794
 msgid "Select signature file"
 msgstr "Sélection du fichier signature"
 
-#: src/prefs_account.c:3813
-#: src/prefs_account.c:3830
-#: src/wizard.c:1237
+#: src/prefs_account.c:3812
+#: src/prefs_account.c:3829
+#: src/wizard.c:1053
 msgid "Select certificate file"
 msgstr "Choisir le fichier de certificat"
 
-#: src/prefs_account.c:3926
+#: src/prefs_account.c:3925
 msgid "Protocol:"
 msgstr "Protocole :"
 
-#: src/prefs_account.c:4066
+#: src/prefs_account.c:4065
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (module non chargé)"
@@ -14521,81 +14586,81 @@ msgstr "Éditer le filtre d'action"
 msgid "Append the new action above to the list"
 msgstr "Ajoute la nouvelle action ci-dessus à la liste"
 
-#: src/prefs_actions.c:329
-#: src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477
-#: src/prefs_matcher.c:768
-#: src/prefs_template.c:309
-#: src/prefs_toolbar.c:1043
-msgid "Replace"
-msgstr "Remplacer"
-
 #: src/prefs_actions.c:335
 msgid "Replace the selected action in list with the action above"
 msgstr "Remplace l'action sélectionnée dans la liste par l'action ci-dessus"
 
-#: src/prefs_actions.c:343
+#: src/prefs_actions.c:337
+#: src/prefs_filtering_action.c:616
+#: src/prefs_filtering.c:486
+#: src/prefs_matcher.c:778
+#: src/prefs_template.c:318
+#: src/prefs_toolbar.c:1056
+msgid "Re_move"
+msgstr "Suppri_mer"
+
+#: src/prefs_actions.c:345
 msgid "Delete the selected action from the list"
 msgstr "Supprime l'action sélectionnée dans la liste"
 
-#: src/prefs_actions.c:351
-#: src/prefs_filtering.c:500
-#: src/prefs_template.c:332
+#: src/prefs_actions.c:355
+#: src/prefs_filtering.c:503
+#: src/prefs_template.c:336
 msgid "Clear all the input fields in the dialog"
 msgstr "Efface tous les champs de saisie de la boîte de dialogue"
 
-#: src/prefs_actions.c:359
+#: src/prefs_actions.c:363
 msgid "Show information on configuring actions"
 msgstr "Affiche une aide pour la configuration d'actions"
 
-#: src/prefs_actions.c:390
+#: src/prefs_actions.c:394
 msgid "Move the selected action up"
 msgstr "Déplace l'action sélectionnée d'une ligne vers le haut"
 
-#: src/prefs_actions.c:398
+#: src/prefs_actions.c:402
 msgid "Move selected action down"
 msgstr "Déplace l'action sélectionnée d'une ligne vers le bas"
 
-#: src/prefs_actions.c:531
-#: src/prefs_filtering_action.c:702
-#: src/prefs_filtering.c:833
-#: src/prefs_filtering.c:835
+#: src/prefs_actions.c:535
+#: src/prefs_filtering_action.c:704
 #: src/prefs_filtering.c:836
-#: src/prefs_filtering.c:946
-#: src/prefs_matcher.c:891
-#: src/prefs_template.c:465
+#: src/prefs_filtering.c:838
+#: src/prefs_filtering.c:839
+#: src/prefs_filtering.c:949
+#: src/prefs_matcher.c:897
+#: src/prefs_template.c:469
 msgid "(New)"
 msgstr "(Nouveau)"
 
-#: src/prefs_actions.c:596
+#: src/prefs_actions.c:600
 msgid "Menu name is not set."
 msgstr "Le nom du menu n'est pas défini."
 
-#: src/prefs_actions.c:601
+#: src/prefs_actions.c:605
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "Il n'est pas autorisé à faire débuter un nom de menu par le caractère « / »."
 
-#: src/prefs_actions.c:606
+#: src/prefs_actions.c:610
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Les double-points « : » ne sont pas acceptés dans un nom de menu."
 
-#: src/prefs_actions.c:612
+#: src/prefs_actions.c:616
 msgid "There is an action with this name already."
 msgstr "Ce nom est déjà utilisé par une autre action."
 
-#: src/prefs_actions.c:631
+#: src/prefs_actions.c:635
 msgid "Menu name is too long."
 msgstr "Le nom du menu est trop long."
 
-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:644
 msgid "Command-line not set."
 msgstr "La commande n'est pas définie."
 
-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:649
 msgid "Menu name and command are too long."
 msgstr "Le nom du menu et la commande sont trop longs."
 
-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:655
 #, c-format
 msgid ""
 "The command\n"
@@ -14605,173 +14670,173 @@ msgstr ""
 "Erreur de syntaxe dans la commande :\n"
 "%s"
 
-#: src/prefs_actions.c:709
+#: src/prefs_actions.c:713
 msgid "Delete action"
 msgstr "Supprimer l'action"
 
-#: src/prefs_actions.c:710
+#: src/prefs_actions.c:714
 msgid "Do you really want to delete this action?"
 msgstr "Voulez-vous vraiment supprimer l'action sélectionnée ?"
 
-#: src/prefs_actions.c:730
+#: src/prefs_actions.c:734
 msgid "Delete all actions"
 msgstr "Suppression des actions"
 
-#: src/prefs_actions.c:731
+#: src/prefs_actions.c:735
 msgid "Do you really want to delete all the actions?"
 msgstr "Voulez-vous vraiment supprimer toutes les actions ?"
 
-#: src/prefs_actions.c:894
-#: src/prefs_actions.c:925
-#: src/prefs_filtering.c:1496
-#: src/prefs_filtering.c:1518
-#: src/prefs_matcher.c:2103
-#: src/prefs_template.c:565
-#: src/prefs_template.c:590
+#: src/prefs_actions.c:898
+#: src/prefs_actions.c:929
+#: src/prefs_filtering.c:1499
+#: src/prefs_filtering.c:1521
+#: src/prefs_matcher.c:2109
+#: src/prefs_template.c:569
+#: src/prefs_template.c:594
 msgid "Entry not saved"
 msgstr "Règle non ajoutée"
 
-#: src/prefs_actions.c:895
-#: src/prefs_actions.c:926
-#: src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519
-#: src/prefs_template.c:566
-#: src/prefs_template.c:591
+#: src/prefs_actions.c:899
+#: src/prefs_actions.c:930
+#: src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1522
+#: src/prefs_template.c:570
+#: src/prefs_template.c:595
 msgid "The entry was not saved. Close anyway?"
 msgstr "La règle n'a pas encore été ajoutée. Voulez-vous quand même fermer ?"
 
-#: src/prefs_actions.c:896
-#: src/prefs_actions.c:901
-#: src/prefs_actions.c:927
-#: src/prefs_filtering.c:1476
-#: src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520
-#: src/prefs_matcher.c:2105
-#: src/prefs_template.c:567
-#: src/prefs_template.c:592
-#: src/prefs_template.c:597
+#: src/prefs_actions.c:900
+#: src/prefs_actions.c:905
+#: src/prefs_actions.c:931
+#: src/prefs_filtering.c:1479
+#: src/prefs_filtering.c:1501
+#: src/prefs_filtering.c:1523
+#: src/prefs_matcher.c:2111
+#: src/prefs_template.c:571
+#: src/prefs_template.c:596
+#: src/prefs_template.c:601
 msgid "+_Continue editing"
 msgstr "+_Poursuivre l'édition"
 
-#: src/prefs_actions.c:899
+#: src/prefs_actions.c:903
 msgid "Actions list not saved"
 msgstr "Liste des actions non enregistrée"
 
-#: src/prefs_actions.c:900
+#: src/prefs_actions.c:904
 msgid "The actions list has been modified. Close anyway?"
 msgstr "La liste d'actions a été modifiée mais non enregistrée. Voulez-vous quand même fermer ?"
 
-#: src/prefs_actions.c:970
+#: src/prefs_actions.c:974
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Nom du menu :</span>"
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:975
 msgid "Use / in menu name to make submenus."
 msgstr "Inclure / dans le nom du menu pour faire des sous-menus."
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:977
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Commande :</span>"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:978
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Commencer par :</span>"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:979
 msgid "to send message body or selection to command's standard input"
 msgstr "pour envoyer le texte du message ou une sélection à l'entrée standard de la commande"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:980
 msgid "to send user provided text to command's standard input"
 msgstr "pour envoyer un texte fourni par l'utilisateur à l'entrée standard de la commande"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:981
 msgid "to send user provided hidden text to command's standard input"
 msgstr "pour envoyer un texte caché fourni par l'utilisateur à l'entrée standard de la commande"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:982
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Terminer par :</span>"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:983
 msgid "to replace message body or selection with command's standard output"
 msgstr "pour remplacer le texte du message ou une sélection par la sortie standard de la commande"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:984
 msgid "to insert command's standard output without replacing old text"
 msgstr "pour ajouter la sortie standard de la commande au texte du message"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:985
 msgid "to run command asynchronously"
 msgstr "pour lancer la commande en arrière plan"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:986
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Utiliser :</span>"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:987
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "pour le fichier correspondant au message sélectionné dans le format RFC822/2822"
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:988
 msgid "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "pour la liste des fichiers correspondants aux messages sélectionnés dans le format RFC822/2822"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:989
 msgid "for the file of the selected decoded message MIME part"
 msgstr "pour désigner le fichier temporaire contenant la partie MIME sélectionnée, décodée"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:990
 msgid "for a user provided argument"
 msgstr "pour un texte fourni par l'utilisateur"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:991
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "pour un texte caché fourni par l'utilisateur (ex : mot de passe)"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:992
 msgid "for the text selection"
 msgstr "pour la partie sélectionnée du texte"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:993
 msgid "apply filtering actions between {} to selected messages"
 msgstr "appliquer les actions de filtrages entre {} à la liste des messages sélectionnés"
 
-#: src/prefs_actions.c:990
+#: src/prefs_actions.c:994
 msgid "for a literal %"
 msgstr "Caractère « % »"
 
-#: src/prefs_actions.c:1000
+#: src/prefs_actions.c:1004
 #: src/prefs_themes.c:959
 msgid "Actions"
 msgstr "Actions"
 
-#: src/prefs_actions.c:1001
+#: src/prefs_actions.c:1005
 msgid "The Actions feature is a way for the user to launch external commands to process a complete message file or just one of its parts."
 msgstr "La fonctionnalité des actions est un moyen pour l'utilisateur d'exécuter des commandes externes depuis Claws Mail. Il est par exemple possible de manipuler physiquement ou graphiquement (vue du message, fenêtre de composition) les messages ou une de leurs parties."
 
-#: src/prefs_actions.c:1088
-#: src/prefs_filtering.c:1694
-#: src/prefs_template.c:1097
+#: src/prefs_actions.c:1092
+#: src/prefs_filtering.c:1697
+#: src/prefs_template.c:1101
 msgid "D_uplicate"
 msgstr "_Dupliquer"
 
-#: src/prefs_actions.c:1215
+#: src/prefs_actions.c:1212
 msgid "Current actions"
 msgstr "Actions enregistrées"
 
-#: src/prefs_actions.c:1314
-#: src/prefs_filtering.c:1071
-#: src/prefs_filtering.c:1129
+#: src/prefs_actions.c:1311
+#: src/prefs_filtering.c:1074
+#: src/prefs_filtering.c:1132
 msgid "Action string is not valid."
 msgstr "La syntaxe de l'action est incorrecte."
 
-#: src/prefs_common.c:230
+#: src/prefs_common.c:220
 #: src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Bonjour,\\n"
 
-#: src/prefs_common.c:304
+#: src/prefs_common.c:294
 msgid ""
 "On %d\\n"
 "%f wrote:\\n"
@@ -14785,7 +14850,7 @@ msgstr ""
 "%q\\n"
 "%X"
 
-#: src/prefs_common.c:310
+#: src/prefs_common.c:300
 #: src/prefs_quote.c:85
 msgid ""
 "\\n"
@@ -14816,7 +14881,7 @@ msgstr ""
 "\\n"
 "%M"
 
-#: src/prefs_common.c:450
+#: src/prefs_common.c:440
 msgid "%x(%a) %H:%M"
 msgstr "%a %x %H:%M"
 
@@ -14899,12 +14964,12 @@ msgid "Ask"
 msgstr "Demander"
 
 #: src/prefs_compose_writing.c:230
-#: src/toolbar.c:425
+#: src/toolbar.c:426
 msgid "Insert"
 msgstr "Insertion"
 
 #: src/prefs_compose_writing.c:231
-#: src/toolbar.c:426
+#: src/toolbar.c:427
 msgid "Attach"
 msgstr "Joindre"
 
@@ -14918,8 +14983,8 @@ msgstr "Configuration des en-têtes supplémentaires"
 
 #: src/prefs_customheader.c:507
 #: src/prefs_display_header.c:599
-#: src/prefs_matcher.c:1577
-#: src/prefs_matcher.c:1592
+#: src/prefs_matcher.c:1583
+#: src/prefs_matcher.c:1598
 msgid "Header name is not set."
 msgstr "Le nom de l'en-tête n'est pas défini."
 
@@ -15017,29 +15082,29 @@ msgstr "Aide : la chaine %s sera remplacée par le chemin du fichier ou l'URI."
 msgid "Use system defaults when possible"
 msgstr "Utiliser les commandes par défaut du système quand c'est possible"
 
-#: src/prefs_ext_prog.c:146
+#: src/prefs_ext_prog.c:141
 msgid "Web browser"
 msgstr "Navigateur Web"
 
-#: src/prefs_ext_prog.c:180
+#: src/prefs_ext_prog.c:169
 msgid "Text editor"
 msgstr "Editeur de texte"
 
-#: src/prefs_ext_prog.c:208
+#: src/prefs_ext_prog.c:197
 msgid "Command for 'Display as text'"
 msgstr "Commande d'affichage texte"
 
-#: src/prefs_ext_prog.c:221
+#: src/prefs_ext_prog.c:210
 msgid "This option enables MIME parts to be displayed in the message view via a script when using the 'Display as text' contextual menu item"
 msgstr "Cette option permet l'affichage texte des parties MIME dans la vue du message via un script ou une commande de votre choix lorsque l'élément 'Afficher comme du texte' du menu contextuel est choisi."
 
-#: src/prefs_ext_prog.c:280
+#: src/prefs_ext_prog.c:269
 #: src/prefs_image_viewer.c:138
 #: src/prefs_message.c:354
 msgid "Message View"
 msgstr "Vue du message"
 
-#: src/prefs_ext_prog.c:281
+#: src/prefs_ext_prog.c:270
 msgid "External Programs"
 msgstr "Programmes auxiliaires"
 
@@ -15089,10 +15154,10 @@ msgid "Mark as ham"
 msgstr "Marquer comme courrier légitime"
 
 #: src/prefs_filtering_action.c:187
-#: src/prefs_filtering_action.c:1436
-#: src/toolbar.c:204
-#: src/toolbar.c:435
-#: src/toolbar.c:2106
+#: src/prefs_filtering_action.c:1438
+#: src/toolbar.c:205
+#: src/toolbar.c:436
+#: src/toolbar.c:2107
 msgid "Execute"
 msgstr "Exécuter"
 
@@ -15112,7 +15177,7 @@ msgstr "Rediriger"
 
 #: src/prefs_filtering_action.c:194
 #: src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1440
+#: src/prefs_filtering_action.c:1442
 #: src/prefs_matcher.c:626
 #: src/prefs_summary_column.c:87
 #: src/summaryview.c:449
@@ -15162,7 +15227,7 @@ msgid "Action configuration"
 msgstr "Configuration de l'action"
 
 #: src/prefs_filtering_action.c:427
-#: src/prefs_filtering.c:1892
+#: src/prefs_filtering.c:1888
 #: src/prefs_matcher.c:583
 msgid "Rule"
 msgstr "Règle"
@@ -15172,70 +15237,70 @@ msgstr "Règle"
 msgid "Action"
 msgstr "Action"
 
-#: src/prefs_filtering_action.c:933
+#: src/prefs_filtering_action.c:935
 msgid "Command-line not set"
 msgstr "La commande n'a pas été spécifiée."
 
-#: src/prefs_filtering_action.c:934
+#: src/prefs_filtering_action.c:936
 msgid "Destination is not set."
 msgstr "La destination n'a pas été spécifiée."
 
-#: src/prefs_filtering_action.c:945
+#: src/prefs_filtering_action.c:947
 msgid "Recipient is not set."
 msgstr "Destinataire non spécifié."
 
-#: src/prefs_filtering_action.c:963
+#: src/prefs_filtering_action.c:965
 msgid "Score is not set"
 msgstr "Score non spécifié"
 
-#: src/prefs_filtering_action.c:971
+#: src/prefs_filtering_action.c:973
 msgid "Header is not set."
 msgstr "L'en-tête n'est pas défini."
 
-#: src/prefs_filtering_action.c:978
+#: src/prefs_filtering_action.c:980
 msgid "Target addressbook/folder is not set."
 msgstr "Le carnet/dossier de destination n'est pas défini."
 
-#: src/prefs_filtering_action.c:992
+#: src/prefs_filtering_action.c:994
 msgid "Tag name is empty."
 msgstr "Le nom du label n'est pas défini."
 
-#: src/prefs_filtering_action.c:1214
+#: src/prefs_filtering_action.c:1216
 msgid "No action was defined."
 msgstr "Aucune action n'a été spécifiée."
 
-#: src/prefs_filtering_action.c:1252
-#: src/prefs_matcher.c:2147
+#: src/prefs_filtering_action.c:1254
+#: src/prefs_matcher.c:2153
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "Caractère « % »"
 
-#: src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2156
+#: src/prefs_filtering_action.c:1263
+#: src/prefs_matcher.c:2162
 msgid "filename (should not be modified)"
 msgstr "Chemin du fichier (Ne doit pas être modifié !)"
 
-#: src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2157
+#: src/prefs_filtering_action.c:1264
+#: src/prefs_matcher.c:2163
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "Retour chariot"
 
-#: src/prefs_filtering_action.c:1263
-#: src/prefs_matcher.c:2158
+#: src/prefs_filtering_action.c:1265
+#: src/prefs_matcher.c:2164
 msgid "escape character for quotes"
 msgstr "Caractère d'échappement"
 
-#: src/prefs_filtering_action.c:1264
-#: src/prefs_matcher.c:2159
+#: src/prefs_filtering_action.c:1266
+#: src/prefs_matcher.c:2165
 msgid "quote character"
 msgstr "Préfixes de citation"
 
-#: src/prefs_filtering_action.c:1273
+#: src/prefs_filtering_action.c:1275
 msgid "Filtering Action: 'Execute'"
 msgstr "Action de filtrage : « Exécuter »"
 
-#: src/prefs_filtering_action.c:1274
+#: src/prefs_filtering_action.c:1276
 msgid ""
 "'Execute' allows you to send a message or message element to an external program or script.\n"
 "The following symbols can be used:"
@@ -15243,23 +15308,23 @@ msgstr ""
 "L'action de filtrage « Exécuter » permet à l'utilisateur d'envoyer un message ou élément d'en-tête de message à un programme ou un script auxiliaire.\n"
 "Il est possible d'utiliser les symboles suivants :"
 
-#: src/prefs_filtering_action.c:1420
+#: src/prefs_filtering_action.c:1422
 msgid "Recipient"
 msgstr "Destinataire"
 
-#: src/prefs_filtering_action.c:1424
+#: src/prefs_filtering_action.c:1426
 msgid "Book/Folder"
 msgstr "Carnet/dossier"
 
-#: src/prefs_filtering_action.c:1428
+#: src/prefs_filtering_action.c:1430
 msgid "Destination"
 msgstr "Destination"
 
-#: src/prefs_filtering_action.c:1432
+#: src/prefs_filtering_action.c:1434
 msgid "Color"
 msgstr "Colorier"
 
-#: src/prefs_filtering_action.c:1518
+#: src/prefs_filtering_action.c:1520
 msgid "Current action list"
 msgstr "Actions enregistrées"
 
@@ -15269,8 +15334,8 @@ msgid "Filtering/Processing configuration"
 msgstr "Configuration du filtrage/traitement"
 
 #: src/prefs_filtering.c:266
-#: src/prefs_filtering.c:864
-#: src/prefs_filtering.c:978
+#: src/prefs_filtering.c:867
+#: src/prefs_filtering.c:981
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Tous"
@@ -15280,9 +15345,12 @@ msgid "Condition"
 msgstr "Condition"
 
 #: src/prefs_filtering.c:424
+msgid " D_efine... "
+msgstr " D_éfinir... "
+
 #: src/prefs_filtering.c:446
-msgid " Define... "
-msgstr " Définir.. "
+msgid " De_fine... "
+msgstr " Dé_finir... "
 
 #: src/prefs_filtering.c:475
 msgid "Append the new rule above to the list"
@@ -15292,88 +15360,88 @@ msgstr "Ajoute la règle suivante à la liste"
 msgid "Replace the selected rule in list with the rule above"
 msgstr "Remplace la règle sélectionnée dans la liste par la suivante"
 
-#: src/prefs_filtering.c:492
+#: src/prefs_filtering.c:493
 msgid "Delete the selected rule from the list"
 msgstr "Supprime la règle sélectionnée dans la liste"
 
-#: src/prefs_filtering.c:529
+#: src/prefs_filtering.c:532
 msgid "Move the selected rule to the top"
 msgstr "Déplace la règle sélectionnée tout en haut"
 
-#: src/prefs_filtering.c:532
-msgid "Page up"
+#: src/prefs_filtering.c:535
+msgid "Page u_p"
 msgstr "Page préc."
 
-#: src/prefs_filtering.c:540
+#: src/prefs_filtering.c:543
 msgid "Move the selected rule one page up"
 msgstr "Déplace la règle sélectionnée une page plus haut"
 
-#: src/prefs_filtering.c:549
+#: src/prefs_filtering.c:552
 msgid "Move the selected rule up"
 msgstr "Déplace la règle sélectionnée une ligne plus haut"
 
-#: src/prefs_filtering.c:557
+#: src/prefs_filtering.c:560
 msgid "Move the selected rule down"
 msgstr "Déplace la règle sélectionnée une ligne plus bas"
 
-#: src/prefs_filtering.c:560
-msgid "Page down"
+#: src/prefs_filtering.c:563
+msgid "Page dow_n"
 msgstr "Page suiv."
 
-#: src/prefs_filtering.c:568
+#: src/prefs_filtering.c:571
 msgid "Move the selected rule one page down"
 msgstr "Déplace la règle sélectionnée une page plus bas"
 
-#: src/prefs_filtering.c:577
+#: src/prefs_filtering.c:580
 msgid "Move the selected rule to the bottom"
 msgstr "Déplace la règle sélectionnée tout en bas"
 
-#: src/prefs_filtering.c:1035
-#: src/prefs_filtering.c:1121
+#: src/prefs_filtering.c:1038
+#: src/prefs_filtering.c:1124
 msgid "Condition string is not valid."
 msgstr "La syntaxe de la condition est incorrecte."
 
-#: src/prefs_filtering.c:1108
+#: src/prefs_filtering.c:1111
 msgid "Condition string is empty."
 msgstr "La condition est vide."
 
-#: src/prefs_filtering.c:1114
+#: src/prefs_filtering.c:1117
 msgid "Action string is empty."
 msgstr "L'action est vide."
 
-#: src/prefs_filtering.c:1202
+#: src/prefs_filtering.c:1205
 msgid "Delete rule"
 msgstr "Suppression d'une règle"
 
-#: src/prefs_filtering.c:1203
+#: src/prefs_filtering.c:1206
 msgid "Do you really want to delete this rule?"
 msgstr "Voulez-vous vraiment supprimer la règle sélectionnée ?"
 
-#: src/prefs_filtering.c:1221
+#: src/prefs_filtering.c:1224
 msgid "Delete all rules"
 msgstr "Suppression de toutes les règles"
 
-#: src/prefs_filtering.c:1222
+#: src/prefs_filtering.c:1225
 msgid "Do you really want to delete all the rules?"
 msgstr "Voulez-vous vraiment supprimer toutes les règles ?"
 
-#: src/prefs_filtering.c:1474
+#: src/prefs_filtering.c:1477
 msgid "Filtering rules not saved"
 msgstr "Règles de filtrage non enregistrées"
 
-#: src/prefs_filtering.c:1475
+#: src/prefs_filtering.c:1478
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "La liste de règles de filtrage a été modifiée mais non enregistrée. Voulez-vous quand même fermer ?"
 
-#: src/prefs_filtering.c:1697
+#: src/prefs_filtering.c:1700
 msgid "Move one page up"
 msgstr "Déplacer une page plus haut"
 
-#: src/prefs_filtering.c:1698
+#: src/prefs_filtering.c:1701
 msgid "Move one page down"
 msgstr "Déplacer une page plus bas"
 
-#: src/prefs_filtering.c:1860
+#: src/prefs_filtering.c:1856
 msgid "Enable"
 msgstr "Activer"
 
@@ -15404,7 +15472,7 @@ msgstr "Éléments affichés"
 #: src/prefs_folder_column.c:329
 #: src/prefs_msg_colors.c:494
 #: src/prefs_summary_column.c:343
-#: src/prefs_toolbar.c:1055
+#: src/prefs_toolbar.c:1064
 msgid " Use default "
 msgstr " Remise à zéro "
 
@@ -15554,7 +15622,7 @@ msgid "Folder and Message Lists"
 msgstr "Listes de dossiers et de messages"
 
 #: src/prefs_fonts.c:99
-#: src/prefs_matcher.c:2024
+#: src/prefs_matcher.c:2030
 msgid "Message"
 msgstr "Message"
 
@@ -15590,8 +15658,8 @@ msgid "Fonts"
 msgstr "Polices"
 
 #: src/prefs_gtk.c:938
-#: src/toolbar.c:212
-#: src/toolbar.c:421
+#: src/toolbar.c:213
+#: src/toolbar.c:422
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -15806,12 +15874,12 @@ msgid "whole message"
 msgstr "Tout le message"
 
 #: src/prefs_matcher.c:389
-#: src/summaryview.c:6302
+#: src/summaryview.c:6298
 msgid "Marked"
 msgstr "Marqué"
 
 #: src/prefs_matcher.c:390
-#: src/summaryview.c:6300
+#: src/summaryview.c:6296
 msgid "Deleted"
 msgstr "Supprimé"
 
@@ -15820,15 +15888,15 @@ msgid "Replied"
 msgstr "Répondu"
 
 #: src/prefs_matcher.c:392
-#: src/summaryview.c:6294
+#: src/summaryview.c:6290
 msgid "Forwarded"
 msgstr "Transféré"
 
 #: src/prefs_matcher.c:394
-#: src/summaryview.c:6284
-#: src/toolbar.c:414
-#: src/toolbar.c:950
-#: src/toolbar.c:1996
+#: src/summaryview.c:6280
+#: src/toolbar.c:415
+#: src/toolbar.c:951
+#: src/toolbar.c:1997
 msgid "Spam"
 msgstr "Pourriel"
 
@@ -15837,7 +15905,7 @@ msgid "Has attachment"
 msgstr "Contient une ou plusieurs pièces jointes"
 
 #: src/prefs_matcher.c:396
-#: src/summaryview.c:6320
+#: src/summaryview.c:6316
 msgid "Signed"
 msgstr "Signé"
 
@@ -15939,56 +16007,56 @@ msgid "External program test"
 msgstr "Test par programme auxiliaire"
 
 #: src/prefs_matcher.c:707
-#: src/prefs_matcher.c:1598
-#: src/prefs_matcher.c:1613
-#: src/prefs_matcher.c:2495
+#: src/prefs_matcher.c:1604
+#: src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:2501
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Tous"
 
-#: src/prefs_matcher.c:739
+#: src/prefs_matcher.c:741
 msgid "Use regexp"
 msgstr "Utiliser des expressions régulières"
 
-#: src/prefs_matcher.c:812
+#: src/prefs_matcher.c:818
 msgid "Message must match"
 msgstr "Le message doit valider"
 
-#: src/prefs_matcher.c:816
+#: src/prefs_matcher.c:822
 msgid "at least one"
 msgstr "au moins une des"
 
-#: src/prefs_matcher.c:817
+#: src/prefs_matcher.c:823
 msgid "all"
 msgstr "toutes les"
 
-#: src/prefs_matcher.c:820
+#: src/prefs_matcher.c:826
 msgid "of above rules"
 msgstr "règles ci-dessus."
 
-#: src/prefs_matcher.c:1516
-#: src/prefs_matcher.c:1582
+#: src/prefs_matcher.c:1522
+#: src/prefs_matcher.c:1588
 msgid "Search pattern is not set."
 msgstr "Le terme cherché n'est pas défini."
 
-#: src/prefs_matcher.c:1525
+#: src/prefs_matcher.c:1531
 msgid "Test command is not set."
 msgstr "La commande de test n'est pas définie."
 
-#: src/prefs_matcher.c:1599
+#: src/prefs_matcher.c:1605
 msgid "all addresses in all headers"
 msgstr "toutes les adresses de toutes les en-têtes"
 
-#: src/prefs_matcher.c:1602
+#: src/prefs_matcher.c:1608
 msgid "any address in any header"
 msgstr "n'importe quelle adresse de n'importe quel en-tête"
 
-#: src/prefs_matcher.c:1604
+#: src/prefs_matcher.c:1610
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "l'(les) adresse(s) de l'en-tête '%s'"
 
-#: src/prefs_matcher.c:1605
+#: src/prefs_matcher.c:1611
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -15999,91 +16067,91 @@ msgstr ""
 "\n"
 "Si vous souhaitez tester la présence de '%s' dans la totalité du carnet d'adresse, vous devez sélectionner '%s' dans la liste déroulante « carnet/dossier »."
 
-#: src/prefs_matcher.c:1824
+#: src/prefs_matcher.c:1830
 msgid "Headers part"
 msgstr "En-têtes du message"
 
-#: src/prefs_matcher.c:1828
+#: src/prefs_matcher.c:1834
 msgid "Body part"
 msgstr "Corps du message"
 
-#: src/prefs_matcher.c:1832
+#: src/prefs_matcher.c:1838
 msgid "Whole message"
 msgstr "Tout le message"
 
-#: src/prefs_matcher.c:1951
-#: src/prefs_matcher.c:1995
+#: src/prefs_matcher.c:1957
+#: src/prefs_matcher.c:2001
 msgid "in"
 msgstr "dans"
 
-#: src/prefs_matcher.c:1953
+#: src/prefs_matcher.c:1959
 msgid "content is"
 msgstr "Le contenu est"
 
-#: src/prefs_matcher.c:1962
+#: src/prefs_matcher.c:1968
 msgid "Age is"
 msgstr "Âge"
 
-#: src/prefs_matcher.c:1967
+#: src/prefs_matcher.c:1973
 msgid "Flag"
 msgstr "État"
 
-#: src/prefs_matcher.c:1968
-#: src/prefs_matcher.c:1985
+#: src/prefs_matcher.c:1974
+#: src/prefs_matcher.c:1991
 msgid "is"
 msgstr "est"
 
-#: src/prefs_matcher.c:1973
+#: src/prefs_matcher.c:1979
 msgid "Name:"
 msgstr "Nom d'en-tête"
 
-#: src/prefs_matcher.c:1984
+#: src/prefs_matcher.c:1990
 msgid "Label"
 msgstr "Couleur"
 
-#: src/prefs_matcher.c:1990
+#: src/prefs_matcher.c:1996
 msgid "Value:"
 msgstr "Valeur"
 
-#: src/prefs_matcher.c:2007
+#: src/prefs_matcher.c:2013
 msgid "Score is"
 msgstr "Score"
 
-#: src/prefs_matcher.c:2008
+#: src/prefs_matcher.c:2014
 msgid "points"
 msgstr "points"
 
-#: src/prefs_matcher.c:2018
+#: src/prefs_matcher.c:2024
 msgid "Size is"
 msgstr "Taille"
 
-#: src/prefs_matcher.c:2023
+#: src/prefs_matcher.c:2029
 msgid "Scope:"
 msgstr "Portée"
 
-#: src/prefs_matcher.c:2025
+#: src/prefs_matcher.c:2031
 msgid "tags"
 msgstr "un(des) label(s)."
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2036
 msgid "type is"
 msgstr "est"
 
-#: src/prefs_matcher.c:2034
+#: src/prefs_matcher.c:2040
 msgid "Program returns"
 msgstr "Retourne"
 
-#: src/prefs_matcher.c:2104
+#: src/prefs_matcher.c:2110
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgstr "La règle n'a pas encore été ajoutée. Voulez-vous quand même fermer ?"
 
-#: src/prefs_matcher.c:2168
+#: src/prefs_matcher.c:2174
 msgid "Match Type: 'Test'"
 msgstr "Condition de filtrage : « Test »"
 
-#: src/prefs_matcher.c:2169
+#: src/prefs_matcher.c:2175
 msgid ""
 "'Test' allows you to test a message or message element using an external program or script. The program will return either 0 or 1.\n"
 "\n"
@@ -16093,7 +16161,7 @@ msgstr ""
 "\n"
 "Il est possible d'utiliser les symboles suivants :"
 
-#: src/prefs_matcher.c:2268
+#: src/prefs_matcher.c:2274
 msgid "Current condition rules"
 msgstr "Conditions enregistrées"
 
@@ -16264,10 +16332,6 @@ msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Sélection de la couleur des signatures"
 
-#: src/prefs_msg_colors.c:362
-msgid "Signatures"
-msgstr "Signature"
-
 #: src/prefs_msg_colors.c:367
 #: src/prefs_summaries.c:354
 msgid "Folder list"
@@ -16495,71 +16559,71 @@ msgstr ""
 "\\n"
 "%q"
 
-#: src/prefs_receive.c:137
+#: src/prefs_receive.c:123
 msgid "External incorporation program"
 msgstr "Programme auxiliaire pour la réception du courriel"
 
-#: src/prefs_receive.c:140
+#: src/prefs_receive.c:126
 msgid "Use external program for receiving mail"
 msgstr "Utiliser le programme suivant"
 
-#: src/prefs_receive.c:156
+#: src/prefs_receive.c:142
 msgid "Automatic checking"
 msgstr "Relève automatique du courriel"
 
-#: src/prefs_receive.c:163
+#: src/prefs_receive.c:149
 msgid "Check for new mail every"
 msgstr "Relever automatiquement toutes les"
 
-#: src/prefs_receive.c:181
+#: src/prefs_receive.c:167
 msgid "Check for new mail on start-up"
 msgstr "Relever au démarrage"
 
-#: src/prefs_receive.c:184
+#: src/prefs_receive.c:170
 msgid "Dialogs"
 msgstr "Fenêtres"
 
-#: src/prefs_receive.c:186
+#: src/prefs_receive.c:172
 msgid "Show receive dialog"
 msgstr "Afficher une fenêtre lors de la réception"
 
-#: src/prefs_receive.c:196
+#: src/prefs_receive.c:182
 msgid "Only on manual receiving"
 msgstr "Uniquement lors de la relève manuelle"
 
-#: src/prefs_receive.c:207
+#: src/prefs_receive.c:193
 msgid "Close receive dialog when finished"
 msgstr "Fermer la fenêtre de réception en fin d'opération"
 
-#: src/prefs_receive.c:210
+#: src/prefs_receive.c:196
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne pas afficher de fenêtre lors d'une erreur de réception"
 
-#: src/prefs_receive.c:213
-msgid "After checking for new mail"
+#: src/prefs_receive.c:199
+msgid "After receiving new mail"
 msgstr "Après réception du courriel"
 
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:201
 msgid "Go to Inbox"
 msgstr "Aller dans le dossier de réception"
 
-#: src/prefs_receive.c:217
+#: src/prefs_receive.c:203
 msgid "Update all local folders"
 msgstr "Mettre à jour l'ensemble des dossiers locaux"
 
-#: src/prefs_receive.c:220
+#: src/prefs_receive.c:205
 msgid "Run command"
 msgstr "Exécution d'une commande si du courriel arrive"
 
-#: src/prefs_receive.c:225
+#: src/prefs_receive.c:210
 msgid "after automatic check"
 msgstr "après une relève automatique"
 
-#: src/prefs_receive.c:227
+#: src/prefs_receive.c:212
 msgid "after manual check"
 msgstr "après une relève manuelle"
 
-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:220
 #, c-format
 msgid ""
 "Command to execute:\n"
@@ -16568,185 +16632,177 @@ msgstr ""
 "Commande à exécuter :\n"
 "(%d : nombre de nouveaux messages)"
 
-#: src/prefs_receive.c:260
-msgid "Blink LED"
-msgstr "Faire clignoter les diodes"
-
-#: src/prefs_receive.c:261
-msgid "Play sound"
-msgstr "Jouer un son"
-
-#: src/prefs_receive.c:263
-msgid "Show info banner"
-msgstr "Afficher un bandeau informatif"
-
-#: src/prefs_receive.c:397
-#: src/prefs_send.c:348
+#: src/prefs_receive.c:343
+#: src/prefs_send.c:357
 msgid "Mail Handling"
 msgstr "Traitement du courrier"
 
-#: src/prefs_receive.c:398
+#: src/prefs_receive.c:344
 msgid "Receiving"
 msgstr "Réception"
 
-#: src/prefs_send.c:159
+#: src/prefs_send.c:161
 msgid "Save sent messages to Sent folder"
 msgstr "Enregistrer les messages envoyés dans le dossier « Envoyés »"
 
-#: src/prefs_send.c:162
+#: src/prefs_send.c:164
 msgid "Confirm before sending queued messages"
 msgstr "Demander une confirmation avant d'envoyer les messages en file d'attente"
 
-#: src/prefs_send.c:165
+#: src/prefs_send.c:167
 msgid "Never send Return Receipts"
 msgstr "Ne jamais envoyer d'accusé de réception"
 
-#: src/prefs_send.c:168
+#: src/prefs_send.c:170
 msgid "Show send dialog"
 msgstr "Afficher une fenêtre lors de l'envoi"
 
-#: src/prefs_send.c:176
+#: src/prefs_send.c:172
+msgid "Warn when Subject is empty"
+msgstr "Prévenir si le sujet est vide."
+
+#: src/prefs_send.c:180
 msgid "Outgoing encoding"
 msgstr ""
 "Pour l'envoi, utiliser le jeu\n"
 "de caractères suivant"
 
-#: src/prefs_send.c:201
+#: src/prefs_send.c:205
 msgid "If 'Automatic' is selected, the optimal encoding for the current locale will be used"
 msgstr "Si « Automatique » est sélectionné, le jeu de caractères par défaut du système sera choisi automatiquement."
 
-#: src/prefs_send.c:216
+#: src/prefs_send.c:220
 msgid "Automatic (Recommended)"
 msgstr "Automatique (recommandé)"
 
-#: src/prefs_send.c:218
+#: src/prefs_send.c:222
 msgid "7bit ASCII (US-ASCII)"
 msgstr "ASCII 7 bits (US-ASCII)"
 
-#: src/prefs_send.c:219
+#: src/prefs_send.c:223
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_send.c:221
+#: src/prefs_send.c:225
 msgid "Western European (ISO-8859-1)"
 msgstr "Europe de l'Ouest (ISO-8859-1)"
 
-#: src/prefs_send.c:222
+#: src/prefs_send.c:226
 msgid "Western European (ISO-8859-15)"
 msgstr "Europe de l'Ouest (Euro) (ISO-8859-15)"
 
-#: src/prefs_send.c:224
+#: src/prefs_send.c:228
 msgid "Central European (ISO-8859-2)"
 msgstr "Europe Centrale (ISO-8859-2)"
 
-#: src/prefs_send.c:226
+#: src/prefs_send.c:230
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltique (ISO-8859-13)"
 
-#: src/prefs_send.c:227
+#: src/prefs_send.c:231
 msgid "Baltic (ISO-8859-4)"
 msgstr "Europe du Nord (ISO-8859-4)"
 
-#: src/prefs_send.c:229
+#: src/prefs_send.c:233
 msgid "Greek (ISO-8859-7)"
 msgstr "Grec (ISO-8859-7)"
 
-#: src/prefs_send.c:231
+#: src/prefs_send.c:235
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hébreu (ISO-8859-8)"
 
-#: src/prefs_send.c:232
+#: src/prefs_send.c:236
 msgid "Hebrew (Windows-1255)"
 msgstr "Hébreu (Windows-1255)"
 
-#: src/prefs_send.c:234
+#: src/prefs_send.c:238
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabe (ISO-8859-6)"
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:239
 msgid "Arabic (Windows-1256)"
 msgstr "Arabe (Windows-1256)"
 
-#: src/prefs_send.c:237
+#: src/prefs_send.c:241
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turc (ISO-8859-9)"
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:243
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillique (ISO-8859-5)"
 
-#: src/prefs_send.c:240
+#: src/prefs_send.c:244
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillique (KOI8-R)"
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:245
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillique (KOI8-U)"
 
-#: src/prefs_send.c:242
+#: src/prefs_send.c:246
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillique (Windows-1251)"
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:248
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonais (ISO-2022-JP)"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:250
 msgid "Japanese (EUC-JP)"
 msgstr "Japonais (EUC-JP)"
 
-#: src/prefs_send.c:247
+#: src/prefs_send.c:251
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonais (Shift_JIS)"
 
-#: src/prefs_send.c:250
+#: src/prefs_send.c:254
 msgid "Simplified Chinese (GB18030)"
 msgstr "Chinois simplifié (GB18030)"
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:255
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinois simplifié (GB2312)"
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:256
 msgid "Simplified Chinese (GBK)"
 msgstr "Chinois simplifié (GBK)"
 
-#: src/prefs_send.c:253
+#: src/prefs_send.c:257
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinois traditionnel (Big5)"
 
-#: src/prefs_send.c:255
+#: src/prefs_send.c:259
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinois traditionnel (EUC-TW)"
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:260
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinois (ISO-2022-CN)"
 
-#: src/prefs_send.c:259
+#: src/prefs_send.c:263
 msgid "Korean (EUC-KR)"
 msgstr "Coréen (EUC-KR)"
 
-#: src/prefs_send.c:261
+#: src/prefs_send.c:265
 msgid "Thai (TIS-620)"
 msgstr "Thaïlandais (TIS-620)"
 
-#: src/prefs_send.c:262
+#: src/prefs_send.c:266
 msgid "Thai (Windows-874)"
 msgstr "Thaïlandais (Windows-874)"
 
-#: src/prefs_send.c:266
+#: src/prefs_send.c:270
 msgid "Transfer encoding"
 msgstr "Encodage de transfert"
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:281
 msgid "Specify Content-Transfer-Encoding used when message body contains non-ASCII characters"
 msgstr "Spécifier le « Content-Transfer-Encoding » utilisé quand le corps du message contient des caractères non ASCII."
 
-#: src/prefs_send.c:349
-#: src/send_message.c:483
-#: src/send_message.c:487
-#: src/send_message.c:492
+#: src/prefs_send.c:358
+#: src/send_message.c:491
+#: src/send_message.c:495
+#: src/send_message.c:500
 msgid "Sending"
 msgstr "Envoi"
 
@@ -17060,87 +17116,87 @@ msgstr "Ajoute le nouveau modèle ci-dessus à la liste"
 msgid "Replace the selected template in list with the template above"
 msgstr "Remplace le modèle sélectionné dans la liste par le modèle ci-dessus"
 
-#: src/prefs_template.c:324
+#: src/prefs_template.c:326
 msgid "Delete the selected template from the list"
 msgstr "Supprime le modèle sélectionné de la liste"
 
-#: src/prefs_template.c:340
+#: src/prefs_template.c:344
 msgid "Show information on configuring templates"
 msgstr "Affiche une aide pour la configuration de modèles"
 
-#: src/prefs_template.c:364
+#: src/prefs_template.c:368
 msgid "Move the selected template to the top"
 msgstr "Déplace le modèle sélectionné tout en haut"
 
-#: src/prefs_template.c:374
+#: src/prefs_template.c:378
 msgid "Move the selected template up"
 msgstr "Déplace le modèle sélectionné une ligne plus haut"
 
-#: src/prefs_template.c:382
+#: src/prefs_template.c:386
 msgid "Move the selected template down"
 msgstr "Déplace le modèle sélectionné une ligne plus bas"
 
-#: src/prefs_template.c:392
+#: src/prefs_template.c:396
 msgid "Move the selected template to the bottom"
 msgstr "Déplace le modèle sélectionné tout en bas"
 
-#: src/prefs_template.c:408
+#: src/prefs_template.c:412
 msgid "Template configuration"
 msgstr "Configuration des modèles"
 
-#: src/prefs_template.c:595
+#: src/prefs_template.c:599
 msgid "Templates list not saved"
 msgstr "Liste des modèles non enregistrée"
 
-#: src/prefs_template.c:596
+#: src/prefs_template.c:600
 msgid "The templates list has been modified. Close anyway?"
 msgstr "La liste de modèles a été modifiée mais non enregistrée. Voulez-vous quand même fermer ?"
 
-#: src/prefs_template.c:757
+#: src/prefs_template.c:761
 msgid "The template's name is not set."
 msgstr "Le nom du modèle n'est pas défini."
 
-#: src/prefs_template.c:794
+#: src/prefs_template.c:798
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "Le champ \"De\" du modèle contient une adresse email invalide."
 
-#: src/prefs_template.c:800
+#: src/prefs_template.c:804
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "Le champ \"À\" du modèle contient une adresse email invalide."
 
-#: src/prefs_template.c:806
+#: src/prefs_template.c:810
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "Le champ \"Cc\" du modèle contient une adresse email invalide."
 
-#: src/prefs_template.c:812
+#: src/prefs_template.c:816
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "Le champ \"Bcc\" du modèle contient une adresse email invalide."
 
-#: src/prefs_template.c:818
+#: src/prefs_template.c:822
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "Le champ \"Sujet\" du modèle est invalide."
 
-#: src/prefs_template.c:888
+#: src/prefs_template.c:892
 msgid "Delete template"
 msgstr "Supprimer le modèle"
 
-#: src/prefs_template.c:889
+#: src/prefs_template.c:893
 msgid "Do you really want to delete this template?"
 msgstr "Voulez-vous vraiment supprimer le modèle sélectionné ?"
 
-#: src/prefs_template.c:901
+#: src/prefs_template.c:905
 msgid "Delete all templates"
 msgstr "Suppression de tous les modèles"
 
-#: src/prefs_template.c:902
+#: src/prefs_template.c:906
 msgid "Do you really want to delete all the templates?"
 msgstr "Voulez-vous vraiment supprimer tous les modèles ?"
 
-#: src/prefs_template.c:1224
+#: src/prefs_template.c:1221
 msgid "Current templates"
 msgstr "Modèles enregistrés"
 
-#: src/prefs_template.c:1252
+#: src/prefs_template.c:1249
 msgid "Template"
 msgstr "Modèle"
 
@@ -17283,6 +17339,10 @@ msgstr "Sélection"
 msgid "Install new..."
 msgstr "Installer un nouveau thème.."
 
+#: src/prefs_themes.c:843
+msgid "Get more..."
+msgstr "Autres.."
+
 #: src/prefs_themes.c:854
 msgid "Information"
 msgstr "Informations"
@@ -17319,67 +17379,71 @@ msgstr "L'élément n'a pas d'icône définie."
 msgid "Item has no text defined."
 msgstr "L'élément n'a pas de texte défini."
 
-#: src/prefs_toolbar.c:911
+#: src/prefs_toolbar.c:916
 msgid "Toolbar item"
 msgstr "Élément de barre d'outils"
 
-#: src/prefs_toolbar.c:927
+#: src/prefs_toolbar.c:932
 msgid "Item type"
 msgstr "Type d'élément"
 
-#: src/prefs_toolbar.c:937
+#: src/prefs_toolbar.c:942
 msgid "Internal Function"
 msgstr "Fonction interne"
 
-#: src/prefs_toolbar.c:938
+#: src/prefs_toolbar.c:943
 msgid "User Action"
 msgstr "Action"
 
-#: src/prefs_toolbar.c:940
-#: src/toolbar.c:232
+#: src/prefs_toolbar.c:945
+#: src/toolbar.c:233
 msgid "Separator"
 msgstr "Séparateur"
 
-#: src/prefs_toolbar.c:947
+#: src/prefs_toolbar.c:952
 msgid "Event executed on click"
 msgstr "Fonction à exécuter"
 
-#: src/prefs_toolbar.c:986
+#: src/prefs_toolbar.c:991
 msgid "Toolbar text"
 msgstr "Texte de la barre d'outils"
 
-#: src/prefs_toolbar.c:1001
-#: src/prefs_toolbar.c:1372
+#: src/prefs_toolbar.c:1006
+#: src/prefs_toolbar.c:1381
 msgid "Icon"
 msgstr "Icône"
 
-#: src/prefs_toolbar.c:1252
-#: src/prefs_toolbar.c:1266
-#: src/prefs_toolbar.c:1280
+#: src/prefs_toolbar.c:1042
+msgid "A_dd"
+msgstr "A_jouter"
+
+#: src/prefs_toolbar.c:1261
+#: src/prefs_toolbar.c:1275
+#: src/prefs_toolbar.c:1289
 msgid "Toolbars"
 msgstr "Barre d'outils"
 
-#: src/prefs_toolbar.c:1253
+#: src/prefs_toolbar.c:1262
 msgid "Main Window"
 msgstr "Vue principale"
 
-#: src/prefs_toolbar.c:1267
+#: src/prefs_toolbar.c:1276
 msgid "Message Window"
 msgstr "Vue de messages"
 
-#: src/prefs_toolbar.c:1281
+#: src/prefs_toolbar.c:1290
 msgid "Compose Window"
 msgstr "Fenêtre de composition"
 
-#: src/prefs_toolbar.c:1395
+#: src/prefs_toolbar.c:1404
 msgid "Icon text"
 msgstr "Texte"
 
-#: src/prefs_toolbar.c:1404
+#: src/prefs_toolbar.c:1413
 msgid "Mapped event"
 msgstr "Fonction"
 
-#: src/prefs_toolbar.c:1701
+#: src/prefs_toolbar.c:1710
 msgid "Toolbar item icon"
 msgstr "Icône de l'élément de barre d'outils"
 
@@ -17449,9 +17513,9 @@ msgstr "Aucune d'information trouvée"
 msgid "No recipient keys defined."
 msgstr "Pas de clé de destinataire spécifiée."
 
-#: src/procmime.c:419
-#: src/procmime.c:421
 #: src/procmime.c:422
+#: src/procmime.c:424
+#: src/procmime.c:425
 msgid "[Error decoding BASE64]\n"
 msgstr "[Erreur de décodage BASE64]\n"
 
@@ -17483,7 +17547,7 @@ msgid "No specific account has been found to send, and an error happened during
 msgstr "Aucun compte précis n'a été trouvé pour l'envoi, et une erreur est survenue durant la session SMTP."
 
 #: src/procmsg.c:1732
-msgid "Couldn't determine sending informations. Maybe the email hasn't been generated by Claws Mail."
+msgid "Couldn't determine sending information. Maybe the email hasn't been generated by Claws Mail."
 msgstr "Impossible de déterminer les paramètres d'envoi. Le message n'a sans doute pas été généré par Claws Mail."
 
 #: src/procmsg.c:1750
@@ -17792,77 +17856,77 @@ msgstr "Impossible de lancer la commande : %s"
 msgid "Error occurred while executing command: %s"
 msgstr "Une erreur est survenue pendant le lancement de la commande : %s"
 
-#: src/send_message.c:331
+#: src/send_message.c:339
 msgid "Connecting"
 msgstr "Connexion"
 
-#: src/send_message.c:336
+#: src/send_message.c:344
 msgid "Doing POP before SMTP..."
 msgstr "Connexion POP avant SMTP.."
 
-#: src/send_message.c:339
+#: src/send_message.c:347
 msgid "POP before SMTP"
 msgstr "POP avant SMTP"
 
-#: src/send_message.c:344
+#: src/send_message.c:352
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Compte '%s' : Connexion au serveur SMTP : %s:%d.."
 
-#: src/send_message.c:401
+#: src/send_message.c:409
 msgid "Mail sent successfully."
 msgstr "Message envoyé avec succès."
 
-#: src/send_message.c:468
+#: src/send_message.c:476
 msgid "Sending HELO..."
 msgstr "Envoi de HELO.."
 
-#: src/send_message.c:469
-#: src/send_message.c:474
-#: src/send_message.c:479
+#: src/send_message.c:477
+#: src/send_message.c:482
+#: src/send_message.c:487
 msgid "Authenticating"
 msgstr "Authentification"
 
-#: src/send_message.c:470
-#: src/send_message.c:475
+#: src/send_message.c:478
+#: src/send_message.c:483
 msgid "Sending message..."
 msgstr "Envoi du message.."
 
-#: src/send_message.c:473
+#: src/send_message.c:481
 msgid "Sending EHLO..."
 msgstr "Envoi de EHLO.."
 
-#: src/send_message.c:482
+#: src/send_message.c:490
 msgid "Sending MAIL FROM..."
 msgstr "Envoi de MAIL FROM.."
 
-#: src/send_message.c:486
+#: src/send_message.c:494
 msgid "Sending RCPT TO..."
 msgstr "Envoi de RCPT TO.."
 
-#: src/send_message.c:491
+#: src/send_message.c:499
 msgid "Sending DATA..."
 msgstr "Envoi de DATA.."
 
-#: src/send_message.c:495
+#: src/send_message.c:503
 msgid "Quitting..."
 msgstr "Fermeture.."
 
-#: src/send_message.c:524
+#: src/send_message.c:532
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Envoi du message (%d / %d octets)"
 
-#: src/send_message.c:577
+#: src/send_message.c:585
 msgid "Sending message"
 msgstr "Envoi de message"
 
-#: src/send_message.c:646
-#: src/send_message.c:666
+#: src/send_message.c:654
+#: src/send_message.c:674
 msgid "Error occurred while sending the message."
 msgstr "Une erreur est survenue pendant l'envoi de message."
 
-#: src/send_message.c:649
+#: src/send_message.c:657
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -17908,44 +17972,44 @@ msgstr "Supprimer le certificat"
 msgid "Do you really want to delete this certificate?"
 msgstr "Voulez-vous vraiment supprimer le certificat sélectionné ?"
 
-#: src/summary_search.c:266
+#: src/summary_search.c:271
 msgid "Search messages"
 msgstr "Chercher dans le dossier"
 
-#: src/summary_search.c:292
+#: src/summary_search.c:293
 msgid "Match any of the following"
 msgstr "Messages validant au moins UN des critères suivants"
 
-#: src/summary_search.c:294
+#: src/summary_search.c:295
 msgid "Match all of the following"
 msgstr "Messages validant TOUS les critères suivants"
 
-#: src/summary_search.c:433
+#: src/summary_search.c:459
 msgid "Body:"
 msgstr ""
 "Corps du\n"
 "message :"
 
-#: src/summary_search.c:440
+#: src/summary_search.c:466
 msgid "Condition:"
 msgstr "Condition :"
 
-#: src/summary_search.c:470
+#: src/summary_search.c:496
 msgid "Find _all"
 msgstr "Chercher _tous"
 
-#: src/summary_search.c:679
+#: src/summary_search.c:702
 #: src/summaryview.c:1105
 #: src/summaryview.c:1366
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Recherche en cours dans le dossier %s.. \n"
 
-#: src/summary_search.c:776
+#: src/summary_search.c:799
 msgid "Beginning of list reached; continue from end?"
 msgstr "Début de liste atteinte, reprise à la fin ?"
 
-#: src/summary_search.c:778
+#: src/summary_search.c:801
 msgid "End of list reached; continue from beginning?"
 msgstr "Fin de liste atteinte, reprise au début ?"
 
@@ -18155,71 +18219,71 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>À : %s, le %s</span>"
 
-#: src/summaryview.c:4290
+#: src/summaryview.c:4286
 msgid "You're not the author of the article.\n"
 msgstr "Vous n'êtes pas l'auteur de cet article.\n"
 
-#: src/summaryview.c:4383
+#: src/summaryview.c:4379
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "Voulez-vous vraiment supprimer le message sélectionné ?"
 msgstr[1] "Voulez-vous vraiment supprimer les %d messages sélectionnés ?"
 
-#: src/summaryview.c:4386
+#: src/summaryview.c:4382
 msgid "Delete message(s)"
 msgstr "Suppression de message(s)"
 
-#: src/summaryview.c:4549
+#: src/summaryview.c:4545
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
-#: src/summaryview.c:4648
+#: src/summaryview.c:4644
 msgid "Destination to copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques"
 
-#: src/summaryview.c:4821
+#: src/summaryview.c:4817
 msgid "Append or Overwrite"
 msgstr "Ajouter ou écraser"
 
-#: src/summaryview.c:4822
+#: src/summaryview.c:4818
 msgid "Append or overwrite existing file?"
 msgstr "Le fichier existe déjà. Ajouter au fichier existant ou bien l'écraser ?"
 
-#: src/summaryview.c:4823
+#: src/summaryview.c:4819
 msgid "_Append"
 msgstr "_Ajouter"
 
-#: src/summaryview.c:4823
+#: src/summaryview.c:4819
 msgid "_Overwrite"
 msgstr "_Ecraser"
 
-#: src/summaryview.c:4864
+#: src/summaryview.c:4860
 #, c-format
 msgid "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "Vous êtes sur le point d'imprimer %d messages un par un. Voulez-vous continuer ?"
 
-#: src/summaryview.c:5341
+#: src/summaryview.c:5337
 msgid "Building threads..."
 msgstr "Construction des threads.."
 
-#: src/summaryview.c:5587
+#: src/summaryview.c:5583
 msgid "Skip these rules"
 msgstr "Ignorer ces règles"
 
-#: src/summaryview.c:5590
+#: src/summaryview.c:5586
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Appliquer ces règles sans se soucier des comptes auxquels elles sont rattachées"
 
-#: src/summaryview.c:5593
+#: src/summaryview.c:5589
 msgid "Apply these rules if they apply to the current account"
 msgstr "Appliquer ces règles si elles s'appliquent au compte courant"
 
-#: src/summaryview.c:5622
+#: src/summaryview.c:5618
 msgid "Filtering"
 msgstr "Filtrage"
 
-#: src/summaryview.c:5623
+#: src/summaryview.c:5619
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18227,59 +18291,59 @@ msgstr ""
 "Il y a des règles de filtrage rattachées à des comptes.\n"
 "Veuillez sélectionner ce que vous souhaitez faire avec ces règles :"
 
-#: src/summaryview.c:5625
+#: src/summaryview.c:5621
 msgid "_Filter"
 msgstr "_Filtrer"
 
-#: src/summaryview.c:5653
+#: src/summaryview.c:5649
 msgid "Filtering..."
 msgstr "Filtrage des messages.."
 
-#: src/summaryview.c:5732
+#: src/summaryview.c:5728
 msgid "Processing configuration"
 msgstr "Configuration du filtrage/traitement"
 
-#: src/summaryview.c:6280
+#: src/summaryview.c:6276
 msgid "Ignored thread"
 msgstr "Fil de discussion ignoré"
 
-#: src/summaryview.c:6282
+#: src/summaryview.c:6278
 msgid "Watched thread"
 msgstr "Fil de discussion suivi"
 
-#: src/summaryview.c:6290
+#: src/summaryview.c:6286
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Répondu mais aussi transféré - cliquer pour voir la réponse"
 
-#: src/summaryview.c:6292
+#: src/summaryview.c:6288
 msgid "Replied - click to see reply"
 msgstr "Répondu - cliquer pour voir la réponse"
 
-#: src/summaryview.c:6304
+#: src/summaryview.c:6300
 msgid "To be moved"
 msgstr "À deplacer"
 
-#: src/summaryview.c:6306
+#: src/summaryview.c:6302
 msgid "To be copied"
 msgstr "À copier"
 
-#: src/summaryview.c:6318
+#: src/summaryview.c:6314
 msgid "Signed, has attachment(s)"
 msgstr "Signé et contenant une ou plusieurs pièces jointes"
 
-#: src/summaryview.c:6322
+#: src/summaryview.c:6318
 msgid "Encrypted, has attachment(s)"
 msgstr "Chiffré et contenant une ou plusieurs pièces jointes"
 
-#: src/summaryview.c:6324
+#: src/summaryview.c:6320
 msgid "Encrypted"
 msgstr "Chiffré"
 
-#: src/summaryview.c:6326
+#: src/summaryview.c:6322
 msgid "Has attachment(s)"
 msgstr "Contient une ou plusieurs pièces jointes"
 
-#: src/summaryview.c:7963
+#: src/summaryview.c:7952
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18288,11 +18352,11 @@ msgstr ""
 "Erreur dans l'expression régulière (regexp) :\n"
 "%s"
 
-#: src/summaryview.c:8071
+#: src/summaryview.c:8060
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Revenir à la liste des dossiers (Vous avez des messages non lus)"
 
-#: src/summaryview.c:8076
+#: src/summaryview.c:8065
 msgid "Go back to the folder list"
 msgstr "Revenir à la liste des dossiers"
 
@@ -18452,323 +18516,323 @@ msgstr "Attention : Tentative d'hameçonnage (phishing)"
 msgid "_Open URL"
 msgstr "_Ouvrir l'URL"
 
-#: src/toolbar.c:191
-#: src/toolbar.c:1948
+#: src/toolbar.c:192
+#: src/toolbar.c:1949
 msgid "Receive Mail from all Accounts"
 msgstr "Relever le courrier de tous les comptes"
 
-#: src/toolbar.c:192
-#: src/toolbar.c:1953
+#: src/toolbar.c:193
+#: src/toolbar.c:1954
 msgid "Receive Mail from current Account"
 msgstr "Relever le courrier du compte courant"
 
-#: src/toolbar.c:193
-#: src/toolbar.c:1957
+#: src/toolbar.c:194
+#: src/toolbar.c:1958
 msgid "Send Queued Messages"
 msgstr "Envoyer les messages en attente"
 
-#: src/toolbar.c:194
-#: src/toolbar.c:918
-#: src/toolbar.c:1975
-#: src/toolbar.c:1986
+#: src/toolbar.c:195
+#: src/toolbar.c:919
+#: src/toolbar.c:1976
+#: src/toolbar.c:1987
 msgid "Compose Email"
 msgstr "Composer un message"
 
-#: src/toolbar.c:195
+#: src/toolbar.c:196
 msgid "Compose News"
 msgstr "Composer un article"
 
-#: src/toolbar.c:196
-#: src/toolbar.c:2014
-#: src/toolbar.c:2024
+#: src/toolbar.c:197
+#: src/toolbar.c:2015
+#: src/toolbar.c:2025
 msgid "Reply to Message"
 msgstr "Répondre au message"
 
-#: src/toolbar.c:197
-#: src/toolbar.c:2031
-#: src/toolbar.c:2041
+#: src/toolbar.c:198
+#: src/toolbar.c:2032
+#: src/toolbar.c:2042
 msgid "Reply to Sender"
 msgstr "Répondre à l'expéditeur"
 
-#: src/toolbar.c:198
-#: src/toolbar.c:2048
-#: src/toolbar.c:2058
+#: src/toolbar.c:199
+#: src/toolbar.c:2049
+#: src/toolbar.c:2059
 msgid "Reply to All"
 msgstr "Répondre à tous"
 
-#: src/toolbar.c:199
-#: src/toolbar.c:2065
-#: src/toolbar.c:2075
+#: src/toolbar.c:200
+#: src/toolbar.c:2066
+#: src/toolbar.c:2076
 msgid "Reply to Mailing-list"
 msgstr "Répondre à la liste"
 
-#: src/toolbar.c:200
-#: src/toolbar.c:1969
+#: src/toolbar.c:201
+#: src/toolbar.c:1970
 msgid "Open email"
 msgstr "Ouvrir le message"
 
-#: src/toolbar.c:201
-#: src/toolbar.c:2082
-#: src/toolbar.c:2093
+#: src/toolbar.c:202
+#: src/toolbar.c:2083
+#: src/toolbar.c:2094
 msgid "Forward Message"
 msgstr "Transférer le(s) message(s) sélectionné(s)"
 
-#: src/toolbar.c:202
-#: src/toolbar.c:2098
+#: src/toolbar.c:203
+#: src/toolbar.c:2099
 msgid "Trash Message"
 msgstr "Déplacer le(s) message(s) sélectionné(s) vers la corbeille"
 
-#: src/toolbar.c:203
-#: src/toolbar.c:2102
+#: src/toolbar.c:204
+#: src/toolbar.c:2103
 msgid "Delete Message"
 msgstr "Supprimer le(s) message(s) sélectionné(s)"
 
-#: src/toolbar.c:205
-#: src/toolbar.c:2110
+#: src/toolbar.c:206
+#: src/toolbar.c:2111
 msgid "Go to Previous Unread Message"
 msgstr "Aller au message non lu précédent"
 
-#: src/toolbar.c:206
-#: src/toolbar.c:2114
+#: src/toolbar.c:207
+#: src/toolbar.c:2115
 msgid "Go to Next Unread Message"
 msgstr "Aller au message non lu suivant"
 
-#: src/toolbar.c:209
-#: src/toolbar.c:419
+#: src/toolbar.c:210
+#: src/toolbar.c:420
 msgid "Print"
 msgstr "Impression"
 
-#: src/toolbar.c:210
+#: src/toolbar.c:211
 msgid "Learn Spam or Ham"
 msgstr "Appliquer l'opération d'apprentissage de SpamAssassin"
 
-#: src/toolbar.c:211
+#: src/toolbar.c:212
 msgid "Open folder/Go to folder list"
 msgstr "Ouvrir le dossier / la liste des dossiers"
 
-#: src/toolbar.c:214
-#: src/toolbar.c:2120
+#: src/toolbar.c:215
+#: src/toolbar.c:2121
 msgid "Send Message"
 msgstr "Envoyer le message"
 
-#: src/toolbar.c:215
-#: src/toolbar.c:2124
+#: src/toolbar.c:216
+#: src/toolbar.c:2125
 msgid "Put into queue folder and send later"
 msgstr "Mettre en file d'attente et envoyer plus tard"
 
-#: src/toolbar.c:216
-#: src/toolbar.c:2128
+#: src/toolbar.c:217
+#: src/toolbar.c:2129
 msgid "Save to draft folder"
 msgstr "Enregistrer dans le dossier brouillon"
 
-#: src/toolbar.c:217
-#: src/toolbar.c:2132
+#: src/toolbar.c:218
+#: src/toolbar.c:2133
 msgid "Insert file"
 msgstr "Insérer un fichier"
 
-#: src/toolbar.c:218
-#: src/toolbar.c:2136
+#: src/toolbar.c:219
+#: src/toolbar.c:2137
 msgid "Attach file"
 msgstr "Joindre un fichier"
 
-#: src/toolbar.c:219
-#: src/toolbar.c:2140
+#: src/toolbar.c:220
+#: src/toolbar.c:2141
 msgid "Insert signature"
 msgstr "Insérer la signature"
 
-#: src/toolbar.c:220
-#: src/toolbar.c:2144
+#: src/toolbar.c:221
+#: src/toolbar.c:2145
 msgid "Edit with external editor"
 msgstr "Éditer avec un éditeur auxiliaire"
 
-#: src/toolbar.c:221
-#: src/toolbar.c:2148
+#: src/toolbar.c:222
+#: src/toolbar.c:2149
 msgid "Wrap long lines of current paragraph"
 msgstr "Justifier le paragraphe actuel"
 
-#: src/toolbar.c:222
-#: src/toolbar.c:2152
+#: src/toolbar.c:223
+#: src/toolbar.c:2153
 msgid "Wrap all long lines"
 msgstr "Justifier tout le message"
 
-#: src/toolbar.c:225
-#: src/toolbar.c:437
-#: src/toolbar.c:2161
+#: src/toolbar.c:226
+#: src/toolbar.c:438
+#: src/toolbar.c:2162
 msgid "Check spelling"
 msgstr "Vérifier l'orthographe"
 
-#: src/toolbar.c:227
+#: src/toolbar.c:228
 msgid "Claws Mail Actions Feature"
 msgstr "Actions Claws Mail"
 
-#: src/toolbar.c:228
-#: src/toolbar.c:2177
+#: src/toolbar.c:229
+#: src/toolbar.c:2178
 msgid "Cancel receiving"
 msgstr "Interrompre la relève du courrier"
 
-#: src/toolbar.c:230
-#: src/toolbar.c:2185
+#: src/toolbar.c:231
+#: src/toolbar.c:2186
 msgid "Cancel receiving/sending"
 msgstr "Interrompre la relève et/ou l'envoi"
 
-#: src/toolbar.c:231
-#: src/toolbar.c:1961
+#: src/toolbar.c:232
+#: src/toolbar.c:1962
 msgid "Close window"
 msgstr "Fermer la fenêtre"
 
-#: src/toolbar.c:233
+#: src/toolbar.c:234
 msgid "Claws Mail Plugins"
 msgstr "Modules Claws Mail"
 
-#: src/toolbar.c:377
-#: src/toolbar.c:412
+#: src/toolbar.c:378
+#: src/toolbar.c:413
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/toolbar.c:400
+#: src/toolbar.c:401
 msgid "Folders"
 msgstr "Dossiers"
 
-#: src/toolbar.c:402
+#: src/toolbar.c:403
 msgid "Get Mail"
 msgstr "Relever"
 
-#: src/toolbar.c:403
+#: src/toolbar.c:404
 msgid "Get"
 msgstr "Relever"
 
-#: src/toolbar.c:405
 #: src/toolbar.c:406
+#: src/toolbar.c:407
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Composer"
 
-#: src/toolbar.c:408
+#: src/toolbar.c:409
 msgid "All"
 msgstr "À tous"
 
-#: src/toolbar.c:409
+#: src/toolbar.c:410
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "Expéditeur"
 
-#: src/toolbar.c:410
+#: src/toolbar.c:411
 msgid "List"
 msgstr "À la liste"
 
-#: src/toolbar.c:415
+#: src/toolbar.c:416
 msgid "Prev"
 msgstr "Précédent"
 
-#: src/toolbar.c:416
+#: src/toolbar.c:417
 msgid "Next"
 msgstr "Suivant"
 
-#: src/toolbar.c:424
+#: src/toolbar.c:425
 msgid "Draft"
 msgstr "Brouillon"
 
-#: src/toolbar.c:427
+#: src/toolbar.c:428
 msgid "Insert sig."
 msgstr "Insérer signature"
 
-#: src/toolbar.c:428
+#: src/toolbar.c:429
 msgid "Edit"
 msgstr "Éditer"
 
-#: src/toolbar.c:429
+#: src/toolbar.c:430
 msgid "Wrap para."
 msgstr "Justifier para."
 
-#: src/toolbar.c:430
+#: src/toolbar.c:431
 msgid "Wrap all"
 msgstr "Justifier tout"
 
-#: src/toolbar.c:432
 #: src/toolbar.c:433
+#: src/toolbar.c:434
 msgid "Stop"
 msgstr "Interrompre"
 
-#: src/toolbar.c:434
+#: src/toolbar.c:435
 msgid "Stop all"
 msgstr "Interrompre"
 
-#: src/toolbar.c:910
+#: src/toolbar.c:911
 msgid "Compose News message"
 msgstr "Composer un article de groupe de discussion"
 
-#: src/toolbar.c:952
+#: src/toolbar.c:953
 msgid "Learn spam"
 msgstr "Marquer le(s) courriel(s) sélectionné(s) comme pourriel(s)"
 
-#: src/toolbar.c:961
+#: src/toolbar.c:962
 msgid "Ham"
 msgstr "Légitime"
 
-#: src/toolbar.c:963
+#: src/toolbar.c:964
 msgid "Learn ham"
 msgstr "Marquer le(s) courriel(s) sélectionné(s) comme légitime(s)"
 
-#: src/toolbar.c:1943
+#: src/toolbar.c:1944
 msgid "Go to folder list"
 msgstr "Ouvrir la liste des dossiers"
 
-#: src/toolbar.c:1949
+#: src/toolbar.c:1950
 msgid "Receive Mail from selected Account"
 msgstr "Relever le courrier du compte sélectionné"
 
-#: src/toolbar.c:1965
+#: src/toolbar.c:1966
 msgid "Open preferences"
 msgstr "Ouvrir les préférences"
 
-#: src/toolbar.c:1976
+#: src/toolbar.c:1977
 msgid "Compose with selected Account"
 msgstr "Composer un message avec le compte sélectionné"
 
-#: src/toolbar.c:1997
+#: src/toolbar.c:1998
 msgid "Learn as..."
 msgstr "Marquer comme.."
 
-#: src/toolbar.c:2007
+#: src/toolbar.c:2008
 msgid "Learn as _Spam"
 msgstr "Marquer comme _pourriel"
 
-#: src/toolbar.c:2008
+#: src/toolbar.c:2009
 msgid "Learn as _Ham"
 msgstr "Marquer comme _légitime"
 
-#: src/toolbar.c:2015
+#: src/toolbar.c:2016
 msgid "Reply to Message options"
 msgstr "Options de réponse à un message"
 
-#: src/toolbar.c:2019
-#: src/toolbar.c:2036
-#: src/toolbar.c:2053
-#: src/toolbar.c:2070
-msgid "_Reply with quote"
-msgstr "Répondre en _citant le message"
-
 #: src/toolbar.c:2020
 #: src/toolbar.c:2037
 #: src/toolbar.c:2054
 #: src/toolbar.c:2071
+msgid "_Reply with quote"
+msgstr "Répondre en _citant le message"
+
+#: src/toolbar.c:2021
+#: src/toolbar.c:2038
+#: src/toolbar.c:2055
+#: src/toolbar.c:2072
 msgid "Reply without _quote"
 msgstr "Répondre _sans citer le message"
 
-#: src/toolbar.c:2032
+#: src/toolbar.c:2033
 msgid "Reply to Sender options"
 msgstr "Options de réponse à l'expéditeur"
 
-#: src/toolbar.c:2049
+#: src/toolbar.c:2050
 msgid "Reply to All options"
 msgstr "Options de réponse à tous"
 
-#: src/toolbar.c:2066
+#: src/toolbar.c:2067
 msgid "Reply to Mailing-list options"
 msgstr "Options de réponse à la liste"
 
-#: src/toolbar.c:2083
+#: src/toolbar.c:2084
 msgid "Forward Message options"
 msgstr "Options de transfert d'un message"
 
@@ -18793,12 +18857,12 @@ msgstr "Veuillez sélectionner un URL à ouvrir."
 msgid "Select All"
 msgstr "Sélectionner tout"
 
-#: src/wizard.c:539
+#: src/wizard.c:517
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Bienvenue dans Claws Mail"
 
-#: src/wizard.c:562
+#: src/wizard.c:540
 #, c-format
 msgid ""
 "\n"
@@ -18893,143 +18957,127 @@ msgstr ""
 "<%s>\n"
 "\n"
 
-#: src/wizard.c:638
+#: src/wizard.c:616
 msgid "Please enter the mailbox name."
 msgstr "Veuillez saisir le nom de la boîte aux lettres."
 
-#: src/wizard.c:681
+#: src/wizard.c:644
 msgid "Please enter your name and email address."
 msgstr "Veuillez saisir votre nom et adresse email."
 
-#: src/wizard.c:692
+#: src/wizard.c:655
 msgid "Please enter your receiving server and username."
 msgstr "Veuillez saisir votre serveur de réception et votre compte utilisateur."
 
-#: src/wizard.c:702
+#: src/wizard.c:665
 msgid "Please enter your username."
 msgstr "Veuillez saisir l'emplacement de votre boîte aux lettres locale."
 
-#: src/wizard.c:712
+#: src/wizard.c:675
 msgid "Please enter your SMTP server."
 msgstr "Veuillez saisir votre serveur d'envoi (SMTP)."
 
-#: src/wizard.c:723
+#: src/wizard.c:686
 msgid "Please enter your SMTP username."
 msgstr "Veuillez saisir votre nom d'utilisateur sur le serveur d'envoi."
 
-#: src/wizard.c:1013
+#: src/wizard.c:965
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Votre nom :</span>"
 
-#: src/wizard.c:1023
+#: src/wizard.c:975
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Votre adresse email :</span>"
 
-#: src/wizard.c:1033
+#: src/wizard.c:985
 msgid "Your organization:"
 msgstr "Votre société :"
 
-#: src/wizard.c:1141
+#: src/wizard.c:1018
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Nom de la boîte aux lettres :</span>"
 
-#: src/wizard.c:1149
+#: src/wizard.c:1026
 msgid "You can also specify an absolute path, for example: \"/home/john/Documents/Mail\""
 msgstr "Vous pouvez aussi spécifier un chemin absolu, comme par exemple : « /home/john/Documents/Mail »."
 
-#: src/wizard.c:1157
-msgid "on internal memory"
-msgstr "en mémoire interne"
-
-#: src/wizard.c:1160
-msgid "on external memory card"
-msgstr "sur la carte mémoire externe"
-
-#: src/wizard.c:1163
-msgid "on internal memory card"
-msgstr "sur la carte mémoire interne"
-
-#: src/wizard.c:1213
-msgid "<span weight=\"bold\">Store data</span>"
-msgstr "<span weight=\"bold\">Stockage des données</span>"
-
-#: src/wizard.c:1281
+#: src/wizard.c:1097
 msgid "You can specify the port number by appending it at the end: \"mail.example.com:25\""
 msgstr "Vous pouvez spécifier le numéro du port en l'ajoutant à la fin : « mail.exemple.com:25 »."
 
-#: src/wizard.c:1284
+#: src/wizard.c:1100
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Adresse du serveur d'envoi (SMTP) :</span>"
 
-#: src/wizard.c:1290
+#: src/wizard.c:1106
 msgid "Use authentication"
 msgstr "Utiliser l'authentification (SMTP AUTH)"
 
-#: src/wizard.c:1298
+#: src/wizard.c:1114
 msgid "<span size=\"small\">(empty to use the same as receive)</span>"
 msgstr "<span size=\"small\">(si non renseigné, utilise le même qu'en réception)</span>"
 
-#: src/wizard.c:1312
+#: src/wizard.c:1128
 msgid "SMTP username:"
 msgstr "Nom d'utilisateur SMTP :"
 
-#: src/wizard.c:1323
+#: src/wizard.c:1139
 msgid "SMTP password:"
 msgstr "Mot de passe SMTP :"
 
-#: src/wizard.c:1340
+#: src/wizard.c:1152
 msgid "Use SSL to connect to SMTP server"
 msgstr "Utiliser SSL pour les connexions au serveur d'envoi (SMTP)"
 
-#: src/wizard.c:1351
-#: src/wizard.c:1630
+#: src/wizard.c:1163
+#: src/wizard.c:1437
 msgid "Use SSL via STARTTLS"
 msgstr "Utiliser SSL via STARTTLS"
 
-#: src/wizard.c:1363
-#: src/wizard.c:1642
+#: src/wizard.c:1175
+#: src/wizard.c:1449
 msgid "Client SSL certificate (optional)"
 msgstr "Certificat client SSL (optionnel)"
 
-#: src/wizard.c:1425
-#: src/wizard.c:1450
-#: src/wizard.c:1573
+#: src/wizard.c:1237
+#: src/wizard.c:1262
+#: src/wizard.c:1385
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Adresse du serveur :</span>"
 
-#: src/wizard.c:1480
+#: src/wizard.c:1292
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Boîte aux lettres locale :</span>"
 
-#: src/wizard.c:1540
+#: src/wizard.c:1352
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Type de serveur :</span>"
 
-#: src/wizard.c:1550
+#: src/wizard.c:1362
 msgid "IMAP"
 msgstr "IMAP4"
 
-#: src/wizard.c:1584
+#: src/wizard.c:1396
 msgid "You can specify the port number by appending it at the end: \"mail.example.com:110\""
 msgstr "Vous pouvez spécifier le numéro du port en l'ajoutant à la fin : « mail.exemple.com:110 »."
 
-#: src/wizard.c:1589
+#: src/wizard.c:1401
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Utilisateur :</span>"
 
-#: src/wizard.c:1619
+#: src/wizard.c:1426
 msgid "Use SSL to connect to receiving server"
 msgstr "Utiliser SSL pour les connexions au serveur de réception"
 
-#: src/wizard.c:1684
+#: src/wizard.c:1491
 msgid "IMAP server directory:"
 msgstr "Répertoire IMAP4 :"
 
-#: src/wizard.c:1695
+#: src/wizard.c:1502
 msgid "Show only subscribed folders"
 msgstr "Afficher seulement les dossiers inscrits"
 
-#: src/wizard.c:1703
+#: src/wizard.c:1510
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"
@@ -19037,15 +19085,15 @@ msgstr ""
 "<span weight=\"bold\">Attention : la version de Claws Mail actuellement\n"
 "utilisée a été compilée sans le support IMAP.</span>"
 
-#: src/wizard.c:1823
+#: src/wizard.c:1628
 msgid "Claws Mail Setup Wizard"
 msgstr "Assistant de configuration de Claws Mail"
 
-#: src/wizard.c:1857
+#: src/wizard.c:1662
 msgid "Welcome to Claws Mail"
 msgstr "Bienvenue dans Claws Mail"
 
-#: src/wizard.c:1865
+#: src/wizard.c:1670
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19055,34 +19103,34 @@ msgstr ""
 "\n"
 "Nous allons définir ici quelques informations sommaires comme vos informations personnelles et vos paramètres de connexion courants, de sorte que vous puissiez commencer à utiliser Claws Mail dans une poignée de secondes..."
 
-#: src/wizard.c:1888
+#: src/wizard.c:1683
 msgid "About You"
 msgstr "Informations personnelles"
 
-#: src/wizard.c:1896
-#: src/wizard.c:1911
-#: src/wizard.c:1926
-#: src/wizard.c:1942
+#: src/wizard.c:1691
+#: src/wizard.c:1706
+#: src/wizard.c:1721
+#: src/wizard.c:1737
 msgid "Bold fields must be completed"
 msgstr "Les champs en gras doivent être spécifiés."
 
-#: src/wizard.c:1903
+#: src/wizard.c:1698
 msgid "Receiving mail"
 msgstr "Réception du courrier"
 
-#: src/wizard.c:1918
+#: src/wizard.c:1713
 msgid "Sending mail"
 msgstr "Envoi du courrier"
 
-#: src/wizard.c:1934
+#: src/wizard.c:1729
 msgid "Saving mail on disk"
 msgstr "Enregistrer les messages sur le disque"
 
-#: src/wizard.c:1950
+#: src/wizard.c:1745
 msgid "Configuration finished"
 msgstr "Configuration terminée"
 
-#: src/wizard.c:1958
+#: src/wizard.c:1753
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -19093,6 +19141,94 @@ msgstr ""
 "Vous pouvez maintenant cliquer sur « Enregistrer » pour\n"
 "débuter et apprécier..."
 
+#~ msgid "More plugins are available from the Claws Mail website."
+#~ msgstr ""
+#~ "Plus de modules sont disponibles depuis le site internet de Claws Mail."
+
+#~ msgid "Claws Mail: %d new message"
+
+#~ msgid_plural "Claws Mail: %d new messages"
+#~ msgstr[0] "Claws Mail : %d nouveau message"
+#~ msgstr[1] "Claws Mail : %d nouveaux messages"
+
+#~ msgid "Unable to connect: you are offline."
+#~ msgstr "Connexion impossible : vous êtes hors-ligne."
+
+#~ msgid "Exiting..."
+#~ msgstr "Fermeture.."
+
+#~ msgid "Claws Mail can not start without its data volume (%s)."
+#~ msgstr "Claws Mail ne peut démarrer sans son volume de données (%s)."
+
+#~ msgid "No registered viewer for this file type."
+#~ msgstr "Aucun programme n'est référencé pour afficher ce type de fichier."
+
+#~ msgid "Skip quoted lines"
+#~ msgstr "Ne pas vérifier les citations"
+
+#~ msgid "Skip forwards and redirections"
+#~ msgstr "Ne pas vérifier les messages transférés ou redirigés"
+
+#~ msgid "Skip signature"
+#~ msgstr "Ignorer la signature"
+
+#~ msgid ""
+#~ "This plugin provides Python integration features.\n"
+#~ "\n"
+#~ "For the most up-to-date API documentation, type\n"
+#~ "\n"
+#~ " help(clawsmail)\n"
+#~ "\n"
+#~ "in the interactive Python console under Tools -> Show Python console.\n"
+#~ "\n"
+#~ "The source distribution of this plugin comes with various example scripts "
+#~ "in the \"examples\" subdirectory. If you wrote a script that you would be "
+#~ "interested in sharing, feel free to send it to me to have it considered "
+#~ "for inclusion in the examples.\n"
+#~ "\n"
+#~ "Feedback to <berndth at gmx.de> is welcome."
+#~ msgstr ""
+#~ "Ce module permet l'intégration de fonctionnalités Python.\n"
+#~ "\n"
+#~ "Pour consulter la documentation de l'API, tapez\n"
+#~ "\n"
+#~ " help(clawsmail)\n"
+#~ "\n"
+#~ "dans la console interactive Python disponible dans Outils -> Afficher la "
+#~ "console Python.\n"
+#~ "\n"
+#~ "Vous trouverez de nombreux exemples de scripts Python dans le répertoire "
+#~ "\"examples\" contenu dans les sources de ce module. Si vous avez écrit un "
+#~ "script Python et souhaitez en faire bénéficier les autres utilisateurs, "
+#~ "envoyez-le moi et je l'ajouterai volontiers dans le répertoire des "
+#~ "exemples.\n"
+#~ "\n"
+#~ "Vos commentaires et retours sont les bienvenus auprès de <berndth at gmx.de>."
+
+#~ msgid "Replace"
+#~ msgstr "Remplacer"
+
+#~ msgid "Blink LED"
+#~ msgstr "Faire clignoter les diodes"
+
+#~ msgid "Play sound"
+#~ msgstr "Jouer un son"
+
+#~ msgid "Show info banner"
+#~ msgstr "Afficher un bandeau informatif"
+
+#~ msgid "on internal memory"
+#~ msgstr "en mémoire interne"
+
+#~ msgid "on external memory card"
+#~ msgstr "sur la carte mémoire externe"
+
+#~ msgid "on internal memory card"
+#~ msgstr "sur la carte mémoire interne"
+
+#~ msgid "<span weight=\"bold\">Store data</span>"
+#~ msgstr "<span weight=\"bold\">Stockage des données</span>"
+
 #~ msgid "`%c' can't be included in folder name."
 #~ msgstr "'%c' n'est pas un caractère valide dans le nom d'un dossier."
 
diff --git a/po/he.po b/po/he.po
index c9c9a55..d6d72c6 100644
--- a/po/he.po
+++ b/po/he.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: claws mail\n"
+"Project-Id-Version: claws-mail 3.9.3\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2013-04-29 09:41+0300\n"
-"PO-Revision-Date: 2013-04-29 12:41+0200\n"
+"POT-Creation-Date: 2013-12-07 08:54+0000\n"
+"PO-Revision-Date: 2013-12-08 08:55+0200\n"
 "Last-Translator: Isratine Citizen <genghiskhan at gmx.ca>\n"
 "Language-Team: Rahut <translators at lists.claws-mail.org>\n"
 "Language: he\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: src/account.c:393
+#: src/account.c:392
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -26,93 +26,92 @@ msgstr ""
 "קיימים כמה חלונות הלחנה פתוחים.\n"
 "סגור את כל חלונות ההלחנה לפני עריכת החשבונות."
 
-#: src/account.c:438
+#: src/account.c:437
 msgid "Can't create folder."
-msgstr "לא ניתן ליצור תיקייה."
+msgstr "אין אפשרות ליצור תיקייה."
 
-#: src/account.c:719
+#: src/account.c:717
 msgid "Edit accounts"
 msgstr "עריכת חשבונות"
 
 # מחווינה
-#: src/account.c:740
+#: src/account.c:734
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
 "indicates the default account."
 msgstr ""
-"הפעולה 'השגת דואר' תאחזר הודעות מן חשבונותייך בסדר הנתון, תיבת הסימון\n"
+"הפעולה 'השגת דואר' תאחזר הודעות מתוך חשבונותייך בסדר הנתון, תיבת הסימון\n"
 "מתווה אילו חשבונות יכללו. תמליל בולט מעיד על החשבון המשתמט."
 
-# קבע
-#: src/account.c:811
+#: src/account.c:805
 msgid " _Set as default account "
-msgstr " הגדר כחשבון משתמ_ט "
+msgstr " קבע בתור חשבון משתמ_ט "
 
-#: src/account.c:906
+#: src/account.c:897
 msgid "Accounts with remote folders cannot be copied."
 msgstr "חשבונות עם תיקיות מרוחקות לא ניתנות להעתקה."
 
-#: src/account.c:913
+#: src/account.c:904
 #, c-format
 msgid "Copy of %s"
 msgstr "עותק של %s"
 
-#: src/account.c:1073
+#: src/account.c:1064
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
-msgstr "האם באמת שברצונך למחוק את החשבון '%s'?"
+msgstr "האם אתה בטוח כי ברצונך למחוק את החשבון '%s'?"
 
-#: src/account.c:1075
+#: src/account.c:1066
 msgid "(Untitled)"
 msgstr "(ללא כותרת)"
 
-#: src/account.c:1076
+#: src/account.c:1067
 msgid "Delete account"
 msgstr "מחיקת חשבון"
 
-#: src/account.c:1546
+#: src/account.c:1536
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "ק"
 
-#: src/account.c:1552
+#: src/account.c:1542
 msgid "'Get Mail' retrieves mail from the checked accounts"
-msgstr "'השגת דואר' מאחזר דואר מן החשבונות הנבחרים"
+msgstr "'השגת דואר' מאחזר דואר מתוך החשבונות הנבחרים"
 
-#: src/account.c:1559 src/addressadd.c:215 src/addressbook.c:125
-#: src/addrduplicates.c:481 src/compose.c:6984 src/editaddress.c:1270
-#: src/editaddress.c:1327 src/editaddress.c:1347 src/editbook.c:170
+#: src/account.c:1549 src/addressadd.c:215 src/addressbook.c:125
+#: src/addrduplicates.c:481 src/compose.c:7073 src/editaddress.c:1263
+#: src/editaddress.c:1320 src/editaddress.c:1340 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:284 src/plugins/pdf_viewer/poppler_viewer.c:1784
-#: src/plugins/pgpcore/select-keys.c:398 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1872 src/prefs_template.c:78
+#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1800
+#: src/plugins/pgpcore/select-keys.c:394 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1868 src/prefs_template.c:78
 msgid "Name"
 msgstr "שם"
 
-#: src/account.c:1567 src/prefs_account.c:1097 src/prefs_account.c:3922
+#: src/account.c:1557 src/prefs_account.c:1097 src/prefs_account.c:3921
 msgid "Protocol"
 msgstr "פרוטוקול"
 
-#: src/account.c:1575 src/ssl_manager.c:102
+#: src/account.c:1565 src/ssl_manager.c:102
 msgid "Server"
 msgstr "שרת"
 
 #: src/action.c:383
 #, c-format
 msgid "Could not get message file %d"
-msgstr "לא היה ניתן לקבל קובץ הודעה %d"
+msgstr "לא היתה אפשרות לקבל קובץ הודעה %d"
 
 #: src/action.c:420
 msgid "Could not get message part."
-msgstr "לא היה ניתן לקבל אזור הודעה."
+msgstr "לא היתה אפשרות לקבל אזור הודעה."
 
 # multipartite
 #: src/action.c:437
 #, c-format
 msgid "Can't get part of multipart message: %s"
-msgstr "לא ניתן להשיג חלק מן הודעה מרובת חלקים: %s"
+msgstr "אין אפשרות להשיג חלק בתוך הודעה מרובת חלקים: %s"
 
 #: src/action.c:609
 #, c-format
@@ -137,18 +136,18 @@ msgstr ""
 "פעולת סינון שגויה:\n"
 "%s"
 
-#: src/action.c:978
+#: src/action.c:988
 #, fuzzy, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
 "%s\n"
 "%s"
 msgstr ""
-"לא היה ניתן fork או לבצע את הפקודה הבאה:\n"
+"לא היתה אפשרות לבצע fork כדי לבצע את הפקודה הבאה:\n"
 "%s\n"
 "%s"
 
-#: src/action.c:980 src/plugins/bogofilter/bogofilter.c:875
+#: src/action.c:990 src/plugins/bogofilter/bogofilter.c:875
 #: src/plugins/rssyl/feed.c:1734 src/plugins/rssyl/feed.c:1738
 #: src/plugins/tnef_parse/tnef_parse.c:67
 #: src/plugins/vcalendar/vcal_folder.c:1800
@@ -158,25 +157,25 @@ msgstr ""
 msgid "Unknown error"
 msgstr "שגיאה לא מוכרת"
 
-#: src/action.c:1198 src/action.c:1368
+#: src/action.c:1208 src/action.c:1373
 msgid "Completed"
 msgstr "הושלמה"
 
-#: src/action.c:1234
+#: src/action.c:1244
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- מופעלת: %s\n"
 
-#: src/action.c:1238
+#: src/action.c:1248
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- הסתיימה: %s\n"
 
-#: src/action.c:1271
+#: src/action.c:1281
 msgid "Action's input/output"
 msgstr "קלט/פלט של פעולה"
 
-#: src/action.c:1604
+#: src/action.c:1609
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -187,11 +186,11 @@ msgstr ""
 "‏('‎%%h' יוחלף עם הארגומנט)\n"
 "  %s"
 
-#: src/action.c:1609
+#: src/action.c:1614
 msgid "Action's hidden user argument"
 msgstr "ארגומנט משתמש נסתר של פעולה"
 
-#: src/action.c:1613
+#: src/action.c:1618
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -202,11 +201,11 @@ msgstr ""
 "‏('‎%%u' יוחלף עם הארגומנט)\n"
 "  %s"
 
-#: src/action.c:1618
+#: src/action.c:1623
 msgid "Action's user argument"
 msgstr "ארגומנט משתמש של פעולה"
 
-#: src/addr_compl.c:600 src/addressbook.c:4881
+#: src/addr_compl.c:600 src/addressbook.c:4870
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:314
 msgid "Group"
 msgstr "קבוצה"
@@ -257,7 +256,7 @@ msgstr "מחיקת כל שמות אפיון"
 
 #: src/addrcustomattr.c:157
 msgid "Do you really want to delete all attribute names?"
-msgstr "האם באמת שברצונך למחוק את כל השמות אפיון"
+msgstr "האם אתה בטוח כי ברצונך למחוק כל שם אפיון?"
 
 #: src/addrcustomattr.c:181
 msgid "Delete attribute name"
@@ -265,7 +264,7 @@ msgstr "מחיקת שם אפיון"
 
 #: src/addrcustomattr.c:182
 msgid "Do you really want to delete this attribute name?"
-msgstr "האם באמת שברצונך למחוק את שם אפיון זה?"
+msgstr "האם אתה בטוח כי ברצונך למחוק את שם אפיון זה?"
 
 #: src/addrcustomattr.c:191
 msgid "Reset to default"
@@ -276,41 +275,41 @@ msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
 msgstr ""
-"האם באמת שברצונך להחליף את כל שמות האפיון\n"
+"האם אתה בטוח כי ברצונך להחליף את כל שמות האפיון\n"
 "עם המערך המשתמט?"
 
 # CM (and GTK+ are) is running on Win too
 #: src/addrcustomattr.c:212 src/addressbook.c:435 src/addressbook.c:463
 #: src/addressbook.c:480 src/edittags.c:271
-#: src/plugins/archive/archiver_gtk.c:1193 src/prefs_actions.c:1086
-#: src/prefs_filtering.c:1692 src/prefs_template.c:1095
+#: src/plugins/archive/archiver_gtk.c:1193 src/prefs_actions.c:1090
+#: src/prefs_filtering.c:1695 src/prefs_template.c:1099
 msgid "_Delete"
 msgstr "_מחק"
 
 # מחיקה מו_חלטת
-#: src/addrcustomattr.c:213 src/edittags.c:272 src/prefs_actions.c:1087
-#: src/prefs_filtering.c:1693 src/prefs_template.c:1096
+#: src/addrcustomattr.c:213 src/edittags.c:272 src/prefs_actions.c:1091
+#: src/prefs_filtering.c:1696 src/prefs_template.c:1100
 msgid "Delete _all"
 msgstr "מ_חק הכל"
 
 #: src/addrcustomattr.c:214
 msgid "_Reset to default"
-msgstr "_איפוס אל ברירת מחדל"
+msgstr "_אפס אל ברירת מחדל"
 
-#: src/addrcustomattr.c:410
+#: src/addrcustomattr.c:403
 msgid "Attribute name is not set."
 msgstr "שם אפיון אינו מוגדר."
 
-#: src/addrcustomattr.c:469
+#: src/addrcustomattr.c:462
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "ערוך שמות אפיון"
 
-#: src/addrcustomattr.c:483
+#: src/addrcustomattr.c:476
 msgid "New attribute name:"
 msgstr "שם אפיון חדש:"
 
-#: src/addrcustomattr.c:520
+#: src/addrcustomattr.c:513
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -327,13 +326,13 @@ msgid "Contact"
 msgstr "איש קשר"
 
 #: src/addressadd.c:227 src/addrduplicates.c:452
-#: src/plugins/pgpcore/select-keys.c:399 src/toolbar.c:431
+#: src/plugins/pgpcore/select-keys.c:395 src/toolbar.c:432
 msgid "Address"
 msgstr "כתובת"
 
 # להבחין
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1062
-#: src/editaddress.c:1137 src/editgroup.c:290
+#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1055
+#: src/editaddress.c:1130 src/editgroup.c:290
 msgid "Remarks"
 msgstr "הערה"
 
@@ -341,27 +340,26 @@ msgstr "הערה"
 msgid "Select Address Book Folder"
 msgstr "בחר תיקיית ספר כתובות"
 
-# נכשלתי בשמירת תמונה
-#: src/addressadd.c:483 src/editaddress.c:1585 src/headerview.c:348
+#: src/addressadd.c:483 src/editaddress.c:1582 src/headerview.c:348
 #: src/textview.c:2110
 #, c-format
 msgid ""
 "Failed to save image: \n"
 "%s"
 msgstr ""
-"נכשל לשמור תמונה: \n"
+"כשל בשמירת תמונה: \n"
 "%s"
 
-#: src/addressadd.c:532 src/addressbook.c:3221 src/addressbook.c:3272
+#: src/addressadd.c:532 src/addressbook.c:3210 src/addressbook.c:3261
 msgid "Add address(es)"
-msgstr "הוסף כתובת(ות)"
+msgstr "הוסף כתוב(ו)ת"
 
 #: src/addressadd.c:533
 msgid "Can't add the specified address"
-msgstr "לא ניתן להוסיף את הכתובת שצוינה"
+msgstr "אין אפשרות להוסיף את הכתובת שצוינה"
 
-#: src/addressbook.c:126 src/addressbook.c:4869 src/editaddress.c:1059
-#: src/editaddress.c:1120 src/editgroup.c:289 src/expldifdlg.c:517
+#: src/addressbook.c:126 src/addressbook.c:4858 src/editaddress.c:1052
+#: src/editaddress.c:1113 src/editgroup.c:289 src/expldifdlg.c:517
 #: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:782
 msgid "Email Address"
 msgstr "כתובת דוא״ל"
@@ -371,18 +369,18 @@ msgid "_Book"
 msgstr "_ספר"
 
 #: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
-#: src/addressbook.c:479 src/compose.c:576 src/gtk/quicksearch.c:799
-#: src/gtk/quicksearch.c:814 src/mainwindow.c:504 src/messageview.c:211
+#: src/addressbook.c:479 src/compose.c:578 src/mainwindow.c:504
+#: src/messageview.c:209
 msgid "_Edit"
 msgstr "ע_ריכה"
 
-#: src/addressbook.c:404 src/compose.c:581 src/mainwindow.c:507
-#: src/messageview.c:214
+#: src/addressbook.c:404 src/compose.c:583 src/mainwindow.c:507
+#: src/messageview.c:212
 msgid "_Tools"
 msgstr "_כלים"
 
-#: src/addressbook.c:405 src/compose.c:582 src/mainwindow.c:509
-#: src/messageview.c:215
+#: src/addressbook.c:405 src/compose.c:584 src/mainwindow.c:509
+#: src/messageview.c:213
 msgid "_Help"
 msgstr "_עזרה"
 
@@ -414,17 +412,17 @@ msgstr "_ערוך ספר"
 msgid "_Delete book"
 msgstr "_מחק ספר"
 
-#: src/addressbook.c:424 src/compose.c:592
+#: src/addressbook.c:424 src/compose.c:595
 msgid "_Save"
 msgstr "ש_מור"
 
-#: src/addressbook.c:425 src/compose.c:596 src/messageview.c:224
+#: src/addressbook.c:425 src/compose.c:599 src/messageview.c:222
 msgid "_Close"
 msgstr "_סגור"
 
 # CM is running on Win too
 # _בחירה מוחלטת
-#: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:228
+#: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:226
 msgid "_Select all"
 msgstr "_בחר הכל"
 
@@ -433,12 +431,12 @@ msgid "C_ut"
 msgstr "_גזור"
 
 #: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:604 src/mainwindow.c:538 src/messageview.c:227
+#: src/compose.c:607 src/mainwindow.c:538 src/messageview.c:225
 msgid "_Copy"
 msgstr "הע_תק"
 
 #: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:605
+#: src/compose.c:608
 msgid "_Paste"
 msgstr "ה_דבק"
 
@@ -474,17 +472,16 @@ msgstr "ייצוא _HTML..."
 msgid "Export LDI_F..."
 msgstr "ייצוא LDI_F..."
 
-# מציאת
 #: src/addressbook.c:451
 msgid "Find duplicates..."
-msgstr "מצא כפילויות..."
+msgstr "מציאת כפילויות..."
 
 #: src/addressbook.c:452
 msgid "Edit custom attributes..."
-msgstr "ערוך אפיונים מותאמים..."
+msgstr "עריכת אפיונים מותאמים..."
 
-#: src/addressbook.c:455 src/compose.c:684 src/mainwindow.c:801
-#: src/messageview.c:340
+#: src/addressbook.c:455 src/compose.c:687 src/mainwindow.c:801
+#: src/messageview.c:338
 msgid "_About"
 msgstr "_אודות"
 
@@ -495,7 +492,7 @@ msgstr "_עיין רשומה"
 
 # תקפות: לא מוכר
 #: src/addressbook.c:504 src/crash.c:451 src/crash.c:470 src/importldif.c:115
-#: src/plugins/pgpcore/select-keys.c:255 src/plugins/pgpcore/sgpgme.c:140
+#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:140
 #: src/plugins/vcalendar/day-view.c:410 src/plugins/vcalendar/month-view.c:431
 #: src/prefs_themes.c:705 src/prefs_themes.c:737 src/prefs_themes.c:738
 msgid "Unknown"
@@ -589,7 +586,6 @@ msgstr "שם מבחין (dn) הינו חסר"
 msgid "Missing required information"
 msgstr "מידע נדרש חסר"
 
-# typo: this
 # if it was this, it would be מפתח זה
 #: src/addressbook.c:542
 msgid "Another contact exists with that key"
@@ -599,32 +595,32 @@ msgstr "קיים איש קשר אחר עם המפתח הזה"
 msgid "Strong(er) authentication required"
 msgstr "אימות חזק (יותר) נדרש"
 
-#: src/addressbook.c:913
+#: src/addressbook.c:910
 msgid "Sources"
 msgstr "מקורות"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:629 src/prefs_other.c:475
-#: src/toolbar.c:223 src/toolbar.c:2156
+#: src/addressbook.c:914 src/prefs_matcher.c:629 src/prefs_other.c:475
+#: src/toolbar.c:224 src/toolbar.c:2157
 msgid "Address book"
 msgstr "ספר כתובות"
 
-#: src/addressbook.c:1120
+#: src/addressbook.c:1109
 msgid "Lookup name:"
 msgstr "חיפוש שם:"
 
-#: src/addressbook.c:1444 src/addressbook.c:1497 src/addrduplicates.c:803
+#: src/addressbook.c:1433 src/addressbook.c:1486 src/addrduplicates.c:803
 msgid "Delete address(es)"
-msgstr "מחיקת כתובת(ות)"
+msgstr "מחיקת כתוב(ו)ת"
 
-#: src/addressbook.c:1445 src/addrduplicates.c:853
+#: src/addressbook.c:1434 src/addrduplicates.c:853
 msgid "This address data is readonly and cannot be deleted."
 msgstr "נתון כתובת זה הינו קריאה-בלבד ואינו יכול להימחק."
 
-#: src/addressbook.c:1489
+#: src/addressbook.c:1478
 msgid "Delete group"
 msgstr "מחק קבוצה"
 
-#: src/addressbook.c:1490
+#: src/addressbook.c:1479
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -632,32 +628,32 @@ msgstr ""
 "באמת למחוק את הקבוצה(ות)?\n"
 "הכתובות המוכלות בתוכה לא יאבדו."
 
-#: src/addressbook.c:1498 src/addrduplicates.c:804
+#: src/addressbook.c:1487 src/addrduplicates.c:804
 msgid "Really delete the address(es)?"
-msgstr "באמת למחוק את הכתובת(ות)?"
+msgstr "באמת למחוק את הכתוב(ו)ת?"
 
 # מוגדר לקריאה בלבד
 # אין אפשרות
-#: src/addressbook.c:2201
+#: src/addressbook.c:2190
 msgid "Cannot paste. Target address book is readonly."
-msgstr "לא ניתן להעתיק. ספר כתובות יעד הינו לקריאה בלבד."
+msgstr "אין אפשרות להעתיק. ספר כתובות יעד הינו לקריאה בלבד."
 
-#: src/addressbook.c:2211
+#: src/addressbook.c:2200
 msgid "Cannot paste into an address group."
-msgstr "לא ניתן להדביק אל תוך קבוצת כתובת."
+msgstr "אין אפשרות להדביק אל תוך קבוצת כתובת."
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2906
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "האם ברצונך למחוק את תוצאות השאילתא וגם את הכתובות בתוך '%s'?"
 
-#: src/addressbook.c:2920 src/addressbook.c:2946 src/addressbook.c:2953
+#: src/addressbook.c:2909 src/addressbook.c:2935 src/addressbook.c:2942
 #: src/plugins/archive/archiver_prefs.c:337 src/prefs_filtering_action.c:177
-#: src/toolbar.c:413
+#: src/toolbar.c:414
 msgid "Delete"
 msgstr "מחיקה"
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2918
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -666,21 +662,21 @@ msgstr ""
 "האם ברצונך למחוק את '%s'? אם תמחק את התיקייה בלבד, הכתובות שזו מכילה יועברו "
 "אל תוך תיקיית ההורה."
 
-#: src/addressbook.c:2932 src/imap_gtk.c:363 src/mh_gtk.c:202
-#: src/plugins/mailmbox/plugin_gtk.c:325 src/plugins/rssyl/rssyl_cb_menu.c:237
-#: src/plugins/vcalendar/vcal_folder.c:1953
+#: src/addressbook.c:2921 src/imap_gtk.c:363 src/mh_gtk.c:202
+#: src/plugins/mailmbox/plugin_gtk.c:324 src/plugins/rssyl/rssyl_cb_menu.c:237
+#: src/plugins/vcalendar/vcal_folder.c:1951
 msgid "Delete folder"
 msgstr "מחק תיקייה"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "+Delete _folder only"
-msgstr "+מחיקת _תיקיות בלבד"
+msgstr "+מחק _תיקיות בלבד"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "Delete folder and _addresses"
 msgstr "מחיקת תיקיות וגם _כתובות"
 
-#: src/addressbook.c:2944
+#: src/addressbook.c:2933
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -689,7 +685,7 @@ msgstr ""
 "האם ברצונך למחוק את '%s'?\n"
 "הכתובות המוכלות בתוכו לא יאבדו."
 
-#: src/addressbook.c:2951
+#: src/addressbook.c:2940
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -698,109 +694,110 @@ msgstr ""
 "האם ברצונך למחוק את '%s'?\n"
 "הכתובות המוכלות בתוכו יאבדו."
 
-#: src/addressbook.c:3065
+#: src/addressbook.c:3054
 #, c-format
 msgid "Search '%s'"
 msgstr "חיפוש '%s'"
 
-#: src/addressbook.c:3203 src/addressbook.c:3253
+#: src/addressbook.c:3192 src/addressbook.c:3242
 msgid "New Contacts"
 msgstr "אנשי קשר חדשים"
 
-#: src/addressbook.c:4035
+#: src/addressbook.c:4024
 msgid "New user, could not save index file."
-msgstr "משתמש חדש, לא היה ניתן לשמור קובץ מפתח."
+msgstr "משתמש חדש, לא היתה אפשרות לשמור קובץ מפתח."
 
-#: src/addressbook.c:4039
+#: src/addressbook.c:4028
 msgid "New user, could not save address book files."
-msgstr "משתמש חדש, לא היה ניתן לשמור קבצי ספר כתובות."
+msgstr "משתמש חדש, לא היתה אפשרות לשמור קבצי ספר כתובות."
 
-#: src/addressbook.c:4049
+#: src/addressbook.c:4038
 msgid "Old address book converted successfully."
 msgstr "ספר כתובות ישן הומר בהצלחה."
 
-#: src/addressbook.c:4054
+#: src/addressbook.c:4043
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgstr ""
 "ספר כתובות ישן הומר,\n"
-"לא היה ניתן לשמור קובץ מפתח כתובות חדש."
+"לא היתה אפשרות לשמור קובץ מפתח כתובות חדש."
 
-#: src/addressbook.c:4067
+#: src/addressbook.c:4056
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgstr ""
-"לא היה ניתן להמיר ספר כתובות,\n"
+"לא היתה אפשרות להמיר ספר כתובות,\n"
 "אך נוצרו קבצי ספר כתובות חדשים ריקים."
 
-#: src/addressbook.c:4073
+#: src/addressbook.c:4062
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgstr ""
-"לא היה ניתן להמיר ספר כתובות,\n"
-"לא היה ניתן לשמור קובץ מפתח כתובות חדש."
+"לא היתה אפשרות להמיר ספר כתובות,\n"
+"לא היתה אפשרות לשמור קובץ מפתח כתובות חדש."
 
-#: src/addressbook.c:4078
+#: src/addressbook.c:4067
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr ""
-"לא היה ניתן להמיר ספר כתובות\n"
-"ולא היה ניתן ל ליצור קבצי ספר כתובות חדש."
+"לא היתה אפשרות להמיר ספר כתובות\n"
+"ולא היתה אפשרות ליצור קבצי ספר כתובות חדשים."
 
-#: src/addressbook.c:4085 src/addressbook.c:4091
+#: src/addressbook.c:4074 src/addressbook.c:4080
 msgid "Addressbook conversion error"
 msgstr "שגיאת המרת ספר כתובות"
 
-#: src/addressbook.c:4198
+#: src/addressbook.c:4187
 msgid "Addressbook Error"
 msgstr "שגיאת ספר כתובות"
 
-#: src/addressbook.c:4199
+#: src/addressbook.c:4188
 msgid "Could not read address index"
-msgstr "לא היה ניתן לקרוא מפתח כתובות"
+msgstr "לא היתה אפשרות לקרוא מפתח כתובות"
 
-#: src/addressbook.c:4530
+#: src/addressbook.c:4519
 #, fuzzy
 msgid "Busy searching..."
-msgstr "עסוק כעת בחיפוש..."
+msgstr "כעת עסוק בחיפוש..."
 
-#: src/addressbook.c:4833
+#: src/addressbook.c:4822
 msgid "Interface"
 msgstr "ממשק"
 
-#: src/addressbook.c:4845 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
+#: src/addressbook.c:4834 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
 #: src/expldifdlg.c:388 src/exporthtml.c:984 src/importldif.c:657
 msgid "Address Book"
 msgstr "ספר כתובות"
 
-#: src/addressbook.c:4857
+#: src/addressbook.c:4846
 msgid "Person"
 msgstr "אישיות"
 
-#: src/addressbook.c:4893 src/exporthtml.c:884 src/folderview.c:338
-#: src/folderview.c:426 src/prefs_account.c:2746 src/prefs_folder_column.c:78
+#: src/addressbook.c:4882 src/exporthtml.c:884 src/folderview.c:338
+#: src/folderview.c:426 src/prefs_account.c:2738 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "תיקייה"
 
-#: src/addressbook.c:4905
+# כרטיס וירטואלי
+#: src/addressbook.c:4894
 #, fuzzy
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4917 src/addressbook.c:4929
+#: src/addressbook.c:4906 src/addressbook.c:4918
 #, fuzzy
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4941
+#: src/addressbook.c:4930
 msgid "LDAP servers"
 msgstr "שרתי LDAP"
 
-#: src/addressbook.c:4953
+#: src/addressbook.c:4942
 msgid "LDAP Query"
 msgstr "שאילתת LDAP"
 
@@ -816,9 +813,9 @@ msgstr "שאילתת LDAP"
 #: src/plugins/spamassassin/spamassassin_gtk.c:443
 #: src/plugins/spamassassin/spamassassin_gtk.c:490
 #: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:672
-#: src/prefs_matcher.c:707 src/prefs_matcher.c:1601 src/prefs_matcher.c:1608
-#: src/prefs_matcher.c:1616 src/prefs_matcher.c:1618 src/prefs_matcher.c:2498
-#: src/prefs_matcher.c:2502
+#: src/prefs_matcher.c:707 src/prefs_matcher.c:1607 src/prefs_matcher.c:1614
+#: src/prefs_matcher.c:1622 src/prefs_matcher.c:1624 src/prefs_matcher.c:2504
+#: src/prefs_matcher.c:2508
 msgid "Any"
 msgstr "כל אחת"
 
@@ -836,7 +833,7 @@ msgstr "אנא בחר את תקורות הדואר לחיפוש."
 
 #: src/addrgather.c:207
 msgid "Collecting addresses..."
-msgstr "אוסף כעת כתובות..."
+msgstr "כעת אוסף כתובות..."
 
 #: src/addrgather.c:247
 msgid "address added by claws-mail"
@@ -873,13 +870,13 @@ msgstr "עבד את שדות תקורת דואר אלו"
 msgid "Include subfolders"
 msgstr "הכלל תיקיות משנה"
 
-#: src/addrgather.c:456 src/prefs_filtering_action.c:1423
+#: src/addrgather.c:456 src/prefs_filtering_action.c:1425
 msgid "Header Name"
 msgstr "שם תקורה"
 
 #: src/addrgather.c:457
 msgid "Address Count"
-msgstr ""
+msgstr "ספירת כתובת"
 
 #: src/addrgather.c:567
 msgid "Header Fields"
@@ -892,11 +889,11 @@ msgstr "סיים"
 
 #: src/addrgather.c:626
 msgid "Collect email addresses from selected messages"
-msgstr "איסוף כתובות דוא״ל מן הודעות נבחרות"
+msgstr "איסוף כתובות דוא״ל בתוך הודעות נבחרות"
 
 #: src/addrgather.c:630
 msgid "Collect email addresses from folder"
-msgstr "איסוף כתובות דוא״ל מן תיקייה"
+msgstr "איסוף כתובות דוא״ל בתוך תיקייה"
 
 #: src/addrindex.c:123
 msgid "Common addresses"
@@ -916,7 +913,7 @@ msgstr "כתובת אישית"
 
 #: src/addrindex.c:1827
 msgid "Address(es) update"
-msgstr ""
+msgstr "כתוב(ו)ת עודכנה(ו)"
 
 #: src/addrindex.c:1828
 msgid "Update failed. Changes not written to Directory."
@@ -956,18 +953,19 @@ msgstr "נתיב ספר כתובות"
 msgid "Delete address"
 msgstr "מחיקת כתובת"
 
-#: src/alertpanel.c:146 src/compose.c:9160
+#: src/alertpanel.c:146 src/compose.c:9217
 msgid "Notice"
 msgstr "התראה"
 
-#: src/alertpanel.c:159 src/compose.c:5556 src/compose.c:6022
-#: src/compose.c:11468 src/messageview.c:874 src/messageview.c:887
+#: src/alertpanel.c:159 src/compose.c:5597 src/compose.c:6063
+#: src/compose.c:11533 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:852 src/messageview.c:865
 #: src/plugins/pgpcore/sgpgme.c:706 src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4869
+#: src/summaryview.c:4865
 msgid "Warning"
 msgstr "אזהרה"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5497 src/inc.c:666
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5538 src/inc.c:652
 #: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:246
 msgid "Error"
 msgstr "שגיאה"
@@ -1071,7 +1069,7 @@ msgstr "הגרסא של Claws Mail שברשותך חדשה יותר מן הגר
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
-msgstr "הגרסא של Claws Mail שברשותך חדשה יותר מן הגרסא שהתוספת נבנתה עמה"
+msgstr "הגרסא של Claws Mail שברשותך חדשה יותר מן הגרסא שהתוספת נבנתה עמה."
 
 #: src/common/plugin.c:784
 #, c-format
@@ -1100,11 +1098,11 @@ msgstr "היענות SMTP רעה\n"
 
 #: src/common/smtp.c:546 src/common/smtp.c:564 src/common/smtp.c:683
 msgid "error occurred on SMTP session\n"
-msgstr "ארעה שגיאה בסשן SMTP\n"
+msgstr "אירעה שגיאה בסשן SMTP\n"
 
 #: src/common/smtp.c:555 src/pop.c:895
 msgid "error occurred on authentication\n"
-msgstr "ארעה שגיאה באימות\n"
+msgstr "אירעה שגיאה באימות\n"
 
 #: src/common/smtp.c:610
 #, c-format
@@ -1113,7 +1111,7 @@ msgstr "ההודעה הינה גדולה מדי (גודל מרבי הינו %s)\
 
 #: src/common/smtp.c:642 src/pop.c:888
 msgid "couldn't start TLS session\n"
-msgstr "לא היה ניתן להתחיל סשן TLS\n"
+msgstr "לא היתה אפשרות להתחיל סשן TLS\n"
 
 #: src/common/socket.c:573
 msgid "Socket IO timeout.\n"
@@ -1151,22 +1149,22 @@ msgstr "‫%s:%s: חיפוש מארח נכשל (%s).\n"
 #: src/common/socket.c:1513
 #, c-format
 msgid "write on fd%d: %s\n"
-msgstr ""
+msgstr "רשום על fd%d:‏ %s\n"
 
 #: src/common/ssl_certificate.c:277
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
-msgstr "לא ניתן להתחיל קובץ P12 ‫(%s)\n"
+msgstr "אין אפשרות להתחיל קובץ P12 ‫(%s)\n"
 
 #: src/common/ssl_certificate.c:285
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
-msgstr "לא ניתן לקרוא קובץ P12 ‫(%s)\n"
+msgstr "אין אפשרות לקרוא קובץ P12 ‫(%s)\n"
 
 #: src/common/ssl_certificate.c:294
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
-msgstr "לא ניתן לייבא קובץ P12 ‫(%s)\n"
+msgstr "אין אפשרות לייבא קובץ P12 ‫(%s)\n"
 
 # לא ניתנת לסימון
 # לא ניתנת לבדיקה
@@ -1193,7 +1191,7 @@ msgstr "מנפיק תעודה אינו CA"
 #: src/common/ssl_certificate.c:663
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
-msgstr "לא ניתן לפתוח קובץ תעודה %s: ‫%s\n"
+msgstr "אין אפשרות לפתוח קובץ תעודה %s: ‫%s\n"
 
 #: src/common/ssl_certificate.c:667
 #, c-format
@@ -1203,7 +1201,7 @@ msgstr "קובץ תעודה %s חסר (%s)\n"
 #: src/common/ssl_certificate.c:686
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
-msgstr "לא ניתן לפתוח קובץ מפתח %s ‫(%s)\n"
+msgstr "אין אפשרות לפתוח קובץ מפתח %s ‫(%s)\n"
 
 #: src/common/ssl_certificate.c:690
 #, c-format
@@ -1218,7 +1216,7 @@ msgstr "כשל בקריאת קובץ תעודה P12 ‫%s\n"
 #: src/common/ssl_certificate.c:841
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
-msgstr "לא ניתן לפתוח קובץ תעודה P12 ‫%s (%s)\n"
+msgstr "אין אפשרות לפתוח קובץ תעודה P12 ‫%s (%s)\n"
 
 # נעדר
 #: src/common/ssl_certificate.c:845
@@ -1238,671 +1236,667 @@ msgstr "<לא בתעודה>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(נושא טוהר באמצעות RegExp)"
 
-#: src/common/utils.c:371
+#: src/common/utils.c:362
 #, c-format
 msgid "%dB"
 msgstr "%d בתים"
 
-#: src/common/utils.c:372
+#: src/common/utils.c:363
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02d ק״ב"
 
-#: src/common/utils.c:373
+#: src/common/utils.c:364
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02d מ״ב"
 
-#: src/common/utils.c:374
+#: src/common/utils.c:365
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2f ג״ב"
 
-#: src/common/utils.c:4974
+#: src/common/utils.c:4946
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "ראשון"
 
-#: src/common/utils.c:4975
+#: src/common/utils.c:4947
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "שני"
 
-#: src/common/utils.c:4976
+#: src/common/utils.c:4948
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "שלישי"
 
-#: src/common/utils.c:4977
+#: src/common/utils.c:4949
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "רביעי"
 
-#: src/common/utils.c:4978
+#: src/common/utils.c:4950
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "חמישי"
 
-#: src/common/utils.c:4979
+#: src/common/utils.c:4951
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "שישי"
 
-#: src/common/utils.c:4980
+#: src/common/utils.c:4952
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "שבת"
 
-#: src/common/utils.c:4982
+#: src/common/utils.c:4954
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "ינואר"
 
-#: src/common/utils.c:4983
+#: src/common/utils.c:4955
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "פברואר"
 
-#: src/common/utils.c:4984
+#: src/common/utils.c:4956
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "מרץ"
 
-#: src/common/utils.c:4985
+#: src/common/utils.c:4957
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "אפריל"
 
-#: src/common/utils.c:4986
+#: src/common/utils.c:4958
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "מאי"
 
-#: src/common/utils.c:4987
+#: src/common/utils.c:4959
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "יוני"
 
-#: src/common/utils.c:4988
+#: src/common/utils.c:4960
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "יולי"
 
-#: src/common/utils.c:4989
+#: src/common/utils.c:4961
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "אוגוסט"
 
-#: src/common/utils.c:4990
+#: src/common/utils.c:4962
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "ספטמבר"
 
-#: src/common/utils.c:4991
+#: src/common/utils.c:4963
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "אוקטובר"
 
-#: src/common/utils.c:4992
+#: src/common/utils.c:4964
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "נובמבר"
 
-#: src/common/utils.c:4993
+#: src/common/utils.c:4965
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "דצמבר"
 
-#: src/common/utils.c:4995
+#: src/common/utils.c:4967
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
-msgstr "ראש"
+msgstr "א׳"
 
-#: src/common/utils.c:4996
+#: src/common/utils.c:4968
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
-msgstr "שני"
+msgstr "ב׳"
 
-#: src/common/utils.c:4997
+#: src/common/utils.c:4969
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
-msgstr "שלי"
+msgstr "ג׳"
 
-#: src/common/utils.c:4998
+#: src/common/utils.c:4970
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
-msgstr "רבי"
+msgstr "ד׳"
 
-#: src/common/utils.c:4999
+#: src/common/utils.c:4971
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
-msgstr "חמי"
+msgstr "ה׳"
 
-#: src/common/utils.c:5000
+#: src/common/utils.c:4972
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
-msgstr "שיש"
+msgstr "ו׳"
 
-#: src/common/utils.c:5001
+#: src/common/utils.c:4973
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
-msgstr "שבת"
+msgstr "ש׳"
 
-#: src/common/utils.c:5003
+#: src/common/utils.c:4975
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "ינו"
 
-#: src/common/utils.c:5004
+#: src/common/utils.c:4976
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "פבר"
 
-#: src/common/utils.c:5005
+#: src/common/utils.c:4977
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "מרץ"
 
-#: src/common/utils.c:5006
+#: src/common/utils.c:4978
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "אפר"
 
-#: src/common/utils.c:5007
+#: src/common/utils.c:4979
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "מאי"
 
-#: src/common/utils.c:5008
+#: src/common/utils.c:4980
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "יונ"
 
-#: src/common/utils.c:5009
+#: src/common/utils.c:4981
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "יול"
 
-#: src/common/utils.c:5010
+#: src/common/utils.c:4982
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "אוג"
 
-#: src/common/utils.c:5011
+#: src/common/utils.c:4983
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "ספט"
 
-#: src/common/utils.c:5012
+#: src/common/utils.c:4984
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "אוק"
 
-#: src/common/utils.c:5013
+#: src/common/utils.c:4985
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "נוב"
 
-#: src/common/utils.c:5014
+#: src/common/utils.c:4986
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "דצמ"
 
-#: src/common/utils.c:5025
-#, fuzzy
+#: src/common/utils.c:4997
 msgctxt "For use by strftime (morning)"
 msgid "AM"
-msgstr "AM"
+msgstr "בבוקר"
 
-#: src/common/utils.c:5026
-#, fuzzy
+#: src/common/utils.c:4998
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
-msgstr "PM"
+msgstr "אחה״צ"
 
-#: src/common/utils.c:5027
-#, fuzzy
+#: src/common/utils.c:4999
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
-msgstr "am"
+msgstr "בבוקר"
 
-#: src/common/utils.c:5028
-#, fuzzy
+#: src/common/utils.c:5000
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
-msgstr "pm"
+msgstr "אחה״צ"
 
-#: src/common/utils.c:5035
+#: src/common/utils.c:5007
 msgctxt "For use by strftime (default date+time format)"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr ""
 
-#: src/common/utils.c:5036
+#: src/common/utils.c:5008
 msgctxt "For use by strftime (default date format)"
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: src/common/utils.c:5037
+#: src/common/utils.c:5009
 msgctxt "For use by strftime (default time format)"
 msgid "%H:%M:%S"
 msgstr ""
 
-#: src/common/utils.c:5039
+#: src/common/utils.c:5011
 msgctxt "For use by strftime (default 12-hour time format)"
 msgid "%I:%M:%S %p"
 msgstr ""
 
-#: src/compose.c:565
+#: src/compose.c:567
 msgid "_Add..."
-msgstr "הו_סף..."
+msgstr "הו_ספה..."
 
-#: src/compose.c:566 src/mh_gtk.c:361 src/plugins/mailmbox/plugin_gtk.c:293
+#: src/compose.c:568 src/mh_gtk.c:361 src/plugins/mailmbox/plugin_gtk.c:293
 #: src/plugins/rssyl/rssyl_cb_menu.c:140
 msgid "_Remove"
 msgstr "הס_ר"
 
-#: src/compose.c:568 src/folderview.c:234
+#: src/compose.c:570 src/folderview.c:234
 msgid "_Properties..."
 msgstr "_מאפיינים..."
 
-#: src/compose.c:575 src/mainwindow.c:506 src/messageview.c:213
+#: src/compose.c:577 src/mainwindow.c:506 src/messageview.c:211
 msgid "_Message"
 msgstr "_הודעה"
 
-#: src/compose.c:578
+#: src/compose.c:580
 msgid "_Spelling"
 msgstr "_איות"
 
-#: src/compose.c:580 src/compose.c:646
+#: src/compose.c:582 src/compose.c:649
 msgid "_Options"
 msgstr "א_פשרויות"
 
-#: src/compose.c:584
+#: src/compose.c:586
 msgid "S_end"
 msgstr "_שלח"
 
-# שליחה _מאוחרת
-#: src/compose.c:585
+#: src/compose.c:587
 msgid "Send _later"
 msgstr "שלח _מאוחר יותר"
 
-# סיפוח
-#: src/compose.c:588
+#: src/compose.c:590
 msgid "_Attach file"
 msgstr "_ספח קובץ"
 
-# שיבוץ
-#: src/compose.c:589
+#: src/compose.c:591
 msgid "_Insert file"
 msgstr "שבץ _קובץ"
 
-#: src/compose.c:590
+#: src/compose.c:592
 msgid "Insert si_gnature"
 msgstr "שבץ _חתימה"
 
-#: src/compose.c:594
+#: src/compose.c:593
+msgid "_Replace signature"
+msgstr "ה_חלף חתימה"
+
+#: src/compose.c:597
 msgid "_Print"
 msgstr "הד_פס"
 
-# ביטו_ל ביצוע
-#: src/compose.c:599
+#: src/compose.c:602
 msgid "_Undo"
 msgstr "בט_ל"
 
-# ביצוע _חוזר
-#: src/compose.c:600
+#: src/compose.c:603
 msgid "_Redo"
 msgstr "ב_צע שוב"
 
-# CM is running on Win too
-#: src/compose.c:603
+#: src/compose.c:606
 msgid "Cu_t"
 msgstr "_גזור"
 
-#: src/compose.c:607
+#: src/compose.c:610
 msgid "_Special paste"
 msgstr "_הדבקה מיוחדת"
 
-#: src/compose.c:608
+#: src/compose.c:611
 msgid "As _quotation"
 msgstr "כ_ציטטה"
 
-#: src/compose.c:609
+# _כרוך
+#: src/compose.c:612
 msgid "_Wrapped"
 msgstr "_כרוכה"
 
-#: src/compose.c:610
+# בטל כריכה
+#: src/compose.c:613
 msgid "_Unwrapped"
 msgstr "_לא כרוכה"
 
-#: src/compose.c:612 src/mainwindow.c:539
+#: src/compose.c:615 src/mainwindow.c:539
 msgid "Select _all"
 msgstr "בחר ה_כל"
 
-#: src/compose.c:614
+#: src/compose.c:617
 msgid "A_dvanced"
 msgstr "_מתקדם"
 
-#: src/compose.c:615
+#: src/compose.c:618
 msgid "Move a character backward"
 msgstr "הזז תו לאחור"
 
-#: src/compose.c:616
+#: src/compose.c:619
 msgid "Move a character forward"
 msgstr "הזז תו לפנים"
 
-#: src/compose.c:617
+#: src/compose.c:620
 msgid "Move a word backward"
 msgstr "הזז מילה לאחור"
 
-#: src/compose.c:618
+#: src/compose.c:621
 msgid "Move a word forward"
 msgstr "הזז מילה לפנים"
 
-#: src/compose.c:619
+#: src/compose.c:622
 msgid "Move to beginning of line"
 msgstr "הזז אל תחילת שורה"
 
-#: src/compose.c:620
+#: src/compose.c:623
 msgid "Move to end of line"
 msgstr "הזז אל סוף שורה"
 
-#: src/compose.c:621
+#: src/compose.c:624
 msgid "Move to previous line"
 msgstr "הזז אל שורה קודמת"
 
-#: src/compose.c:622
+#: src/compose.c:625
 msgid "Move to next line"
 msgstr "הזז אל שורה באה"
 
-#: src/compose.c:623
+#: src/compose.c:626
 msgid "Delete a character backward"
 msgstr "מחק תו לאחור"
 
-#: src/compose.c:624
+#: src/compose.c:627
 msgid "Delete a character forward"
 msgstr "מחק תו לפנים"
 
-#: src/compose.c:625
+#: src/compose.c:628
 msgid "Delete a word backward"
 msgstr "מחק מילה לאחור"
 
-#: src/compose.c:626
+#: src/compose.c:629
 msgid "Delete a word forward"
 msgstr "מחק מילה לפנים"
 
-#: src/compose.c:627
+#: src/compose.c:630
 msgid "Delete line"
 msgstr "מחק שורה"
 
-#: src/compose.c:628
+#: src/compose.c:631
 msgid "Delete to end of line"
 msgstr "מחק אל סוף שורה"
 
-#: src/compose.c:631 src/messageview.c:230
+#: src/compose.c:634 src/messageview.c:228
 msgid "_Find"
 msgstr "_מצא"
 
-#: src/compose.c:634
+#: src/compose.c:637
 msgid "_Wrap current paragraph"
 msgstr "_כרוך פסקה נוכחית"
 
-#: src/compose.c:635
+#: src/compose.c:638
 msgid "Wrap all long _lines"
 msgstr "כרוך _שורות ארוכות"
 
-#: src/compose.c:637
+#: src/compose.c:640
 msgid "Edit with e_xternal editor"
 msgstr "ערוך בעזרת עורך חי_צוני"
 
-#: src/compose.c:640
+#: src/compose.c:643
 msgid "_Check all or check selection"
 msgstr "_בדוק הכל או בדוק בחירה"
 
-#: src/compose.c:641
+#: src/compose.c:644
 msgid "_Highlight all misspelled words"
 msgstr "_הדגש את כל המילים שאויתו באופן שגוי"
 
-#: src/compose.c:642
+#: src/compose.c:645
 msgid "Check _backwards misspelled word"
 msgstr "בדוק _אחורנית עבור מילים שאויתו באופן שגוי"
 
-#: src/compose.c:643
+#: src/compose.c:646
 msgid "_Forward to next misspelled word"
-msgstr "ה_לאה עבור המילה הבאה שאויתה באופן שגוי"
+msgstr "_עבור הלאה אל המילה הבאה שאויתה באופן שגוי"
 
-#: src/compose.c:651
+#: src/compose.c:654
 msgid "Reply _mode"
 msgstr "_צורת מענה"
 
-#: src/compose.c:653
+#: src/compose.c:656
 msgid "Privacy _System"
 msgstr "מערכת _פרטיות"
 
-#: src/compose.c:658
+#: src/compose.c:661
 msgid "_Priority"
 msgstr "_עדיפות"
 
-#: src/compose.c:660 src/mainwindow.c:603 src/messageview.c:266
+#: src/compose.c:663 src/mainwindow.c:603 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "_קידוד תווים"
 
-#: src/compose.c:665 src/mainwindow.c:608 src/messageview.c:271
+#: src/compose.c:668 src/mainwindow.c:608 src/messageview.c:269
 msgid "Western European"
 msgstr "מערב אירופאי"
 
-#: src/compose.c:666 src/mainwindow.c:609 src/messageview.c:272
+#: src/compose.c:669 src/mainwindow.c:609 src/messageview.c:270
 msgid "Baltic"
 msgstr "בלטי"
 
-#: src/compose.c:667 src/mainwindow.c:610 src/messageview.c:273
+#: src/compose.c:670 src/mainwindow.c:610 src/messageview.c:271
 msgid "Hebrew"
 msgstr "עברי"
 
-#: src/compose.c:668 src/mainwindow.c:611 src/messageview.c:274
+#: src/compose.c:671 src/mainwindow.c:611 src/messageview.c:272
 msgid "Arabic"
 msgstr "ערבי"
 
-#: src/compose.c:669 src/mainwindow.c:612 src/messageview.c:275
+#: src/compose.c:672 src/mainwindow.c:612 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "קירילי"
 
-#: src/compose.c:670 src/mainwindow.c:613 src/messageview.c:276
+#: src/compose.c:673 src/mainwindow.c:613 src/messageview.c:274
 msgid "Japanese"
 msgstr "יפני"
 
-#: src/compose.c:671 src/mainwindow.c:614 src/messageview.c:277
+#: src/compose.c:674 src/mainwindow.c:614 src/messageview.c:275
 msgid "Chinese"
 msgstr "סיני"
 
-#: src/compose.c:672 src/mainwindow.c:615 src/messageview.c:278
+#: src/compose.c:675 src/mainwindow.c:615 src/messageview.c:276
 msgid "Korean"
 msgstr "קוריאני"
 
-#: src/compose.c:673 src/mainwindow.c:616 src/messageview.c:279
+#: src/compose.c:676 src/mainwindow.c:616 src/messageview.c:277
 msgid "Thai"
 msgstr "תאילנדי"
 
-#: src/compose.c:676 src/mainwindow.c:723 src/messageview.c:315
+#: src/compose.c:679 src/mainwindow.c:723 src/messageview.c:313
 msgid "_Address book"
 msgstr "_ספר כתובות"
 
-#: src/compose.c:678
+#: src/compose.c:681
 msgid "_Template"
 msgstr "_תבנית"
 
-#: src/compose.c:680 src/mainwindow.c:751 src/messageview.c:336
+#: src/compose.c:683 src/mainwindow.c:751 src/messageview.c:334
 msgid "Actio_ns"
 msgstr "_פעולות"
 
-#: src/compose.c:689
+#: src/compose.c:692
 msgid "Aut_o wrapping"
 msgstr "כריכה _אוטומטית"
 
-#: src/compose.c:690
+#: src/compose.c:693
 msgid "Auto _indent"
 msgstr "ה_זחה אוטומטית"
 
-#: src/compose.c:691
+#: src/compose.c:694
 msgid "Si_gn"
 msgstr "_חתימה"
 
-#: src/compose.c:692
+#: src/compose.c:695
 msgid "_Encrypt"
 msgstr "ה_צפנה"
 
-#: src/compose.c:693
+#: src/compose.c:696
 msgid "_Request Return Receipt"
 msgstr "_בקש קבלת מסירה"
 
-#: src/compose.c:694
+#: src/compose.c:697
 msgid "Remo_ve references"
 msgstr "הסר _מראי מקום"
 
-#: src/compose.c:695
+#: src/compose.c:698
 msgid "Show _ruler"
 msgstr "הצג _סרגל"
 
-#: src/compose.c:700 src/compose.c:710
+#: src/compose.c:703 src/compose.c:713
 msgid "_Normal"
 msgstr "_רגילה"
 
-#: src/compose.c:701 src/mainwindow.c:657 src/messageview.c:304
+#: src/compose.c:704 src/mainwindow.c:657 src/messageview.c:302
 msgid "_All"
 msgstr "_כולם"
 
-#: src/compose.c:702 src/mainwindow.c:658 src/messageview.c:305
+#: src/compose.c:705 src/mainwindow.c:658 src/messageview.c:303
 msgid "_Sender"
 msgstr "_ממען"
 
-#: src/compose.c:703
+#: src/compose.c:706
 msgid "_Mailing-list"
 msgstr "_רשימת-דיוור"
 
-#: src/compose.c:708
+#: src/compose.c:711
 msgid "_Highest"
 msgstr "_גבוהה ביותר"
 
-#: src/compose.c:709
+#: src/compose.c:712
 msgid "Hi_gh"
 msgstr "ג_בוהה"
 
-#: src/compose.c:711
+#: src/compose.c:714
 msgid "Lo_w"
 msgstr "_נמוכה"
 
-#: src/compose.c:712
+#: src/compose.c:715
 msgid "_Lowest"
 msgstr "נ_מוכה ביותר"
 
-#: src/compose.c:717 src/mainwindow.c:867 src/messageview.c:353
+#: src/compose.c:720 src/mainwindow.c:865 src/messageview.c:351
 msgid "_Automatic"
 msgstr "_אוטומטי"
 
-#: src/compose.c:718 src/mainwindow.c:868 src/messageview.c:354
+#: src/compose.c:721 src/mainwindow.c:866 src/messageview.c:352
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "‫7bit ASCII ‫(US-ASC_II)"
 
-#: src/compose.c:719 src/mainwindow.c:869 src/messageview.c:355
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:353
 msgid "Unicode (_UTF-8)"
 msgstr "קידוד אוניברסלי (_UTF-8)"
 
-#: src/compose.c:723 src/mainwindow.c:873 src/messageview.c:359
+#: src/compose.c:726 src/mainwindow.c:871 src/messageview.c:357
 msgid "Central European (ISO-8859-_2)"
 msgstr "מרכז אירופאי (ISO-8859-_2)"
 
-#: src/compose.c:726 src/mainwindow.c:876 src/messageview.c:362
+#: src/compose.c:729 src/mainwindow.c:874 src/messageview.c:360
 msgid "Greek (ISO-8859-_7)"
 msgstr "יווני (ISO-8859-_7)"
 
-#: src/compose.c:731 src/mainwindow.c:881 src/messageview.c:367
+#: src/compose.c:734 src/mainwindow.c:879 src/messageview.c:365
 msgid "Turkish (ISO-8859-_9)"
 msgstr "טורקי (ISO-8859-_9)"
 
-#: src/compose.c:1034
+#: src/compose.c:1062
 msgid "New message From format error."
 msgstr ""
 
-#: src/compose.c:1126
+#: src/compose.c:1154
 msgid "New message subject format error."
 msgstr ""
 
-#: src/compose.c:1157 src/quote_fmt.c:563
+#: src/compose.c:1185 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "לגוף של התבנית \"הודעה חדשה\" יש שגיאה בשורה %d."
 
-#: src/compose.c:1413
+#: src/compose.c:1439
 msgid "Unable to reply. The original email probably doesn't exist."
-msgstr "לא ניתן לענות. הדוא״ל המקורי כפי הנראה לא קיים."
+msgstr "אין אפשרות לענות. הדוא״ל המקורי כפי הנראה לא קיים."
 
-#: src/compose.c:1596 src/quote_fmt.c:580
+#: src/compose.c:1622 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr "השדה \"From\" של התבנית \"Reply\" מכיל כתובת דוא״ל שגויה."
 
-#: src/compose.c:1644 src/quote_fmt.c:583
+#: src/compose.c:1670 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "לגוף של התבנית \"מענה\" יש שגיאה בשורה %d."
 
-#: src/compose.c:1780 src/compose.c:1972 src/quote_fmt.c:600
+#: src/compose.c:1806 src/compose.c:1998 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "השדה \"From\" של התבנית \"Forward\" מכיל כתובת דוא״ל שגויה."
 
-#: src/compose.c:1840 src/quote_fmt.c:603
+#: src/compose.c:1866 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "לגוף של התבנית \"קידום\" יש שגיאה בשורה %d."
 
-#: src/compose.c:2014
+#: src/compose.c:2040
 msgid "Fw: multiple emails"
 msgstr "Fw: הודעות דואר מרובות"
 
-#: src/compose.c:2456
+#: src/compose.c:2482
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
-msgstr "לגוף של התבנית \"הכוונה מחודשת\" יש שגיאה בשורה %d."
+msgstr "לגוף של התבנית \"הכוונה מחדש\" יש שגיאה בשורה %d."
 
-#: src/compose.c:2522 src/gtk/headers.h:13
+#: src/compose.c:2549 src/gtk/headers.h:13
 msgid "Cc:"
 msgstr "עותק:"
 
-#: src/compose.c:2525 src/gtk/headers.h:14
+#: src/compose.c:2552 src/gtk/headers.h:14
 msgid "Bcc:"
 msgstr "עותק סמוי:"
 
-#: src/compose.c:2528 src/gtk/headers.h:11
+#: src/compose.c:2555 src/gtk/headers.h:11
 msgid "Reply-To:"
 msgstr "מענה-אל:"
 
-#: src/compose.c:2531 src/compose.c:4818 src/compose.c:4820
+#: src/compose.c:2558 src/compose.c:4854 src/compose.c:4856
 #: src/gtk/headers.h:32
 msgid "Newsgroups:"
 msgstr "קבוצות דיונים:"
 
-#: src/compose.c:2534 src/gtk/headers.h:33
+#: src/compose.c:2561 src/gtk/headers.h:33
 msgid "Followup-To:"
 msgstr "המשך-אל:"
 
-#: src/compose.c:2537 src/gtk/headers.h:16
+#: src/compose.c:2564 src/gtk/headers.h:16
 msgid "In-Reply-To:"
 msgstr "ב-מענה-אל:"
 
-#: src/compose.c:2541 src/compose.c:4815 src/compose.c:4823
-#: src/gtk/headers.h:12 src/summary_search.c:419
+#: src/compose.c:2568 src/compose.c:4851 src/compose.c:4859
+#: src/gtk/headers.h:12 src/summary_search.c:445
 msgid "To:"
 msgstr "אל:"
 
 # הימור
-#: src/compose.c:2747
+#: src/compose.c:2774
 msgid "Couldn't attach a file (charset conversion failed)."
-msgstr "לא ניתן לספח קובץ (המרת מערך תווים נכשלה)."
+msgstr "לא היתה אפשרות לספח קובץ (המרת מערך תווים נכשלה)."
 
-#: src/compose.c:2753
+#: src/compose.c:2780
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1917,64 +1911,65 @@ msgstr[1] ""
 "הקבצים הבאים סופחו: \n"
 "%s"
 
-#: src/compose.c:3026
+#: src/compose.c:3053
 msgid "The \"Quotation mark\" of the template is invalid."
-msgstr "\"סימן ציטטה\" של התבנית הינו שגוי."
+msgstr "\"סימן מרכאות\" של התבנית הינו שגוי."
 
-#: src/compose.c:3514
+#: src/compose.c:3542
 #, c-format
 msgid "Could not get size of file '%s'."
-msgstr "לא היה ניתן להשיג גודל של קובץ '%s'."
+msgstr "לא היתה אפשרות להשיג גודל של קובץ '%s'."
 
-#: src/compose.c:3525
+#: src/compose.c:3553
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
-msgstr "בחרת לשבץ קובץ של %s בתוך גוף ההודעה. האם אכן ברצונך לעשות זאת?"
+msgstr ""
+"בחרת לשבץ קובץ של %s בתוך גוף ההודעה. האם אתה בטוח כי ברצונך לעשות זאת?"
 
-#: src/compose.c:3528
+#: src/compose.c:3556
 msgid "Are you sure?"
 msgstr "האם אתה בטוח?"
 
-#: src/compose.c:3529 src/compose.c:10962
+#: src/compose.c:3557 src/compose.c:11027
 msgid "+_Insert"
-msgstr "+_שיבוץ"
+msgstr "+_שבץ"
 
-#: src/compose.c:3639
+#: src/compose.c:3672
 #, c-format
 msgid "File %s is empty."
 msgstr "קובץ %s הינו ריק."
 
-#: src/compose.c:3643
+#: src/compose.c:3676
 #, c-format
 msgid "Can't read %s."
-msgstr "לא ניתן לקרוא %s."
+msgstr "אין אפשרות לקרוא %s."
 
-#: src/compose.c:3670
+#: src/compose.c:3703
 #, c-format
 msgid "Message: %s"
 msgstr "הודעה: %s"
 
-#: src/compose.c:4658 src/plugins/python/composewindowtype.c:428
+#: src/compose.c:4691 src/plugins/python/composewindowtype.c:432
 msgid " [Edited]"
 msgstr " [ערוכה]"
 
-#: src/compose.c:4665 src/plugins/python/composewindowtype.c:431
+#: src/compose.c:4698 src/plugins/python/composewindowtype.c:435
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "‫%s - הלחנת הודעה%s"
 
-#: src/compose.c:4668 src/plugins/python/composewindowtype.c:434
+#: src/compose.c:4701 src/plugins/python/composewindowtype.c:438
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[אין נושא] - הלחנת הודעה%s"
 
-#: src/compose.c:4670 src/plugins/python/composewindowtype.c:422
+#: src/compose.c:4703 src/plugins/python/composewindowtype.c:426
 msgid "Compose message"
 msgstr "הלחנת הודעה"
 
-#: src/compose.c:4697 src/messageview.c:909
+#: src/compose.c:4730 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1982,127 +1977,127 @@ msgstr ""
 "חשבון לשליחת דואר אינו מצוין.\n"
 "אנא בחר חשבון דואר לפני שליחה."
 
-#: src/compose.c:4914 src/compose.c:4946 src/compose.c:4988
-#: src/plugins/attachwarner/attachwarner.c:219 src/prefs_account.c:3245
-#: src/toolbar.c:404 src/toolbar.c:422
+#: src/compose.c:4950 src/compose.c:4982 src/compose.c:5024
+#: src/plugins/attachwarner/attachwarner.c:219 src/prefs_account.c:3237
+#: src/toolbar.c:405 src/toolbar.c:423
 msgid "Send"
 msgstr "שליחה"
 
-#: src/compose.c:4915
+#: src/compose.c:4951
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "הנמען היחיד הינו כתובת CC משתמטת. לשלוח בכל זאת?"
 
-#: src/compose.c:4916 src/compose.c:4948 src/compose.c:4981 src/compose.c:5497
+#: src/compose.c:4952 src/compose.c:4984 src/compose.c:5017 src/compose.c:5538
 #: src/plugins/attachwarner/attachwarner.c:211
 msgid "+_Send"
 msgstr "+_שלח"
 
-#: src/compose.c:4947
+#: src/compose.c:4983
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "הנמען היחיד הינו כתובת BCC משתמטת. לשלוח בכל זאת?"
 
-#: src/compose.c:4964
+#: src/compose.c:5000
 msgid "Recipient is not specified."
 msgstr "נמען אינו מצוין."
 
-#: src/compose.c:4983 src/plugins/attachwarner/attachwarner.c:213
+#: src/compose.c:5019 src/plugins/attachwarner/attachwarner.c:213
 msgid "+_Queue"
 msgstr "+_תור"
 
-#: src/compose.c:4984
+#: src/compose.c:5020
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "הנושא הינו ריק. %s"
 
-#: src/compose.c:4985
+#: src/compose.c:5021
 msgid "Send it anyway?"
 msgstr "לשלוח למרות זאת?"
 
 # להעמיד בתור
-#: src/compose.c:4986
+#: src/compose.c:5022
 msgid "Queue it anyway?"
 msgstr "להשים בתור למרות זאת?"
 
-#: src/compose.c:4988 src/toolbar.c:423
+#: src/compose.c:5024 src/toolbar.c:424
 msgid "Send later"
 msgstr "שליחה מאוחרת"
 
-#: src/compose.c:5036 src/compose.c:9585
+#: src/compose.c:5077 src/compose.c:9643
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Charset conversion failed."
 msgstr ""
-"לא היה ניתן להשים הודעה בתור לשליחה:\n"
+"לא היתה אפשרות להשים הודעה בתור לשליחה:\n"
 "\n"
 "המרת מערך תווים נכשלה."
 
-#: src/compose.c:5039 src/compose.c:9588
+#: src/compose.c:5080 src/compose.c:9646
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Couldn't get recipient encryption key."
 msgstr ""
-"לא היה ניתן להשים הודעה בתור לשליחה:\n"
+"לא היתה אפשרות להשים הודעה בתור לשליחה:\n"
 "\n"
-"לא היה ניתן להשיג מפתח הצפנה של נמען."
+"לא היתה אפשרות להשיג מפתח הצפנה של נמען."
 
-#: src/compose.c:5045 src/compose.c:9582
+#: src/compose.c:5086 src/compose.c:9640
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Signature failed: %s"
 msgstr ""
-"לא היה ניתן להשים הודעה בתור לשליחה:\n"
+"לא היתה אפשרות להשים הודעה בתור לשליחה:\n"
 "\n"
 "חתימה נכשלה: %s"
 
-#: src/compose.c:5048
+#: src/compose.c:5089
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "%s."
 msgstr ""
-"לא היה ניתן להשים הודעה בתור לשליחה:\n"
+"לא היתה אפשרות להשים הודעה בתור לשליחה:\n"
 "\n"
 "%s."
 
-#: src/compose.c:5050
+#: src/compose.c:5091
 msgid "Could not queue message for sending."
-msgstr "לא היה ניתן להשים הודעה בתור לשליחה."
+msgstr "לא היתה אפשרות להשים הודעה בתור לשליחה."
 
-#: src/compose.c:5065 src/compose.c:5125
+#: src/compose.c:5106 src/compose.c:5166
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "ההודעה הוכנסה לתור אך לא היתה ניתנת לשליחה.\n"
-"נסה את \"שלח הודעות בהמתנה\" מן התפריט הראשי ונסה שוב."
+"נסה את \"שלח הודעות בהמתנה\" מתוך התפריט הראשי ונסה שוב."
 
 # נצל
-#: src/compose.c:5121
+#: src/compose.c:5162
 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "%s\n"
-"נסה את \"שלח הודעות בהמתנה\" מן התפריט הראשי ונסה שוב."
+"נסה את \"שלח הודעות בהמתנה\" מתוך התפריט הראשי ונסה שוב."
 
-#: src/compose.c:5494
+#: src/compose.c:5535
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 "to the specified %s charset.\n"
 "Send it as %s?"
 msgstr ""
-"לא ניתן להמיר את קידוד מערך התווים של ההודעה \n"
+"אין אפשרות להמיר את קידוד מערך התווים של ההודעה \n"
 "אל מערך התווים %s המצוין.\n"
 "שלח זאת כהודעה %s?"
 
-#: src/compose.c:5552
+#: src/compose.c:5593
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2115,68 +2110,68 @@ msgstr ""
 "\n"
 "לשלוח למרות זאת?"
 
-#: src/compose.c:5733
+#: src/compose.c:5774
 msgid "Encryption warning"
 msgstr "אזהרת הצפנה"
 
-#: src/compose.c:5734
+#: src/compose.c:5775
 msgid "+C_ontinue"
 msgstr "+ה_משך"
 
-#: src/compose.c:5783
+#: src/compose.c:5824
 msgid "No account for sending mails available!"
 msgstr "אין חשבון זמין עבור שליחת דואר!"
 
-#: src/compose.c:5792
+#: src/compose.c:5833
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "חשבון נבחר אינו NNTP: פרסום הינו בלתי אפשרי."
 
-#: src/compose.c:6021
+#: src/compose.c:6062
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "תצריף %s לא קיים כבר. להתעלם?"
 
-#: src/compose.c:6022 src/mainwindow.c:648 src/toolbar.c:229
-#: src/toolbar.c:2181
+#: src/compose.c:6063 src/mainwindow.c:648 src/toolbar.c:230
+#: src/toolbar.c:2182
 msgid "Cancel sending"
 msgstr "ביטול שליחה"
 
 # check
-#: src/compose.c:6022
+#: src/compose.c:6063
 msgid "Ignore attachment"
 msgstr "התעלם מן תצריף"
 
-#: src/compose.c:6061
+#: src/compose.c:6102
 #, c-format
 msgid "Original %s part"
 msgstr "אזור %s מקורי"
 
-#: src/compose.c:6592
+#: src/compose.c:6681
 msgid "Add to address _book"
 msgstr "הוסף אל _ספר כתובות"
 
-#: src/compose.c:6748
+#: src/compose.c:6837
 msgid "Delete entry contents"
 msgstr "מחק תכולות רשומה"
 
-#: src/compose.c:6752 src/plugins/vcalendar/vcal_meeting_gtk.c:295
+#: src/compose.c:6841 src/plugins/vcalendar/vcal_meeting_gtk.c:295
 msgid "Use <tab> to autocomplete from addressbook"
-msgstr "באפשרותך להקיש על <tab> להשלמה אוטומטית מן ספר כתובות"
+msgstr "באפשרותך להקיש על <tab> להשלמה אוטומטית מתוך ספר כתובות"
 
-#: src/compose.c:6972
+#: src/compose.c:7061
 msgid "Mime type"
 msgstr "טיפוס Mime"
 
-#: src/compose.c:6978 src/mimeview.c:283 src/plugins/pgpcore/select-keys.c:396
+#: src/compose.c:7067 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:392
 #: src/prefs_matcher.c:627 src/prefs_summary_column.c:85 src/summaryview.c:447
 msgid "Size"
 msgstr "גודל"
 
-#: src/compose.c:7048
+#: src/compose.c:7130
 msgid "Save Message to "
 msgstr "שמור הודעה אל "
 
-#: src/compose.c:7081 src/editjpilot.c:276 src/editldap.c:520
+#: src/compose.c:7167 src/editjpilot.c:276 src/editldap.c:520
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1028
 #: src/plugins/bogofilter/bogofilter_gtk.c:188
@@ -2187,24 +2182,24 @@ msgstr "שמור הודעה אל "
 msgid "_Browse"
 msgstr "   _עיון   "
 
-#: src/compose.c:7569
+#: src/compose.c:7643
 msgid "Hea_der"
 msgstr "ת_קורה"
 
-#: src/compose.c:7574
+#: src/compose.c:7648
 msgid "_Attachments"
 msgstr "_תצריפים"
 
-#: src/compose.c:7588
+#: src/compose.c:7662
 msgid "Othe_rs"
 msgstr "_אחרים"
 
-#: src/compose.c:7603 src/gtk/headers.h:18
-#: src/plugins/pdf_viewer/poppler_viewer.c:704 src/summary_search.c:426
+#: src/compose.c:7677 src/gtk/headers.h:18
+#: src/plugins/pdf_viewer/poppler_viewer.c:704 src/summary_search.c:452
 msgid "Subject:"
 msgstr "נושא:"
 
-#: src/compose.c:7830
+#: src/compose.c:7891
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2213,86 +2208,86 @@ msgstr ""
 "בודק איות לא יכול היה להתחיל.\n"
 "%s"
 
-#: src/compose.c:7943
+#: src/compose.c:8000
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "מאת: <i>%s</i>"
 
-#: src/compose.c:7977
+#: src/compose.c:8034
 msgid "Account to use for this email"
 msgstr "חשבון לשימוש עבור דוא״ל זה"
 
-#: src/compose.c:7979
+#: src/compose.c:8036
 msgid "Sender address to be used"
 msgstr "כתובת ממען לשימוש"
 
-#: src/compose.c:8143
+#: src/compose.c:8200
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr ""
-"מערכת הפרטיות '%s' לא ניתנת היתה להיטען. לא תהיה ביכולתך לחתום או להצפין את "
+"מערכת הפרטיות '%s' לא ניתנת היתה להיטען. לא תהיה באפשרותך לחתום או להצפין את "
 "הודעה זו."
 
-#: src/compose.c:8243 src/plugins/archive/archiver_gtk.c:1082
+#: src/compose.c:8300 src/plugins/archive/archiver_gtk.c:1082
 msgid "_None"
 msgstr "_ללא"
 
-#: src/compose.c:8344 src/prefs_template.c:749
+#: src/compose.c:8401 src/prefs_template.c:753
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "גוף התבנית מכיל שגיאה בשורה %d."
 
-#: src/compose.c:8460
+#: src/compose.c:8517
 msgid "Template From format error."
 msgstr ""
 
-#: src/compose.c:8478
+#: src/compose.c:8535
 msgid "Template To format error."
 msgstr ""
 
-#: src/compose.c:8496
+#: src/compose.c:8553
 msgid "Template Cc format error."
 msgstr ""
 
-#: src/compose.c:8514
+#: src/compose.c:8571
 msgid "Template Bcc format error."
 msgstr ""
 
-#: src/compose.c:8533
+#: src/compose.c:8590
 msgid "Template subject format error."
 msgstr ""
 
-#: src/compose.c:8797
+#: src/compose.c:8854
 msgid "Invalid MIME type."
 msgstr "טיפוס MIME שגוי."
 
-#: src/compose.c:8812
+#: src/compose.c:8869
 msgid "File doesn't exist or is empty."
 msgstr "קובץ אינו קיים או שהינו ריק."
 
-#: src/compose.c:8886
+#: src/compose.c:8943
 msgid "Properties"
 msgstr "מאפיינים"
 
-#: src/compose.c:8903
+#: src/compose.c:8960
 msgid "MIME type"
 msgstr "טיפוס MIME"
 
-#: src/compose.c:8944
+#: src/compose.c:9001
 msgid "Encoding"
 msgstr "קידוד"
 
-#: src/compose.c:8964
+#: src/compose.c:9021
 msgid "Path"
 msgstr "נתיב"
 
-#: src/compose.c:8965
+#: src/compose.c:9022
 msgid "File name"
 msgstr "שם קובץ"
 
-#: src/compose.c:9157
+#: src/compose.c:9214
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2303,59 +2298,59 @@ msgstr ""
 "לכפות את סיום התהליך?\n"
 "process group id: %d"
 
-#: src/compose.c:9551 src/messageview.c:1116
+#: src/compose.c:9609 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לשלוח את דוא״ל זה."
 
-#: src/compose.c:9577
+#: src/compose.c:9635
 msgid "Could not queue message."
-msgstr "לא היה ניתן להשים הודעה בתור."
+msgstr "לא היתה אפשרות להשים הודעה בתור."
 
-#: src/compose.c:9579
+#: src/compose.c:9637
 #, c-format
 msgid ""
 "Could not queue message:\n"
 "\n"
 "%s."
 msgstr ""
-"לא היה ניתן להשים הודעה בתור:\n"
+"לא היתה אפשרות להשים הודעה בתור:\n"
 "\n"
 "%s."
 
-#: src/compose.c:9747
+#: src/compose.c:9805
 msgid "Could not save draft."
-msgstr "לא היה ניתן לשמור טיוטה."
+msgstr "לא היתה אפשרות לשמור טיוטה."
 
-#: src/compose.c:9751
+#: src/compose.c:9809
 msgid "Could not save draft"
-msgstr "לא היה ניתן לשמור טיוטה"
+msgstr "לא היתה אפשרות לשמור טיוטה"
 
-#: src/compose.c:9752
+#: src/compose.c:9810
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
 msgstr ""
-"לא היה ניתן לשמור טיוטה.\n"
+"לא היתה אפשרות לשמור טיוטה.\n"
 "האם ברצונך לבטל יציאה או לסלק את דואר זה?"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Cancel exit"
 msgstr "_ביטול יציאה"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Discard email"
 msgstr "_סלק דואר"
 
-#: src/compose.c:9914 src/compose.c:9928
+#: src/compose.c:9972 src/compose.c:9986
 msgid "Select file"
 msgstr "בחירת קובץ"
 
-#: src/compose.c:9942
+#: src/compose.c:10000
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "קובץ '%s' לא היה יכול להיקרא."
 
-#: src/compose.c:9944
+#: src/compose.c:10002
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2364,62 +2359,63 @@ msgstr ""
 "קובץ '%s' מכיל תווים שגויים\n"
 "עבור הקידוד הנוכחי, שיבוץ עשוי להיות לא מדויק."
 
-#: src/compose.c:10016
+#: src/compose.c:10081
 msgid "Discard message"
 msgstr "סילוק הודעה"
 
 # עברה שינוי. האם לסלקה
-#: src/compose.c:10017
+#: src/compose.c:10082
 msgid "This message has been modified. Discard it?"
 msgstr "הודעה זו שונתה. לסלק אותה?"
 
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Discard"
 msgstr "_סלק"
 
-# ל_שמור
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Save to Drafts"
 msgstr "_שמור אל טיוטות"
 
-#: src/compose.c:10020
+#: src/compose.c:10085
 msgid "Save changes"
 msgstr "שמור שינויים"
 
-#: src/compose.c:10021
+#: src/compose.c:10086
 msgid "This message has been modified. Save the latest changes?"
 msgstr "הודעה זו שונתה. לשמור שינויים אחרונים?"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "_Don't save"
 msgstr "_אל תשמור"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "+_Save to Drafts"
 msgstr "+_שמור אל טיוטות"
 
-#: src/compose.c:10092
+#: src/compose.c:10157
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "האם ברצונך להחיל את התבנית '%s'?"
 
-#: src/compose.c:10094
+#: src/compose.c:10159
 msgid "Apply template"
 msgstr "החלת תבנית"
 
-#: src/compose.c:10095
+#: src/compose.c:10160 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:772 src/prefs_template.c:309 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_החלף"
 
-#: src/compose.c:10095
+#: src/compose.c:10160
 msgid "_Insert"
 msgstr "_שבץ"
 
-#: src/compose.c:10959
+#: src/compose.c:11024
 msgid "Insert or attach?"
 msgstr "שיבוץ או סיפוח?"
 
-#: src/compose.c:10960
+#: src/compose.c:11025
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2427,16 +2423,16 @@ msgstr ""
 "האם ברצונך לשבץ את התכולות של הקובץ/הקבצים אל תוך גוף ההודעה, או לספחן אל "
 "הדוא״ל?"
 
-#: src/compose.c:10962
+#: src/compose.c:11027
 msgid "_Attach"
 msgstr "_ספח"
 
-#: src/compose.c:11178
+#: src/compose.c:11243
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "שגיאת פורמט ציטטה בשורה %d."
 
-#: src/compose.c:11462
+#: src/compose.c:11527
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2467,13 +2463,13 @@ msgstr ""
 msgid "Debug log"
 msgstr "יומן דיבאג"
 
-#: src/crash.c:252 src/toolbar.c:420
+#: src/crash.c:252 src/toolbar.c:421
 msgid "Close"
 msgstr "סגור"
 
 #: src/crash.c:257
 msgid "Save..."
-msgstr "שמור..."
+msgstr "שמירה..."
 
 #: src/crash.c:262
 msgid "Create bug report"
@@ -2542,13 +2538,12 @@ msgstr "עריכת פרטי אישיות"
 
 #: src/editaddress.c:411
 msgid "An Email address must be supplied."
-msgstr "חובה לספק כתובת דוא״ל."
+msgstr "יש לספק כתובת דוא״ל."
 
 #: src/editaddress.c:587
 msgid "A Name and Value must be supplied."
-msgstr "חובה לספק שם וערך."
+msgstr "יש לספק שם וערך."
 
-# להתעלם
 #: src/editaddress.c:676
 msgid "Discard"
 msgstr "סילוק"
@@ -2586,41 +2581,41 @@ msgstr "_אפס תמונה"
 msgid "Photo"
 msgstr "תצלום"
 
-#: src/editaddress.c:959 src/editaddress.c:961 src/expldifdlg.c:516
+#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:516
 #: src/exporthtml.c:761 src/ldif.c:766
 msgid "Display Name"
 msgstr "שם צג"
 
-#: src/editaddress.c:968 src/editaddress.c:972 src/ldif.c:774
+#: src/editaddress.c:961 src/editaddress.c:965 src/ldif.c:774
 msgid "Last Name"
 msgstr "שם משפחה"
 
-#: src/editaddress.c:969 src/editaddress.c:971 src/ldif.c:770
+#: src/editaddress.c:962 src/editaddress.c:964 src/ldif.c:770
 msgid "First Name"
 msgstr "שם פרטי"
 
-#: src/editaddress.c:975 src/editaddress.c:977
+#: src/editaddress.c:968 src/editaddress.c:970
 msgid "Nickname"
 msgstr "שם כינוי"
 
-#: src/editaddress.c:1061 src/editaddress.c:1129
+#: src/editaddress.c:1054 src/editaddress.c:1122
 msgid "Alias"
 msgstr "שם נוסף"
 
-#: src/editaddress.c:1271 src/editaddress.c:1340 src/editaddress.c:1360
+#: src/editaddress.c:1264 src/editaddress.c:1333 src/editaddress.c:1353
 #: src/prefs_customheader.c:223
 msgid "Value"
 msgstr "ערך"
 
-#: src/editaddress.c:1427
+#: src/editaddress.c:1424
 msgid "_User Data"
 msgstr "מידע _משתמש"
 
-#: src/editaddress.c:1428
+#: src/editaddress.c:1425
 msgid "_Email Addresses"
 msgstr "_כתובות דוא״ל"
 
-#: src/editaddress.c:1431 src/editaddress.c:1434
+#: src/editaddress.c:1428 src/editaddress.c:1431
 msgid "O_ther Attributes"
 msgstr "א_פיונים אחרים"
 
@@ -2634,7 +2629,7 @@ msgstr "נראה שקובץ איננו פורמט ספר כתובות תקף."
 
 #: src/editbook.c:115 src/editjpilot.c:191 src/editvcard.c:98
 msgid "Could not read file."
-msgstr "לא ניתן לקרוא את הקובץ."
+msgstr "לא היתה אפשרות לקרוא את הקובץ."
 
 #: src/editbook.c:149 src/editbook.c:262
 msgid "Edit Addressbook"
@@ -2645,8 +2640,8 @@ msgid " Check File "
 msgstr " בדוק קובץ "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1942
-#: src/wizard.c:1371 src/wizard.c:1650
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1934
+#: src/wizard.c:1183 src/wizard.c:1457
 msgid "File"
 msgstr "קובץ"
 
@@ -2656,7 +2651,7 @@ msgstr "הוספת ספר כתובות חדש"
 
 #: src/editgroup.c:101
 msgid "A Group Name must be supplied."
-msgstr "חובה לספק שם קבוצה."
+msgstr "יש לספק שם קבוצה."
 
 #: src/editgroup.c:294
 msgid "Edit Group Data"
@@ -2676,7 +2671,7 @@ msgstr "כתובות זמינות"
 
 #: src/editgroup.c:452
 msgid "Move Email Addresses to or from Group with arrow buttons"
-msgstr "העבר כתובת דוא״ל אל או מן קבוצה בעזרת לחצני חיצים"
+msgstr "העבר כתובת דוא״ל אל או מתוך קבוצה בעזרת לחצני חיצים"
 
 #: src/editgroup.c:500
 msgid "Edit Group Details"
@@ -2747,11 +2742,11 @@ msgstr "בסיס(י) חיפוש זמינים"
 
 #: src/editldap_basedn.c:288
 msgid "Could not read Search Base(s) from server - please set manually"
-msgstr "לא היה ניתן לקרוא בסיס(י) חיפוש מן שרת - אנא קבע ידנית"
+msgstr "לא היתה אפשרות לקרוא בסיס(י) חיפוש מתוך שרת - אנא קבע ידנית"
 
 #: src/editldap_basedn.c:292 src/editldap.c:281
 msgid "Could not connect to server"
-msgstr "לא היה ניתן לקשר אל שרת"
+msgstr "לא היתה אפשרות לקשר אל שרת"
 
 #: src/editldap.c:152
 msgid "A Name must be supplied."
@@ -2771,7 +2766,7 @@ msgstr "קיים צורך שלפחות אפיון חיפוש LDAP אחד יסו
 msgid "Connected successfully to server"
 msgstr "חובר בהצלחה אל שרת"
 
-#: src/editldap.c:336 src/editldap.c:980
+#: src/editldap.c:336 src/editldap.c:976
 msgid "Edit LDAP Server"
 msgstr "ערוך שרת LDAP"
 
@@ -2787,14 +2782,14 @@ msgid ""
 "computer as Claws Mail."
 msgstr ""
 "זהו שם המארח של השרת. לדוגמא, \"ldap.mydomain.com\" יכול להיות הולם עבור "
-"הארגון \"mydomain.com\". כתובת IP גם כן ניתנת לשימוש. ביכולתך לציין "
+"הארגון \"mydomain.com\". כתובת IP גם כן ניתנת לשימוש. באפשרותך לציין "
 "\"localhost\" אם שרת LDAP מורץ על אותו מחשב בו Claws Mail מורץ עליו."
 
 #: src/editldap.c:470
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3318
+#: src/editldap.c:471 src/prefs_account.c:3310
 msgid "SSL"
 msgstr "SSL"
 
@@ -2942,44 +2937,44 @@ msgstr ""
 msgid "Bind Password"
 msgstr "סיסמת קשירה"
 
-#: src/editldap.c:733
+#: src/editldap.c:729
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "הסיסמה לשימוש בעת התחברות כמשתמש \"DN קשור\"."
 
-#: src/editldap.c:738
+#: src/editldap.c:734
 msgid "Timeout (secs)"
 msgstr "פקיעת זמן (שניות)"
 
-#: src/editldap.c:752
+#: src/editldap.c:748
 msgid "The timeout period in seconds."
 msgstr "משך זמן פקיעת זמן בשניות."
 
-#: src/editldap.c:756
+#: src/editldap.c:752
 msgid "Maximum Entries"
 msgstr "רשומות מרביות"
 
-#: src/editldap.c:770
+#: src/editldap.c:766
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "המספר המקסימלי של רשומות שיוחזרו בתוצאות חיפוש."
 
-#: src/editldap.c:785 src/prefs_account.c:3209
+#: src/editldap.c:781 src/prefs_account.c:3201
 msgid "Basic"
 msgstr "בסיסי"
 
-#: src/editldap.c:786
+#: src/editldap.c:782
 msgid "Search"
 msgstr "חיפוש"
 
-#: src/editldap.c:787 src/gtk/quicksearch.c:661
+#: src/editldap.c:783 src/gtk/quicksearch.c:670
 msgid "Extended"
 msgstr "מורחב"
 
-#: src/editldap.c:985
+#: src/editldap.c:981
 msgid "Add New LDAP Server"
 msgstr "הוספת שרת LDAP חדש"
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1444
+#: src/edittags.c:187 src/prefs_filtering_action.c:1446
 msgid "Tag"
 msgstr "תגית"
 
@@ -2999,24 +2994,24 @@ msgstr "מחיקת כל התגיות"
 msgid "Do you really want to delete all tags?"
 msgstr "האם אכן ברצונך למחוק את כל התגיות?"
 
-#: src/edittags.c:422
+#: src/edittags.c:415
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr "הזנת שם תגית הפוך, אנא בחר אחר במקום."
 
-#: src/edittags.c:464
+#: src/edittags.c:457
 msgid "Tag is not set."
 msgstr "תגית אינה מוגדרת."
 
-#: src/edittags.c:529
+#: src/edittags.c:522
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "החל תגיות"
 
-#: src/edittags.c:543
+#: src/edittags.c:536
 msgid "New tag:"
 msgstr "תגית חדשה:"
 
-#: src/edittags.c:576
+#: src/edittags.c:569
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr "אנא בחר תגיות להחלה/להסרה. שינויים הינם מידיים."
 
@@ -3072,13 +3067,12 @@ msgid ""
 "Could not create output directory for HTML file:\n"
 "%s"
 msgstr ""
-"לא היה ניתן ליצור מדור פלט עבור קובץ HTML:\n"
+"לא היתה אפשרות ליצור מדור פלט עבור קובץ HTML:\n"
 "%s"
 
-# כשל ביצירת מדור
 #: src/exphtmldlg.c:191 src/expldifdlg.c:201
 msgid "Failed to Create Directory"
-msgstr "נכשל ליצור מדור"
+msgstr "כשל ביצירת מדור"
 
 #: src/exphtmldlg.c:233
 msgid "Error creating HTML file"
@@ -3102,9 +3096,9 @@ msgid "Stylesheet"
 msgstr "יריעת סגנון"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:133 src/mainwindow.c:1175
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1173
 #: src/plugins/archive/archiver_prefs.c:241 src/prefs_account.c:946
-#: src/prefs_toolbar.c:775 src/prefs_toolbar.c:1456 src/summaryview.c:6010
+#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1465 src/summaryview.c:6006
 msgid "None"
 msgstr "ללא"
 
@@ -3113,7 +3107,7 @@ msgstr "ללא"
 msgid "Default"
 msgstr "ברירת מחדל"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:248
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
 #: src/plugins/pgpcore/sgpgme.c:148
 msgid "Full"
 msgstr "מלא"
@@ -3148,7 +3142,7 @@ msgstr "שם משפחה, שם פרטי"
 
 #: src/exphtmldlg.c:482
 msgid "Color Banding"
-msgstr ""
+msgstr "קיבוע צבע"
 
 #: src/exphtmldlg.c:488
 msgid "Format Email Links"
@@ -3205,7 +3199,7 @@ msgid ""
 "Could not create output directory for LDIF file:\n"
 "%s"
 msgstr ""
-"לא היה ניתן לייצר תיקיית פלט עבור קובץ LDIF:\n"
+"לא היתה אפשרות לייצר תיקיית פלט עבור קובץ LDIF:\n"
 "%s"
 
 #: src/expldifdlg.c:241
@@ -3217,8 +3211,8 @@ msgid ""
 "A suffix is required if data is to be used for an LDAP server. Are you sure "
 "you wish to proceed without a suffix?"
 msgstr ""
-"סיומת נדרשת במידה ונתונים ינוצלו עבור שרת LDAP. האם אכן ברצונך להמשיך בלי "
-"סיומת?"
+"סיומת נדרשת במידה ונתונים ינוצלו עבור שרת LDAP. האם אתה בטוח כי ברצונך "
+"להמשיך בלי סיומת?"
 
 #: src/expldifdlg.c:261
 msgid "Error creating LDIF file"
@@ -3315,8 +3309,9 @@ msgstr ""
 "שנבחר לעיל ינוצל אם אפיון משתמש DN אינו נמצא."
 
 #: src/expldifdlg.c:558
+#, fuzzy
 msgid "Exclude record if no Email Address"
-msgstr ""
+msgstr "הוצא record אם אין כתובת דוא״ל"
 
 #: src/expldifdlg.c:563
 msgid ""
@@ -3335,7 +3330,7 @@ msgstr "ייצוא ספר כתובות אל קובץ LDIF"
 msgid "Distinguished Name"
 msgstr "שם מובחן"
 
-#: src/export.c:113 src/summaryview.c:8154
+#: src/export.c:113 src/summaryview.c:8143
 msgid "Export to mbox file"
 msgstr "ייצוא אל קובץ mbox"
 
@@ -3361,7 +3356,7 @@ msgstr "תיקיית מקור לא יכולה להישאר ריקה."
 
 #: src/export.c:221
 msgid "Couldn't find the source folder."
-msgstr "לא היה ניתן למצוא את תיקיית המקור."
+msgstr "לא היתה אפשרות למצוא את תיקיית המקור."
 
 #: src/export.c:245
 msgid "Select exporting file"
@@ -3396,57 +3391,74 @@ msgstr "שם ארוך מדי."
 msgid "Not specified."
 msgstr "לא מצוין."
 
+#: src/file_checker.c:76
+#, c-format
+msgid "The file %s is missing! Do you want to use the backup file from %s?"
+msgstr "הקובץ %s נעדר! האם ברצונך להשתמש בקובץ גיבוי מתוך %s?"
+
+#: src/file_checker.c:84 src/file_checker.c:106
+#, c-format
+msgid "Could not copy %s to %s"
+msgstr "לא היתה אפשרות להעתיק את %s אל %s"
+
+#: src/file_checker.c:98
+#, c-format
+msgid ""
+"The file %s is empty or corrupted! Do you want to use the backup file from "
+"%s?"
+msgstr "הקובץ %s הינו ריק או מושחת! האם ברצונך להשתמש בקובץ גיבוי מתוך %s?"
+
 # נכנסות
-#: src/folder.c:1571 src/foldersel.c:374 src/prefs_folder_item.c:308
+#: src/folder.c:1577 src/foldersel.c:374 src/prefs_folder_item.c:308
 msgid "Inbox"
 msgstr "דואר נכנס"
 
 # נשלחו
-#: src/folder.c:1575 src/foldersel.c:378
+#: src/folder.c:1581 src/foldersel.c:378
 msgid "Sent"
 msgstr "דואר יוצא"
 
-#: src/folder.c:1579 src/foldersel.c:382
+#: src/folder.c:1585 src/foldersel.c:382
 #: src/plugins/attachwarner/attachwarner.c:219 src/prefs_folder_item.c:311
 msgid "Queue"
 msgstr "תור"
 
-#: src/folder.c:1583 src/foldersel.c:386 src/prefs_folder_item.c:312
+#: src/folder.c:1589 src/foldersel.c:386 src/prefs_folder_item.c:312
 msgid "Trash"
 msgstr "אשפה"
 
-#: src/folder.c:1587 src/foldersel.c:390 src/prefs_folder_item.c:310
+#: src/folder.c:1593 src/foldersel.c:390 src/prefs_folder_item.c:310
 msgid "Drafts"
 msgstr "טיוטות"
 
-#: src/folder.c:2017
+#: src/folder.c:2023
 #, c-format
 msgid "Processing (%s)...\n"
-msgstr "מעבד כעת (%s)...\n"
+msgstr "כעת מעבד (%s)...\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Copying %s to %s...\n"
-msgstr "מעתיק כעת את %s אל %s...\n"
+msgstr "כעת מעתיק את %s אל %s...\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Moving %s to %s...\n"
-msgstr "מזיז כעת את %s אל %s...\n"
+msgstr "כעת מזיז את %s אל %s...\n"
 
-#: src/folder.c:3563
+#: src/folder.c:3569
 #, c-format
 msgid "Updating cache for %s..."
-msgstr "מעדכן כעת מטמון עבור %s..."
+msgstr "כעת מעדכן מטמון עבור %s..."
 
-#: src/folder.c:4435
+#: src/folder.c:4443
 msgid "Processing messages..."
-msgstr "מעבד כעת הודעות..."
+msgstr "כעת מעבד הודעות..."
 
-#: src/folder.c:4571
+#: src/folder.c:4579
 #, c-format
 msgid "Synchronising %s for offline use...\n"
-msgstr "מסנכרן כעת את %s עבור שימוש לא מקוון...\n"
+msgstr "כעת מסנכרן את %s עבור שימוש לא מקוון...\n"
 
 #: src/foldersel.c:221
 msgid "Select folder"
@@ -3460,18 +3472,18 @@ msgstr "תיקייה_חדשה"
 #: src/foldersel.c:562 src/imap_gtk.c:210 src/imap_gtk.c:216
 #: src/imap_gtk.c:272 src/imap_gtk.c:277 src/mh_gtk.c:155 src/mh_gtk.c:259
 #: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:249
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:97
+#: src/plugins/mailmbox/plugin_gtk.c:416 src/plugins/rssyl/rssyl_cb_menu.c:97
 #: src/plugins/rssyl/rssyl_cb_menu.c:341
-#: src/plugins/vcalendar/vcal_folder.c:2028
+#: src/plugins/vcalendar/vcal_folder.c:2026
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "‫'%c' לא יכול להיכלל בשם תיקייה."
 
 #: src/foldersel.c:572 src/imap_gtk.c:226 src/imap_gtk.c:284 src/mh_gtk.c:165
 #: src/mh_gtk.c:266 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:261
-#: src/plugins/mailmbox/plugin_gtk.c:428 src/plugins/rssyl/rssyl_cb_menu.c:107
+#: src/plugins/mailmbox/plugin_gtk.c:425 src/plugins/rssyl/rssyl_cb_menu.c:107
 #: src/plugins/rssyl/rssyl_cb_menu.c:348
-#: src/plugins/vcalendar/vcal_folder.c:2035
+#: src/plugins/vcalendar/vcal_folder.c:2033
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "התיקייה '%s' כבר קיימת."
@@ -3480,11 +3492,11 @@ msgstr "התיקייה '%s' כבר קיימת."
 #: src/plugins/mailmbox/plugin_gtk.c:268 src/plugins/rssyl/rssyl_cb_menu.c:113
 #, c-format
 msgid "Can't create the folder '%s'."
-msgstr "לא ניתן ליצור את התיקייה '%s'."
+msgstr "אין אפשרות ליצור את התיקייה '%s'."
 
 #: src/folderview.c:230
 msgid "Mark all re_ad"
-msgstr "סמן את כולן כ־נ_קראו"
+msgstr "סמן את כולן בתור נ_קראו"
 
 #: src/folderview.c:232
 msgid "R_un processing rules"
@@ -3492,7 +3504,7 @@ msgstr "ה_רץ חוקי עיבוד"
 
 #: src/folderview.c:233 src/mainwindow.c:544
 msgid "_Search folder..."
-msgstr "_חפש בתיקייה..."
+msgstr "_חיפוש תיקייה..."
 
 #: src/folderview.c:235
 msgid "Process_ing..."
@@ -3500,22 +3512,22 @@ msgstr "_עיבוד..."
 
 #: src/folderview.c:236
 msgid "Empty _trash..."
-msgstr "רוקן _אשפה..."
+msgstr "ריקון _אשפה..."
 
 #: src/folderview.c:237
 msgid "Send _queue..."
-msgstr "שלח _תור..."
+msgstr "שליחת _תור..."
 
 # חדשה
 #: src/folderview.c:380 src/folderview.c:427
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:388 src/summaryview.c:6286
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:388 src/summaryview.c:6282
 msgid "New"
 msgstr "חדשות"
 
 #: src/folderview.c:381 src/folderview.c:428
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:387 src/summaryview.c:6288
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:387 src/summaryview.c:6284
 msgid "Unread"
 msgstr "לא נקראו"
 
@@ -3529,174 +3541,174 @@ msgstr "סך הכל"
 msgid "#"
 msgstr "מס׳"
 
-#: src/folderview.c:734
+#: src/folderview.c:727
 msgid "Setting folder info..."
-msgstr "מגדיר כעת מידע תיקייה..."
+msgstr "כעת מגדיר מידע תיקייה..."
 
-#: src/folderview.c:797 src/summaryview.c:4113 src/summaryview.c:4115
+#: src/folderview.c:790 src/summaryview.c:4109 src/summaryview.c:4111
 msgid "Mark all as read"
-msgstr "סמן את כולן כ־נקראו"
+msgstr "סמן את כולן בתור נקראו"
 
-#: src/folderview.c:798 src/summaryview.c:4114
+#: src/folderview.c:791 src/summaryview.c:4110
 msgid "Do you really want to mark all mails in this folder as read?"
-msgstr "האם באמת שברצונך לסמן את כל הדואר בתיקייה זו כנקרא?"
+msgstr "האם אתה בטוח כי ברצונך לסמן את כל הדואר בתיקייה זו בתור נקרא?"
 
-#: src/folderview.c:1021 src/imap.c:4490 src/mainwindow.c:5308 src/setup.c:91
+#: src/folderview.c:1014 src/imap.c:4497 src/mainwindow.c:5128 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
-msgstr "סורק כעת תיקייה %s%c%s..."
+msgstr "כעת סורק תיקייה %s%c%s..."
 
-#: src/folderview.c:1025 src/imap.c:4495 src/mainwindow.c:5313 src/setup.c:96
+#: src/folderview.c:1018 src/imap.c:4502 src/mainwindow.c:5133 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
-msgstr "סורק כעת תיקייה %s..."
+msgstr "כעת סורק תיקייה %s..."
 
-#: src/folderview.c:1056
+#: src/folderview.c:1049
 msgid "Rebuild folder tree"
 msgstr "בנה מחדש עץ תיקייה"
 
-#: src/folderview.c:1057
+#: src/folderview.c:1050
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "בנייה מחודשת של עץ התיקייה תסיר רק את המטמונים המקומיים. האם ברצונך להמשיך?"
 
-#: src/folderview.c:1067
+#: src/folderview.c:1060
 msgid "Rebuilding folder tree..."
-msgstr "בונה מחדש כעת עץ תיקייה..."
+msgstr "כעת בונה מחדש עץ תיקייה..."
 
-#: src/folderview.c:1069 src/folderview.c:1110
+#: src/folderview.c:1062 src/folderview.c:1103
 msgid "Scanning folder tree..."
-msgstr "סורק כעת עץ תיקייה..."
+msgstr "כעת סורק עץ תיקייה..."
 
-#: src/folderview.c:1201
+#: src/folderview.c:1194
 #, c-format
 msgid "Couldn't scan folder %s\n"
-msgstr "לא היה ניתן לסרוק תיקייה %s\n"
+msgstr "לא היתה אפשרות לסרוק תיקייה %s\n"
 
-#: src/folderview.c:1255
+#: src/folderview.c:1248
 msgid "Checking for new messages in all folders..."
-msgstr "בודק כעת עבור הודעות חדשות בכל התיקיות..."
+msgstr "כעת בודק עבור הודעות חדשות בכל התיקיות..."
 
-#: src/folderview.c:2083
+#: src/folderview.c:2076
 #, c-format
 msgid "Closing folder %s..."
-msgstr "סוגר כעת תיקייה %s..."
+msgstr "כעת סוגר תיקייה %s..."
 
-#: src/folderview.c:2178
+#: src/folderview.c:2171
 #, c-format
 msgid "Opening folder %s..."
-msgstr "פותח כעת תיקייה %s..."
+msgstr "כעת פותח תיקייה %s..."
 
-#: src/folderview.c:2196
+#: src/folderview.c:2189
 msgid "Folder could not be opened."
 msgstr "תיקייה לא היתה ניתנת להיפתח."
 
-#: src/folderview.c:2337 src/mainwindow.c:3059 src/mainwindow.c:3063
+#: src/folderview.c:2330 src/mainwindow.c:2877 src/mainwindow.c:2881
 msgid "Empty trash"
 msgstr "ריקון אשפה"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2331
 msgid "Delete all messages in trash?"
 msgstr "מחיקת כל ההודעות באשפה?"
 
-#: src/folderview.c:2339
+#: src/folderview.c:2332
 msgid "+_Empty trash"
-msgstr "+_ריקון אשפה"
+msgstr "+_רקן אשפה"
 
-#: src/folderview.c:2383 src/inc.c:1620 src/toolbar.c:2689
+#: src/folderview.c:2376 src/inc.c:1528 src/toolbar.c:2678
 msgid "Offline warning"
 msgstr "אזהרה לא מקוונת"
 
 # להמשיך
-#: src/folderview.c:2384 src/toolbar.c:2690
+#: src/folderview.c:2377 src/toolbar.c:2679
 msgid "You're working offline. Override?"
 msgstr "הינך עובד במצב לא מקוון. לעקוף?"
 
-#: src/folderview.c:2395 src/toolbar.c:2709
+#: src/folderview.c:2388 src/toolbar.c:2698
 msgid "Send queued messages"
 msgstr "שליחת הודעות בהמתנה"
 
-#: src/folderview.c:2396 src/toolbar.c:2710
+#: src/folderview.c:2389 src/toolbar.c:2699
 msgid "Send all queued messages?"
 msgstr "שליחת כל ההודעות שבהמתנה?"
 
-#: src/folderview.c:2397 src/messageview.c:875 src/messageview.c:892
-#: src/toolbar.c:2711
+#: src/folderview.c:2390 src/messageview.c:853 src/messageview.c:870
+#: src/toolbar.c:2700
 msgid "_Send"
-msgstr "_שליחה"
+msgstr "_שלח"
 
-#: src/folderview.c:2405 src/toolbar.c:2729
+#: src/folderview.c:2398 src/toolbar.c:2718
 msgid "Some errors occurred while sending queued messages."
-msgstr "ארעו שגיאות מסוימות במהלך שליחת הודעות בהמתנה."
+msgstr "אירעו שגיאות מסוימות במהלך שליחת הודעות בהמתנה."
 
-#: src/folderview.c:2408 src/main.c:2862 src/toolbar.c:2732
+#: src/folderview.c:2401 src/main.c:2689 src/toolbar.c:2721
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"
 msgstr ""
-"ארעו שגיאות מסוימות במהלך שליחת הודעות בהמתנה:\n"
+"אירעו שגיאות מסוימות במהלך שליחת הודעות בהמתנה:\n"
 "%s"
 
-#: src/folderview.c:2485
+#: src/folderview.c:2478
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
-msgstr "האם באמת שברצונך להעתיק את תיקייה '%s' בתוך '%s'?"
+msgstr "האם אתה בטוח כי ברצונך להעתיק את תיקייה '%s' בתוך '%s'?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2479
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
-msgstr "האם באמת שברצונך להפוך את תיקייה '%s' אל תיקיית משנה של '%s'?"
+msgstr "האם אתה בטוח כי ברצונך להפוך את תיקייה '%s' אל תיקיית משנה של '%s'?"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Copy folder"
 msgstr "העתקת תיקייה"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Move folder"
 msgstr "העברת תיקייה"
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Copying %s to %s..."
-msgstr "מעתיק כעת %s אל %s..."
+msgstr "כעת מעתיק את %s אל %s..."
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Moving %s to %s..."
-msgstr "מזיז כעת %s אל %s..."
+msgstr "כעת מעביר את %s אל %s..."
 
-#: src/folderview.c:2530
+#: src/folderview.c:2523
 msgid "Source and destination are the same."
 msgstr "מקור ויעד הינם זהים."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2526
 msgid "Can't copy a folder to one of its children."
-msgstr "לא ניתן להעתיק תיקייה אל אחד מן צאצאיה."
+msgstr "אין אפשרות להעתיק תיקייה אל אחד מן צאצאיה."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2527
 msgid "Can't move a folder to one of its children."
-msgstr "לא ניתן להעביר תיקייה אל אחד מן צאצאיה."
+msgstr "אין אפשרות להעביר תיקייה אל אחד מן צאצאיה."
 
-#: src/folderview.c:2537
+#: src/folderview.c:2530
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "תיקייה לא ניתנת להעברה בין תיבות דואר שונות."
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Copy failed!"
 msgstr "העתקה נכשלה!"
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Move failed!"
 msgstr "העברה נכשלה!"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2584
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "תצורת עיבוד עבור תיקייה %s"
 
-#: src/folderview.c:3018 src/summaryview.c:4554 src/summaryview.c:4653
+#: src/folderview.c:3011 src/summaryview.c:4550 src/summaryview.c:4649
 msgid "The destination folder can only be used to store subfolders."
 msgstr "תיקיית היעד ניתנת לשימוש רק לאחסון תיקיות משנה."
 
@@ -3744,7 +3756,7 @@ msgstr "לא מוכר"
 
 #: src/grouplistdialog.c:422
 msgid "Can't retrieve newsgroup list."
-msgstr "לא ניתן לאחזר רשימת קבוצת דיונים."
+msgstr "אין אפשרות לאחזר רשימת קבוצת דיונים."
 
 #: src/grouplistdialog.c:459 src/summaryview.c:1579
 msgid "Done."
@@ -3786,7 +3798,7 @@ msgstr ""
 "\n"
 "\n"
 "‫Claws Mail הינו תוכנה חופשית המשוחרר תחת הרשיון GPL. אם ברצונך לתרום לפרויקט "
-"Claws Mail ביכולתך לעשות כן בכתובת:\n"
+"Claws Mail באפשרותך לעשות כן בכתובת:\n"
 
 #: src/gtk/about.c:159
 msgid ""
@@ -3798,7 +3810,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"זכויות יוצרים (C) ‏1999-‏2013\\nנבחרת Claws Mail\n"
+"זכויות יוצרים (C) ‏1999-2013\\nנבחרת Claws Mail\n"
 "  וגם Hiroyuki Yamamoto"
 
 #: src/gtk/about.c:162
@@ -3830,7 +3842,7 @@ msgid ""
 "Operating System: %s"
 msgstr ""
 "‫‭GTK+ %d.%d.%d / GLib %d.%d.%d\n"
-"מקומיות: ‭%s (charset: %s)\n"
+"מקומיות: %s (מערך תווים: %s)\n"
 "מערכת הפעלה: %s"
 
 #: src/gtk/about.c:186
@@ -3841,10 +3853,10 @@ msgid ""
 "Operating System: unknown"
 msgstr ""
 "‫‭GTK+ %d.%d.%d / GLib %d.%d.%d\n"
-"מקומיות: ‭%s (charset: %s)\n"
+"מקומיות: %s (מערך תווים: %s)\n"
 "מערכת הפעלה: לא ידועה"
 
-#: src/gtk/about.c:243 src/prefs_themes.c:728 src/wizard.c:545
+#: src/gtk/about.c:243 src/prefs_themes.c:728 src/wizard.c:523
 msgid "The Claws Mail Team"
 msgstr "‪נבחרת ‫Claws Mail"
 
@@ -3896,10 +3908,11 @@ msgctxt "IPv6"
 msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
 msgstr "מוסיפה תמיכה עבור כתובות ‫IPv6, פרוטוקול המיעון החדש\n"
 
+# לתוך
 #: src/gtk/about.c:462
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
-msgstr "מתירה המרה אל וגם מן מערכי תווים שונים\n"
+msgstr "מתירה המרה אל וגם מתוך מערכי תווים שונים\n"
 
 #: src/gtk/about.c:472
 msgctxt "JPilot"
@@ -3968,47 +3981,47 @@ msgstr ""
 "‬>. \n"
 "\n"
 
-#: src/gtk/about.c:699 src/main.c:2689
+#: src/gtk/about.c:699 src/main.c:2516
 msgid "Session statistics\n"
 msgstr "סטטיסטיקות סשן\n"
 
-#: src/gtk/about.c:709 src/gtk/about.c:712 src/main.c:2699 src/main.c:2702
+#: src/gtk/about.c:709 src/gtk/about.c:712 src/main.c:2526 src/main.c:2529
 #, c-format
 msgid "Started: %s\n"
 msgstr "אותחל: %s\n"
 
-#: src/gtk/about.c:719 src/main.c:2708
+#: src/gtk/about.c:719 src/main.c:2535
 msgid "Incoming traffic\n"
 msgstr "תעבורה נכנסת\n"
 
-#: src/gtk/about.c:722 src/main.c:2711
+#: src/gtk/about.c:722 src/main.c:2538
 #, c-format
 msgid "Received messages: %d\n"
-msgstr "הודעות שנתקבלו: %d\n"
+msgstr "הודעות אשר נתקבלו: %d\n"
 
-#: src/gtk/about.c:729 src/main.c:2717
+#: src/gtk/about.c:729 src/main.c:2544
 msgid "Outgoing traffic\n"
 msgstr "תעבורה יוצאת\n"
 
-#: src/gtk/about.c:732 src/main.c:2720
+#: src/gtk/about.c:732 src/main.c:2547
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "הודעות חדשות/שכוונו מחדש: %d\n"
 
-#: src/gtk/about.c:737 src/main.c:2724
+#: src/gtk/about.c:737 src/main.c:2551
 #, c-format
 msgid "Replied messages: %d\n"
-msgstr "הודעות שנענו: %d\n"
+msgstr "הודעות אשר נענו: %d\n"
 
-#: src/gtk/about.c:742 src/main.c:2728
+#: src/gtk/about.c:742 src/main.c:2555
 #, c-format
 msgid "Forwarded messages: %d\n"
-msgstr "הודעות שקודמו: %d\n"
+msgstr "הודעות אשר קודמו: %d\n"
 
-#: src/gtk/about.c:747 src/main.c:2732
+#: src/gtk/about.c:747 src/main.c:2559
 #, c-format
 msgid "Total outgoing messages: %d\n"
-msgstr "סך הכל הודעות יוצאות: %d\n"
+msgstr "סך כל הודעות יוצאות: %d\n"
 
 #: src/gtk/about.c:774
 msgid "About Claws Mail"
@@ -4020,7 +4033,7 @@ msgid ""
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"זכויות יוצרים (C) ‫1999-‏2013\n"
+"זכויות יוצרים (C) ‏1999-2013\n"
 "נבחרת Claws Mail\n"
 "וגם Hiroyuki Yamamoto"
 
@@ -4048,63 +4061,63 @@ msgstr "_הערות שחרור"
 msgid "_Statistics"
 msgstr "ס_טטיסטיקות"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:358
 msgid "Orange"
 msgstr "כתום"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:362
 msgid "Red"
 msgstr "אדום"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:366
 msgid "Pink"
 msgstr "ורוד"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:370
 msgid "Sky blue"
 msgstr "כחול שמים"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:374
 msgid "Blue"
 msgstr "כחול"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:378
 msgid "Green"
 msgstr "ירוק"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:382
 msgid "Brown"
 msgstr "חום"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:386
 msgid "Grey"
 msgstr "אפור"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:390
 msgid "Light brown"
 msgstr "חום בהיר"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:394
 msgid "Dark red"
 msgstr "אדום כהה"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:398
 msgid "Dark pink"
 msgstr "ורוד כהה"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:402
 msgid "Steel blue"
 msgstr "כחול פלדה"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:406
 msgid "Gold"
 msgstr "זהב"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:410
 msgid "Bright green"
 msgstr "ירוק בהיר"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:424
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:414
 msgid "Magenta"
 msgstr "ארגמן"
 
@@ -4127,16 +4140,16 @@ msgstr "לא נבחר מילון."
 #: src/gtk/gtkaspell.c:365 src/gtk/gtkaspell.c:395
 #, c-format
 msgid "Couldn't initialize %s speller."
-msgstr "לא היה ניתן לאתחל מאיית %s."
+msgstr "לא היתה אפשרות לאתחל מאיית %s."
 
 #: src/gtk/gtkaspell.c:707
 msgid "Couldn't initialize Enchant broker."
-msgstr "לא היה ניתן לאתחל Enchant broker."
+msgstr "לא היתה אפשרות לאתחל Enchant broker."
 
 #: src/gtk/gtkaspell.c:713
 #, c-format
 msgid "Couldn't initialize %s dictionary:"
-msgstr "לא היה ניתן לאתחל מילון %s:"
+msgstr "לא היתה אפשרות לאתחל מילון %s:"
 
 #: src/gtk/gtkaspell.c:1070
 msgid "No misspelled word found."
@@ -4159,10 +4172,9 @@ msgstr ""
 "החזקת המקש Control בזמן לחיצה על Enter\n"
 "ילמד מטעות.\n"
 
-# שינוי
 #: src/gtk/gtkaspell.c:1800
 msgid "Change to..."
-msgstr "שנה אל..."
+msgstr "שינוי אל..."
 
 #: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
 msgid "More..."
@@ -4179,11 +4191,11 @@ msgstr "הסכם בסשן זה"
 
 #: src/gtk/gtkaspell.c:1893
 msgid "Add to personal dictionary"
-msgstr "הוסף אל מילון אישי"
+msgstr "הוסף למילון אישי"
 
 #: src/gtk/gtkaspell.c:1903
 msgid "Replace with..."
-msgstr "החלף עם..."
+msgstr "החלפה עם..."
 
 #: src/gtk/gtkaspell.c:1916
 #, c-format
@@ -4230,8 +4242,8 @@ msgstr ""
 "בודק איות לא יכול היה להחליף את המילון החלופי.\n"
 "%s"
 
-#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1257
-#: src/prefs_matcher.c:2152 src/prefs_summary_column.c:84 src/quote_fmt.c:49
+#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1259
+#: src/prefs_matcher.c:2158 src/prefs_summary_column.c:84 src/quote_fmt.c:49
 #: src/summaryview.c:446
 msgid "Date"
 msgstr "‎תאריך‎"
@@ -4240,13 +4252,13 @@ msgstr "‎תאריך‎"
 msgid "Date:"
 msgstr "תאריך:"
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1254
-#: src/prefs_matcher.c:2149 src/prefs_summary_column.c:82 src/quote_fmt.c:50
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1256
+#: src/prefs_matcher.c:2155 src/prefs_summary_column.c:82 src/quote_fmt.c:50
 #: src/summaryview.c:444
 msgid "From"
 msgstr "‎מאת‎"
 
-#: src/gtk/headers.h:9 src/summary_search.c:412
+#: src/gtk/headers.h:9 src/summary_search.c:438
 msgid "From:"
 msgstr "מאת:"
 
@@ -4262,36 +4274,36 @@ msgstr "ממען:"
 msgid "Reply-To"
 msgstr "‎מענה-אל‎"
 
-#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2150 src/prefs_summary_column.c:83 src/quote_fmt.c:57
+#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1257
+#: src/prefs_matcher.c:2156 src/prefs_summary_column.c:83 src/quote_fmt.c:57
 #: src/summaryview.c:445
 msgid "To"
 msgstr "‎אל‎"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2151 src/quote_fmt.c:58
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1258
+#: src/prefs_matcher.c:2157 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "‎עותק‎"
 
 #: src/gtk/headers.h:14
 msgid "Bcc"
-msgstr "‎עותק סמוי‎"
+msgstr "‎עותק-סמוי‎"
 
-#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1258
-#: src/prefs_matcher.c:2153 src/quote_fmt.c:61
+#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1260
+#: src/prefs_matcher.c:2159 src/quote_fmt.c:61
 msgid "Message-ID"
-msgstr "‎הודעה-ID‎"
+msgstr "‎מזהה-הודעה"
 
 #: src/gtk/headers.h:15
 msgid "Message-ID:"
-msgstr "‏ID-הודעה:"
+msgstr "מזהה-הודעה:"
 
 #: src/gtk/headers.h:16
 msgid "In-Reply-To"
 msgstr "‎ב-מענה-אל‎"
 
-#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2155 src/quote_fmt.c:60
+#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1262
+#: src/prefs_matcher.c:2161 src/quote_fmt.c:60
 msgid "References"
 msgstr "‎מראי מקום‎"
 
@@ -4300,8 +4312,8 @@ msgstr "‎מראי מקום‎"
 msgid "References:"
 msgstr "מראי מקום:"
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1253
-#: src/prefs_matcher.c:2148 src/prefs_summary_column.c:81 src/quote_fmt.c:56
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1255
+#: src/prefs_matcher.c:2154 src/prefs_summary_column.c:81 src/quote_fmt.c:56
 #: src/summaryview.c:443
 msgid "Subject"
 msgstr "‎נושא‎"
@@ -4324,59 +4336,59 @@ msgstr "מילות מפתח:"
 
 #: src/gtk/headers.h:21
 msgid "Resent-Date"
-msgstr ""
+msgstr "‎שליחה-חוזרת-תאריך"
 
 #: src/gtk/headers.h:21
 msgid "Resent-Date:"
-msgstr ""
+msgstr "שליחה-חוזרת-תאריך:"
 
 #: src/gtk/headers.h:22
 msgid "Resent-From"
-msgstr ""
+msgstr "‎שליחה-חוזרת-מאת"
 
 #: src/gtk/headers.h:22
 msgid "Resent-From:"
-msgstr ""
+msgstr "שליחה-חוזרת-מאת:"
 
 #: src/gtk/headers.h:23
 msgid "Resent-Sender"
-msgstr ""
+msgstr "‎שליחה-חוזרת-ממען"
 
 #: src/gtk/headers.h:23
 msgid "Resent-Sender:"
-msgstr ""
+msgstr "שליחה-חוזרת-ממען:"
 
 #: src/gtk/headers.h:24
 msgid "Resent-To"
-msgstr ""
+msgstr "‎שליחה-חוזרת-אל"
 
 #: src/gtk/headers.h:24
 msgid "Resent-To:"
-msgstr ""
+msgstr "שליחה-חוזרת-אל:"
 
 #: src/gtk/headers.h:25
 msgid "Resent-Cc"
-msgstr ""
+msgstr "‎שליחה-חוזרת-עותק"
 
 #: src/gtk/headers.h:25
 msgid "Resent-Cc:"
-msgstr ""
+msgstr "שליחה-חוזרת-עותק:"
 
 #: src/gtk/headers.h:26
 msgid "Resent-Bcc"
-msgstr ""
+msgstr "‎שליחה-חוזרת-עותק-סמוי"
 
 #: src/gtk/headers.h:26
 msgid "Resent-Bcc:"
-msgstr ""
+msgstr "שליחה-חוזרת-עותק-סמוי:"
 
 #: src/gtk/headers.h:27
 msgid "Resent-Message-ID"
-msgstr ""
+msgstr "‎שליחה-חוזרת-מזהה-הודעה"
 
 #: src/gtk/headers.h:27
 msgid "Resent-Message-ID:"
-msgstr ""
+msgstr "שליחה-חוזרת-מזהה-הודעה:"
 
 # שביל
 #: src/gtk/headers.h:28
@@ -4396,11 +4408,12 @@ msgid "Received:"
 msgstr "התקבלה:"
 
 # קבוצות (של) חדשות
-#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2154 src/quote_fmt.c:59
+#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1261
+#: src/prefs_matcher.c:2160 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "‎קבוצות דיונים‎"
 
+# עוקב-את
 #: src/gtk/headers.h:33
 msgid "Followup-To"
 msgstr "‎המשך-אל‎"
@@ -4570,7 +4583,7 @@ msgstr "‏X-סיווג:"
 
 #: src/gtk/headers.h:56
 msgid "X-Mailer"
-msgstr "‎X-מדוור‎"
+msgstr "‎מדוור-X"
 
 #: src/gtk/headers.h:56
 msgid "X-Mailer:"
@@ -4578,7 +4591,7 @@ msgstr "‏X-מדוור:"
 
 #: src/gtk/headers.h:57
 msgid "X-Status"
-msgstr "‎X-סטטוס‎"
+msgstr "‎סטטוס-X"
 
 #: src/gtk/headers.h:57
 msgid "X-Status:"
@@ -4586,7 +4599,7 @@ msgstr "‏X-סטטוס:"
 
 #: src/gtk/headers.h:58
 msgid "X-Face"
-msgstr "‎X-פנים‎"
+msgstr "‎פנים-X"
 
 #: src/gtk/headers.h:58
 msgid "X-Face:"
@@ -4594,7 +4607,7 @@ msgstr "‏X-פנים:"
 
 #: src/gtk/headers.h:59
 msgid "X-No-Archive"
-msgstr "‎X-אין-ארכיון‎"
+msgstr "‎אין-ארכיון-X"
 
 #: src/gtk/headers.h:59
 msgid "X-No-Archive:"
@@ -4644,13 +4657,14 @@ msgstr "הודעה קודמה"
 msgid "Message has been forwarded and replied to"
 msgstr "הודעה קודמה ונענתה"
 
+# פתיל
 #: src/gtk/icon_legend.c:69
 msgid "Message is in an ignored thread"
-msgstr "הודעה בתוך פתיל מנוכר"
+msgstr "הודעה בתוך שרשור מנוכר"
 
 #: src/gtk/icon_legend.c:70
 msgid "Message is in a watched thread"
-msgstr "הודעה בתוך פתיל מפוקח"
+msgstr "הודעה בתוך שרשור מפוקח"
 
 #: src/gtk/icon_legend.c:71
 msgid "Message is spam"
@@ -4722,40 +4736,40 @@ msgstr ""
 "span>"
 
 # check
-#: src/gtk/inputdialog.c:246 src/gtk/inputdialog.c:268
+#: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "קלט סיסמה עבור %s אצל %s:"
 
-#: src/gtk/inputdialog.c:249 src/gtk/inputdialog.c:252
-#: src/gtk/inputdialog.c:271 src/gtk/inputdialog.c:274
+#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
+#: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
 #, c-format
 msgid "Input password for %s:"
 msgstr "קלט סיסמה עבור %s:"
 
-#: src/gtk/inputdialog.c:255 src/gtk/inputdialog.c:277
+#: src/gtk/inputdialog.c:242 src/gtk/inputdialog.c:264
 msgid "Input password:"
 msgstr "קלט סיסמה:"
 
-#: src/gtk/inputdialog.c:256 src/gtk/inputdialog.c:284
-#: src/gtk/inputdialog.c:296
+#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
+#: src/gtk/inputdialog.c:283
 msgid "Input password"
 msgstr "קלט סיסמה"
 
 # this > current
-#: src/gtk/inputdialog.c:286
+#: src/gtk/inputdialog.c:273
 msgid "Remember password for this session"
 msgstr "זכור סיסמה עבור סשן זה"
 
-#: src/gtk/inputdialog.c:385 src/gtk/inputdialog.c:434
+#: src/gtk/inputdialog.c:372 src/gtk/inputdialog.c:421
 msgid "Remember this"
 msgstr "זכור את בחירתי"
 
-#: src/gtk/logwindow.c:451
+#: src/gtk/logwindow.c:447
 msgid "Clear _Log"
 msgstr "_טהר יומן"
 
-#: src/gtk/menu.c:145
+#: src/gtk/menu.c:137
 msgid ""
 "<span><b>Warning:</b> This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -4763,7 +4777,7 @@ msgid ""
 msgstr ""
 "<span><b>אזהרה:</b> כתובת URL זו היתה ארוכה מדי לתצוגה\n"
 "ונקטעה לשם בטיחות. הודעה זו עשויה להיות\n"
-"מושחתת, פגומה או חלק מן ניסיון מתקפת DoS.</span>"
+"מושחתת, פגומה או חלק מתוך ניסיון מתקפת DoS.</span>"
 
 #: src/gtk/pluginwindow.c:164 src/gtk/pluginwindow.c:169
 msgid ""
@@ -4794,14 +4808,13 @@ msgid ""
 "\n"
 "%s\n"
 msgstr ""
-"השגיאה הבאה ארעה במהלך טעינת %s :\n"
+"השגיאה הבאה אירעה במהלך טעינת %s :\n"
 "\n"
 "%s\n"
 
 #: src/gtk/pluginwindow.c:304 src/plugins/acpi_notifier/acpi_notifier.c:790
 #: src/plugins/archive/archiver_prefs.c:92
-#: src/plugins/att_remover/att_remover.c:519
-#: src/plugins/attachwarner/attachwarner_prefs.c:201
+#: src/plugins/attachwarner/attachwarner_prefs.c:228
 #: src/plugins/address_keeper/address_keeper_prefs.c:248
 #: src/plugins/bogofilter/bogofilter_gtk.c:457
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
@@ -4820,7 +4833,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:557 src/plugins/rssyl/rssyl_prefs.c:63
 #: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:648
-#: src/plugins/vcalendar/vcal_prefs.c:645 src/prefs_toolbar.c:939
+#: src/plugins/vcalendar/vcal_prefs.c:647 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "תוספות"
 
@@ -4836,240 +4849,241 @@ msgstr "פריקה"
 msgid "Description"
 msgstr "תיאור"
 
-#: src/gtk/pluginwindow.c:373
-msgid "More plugins are available from the Claws Mail website."
-msgstr "תוספות נוספות זמינות מן אתר הרשת של Claws Mail."
-
-#: src/gtk/pluginwindow.c:379 src/prefs_themes.c:843
-msgid "Get more..."
-msgstr "השג עוד..."
+#: src/gtk/pluginwindow.c:374
+#, c-format
+msgid ""
+"For more information about plugins see the <a href=\"%s\"><span underline="
+"\"none\">Claws Mail website</span></a>."
+msgstr ""
+"למידע נוסף אודות תוספת זו ראה <a href=\"%s\"><span underline=\"none\">אתר "
+"אינטרנט Claws Mail</span></a>."
 
-#: src/gtk/pluginwindow.c:415
+#: src/gtk/pluginwindow.c:414
 msgid "Click here to load one or more plugins"
 msgstr "לחץ כאן כדי לטעון תוספת אחת או יותר"
 
-#: src/gtk/pluginwindow.c:418
+#: src/gtk/pluginwindow.c:417
 msgid "Unload the selected plugin"
 msgstr "פריקת התוספת הנבחרת"
 
-#: src/gtk/pluginwindow.c:483
+#: src/gtk/pluginwindow.c:482
 msgid "Loaded plugins"
 msgstr "תוספות מוטענות"
 
-#: src/gtk/prefswindow.c:679
+#: src/gtk/prefswindow.c:671
 msgid "Page Index"
 msgstr "מפתח עמוד"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:830
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:828
 msgid "_Hide"
 msgstr "הס_תר"
 
-#: src/gtk/progressdialog.c:141 src/prefs_account.c:3208
-#: src/prefs_account.c:3226 src/prefs_account.c:3244 src/prefs_account.c:3262
-#: src/prefs_account.c:3280 src/prefs_account.c:3298 src/prefs_account.c:3317
-#: src/prefs_account.c:3399 src/prefs_filtering_action.c:1419
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1881
+#: src/gtk/progressdialog.c:141 src/prefs_account.c:3200
+#: src/prefs_account.c:3218 src/prefs_account.c:3236 src/prefs_account.c:3254
+#: src/prefs_account.c:3272 src/prefs_account.c:3290 src/prefs_account.c:3309
+#: src/prefs_account.c:3399 src/prefs_filtering_action.c:1421
+#: src/prefs_filtering.c:397 src/prefs_filtering.c:1877
 msgid "Account"
 msgstr "חשבון"
 
-#: src/gtk/quicksearch.c:433
+#: src/gtk/quicksearch.c:442
 msgid "all messages"
 msgstr "כל ההודעות"
 
-#: src/gtk/quicksearch.c:434
+#: src/gtk/quicksearch.c:443
 msgid "messages whose age is greater than # days"
 msgstr "הודעה שגילה הינו גדול יותר מן # ימים"
 
-#: src/gtk/quicksearch.c:435
+#: src/gtk/quicksearch.c:444
 msgid "messages whose age is less than # days"
 msgstr "הודעה שגילה הינו קטן יותר מן # ימים"
 
-#: src/gtk/quicksearch.c:436
+#: src/gtk/quicksearch.c:445
 msgid "messages whose age is greater than # hours"
 msgstr "הודעה שגילה הינו גדול יותר מן # שעות"
 
-#: src/gtk/quicksearch.c:437
+#: src/gtk/quicksearch.c:446
 msgid "messages whose age is less than # hours"
 msgstr "הודעה שגילה הינו קטן יותר מן # שעות"
 
-#: src/gtk/quicksearch.c:438
+#: src/gtk/quicksearch.c:447
 msgid "messages which contain S in the message body"
 msgstr "הודעות שמכילות S בתוך גוף ההודעה"
 
 # בכל
-#: src/gtk/quicksearch.c:439
+#: src/gtk/quicksearch.c:448
 msgid "messages which contain S in the whole message"
 msgstr "הודעות שמכילות S בתוך כל ההודעה"
 
-#: src/gtk/quicksearch.c:440
+#: src/gtk/quicksearch.c:449
 msgid "messages carbon-copied to S"
 msgstr "הודעות שהועתקו (‪cc:‬) אל S"
 
-#: src/gtk/quicksearch.c:441
+#: src/gtk/quicksearch.c:450
 msgid "message is either to: or cc: to S"
 msgstr "הודעה הינה אחד משניים או ‪to:‬ או ‪cc:‬ אל S"
 
-#: src/gtk/quicksearch.c:442
+#: src/gtk/quicksearch.c:451
 msgid "deleted messages"
 msgstr "הודעות שנמחקו"
 
-#: src/gtk/quicksearch.c:443
+#: src/gtk/quicksearch.c:452
 msgid "messages which contain S in the Sender field"
 msgstr "הודעות שמכילות S בשדה ממען"
 
-#: src/gtk/quicksearch.c:444
+#: src/gtk/quicksearch.c:453
 msgid "true if execute \"S\" succeeds"
 msgstr ""
 
-#: src/gtk/quicksearch.c:445
+#: src/gtk/quicksearch.c:454
 msgid "messages originating from user S"
-msgstr "הודעות שמקורן מן משתמש S"
+msgstr "הודעות שמקורן מאת משתמש S"
 
-#: src/gtk/quicksearch.c:446
+#: src/gtk/quicksearch.c:455
 msgid "forwarded messages"
 msgstr "הודעות שקודמו"
 
 # שמכילות
-#: src/gtk/quicksearch.c:447
+#: src/gtk/quicksearch.c:456
 msgid "messages which have attachments"
 msgstr "הודעות להן מסופחים תצריפים"
 
-#: src/gtk/quicksearch.c:448
+#: src/gtk/quicksearch.c:457
 msgid "messages which contain header S"
 msgstr "הודעות שמכילות תקורת S"
 
-#: src/gtk/quicksearch.c:449
+#: src/gtk/quicksearch.c:458
 msgid "messages which contain S in Message-ID header"
 msgstr "הודעות שמכילות S בתוך תקורת Message-ID"
 
 # ב-מענה-אל
-#: src/gtk/quicksearch.c:450
+#: src/gtk/quicksearch.c:459
 msgid "messages which contain S in In-Reply-To header"
 msgstr "הודעות שמכילות S בתוך תקורת In-Reply-To"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:460
 msgid "messages which are marked with color #"
 msgstr "הודעות שמסומנות עם צבע #"
 
-#: src/gtk/quicksearch.c:452
+#: src/gtk/quicksearch.c:461
 msgid "locked messages"
 msgstr "הודעות נעולות"
 
-#: src/gtk/quicksearch.c:453
+#: src/gtk/quicksearch.c:462
 msgid "messages which are in newsgroup S"
 msgstr "הודעות שמצויות בתוך קבוצת דיונים S"
 
-#: src/gtk/quicksearch.c:454
+#: src/gtk/quicksearch.c:463
 msgid "new messages"
 msgstr "הודעות חדשות"
 
-#: src/gtk/quicksearch.c:455
+#: src/gtk/quicksearch.c:464
 msgid "old messages"
 msgstr "הודעות ישנות"
 
-#: src/gtk/quicksearch.c:456
+#: src/gtk/quicksearch.c:465
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "הודעות לוקות בחסר (לא מוּרדות באופן מוחלט)"
 
-#: src/gtk/quicksearch.c:457
+#: src/gtk/quicksearch.c:466
 msgid "messages which have been replied to"
 msgstr "הודעות שנענו"
 
-#: src/gtk/quicksearch.c:458
+#: src/gtk/quicksearch.c:467
 msgid "read messages"
 msgstr "הודעות שנקראו"
 
-#: src/gtk/quicksearch.c:459
+#: src/gtk/quicksearch.c:468
 msgid "messages which contain S in subject"
 msgstr "הודעות שמכילות S בתוך נושא"
 
-#: src/gtk/quicksearch.c:460
+#: src/gtk/quicksearch.c:469
 msgid "messages whose score is equal to # points"
 msgstr "הודעות שניקודן הינו שקול אל # נקודות"
 
-#: src/gtk/quicksearch.c:461
+#: src/gtk/quicksearch.c:470
 msgid "messages whose score is greater than # points"
 msgstr "הודעות שניקודן הינו גדול יותר מן # נקודות"
 
-#: src/gtk/quicksearch.c:462
+#: src/gtk/quicksearch.c:471
 msgid "messages whose score is lower than # points"
 msgstr "הודעות שניקודן הינו קטן יותר מן # נקודות"
 
-#: src/gtk/quicksearch.c:463
+#: src/gtk/quicksearch.c:472
 msgid "messages whose size is equal to # bytes"
 msgstr "הודעות שגודלן הינו שקול אל # בתים"
 
-#: src/gtk/quicksearch.c:464
+#: src/gtk/quicksearch.c:473
 msgid "messages whose size is greater than # bytes"
 msgstr "הודעות שגודלן הינו גדול יותר מן # בתים"
 
-#: src/gtk/quicksearch.c:465
+#: src/gtk/quicksearch.c:474
 msgid "messages whose size is smaller than # bytes"
 msgstr "הודעות שגודלן הינו קטן יותר מן # בתים"
 
-#: src/gtk/quicksearch.c:466
+#: src/gtk/quicksearch.c:475
 msgid "messages which have been sent to S"
 msgstr "הודעות שנשלחו אל S"
 
-#: src/gtk/quicksearch.c:467
+#: src/gtk/quicksearch.c:476
 msgid "messages which tags contain S"
 msgstr "הודעות שתגיותן מכילות S"
 
-#: src/gtk/quicksearch.c:468
+#: src/gtk/quicksearch.c:477
 msgid "messages which have tag(s)"
-msgstr "הודעות להן יש תג(יות)"
+msgstr "הודעה(ות) לה(ן) יש תגי(ו)ת"
 
-#: src/gtk/quicksearch.c:469
+#: src/gtk/quicksearch.c:478
 msgid "marked messages"
 msgstr "הודעות מסומנות"
 
-#: src/gtk/quicksearch.c:470
+#: src/gtk/quicksearch.c:479
 msgid "unread messages"
 msgstr "הודעות שלא נקראו"
 
-#: src/gtk/quicksearch.c:471
+#: src/gtk/quicksearch.c:480
 msgid "messages which contain S in References header"
 msgstr "הודעות שמכילות S בתוך תקורת References"
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:481
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "הודעות מחזירות 0 כאשר מועברת פקודה - %F הינה הודעת קובץ"
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:482
 msgid "messages which contain S in X-Label header"
 msgstr "הודעות שמכילות S בתוך תקורת X-Label"
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:484
 msgid "logical AND operator"
 msgstr "לוגי וגם אופרטור"
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:485
 msgid "logical OR operator"
 msgstr "לוגי או אופרטור"
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:486
 msgid "logical NOT operator"
 msgstr "לוגי לא אופרטור"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:487
 msgid "case sensitive search"
-msgstr "חיפוש מותאם אותיות גדולות/קטנות"
+msgstr "חיפוש תואם רישיות"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:488
 msgid "match using regular expressions instead of substring search"
 msgstr "התאם באמצעות ביטויים רגולריים במקום חיפוש מחרוזת משנה"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:490
 msgid "all filtering expressions are allowed"
 msgstr "כל ביטוי סינון הינו מותר"
 
-#: src/gtk/quicksearch.c:490 src/summary_search.c:457
+#: src/gtk/quicksearch.c:499 src/summary_search.c:483
 msgid "Extended Search"
 msgstr "חיפוש מורחב"
 
 # בכדי להתאים
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:500
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
@@ -5079,55 +5093,60 @@ msgstr ""
 "יוצגו ברשימת ההודעה.\n"
 "הסמלים הבאים ניתנים לשימוש:"
 
-#: src/gtk/quicksearch.c:591
+#: src/gtk/quicksearch.c:600
 msgid "Something went wrong during search. Please check your logs."
 msgstr "משהו השתבש במהלך חיפוש. אנא בדוק רשומות יומן."
 
-#: src/gtk/quicksearch.c:657
+#: src/gtk/quicksearch.c:666
 msgid "From/To/Subject/Tag"
 msgstr "מאת/אל/נושא/תגית"
 
-#: src/gtk/quicksearch.c:668 src/plugins/archive/archiver_prefs.c:322
+#: src/gtk/quicksearch.c:677 src/plugins/archive/archiver_prefs.c:322
 msgid "Recursive"
 msgstr "רקורסיבי"
 
-#: src/gtk/quicksearch.c:677
+#: src/gtk/quicksearch.c:686
 msgid "Sticky"
 msgstr "דביק"
 
 # טיפוס או הקלדה
-#: src/gtk/quicksearch.c:687
+#: src/gtk/quicksearch.c:696
 msgid "Type-ahead"
 msgstr ""
 
-#: src/gtk/quicksearch.c:699
+#: src/gtk/quicksearch.c:708
 msgid "Run on select"
 msgstr "הרץ על בחירה"
 
-#: src/gtk/quicksearch.c:741
+#: src/gtk/quicksearch.c:750
 msgid "Clear the current search"
 msgstr "טיהור חיפוש נוכחי"
 
-#: src/gtk/quicksearch.c:751 src/summary_search.c:410
+#: src/gtk/quicksearch.c:760 src/summary_search.c:436
 msgid "Edit search criteria"
 msgstr "עריכת קריטריון חיפוש"
 
-#: src/gtk/quicksearch.c:760
+#: src/gtk/quicksearch.c:769
 msgid "Information about extended symbols"
 msgstr "מידע אודות סמלים מורחבים"
 
-#: src/gtk/quicksearch.c:798 src/gtk/quicksearch.c:813
+#: src/gtk/quicksearch.c:807 src/gtk/quicksearch.c:822
 msgid "_Information"
 msgstr "_מידע"
 
-#: src/gtk/quicksearch.c:800 src/gtk/quicksearch.c:815
+#: src/gtk/quicksearch.c:808 src/gtk/quicksearch.c:823
+msgid "E_dit"
+msgstr "ע_רוך"
+
+#: src/gtk/quicksearch.c:809 src/gtk/quicksearch.c:824 src/prefs_actions.c:347
+#: src/prefs_filtering.c:495 src/prefs_template.c:328
 msgid "C_lear"
 msgstr "_טהר"
 
 #: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:348
 #: src/gtk/sslcertwindow.c:398 src/gtk/sslcertwindow.c:462
 msgid "Correct"
-msgstr ""
+msgstr "מדויק"
 
 #: src/gtk/sslcertwindow.c:162
 msgid "Owner"
@@ -5287,7 +5306,7 @@ msgstr "(אין נושא)"
 msgid "Error:"
 msgstr "שגיאה:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2578
+#: src/image_viewer.c:299 src/mimeview.c:2546
 #: src/plugins/pdf_viewer/poppler_viewer.c:700
 msgid "Filename:"
 msgstr "שם קובץ:"
@@ -5330,7 +5349,7 @@ msgstr "שגיאת IMAP אצל %s: שגיאת זרם\n"
 msgid ""
 "IMAP error on %s: parse error (very probably non-RFC compliance from the "
 "server)\n"
-msgstr "שגיאת IMAP אצל %s: שגיאת ניתוח (קרוב לוודאי אי תאימות RFC מן השרת)\n"
+msgstr "שגיאת IMAP אצל %s: שגיאת ניתוח (קרוב לוודאי אי תאימות RFC מתוך השרת)\n"
 
 #: src/imap.c:623
 #, c-format
@@ -5354,7 +5373,7 @@ msgid ""
 "IMAP error on %s: protocol error(very probably non-RFC compliance from the "
 "server)\n"
 msgstr ""
-"שגיאת IMAP אצל %s: שגיאת פרוטוקול (קרוב לוודאי אי תאימות RFC מן השרת)\n"
+"שגיאת IMAP אצל %s: שגיאת פרוטוקול (קרוב לוודאי אי תאימות RFC מתוך השרת)\n"
 
 # התקבל
 #: src/imap.c:636
@@ -5565,18 +5584,18 @@ msgstr "התחברות אל %s נכשלה"
 #: src/imap.c:959 src/imap.c:962
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "חיבור IMAP4 אל %s התנתק. מחדש כעת חיבור...\n"
+msgstr "חיבור IMAP4 אל %s התנתק. כעת מחדש חיבור...\n"
 
-#: src/imap.c:992 src/imap.c:3539 src/imap.c:4199 src/imap.c:4296
-#: src/imap.c:4479 src/imap.c:5276
+#: src/imap.c:992 src/imap.c:3546 src/imap.c:4206 src/imap.c:4303
+#: src/imap.c:4486 src/imap.c:5283
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לגשת אל שרת IMAP."
 
-#: src/imap.c:1086 src/inc.c:816 src/news.c:394 src/send_message.c:308
+#: src/imap.c:1086 src/inc.c:802 src/news.c:388 src/send_message.c:269
 msgid "Insecure connection"
 msgstr "חיבור לא מאובטח"
 
-#: src/imap.c:1087 src/inc.c:817 src/news.c:395 src/send_message.c:309
+#: src/imap.c:1087 src/inc.c:803 src/news.c:389 src/send_message.c:270
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5589,109 +5608,108 @@ msgstr ""
 "\n"
 "האם ברצונך להמשיך להתחבר אל שרת זה? ההתקשרות לא תהיה מאובטחת."
 
-#: src/imap.c:1093 src/inc.c:823 src/news.c:401 src/send_message.c:315
+#: src/imap.c:1093 src/inc.c:809 src/news.c:395 src/send_message.c:276
 msgid "Con_tinue connecting"
 msgstr "ה_משך התחברות"
 
 #: src/imap.c:1103
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
-msgstr "חשבון '%s': מתחבר כעת אל שרת IMAP4: ‏%s:%d..."
+msgstr "חשבון '%s': כעת מתחבר אל שרת IMAP4: ‏%s:%d..."
 
 #: src/imap.c:1151
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
-msgstr "לא ניתן לקשר אל שרת IMAP4: ‫%s:%d"
+msgstr "אין אפשרות לקשר אל שרת IMAP4: ‫%s:%d"
 
 #: src/imap.c:1154
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "לא ניתן לקשר אל שרת IMAP4: ‫%s:%d\n"
+msgstr "אין אפשרות לקשר אל שרת IMAP4: ‫%s:%d\n"
 
-#: src/imap.c:1187 src/imap.c:3961
+#: src/imap.c:1187 src/imap.c:3968
 msgid "Can't start TLS session.\n"
-msgstr "לא ניתן להתחיל סשן TLS.\n"
+msgstr "אין אפשרות להתחיל סשן TLS.\n"
 
-#: src/imap.c:1243
+#: src/imap.c:1250
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
-msgstr "לא היה ניתן להתחבר אל שרת IMAP ‫%s.\n"
+msgstr "לא היתה אפשרות להתחבר אל שרת IMAP ‫%s.\n"
 
-#: src/imap.c:1246
+#: src/imap.c:1253
 #, c-format
 msgid "Couldn't login to IMAP server %s."
-msgstr "לא היה ניתן להתחבר אל שרת IMAP ‫%s."
+msgstr "לא היתה אפשרות להתחבר אל שרת IMAP ‫%s."
 
-#: src/imap.c:1640
+#: src/imap.c:1647
 msgid "Adding messages..."
-msgstr "מוסיף כעת הודעות..."
+msgstr "כעת מוסיף הודעות..."
 
-#: src/imap.c:1842 src/mh.c:520
+#: src/imap.c:1849 src/mh.c:520
 msgid "Copying messages..."
-msgstr "מעתיק כעת הודעות..."
+msgstr "כעת מעתיק הודעות..."
 
-#: src/imap.c:2421
+#: src/imap.c:2428
 msgid "can't set deleted flags\n"
-msgstr "לא ניתן לקבוע דגלים של מחיקה\n"
+msgstr "אין אפשרות לקבוע דגלים של מחיקה\n"
 
-#: src/imap.c:2428 src/imap.c:4906
+#: src/imap.c:2435 src/imap.c:4913
 msgid "can't expunge\n"
-msgstr "לא ניתן להסיר האופן מוחלט\n"
+msgstr "אין אפשרות להסיר באופן מוחלט\n"
 
-#: src/imap.c:2779
+#: src/imap.c:2786
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
-msgstr "מחפש כעת עבור תיקיות לא רשומות אצל %s..."
+msgstr "כעת מחפש עבור תיקיות לא רשומות אצל %s..."
 
-#: src/imap.c:2782
+#: src/imap.c:2789
 #, c-format
 msgid "Looking for subfolders of %s..."
-msgstr "מחפש כעת עבור תיקיות משנה של %s..."
+msgstr "כעת מחפש עבור תיקיות משנה של %s..."
 
-#: src/imap.c:3078
+#: src/imap.c:3085
 msgid "can't create mailbox: LIST failed\n"
-msgstr "לא ניתן ליצור תיבת דואר: LIST נכשל\n"
+msgstr "אין אפשרות ליצור תיבת דואר: LIST נכשל\n"
 
-#: src/imap.c:3093
+#: src/imap.c:3100
 msgid "can't create mailbox\n"
-msgstr "לא ניתן ליצור תיבת דואר\n"
+msgstr "אין אפשרות ליצור תיבת דואר\n"
 
-#: src/imap.c:3184
-#, fuzzy
+#: src/imap.c:3191
 msgid "New folder name must not contain the namespace path separator"
-msgstr "על שם תיקייה חדשה אסור להכיל נתיב namespace מפריד"
+msgstr "שם תיקייה חדשה לא יכול להכיל נתיב namespace מפריד"
 
-#: src/imap.c:3221
+#: src/imap.c:3228
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
-msgstr "לא ניתן לשנות תיבת דואר: %s אל %s\n"
+msgstr "אין אפשרות לשנות תיבת דואר: %s אל %s\n"
 
-#: src/imap.c:3333
+#: src/imap.c:3340
 msgid "can't delete mailbox\n"
-msgstr "לא ניתן למחוק תיבת דואר\n"
+msgstr "אין אפשרות למחוק תיבת דואר\n"
 
-#: src/imap.c:3620
+#: src/imap.c:3627
 msgid "LIST failed\n"
 msgstr "LIST נכשל\n"
 
-#: src/imap.c:3705
+#: src/imap.c:3712
 msgid "Flagging messages..."
-msgstr "מדגל כעת הודעות..."
+msgstr "כעת מדגל הודעות..."
 
-#: src/imap.c:3806
+#: src/imap.c:3813
 #, c-format
 msgid "can't select folder: %s\n"
-msgstr "לא ניתן לבחור תיקייה: %s\n"
+msgstr "אין אפשרות לבחור תיקייה: %s\n"
 
-#: src/imap.c:3958
+#: src/imap.c:3965
 msgid "Server requires TLS to log in.\n"
 msgstr "שרת מצריך TLS כדי להתחבר.\n"
 
-#: src/imap.c:3968
+#: src/imap.c:3975
 msgid "Can't refresh capabilities.\n"
-msgstr "לא ניתן לרענן יכולות.\n"
+msgstr "אין אפשרות לרענן יכולות.\n"
 
-#: src/imap.c:3973
+#: src/imap.c:3980
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5699,20 +5717,20 @@ msgid ""
 msgstr ""
 "חיבור אל %s נכשל: שרת מצריך TLS, אך Claws Mail הודר ללא תמיכת OpenSSL.\n"
 
-#: src/imap.c:3981
+#: src/imap.c:3988
 msgid "Server logins are disabled.\n"
 msgstr "התחברויות שרת הינן מנוטרלות.\n"
 
-#: src/imap.c:4204
+#: src/imap.c:4211
 msgid "Fetching message..."
-msgstr "מושך כעת הודעות..."
+msgstr "כעת מושך הודעות..."
 
-#: src/imap.c:4899
+#: src/imap.c:4906
 #, c-format
 msgid "can't set deleted flags: %d\n"
-msgstr "לא ניתן לקבוע דגלים של מחיקה: %d\n"
+msgstr "אין אפשרות לקבוע דגלים של מחיקה: %d\n"
 
-#: src/imap.c:5932
+#: src/imap.c:5939
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -5727,25 +5745,25 @@ msgstr ""
 
 #: src/imap_gtk.c:63 src/mh_gtk.c:55 src/plugins/mailmbox/plugin_gtk.c:59
 msgid "Create _new folder..."
-msgstr "צור תיקיית _חדשה..."
+msgstr "יצירת תיקיית _חדשה..."
 
 #: src/imap_gtk.c:65 src/mh_gtk.c:56 src/news_gtk.c:61
 #: src/plugins/mailmbox/plugin_gtk.c:60
 msgid "_Rename folder..."
-msgstr "_שנה שם תיקייה..."
+msgstr "_שינוי שם תיקייה..."
 
 #: src/imap_gtk.c:66 src/mh_gtk.c:57 src/plugins/mailmbox/plugin_gtk.c:61
 msgid "M_ove folder..."
-msgstr "ה_עבר תיקייה..."
+msgstr "ה_עברת תיקייה..."
 
 #: src/imap_gtk.c:67 src/mh_gtk.c:58 src/plugins/mailmbox/plugin_gtk.c:62
 msgid "Cop_y folder..."
-msgstr "ה_עתק תיקייה..."
+msgstr "ה_עתקת תיקייה..."
 
 #: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:63
 #: src/plugins/rssyl/rssyl_gtk.c:61
 msgid "_Delete folder..."
-msgstr "_מחק תיקייה..."
+msgstr "_מחיקת תיקייה..."
 
 #: src/imap_gtk.c:71 src/news_gtk.c:59
 msgid "Synchronise"
@@ -5796,24 +5814,24 @@ msgstr ""
 
 #: src/imap_gtk.c:200 src/mh_gtk.c:148
 msgid "Inherit properties from parent folder"
-msgstr "הורש מאפיינים מן תיקיית הורה"
+msgstr "הורש מאפיינים מתוך תיקיית הורה"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:249 src/news_gtk.c:305
-#: src/plugins/mailmbox/plugin_gtk.c:408 src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/vcalendar/vcal_folder.c:2020
+#: src/plugins/mailmbox/plugin_gtk.c:405 src/plugins/rssyl/rssyl_cb_menu.c:333
+#: src/plugins/vcalendar/vcal_folder.c:2018
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "הזן שם חדש עבור '%s':"
 
-#: src/imap_gtk.c:263 src/mh_gtk.c:251 src/plugins/mailmbox/plugin_gtk.c:409
+#: src/imap_gtk.c:263 src/mh_gtk.c:251 src/plugins/mailmbox/plugin_gtk.c:406
 #: src/plugins/rssyl/rssyl_cb_menu.c:334
-#: src/plugins/vcalendar/vcal_folder.c:2021
+#: src/plugins/vcalendar/vcal_folder.c:2019
 msgid "Rename folder"
 msgstr "שנה שם תיקייה"
 
 #: src/imap_gtk.c:292 src/mh_gtk.c:274 src/news_gtk.c:327
-#: src/plugins/mailmbox/plugin_gtk.c:438 src/plugins/rssyl/rssyl_cb_menu.c:354
-#: src/plugins/vcalendar/vcal_folder.c:2041
+#: src/plugins/mailmbox/plugin_gtk.c:433 src/plugins/rssyl/rssyl_cb_menu.c:354
+#: src/plugins/vcalendar/vcal_folder.c:2039
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -5831,14 +5849,14 @@ msgid ""
 msgstr ""
 "כל התיקיות וההודעות תחת '%s' ימחקו לצמיתות. השבה לא תהיה אפשרית.\n"
 "\n"
-"האם באמת שברצונך למחוק?"
+"האם אתה בטוח כי ברצונך למחוק?"
 
 #: src/imap_gtk.c:381 src/mh_gtk.c:220 src/news_gtk.c:280
-#: src/plugins/mailmbox/plugin_gtk.c:343 src/plugins/rssyl/rssyl_cb_menu.c:256
-#: src/plugins/vcalendar/vcal_folder.c:1974
+#: src/plugins/mailmbox/plugin_gtk.c:341 src/plugins/rssyl/rssyl_cb_menu.c:256
+#: src/plugins/vcalendar/vcal_folder.c:1972
 #, c-format
 msgid "Can't remove the folder '%s'."
-msgstr "לא ניתן להסיר את התיקייה '%s'."
+msgstr "אין אפשרות להסיר את התיקייה '%s'."
 
 # תחת
 #: src/imap_gtk.c:507
@@ -5856,7 +5874,7 @@ msgstr "הרשמות"
 
 #: src/imap_gtk.c:516
 msgid "+_Search"
-msgstr "+_חיפוש"
+msgstr "+_חפש"
 
 #: src/imap_gtk.c:526
 #, c-format
@@ -5880,7 +5898,7 @@ msgid ""
 msgstr ""
 "תיקייה זו כבר רשומה ואין בה תיקיות משנה לא רשומות.\n"
 "\n"
-"במידה וקיימות תיקיות חדשות, שנוצרו ונרשמו אל מן לקוח אחר, ניתן לעשות שימוש "
+"במידה וקיימות תיקיות חדשות, שנוצרו ונרשמו אל מתוך לקוח אחר, ניתן לעשות שימוש "
 "בפעולה \"בדוק עבור תיקיות חדשות\" בתיקיית השורש של תיבת דואר."
 
 #: src/imap_gtk.c:566
@@ -5903,11 +5921,11 @@ msgstr "החל על תיקיות משנה"
 
 #: src/imap_gtk.c:575
 msgid "+_Subscribe"
-msgstr "+_הרשמה"
+msgstr "+_הירשם"
 
 #: src/imap_gtk.c:575
 msgid "+_Unsubscribe"
-msgstr "+_ביטול הרשמה"
+msgstr "+_בטל הרשמה"
 
 #: src/import.c:113 src/import.c:207
 msgid "Import mbox file"
@@ -5935,7 +5953,7 @@ msgstr ""
 
 #: src/import.c:229
 msgid "Can't find the destination folder."
-msgstr "לא ניתן למצוא את תיקיית היעד."
+msgstr "אין אפשרות למצוא את תיקיית היעד."
 
 #: src/import.c:254
 msgid "Select importing file"
@@ -5959,7 +5977,7 @@ msgstr "אנא בחר קובץ."
 
 #: src/importldif.c:456 src/importmutt.c:128 src/importpine.c:127
 msgid "Address book name must be supplied."
-msgstr "חובה לספק שם ספר כתובות."
+msgstr "יש לספק שם ספר כתובות."
 
 #: src/importldif.c:496
 msgid "LDIF file imported successfully."
@@ -5973,7 +5991,7 @@ msgstr "בחירת קובץ LDIF"
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
-msgstr "ציין את השם עבור ספר כתובות שייווצר מן קובץ הנתונים של LDIF."
+msgstr "ציין את השם עבור ספר כתובות שייווצר מתוך קובץ הנתונים של LDIF."
 
 #: src/importldif.c:672
 msgid "File Name"
@@ -6090,182 +6108,182 @@ msgstr "בחירת קובץ Pine"
 msgid "Import Pine file into Address Book"
 msgstr "ייבוא קובץ Pine אל תוך ספר כתובות"
 
-#: src/inc.c:205 src/inc.c:312 src/inc.c:339
+#: src/inc.c:186 src/inc.c:293 src/inc.c:320
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "‏Claws Mail זקוק לגישת רשת תקשורת על מנת להשיג דואר."
 
-#: src/inc.c:361
+#: src/inc.c:342
 #, c-format
 msgid "%s failed\n"
 msgstr "‏%s נכשלה\n"
 
-#: src/inc.c:432
+#: src/inc.c:413
 msgid "Retrieving new messages"
 msgstr "מאחזר כעת הודעות חדשות"
 
-#: src/inc.c:493
+#: src/inc.c:474
 #, fuzzy
 msgid "Standby"
 msgstr "כוננות"
 
-#: src/inc.c:618 src/inc.c:672
+#: src/inc.c:604 src/inc.c:658
 msgid "Cancelled"
 msgstr "בוטלה"
 
-#: src/inc.c:629
+#: src/inc.c:615
 msgid "Retrieving"
 msgstr "אחזור"
 
-#: src/inc.c:638
+#: src/inc.c:624
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "סיים (הודעה %d ‫(%s) התקבלה)"
 msgstr[1] "סיים (%d הודעות (%s) התקבלו)"
 
-#: src/inc.c:644
+#: src/inc.c:630
 msgid "Done (no new messages)"
 msgstr "סוים (אין הודעות חדשות)"
 
-#: src/inc.c:649
+#: src/inc.c:635
 msgid "Connection failed"
 msgstr "חיבור נכשל"
 
-#: src/inc.c:652
+#: src/inc.c:638
 msgid "Auth failed"
 msgstr "אימות נכשל"
 
-#: src/inc.c:659 src/prefs_matcher.c:393 src/prefs_summary_column.c:88
-#: src/summaryview.c:2782 src/summaryview.c:6312
+#: src/inc.c:645 src/prefs_matcher.c:393 src/prefs_summary_column.c:88
+#: src/summaryview.c:2782 src/summaryview.c:6308
 msgid "Locked"
 msgstr "נעולה"
 
-#: src/inc.c:669 src/plugins/spamassassin/spamassassin_gtk.c:378
+#: src/inc.c:655 src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Timeout"
 msgstr "פקיעת זמן"
 
-#: src/inc.c:756
+#: src/inc.c:742
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "הוגמר (הודעה חדשה %d)"
 msgstr[1] "הוגמר (%d הודעות חדשות)"
 
-#: src/inc.c:760
+#: src/inc.c:746
 msgid "Finished (no new messages)"
 msgstr "הוגמר (אין הודעות חדשות)"
 
-#: src/inc.c:799
+#: src/inc.c:785
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "‫%s: מאחזר כעת הודעות חדשות"
 
-#: src/inc.c:832
+#: src/inc.c:818
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
-msgstr "חשבון '%s': מתחבר כעת אל שרת POP3: ‫%s:%d..."
+msgstr "חשבון '%s': כעת מתחבר אל שרת POP3: ‫%s:%d..."
 
-#: src/inc.c:850
+#: src/inc.c:836
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
-msgstr "לא ניתן להתחבר אל שרת POP3: ‫%s:%d"
+msgstr "אין אפשרות להתחבר אל שרת POP3: ‫%s:%d"
 
-#: src/inc.c:854
+#: src/inc.c:840
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
-msgstr "לא ניתן להתחבר אל שרת POP3: ‫%s:%d\n"
+msgstr "אין אפשרות להתחבר אל שרת POP3: ‫%s:%d\n"
 
-#: src/inc.c:934 src/send_message.c:478
+#: src/inc.c:920 src/send_message.c:486
 msgid "Authenticating..."
-msgstr "מאמת כעת..."
+msgstr "כעת מאמת..."
 
-#: src/inc.c:936
+#: src/inc.c:922
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
-msgstr "מאחזר כעת הודעות מן %s ‏(%s)..."
+msgstr "כעת מאחזר הודעות מתוך %s ‏(%s)..."
 
-#: src/inc.c:942
+#: src/inc.c:928
 msgid "Getting the number of new messages (STAT)..."
-msgstr "משיג כעת את המספר של הודעות חדשות (STAT)..."
+msgstr "כעת משיג את המספר של הודעות חדשות (STAT)..."
 
-#: src/inc.c:946
+#: src/inc.c:932
 msgid "Getting the number of new messages (LAST)..."
-msgstr "משיג כעת את המספר של הודעות חדשות (LAST)..."
+msgstr "כעת משיג את המספר של הודעות חדשות (LAST)..."
 
-#: src/inc.c:950
+#: src/inc.c:936
 msgid "Getting the number of new messages (UIDL)..."
-msgstr "משיג כעת את המספר של הודעות חדשות (UIDL)..."
+msgstr "כעת משיג את המספר של הודעות חדשות (UIDL)..."
 
-#: src/inc.c:954
+#: src/inc.c:940
 msgid "Getting the size of messages (LIST)..."
-msgstr "משיג כעת את הגודל הודעות (LIST)..."
+msgstr "כעת משיג את הגודל הודעות (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:496
+#: src/inc.c:947 src/send_message.c:504
 msgid "Quitting"
-msgstr "יוצא כעת"
+msgstr "כעת יוצא"
 
-#: src/inc.c:986
+#: src/inc.c:972
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
-msgstr "מאחזר כעת הודעה (%d / %d) ‫(%s / %s)"
+msgstr "כעת מאחזר הודעה (%d / %d) ‫(%s / %s)"
 
-#: src/inc.c:999
+#: src/inc.c:985
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
-msgstr[0] "מאחזר כעת (הודעה %d ‫(%s) התקבלה)"
-msgstr[1] "מאחזר כעת (%d הודעות (%s) התקבלו)"
+msgstr[0] "כעת מאחזר (הודעה %d ‫(%s) התקבלה)"
+msgstr[1] "כעת מאחזר (%d הודעות (%s) התקבלו)"
 
-#: src/inc.c:1158
+#: src/inc.c:1144
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "חיבור אל %s:%d נכשל."
 
-#: src/inc.c:1163
+#: src/inc.c:1149
 msgid "Error occurred while processing mail."
-msgstr "ארעה שגיאה במהלך עיבוד דואר."
+msgstr "אירעה שגיאה במהלך עיבוד דואר."
 
-#: src/inc.c:1169
+#: src/inc.c:1155
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr ""
-"ארעה שגיאה במהלך עיבוד דואר:\n"
+"אירעה שגיאה במהלך עיבוד דואר:\n"
 "%s"
 
 # נותר
-#: src/inc.c:1175
+#: src/inc.c:1161
 msgid "No disk space left."
 msgstr "לא נשאר שטח כונן."
 
-#: src/inc.c:1180
+#: src/inc.c:1166
 msgid "Can't write file."
-msgstr "לא ניתן לכתוב קובץ."
+msgstr "אין אפשרות לכתוב קובץ."
 
-#: src/inc.c:1185
+#: src/inc.c:1171
 msgid "Socket error."
 msgstr "שגיאת Socket."
 
-#: src/inc.c:1188
+#: src/inc.c:1174
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "שגיאת Socket בעת התחברות אל %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:406 src/send_message.c:670
+#: src/inc.c:1179 src/send_message.c:414 src/send_message.c:678
 msgid "Connection closed by the remote host."
 msgstr "חיבור נסגר על ידי מארח מרוחק."
 
-#: src/inc.c:1196
+#: src/inc.c:1182
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "חיבור אל %s:%d נסגר על ידי מארח מרוחק."
 
-#: src/inc.c:1201
+#: src/inc.c:1187
 msgid "Mailbox is locked."
 msgstr "תיבת דואר הינה נעולה."
 
-#: src/inc.c:1205
+#: src/inc.c:1191
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6274,11 +6292,11 @@ msgstr ""
 "תיבת דואר הינה נעולה:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:655
+#: src/inc.c:1197 src/send_message.c:663
 msgid "Authentication failed."
 msgstr "אימות נכשל."
 
-#: src/inc.c:1217 src/send_message.c:658
+#: src/inc.c:1203 src/send_message.c:666
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6288,7 +6306,7 @@ msgstr ""
 "%s"
 
 # הינך עשוי להשיב
-#: src/inc.c:1222 src/send_message.c:674
+#: src/inc.c:1208 src/send_message.c:682
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6296,37 +6314,26 @@ msgstr ""
 "זמן סשן פקע. ניתן אולי להשיב על ידי הגברת ערך תפוגת זמן בתוך העדפות/אחרות/"
 "שונות."
 
-#: src/inc.c:1227
+#: src/inc.c:1213
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "זמן התחברות אל %s:%d פקע."
 
-#: src/inc.c:1265
+#: src/inc.c:1251
 msgid "Incorporation cancelled\n"
 msgstr "איחוד בוטל\n"
 
-#: src/inc.c:1457
-#, c-format
-msgid "Claws Mail: %d new message"
-msgid_plural "Claws Mail: %d new messages"
-msgstr[0] "‫Claws Mail: הודעה חדשה %d"
-msgstr[1] "‫Claws Mail: ‏%d הודעות חדשות"
-
-#: src/inc.c:1584
-msgid "Unable to connect: you are offline."
-msgstr "לא ניתן להתחבר: אתה לא מקוון."
-
-#: src/inc.c:1610
+#: src/inc.c:1518
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sאתה עובד במצב מקוון. לעקוף למשך %d דקות?"
 
-#: src/inc.c:1616
+#: src/inc.c:1524
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sאתה עובד במצב מקוון. לעקוף?"
 
-#: src/inc.c:1623
+#: src/inc.c:1531
 msgid "On_ly once"
 msgstr "_רק פעם אחת"
 
@@ -6334,21 +6341,17 @@ msgstr "_רק פעם אחת"
 msgid "Nick Name"
 msgstr "שם כינוי"
 
-#: src/main.c:272
+#: src/main.c:241
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
 "Can't create folder."
 msgstr ""
 "קובץ '%s' כבר קיים.\n"
-"לא ניתן ליצור תיקייה."
-
-#: src/main.c:294 src/main.c:307
-msgid "Exiting..."
-msgstr "יוצא כעת..."
+"אין אפשרות ליצור תיקייה."
 
 # להגר
-#: src/main.c:438
+#: src/main.c:362
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6357,7 +6360,7 @@ msgstr ""
 "תצורה עבור %s נמצאה.\n"
 "האם ברצונך למזג את תצורה זו?"
 
-#: src/main.c:440
+#: src/main.c:364
 #, c-format
 msgid ""
 "\n"
@@ -6370,11 +6373,11 @@ msgstr ""
 "ניתן להמיר חוקי סינון של Sylpheed עם\n"
 "תסריט שזמין אצל %s."
 
-#: src/main.c:452
+#: src/main.c:376
 msgid "Keep old configuration"
 msgstr "שמור תצורה ישנה"
 
-#: src/main.c:455
+#: src/main.c:379
 msgid ""
 "Keeping a backup will allow you to go back to an older version, but may take "
 "a while if you have cached IMAP or News data, and will take some extra room "
@@ -6383,47 +6386,47 @@ msgstr ""
 "שמירת גיבוי תתיר לך לחזור אל גרסא ישנה יותר, אך זו עשויה לקחת פרק זמן מסוים "
 "אם יש לך IMAP מוטמן או נתונים של News, וייקח מקום נוסף מסוים בכונן שלך."
 
-#: src/main.c:463
+#: src/main.c:387
 msgid "Migration of configuration"
 msgstr "מיזוג של תצורה"
 
-#: src/main.c:474
+#: src/main.c:398
 msgid "Copying configuration... This may take a while..."
-msgstr "מעתיק כעת תצורה... פעולה זו עשויה לקחת זמן מה..."
+msgstr "כעת מעתיק תצורה... פעולה זו עשויה לקחת זמן מה..."
 
-#: src/main.c:483
+#: src/main.c:407
 msgid "Migration failed!"
 msgstr "מיזוג נכשל!"
 
-#: src/main.c:492
+#: src/main.c:416
 msgid "Migrating configuration..."
-msgstr "מהגר כעת תצורה..."
+msgstr "כעת מהגר תצורה..."
 
-#: src/main.c:1039
+#: src/main.c:934
 msgid "Failed to register folder item update hook"
 msgstr ""
 
-#: src/main.c:1046
+#: src/main.c:941
 msgid "Failed to register folder update hook"
 msgstr ""
 
-#: src/main.c:1226
+#: src/main.c:1110
 msgid "g_thread is not supported by glib.\n"
 msgstr "‏g_thread אינו נתמך על ידי glib.\n"
 
-#: src/main.c:1245
+#: src/main.c:1129
 msgid "Sylpheed-Claws 2.6.0 (or older)"
 msgstr ""
 
-#: src/main.c:1248
+#: src/main.c:1132
 msgid "Sylpheed-Claws 1.9.15 (or older)"
 msgstr ""
 
-#: src/main.c:1251
+#: src/main.c:1135
 msgid "Sylpheed-Claws 1.0.5 (or older)"
 msgstr ""
 
-#: src/main.c:1574
+#: src/main.c:1434
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6440,62 +6443,57 @@ msgstr[1] ""
 "התוספות הבאות כשלו מלהיטען. בדוק את תצורת התוספות למידע נוסף:\n"
 "%s"
 
-#: src/main.c:1602
+#: src/main.c:1462
 msgid ""
 "Claws Mail has detected a configured mailbox, but it is incomplete. It is "
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
 "mailbox parent folder's context menu to try to fix it."
 msgstr ""
-"‏Claws Mail איתר תיבת דואר מוגדרת, אך זו לוקה בחסר. ייתכן שזה עקב חשבון IMAP "
-"נכשל. השתמש באפשרות \"בנה מחדש עץ תיקייה\" בתפריט ההקשר של תיקיית ההורה "
+"‏Claws Mail איתר תיבת דואר מוגדרת, אך זו לוקה בחסר. ייתכן כי זה עקב חשבון "
+"IMAP נכשל. השתמש באפשרות \"בנה מחדש עץ תיקייה\" בתפריט ההקשר של תיקיית ההורה "
 "בתיבת הדואר כדי לתקנה."
 
-#: src/main.c:1608
+#: src/main.c:1468
 msgid ""
 "Claws Mail has detected a configured mailbox, but could not load it. It is "
 "probably provided by an out-of-date external plugin. Please reinstall the "
 "plugin and try again."
 msgstr ""
-"‏Claws Mail איתר תיבת דואר מוגדרת, אך לא יכל לטעונה. ייתכן שזו מסופקת על ידי "
-"תוספת חיצונית מיושנת. אנא התקן מחדש את התוספת ונסה שוב."
-
-#: src/main.c:1637
-#, c-format
-msgid "Claws Mail can not start without its data volume (%s)."
-msgstr "‏Claws Mail לא יכול להתחיל ללא כרך הנתונים שלו (%s)."
+"‏Claws Mail איתר תיבת דואר מוגדרת, אך לא יכל לטעונה. ייתכן כי זו מסופקת על "
+"ידי תוספת חיצונית מיושנת. אנא התקן מחדש את התוספת ונסה שוב."
 
-#: src/main.c:1884
+#: src/main.c:1711
 msgid "Missing filename\n"
 msgstr "שם קובץ חסר\n"
 
 # filename or file?
-#: src/main.c:1891
+#: src/main.c:1718
 msgid "Cannot open filename for reading\n"
-msgstr "לא ניתן לפתוח שם קובץ לקריאה\n"
+msgstr "אין אפשרות לפתוח שם קובץ לקריאה\n"
 
-#: src/main.c:1902
+#: src/main.c:1729
 msgid "Malformed header\n"
 msgstr "תקורה פגומה\n"
 
-#: src/main.c:1909
+#: src/main.c:1736
 msgid "Duplicated 'To:' header\n"
 msgstr "תקורת 'To:' כפולה\n"
 
-#: src/main.c:1924
+#: src/main.c:1751
 msgid "Missing required 'To:' header\n"
 msgstr "תקורת 'To:' נדרשת חסרה\n"
 
-#: src/main.c:2071
+#: src/main.c:1898
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "cli"
 
-#: src/main.c:2073
+#: src/main.c:1900
 #, fuzzy
 msgid "  --compose [address]    open composition window"
 msgstr "cli"
 
-#: src/main.c:2074
+#: src/main.c:1901
 #, fuzzy
 msgid ""
 "  --compose-from-file file\n"
@@ -6507,12 +6505,12 @@ msgid ""
 "                         empty line, then mail body until end of file."
 msgstr "cli"
 
-#: src/main.c:2079
+#: src/main.c:1906
 #, fuzzy
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "cli"
 
-#: src/main.c:2080
+#: src/main.c:1907
 #, fuzzy
 msgid ""
 "  --attach file1 [file2]...\n"
@@ -6520,27 +6518,27 @@ msgid ""
 "                         attached"
 msgstr "cli"
 
-#: src/main.c:2083
+#: src/main.c:1910
 #, fuzzy
 msgid "  --receive              receive new messages"
 msgstr "cli"
 
-#: src/main.c:2084
+#: src/main.c:1911
 #, fuzzy
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "cli"
 
-#: src/main.c:2085
+#: src/main.c:1912
 #, fuzzy
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "cli"
 
-#: src/main.c:2086
+#: src/main.c:1913
 #, fuzzy
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "cli"
 
-#: src/main.c:2087
+#: src/main.c:1914
 #, fuzzy
 msgid ""
 "  --search folder type request [recursive]\n"
@@ -6552,128 +6550,128 @@ msgid ""
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr "cli"
 
-#: src/main.c:2094
+#: src/main.c:1921
 #, fuzzy
 msgid "  --send                 send all queued messages"
 msgstr "cli"
 
-#: src/main.c:2095
+#: src/main.c:1922
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "cli"
 
-#: src/main.c:2096
+#: src/main.c:1923
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "cli"
 
-#: src/main.c:2098
+#: src/main.c:1925
 #, fuzzy
 msgid "  --statistics           show session statistics"
 msgstr "cli"
 
-#: src/main.c:2099
+#: src/main.c:1926
 #, fuzzy
 msgid "  --reset-statistics     reset session statistics"
 msgstr "cli"
 
-#: src/main.c:2100
+#: src/main.c:1927
 #, fuzzy
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
 msgstr "cli"
 
-#: src/main.c:2102
+#: src/main.c:1929
 #, fuzzy
 msgid "  --online               switch to online mode"
 msgstr "cli"
 
-#: src/main.c:2103
+#: src/main.c:1930
 #, fuzzy
 msgid "  --offline              switch to offline mode"
 msgstr "cli"
 
-#: src/main.c:2104
+#: src/main.c:1931
 #, fuzzy
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "cli"
 
-#: src/main.c:2105
+#: src/main.c:1932
 #, fuzzy
 msgid "  --debug                debug mode"
 msgstr "cli"
 
-#: src/main.c:2106
+#: src/main.c:1933
 #, fuzzy
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "cli"
 
-#: src/main.c:2107
+#: src/main.c:1934
 #, fuzzy
 msgid "  --help -h              display this help and exit"
 msgstr "cli"
 
-#: src/main.c:2108
+#: src/main.c:1935
 #, fuzzy
 msgid "  --version -v           output version information and exit"
 msgstr "cli"
 
-#: src/main.c:2109
+#: src/main.c:1936
 #, fuzzy
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
 msgstr "cli"
 
-#: src/main.c:2110
+#: src/main.c:1937
 #, fuzzy
 msgid "  --config-dir           output configuration directory"
 msgstr "cli"
 
-#: src/main.c:2111
+#: src/main.c:1938
 #, fuzzy
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
 msgstr "cli"
 
-#: src/main.c:2161
+#: src/main.c:1988
 msgid "Unknown option\n"
 msgstr "אפשרות לא מוכרת\n"
 
-#: src/main.c:2179
+#: src/main.c:2006
 #, c-format
 msgid "Processing (%s)..."
-msgstr "מעבד כעת (%s)..."
+msgstr "כעת מעבד (%s)..."
 
-#: src/main.c:2182
+#: src/main.c:2009
 msgid "top level folder"
-msgstr ""
+msgstr "תיקייה עילית"
 
-#: src/main.c:2265
+#: src/main.c:2092
 msgid "Queued messages"
 msgstr "הודעות בהמתנה"
 
-#: src/main.c:2266
+#: src/main.c:2093
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "הודעות מסוימות שלא נשלחו מצויות בהמתנה בתור. לצאת עכשיו?"
 
-#: src/main.c:2999
+#: src/main.c:2818
 msgid "NetworkManager: network is online.\n"
 msgstr "‏NetworkManager: רשת תקשורת הינה מקוונות.\n"
 
-#: src/main.c:3005
+#: src/main.c:2824
 msgid "NetworkManager: network is offline.\n"
 msgstr "‏NetworkManager: רשת תקשורת אינה מקוונות.\n"
 
-#: src/mainwindow.c:503 src/messageview.c:210
+#: src/mainwindow.c:503 src/messageview.c:208
 msgid "_File"
 msgstr "_קובץ"
 
-#: src/mainwindow.c:505 src/messageview.c:212 src/summaryview.c:436
+#: src/mainwindow.c:505 src/messageview.c:210 src/summaryview.c:436
 msgid "_View"
 msgstr "_תצוגה"
 
@@ -6691,7 +6689,7 @@ msgstr "‏MH..."
 
 #: src/mainwindow.c:516
 msgid "Change mailbox order..."
-msgstr "שנה סדר תיבת דואר..."
+msgstr "שינוי סדר תיבת דואר..."
 
 #: src/mainwindow.c:519
 msgid "_Import mbox file..."
@@ -6703,25 +6701,25 @@ msgstr "ייצו_א אל קובץ mbox..."
 
 #: src/mainwindow.c:521
 msgid "_Export selected to mbox file..."
-msgstr "ייצוא ה_נבחרת(ות) אל קובץ mbox..."
+msgstr "ייצוא ה_נבחר(ו)ת אל קובץ mbox..."
 
 #: src/mainwindow.c:523
 msgid "Empty all _Trash folders"
 msgstr "רוקן כל תיקיות _אשפה"
 
-#: src/mainwindow.c:526 src/messageview.c:219
+#: src/mainwindow.c:526 src/messageview.c:217
 msgid "_Save email as..."
-msgstr "_שמור דוא״ל בשם..."
+msgstr "_שמירת דוא״ל בשם..."
 
-#: src/mainwindow.c:527 src/messageview.c:220
+#: src/mainwindow.c:527 src/messageview.c:218
 msgid "_Save part as..."
-msgstr "_שמור אזור בשם..."
+msgstr "_שמירת אזור בשם..."
 
-#: src/mainwindow.c:530 src/messageview.c:221
+#: src/mainwindow.c:530 src/messageview.c:219
 msgid "Page setup..."
 msgstr "מבנה עמוד..."
 
-#: src/mainwindow.c:531 src/messageview.c:222
+#: src/mainwindow.c:531 src/messageview.c:220
 msgid "_Print..."
 msgstr "_הדפסה..."
 
@@ -6735,11 +6733,11 @@ msgstr "י_ציאה"
 
 #: src/mainwindow.c:540
 msgid "Select _thread"
-msgstr "בחר _פתיל"
+msgstr "בחר _שרשור"
 
 #: src/mainwindow.c:541
 msgid "_Delete thread"
-msgstr "_מחק פתיל"
+msgstr "_מחק שרשור"
 
 #: src/mainwindow.c:543
 msgid "_Find in current message..."
@@ -6763,11 +6761,11 @@ msgstr "הגדר _טורים מוצגים"
 
 #: src/mainwindow.c:552
 msgid "In _folder list..."
-msgstr "ברשימת _תיקייה..."
+msgstr "בתוך רשימת _תיקייה..."
 
 #: src/mainwindow.c:553
 msgid "In _message list..."
-msgstr "ברשימת _הודעה..."
+msgstr "בתוך רשימת _הודעה..."
 
 #: src/mainwindow.c:558
 msgid "La_yout"
@@ -6783,105 +6781,105 @@ msgstr "מ_שוך לפי נושא"
 
 #: src/mainwindow.c:565
 msgid "E_xpand all threads"
-msgstr "ה_רחב את כל הפתילים"
+msgstr "ה_רחב את כל השרשורים"
 
 #: src/mainwindow.c:566
 msgid "Co_llapse all threads"
-msgstr "_צמצם את כל הפתילים"
+msgstr "_צמצם את כל השרשורים"
 
-#: src/mainwindow.c:568 src/messageview.c:233
+#: src/mainwindow.c:568 src/messageview.c:231
 msgid "_Go to"
 msgstr "מ_עבר אל"
 
-#: src/mainwindow.c:569 src/messageview.c:234
+#: src/mainwindow.c:569 src/messageview.c:232
 msgid "_Previous message"
 msgstr "הודעה _קודמת"
 
-#: src/mainwindow.c:570 src/messageview.c:235
+#: src/mainwindow.c:570 src/messageview.c:233
 msgid "_Next message"
 msgstr "הודעה _באה"
 
-#: src/mainwindow.c:572 src/messageview.c:237
+#: src/mainwindow.c:572 src/messageview.c:235
 msgid "P_revious unread message"
 msgstr "הודעה קו_דמת שלא נקראה"
 
-#: src/mainwindow.c:573 src/messageview.c:238
+#: src/mainwindow.c:573 src/messageview.c:236
 msgid "N_ext unread message"
 msgstr "הודעה ב_אה שלא נקראה"
 
-#: src/mainwindow.c:575 src/messageview.c:240
+#: src/mainwindow.c:575 src/messageview.c:238
 msgid "Previous ne_w message"
 msgstr "הודעה _חדשה קודמת"
 
-#: src/mainwindow.c:576 src/messageview.c:241
+#: src/mainwindow.c:576 src/messageview.c:239
 msgid "Ne_xt new message"
 msgstr "הודעה ח_דשה באה"
 
-#: src/mainwindow.c:578 src/messageview.c:243
+#: src/mainwindow.c:578 src/messageview.c:241
 msgid "Previous _marked message"
 msgstr "הודעה _מסומנת קודמת"
 
-#: src/mainwindow.c:579 src/messageview.c:244
+#: src/mainwindow.c:579 src/messageview.c:242
 msgid "Next m_arked message"
 msgstr "הודעה מ_סומנת באה"
 
-#: src/mainwindow.c:581 src/messageview.c:246
+#: src/mainwindow.c:581 src/messageview.c:244
 msgid "Previous _labeled message"
 msgstr "הודעה מסוו_גת קודמת"
 
-#: src/mainwindow.c:582 src/messageview.c:247
+#: src/mainwindow.c:582 src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "הודעה מסווג_ת באה"
 
-#: src/mainwindow.c:584 src/messageview.c:249
+#: src/mainwindow.c:584 src/messageview.c:247
 msgid "Previous opened message"
 msgstr "הודעה פתוחה קודמת"
 
-#: src/mainwindow.c:585 src/messageview.c:250
+#: src/mainwindow.c:585 src/messageview.c:248
 msgid "Next opened message"
 msgstr "הודעה פתוחה באה"
 
-#: src/mainwindow.c:587 src/messageview.c:252
+#: src/mainwindow.c:587 src/messageview.c:250
 msgid "Parent message"
 msgstr "הודעת הורה"
 
-#: src/mainwindow.c:589 src/messageview.c:254
+#: src/mainwindow.c:589 src/messageview.c:252
 msgid "Next unread _folder"
 msgstr "_תיקייה באה שלא נקראה"
 
-#: src/mainwindow.c:590 src/messageview.c:255
+#: src/mainwindow.c:590 src/messageview.c:253
 msgid "_Other folder..."
 msgstr "תיקייה _אחרת..."
 
-#: src/mainwindow.c:592 src/messageview.c:257 src/mimeview.c:210
+#: src/mainwindow.c:592 src/messageview.c:255 src/mimeview.c:201
 msgid "Next part"
 msgstr "חלק הבא"
 
-#: src/mainwindow.c:593 src/messageview.c:258 src/mimeview.c:211
+#: src/mainwindow.c:593 src/messageview.c:256 src/mimeview.c:202
 msgid "Previous part"
 msgstr "חלק קודם"
 
-#: src/mainwindow.c:596 src/messageview.c:259
+#: src/mainwindow.c:596 src/messageview.c:257
 msgid "Message scroll"
 msgstr "גלילת הודעה"
 
-#: src/mainwindow.c:597 src/messageview.c:260
+#: src/mainwindow.c:597 src/messageview.c:258
 msgid "Previous line"
 msgstr "שורה קודמת"
 
-#: src/mainwindow.c:598 src/messageview.c:261
+#: src/mainwindow.c:598 src/messageview.c:259
 msgid "Next line"
 msgstr "שורה באה"
 
-#: src/mainwindow.c:599 src/messageview.c:262 src/printing.c:487
+#: src/mainwindow.c:599 src/messageview.c:260 src/printing.c:487
 msgid "Previous page"
 msgstr "עמוד קודם"
 
-#: src/mainwindow.c:600 src/messageview.c:263 src/printing.c:494
+#: src/mainwindow.c:600 src/messageview.c:261 src/printing.c:494
 msgid "Next page"
 msgstr "עמוד בא"
 
-#: src/mainwindow.c:618 src/messageview.c:281
+#: src/mainwindow.c:618 src/messageview.c:279
 msgid "Decode"
 msgstr "פענוח קוד"
 
@@ -6889,27 +6887,27 @@ msgstr "פענוח קוד"
 msgid "Open in new _window"
 msgstr "פתח בחלון _חדש"
 
-#: src/mainwindow.c:626 src/messageview.c:288
+#: src/mainwindow.c:626 src/messageview.c:286
 msgid "Mess_age source"
 msgstr "מ_קור הודעה"
 
-#: src/mainwindow.c:628 src/messageview.c:289
+#: src/mainwindow.c:628 src/messageview.c:287
 msgid "Message part"
 msgstr "אזור הודעה"
 
-#: src/mainwindow.c:629 src/messageview.c:290
+#: src/mainwindow.c:629 src/messageview.c:288
 msgid "View as text"
 msgstr "הצגה כתמליל"
 
-#: src/mainwindow.c:630 src/messageview.c:291 src/toolbar.c:401
+#: src/mainwindow.c:630 src/messageview.c:289 src/toolbar.c:402
 msgid "Open"
 msgstr "פתח"
 
-#: src/mainwindow.c:632 src/messageview.c:293
+#: src/mainwindow.c:632 src/messageview.c:291
 msgid "Open with..."
-msgstr "פתח באמצעות..."
+msgstr "פתיחה באמצעות..."
 
-#: src/mainwindow.c:636 src/messageview.c:296
+#: src/mainwindow.c:636 src/messageview.c:294
 msgid "Quotes"
 msgstr "ציטטות"
 
@@ -6924,11 +6922,11 @@ msgstr "ק_בלה"
 
 #: src/mainwindow.c:642
 msgid "Get from _current account"
-msgstr "השג מן חשבון _נוכחי"
+msgstr "השג מתוך חשבון _נוכחי"
 
 #: src/mainwindow.c:643
 msgid "Get from _all accounts"
-msgstr "השג מן _כל החשבונות"
+msgstr "השג מתוך _כל החשבונות"
 
 #: src/mainwindow.c:644
 msgid "Cancel receivin_g"
@@ -6946,16 +6944,16 @@ msgstr "הלחן _הודעת דוא״ל"
 msgid "Compose a news message"
 msgstr "הלחן הודעת חדשות"
 
-#: src/mainwindow.c:655 src/messageview.c:302
+#: src/mainwindow.c:655 src/messageview.c:300
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_מענה"
 
-#: src/mainwindow.c:656 src/messageview.c:303 src/summaryview.c:428
+#: src/mainwindow.c:656 src/messageview.c:301 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "מענה _אל"
 
-#: src/mainwindow.c:659 src/messageview.c:306
+#: src/mainwindow.c:659 src/messageview.c:304
 msgid "Mailing _list"
 msgstr "_רשימת דיוור"
 
@@ -6963,15 +6961,16 @@ msgstr "_רשימת דיוור"
 msgid "Follow-up and reply to"
 msgstr "המשך-אל ומענה עבור"
 
-#: src/mainwindow.c:663 src/messageview.c:309 src/toolbar.c:2087
+#: src/mainwindow.c:663 src/messageview.c:307 src/toolbar.c:2088
 msgid "_Forward"
 msgstr "_קידום"
 
-#: src/mainwindow.c:664 src/messageview.c:310 src/toolbar.c:2088
+#: src/mainwindow.c:664 src/messageview.c:308 src/toolbar.c:2089
 msgid "For_ward as attachment"
 msgstr "קידום כ_תצריף"
 
-#: src/mainwindow.c:665 src/messageview.c:311 src/toolbar.c:2089
+# הפנה מחדש
+#: src/mainwindow.c:665 src/messageview.c:309 src/toolbar.c:2090
 msgid "Redirec_t"
 msgstr "ה_כוון מחדש"
 
@@ -7000,14 +6999,13 @@ msgstr "עיון בארכיון"
 msgid "Contact owner"
 msgstr "התקשרות עם בעלים"
 
-# ה_זז...
 #: src/mainwindow.c:682
 msgid "M_ove..."
-msgstr "ה_עבר..."
+msgstr "ה_עברה..."
 
 #: src/mainwindow.c:683
 msgid "_Copy..."
-msgstr "הע_תק..."
+msgstr "הע_תקה..."
 
 #: src/mainwindow.c:684
 msgid "Move to _trash"
@@ -7015,7 +7013,7 @@ msgstr "העבר אל _אשפה"
 
 #: src/mainwindow.c:685
 msgid "_Delete..."
-msgstr "_מחק..."
+msgstr "_מחיקה..."
 
 #: src/mainwindow.c:686
 msgid "Cancel a news message"
@@ -7023,50 +7021,50 @@ msgstr "ביטול הודעת חדשות"
 
 #: src/mainwindow.c:689 src/mainwindow.c:690 src/summaryview.c:429
 msgid "_Mark"
-msgstr "_סימון"
+msgstr "_סמן"
 
 #: src/mainwindow.c:691
 msgid "_Unmark"
-msgstr "_אי סימון"
+msgstr "_בטל סימון"
 
 #: src/mainwindow.c:694
 msgid "Mark as unr_ead"
-msgstr "סמן כ־לא נקראה"
+msgstr "סמן בתור לא נקראה"
 
 #: src/mainwindow.c:695
 msgid "Mark as rea_d"
-msgstr "סמן כ־נקראה"
+msgstr "סמן בתור נקר_אה"
 
 #: src/mainwindow.c:697
 msgid "Mark all read"
-msgstr "סמן את כולן כ־נקראו"
+msgstr "סמן את כולן בתור נקראו"
 
-# לנכר פתיל דיון
-#: src/mainwindow.c:699 src/prefs_filtering_action.c:199 src/toolbar.c:207
-#: src/toolbar.c:417
+# נכר פתיל דיון
+#: src/mainwindow.c:699 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/toolbar.c:418
 msgid "Ignore thread"
-msgstr "פתיל מנוכר"
+msgstr "שרשור מנוכר"
 
 #: src/mainwindow.c:700
 msgid "Unignore thread"
-msgstr "פתיל לא מנוכר"
+msgstr "שרשור לא מנוכר"
 
-#: src/mainwindow.c:701 src/prefs_filtering_action.c:200 src/toolbar.c:208
-#: src/toolbar.c:418
+#: src/mainwindow.c:701 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/toolbar.c:419
 msgid "Watch thread"
-msgstr "פתיל מפוקח"
+msgstr "שרשור מפוקח"
 
 #: src/mainwindow.c:702
 msgid "Unwatch thread"
-msgstr "פתיל לא מפוקח"
+msgstr "שרשור לא מפוקח"
 
 #: src/mainwindow.c:705
 msgid "Mark as _spam"
-msgstr "סמן כ_ספאם"
+msgstr "סמן בתור _ספאם"
 
 #: src/mainwindow.c:706
 msgid "Mark as _ham"
-msgstr "סמן כ_לגיטימית"
+msgstr "סמן בתור _לגיטימית"
 
 #: src/mainwindow.c:709 src/prefs_filtering_action.c:181
 msgid "Lock"
@@ -7088,11 +7086,11 @@ msgstr "_תגיות"
 msgid "Re-_edit"
 msgstr "עריכה-_מחודשת"
 
-#: src/mainwindow.c:719 src/messageview.c:312 src/mimeview.c:1039
+#: src/mainwindow.c:719 src/messageview.c:310 src/mimeview.c:1030
 msgid "Check signature"
 msgstr "בידוק חתימה"
 
-#: src/mainwindow.c:724 src/messageview.c:316
+#: src/mainwindow.c:724 src/messageview.c:314
 msgid "Add sender to address boo_k"
 msgstr "הוסף ממען אל ספר _כתובות"
 
@@ -7102,11 +7100,11 @@ msgstr "_אסוף כתובות"
 
 #: src/mainwindow.c:727
 msgid "From current _folder..."
-msgstr "מן _תיקייה נוכחית..."
+msgstr "מתוך _תיקייה נוכחית..."
 
 #: src/mainwindow.c:728
 msgid "From selected _messages..."
-msgstr "מן _הודעות נוכחיות..."
+msgstr "מתוך _הודעות נוכחיות..."
 
 #: src/mainwindow.c:731
 msgid "_Filter all messages in folder"
@@ -7120,37 +7118,38 @@ msgstr "סנן הודעות _נבחרות"
 msgid "Run folder pr_ocessing rules"
 msgstr "הרץ חוקי _עיבוד של תיקייה"
 
-#: src/mainwindow.c:735 src/messageview.c:319
+#: src/mainwindow.c:735 src/messageview.c:317
 msgid "_Create filter rule"
 msgstr "_צור חוק סינון"
 
-#: src/mainwindow.c:736 src/mainwindow.c:742 src/messageview.c:320
-#: src/messageview.c:326
+#: src/mainwindow.c:736 src/mainwindow.c:742 src/messageview.c:318
+#: src/messageview.c:324
 msgid "_Automatically"
 msgstr "_אוטומטית"
 
-#: src/mainwindow.c:737 src/mainwindow.c:743 src/mainwindow.c:847
-#: src/messageview.c:321 src/messageview.c:327
+#: src/mainwindow.c:737 src/mainwindow.c:743 src/mainwindow.c:845
+#: src/messageview.c:319 src/messageview.c:325
 msgid "By _From"
-msgstr "לפי _מאת"
+msgstr "לפי _From"
 
-#: src/mainwindow.c:738 src/mainwindow.c:744 src/mainwindow.c:848
-#: src/messageview.c:322 src/messageview.c:328
+#: src/mainwindow.c:738 src/mainwindow.c:744 src/mainwindow.c:846
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _To"
-msgstr "לפי _אל"
+msgstr "לפי _To"
 
-#: src/mainwindow.c:739 src/mainwindow.c:745 src/messageview.c:323
-#: src/messageview.c:329
+#: src/mainwindow.c:739 src/mainwindow.c:745 src/messageview.c:321
+#: src/messageview.c:327
 msgid "By _Subject"
-msgstr "לפי _נושא"
+msgstr "לפי _Subject"
 
-#: src/mainwindow.c:741 src/messageview.c:325 src/summaryview.c:434
+#: src/mainwindow.c:741 src/messageview.c:323 src/summaryview.c:434
 msgid "Create processing rule"
 msgstr "צור חוק עיבוד"
 
-#: src/mainwindow.c:748 src/messageview.c:333
+# מנה מסדר
+#: src/mainwindow.c:748 src/messageview.c:331
 msgid "List _URLs..."
-msgstr "מנה כתובות _URL..."
+msgstr "ספירת כתובות _URL..."
 
 #: src/mainwindow.c:755
 msgid "Ch_eck for new messages in all folders"
@@ -7205,11 +7204,11 @@ msgstr "_העדפות עבור חשבון נוכחי..."
 
 #: src/mainwindow.c:779
 msgid "Create _new account..."
-msgstr "צור חשבון _חדש..."
+msgstr "יצירת חשבון _חדש..."
 
 #: src/mainwindow.c:780
 msgid "_Edit accounts..."
-msgstr "_ערוך חשבונות..."
+msgstr "_עריכת חשבונות..."
 
 #: src/mainwindow.c:783
 msgid "P_references..."
@@ -7279,11 +7278,11 @@ msgstr "טור תקורות"
 
 #: src/mainwindow.c:811
 msgid "Th_read view"
-msgstr "תצוגת פ_תיל"
+msgstr "תצוגת ש_רשור"
 
 #: src/mainwindow.c:812
 msgid "Hide read threads"
-msgstr "הסתר פתילים שנקראו"
+msgstr "הסתר שרשורים שנקראו"
 
 #: src/mainwindow.c:813
 msgid "_Hide read messages"
@@ -7293,192 +7292,192 @@ msgstr "_הסתר הודעות שנקראו"
 msgid "Hide deleted messages"
 msgstr "הסתר הודעות שנמחקו"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:815
 msgid "_Fullscreen"
 msgstr "_מסך מלא"
 
-#: src/mainwindow.c:818 src/messageview.c:345
+#: src/mainwindow.c:816 src/messageview.c:343
 msgid "Show all _headers"
 msgstr "הצג את כל ה_תקורות"
 
 # fold קיפול
-#: src/mainwindow.c:819 src/messageview.c:346
+#: src/mainwindow.c:817 src/messageview.c:344
 msgid "_Collapse all"
 msgstr "_צמצום מוחלט"
 
-#: src/mainwindow.c:820 src/messageview.c:347
+#: src/mainwindow.c:818 src/messageview.c:345
 msgid "Collapse from level _2"
 msgstr "לצמצם מן רמה _2"
 
-#: src/mainwindow.c:821 src/messageview.c:348
+#: src/mainwindow.c:819 src/messageview.c:346
 msgid "Collapse from level _3"
 msgstr "לצמצם מן רמה _3"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:823
 msgid "Text _below icons"
 msgstr "תמליל תחת _צלמיות"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:824
 msgid "Text be_side icons"
 msgstr "תמליל ל_צד צלמיות"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:825
 msgid "_Icons only"
 msgstr "_צלמיות בלבד"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:826
 msgid "_Text only"
 msgstr "_תמליל בלבד"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:833
 msgid "_Standard"
 msgstr "_סטנדרטי"
 
 # שלוש עמודות
-#: src/mainwindow.c:836
+#: src/mainwindow.c:834
 msgid "_Three columns"
 msgstr "_שלושה טורים"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:835
 msgid "_Wide message"
 msgstr "_הודעה רחבה"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:836
 msgid "W_ide message list"
 msgstr "רשימת הודעות _רחבה"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:837
 msgid "S_mall screen"
 msgstr "מסך _קטן"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:841
 msgid "By _number"
 msgstr "לפי מ_ספר"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:842
 msgid "By s_ize"
 msgstr "לפי _גודל"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:843
 msgid "By _date"
 msgstr "לפי _תאריך"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:844
 msgid "By thread date"
-msgstr "לפי תאריך פתיל"
+msgstr "לפי תאריך שרשור"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:847
 msgid "By s_ubject"
 msgstr "לפי _נושא"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:848
 msgid "By _color label"
 msgstr "לפי _צבע תווית"
 
 # BUG: underline is missing
-#: src/mainwindow.c:851
+#: src/mainwindow.c:849
 msgid "By tag"
 msgstr "לפי תגית"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:850
 msgid "By _mark"
 msgstr "לפי סימו_ן"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:851
 msgid "By _status"
 msgstr "לפי מצ_ב"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:852
 msgid "By a_ttachment"
 msgstr "לפי תצ_ריף"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:853
 msgid "By score"
 msgstr "לפי ניקוד"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:854
 msgid "By locked"
 msgstr "לפי נעולה"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:855
 msgid "D_on't sort"
 msgstr "_לא למיין"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:859
 msgid "Ascending"
 msgstr "סדר עולה"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:860
 msgid "Descending"
 msgstr "סדר יורד"
 
-#: src/mainwindow.c:903 src/messageview.c:389
+#: src/mainwindow.c:901 src/messageview.c:387
 msgid "_Auto detect"
 msgstr "_איתור אוטומטי"
 
-#: src/mainwindow.c:1299 src/summaryview.c:6238
+#: src/mainwindow.c:1297 src/summaryview.c:6234
 msgid "Apply tags..."
-msgstr "החל תגיות..."
+msgstr "החלת תגיות..."
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:1935
 msgid "Some error(s) happened. Click here to view log."
-msgstr "ארעו שגיאות מסוימות. הקלק כאן לצפייה ביומן."
+msgstr "אירעו שגיאות מסוימות. הקלק כאן לצפייה ביומן."
 
 # הקלקה על הצלמית תובילך אל מצב לא מקוון
-#: src/mainwindow.c:2127
+#: src/mainwindow.c:1950
 msgid "You are online. Click the icon to go offline"
 msgstr "מצב מקוון. הקלק על הצלמית כדי לעבור למצב לא מקוון"
 
 # הקלקה על הצלמית תובילך אל מצב מקוון
-#: src/mainwindow.c:2130
+#: src/mainwindow.c:1953
 msgid "You are offline. Click the icon to go online"
 msgstr "מצב לא מקוון. הקלק על הצלמית כדי לעבור למצב מקוון"
 
-#: src/mainwindow.c:2144
+#: src/mainwindow.c:1967
 msgid "Select account"
 msgstr "בחירת חשבון"
 
-#: src/mainwindow.c:2171 src/prefs_logging.c:140
+#: src/mainwindow.c:1994 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "יומן רשת תקשורת"
 
-#: src/mainwindow.c:2175
+#: src/mainwindow.c:1998
 msgid "Filtering/Processing debug log"
 msgstr "יומן דיבאג סינון/עיבוד"
 
-#: src/mainwindow.c:2194 src/prefs_logging.c:392
+#: src/mainwindow.c:2017 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "יומן סינון מאופשר\n"
 
-#: src/mainwindow.c:2196 src/prefs_logging.c:394
+#: src/mainwindow.c:2019 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "יומן סינון מנוטרל\n"
 
-#: src/mainwindow.c:2642 src/mainwindow.c:2649 src/mainwindow.c:2692
-#: src/mainwindow.c:2725 src/mainwindow.c:2757 src/mainwindow.c:2802
+#: src/mainwindow.c:2460 src/mainwindow.c:2467 src/mainwindow.c:2510
+#: src/mainwindow.c:2543 src/mainwindow.c:2575 src/mainwindow.c:2620
 #: src/plugins/notification/notification_trayicon.c:363
 #: src/prefs_folder_item.c:1067
 msgid "Untitled"
 msgstr "ללא כותרת"
 
-#: src/mainwindow.c:2803 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2621 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "כלום"
 
-#: src/mainwindow.c:3060 src/mainwindow.c:3064
+#: src/mainwindow.c:2878 src/mainwindow.c:2882
 msgid "Delete all messages in trash folders?"
 msgstr "מחיקת כל ההודעות בתיקיות אשפה?"
 
-#: src/mainwindow.c:3061
+#: src/mainwindow.c:2879
 msgid "Don't quit"
 msgstr "אל תצא"
 
-#: src/mainwindow.c:3090 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2908 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "הוספת תיבת דואר"
 
 # מצוינת
-#: src/mainwindow.c:3091
+#: src/mainwindow.c:2909
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7488,96 +7487,96 @@ msgstr ""
 "במידה ותיבת דואר קיימת תצוין, זו\n"
 "תיסרק באופן אוטומטי."
 
-#: src/mainwindow.c:3097 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:158
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "תיבת הדואר '%s' כבר קיימת."
 
-#: src/mainwindow.c:3102 src/plugins/mailmbox/plugin_gtk.c:202 src/setup.c:52
-#: src/wizard.c:774
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:202 src/setup.c:52
+#: src/wizard.c:737
 msgid "Mailbox"
 msgstr "תיבת דואר"
 
-#: src/mainwindow.c:3107 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:55
+#: src/mainwindow.c:2925 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 "there."
 msgstr ""
 "יצירה של תיבת דואר נכשלה.\n"
-"ייתכן שקבצים מסוימים כבר קיימים, או שלא עומדת לרשותך ההרשאה לכתוב כאם."
+"ייתכן כי קבצים מסוימים כבר קיימים, או שלא עומדת לרשותך ההרשאה לכתוב כאם."
 
 # לא מותר לפרסם
-#: src/mainwindow.c:3553
+#: src/mainwindow.c:3373
 msgid "No posting allowed"
 msgstr "פרסום לא מותר"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "ייבוא mbox נכשל."
 
-#: src/mainwindow.c:4140 src/mainwindow.c:4149
+#: src/mainwindow.c:3960 src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "ייצוא אל mbox נכשל."
 
-#: src/mainwindow.c:4190 src/plugins/notification/notification_trayicon.c:518
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:518
 msgid "Exit"
 msgstr "יציאה"
 
-#: src/mainwindow.c:4190 src/plugins/notification/notification_trayicon.c:518
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:518
 msgid "Exit Claws Mail?"
-msgstr "באם ברצונך לצאת מן Claws Mail?"
+msgstr "באם ברצונך לצאת מתוך Claws Mail?"
 
-#: src/mainwindow.c:4379
+#: src/mainwindow.c:4199
 msgid "Folder synchronisation"
 msgstr "סנכרון תיקייה"
 
-#: src/mainwindow.c:4380
+#: src/mainwindow.c:4200
 msgid "Do you want to synchronise your folders now?"
 msgstr "האם ברצונך לסנכרן את תיקיותייך כעת?"
 
-#: src/mainwindow.c:4381
+#: src/mainwindow.c:4201
 msgid "+_Synchronise"
 msgstr "+_סנכרן"
 
-#: src/mainwindow.c:4810
+#: src/mainwindow.c:4630
 msgid "Deleting duplicated messages..."
-msgstr "מוחק כעת הודעות כפולות..."
+msgstr "כעת מוחק הודעות כפולות..."
 
-#: src/mainwindow.c:4847
+#: src/mainwindow.c:4667
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "נמחקה הודעה כפולה %d בתיקייה %d.\n"
 msgstr[1] "נמחקו %d הודעות כפולות בתיקייה %d.\n"
 
-#: src/mainwindow.c:5102 src/summaryview.c:5727
+#: src/mainwindow.c:4922 src/summaryview.c:5723
 msgid "Processing rules to apply before folder rules"
 msgstr "חוקי עיבוד להחלה לפני חוקי תיקייה"
 
-#: src/mainwindow.c:5110
+#: src/mainwindow.c:4930
 msgid "Processing rules to apply after folder rules"
 msgstr "חוקי עיבוד להחלה עובר חוקי תיקייה"
 
-#: src/mainwindow.c:5118 src/summaryview.c:5738
+#: src/mainwindow.c:4938 src/summaryview.c:5734
 msgid "Filtering configuration"
 msgstr "תצורת סינון"
 
-#: src/mainwindow.c:5233
+#: src/mainwindow.c:5053
 msgid "Can not register as default client: impossible to get executable path."
-msgstr "לא ניתן להירשם כלקוח משתמט: בלתי אפשרי להשיג נתיב של קובץ בר יישום."
+msgstr "אין אפשרות להירשם כלקוח משתמט: בלתי אפשרי להשיג נתיב של קובץ בר יישום."
 
-#: src/mainwindow.c:5292
+#: src/mainwindow.c:5112
 msgid "Claws Mail has been registered as default client."
 msgstr "‫Claws Mail נרשם כלקוח משתמט."
 
-#: src/mainwindow.c:5294
+#: src/mainwindow.c:5114
 msgid ""
 "Can not register as default client: impossible to write to the registry."
-msgstr "לא ניתן להירשם כלקוח משתמט: בלתי אפשרי לרשום אל registry."
+msgstr "אין אפשרות להירשם כלקוח משתמט: בלתי אפשרי לרשום אל registry."
 
-#: src/mainwindow.c:5452
+#: src/mainwindow.c:5272
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7606,30 +7605,30 @@ msgstr "גוף שורה"
 msgid "tag"
 msgstr "תג"
 
-#: src/matcher.c:517 src/matcher.c:522 src/matcher.c:542 src/matcher.c:547
-#: src/message_search.c:212 src/prefs_matcher.c:737 src/summary_search.c:452
+#: src/matcher.c:523 src/matcher.c:528 src/matcher.c:548 src/matcher.c:553
+#: src/message_search.c:217 src/prefs_matcher.c:739 src/summary_search.c:478
 msgid "Case sensitive"
-msgstr "התאם אותיות גדולות/קטנות"
+msgstr "התאם רישיות"
 
-#: src/matcher.c:517 src/matcher.c:522 src/matcher.c:542 src/matcher.c:547
+#: src/matcher.c:523 src/matcher.c:528 src/matcher.c:548 src/matcher.c:553
 msgid "Case insensitive"
 msgstr "התעלם מן הבדלי אותיות"
 
-#: src/matcher.c:1809
+#: src/matcher.c:1819
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "בודק כעת אם הודעה תואמת [ %s ]\n"
 
-#: src/matcher.c:1878 src/matcher.c:1897 src/matcher.c:1910
+#: src/matcher.c:1888 src/matcher.c:1907 src/matcher.c:1920
 msgid "message matches\n"
 msgstr "הודעה תואמת\n"
 
-#: src/matcher.c:1885 src/matcher.c:1903 src/matcher.c:1912
+#: src/matcher.c:1895 src/matcher.c:1913 src/matcher.c:1922
 msgid "message does not match\n"
 msgstr "הודעה לא תואמת\n"
 
-#: src/matcher.c:2175 src/matcher.c:2176 src/matcher.c:2177 src/matcher.c:2178
-#: src/matcher.c:2179 src/matcher.c:2180 src/matcher.c:2181 src/matcher.c:2182
+#: src/matcher.c:2185 src/matcher.c:2186 src/matcher.c:2187 src/matcher.c:2188
+#: src/matcher.c:2189 src/matcher.c:2190 src/matcher.c:2191 src/matcher.c:2192
 msgid "(none)"
 msgstr "(כלום)"
 
@@ -7639,16 +7638,16 @@ msgid ""
 "Could not open mbox file:\n"
 "%s\n"
 msgstr ""
-"לא היה ניתן לפתוח קובץ mbox:\n"
+"לא היתה אפשרות לפתוח קובץ mbox:\n"
 "%s\n"
 
-# מייבא כעת מן קובץ mbox... (%d הודעות דואר יובאו)
+# מייבא כעת מתוך קובץ mbox... (%d הודעות דואר יובאו)
 #: src/mbox.c:144
 #, c-format
 msgid "Importing from mbox... (%d mail imported)"
 msgid_plural "Importing from mbox... (%d mails imported)"
-msgstr[0] "מייבא כעת מן mbox‏... (הודעות דואר %d יובאה)"
-msgstr[1] "מייבא כעת מן mbox‏... (%d הודעות דואר יובאו)"
+msgstr[0] "כעת מייבא מתוך mbox‏... (הודעות דואר %d יובאה)"
+msgstr[1] "כעת מייבא מתוך mbox‏... (%d הודעות דואר יובאו)"
 
 #: src/mbox.c:553
 msgid "Overwrite mbox file"
@@ -7658,7 +7657,7 @@ msgstr "כתיבה על קובץ mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "קובץ זה כבר קיים. האם ברצונך להחליפו?"
 
-#: src/mbox.c:555 src/messageview.c:1868 src/mimeview.c:1850
+#: src/mbox.c:555 src/messageview.c:1843 src/mimeview.c:1844
 #: src/prefs_themes.c:553 src/textview.c:3120
 msgid "Overwrite"
 msgstr "כתיבה על הכתוב"
@@ -7669,12 +7668,12 @@ msgid ""
 "Could not create mbox file:\n"
 "%s\n"
 msgstr ""
-"לא ניתן ליצור קובץ mbox:\n"
+"לא היתה אפשרות ליצור קובץ mbox:\n"
 "%s\n"
 
 #: src/mbox.c:572
 msgid "Exporting to mbox..."
-msgstr "מייצא כעת אל mbox..."
+msgstr "כעת מייצא אל mbox..."
 
 #: src/message_search.c:167
 msgid "Find in current message"
@@ -7684,39 +7683,41 @@ msgstr "מציאה בהודעה נוכחית"
 msgid "Find text:"
 msgstr "מצא תמליל:"
 
-#: src/message_search.c:332 src/summary_search.c:768
+#: src/message_search.c:346 src/summary_search.c:791
 msgid "Search failed"
 msgstr "חיפוש נכשל"
 
-#: src/message_search.c:333 src/summary_search.c:769
+#: src/message_search.c:347 src/summary_search.c:792
 msgid "Search string not found."
 msgstr "מחרוזת חיפוש לא נמצאה."
 
-#: src/message_search.c:342
+#: src/message_search.c:356
 msgid "Beginning of message reached; continue from end?"
 msgstr "הודעה מוצתה עד תחילתה; האם להמשיך מן הסוף?"
 
-#: src/message_search.c:345
+#: src/message_search.c:359
 msgid "End of message reached; continue from beginning?"
 msgstr "הודעה מוצתה עד סופה; האם להמשיך מן ההתחלה?"
 
-#: src/message_search.c:348 src/summary_search.c:780
+#: src/message_search.c:362 src/summary_search.c:803
 msgid "Search finished"
 msgstr "חיפוש סוים"
 
-#: src/messageview.c:299 src/textview.c:245
+#: src/messageview.c:297 src/textview.c:245
 msgid "Compose _new message"
 msgstr "הלחן הודעה חדשה"
 
-#: src/messageview.c:729 src/messageview.c:1413 src/messageview.c:1610
+#: src/messageview.c:711 src/messageview.c:1388 src/messageview.c:1585
 msgid "Claws Mail - Message View"
 msgstr "‫Claws Mail - תצוגת הודעה"
 
-#: src/messageview.c:860
+#: src/messageview.c:838
 msgid "<No Return-Path found>"
 msgstr "<לא נמצא נתיב-חזרה>"
 
-#: src/messageview.c:868
+# כתובת מסירה
+# נתיב מסירה
+#: src/messageview.c:846
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7726,16 +7727,16 @@ msgid ""
 "It is advised to not to send the return receipt."
 msgstr ""
 "כתובת התראה אליה נשלחת קבלת\n"
-"מסירה לא תואמת לנתיב מסירה:\n"
+"מסירה לא תואמת לנתיב חזרה:\n"
 "כתובת התראה: %s\n"
-"כתובת מסירה: %s\n"
+"נתיב חזרה: %s\n"
 "מומלץ לך שלא לשלוח אישור מסירה."
 
-#: src/messageview.c:875 src/messageview.c:892
+#: src/messageview.c:853 src/messageview.c:870
 msgid "_Don't Send"
 msgstr "_אל תשלח"
 
-#: src/messageview.c:888
+#: src/messageview.c:866
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7747,72 +7748,72 @@ msgstr ""
 "מוּענה אליך באופן רשמי.\n"
 "מומלץ לך שלא לשלוח אישור מסירה."
 
-#: src/messageview.c:1341
+#: src/messageview.c:1319
 #, c-format
 msgid "Fetching message (%s)..."
-msgstr "מושך כעת הודעות (%s)..."
+msgstr "כעת מושך הודעות (%s)..."
 
-#: src/messageview.c:1377 src/procmime.c:983
+#: src/messageview.c:1355 src/procmime.c:986
 #, c-format
 msgid "Couldn't decrypt: %s"
-msgstr "לא היה ניתן להסיר צופן: %s"
+msgstr "לא היתה אפשרות לפענח צופן: %s"
 
-#: src/messageview.c:1460 src/messageview.c:1468
+#: src/messageview.c:1435 src/messageview.c:1443
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "הודעה לא מותאמת אל תקן MIME. זו עשויה להצטייר באופן מוטעה."
 
-#: src/messageview.c:1860 src/messageview.c:1863 src/mimeview.c:2003
-#: src/plugins/fancy/fancy_viewer.c:667 src/summaryview.c:4814
-#: src/summaryview.c:4817 src/textview.c:3108
+#: src/messageview.c:1835 src/messageview.c:1838 src/mimeview.c:1997
+#: src/plugins/fancy/fancy_viewer.c:668 src/summaryview.c:4810
+#: src/summaryview.c:4813 src/textview.c:3108
 msgid "Save as"
 msgstr "שמור בשם"
 
-#: src/messageview.c:1869
+#: src/messageview.c:1844
 msgid "Overwrite existing file?"
 msgstr "החלף קובץ קיים?"
 
-#: src/messageview.c:1877 src/summaryview.c:4834 src/summaryview.c:4837
-#: src/summaryview.c:4852
+#: src/messageview.c:1852 src/summaryview.c:4830 src/summaryview.c:4833
+#: src/summaryview.c:4848
 #, c-format
 msgid "Couldn't save the file '%s'."
-msgstr "לא היה ניתן לשמור את הקובץ '%s'."
+msgstr "לא היתה אפשרות לשמור את הקובץ '%s'."
 
-#: src/messageview.c:1931
+#: src/messageview.c:1905
 #, c-format
 msgid "Show all %s."
 msgstr "הצג כל %s."
 
-#: src/messageview.c:1933
+#: src/messageview.c:1907
 msgid "Only the first megabyte of text is shown."
 msgstr "רק מגה בייט ראשון של תמליל מוצג."
 
-#: src/messageview.c:1964
+#: src/messageview.c:1938
 msgid ""
 "You got a return receipt for this message : it has been displayed by the "
 "recipient."
 msgstr "קיבלת קבלת מסירה עבור הודעה זו : זו הוצגה על ידי הנמען."
 
-#: src/messageview.c:1967
+#: src/messageview.c:1941
 msgid "You asked for a return receipt in this message."
 msgstr "ביקשת עבור קבלת מסירה בהודעה זו."
 
-#: src/messageview.c:1973
+#: src/messageview.c:1947
 msgid "This message asks for a return receipt."
 msgstr "הודעה זו מבקשת עבור קבלת מסירה."
 
-#: src/messageview.c:1974
+#: src/messageview.c:1948
 msgid "Send receipt"
 msgstr "שלח קבלה"
 
-#: src/messageview.c:2017
+#: src/messageview.c:1991
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgstr ""
 "הודעה זו אוחזרה באופן חלקי,\n"
-"ונמחקה מן השרת."
+"ונמחקה מתוך השרת."
 
-#: src/messageview.c:2023
+#: src/messageview.c:1997
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7821,15 +7822,15 @@ msgstr ""
 "הודעה זו אוחזרה באופן חלקי;\n"
 "זו כעת %s."
 
-#: src/messageview.c:2027 src/messageview.c:2049
+#: src/messageview.c:2001 src/messageview.c:2023
 msgid "Mark for download"
 msgstr "סמן להורדה"
 
-#: src/messageview.c:2028 src/messageview.c:2040
+#: src/messageview.c:2002 src/messageview.c:2014
 msgid "Mark for deletion"
 msgstr "סמן למחיקה"
 
-#: src/messageview.c:2033
+#: src/messageview.c:2007
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7838,12 +7839,12 @@ msgstr ""
 "הודעה זו אוחזרה באופן חלקי;\n"
 "זו כעת %s ותורד בעתיד."
 
-#: src/messageview.c:2038 src/messageview.c:2051
+#: src/messageview.c:2012 src/messageview.c:2025
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "אי סימון"
 
-#: src/messageview.c:2044
+#: src/messageview.c:2018
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7853,12 +7854,12 @@ msgstr ""
 "זו כעת %s ותימחק בעתיד."
 
 # התראת קבלת מסירה
-#: src/messageview.c:2117
+#: src/messageview.c:2091
 msgid "Return Receipt Notification"
 msgstr "שלח אישור מסירה"
 
 # ההודעה נשלחה אל מספר חשבונות שברשותך
-#: src/messageview.c:2118
+#: src/messageview.c:2092
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -7868,19 +7869,19 @@ msgstr ""
 "הכתובת שאליה נשלחה הודעה זו מצויה בשימוש על ידי כמה מחשבונותיך.\n"
 "אנא בחר באיזה חשבון ברצונך להשתמש למען שליחת התראת אישור מסירה:"
 
-#: src/messageview.c:2122 src/plugins/rssyl/rssyl_gtk.c:480
+#: src/messageview.c:2096 src/plugins/rssyl/rssyl_gtk.c:480
 msgid "_Cancel"
 msgstr "_ביטול"
 
-#: src/messageview.c:2122
+#: src/messageview.c:2096
 msgid "_Send Notification"
 msgstr "_שלח התראה"
 
-#: src/messageview.c:2189
+#: src/messageview.c:2163
 msgid "Cannot print: the message doesn't contain text."
-msgstr "לא ניתן להדפיס: ההודעה לא מכילה תמליל."
+msgstr "אין אפשרות להדפיס: ההודעה לא מכילה תמליל."
 
-#: src/messageview.c:2958
+#: src/messageview.c:2932
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -7888,7 +7889,7 @@ msgstr ""
 "\n"
 "  אין הודעות בתיקייה זו"
 
-#: src/messageview.c:2966
+#: src/messageview.c:2940
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -7896,7 +7897,7 @@ msgstr ""
 "\n"
 "  הודעה נמחקה"
 
-#: src/messageview.c:2967
+#: src/messageview.c:2941
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -7904,27 +7905,27 @@ msgstr ""
 "\n"
 "  הודעה נמחקה או נעברה אל תיקייה אחרת"
 
-#: src/messageview.c:3000 src/messageview.c:3006 src/summaryview.c:4187
-#: src/summaryview.c:6975
+#: src/messageview.c:2974 src/messageview.c:2980 src/summaryview.c:4183
+#: src/summaryview.c:6964
 msgid "An error happened while learning.\n"
-msgstr "ארעה שגיאה במהלך למידה.\n"
+msgstr "אירעה שגיאה במהלך למידה.\n"
 
 #: src/mh.c:432
 #, c-format
 msgid "can't copy message %s to %s\n"
-msgstr "לא ניתן להעתיק הודעה %s אל %s\n"
+msgstr "אין אפשרות להעתיק הודעה %s אל %s\n"
 
 #: src/mh.c:518
 msgid "Moving messages..."
-msgstr "מעביר כעת הודעות..."
+msgstr "כעת מעביר הודעות..."
 
 #: src/mh.c:662 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
-msgstr "מוחק כעת הודעות..."
+msgstr "כעת מוחק הודעות..."
 
 #: src/mh_gtk.c:63 src/plugins/mailmbox/plugin_gtk.c:67
 msgid "Remove _mailbox..."
-msgstr "הסר _תיבת דואר..."
+msgstr "הסרת _תיבת דואר..."
 
 # לא יימחקו
 #: src/mh_gtk.c:358 src/plugins/mailmbox/plugin_gtk.c:290
@@ -7934,109 +7935,105 @@ msgid ""
 "(The messages are NOT deleted from the disk)"
 msgstr ""
 "באמת להסיר את תיבת הדואר '%s'?\n"
-"(ההודעות אינן נמחקות מן הכונן)"
+"(ההודעות אינן נמחקות מתוך הכונן)"
 
 #: src/mh_gtk.c:360 src/plugins/mailmbox/plugin_gtk.c:292
 msgid "Remove mailbox"
 msgstr "הסרת תיבת דואר"
 
-#: src/mimeview.c:202
+#: src/mimeview.c:193
 msgid "_Open"
 msgstr "_פתח"
 
-#: src/mimeview.c:204
+#: src/mimeview.c:195
 msgid "Open _with..."
-msgstr "פתח באמצעות..."
+msgstr "פתיחה באמצעות..."
 
-#: src/mimeview.c:206
+#: src/mimeview.c:197
 msgid "Send to..."
-msgstr "שלח אל..."
+msgstr "שליחה אל..."
 
-#: src/mimeview.c:207
+#: src/mimeview.c:198
 msgid "_Display as text"
-msgstr "_הצג כתמליל"
+msgstr "_הצג בתור תמליל"
 
-#: src/mimeview.c:208
+#: src/mimeview.c:199
 msgid "_Save as..."
 msgstr "_שמירה בשם..."
 
-#: src/mimeview.c:209
+#: src/mimeview.c:200
 msgid "Save _all..."
-msgstr "שמור ה_כל..."
+msgstr "שמירת _מוחלטת..."
 
-#: src/mimeview.c:282
+#: src/mimeview.c:273
 msgid "MIME Type"
 msgstr "טיפוס MIME"
 
-#: src/mimeview.c:1044 src/mimeview.c:1049 src/mimeview.c:1054
-#: src/mimeview.c:1059
+#: src/mimeview.c:1035 src/mimeview.c:1040 src/mimeview.c:1045
+#: src/mimeview.c:1050
 msgid "View full information"
 msgstr "הצג מידע מלא"
 
 # בדוק שוב
-#: src/mimeview.c:1065
+#: src/mimeview.c:1056
 msgid "Check again"
 msgstr "בידוק חוזר"
 
 # ניתן להקליק על הצלמית
-#: src/mimeview.c:1077
+#: src/mimeview.c:1068
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "‏%s לחץ על הצלמית כדי לבדוקה."
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1070
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "‏%s לחץ על הצלמית או הקש '%s' כדי לבדוקה."
 
-#: src/mimeview.c:1089
+#: src/mimeview.c:1080
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr "פקיעת זמן בידוק חתימה. לחץ על הצלמית כדי לנסות שוב."
 
-#: src/mimeview.c:1091
+#: src/mimeview.c:1082
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr "פקיעת זמן בידוק חתימה. לחץ על הצלמית או הקש '%s' כדי לנסות שוב."
 
-#: src/mimeview.c:1330
+#: src/mimeview.c:1322
 msgid "Checking signature..."
-msgstr "בודק כעת חתימה..."
+msgstr "כעת בודק חתימה..."
 
-#: src/mimeview.c:1373
+#: src/mimeview.c:1363
 msgid "Go back to email"
 msgstr "חזור אל דוא״ל"
 
-#: src/mimeview.c:1769 src/mimeview.c:1858 src/mimeview.c:2050
-#: src/mimeview.c:2093 src/mimeview.c:2224
-#: src/plugins/fancy/fancy_viewer.c:420
+#: src/mimeview.c:1763 src/mimeview.c:1852 src/mimeview.c:2044
+#: src/mimeview.c:2080 src/mimeview.c:2192
+#: src/plugins/fancy/fancy_viewer.c:421
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
-msgstr "לא היה ניתן לשמור אזור של הודעה מרובת חלקים: %s"
+msgstr "לא היתה אפשרות לשמור אזור של הודעה מרובת חלקים: %s"
 
-#: src/mimeview.c:1847 src/textview.c:3118
+#: src/mimeview.c:1841 src/textview.c:3118
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "החלף קובץ קיים '%s'?"
 
-#: src/mimeview.c:1889 src/plugins/archive/archiver_prefs.c:128
+#: src/mimeview.c:1883 src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
 msgstr "בחירת תיקיית יעד"
 
-#: src/mimeview.c:1896 src/plugins/archive/archiver_prefs.c:134
+#: src/mimeview.c:1890 src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "‫'%s' אינו מדור."
 
-#: src/mimeview.c:2125
-msgid "No registered viewer for this file type."
-msgstr "אין מציגים רשומים עבור טיפוס קובץ זה."
-
-#: src/mimeview.c:2157 src/mimeview.c:2164 src/textview.c:3039
+#: src/mimeview.c:2127 src/mimeview.c:2134 src/textview.c:3039
 msgid "Open with"
-msgstr "פתח באמצעות"
+msgstr "פתיחה באמצעות"
 
-#: src/mimeview.c:2158 src/mimeview.c:2165 src/textview.c:3040
+#: src/mimeview.c:2128 src/mimeview.c:2135 src/textview.c:3040
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8045,13 +8042,13 @@ msgstr ""
 "הכנס פקודה לפתיחת קובץ:\n"
 "‫('‎%s' יוחלף עם שם קובץ)"
 
-#: src/mimeview.c:2258
+#: src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "הוצאה אל הפועל של בינארי לא מהימן?"
 
 # BUG: Delete the word (could) probably.  It could, not probably could
 # compromission (French?)
-#: src/mimeview.c:2259
+#: src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8063,96 +8060,96 @@ msgstr ""
 "\n"
 "האם עדיין ברצונך להריץ את קובץ זה?"
 
-#: src/mimeview.c:2263
+#: src/mimeview.c:2231
 msgid "Run binary"
 msgstr "הרצת בינארי"
 
-#: src/mimeview.c:2565
+#: src/mimeview.c:2533
 msgid "Type:"
 msgstr "טיפוס:"
 
-#: src/mimeview.c:2566 src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/mimeview.c:2534 src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Size:"
 msgstr "גודל:"
 
-#: src/mimeview.c:2578 src/plugins/vcalendar/vcalendar.c:1271
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1730
+#: src/mimeview.c:2546 src/plugins/vcalendar/vcalendar.c:1271
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1741
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1751
 msgid "Description:"
 msgstr "תיאור:"
 
-#: src/news.c:300
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "חיבור NNTP אל %s:%d התנתק.\n"
 
-#: src/news.c:333
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
-msgstr "חשבון '%s': מתחבר כעת אל שרת NNTP: ‫%s:%d...\n"
+msgstr "חשבון '%s': כעת מתחבר אל שרת NNTP: ‫%s:%d...\n"
 
-#: src/news.c:354
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "שגיאה בהתחברות אל %s:%d...\n"
 
-#: src/news.c:432
+#: src/news.c:438
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr "‫Libetpan לא תומכת return code 480 ונכון לעכשיו אנחנו בוחרים להמשיך\n"
 
-#: src/news.c:441
+#: src/news.c:447
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "קורא מצב נכשל, ממשיך בכל זאת\n"
 
-#: src/news.c:445
+#: src/news.c:451
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "שגיאה ביצירת סשן עם %s:%d\n"
 
-#: src/news.c:459
+#: src/news.c:466
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "שגיאה באימות אל %s:%d...\n"
 
-#: src/news.c:484
+#: src/news.c:491
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לגשת אל שרת חדשות."
 
-#: src/news.c:853
+#: src/news.c:862
 #, c-format
 msgid "couldn't select group: %s\n"
-msgstr "לא היה ניתן לבחור קבוצה: %s\n"
+msgstr "לא היתה אפשרות לבחור קבוצה: %s\n"
 
-#: src/news.c:1042 src/news.c:1212
+#: src/news.c:1051 src/news.c:1221
 #, c-format
 msgid "couldn't set group: %s\n"
-msgstr "לא היה ניתן להגדיר קבוצה: %s\n"
+msgstr "לא היתה אפשרות להגדיר קבוצה: %s\n"
 
 # פריטים
-#: src/news.c:1051
+#: src/news.c:1060
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "טווח מאמרים שגוי: %d - %d\n"
 
-#: src/news.c:1121 src/news.c:1145 src/news.c:1169
+#: src/news.c:1130 src/news.c:1154 src/news.c:1178
 msgid "couldn't get xhdr\n"
-msgstr "לא היה ניתן להשיג xhdr\n"
+msgstr "לא היתה אפשרות להשיג xhdr\n"
 
-#: src/news.c:1205
+#: src/news.c:1214
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
-msgstr "משיג כעת xover ‫%d - %d בתוך %s...\n"
+msgstr "כעת משיג xover ‫%d - %d בתוך %s...\n"
 
-#: src/news.c:1220
+#: src/news.c:1229
 msgid "couldn't get xover\n"
-msgstr "לא היה ניתן להשיג xover\n"
+msgstr "לא היתה אפשרות להשיג xover\n"
 
-#: src/news.c:1235
+#: src/news.c:1244
 msgid "invalid xover line\n"
 msgstr "שורת xover שגויה\n"
 
-#: src/news.c:1450
+#: src/news.c:1459
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -8167,11 +8164,11 @@ msgstr ""
 
 #: src/news_gtk.c:56
 msgid "_Subscribe to newsgroup..."
-msgstr "_הרשם אל קבוצת דיונים..."
+msgstr "_הרשמה אל קבוצת דיון..."
 
 #: src/news_gtk.c:57
 msgid "_Unsubscribe newsgroup"
-msgstr "_בטל הרשמה לקבוצת דיונים"
+msgstr "_בטל הרשמת קבוצת דיון"
 
 #: src/news_gtk.c:265
 #, c-format
@@ -8184,7 +8181,7 @@ msgstr "ביטול הרשמה לקבוצת דיונים"
 
 #: src/news_gtk.c:267 src/plugins/rssyl/rssyl_gtk.c:678
 msgid "_Unsubscribe"
-msgstr "_ביטול הרשמה"
+msgstr "_בטל הרשמה"
 
 #: src/news_gtk.c:306
 msgid "Rename newsgroup folder"
@@ -8199,36 +8196,36 @@ msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
 msgstr ""
-"ודא שמודול ליבה 'acerhk' הינו מוטען.\n"
-"ביכולתך להשיגו מן http://www.cakey.de/acerhk/"
+"ודא כי מודול ליבה 'acerhk' הינו מוטען.\n"
+"באפשרותך להשיגו מתוך http://www.cakey.de/acerhk/"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:69
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
 msgstr ""
-"ודא שמודול ליבה 'acer_acpi' הינו מוטען.\n"
-"ביכולתך להשיגו מן http://code.google.com/p/aceracpi/"
+"ודא כי מודול ליבה 'acer_acpi' הינו מוטען.\n"
+"באפשרותך להשיגו מתוך http://code.google.com/p/aceracpi/"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:71
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
-msgstr "ודא שמודול ליבה 'asus_laptop' הינו מוטען."
+msgstr "ודא כי מודול ליבה 'asus_laptop' הינו מוטען."
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:72
 msgid "Make sure that the kernel module 'asus_acpi' is loaded."
-msgstr "ודא שמודול ליבה 'asus_acpi' הינו מוטען."
+msgstr "ודא כי מודול ליבה 'asus_acpi' הינו מוטען."
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:73
 msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
-msgstr "ודא שמודול ליבה 'ibm_acpi' הינו מוטען."
+msgstr "ודא כי מודול ליבה 'ibm_acpi' הינו מוטען."
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:74
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
 msgstr ""
-"ודא שיש לך את apanelc מותקן.\n"
-"ביכולתך להשיגו מן http://apanel.sourceforge.net/"
+"ודא כי יש לך את apanelc מותקן.\n"
+"באפשרותך להשיגו מתוך http://apanel.sourceforge.net/"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:207
 #: src/plugins/acpi_notifier/acpi_notifier.c:213
@@ -8252,7 +8249,7 @@ msgstr " : דואר חדש"
 #: src/plugins/acpi_notifier/acpi_notifier.c:315
 #: src/plugins/acpi_notifier/acpi_notifier.c:321
 msgid "off"
-msgstr ""
+msgstr "כבוי"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:311
 #: src/plugins/acpi_notifier/acpi_notifier.c:317
@@ -8264,7 +8261,7 @@ msgstr "מהבהב"
 #: src/plugins/acpi_notifier/acpi_notifier.c:319
 #: src/plugins/acpi_notifier/acpi_notifier.c:325
 msgid "on"
-msgstr ""
+msgstr "פועל"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:347
 #: src/plugins/acpi_notifier/acpi_notifier.c:356
@@ -8283,11 +8280,11 @@ msgstr "קובץ ACPI: "
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:406
 msgid "values - On: "
-msgstr ""
+msgstr "ערכים - פועל: "
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:411
 msgid " - Off: "
-msgstr ""
+msgstr " - כבוי: "
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:433
 msgid "Blink when user interaction is required"
@@ -8388,22 +8385,22 @@ msgstr "‫%s: קיים. להמשיך למרות זאת?"
 #: src/plugins/archive/archiver_gtk.c:518
 #, c-format
 msgid "%s: Is a link. Cannot continue"
-msgstr "‫%s: הינו קישור. לא ניתן להמשיך"
+msgstr "‫%s: הינו קישור. אין אפשרות להמשיך"
 
 #: src/plugins/archive/archiver_gtk.c:521
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
-msgstr "‫%s: הינו מדור. לא ניתן להמשיך"
+msgstr "‫%s: הינו מדור. אין אפשרות להמשיך"
 
 #: src/plugins/archive/archiver_gtk.c:524
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
-msgstr "‫%s: הרשאות חסרות. לא ניתן להמשיך"
+msgstr "‫%s: הרשאות חסרות. אין אפשרות להמשיך"
 
 #: src/plugins/archive/archiver_gtk.c:527
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
-msgstr "‫%s: שגיאה לא מוכרת. לא ניתן להמשיך"
+msgstr "‫%s: שגיאה לא מוכרת. אין אפשרות להמשיך"
 
 #: src/plugins/archive/archiver_gtk.c:564
 #, c-format
@@ -8511,9 +8508,9 @@ msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr "בחר שם קובץ עבור ארכיון [סיומת צריכה לשקף ארכיון כמו ‪.tgz‬]"
 
 #: src/plugins/archive/archiver_gtk.c:952
-#, fuzzy, c-format
+#, c-format
 msgid "%ld of %ld"
-msgstr "%ld של %ld"
+msgstr "%ld מתוך %ld"
 
 #: src/plugins/archive/archiver_gtk.c:991
 msgid "Create Archive"
@@ -8546,7 +8543,7 @@ msgstr "מיקום ושם ארכיון"
 
 #: src/plugins/archive/archiver_gtk.c:1045
 #: src/plugins/archive/archiver_prefs.c:198
-#: src/plugins/pgpcore/select-keys.c:424
+#: src/plugins/pgpcore/select-keys.c:420
 msgid "_Select"
 msgstr "_בחר"
 
@@ -8775,9 +8772,9 @@ msgid ""
 "\n"
 "The deleted data will be unrecoverable."
 msgstr ""
-"האם באמת שברצונך להסיר את כל התצריפים מן ההודעות הנבחרות?\n"
+"האם אתה בטוח כי ברצונך להסיר את כל התצריפים מתוך ההודעות הנבחרות?\n"
 "\n"
-"המידע המחוק לא יהיה ניתן שבה."
+"המידע המחוק לא יהיה בר שבה."
 
 #: src/plugins/att_remover/att_remover.c:479
 msgid "This message doesn't have any attachments."
@@ -8787,26 +8784,26 @@ msgstr "להודעה זו אין שום תצריף."
 msgid "Remove attachments..."
 msgstr "הסרת תצריפים..."
 
-#: src/plugins/att_remover/att_remover.c:507
-#: src/plugins/att_remover/att_remover.c:574
+#: src/plugins/att_remover/att_remover.c:506
+#: src/plugins/att_remover/att_remover.c:566
 #, fuzzy
 msgid "AttRemover"
-msgstr "הסר"
+msgstr "AttRemover"
 
 # מבצע
-#: src/plugins/att_remover/att_remover.c:579
+#: src/plugins/att_remover/att_remover.c:571
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
 "Warning: this operation will be completely un-cancellable and the deleted "
 "attachments will be lost forever, and ever, and ever."
 msgstr ""
-"תוספת זו מסירה תצריפים מן הודעות דואר.\n"
+"תוספת זו מסירה תצריפים מתוך הודעות דואר.\n"
 "\n"
 "אזהרה: פעולה זו תהיה לגמרי חסרת אפשרות ביטול והתצריפים המחוקים יאבדו לעד, "
 "ולעולם, ולעולם."
 
-#: src/plugins/att_remover/att_remover.c:603
+#: src/plugins/att_remover/att_remover.c:595
 msgid "Attachment handling"
 msgstr "ניהול תצריף"
 
@@ -8847,46 +8844,65 @@ msgid ""
 msgstr ""
 "מתרה משתמש במידה והפנייה מסוימת אל תצריף נמצאה בתמליל הודעה ואין קובץ מסופח."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:53
+#: src/plugins/attachwarner/attachwarner_prefs.c:54
 msgid "attach"
 msgstr "ספח"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:80
-msgid ""
-"Warn when matching the following regular expressions:\n"
-"(one per line)"
+#: src/plugins/attachwarner/attachwarner_prefs.c:85
+msgid "One of the following regular expressions is matched (one per line):"
+msgstr "אחד מתוך הביטויים הרגולריים הבאים הינו מתאים (אחד לכל שורה)"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:89
+msgid "Expressions are case sensitive"
+msgstr "ביטויים הינם תלויי רישיות"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:96
+msgid "Case sensitive when matching for the regular expressions in the list"
 msgstr ""
-"התרה כאשר קיימת התאמה לביטויים הרגולריים הבא:\n"
-"(אחד לכל שורה)"
+"התאם רישיות כאשר קיימת התאמה לביטויים הרגולריים בתוך הרשימה (אחד לכל שורה)"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:99
-msgid "Skip quoted lines"
-msgstr "דלג על שורות מצוטטות"
+#: src/plugins/attachwarner/attachwarner_prefs.c:114
+msgid "Lines starting with quotation marks"
+msgstr "שורות מתחילות עם מרכאות"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:106
-msgid "Exclude quoted lines from checking for the regular expressions above"
-msgstr "הוצא שורות מצוטטות מבדיקה עבור הביטויים הרגולריים מעלה"
+#: src/plugins/attachwarner/attachwarner_prefs.c:121
+msgid ""
+"Exclude quoted lines from checking for the regular expressions above. Note "
+"that handmade quotes cannot be distinguished from quotes generated by "
+"replying."
+msgstr ""
+"הוצא שורות מצוטטות מבדיקה עבור הביטויים הרגולריים מעלה. לתשומת לבך מרכאות "
+"ידניות לא ניתנות להבדלה ממרכאות אשר נוצרו על ידי מענה."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:109
-msgid "Skip forwards and redirections"
-msgstr "דלג על מקודמות ועל הכוונות מחודשות"
+#: src/plugins/attachwarner/attachwarner_prefs.c:124
+msgid "Forwarded or redirected messages"
+msgstr "הודעות שקודמו או שהוכוונו מחדש"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:116
+#: src/plugins/attachwarner/attachwarner_prefs.c:131
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
-msgstr "אל תבדוק תצריפים חסרים עבור קידום או הכוונה מחודשת של הודעות"
+msgstr "אל תבדוק תצריפים חסרים עבור קידום או הכוונה מחדש של הודעות"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:119
-msgid "Skip signature"
-msgstr "דלג על חתימה"
+#: src/plugins/attachwarner/attachwarner_prefs.c:134
+#: src/prefs_msg_colors.c:362
+msgid "Signatures"
+msgstr "חתימות"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:126
+#: src/plugins/attachwarner/attachwarner_prefs.c:141
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
-msgstr "הוצא שורות מן מפריד-חתימה ואילך מבדיקה עבור הביטויים הרגולריים מעלה"
+msgstr "הוצא שורות מתוך מפריד-חתימה ואילך מבדיקה עבור הביטויים הרגולריים מעלה"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:147
+msgid "Warn when"
+msgstr "הזהר כאשר"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:151
+msgid "Excluding"
+msgstr "הוצאה"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:202
+#: src/plugins/attachwarner/attachwarner_prefs.c:229
 msgid "Attach Warner"
 msgstr "מתרה תצריף"
 
@@ -8915,7 +8931,7 @@ msgstr "נתיב ספר כתובות היכן שכתובות נשמרות"
 #: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
 #: src/prefs_matcher.c:676
 msgid "Select..."
-msgstr "בחר..."
+msgstr "בחירה..."
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:130
 msgid "Keep 'To' addresses"
@@ -8944,7 +8960,7 @@ msgstr "שמור כתובות שמופיעות בתוך תקורות 'Bcc'"
 #: src/plugins/address_keeper/address_keeper_prefs.c:160
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line):"
-msgstr "הוצא כתובות התואמות לביטויים הרגולריים הבא: (אחד לכל שורה)"
+msgstr "הוצא כתובות התואמות את הביטויים הרגולריים הבאים: (אחד לכל שורה):"
 
 #: src/plugins/bogofilter/bogofilter.c:81
 #: src/plugins/bogofilter/bogofilter_gtk.c:458
@@ -8954,11 +8970,11 @@ msgstr "‏Bogofilter"
 # What are bodies?
 #: src/plugins/bogofilter/bogofilter.c:474
 msgid "Bogofilter: fetching bodies..."
-msgstr "‫Bogofilter: מושך כעת גופים..."
+msgstr "‫Bogofilter: כעת מושך גופים..."
 
 #: src/plugins/bogofilter/bogofilter.c:487
 msgid "Bogofilter: filtering messages..."
-msgstr "‫Bogofilter: מסנן כעת הודעות..."
+msgstr "‫Bogofilter: כעת מסנן הודעות..."
 
 # משום דואר
 #: src/plugins/bogofilter/bogofilter.c:602
@@ -8970,8 +8986,8 @@ msgid ""
 msgstr ""
 "התוספת Bogofilter לא יכלה לסנן הודעה. הגורם המסתבר של השגיאה הוא שזו לא למדה "
 "מאף דואר.\n"
-"עליך לעשות שימוש בפעולות \"/סמן/סמן כספאם\" וגם \"/סמן/סמן כלגיטימית\" בכדי "
-"לאמן את Bogofilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
+"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור לגיטימית"
+"\" בכדי לאמן את Bogofilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
 
 #: src/plugins/bogofilter/bogofilter.c:609
 #, c-format
@@ -8981,10 +8997,9 @@ msgid ""
 msgstr ""
 "התוספת Bogofilter לא יכלה לסנן הודעה. הפקודה `%s %s %s` לא היתה ניתנת להרצה."
 
-# (התוספת) לומדת(?)
 #: src/plugins/bogofilter/bogofilter.c:755
 msgid "Bogofilter: learning from message..."
-msgstr "‫Bogofilter: לומד כעת מן הודעה..."
+msgstr "‫Bogofilter: כעת לומד מתוך הודעה..."
 
 #: src/plugins/bogofilter/bogofilter.c:768
 #: src/plugins/bogofilter/bogofilter.c:817 src/plugins/bsfilter/bsfilter.c:511
@@ -8994,7 +9009,7 @@ msgstr "למידה מכשלה; `%s` הוחזרה עם מצב %d."
 
 #: src/plugins/bogofilter/bogofilter.c:785
 msgid "Bogofilter: learning from messages..."
-msgstr "‫Bogofilter: לומד כעת מן הודעות..."
+msgstr "‫Bogofilter: כעת לומד מתוך הודעות..."
 
 #: src/plugins/bogofilter/bogofilter.c:873
 #, c-format
@@ -9026,10 +9041,10 @@ msgstr ""
 "ספאם באמצעות Bogofilter. עליך להתקין Bogofilter באופן מקומי.\n"
 "\n"
 "בטרם תהיה ביכולתה של Bogofilter לזהות הודעות ספאם, עליך לאמנה על ידי סיווג "
-"כמה מאות הודעות ספאם והודעות לגיטימיות בעזרת הפעולות \"/סמן/סמן כספאם\" וגם "
-"\"/סמן/סמן כלגיטימית\".\n"
+"כמה מאות הודעות ספאם והודעות לגיטימיות בעזרת הפעולות \"/סמן/סמן בתור ספאם\" "
+"וגם \"/סמן/סמן בתור לגיטימית\".\n"
 "\n"
-"כאשר הודעה מזוהה כספאם זו יכולה להימחק או להישמר בתיקייה מיועדת באופן "
+"כאשר הודעה מזוהה בתור ספאם זו יכולה להימחק או להישמר בתיקייה מיועדת באופן "
 "מיוחד.\n"
 "\n"
 "ניתן למצוא אפשרויות בתוך /תצורה/העדפות/תוספות/Bogofilter"
@@ -9062,11 +9077,11 @@ msgstr "גודל מרבי"
 #: src/plugins/bsfilter/bsfilter_gtk.c:160
 #: src/plugins/spamassassin/spamassassin_gtk.c:367
 msgid "Messages larger than this will not be checked"
-msgstr "הודעות שגדולות יותר מן זה לא יבדקו"
+msgstr "הודעות שגדולות יותר מזה לא יבדקו"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:170
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1487
+#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1483
 msgid "KB"
 msgstr "ק״ב"
 
@@ -9087,7 +9102,7 @@ msgstr "תיקייה לאחסון ספאם מזוהה. השאר ריק לשימ
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
 #: src/plugins/spamassassin/spamassassin_gtk.c:422
 msgid "Click this button to select a folder for storing spam"
-msgstr "לחץ על לחצן זה כדי לבחור תיקייה לאחסון ספאם."
+msgstr "לחץ על לחצן זה כדי לבחור תיקייה לאחסון ספאם"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:198
 msgid "When unsure, move to"
@@ -9128,8 +9143,8 @@ msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
 msgstr ""
-"הודעות שבאות מן אנשי קשר שבתוך ספר כתובות יתקבלו בתוך התיקייה הרגילה אפילו "
-"אם אלו הובחנו כספאם"
+"הודעות שבאות מאת אנשי קשר שבתוך ספר כתובות יתקבלו בתוך התיקייה הרגילה אפילו "
+"אם אלו הובחנו בתור ספאם"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:238
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
@@ -9140,7 +9155,7 @@ msgstr "הקלק על לחצן זה כדי לבחור ספר או תיקייה 
 #: src/plugins/bogofilter/bogofilter_gtk.c:240
 #: src/plugins/bsfilter/bsfilter_gtk.c:207
 msgid "Learn whitelisted emails as ham"
-msgstr "למד דוא״ל ברשימה לבנה כלגיטימיות"
+msgstr "למד דוא״ל ברשימה לבנה בתור לגיטימיות"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:242
 msgid ""
@@ -9162,7 +9177,7 @@ msgstr "נתיב אל קובץ בר יישום של bogofilter"
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
 #: src/plugins/spamassassin/spamassassin_gtk.c:429
 msgid "Mark spam as read"
-msgstr "סמן ספאם כ־נקרא"
+msgstr "סמן ספאם בתור נקראה"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:209
 msgid ""
@@ -9187,11 +9202,11 @@ msgstr "‏Bsfilter"
 # What are bodies?
 #: src/plugins/bsfilter/bsfilter.c:299
 msgid "Bsfilter: fetching body..."
-msgstr "‫Bsfilter: מושך כעת גופים..."
+msgstr "‫Bsfilter: כעת מושך גופים..."
 
 #: src/plugins/bsfilter/bsfilter.c:308
 msgid "Bsfilter: filtering message..."
-msgstr "‫Bsfilter: מסנן כעת הודעות..."
+msgstr "‫Bsfilter: כעת מסנן הודעות..."
 
 # משום דואר
 #: src/plugins/bsfilter/bsfilter.c:393
@@ -9203,8 +9218,8 @@ msgid ""
 msgstr ""
 "התוספת Bsfilter לא יכלה לסנן הודעה. הגורם המסתבר של השגיאה הוא שזו לא למדה "
 "מאף דואר.\n"
-"עליך לעשות שימוש בפעולות \"/סמן/סמן כספאם\" וגם \"/סמן/סמן כלגיטימית\" בכדי "
-"לאמן את Bsfilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
+"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור לגיטימית"
+"\" בכדי לאמן את Bsfilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
 
 #: src/plugins/bsfilter/bsfilter.c:400
 #, c-format
@@ -9216,7 +9231,7 @@ msgstr "התוספת Bsfilter לא יכלה לסנן הודעה. הפקודה `%
 # (התוספת) לומדת(?)
 #: src/plugins/bsfilter/bsfilter.c:501
 msgid "Bsfilter: learning from message..."
-msgstr "‫Bsfilter: לומד כעת מן הודעה..."
+msgstr "‫Bsfilter: כעת לומד מתוך הודעה..."
 
 # בטרם Bogofilter תוכל
 # התווית כמה מאות
@@ -9239,10 +9254,10 @@ msgstr ""
 "ספאם באמצעות Bsfilter. עליך להתקין Bsfilter באופן מקומי.\n"
 "\n"
 "בטרם תהיה ביכולתה של Bsfilter לזהות הודעות ספאם, עליך לאמנה על ידי סיווג כמה "
-"מאות הודעות ספאם והודעות לגיטימיות בעזרת הפעולות \"/סמן/סמן כספאם\" וגם \"/"
-"סמן/סמן כלגיטימית\".\n"
+"מאות הודעות ספאם והודעות לגיטימיות בעזרת הפעולות \"/סמן/סמן בתר ספאם\" וגם "
+"\"/סמן/סמן בתור לגיטימית\".\n"
 "\n"
-"כאשר הודעה מזוהה כספאם זו יכולה להימחק או להישמר בתיקייה מיועדת באופן "
+"כאשר הודעה מזוהה בתור ספאם זו יכולה להימחק או להישמר בתיקייה מיועדת באופן "
 "מיוחד.\n"
 "\n"
 "ניתן למצוא אפשרויות בתוך /תצורה/העדפות/תוספות/Bsfilter"
@@ -9288,7 +9303,7 @@ msgstr ""
 
 #: src/plugins/clamd/clamav_plugin.c:161
 msgid "ClamAV: scanning message..."
-msgstr "‏ClamAV: סורק כעת הודעה..."
+msgstr "‏ClamAV: כעת סורק הודעה..."
 
 #: src/plugins/clamd/clamav_plugin.c:262
 msgid "Failed to register mail filtering hook"
@@ -9350,7 +9365,7 @@ msgstr ""
 "לפחות צריכים לתת הרשאות הוצאה לפועל\n"
 "בתיקיות אלו.\n"
 "\n"
-"כדי להימנע משינוי הרשאות ביכולתך להגדיר את\n"
+"כדי להימנע משינוי הרשאות באפשרותך להגדיר את\n"
 "השדון clamav-daemon לתקשר דרך socket\n"
 "של TCP ולבחור תצורה ידנית עבור clamd.\n"
 "\n"
@@ -9467,7 +9482,7 @@ msgid ""
 "%s: Unable to open\n"
 "clamd will be disabled"
 msgstr ""
-"‏%s: לא ניתן לפתוח\n"
+"‏%s: אין אפשרות לפתוח\n"
 "‏clamd ינוטרל"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:215
@@ -9476,12 +9491,12 @@ msgid ""
 "%s: Not able to find required information\n"
 "clamd will be disabled"
 msgstr ""
-"‏%s: לא ניתן למצוא מידע מבוקש\n"
+"‏%s: אין אפשרות למצוא מידע מבוקש\n"
 "‏clamd ינוטרל"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:249
 msgid "Could not create socket"
-msgstr "לא היה ניתן ליצור socket"
+msgstr "לא היתה אפשרות ליצור socket"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:420
 msgid ": File does not exist"
@@ -9526,95 +9541,95 @@ msgstr ""
 "\n"
 "זו לא באמת שימושית."
 
-#: src/plugins/fancy/fancy_viewer.c:391
+#: src/plugins/fancy/fancy_viewer.c:392
 msgid "Remote content loading is disabled."
 msgstr "טעינת תוכן מרוחק הינה מנוטרלת."
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:469
 msgid "Load images"
 msgstr "הטען תמונות"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:471
 msgid "Enable remote content"
 msgstr "אפשר תוכן מרוחק"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:473
 msgid "Enable Javascript"
 msgstr "אפשר Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:475
 msgid "Enable Plugins"
 msgstr "אפשר תוספות"
 
-#: src/plugins/fancy/fancy_viewer.c:476
+#: src/plugins/fancy/fancy_viewer.c:477
 msgid "Enable Java"
 msgstr "אפשר Java"
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:479
 msgid "Open links with external browser"
 msgstr "פתח קישורים בדפדפן חיצוני"
 
-#: src/plugins/fancy/fancy_viewer.c:647
+#: src/plugins/fancy/fancy_viewer.c:648
 #, c-format
 msgid "An error occurred: %d\n"
-msgstr "ארעה שגיאה: %d\n"
+msgstr "אירעה שגיאה: %d\n"
 
 # הזנה
-#: src/plugins/fancy/fancy_viewer.c:698
+#: src/plugins/fancy/fancy_viewer.c:704
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "‏%s הינו ערוץ פגום או שאינו נתמך"
 
-#: src/plugins/fancy/fancy_viewer.c:709
+#: src/plugins/fancy/fancy_viewer.c:715
 msgid "Search the Web"
 msgstr "חפש ברשת"
 
-#: src/plugins/fancy/fancy_viewer.c:721
+#: src/plugins/fancy/fancy_viewer.c:727
 msgid "Open in Viewer"
 msgstr "פתח בתוך צופה"
 
-#: src/plugins/fancy/fancy_viewer.c:723
+#: src/plugins/fancy/fancy_viewer.c:729
 msgid "Open in Viewer (enable remote content)"
 msgstr "פתח בתוך צופה (אפשר תוכן מרוחק)"
 
-#: src/plugins/fancy/fancy_viewer.c:732
+#: src/plugins/fancy/fancy_viewer.c:738
 msgid "Open in Browser"
 msgstr "פתח בתוך דפדפן"
 
-#: src/plugins/fancy/fancy_viewer.c:742
+#: src/plugins/fancy/fancy_viewer.c:748
 msgid "Open Image"
 msgstr "פתח תמונה"
 
-#: src/plugins/fancy/fancy_viewer.c:751
+#: src/plugins/fancy/fancy_viewer.c:757
 msgid "Copy Link"
 msgstr "העתק קישור"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:761
 msgid "Download Link"
 msgstr "הורד קישור"
 
-#: src/plugins/fancy/fancy_viewer.c:766
+#: src/plugins/fancy/fancy_viewer.c:772
 msgid "Save Image As"
 msgstr "שמור תמונה בשם"
 
-#: src/plugins/fancy/fancy_viewer.c:776
+#: src/plugins/fancy/fancy_viewer.c:782
 msgid "Copy Image"
 msgstr "העתק תמונה"
 
-#: src/plugins/fancy/fancy_viewer.c:794
+#: src/plugins/fancy/fancy_viewer.c:800
 msgid "Import feed"
 msgstr "יבא ערוץ"
 
 # מגונדר
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1013
 msgid "Fancy"
 msgstr "מהודר"
 
-#: src/plugins/fancy/fancy_viewer.c:1032
+#: src/plugins/fancy/fancy_viewer.c:1038
 msgid "Fancy HTML Viewer"
 msgstr "‏Fancy צופה HTML"
 
-#: src/plugins/fancy/fancy_viewer.c:1037
+#: src/plugins/fancy/fancy_viewer.c:1043
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -9816,7 +9831,7 @@ msgstr "תוספת GData: מאומת\n"
 msgid "GData plugin: Starting async authentication\n"
 msgstr "תוספת GData: מתחיל כעת אימות async\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:78 src/prefs_account.c:1724
+#: src/plugins/gdata/cm_gdata_prefs.c:78 src/prefs_account.c:1720
 msgid "Authentication"
 msgstr "אימות"
 
@@ -9826,7 +9841,7 @@ msgid "Username:"
 msgstr "שם משתמש:"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:91
-#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1601
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1413
 msgid "Password:"
 msgstr "סיסמה:"
 
@@ -9850,12 +9865,11 @@ msgid ""
 "GData Plugin: Failed to write plugin configuration to file\n"
 msgstr ""
 "\n"
-"תוספת GData: נכשלה לכתוב תצורת תוספת אל קובץ\n"
+"תוספת GData: כשל בכתיבת תצורת תוספת אל קובץ\n"
 
 #: src/plugins/gdata/gdata_plugin.c:107
-#, fuzzy
 msgid "Failed to register address completion hook in the GData plugin"
-msgstr "נכשל לרשום hook השלמת כתובת בתוך תוספת GData "
+msgstr ""
 
 #: src/plugins/gdata/gdata_plugin.c:114
 msgid "Failed to register offline switch hook in the GData plugin"
@@ -9911,29 +9925,29 @@ msgstr ""
 "במידה ותיבת הדואר הקיימת תצוין, זו\n"
 "תיסרק באופן אוטומטי."
 
-#: src/plugins/mailmbox/plugin_gtk.c:323
+#: src/plugins/mailmbox/plugin_gtk.c:322
 #, c-format
 msgid ""
 "All folder(s) and message(s) under '%s' will be deleted.\n"
 "Do you really want to delete?"
 msgstr ""
 "כל תיקייה וכל הודעה תחת '%s' תימחק.\n"
-"האם באמת שברצונך למחוק?"
+"האם אתה בטוח כי ברצונך למחוק?"
 
-#: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
+#: src/plugins/newmail/newmail.c:111 src/plugins/newmail/newmail.c:162
 msgid "NewMail"
 msgstr "‏NewMail"
 
-#: src/plugins/newmail/newmail.c:115
+#: src/plugins/newmail/newmail.c:116
 msgid "Failed to register newmail hook"
 msgstr ""
 
-#: src/plugins/newmail/newmail.c:132
+#: src/plugins/newmail/newmail.c:137 src/plugins/newmail/newmail.c:140
 #, c-format
 msgid "Could not open log file %s: %s\n"
-msgstr "לא היה ניתן לפתוח קובץ יומן %s: %s\n"
+msgstr "לא היתה אפשרות לפתוח קובץ יומן %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:145
+#: src/plugins/newmail/newmail.c:154
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -9943,8 +9957,13 @@ msgid ""
 "\n"
 "Current log is %s"
 msgstr ""
+"תוספת זו רושמת תקורת תמצית אל קובץ יומן עבור כל דואר מתקבל עובר מיון.\n"
+"\n"
+"ברירת מחדל היא ‎~/Mail/NewLog\n"
+"\n"
+"יומן נוכחי %s"
 
-#: src/plugins/newmail/newmail.c:179
+#: src/plugins/newmail/newmail.c:188
 msgid "Log file"
 msgstr "קובץ יומן"
 
@@ -10069,6 +10088,11 @@ msgstr "הודעה לא מוכרת חדשה"
 msgid "Unknown message type arrived"
 msgstr "הודעה מטיפוס לא מוכר הגיעה"
 
+#: src/plugins/notification/notification_popup.c:381
+#: src/plugins/notification/notification_trayicon.c:647
+msgid "Present main window"
+msgstr "הצג חלון ראשי"
+
 #: src/plugins/notification/notification_popup.c:491
 msgid "Mail message"
 msgstr "הודעת דואר"
@@ -10128,7 +10152,7 @@ msgid "Popup"
 msgstr "תיבה מוקפצת"
 
 #: src/plugins/notification/notification_prefs.c:464 src/prefs_actions.c:263
-#: src/prefs_receive.c:147
+#: src/prefs_receive.c:133
 msgid "Command"
 msgstr "פקודה"
 
@@ -10151,7 +10175,7 @@ msgid ""
 "Notification Plugin: Failed to write plugin configuration to file\n"
 msgstr ""
 "\n"
-"תוספת התראה: נכשלה לכתוב תצורת תוספת אל קובץ\n"
+"תוספת התראה: כשל בכתיבת תצורת תוספת אל קובץ\n"
 
 #: src/plugins/notification/notification_prefs.c:597
 msgid "Include folder types"
@@ -10198,12 +10222,12 @@ msgid "Show banner"
 msgstr "הצג כרזה"
 
 #: src/plugins/notification/notification_prefs.c:746
-#: src/plugins/pgpcore/select-keys.c:242 src/plugins/pgpcore/sgpgme.c:144
-#: src/prefs_receive.c:197 src/prefs_summaries.c:462
+#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:144
+#: src/prefs_receive.c:183 src/prefs_summaries.c:462
 msgid "Never"
 msgstr "אף פעם"
 
-#: src/plugins/notification/notification_prefs.c:748 src/prefs_receive.c:195
+#: src/plugins/notification/notification_prefs.c:748 src/prefs_receive.c:181
 #: src/prefs_summaries.c:444 src/prefs_summaries.c:463
 msgid "Always"
 msgstr "תמיד"
@@ -10252,7 +10276,7 @@ msgstr "כלול רק תיקיות נבחרות"
 #: src/plugins/notification/notification_prefs.c:1318
 #: src/plugins/notification/notification_prefs.c:1553
 msgid "Select folders..."
-msgstr "בחר תיקיות..."
+msgstr "בחירת תיקיות..."
 
 #: src/plugins/notification/notification_prefs.c:858
 #: src/plugins/notification/notification_prefs.c:1078
@@ -10420,7 +10444,7 @@ msgstr "_דוא״ל"
 
 #: src/plugins/notification/notification_trayicon.c:117
 msgid "E_mail from account"
-msgstr "דו_א״ל מן חשבון"
+msgstr "דו_א״ל מתוך חשבון"
 
 #: src/plugins/notification/notification_trayicon.c:118
 msgid "Open A_ddressbook"
@@ -10428,9 +10452,8 @@ msgstr "פתח ספר כ_תובות"
 
 #: src/plugins/notification/notification_trayicon.c:119
 msgid "E_xit Claws Mail"
-msgstr "י_ציאה מן Claws Mail"
+msgstr "_צא מתוך Claws Mail"
 
-# עבודה בצורה לא־מקוונת
 #: src/plugins/notification/notification_trayicon.c:124
 msgid "_Work Offline"
 msgstr "_עבוד לא־מקוון"
@@ -10518,83 +10541,83 @@ msgstr "פורמט:"
 msgid "Optimized:"
 msgstr "מיועל:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1165
+#: src/plugins/pdf_viewer/poppler_viewer.c:1181
 msgid "PDF properties"
 msgstr "מאפייני PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1263
+#: src/plugins/pdf_viewer/poppler_viewer.c:1279
 msgid "Loading..."
-msgstr "טוען כעת..."
+msgstr "כעת טוען..."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1322
+#: src/plugins/pdf_viewer/poppler_viewer.c:1338
 #, c-format
 msgid "%s Document"
 msgstr "%s מסמך"
 
 # typo: out of
-#: src/plugins/pdf_viewer/poppler_viewer.c:1328
+#: src/plugins/pdf_viewer/poppler_viewer.c:1344
 #, c-format
 msgid "of %d"
 msgstr "מתוך %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1705
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1721
+#: src/plugins/pdf_viewer/poppler_viewer.c:1943
 msgid "Document Index"
 msgstr "אינדקס מסמך"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1895
+#: src/plugins/pdf_viewer/poppler_viewer.c:1911
 msgid "First Page"
 msgstr "עמוד ראשון"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1898
+#: src/plugins/pdf_viewer/poppler_viewer.c:1914
 msgid "Previous Page"
 msgstr "עמוד קודם"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1901
+#: src/plugins/pdf_viewer/poppler_viewer.c:1917
 msgid "Next Page"
 msgstr "עמוד בא"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1904
+#: src/plugins/pdf_viewer/poppler_viewer.c:1920
 msgid "Last Page"
 msgstr "עמוד אחרון"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1907
+#: src/plugins/pdf_viewer/poppler_viewer.c:1923
 msgid "Zoom In"
 msgstr "זום פנימה"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1909
+#: src/plugins/pdf_viewer/poppler_viewer.c:1925
 msgid "Zoom Out"
 msgstr "זום החוצה"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1912
+#: src/plugins/pdf_viewer/poppler_viewer.c:1928
 msgid "Fit Page"
 msgstr "התאמה לעמוד"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1915
+#: src/plugins/pdf_viewer/poppler_viewer.c:1931
 msgid "Fit Page Width"
 msgstr "התאמה לרוחב עמוד"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1918
+#: src/plugins/pdf_viewer/poppler_viewer.c:1934
 msgid "Rotate Left"
 msgstr "סיבוב לשמאל"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1921
+#: src/plugins/pdf_viewer/poppler_viewer.c:1937
 msgid "Rotate Right"
 msgstr "סיבוב לימין"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1940
 msgid "Document Info"
 msgstr "מידע מסמך"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1929
+#: src/plugins/pdf_viewer/poppler_viewer.c:1945
 msgid "Page Number"
 msgstr "מספר עמוד"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1931
+#: src/plugins/pdf_viewer/poppler_viewer.c:1947
 msgid "Zoom Factor"
 msgstr "זום"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2036
+#: src/plugins/pdf_viewer/poppler_viewer.c:2052
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -10608,13 +10631,13 @@ msgstr ""
 "כל משוב יתקבל בברכה: iwkse at claws-mail.org"
 
 # קורא
-#: src/plugins/pdf_viewer/poppler_viewer.c:2042
-#: src/plugins/pdf_viewer/poppler_viewer.c:2050
-#: src/plugins/pdf_viewer/poppler_viewer.c:2070
+#: src/plugins/pdf_viewer/poppler_viewer.c:2058
+#: src/plugins/pdf_viewer/poppler_viewer.c:2066
+#: src/plugins/pdf_viewer/poppler_viewer.c:2086
 msgid "PDF Viewer"
 msgstr "מציג PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2046
+#: src/plugins/pdf_viewer/poppler_viewer.c:2062
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -10623,50 +10646,79 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"אזהרה: לא היה ניתן למצוא בינארי ghostscript (gs) הנדרש עבור תוספת %s כדי "
+"אזהרה: לא היתה אפשרות למצוא בינארי ghostscript ‏(gs) הנדרש עבור תוספת %s כדי "
 "לעבד תצריפי PostScript, רק תצריפי PDF יוצגו. כדי לאפשר תמיכת PostScript נא "
 "להתקין תוכנית gs.\n"
 "\n"
 "%s"
 
-#: src/plugins/python/python_plugin.c:338
-#: src/plugins/python/python_plugin.c:482
+#: src/plugins/python/python_plugin.c:358
+#: src/plugins/python/python_plugin.c:502
 msgid "Python scripts"
 msgstr "תסריטי Python"
 
-#: src/plugins/python/python_plugin.c:477
+#: src/plugins/python/python_plugin.c:497
 msgid "Show Python console..."
 msgstr "הצגת מסוף Python..."
 
-#: src/plugins/python/python_plugin.c:483
+#: src/plugins/python/python_plugin.c:503
 msgid "Refresh"
 msgstr "רענון"
 
-#: src/plugins/python/python_plugin.c:485 src/prefs_account.c:2488
-#: src/prefs_account.c:2510 src/prefs_account.c:2769 src/wizard.c:1379
-#: src/wizard.c:1658
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2480
+#: src/prefs_account.c:2502 src/prefs_account.c:2761 src/wizard.c:1191
+#: src/wizard.c:1465
 msgid "Browse"
 msgstr "   עיון   "
 
-#: src/plugins/python/python_plugin.c:548
-#: src/plugins/python/python_plugin.c:602
+#: src/plugins/python/python_plugin.c:646
+#: src/plugins/python/python_plugin.c:725
 #, fuzzy
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:554
+#: src/plugins/python/python_plugin.c:652
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:607
+#: src/plugins/python/python_plugin.c:730
 msgid ""
 "This plugin provides Python integration features.\n"
+"Python code can be entered interactively into an embedded Python console, "
+"under Tools -> Show Python console, or stored in scripts.\n"
+"\n"
+"These scripts are then available via the menu. You can assign keyboard "
+"shortcuts to them just like it is done with other menu items. You can also "
+"put buttons for script invokation into the toolbars using Claws Mail's "
+"builtin toolbar editor.\n"
+"\n"
+"You can provide scripts working on the main window by placing files into ~/."
+"claws-mail/python-scripts/main.\n"
+"\n"
+"You can also provide scripts working on an open compose window by placing "
+"files into ~/.claws-mail/python-scripts/compose.\n"
+"\n"
+"The folder ~/.claws-mail/python-scripts/auto/ may contain some scripts that "
+"are automatically executed when certain events occur. Currently, the "
+"following files in this directory are recognised:\n"
+"\n"
+"compose_any\n"
+"Gets executed whenever a compose window is opened, no matterif that opening "
+"happened as a result of composing a new message,replying or forwarding a "
+"message.\n"
+"\n"
+"startup\n"
+"Executed at plugin load\n"
+"\n"
+"shutdown\n"
+"Executed at plugin unload\n"
+"\n"
 "\n"
 "For the most up-to-date API documentation, type\n"
 "\n"
 " help(clawsmail)\n"
 "\n"
-"in the interactive Python console under Tools -> Show Python console.\n"
+"in the interactive Python console.\n"
 "\n"
 "The source distribution of this plugin comes with various example scripts in "
 "the \"examples\" subdirectory. If you wrote a script that you would be "
@@ -10675,21 +10727,8 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"תוספת זו מספקת תכונות שילוב Python.\n"
-"\n"
-"לתיעוד עדכני ביותר API, הדפס\n"
-"\n"
-" help(clawsmail)\n"
-"\n"
-"במסוף Python אינטראקטיבי תחת כלים -> הצגת מסוף Python.\n"
-"\n"
-"תפוצת המקור של תוספת זו באה עם תסריטי דוגמא שונים בתיקיית המשנה \"examples"
-"\". במידה וכתבת תסריט שיש לך עניין לשתפו, הרגש חופשי לשלוחו אליי כדי שאני "
-"אשקול אותו להכללה בתוך הדוגמאות.\n"
-"\n"
-"משוב אל <berndth at gmx.de> מקודם בברכה."
 
-#: src/plugins/python/python_plugin.c:636
+#: src/plugins/python/python_plugin.c:781
 msgid "Python integration"
 msgstr "שילוב Python"
 
@@ -10697,11 +10736,11 @@ msgstr "שילוב Python"
 msgid "Passphrase"
 msgstr "מימרת־סיסמה"
 
-#: src/plugins/pgpcore/passphrase.c:253
+#: src/plugins/pgpcore/passphrase.c:249
 msgid "[no user id]"
 msgstr "[אין מזהה משתמש]"
 
-#: src/plugins/pgpcore/passphrase.c:264
+#: src/plugins/pgpcore/passphrase.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the "
@@ -10714,11 +10753,11 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:267
+#: src/plugins/pgpcore/passphrase.c:263
 msgid "Passphrases did not match.\n"
 msgstr "מימרות סיסמה לא תאמו.\n"
 
-#: src/plugins/pgpcore/passphrase.c:270
+#: src/plugins/pgpcore/passphrase.c:266
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the "
@@ -10731,7 +10770,7 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:274
+#: src/plugins/pgpcore/passphrase.c:270
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
@@ -10744,7 +10783,7 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:277
+#: src/plugins/pgpcore/passphrase.c:273
 msgid "Bad passphrase.\n"
 msgstr "מימרת־סיסמה רעה.\n"
 
@@ -10759,7 +10798,7 @@ msgid ""
 "from a keyserver?"
 msgstr ""
 "מפתח זה אינו מצוי בתוך מחזיק המפתחות שלך. האם ברצונך מן Claws Mail לנסות "
-"לייבאו מן שרת מפתחות?"
+"לייבא אותו מתוך שרת מפתחות?"
 
 #: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:201
 msgid ""
@@ -10809,7 +10848,7 @@ msgstr "   מפתח זה יובא אל מחזיק המפתחות שלך.\n"
 
 #: src/plugins/pgpcore/pgp_viewer.c:188
 msgid "   This key couldn't be imported to your keyring.\n"
-msgstr "   מפתח זה לא היה ניתן לייבוא אל מחזיק המפתחות שלך.\n"
+msgstr "   מפתח זה לא היה אפשרי לייבוא אל מחזיק המפתחות שלך.\n"
 
 #: src/plugins/pgpcore/pgp_viewer.c:189
 msgid "   Key servers are sometimes slow.\n"
@@ -10821,7 +10860,7 @@ msgid ""
 "\n"
 "     "
 msgstr ""
-"   ביכולתך לנסות לייבאו ידנית בעזרת הפקודה:\n"
+"   באפשרותך לנסות לייבא אותו ידנית בעזרת הפקודה:\n"
 "\n"
 "     "
 
@@ -10857,7 +10896,7 @@ msgstr ""
 "ניתן למצוא אפשרויות בתוך /תצורה/העדפות/תוספות/GPG וגם /תצורה/[העדפות חשבון]/"
 "תוספות/GPG\n"
 "\n"
-"התוספת עושה שימוש בספרייה GPGME כעטיפה עבור GnuPG.\n"
+"התוספת עושה שימוש בספרייה GPGME בתור מעטפת עבור GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
@@ -10886,7 +10925,7 @@ msgstr "פוקעת לאחר"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "הגדרה אל '0' תאחסן את מימרת הסיסמה לכל הסשן"
 
-#: src/plugins/pgpcore/prefs_gpg.c:145 src/prefs_receive.c:173
+#: src/plugins/pgpcore/prefs_gpg.c:145 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "דקה(ות)"
 
@@ -10940,55 +10979,55 @@ msgstr "אין תיאום מדויק עבור '%s'; אנא בחר את המפת
 #: src/plugins/pgpcore/select-keys.c:98
 #, c-format
 msgid "Collecting info for '%s' ... %c"
-msgstr "אוסף כעת מידע עבור '%s' ... %c"
+msgstr "כעת אוסף מידע עבור '%s' ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:142
 msgid "Undefined"
 msgstr "לא מוגדר"
 
-#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:146
+#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:146
 msgid "Marginal"
 msgstr "שולי"
 
-#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:150
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:150
 msgid "Ultimate"
 msgstr "סופי"
 
-#: src/plugins/pgpcore/select-keys.c:370
+#: src/plugins/pgpcore/select-keys.c:366
 msgid "Select Keys"
 msgstr "בחר מפתחות"
 
-#: src/plugins/pgpcore/select-keys.c:397
+#: src/plugins/pgpcore/select-keys.c:393
 msgid "Key ID"
 msgstr "מזהה מפתח"
 
-#: src/plugins/pgpcore/select-keys.c:400
+#: src/plugins/pgpcore/select-keys.c:396
 msgid "Trust"
 msgstr "בטח"
 
-#: src/plugins/pgpcore/select-keys.c:425
+#: src/plugins/pgpcore/select-keys.c:421
 msgid "_Other"
 msgstr "_אחר"
 
-#: src/plugins/pgpcore/select-keys.c:426
+#: src/plugins/pgpcore/select-keys.c:422
 msgid "Do_n't encrypt"
 msgstr "א_ל תצפין"
 
-#: src/plugins/pgpcore/select-keys.c:585
+#: src/plugins/pgpcore/select-keys.c:581
 msgid "Add key"
 msgstr "הוסף מפתח"
 
-#: src/plugins/pgpcore/select-keys.c:586
+#: src/plugins/pgpcore/select-keys.c:582
 msgid "Enter another user or key ID:"
 msgstr "הזן משתמש או מזהה מפתח אחר:"
 
-#: src/plugins/pgpcore/select-keys.c:608
-#, fuzzy, c-format
+#: src/plugins/pgpcore/select-keys.c:604
+#, c-format
 msgid "Encrypt to %s <%s>"
-msgstr "הצפן עבור %s ‫<%s>"
+msgstr "הצפן אל %s ‏<%s>"
 
 # לנצלו
-#: src/plugins/pgpcore/select-keys.c:609
+#: src/plugins/pgpcore/select-keys.c:605
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -11024,32 +11063,32 @@ msgstr "החתימה לא נבדקה."
 
 #: src/plugins/pgpcore/sgpgme.c:198 src/plugins/pgpcore/sgpgme.c:200
 msgid "PGP Core: Can't get key - no gpg-agent running."
-msgstr "‫PGP Core: לא ניתן להשיג מפתח - אין סוכן gpg-agent שמורץ כעת."
+msgstr "‫PGP Core: אין אפשרות להשיג מפתח - אין סוכן gpg-agent שמורץ כעת."
 
 #: src/plugins/pgpcore/sgpgme.c:215
 #, c-format
 msgid "Good signature from %s."
-msgstr "חתימה טובה מן %s."
+msgstr "חתימה טובה מאת %s."
 
 #: src/plugins/pgpcore/sgpgme.c:222
 #, c-format
 msgid "Good signature (untrusted) from %s."
-msgstr "חתימה טובה (לא מהימנה) מן %s."
+msgstr "חתימה טובה (לא מהימנה) מאת %s."
 
 #: src/plugins/pgpcore/sgpgme.c:227
 #, c-format
 msgid "Expired signature from %s."
-msgstr "חתימה פקועה מן %s."
+msgstr "חתימה פקועה מאת %s."
 
 #: src/plugins/pgpcore/sgpgme.c:230
 #, c-format
 msgid "Expired key from %s."
-msgstr "מפתח פקוע מן %s."
+msgstr "מפתח פקוע מאת %s."
 
 #: src/plugins/pgpcore/sgpgme.c:233
 #, c-format
 msgid "Bad signature from %s."
-msgstr "חתימה רעה מן %s."
+msgstr "חתימה רעה מאת %s."
 
 #: src/plugins/pgpcore/sgpgme.c:237
 #, c-format
@@ -11068,27 +11107,27 @@ msgstr "שגיאה בבדיקת חתימה: %s\n"
 #: src/plugins/pgpcore/sgpgme.c:299
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
-msgstr "חתימה נוצרה על %s באמצעות %s מזהה מפתח %s\n"
+msgstr "חתימה נוצרה ביום %s באמצעות %s מזהה מפתח %s\n"
 
 #: src/plugins/pgpcore/sgpgme.c:306
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
-msgstr "חתימה טובה מן uid ‫\"%s\" (תקפות: %s)\n"
+msgstr "חתימה טובה מאת מזהה משתמש (uid) ‫\"%s\" (תקפות: %s)\n"
 
 #: src/plugins/pgpcore/sgpgme.c:311
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
-msgstr "חתימה פקועה מן uid ‫\"%s\" (תקפות: %s)\n"
+msgstr "חתימה פקועה מאת מזהה משתמש (uid) ‫\"%s\" (תקפות: %s)\n"
 
 #: src/plugins/pgpcore/sgpgme.c:316
 #, c-format
 msgid "BAD signature from \"%s\"\n"
-msgstr "חתימה רעה מן \"%s\"\n"
+msgstr "חתימה רעה מאת \"%s\"\n"
 
 #: src/plugins/pgpcore/sgpgme.c:327
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
-msgstr "                    ‏uid ‫\"%s\" (תקפות: %s)\n"
+msgstr "                    ‏מזהה משתמש (uid) ‫\"%s\" (תקפות: %s)\n"
 
 #: src/plugins/pgpcore/sgpgme.c:334
 msgid "Primary key fingerprint:"
@@ -11107,12 +11146,12 @@ msgstr "כתובת חותם מאומת הינה \"%s\"\n"
 #: src/plugins/pgpcore/sgpgme.c:400
 #, c-format
 msgid "Couldn't get data from message, %s"
-msgstr "לא היה ניתן לקבל מידע מן הודעה, %s"
+msgstr "לא היתה אפשרות לקבל מידע מתוך הודעה, %s"
 
 #: src/plugins/pgpcore/sgpgme.c:416
 #, c-format
 msgid "Couldn't initialize data, %s"
-msgstr "לא היה ניתן לאתחל נתונים, %s"
+msgstr "לא היתה אפשרות לאתחל נתונים, %s"
 
 #: src/plugins/pgpcore/sgpgme.c:561
 #, c-format
@@ -11179,19 +11218,19 @@ msgstr ""
 #: src/plugins/pgpcore/sgpgme.c:817 src/plugins/pgpcore/sgpgme.c:833
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
-msgstr "לא היה ניתן לחולל צמד מפתחות חדש: %s"
+msgstr "לא היתה אפשרות לחולל צמד מפתחות חדש: %s"
 
 #: src/plugins/pgpcore/sgpgme.c:824
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr ""
-"מחולל כעת את צמד המפתחות החדש שלך... אנא הזז את העכבר סביב כדי לסייע לחולל "
+"כעת מחולל את צמד המפתחות החדש שלך... אנא הזז את העכבר סביב כדי לסייע לחולל "
 "אנטרופיה..."
 
 #: src/plugins/pgpcore/sgpgme.c:839
 msgid "Couldn't generate a new key pair: unknown error"
-msgstr "לא היה ניתן לחולל צמד מפתחות חדש: שגיאה לא מוכרת"
+msgstr "לא היתה אפשרות לחולל צמד מפתחות חדש: שגיאה לא מוכרת"
 
 #: src/plugins/pgpcore/sgpgme.c:843
 #, c-format
@@ -11216,56 +11255,56 @@ msgstr "מפתח יוצא."
 
 #: src/plugins/pgpcore/sgpgme.c:888
 msgid "Couldn't export key."
-msgstr "לא היה ניתן לייצא מפתח."
+msgstr "לא היתה אפשרות לייצא מפתח."
 
 #: src/plugins/pgpcore/sgpgme.c:892
 msgid "Key export isn't implemented in Windows."
 msgstr "ייצוא מפתח אינו מיושם תחת Windows."
 
-#: src/plugins/pgpinline/pgpinline.c:258
+#: src/plugins/pgpinline/pgpinline.c:156
 msgid "Incorrect part"
 msgstr "אזור שגוי"
 
-#: src/plugins/pgpinline/pgpinline.c:262
+#: src/plugins/pgpinline/pgpinline.c:160
 msgid "Not a text part"
 msgstr "לא אזור תמליל"
 
-#: src/plugins/pgpinline/pgpinline.c:273 src/plugins/pgpinline/pgpinline.c:430
+#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
 msgid "Couldn't get text data."
-msgstr "לא היה ניתן להשיג נתוני תמליל."
+msgstr "לא היתה אפשרות להשיג נתוני תמליל."
 
-#: src/plugins/pgpinline/pgpinline.c:291
+#: src/plugins/pgpinline/pgpinline.c:189
 msgid "Couldn't convert text data to any sane charset."
-msgstr "לא היה ניתן להמיר מידע תמליל את כל מערך תווים הגיוני כלשהו."
+msgstr "לא היתה אפשרות להמיר מידע תמליל את כל מערך תווים הגיוני כלשהו."
 
-#: src/plugins/pgpinline/pgpinline.c:299 src/plugins/pgpinline/pgpinline.c:624
-#: src/plugins/pgpinline/pgpinline.c:763 src/plugins/pgpinline/pgpinline.c:819
-#: src/plugins/pgpmime/pgpmime.c:73 src/plugins/pgpmime/pgpmime.c:182
-#: src/plugins/pgpmime/pgpmime.c:322 src/plugins/pgpmime/pgpmime.c:500
-#: src/plugins/pgpmime/pgpmime.c:644 src/plugins/smime/smime.c:406
+#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:517
+#: src/plugins/pgpinline/pgpinline.c:656 src/plugins/pgpinline/pgpinline.c:712
+#: src/plugins/pgpmime/pgpmime.c:74 src/plugins/pgpmime/pgpmime.c:183
+#: src/plugins/pgpmime/pgpmime.c:329 src/plugins/pgpmime/pgpmime.c:507
+#: src/plugins/pgpmime/pgpmime.c:651 src/plugins/smime/smime.c:395
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
-msgstr "לא היה ניתן לאתחל הקשר GPG, ‏%s"
+msgstr "לא היתה אפשרות לאתחל הקשר GPG, ‏%s"
 
-#: src/plugins/pgpinline/pgpinline.c:423
+#: src/plugins/pgpinline/pgpinline.c:316
 msgid "Couldn't parse mime part."
-msgstr "לא היה ניתן לנתח אזור mime."
+msgstr "לא היתה אפשרות לנתח אזור mime."
 
-#: src/plugins/pgpinline/pgpinline.c:453 src/plugins/pgpmime/pgpmime.c:345
+#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:352
 #, c-format
 msgid "Couldn't open decrypted file %s"
-msgstr "לא היה ניתן לפתוח קובץ מפוענח %s"
+msgstr "לא היתה אפשרות לפתוח קובץ מפוענח %s"
 
-#: src/plugins/pgpinline/pgpinline.c:470 src/plugins/pgpinline/pgpinline.c:479
-#: src/plugins/pgpinline/pgpinline.c:488 src/plugins/pgpinline/pgpinline.c:496
-#: src/plugins/pgpinline/pgpinline.c:506 src/plugins/pgpinline/pgpinline.c:515
-#: src/plugins/pgpmime/pgpmime.c:356 src/plugins/pgpmime/pgpmime.c:370
+#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
+#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
+#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
+#: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
 #, c-format
 msgid "Couldn't write to decrypted file %s"
-msgstr "לא היה ניתן לכתוב אל קובץ מפוענח %s"
+msgstr "לא היתה אפשרות לכתוב אל קובץ מפוענח %s"
 
-#: src/plugins/pgpinline/pgpinline.c:484 src/plugins/pgpinline/pgpinline.c:485
-#: src/plugins/pgpinline/pgpinline.c:486
+#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:379
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -11273,51 +11312,51 @@ msgstr ""
 "\n"
 "--- התחלה של מידע PGP/Inline מוצפן ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:502 src/plugins/pgpinline/pgpinline.c:503
-#: src/plugins/pgpinline/pgpinline.c:504
+#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:397
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- סיום של מידע PGP/Inline מוצפן ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:523 src/plugins/pgpmime/pgpmime.c:382
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:389
 #, c-format
 msgid "Couldn't close decrypted file %s"
-msgstr "לא היה ניתן לסגור קובץ מפוענח %s"
+msgstr "לא היתה אפשרות לסגור קובץ מפוענח %s"
 
-#: src/plugins/pgpinline/pgpinline.c:535
+#: src/plugins/pgpinline/pgpinline.c:428
 msgid "Couldn't scan decrypted file."
-msgstr "לא היה ניתן לנתח קובץ מפוענח."
+msgstr "לא היתה אפשרות לנתח קובץ מפוענח."
 
-#: src/plugins/pgpinline/pgpinline.c:543
+#: src/plugins/pgpinline/pgpinline.c:436
 msgid "Couldn't scan decrypted file parts."
-msgstr "לא היה ניתן לסרוק חלקי קובץ מפוענח."
+msgstr "לא היתה אפשרות לסרוק חלקי קובץ מפוענח."
 
-#: src/plugins/pgpinline/pgpinline.c:598 src/plugins/pgpinline/pgpinline.c:790
+#: src/plugins/pgpinline/pgpinline.c:491 src/plugins/pgpinline/pgpinline.c:683
 msgid "Malformed message"
 msgstr "הודעה פגומה"
 
-#: src/plugins/pgpinline/pgpinline.c:609
+#: src/plugins/pgpinline/pgpinline.c:502
 msgid "Couldn't create temporary file."
-msgstr "לא היה ניתן ליצור קובץ זמני."
+msgstr "לא היתה אפשרות ליצור קובץ זמני."
 
-#: src/plugins/pgpinline/pgpinline.c:648 src/plugins/pgpmime/pgpmime.c:527
+#: src/plugins/pgpinline/pgpinline.c:541 src/plugins/pgpmime/pgpmime.c:534
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "חתימת נתונים נכשלה, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:666 src/plugins/pgpmime/pgpmime.c:552
+#: src/plugins/pgpinline/pgpinline.c:559 src/plugins/pgpmime/pgpmime.c:559
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "חתימת נתונים נכשלה עקב חותם שגוי: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:675 src/plugins/pgpmime/pgpmime.c:561
+#: src/plugins/pgpinline/pgpinline.c:568 src/plugins/pgpmime/pgpmime.c:568
 msgid "Data signing failed, no results."
 msgstr "חתימת נתונים נכשלה, אין תוצאות."
 
-#: src/plugins/pgpinline/pgpinline.c:685 src/plugins/pgpmime/pgpmime.c:572
+#: src/plugins/pgpinline/pgpinline.c:578 src/plugins/pgpmime/pgpmime.c:579
 msgid "Data signing failed, no contents."
 msgstr "חתימת נתונים נכשלה, אין תכולות."
 
-#: src/plugins/pgpinline/pgpinline.c:729
+#: src/plugins/pgpinline/pgpinline.c:622
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
@@ -11325,22 +11364,22 @@ msgstr ""
 "לתשומת לבך: תצריפים אינם מוצפנים על ידי המערכת PGP/Inline, וגם לא תקורות של "
 "דוא״ל, כגון נושא."
 
-#: src/plugins/pgpinline/pgpinline.c:773 src/plugins/pgpmime/pgpmime.c:654
+#: src/plugins/pgpinline/pgpinline.c:666 src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
-msgstr "לא היה ניתן להוסיף מפתח GPG ‫%s, ‫%s"
+msgstr "לא היתה אפשרות להוסיף מפתח GPG ‫%s, ‫%s"
 
-#: src/plugins/pgpinline/pgpinline.c:801 src/plugins/pgpmime/pgpmime.c:683
+#: src/plugins/pgpinline/pgpinline.c:694 src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
-msgstr "לא היה ניתן ליצור קובץ זמני, %s"
+msgstr "לא היתה אפשרות ליצור קובץ זמני, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:832 src/plugins/pgpmime/pgpmime.c:710
+#: src/plugins/pgpinline/pgpinline.c:725 src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "הצפנה נכשלה, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:899
+#: src/plugins/pgpinline/pgpinline.c:793
 msgid "PGP/Inline"
 msgstr "‏PGP/Inline"
 
@@ -11363,41 +11402,41 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"התוספת מטפלת בשיטת Inline המסויגת של החתמת ו/או הצפנת דואר. ביכולתך לפענח "
+"התוספת מטפלת בשיטת Inline המסויגת של החתמת ו/או הצפנת דואר. באפשרותך לפענח "
 "דואר מוצפן, לאמת חתימות או לחתום ולהצפין את הדואר שלך.\n"
 "\n"
 "זו יכולה להיבחר כמערכת פרטיות משתמטת בתוך /תצורה/[העדפות חשבון]/פרטיות ובעת "
-"הלחנת הודעה מן /אפשרויות/מערכת פרטיות\n"
+"הלחנת הודעה מתוך /אפשרויות/מערכת פרטיות\n"
 "\n"
-"התוספת עושה שימוש בספרייה GPGME כעטיפה עבור GnuPG.\n"
+"התוספת עושה שימוש בספרייה GPGME בתור מעטפת עבור GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:202
+#: src/plugins/pgpmime/pgpmime.c:203
 msgid "Signature boundary not found."
 msgstr "גבול חתימה לא נמצא."
 
-#: src/plugins/pgpmime/pgpmime.c:394 src/plugins/smime/smime.c:487
+#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:476
 msgid "Couldn't parse decrypted file."
-msgstr "לא היה ניתן לנתח קובץ מפוענח."
+msgstr "לא היתה אפשרות לנתח קובץ מפוענח."
 
-#: src/plugins/pgpmime/pgpmime.c:400 src/plugins/smime/smime.c:494
+#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:483
 msgid "Couldn't parse decrypted file parts."
-msgstr "לא היה ניתן לנתח חלקי קובץ מפוענח."
+msgstr "לא היתה אפשרות לנתח חלקי קובץ מפוענח."
 
-#: src/plugins/pgpmime/pgpmime.c:446 src/plugins/pgpmime/pgpmime.c:485
+#: src/plugins/pgpmime/pgpmime.c:453 src/plugins/pgpmime/pgpmime.c:492
 #, c-format
 msgid "Couldn't create temporary file: %s"
-msgstr "לא היה ניתן ליצור קובץ זמני: %s"
+msgstr "לא היתה אפשרות ליצור קובץ זמני: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:610
+#: src/plugins/pgpmime/pgpmime.c:617
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
 msgstr ""
 "לצומת לבך: תקורות של דוא״ל, כגון נושא, אינן מוצפנות על ידי המערכת PGP/Mime."
 
-#: src/plugins/pgpmime/pgpmime.c:780
+#: src/plugins/pgpmime/pgpmime.c:788
 msgid "PGP/Mime"
 msgstr "‏PGP/Mime"
 
@@ -11419,13 +11458,13 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"התוספת מטפלת בדואר PGP/MIME חתום ו/או מוצפן. ביכולתך לפענח דואר מוצפן, לאמת "
+"התוספת מטפלת בדואר PGP/MIME חתום ו/או מוצפן. באפשרותך לפענח דואר מוצפן, לאמת "
 "חתימות או לחתום ולהצפין את הדואר שלך.\n"
 "\n"
 "זו יכולה להיבחר כמערכת פרטיות משתמטת בתוך /תצורה/[העדפות חשבון]/פרטיות ובעת "
-"הלחנת הודעה מן /אפשרויות/מערכת פרטיות\n"
+"הלחנת הודעה מתוך /אפשרויות/מערכת פרטיות\n"
 "\n"
-"התוספת עושה שימוש בספרייה GPGME כעטיפה עבור GnuPG.\n"
+"התוספת עושה שימוש בספרייה GPGME בתור מעטפת עבור GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
@@ -11491,15 +11530,15 @@ msgstr "ייבוא רשימת ערוצים..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:59
 msgid "Rena_me..."
-msgstr "_שנה שם..."
+msgstr "_שינוי שם..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:60
 msgid "_Create new folder..."
-msgstr "_צור תיקיה חדשה..."
+msgstr "י_צירת תיקיה חדשה..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:62
 msgid "Remove folder _tree..."
-msgstr "הסר _עץ תיקיה..."
+msgstr "הסרת _עץ תיקיה..."
 
 # תיקיית
 #: src/plugins/rssyl/rssyl_gtk.c:152
@@ -11517,7 +11556,7 @@ msgid ""
 "there?"
 msgstr ""
 "יצירה של עץ תיקיה נכשלה.\n"
-"ייתכן שחלק מן הקבצים כבר קיימים, או שאין לך את ההרשאות לכתוב שם?"
+"ייתכן כי חלק מן הקבצים כבר קיימים, או שאין לך את ההרשאות לכתוב שם?"
 
 # Neither RLM nor RLE work.  Order has been reveresed, manually.  Edit: This is still not working.
 # *try again with claws > 3.8.1
@@ -11568,11 +11607,11 @@ msgstr ""
 
 #: src/plugins/rssyl/rssyl_gtk.c:433
 msgid "<b>If an item changes, do not mark it as unread:</b>"
-msgstr "<b>אם פריט משתנה, אל תסמנו כ־לא נקרא:</b>"
+msgstr "<b>אם פריט משתנה, אל תסמנו בתור לא נקרא:</b>"
 
 #: src/plugins/rssyl/rssyl_gtk.c:443
 msgid "Always mark as unread"
-msgstr "סמן תמיד כ־לא נקרא"
+msgstr "סמן תמיד בתור לא נקרא"
 
 #: src/plugins/rssyl/rssyl_gtk.c:445
 msgid "If only its text changed"
@@ -11580,7 +11619,7 @@ msgstr "רק אם תמלילו שונה"
 
 #: src/plugins/rssyl/rssyl_gtk.c:447
 msgid "Never mark as unread"
-msgstr "לעולם אל תסמן כ־לא נקרא"
+msgstr "לעולם אל תסמן בתור לא נקרא"
 
 #: src/plugins/rssyl/rssyl_gtk.c:501
 msgid "_OK"
@@ -11596,7 +11635,7 @@ msgstr "ביטול הרשמה לערוץ"
 
 #: src/plugins/rssyl/rssyl_gtk.c:659
 msgid "Do you really want to remove feed"
-msgstr "האם באמת שברצונך להסיר ערוץ"
+msgstr "האם אתה בטוח כי ברצונך להסיר ערוץ"
 
 #: src/plugins/rssyl/rssyl_gtk.c:665
 msgid "Remove cached entries"
@@ -11611,11 +11650,11 @@ msgid ""
 "Each newsfeed will create a folder with appropriate entries, fetched from "
 "the web. You can read them, and delete or keep old entries."
 msgstr ""
-"תוספת זו מתירה לך ליצור עץ תיבת דואר מקום בו ביכולתך להוסיף ערוצי חדשות "
+"תוספת זו מתירה לך ליצור עץ תיבת דואר מקום בו באפשרותך להוסיף ערוצי חדשות "
 "בפורמט של RSS 1.0, ‏RSS 2.0 או Atom.\n"
 "\n"
-"כל ערוץ חדשות ייצור תיקיה עם הרשומות המתאימות, שנשאבו מן הרשת. ביכולתך "
-"לקרואן, וגם למחוק או לשמור רשומות ישנות."
+"כל ערוץ חדשות ייצור תיקיה עם הרשומות המתאימות, אשר נשאבו מתוך הרשת. באפשרותך "
+"לקוראן, וגם למחוק או לשמור רשומות ישנות."
 
 #: src/plugins/rssyl/plugin.c:87
 msgid "RSS feed"
@@ -11629,7 +11668,7 @@ msgstr "תם הזמן בהתקשרות אל כתובת %s\n"
 #: src/plugins/rssyl/feed.h:21
 #, c-format
 msgid "Couldn't fetch URL %s\n"
-msgstr "לא היה ניתן לתפוס URL ‫%s\n"
+msgstr "לא היתה אפשרות לתפוס URL ‫%s\n"
 
 #: src/plugins/rssyl/feed.h:22
 #, c-format
@@ -11666,7 +11705,7 @@ msgstr "הזן כתובת URL של ערוץ החדשות אליו ברצונך 
 #: src/plugins/rssyl/rssyl_cb_menu.c:138
 #, c-format
 msgid "Really remove the folder tree '%s'?\n"
-msgstr "באמת  להסיר את עץ התיקיה '%s'?\n"
+msgstr "באמת להסיר את עץ התיקיה '%s'?\n"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:139
 msgid "Remove folder tree"
@@ -11675,7 +11714,7 @@ msgstr "הסר עץ תיקיה"
 #: src/plugins/rssyl/rssyl_cb_menu.c:204
 #, c-format
 msgid "Can't remove feed '%s'."
-msgstr "לא ניתן להסיר ערוץ '%s'."
+msgstr "אין אפשרות להסיר ערוץ '%s'."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:283 src/plugins/rssyl/feed.c:1856
 msgid "Claws Mail needs network access in order to update the feed."
@@ -11685,7 +11724,7 @@ msgstr[1] "‏Claws Mail זקוק לגישת רשת תקשורת על מנת ל
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:376
 msgid "Select a .opml file"
-msgstr "בחירת קובץ opml."
+msgstr "בחירת קובץ ‎.opml"
 
 #: src/plugins/rssyl/rssyl.c:133 src/plugins/rssyl/rssyl.c:145
 msgid "Refresh all feeds"
@@ -11693,11 +11732,11 @@ msgstr "רענון כל הערוצים"
 
 #: src/plugins/rssyl/feed.c:125
 msgid "Cannot open temporary file"
-msgstr "לא ניתן לפתוח קובץ זמני"
+msgstr "אין אפשרות לפתוח קובץ זמני"
 
 #: src/plugins/rssyl/feed.c:136
 msgid "Cannot init libCURL"
-msgstr "לא ניתן לאתחל libCURL"
+msgstr "אין אפשרות לאתחל libCURL"
 
 #: src/plugins/rssyl/feed.c:231 src/plugins/vcalendar/vcal_folder.c:1593
 msgid "401 (Authorisation required)"
@@ -11719,7 +11758,7 @@ msgstr "שגיאה %ld"
 #: src/plugins/rssyl/feed.c:324
 #, c-format
 msgid "Fetching '%s'..."
-msgstr "מושך כעת '%s'..."
+msgstr "כעת מושך '%s'..."
 
 #: src/plugins/rssyl/feed.c:383
 msgid "Malformed feed"
@@ -11728,7 +11767,7 @@ msgstr "ערוץ פגום"
 #: src/plugins/rssyl/feed.c:1199
 #, c-format
 msgid "Refreshing feed '%s'..."
-msgstr "מרענן כעת ערוץ '%s'..."
+msgstr "כעת מרענן ערוץ '%s'..."
 
 #: src/plugins/rssyl/feed.c:1214
 #, c-format
@@ -11736,7 +11775,7 @@ msgid ""
 "RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
 "comments of '%s'"
 msgstr ""
-"‏RSSyl: תפיסת תגובות אינה נתמכת עבור ערוצים מטיפוס של RDF. לא ניתן לתפוס "
+"‏RSSyl: תפיסת תגובות אינה נתמכת עבור ערוצים מטיפוס של RDF. אין אפשרות לתפוס "
 "תגובות של '%s'"
 
 #: src/plugins/rssyl/feed.c:1223
@@ -11764,7 +11803,7 @@ msgid ""
 "RSSyl: Cannot update feed %s:\n"
 "%s\n"
 msgstr ""
-"‫RSSyl: לא ניתן לעדכן ערוץ %s:\n"
+"‫RSSyl: אין אפשרות לעדכן ערוץ %s:\n"
 "%s\n"
 
 #: src/plugins/rssyl/feed.c:1722
@@ -11777,7 +11816,7 @@ msgid ""
 "Couldn't fetch URL '%s':\n"
 "%s"
 msgstr ""
-"לא היה ניתן לתפוס URL ‫'%s':\n"
+"לא היתה אפשרות לתפוס URL ‫'%s':\n"
 "%s"
 
 #: src/plugins/rssyl/feed.c:1738
@@ -11786,16 +11825,16 @@ msgid ""
 "Couldn't fetch URL '%s':\n"
 "%s\n"
 msgstr ""
-"לא היה ניתן לתפוס URL ‫'%s':\n"
+"לא היתה אפשרות לתפוס URL ‫'%s':\n"
 "%s\n"
 
 #: src/plugins/rssyl/feed.c:1754
 #, c-format
 msgid "Can't subscribe feed '%s'."
-msgstr "לא ניתן להירשם אל ערוץ '%s'."
+msgstr "אין אפשרות להירשם אל ערוץ '%s'."
 
 #: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:924
+#: src/plugins/smime/smime.c:883
 msgid "S/MIME"
 msgstr "‏S/MIME"
 
@@ -11819,13 +11858,13 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"התוספת מטפלת בדואר S/MIME חתום ו/או מוצפן. ביכולתך לפענח דואר מוצפן, לאמת "
+"התוספת מטפלת בדואר S/MIME חתום ו/או מוצפן. באפשרותך לפענח דואר מוצפן, לאמת "
 "חתימות או לחתום ולהצפין את הדואר שלך.\n"
 "\n"
 "זו יכולה להיבחר כמערכת פרטיות משתמטת בתוך /תצורה/[העדפות חשבון]/פרטיות ובעת "
-"הלחנת הודעה מן /אפשרויות/מערכת פרטיות\n"
+"הלחנת הודעה מתוך /אפשרויות/מערכת פרטיות\n"
 "\n"
-"תוספת זו עושה שימוש בספרייה GPGME כעטיפה עבור.\n"
+"תוספת זו עושה שימוש בספרייה GPGME בתור מעטפת עבור.\n"
 "תוספת זו צריכה את gpgsm, ‫gnupg-agent ואת dirmngr מותקנים ומוגדרים.\n"
 "\n"
 "מידע אודות כיצד ניתן להשיג תעודות S/MIME שעובדות עם GPGSM ניתן למציאה אצל:\n"
@@ -11833,24 +11872,24 @@ msgstr ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:414
+#: src/plugins/smime/smime.c:403
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
-msgstr "לא היה ניתן להגדיר פרוטוקול GPG, ‫%s"
+msgstr "לא היתה אפשרות להגדיר פרוטוקול GPG, ‫%s"
 
-#: src/plugins/smime/smime.c:442
+#: src/plugins/smime/smime.c:431
 msgid "Couldn't open temporary file"
-msgstr "לא היה ניתן לפתוח קובץ זמני"
+msgstr "לא היתה אפשרות לפתוח קובץ זמני"
 
-#: src/plugins/smime/smime.c:453 src/plugins/smime/smime.c:468
+#: src/plugins/smime/smime.c:442 src/plugins/smime/smime.c:457
 msgid "Couldn't write to temporary file"
-msgstr "לא היה ניתן לכתוב אל קובץ זמני"
+msgstr "לא היתה אפשרות לכתוב אל קובץ זמני"
 
-#: src/plugins/smime/smime.c:479
+#: src/plugins/smime/smime.c:468
 msgid "Couldn't close temporary file"
-msgstr "לא היה ניתן לסגור קובץ זמני"
+msgstr "לא היתה אפשרות לסגור קובץ זמני"
 
-#: src/plugins/smime/smime.c:695
+#: src/plugins/smime/smime.c:684
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
@@ -11858,8 +11897,8 @@ msgstr ""
 "לצומת לבך: תקורות של דוא״ל, כגון נושא, אינן מוצפנות על ידי המערכת S/MIME."
 
 #: src/plugins/spam_report/spam_report_prefs.c:80
-#: src/plugins/spam_report/spam_report.c:340
-#: src/plugins/spam_report/spam_report.c:380
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
 msgid "SpamReport"
 msgstr "‏SpamReport"
 
@@ -11871,15 +11910,15 @@ msgstr "אפשר"
 msgid "Forward to:"
 msgstr "קדם אל:"
 
-#: src/plugins/spam_report/spam_report.c:294
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
-msgstr "מדווח כעת על ספאם..."
+msgstr "כעת מדווח על ספאם..."
 
-#: src/plugins/spam_report/spam_report.c:329
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
-msgstr "מדווח ספאם באופן מקוון..."
+msgstr "כעת מדווח ספאם באופן מקוון..."
 
-#: src/plugins/spam_report/spam_report.c:385
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -11895,7 +11934,7 @@ msgstr ""
 " * spamcop.net\n"
 " * lists.debian.org nomination system"
 
-#: src/plugins/spam_report/spam_report.c:410
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "דיווח ספאם"
 
@@ -11918,7 +11957,7 @@ msgstr "התוספת SpamAssassin מנוטרלת על ידי העדפותיה.\n
 
 #: src/plugins/spamassassin/spamassassin.c:243
 msgid "SpamAssassin: filtering message..."
-msgstr "‫SpamAssassin: מסנן כעת הודעה..."
+msgstr "‫SpamAssassin: כעת מסנן הודעה..."
 
 #: src/plugins/spamassassin/spamassassin.c:372
 msgid ""
@@ -11927,7 +11966,7 @@ msgid ""
 "accessible."
 msgstr ""
 "התוספת SpamAssassin לא יכלה לסנן הודעה. הגורם המסתבר של השגיאה הוא משום שדון "
-"spamd שאינו ניתן להשגה. אנא ודא שהשדון spamd הינו מורץ ונגיש."
+"spamd שאינו ניתן להשגה. אנא בדוק היטב כי השדון spamd הינו מורץ ונגיש."
 
 # BUG: from the remote learner? to > from
 # remote learning server
@@ -11961,14 +12000,13 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
-"תוספת זו יכולה לבדוק את כל ההודעות שמתקבלות מן חשבון IMAP, LOCAL או POP עבור "
-"ספאם באמצעות שרת SpamAssassin. על שרת SpamAssassin ‫(spamd) להיות מורץ איפה "
-"שהוא.\n"
+"תוספת זו יכולה לבדוק את כל ההודעות שמתקבלות מתוך חשבון IMAP, LOCAL או POP "
+"עבור ספאם באמצעות שרת SpamAssassin. על שרת SpamAssassin ‫(spamd) להיות מורץ "
+"איפה שהוא.\n"
 "\n"
-"ניתן להשתמש בתוספת זו לסימון הודעות כספאם או כלגיטימיות.\n"
+"ניתן להשתמש בתוספת זו לסימון הודעות בתור ספאם או לגיטימיות.\n"
 "\n"
-"כאשר הודעה מזוהה כספאם זו יכולה להימחק או להישמר בתיקייה מיועדת באופן "
-"מיוחד.\n"
+"כאשר הודעה מזוהה ספאם זו יכולה להימחק או להישמר בתיקייה מיועדת באופן מיוחד.\n"
 "\n"
 "ניתן למצוא אפשרויות בתוך /תצורה/העדפות/תוספות/SpamAssassin"
 
@@ -12022,7 +12060,6 @@ msgstr "פורט של שרת spamd"
 msgid "Path of Unix socket"
 msgstr "נתיב של Unix socket"
 
-# typo: checking
 #: src/plugins/spamassassin/spamassassin_gtk.c:387
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
@@ -12044,19 +12081,19 @@ msgstr ""
 
 #: src/plugins/tnef_parse/tnef_parse.c:116
 msgid "Failed to write the part data."
-msgstr "נכשל לרשום נתון אזור."
+msgstr "כשל ברשימת נתון אזור."
 
 #: src/plugins/tnef_parse/tnef_parse.c:158
 msgid "Failed to parse VCalendar data."
-msgstr "נכשל לנתח נתון VCalendar."
+msgstr "כשל בניתוח נתון VCalendar."
 
 #: src/plugins/tnef_parse/tnef_parse.c:194
 msgid "Failed to parse VTask data."
-msgstr "נכשל לנתח נתון VTask."
+msgstr "כשל בניתוח נתון VTask."
 
 #: src/plugins/tnef_parse/tnef_parse.c:244
 msgid "Failed to parse VCard data."
-msgstr "נכשל לנתח נתון VCard."
+msgstr "כשל בניתוח נתון VCard."
 
 #: src/plugins/tnef_parse/tnef_parse.c:380
 #: src/plugins/tnef_parse/tnef_parse.c:404
@@ -12077,15 +12114,15 @@ msgstr ""
 
 #: src/plugins/vcalendar/common-views.c:62
 msgid "_Edit this meeting..."
-msgstr "ע_רוך את מפגש זה..."
+msgstr "ע_ריכת מפגש זה..."
 
 #: src/plugins/vcalendar/common-views.c:63
 msgid "_Cancel this meeting..."
-msgstr "_בטל את מפגש זה..."
+msgstr "_ביטול מפגש זה..."
 
 #: src/plugins/vcalendar/common-views.c:65
 msgid "_Create new meeting..."
-msgstr "_צור מפגש חדש..."
+msgstr "י_צירת מפגש חדש..."
 
 #: src/plugins/vcalendar/common-views.c:67
 msgid "_Go to today"
@@ -12093,7 +12130,7 @@ msgstr "_לך אל היום"
 
 #: src/plugins/vcalendar/vcalendar.c:100
 msgid "Create meeting from message..."
-msgstr "צור מפגש מן הודעה..."
+msgstr "יצירת מפגש מתוך הודעה..."
 
 #: src/plugins/vcalendar/vcalendar.c:120
 #, c-format
@@ -12103,7 +12140,7 @@ msgstr "בחרת ליצור %d מפגשים, בזה אחר זה. האם ברצו
 
 #: src/plugins/vcalendar/vcalendar.c:139
 msgid "Creating meeting..."
-msgstr "יוצר כעת מפגש..."
+msgstr "כעת יוצר מפגש..."
 
 #: src/plugins/vcalendar/vcalendar.c:158
 msgid "no subject"
@@ -12175,7 +12212,7 @@ msgstr ""
 
 #: src/plugins/vcalendar/vcalendar.c:832
 msgid "Error - could not get the calendar MIME part."
-msgstr "שגיאה - לא היה ניתן להשיג אזור MIME של לוח שנה."
+msgstr "שגיאה - לא היתה אפשרות להשיג אזור MIME של לוח שנה."
 
 #: src/plugins/vcalendar/vcalendar.c:839
 msgid "Error - no calendar part found."
@@ -12196,7 +12233,7 @@ msgstr "ביטול מפגש"
 
 #: src/plugins/vcalendar/vcalendar.c:992
 msgid "Are you sure you want to cancel this meeting?"
-msgstr "האם אכן ברצונך לבטל את מפגש זה?"
+msgstr "האם אתה בטוח כי ברצונך לבטל את מפגש זה?"
 
 #: src/plugins/vcalendar/vcalendar.c:1087
 msgid "No account found"
@@ -12220,7 +12257,7 @@ msgstr "מענה"
 
 #: src/plugins/vcalendar/vcalendar.c:1220
 msgid "Edit meeting..."
-msgstr "ערוך מפגש..."
+msgstr "עריכת מפגש..."
 
 #: src/plugins/vcalendar/vcalendar.c:1221
 msgid "Cancel meeting..."
@@ -12235,25 +12272,25 @@ msgid "You are already busy at this time."
 msgstr "כבר יש לך עיסוק בעת זו."
 
 #: src/plugins/vcalendar/vcalendar.c:1265
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1759
 msgid "Event:"
 msgstr "אירוע:"
 
 #: src/plugins/vcalendar/vcalendar.c:1266
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1727
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1737
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1748
 msgid "Organizer:"
 msgstr "מארגן:"
 
 #: src/plugins/vcalendar/vcalendar.c:1267
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1729
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1740
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1750
 msgid "Location:"
-msgstr "מיקום:‏‪"
+msgstr "מיקום:"
 
 #: src/plugins/vcalendar/vcalendar.c:1268
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1717
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1728
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1749
 msgid "Summary:"
 msgstr "תמצית:"
 
@@ -12266,8 +12303,8 @@ msgid "Ending:"
 msgstr "מסתיים:"
 
 #: src/plugins/vcalendar/vcalendar.c:1272
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1752
 msgid "Attendees:"
 msgstr "נוכחים:"
 
@@ -12275,86 +12312,86 @@ msgstr "נוכחים:"
 msgid "Action:"
 msgstr "פעולה:"
 
-#: src/plugins/vcalendar/vcal_prefs.c:256
+#: src/plugins/vcalendar/vcal_prefs.c:258
 msgid "Reminders"
 msgstr "תזכורות"
 
-#: src/plugins/vcalendar/vcal_prefs.c:265
+#: src/plugins/vcalendar/vcal_prefs.c:267
 msgid "Alert me"
 msgstr "התרע אותי"
 
-#: src/plugins/vcalendar/vcal_prefs.c:277
+#: src/plugins/vcalendar/vcal_prefs.c:279
 msgid "minutes before an event"
 msgstr "דקות לפני אירוע"
 
-#: src/plugins/vcalendar/vcal_prefs.c:289
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Calendar export"
 msgstr "ייצוא לוח שנה"
 
-#: src/plugins/vcalendar/vcal_prefs.c:300
+#: src/plugins/vcalendar/vcal_prefs.c:302
 msgid "Automatically export calendar to"
 msgstr "יצא לוח שנה אוטומטית אל"
 
-#: src/plugins/vcalendar/vcal_prefs.c:309
-#: src/plugins/vcalendar/vcal_prefs.c:415
+#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:417
 msgid "You can export to a local file or URL"
-msgstr "ביכולתך לייצא אל קובץ מקומי או כתובת URL"
+msgstr "באפשרותך לייצא אל קובץ מקומי או כתובת URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:313
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "ציין קובץ מקומי או כתובת URL ‏(http://server/path/file.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:319
-#: src/plugins/vcalendar/vcal_prefs.c:425 src/prefs_account.c:1263
-#: src/prefs_account.c:1770
+#: src/plugins/vcalendar/vcal_prefs.c:321
+#: src/plugins/vcalendar/vcal_prefs.c:427 src/prefs_account.c:1259
+#: src/prefs_account.c:1766
 msgid "User ID"
 msgstr "מזהה משתמש"
 
-#: src/plugins/vcalendar/vcal_prefs.c:327
-#: src/plugins/vcalendar/vcal_prefs.c:433 src/prefs_account.c:1269
-#: src/prefs_account.c:1790 src/prefs_account.c:2499 src/prefs_account.c:2521
-#: src/wizard.c:1389 src/wizard.c:1668
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1265
+#: src/prefs_account.c:1786 src/prefs_account.c:2491 src/prefs_account.c:2513
+#: src/wizard.c:1201 src/wizard.c:1475
 msgid "Password"
 msgstr "סיסמה"
 
-#: src/plugins/vcalendar/vcal_prefs.c:341
+#: src/plugins/vcalendar/vcal_prefs.c:343
 msgid "Include webcal subscriptions in export"
 msgstr "כלול הרשמות webcal בתוך ייצוא"
 
-#: src/plugins/vcalendar/vcal_prefs.c:351
+#: src/plugins/vcalendar/vcal_prefs.c:353
 msgid "Command to run after calendar export"
 msgstr "פקודה להרצה עובר ייצוא לוח שנה"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:382
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "רשום את לוח שנה Claws בתוך שעון  Orage של XFCE"
 
-#: src/plugins/vcalendar/vcal_prefs.c:382
+#: src/plugins/vcalendar/vcal_prefs.c:384
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
 "מעניקה היתר עבור Orage (גרסא שהינה מעל 4.4) לראות את לוח שנה Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:394
+#: src/plugins/vcalendar/vcal_prefs.c:396
 msgid "Free/Busy information"
 msgstr "מידע חופשי/עסוק"
 
-#: src/plugins/vcalendar/vcal_prefs.c:406
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Automatically export free/busy status to"
 msgstr "ייצא אוטומטית מצב חופשי/עסוק אל"
 
-#: src/plugins/vcalendar/vcal_prefs.c:417
+#: src/plugins/vcalendar/vcal_prefs.c:419
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "ציין קובץ מקומי או כתובת URL ‏(http://server/path/file.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:447
+#: src/plugins/vcalendar/vcal_prefs.c:449
 msgid "Command to run after free/busy status export"
 msgstr "פקודה להרצה עובר ייצוא מצב חופשי/עסוק"
 
-#: src/plugins/vcalendar/vcal_prefs.c:474
+#: src/plugins/vcalendar/vcal_prefs.c:476
 msgid "Get free/busy status of others from"
-msgstr "השג מצב חופשי/עסוק של אחרים מן"
+msgstr "השג מצב חופשי/עסוק של אחרים מתוך"
 
-#: src/plugins/vcalendar/vcal_prefs.c:482
+#: src/plugins/vcalendar/vcal_prefs.c:484
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -12363,7 +12400,7 @@ msgstr ""
 "ציין קובץ מקומי או כתובת URL ‏(http://server/path/file.ifb).\n"
 "‫‎%u עבור החלק השמאלי של כתובת הדוא״ל, ‎%d עבור המתחם"
 
-#: src/plugins/vcalendar/vcal_prefs.c:646 src/plugins/vcalendar/plugin.c:43
+#: src/plugins/vcalendar/vcal_prefs.c:648 src/plugins/vcalendar/plugin.c:43
 #: src/plugins/vcalendar/plugin.c:64
 msgid "vCalendar"
 msgstr "‏vCalendar"
@@ -12382,7 +12419,7 @@ msgstr "_הרשמה אל webCal..."
 
 #: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
-msgstr "_שנה שם..."
+msgstr "_שינוי שם..."
 
 #: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
@@ -12400,6 +12437,10 @@ msgstr "תצוגת _שבוע"
 msgid "_Month view"
 msgstr "תצוגת _חודש"
 
+#: src/plugins/vcalendar/vcal_folder.c:1091
+msgid "Meetings"
+msgstr "מפגשים"
+
 #: src/plugins/vcalendar/vcal_folder.c:1475
 msgid "in the past"
 msgstr "בעבר"
@@ -12442,7 +12483,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"לא היה ניתן לאחזר כתובת URL של WebCal:\n"
+"לא היתה אפשרות לאחזר כתובת URL של WebCal:\n"
 "%s:\n"
 "\n"
 "%s"
@@ -12455,7 +12496,7 @@ msgid ""
 "\n"
 "%s\n"
 msgstr ""
-"לא היה ניתן לאחזר כתובת URL של WebCal:\n"
+"לא היתה אפשרות לאחזר כתובת URL של WebCal:\n"
 "%s:\n"
 "\n"
 "%s\n"
@@ -12489,7 +12530,7 @@ msgstr "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לעד
 #: src/plugins/vcalendar/vcal_folder.c:1885
 #, c-format
 msgid "Fetching calendar for %s..."
-msgstr "מושך כעת לוח שנה עבור %s..."
+msgstr "כעת מושך לוח שנה עבור %s..."
 
 #: src/plugins/vcalendar/vcal_folder.c:1886
 msgid "new subscription"
@@ -12507,13 +12548,13 @@ msgstr "הרשמה אל WebCal"
 msgid "Enter the WebCal URL:"
 msgstr "הזן כתובת WebCal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1923
+#: src/plugins/vcalendar/vcal_folder.c:1921
 msgid "Could not parse the URL."
-msgstr "לא היה ניתן לנתח כתובת URL."
+msgstr "לא היתה אפשרות לנתח כתובת URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1952
+#: src/plugins/vcalendar/vcal_folder.c:1950
 msgid "Do you really want to unsubscribe?"
-msgstr "האם באמת שברצונך לבטל הרשמה?"
+msgstr "האם אתה בטוח כי ברצונך לבטל הרשמה?"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:313
 msgid "Individual"
@@ -12529,7 +12570,7 @@ msgstr "חדר"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:329
 msgid "Add..."
-msgstr "הוסף..."
+msgstr "הוספה..."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:788
 msgid ""
@@ -12664,7 +12705,7 @@ msgid "available"
 msgstr "זמין"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:899
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1150
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1151
 msgid "Free/busy retrieval failed"
 msgstr "אחזור מידע חופשי/עסוק נכשל"
 
@@ -12678,92 +12719,92 @@ msgstr "שלח בכל זאת"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:993
 msgid "Not everyone is available. See tooltips for more info..."
-msgstr "לא כל אחד זמין. למידע נוסף ראה תיבות צצות..."
+msgstr "לא כל אחד זמין. למידע נוסף ראה תיבות עזר..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1132
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1133
 #, c-format
 msgid "Fetching planning for %s..."
-msgstr "מושך כעת תכנון עבור %s..."
+msgstr "כעת מושך תכנון עבור %s..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1159
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1160
 msgid "Available"
 msgstr "זמין"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1172
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1179
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1187
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1180
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
 msgid "Everyone is available."
 msgstr "כולם זמינים."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1189
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
 msgstr "נראה שכולם זמינים, אך מידע חופשי/עסוק מסוים נכשל מלהתאחזר."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1360
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1361
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
 msgstr ""
-"לא היה ניתן לשלוח הזמנת מפגש.\n"
+"לא היתה אפשרות לשלוח הזמנת מפגש.\n"
 "בדוק את הנמענים."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1476
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1493
 msgid "Save & Send"
 msgstr "שמור ושלח"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1494
 msgid "Check availability"
 msgstr "בדוק זמינות"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1600
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "<b>Starts at:</b> "
 msgstr "<b>מתחיל בשעה:</b> "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1627
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1623
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1647
 msgid "<b> on:</b>"
 msgstr "<b> ביום:</b>"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1641
 msgid "<b>Ends at:</b> "
 msgstr "<b>מסתיים בשעה:</b> "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1661
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1682
 msgid "New meeting"
 msgstr "מפגש חדש"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1663
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1684
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - עריכת מפגש"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1763
 msgid "Time:"
 msgstr "זמן:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1878
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1896
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "שעה %d"
 msgstr[1] "%d שעות"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1881
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1899
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d דקה"
 msgstr[1] "%d דקות"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1892
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "אירוע ממשמש: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1893
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1911
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -12780,43 +12821,43 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1928
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "הזכר לי בעוד דקה %d"
 msgstr[1] "הזכר לי בעוד %d דקות"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2036
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2054
 msgid "Empty calendar"
 msgstr "רוקן לוח שנה"
 
 # אין דבר לייצא.
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2037
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2055
 msgid "There is nothing to export."
 msgstr "אין מה לייצא."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2077
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2095
 msgid "Could not export the calendar."
-msgstr "לא היה ניתן לייצא לוח שנה."
+msgstr "לא היתה אפשרות לייצא לוח שנה."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2112
 msgid "Export calendar to ICS"
 msgstr "יצא לוח שנה אל ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2135
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
-msgstr "לא היה ניתן לייצא לוח שנה אל '%s'\n"
+msgstr "לא היתה אפשרות לייצא לוח שנה אל '%s'\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2232
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2251
 msgid "Could not export the freebusy info."
-msgstr "לא היה ניתן לייצא את המידע חופשי/עסוק."
+msgstr "לא היתה אפשרות לייצא את המידע חופשי/עסוק."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2263
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2283
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
-msgstr "לא היה ניתן לייצא חופשי/עסוק אל '%s'\n"
+msgstr "לא היתה אפשרות לייצא חופשי/עסוק אל '%s'\n"
 
 # הביע הסכמה
 #: src/plugins/vcalendar/vcal_manager.c:109
@@ -12894,7 +12935,7 @@ msgid "Show"
 msgstr "הצג"
 
 #: src/plugins/vcalendar/day-view.c:622 src/plugins/vcalendar/month-view.c:722
-#: src/prefs_account.c:1456 src/prefs_folder_item.c:562
+#: src/prefs_account.c:1452 src/prefs_folder_item.c:562
 #: src/prefs_matcher.c:334
 msgid "days"
 msgstr "ימים"
@@ -12919,14 +12960,14 @@ msgstr ""
 "תוספת זו מאפשרת טיפול בהודעות vCalendar כמו אלו שמופקות על ידי Evolution או "
 "Outlook.\n"
 "\n"
-"כאשר זו טעונה, זו תיצור תיבת דואר vCalendar בתוך רשימת תיקייה, שתאוכלס "
+"כאשר זו טעונה, זו תיצור תיבת דואר vCalendar בתוך רשימת תיקייה, אשר תאוכלס "
 "במפגשים להם הסכמת או שאותם יצרת.\n"
 "בקשות מפגש שיתקבלו יוצגו בטופס הולם ותהיה לך היכולת לקבלן או לדחותן.\n"
 "כדי ליצור מפגש קליק-ימני על תיקיית vCalendar או תיקיית פגישות ובחר \"מפגש "
 "חדש...\".\n"
 "\n"
-"ביכולתך יהיה ניתן גם להירשם אל ערוצי webCal,לייצא את מפגשייך וגם לוח שנה, "
-"לפרסם מידע חופשי/עסוק ולאחזר את מידע זה מן אחרים."
+"באפשרותך יהיה ניתן גם להירשם אל ערוצי webCal,לייצא את מפגשייך וגם לוח שנה, "
+"לפרסם מידע חופשי/עסוק ולאחזר את מידע זה מאחרים."
 
 #: src/plugins/vcalendar/plugin.c:102
 msgid "Calendar"
@@ -13065,19 +13106,19 @@ msgstr "פקודה לא נתמכת\n"
 
 #: src/pop.c:906
 msgid "error occurred on POP3 session\n"
-msgstr "ארעה שגיאה בסשן POP3\n"
+msgstr "אירעה שגיאה בסשן POP3\n"
 
 #: src/pop.c:1101
 msgid "TOP command unsupported\n"
 msgstr "פקודת TOP לא נתמכת\n"
 
-#: src/prefs_account.c:332 src/prefs_account.c:1430 src/prefs_account.c:2416
-#: src/wizard.c:1549
+#: src/prefs_account.c:332 src/prefs_account.c:1426 src/prefs_account.c:2408
+#: src/wizard.c:1361
 #, fuzzy
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1543 src/prefs_account.c:2431
+#: src/prefs_account.c:335 src/prefs_account.c:1539 src/prefs_account.c:2423
 #, fuzzy
 msgid "IMAP4"
 msgstr "IMAP4"
@@ -13086,7 +13127,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "חדשות (NNTP)"
 
-#: src/prefs_account.c:337 src/wizard.c:1551
+#: src/prefs_account.c:337 src/wizard.c:1363
 msgid "Local mbox file"
 msgstr "קובץ mbox מקומי"
 
@@ -13134,79 +13175,79 @@ msgstr "שרת זה מצריך אימות"
 msgid "Authenticate on connect"
 msgstr "אמת בעת התחברות"
 
-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1216
 msgid "News server"
 msgstr "שרת חדשות"
 
-#: src/prefs_account.c:1226
+#: src/prefs_account.c:1222
 msgid "Server for receiving"
 msgstr "שרת לקבלה"
 
-#: src/prefs_account.c:1232
+#: src/prefs_account.c:1228
 msgid "Local mailbox"
 msgstr "תיבת דואר מקומית"
 
-#: src/prefs_account.c:1239
+#: src/prefs_account.c:1235
 msgid "SMTP server (send)"
 msgstr "שרת SMTP (שליחה)"
 
-#: src/prefs_account.c:1247
+#: src/prefs_account.c:1243
 msgid "Use mail command rather than SMTP server"
 msgstr "השתמש בפקודת דואר במקום שרת SMTP"
 
-#: src/prefs_account.c:1256
+#: src/prefs_account.c:1252
 msgid "command to send mails"
 msgstr "פקודה לשליחת דואר"
 
-#: src/prefs_account.c:1318
+#: src/prefs_account.c:1314
 #, c-format
 msgid "Account%d"
 msgstr "חשבון%d"
 
-#: src/prefs_account.c:1404
+#: src/prefs_account.c:1400
 msgid "Local"
 msgstr "מקומי"
 
-#: src/prefs_account.c:1410 src/prefs_account.c:1499
+#: src/prefs_account.c:1406 src/prefs_account.c:1495
 msgid "Default Inbox"
 msgstr "דואר נכנס משתמט"
 
-#: src/prefs_account.c:1417 src/prefs_account.c:1424 src/prefs_account.c:1506
-#: src/prefs_account.c:1513
+#: src/prefs_account.c:1413 src/prefs_account.c:1420 src/prefs_account.c:1502
+#: src/prefs_account.c:1509
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "הודעות לא מסוננות יאוחסנו בתיקייה זו"
 
-#: src/prefs_account.c:1421 src/prefs_account.c:1510 src/prefs_account.c:1974
+#: src/prefs_account.c:1417 src/prefs_account.c:1506 src/prefs_account.c:1966
 #: src/prefs_customheader.c:237
 msgid "Bro_wse"
 msgstr "   _עיון   "
 
-#: src/prefs_account.c:1432
+#: src/prefs_account.c:1428
 msgid "Use secure authentication (APOP)"
 msgstr "השתמש באימות מאובטח (APOP)"
 
 # בעת במועד קבלה
-#: src/prefs_account.c:1435
+#: src/prefs_account.c:1431
 msgid "Remove messages on server when received"
 msgstr "הסר הודעות שעל שרת לאחר קבלה"
 
-#: src/prefs_account.c:1446
+#: src/prefs_account.c:1442
 msgid "Remove after"
 msgstr "הסר כעבור"
 
-#: src/prefs_account.c:1453 src/prefs_account.c:1463
+#: src/prefs_account.c:1449 src/prefs_account.c:1459
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 ימים וגם 0 שעות : הסרה מידית"
 
-#: src/prefs_account.c:1466 src/prefs_matcher.c:333
+#: src/prefs_account.c:1462 src/prefs_matcher.c:333
 msgid "hours"
 msgstr "שעות"
 
-#: src/prefs_account.c:1476
+#: src/prefs_account.c:1472
 msgid "Receive size limit"
 msgstr "מגבלת גודל לקבלה"
 
-#: src/prefs_account.c:1479
+#: src/prefs_account.c:1475
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -13214,90 +13255,90 @@ msgstr ""
 "הודעות מעל לגודל זה יאוחזרו באופן חלקי. בעת בחירה תעמוד לך האפשרות להורידן "
 "במלואן או למוחקן."
 
-#: src/prefs_account.c:1519 src/prefs_account.c:2446
+#: src/prefs_account.c:1515 src/prefs_account.c:2438
 #, fuzzy
 msgid "NNTP"
 msgstr "NNTP"
 
 # פריטים
-#: src/prefs_account.c:1526
+#: src/prefs_account.c:1522
 msgid "Maximum number of articles to download"
 msgstr "מספר מרבי של מאמרים להורדה"
 
-#: src/prefs_account.c:1536
+#: src/prefs_account.c:1532
 msgid "unlimited if 0 is specified"
 msgstr "בלי הגבלה אם 0 מצוין"
 
-#: src/prefs_account.c:1549 src/prefs_account.c:1742
+#: src/prefs_account.c:1545 src/prefs_account.c:1738
 msgid "Authentication method"
 msgstr "שיטת אימות"
 
-#: src/prefs_account.c:1559 src/prefs_account.c:1751 src/prefs_send.c:286
+#: src/prefs_account.c:1555 src/prefs_account.c:1747 src/prefs_send.c:290
 msgid "Automatic"
 msgstr "אוטומטית"
 
-#: src/prefs_account.c:1571
+#: src/prefs_account.c:1567
 msgid "IMAP server directory"
 msgstr "מדור שרת IMAP"
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1571
 msgid "(usually empty)"
 msgstr "(לרוב ריק)"
 
 # מורשמות
-#: src/prefs_account.c:1589
+#: src/prefs_account.c:1585
 msgid "Show subscribed folders only"
 msgstr "הצג תיקיות רשומות בלבד"
 
-#: src/prefs_account.c:1596
+#: src/prefs_account.c:1592
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "מצב רוחב-פס-תועלתי (מונע אחזור של תגיות מרוחקות)"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1594
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "מצב זה עושה שימוש בפחות רוחב פס, אך עשוי להיות אטי יותר עם שרתים מסוימים."
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1601
 msgid "Filter messages on receiving"
 msgstr "סנן הודעות בעת קבלה"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1608
 msgid "Allow filtering using plugins on receiving"
 msgstr "התר סינון באמצעות תוספות בעת קבלה"
 
-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1612
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'השגת דואר' בודקת עבור הודעות חדשות בחשבון זה"
 
 # כותר
-#: src/prefs_account.c:1697 src/prefs_customheader.c:209
-#: src/prefs_matcher.c:620 src/prefs_matcher.c:1952 src/prefs_matcher.c:1974
+#: src/prefs_account.c:1693 src/prefs_customheader.c:209
+#: src/prefs_matcher.c:620 src/prefs_matcher.c:1958 src/prefs_matcher.c:1980
 msgid "Header"
 msgstr "תקורה"
 
-#: src/prefs_account.c:1699
+#: src/prefs_account.c:1695
 msgid "Generate Message-ID"
 msgstr "הלחן Message-ID"
 
-#: src/prefs_account.c:1702
+#: src/prefs_account.c:1698
 msgid "Send account mail address in Message-ID"
 msgstr "שלח כתובת דואר של חשבון בתוך Message-ID"
 
-#: src/prefs_account.c:1705
+#: src/prefs_account.c:1701
 msgid "Generate X-Mailer header"
 msgstr "הלחן תקורת X-Mailer"
 
 # שמוגדרת לפי משתמש
-#: src/prefs_account.c:1712
+#: src/prefs_account.c:1708
 msgid "Add user-defined header"
 msgstr "הוסף תקורה מוגדרת-משתמש"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1723
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "אימות SMTP ‫(SMTP AUTH)"
 
-#: src/prefs_account.c:1816
+#: src/prefs_account.c:1808
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -13305,269 +13346,269 @@ msgstr ""
 "במידה וערכים אלו יישארו ריקים, ייעשה שימוש באותו מזהה משתמש ובאותה סיסמה "
 "המשמשים עבור קבלה."
 
-#: src/prefs_account.c:1827
+#: src/prefs_account.c:1819
 msgid "Authenticate with POP3 before sending"
 msgstr "אמת עם POP3 טרם שליחה"
 
-#: src/prefs_account.c:1842
+#: src/prefs_account.c:1834
 msgid "POP authentication timeout: "
 msgstr "פקיעת זמן אימות POP: "
 
-#: src/prefs_account.c:1850
+#: src/prefs_account.c:1842
 msgid "minutes"
 msgstr "דקות"
 
-#: src/prefs_account.c:1920 src/prefs_account.c:1966
+#: src/prefs_account.c:1912 src/prefs_account.c:1958
 msgid "Signature"
 msgstr "חתימה"
 
 # שיבוץ חתימה אוטומטי
-#: src/prefs_account.c:1923
+#: src/prefs_account.c:1915
 msgid "Automatically insert signature"
 msgstr "שבץ חתימה אוטומטית"
 
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1920
 msgid "Signature separator"
 msgstr "מפריד חתימה"
 
-#: src/prefs_account.c:1953
+#: src/prefs_account.c:1945
 msgid "Command output"
 msgstr "פלט פקודה"
 
-#: src/prefs_account.c:1986
+#: src/prefs_account.c:1978
 msgid "Automatically set the following addresses"
 msgstr "הגדר אוטומטית את הכתובות הבאות"
 
-#: src/prefs_account.c:2038
+#: src/prefs_account.c:2030
 msgid "Spell check dictionaries"
 msgstr "מילוני בדיקת איות"
 
-#: src/prefs_account.c:2048 src/prefs_folder_item.c:1094
+#: src/prefs_account.c:2040 src/prefs_folder_item.c:1094
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "מילון משתמט"
 
-#: src/prefs_account.c:2061 src/prefs_folder_item.c:1128
+#: src/prefs_account.c:2053 src/prefs_folder_item.c:1128
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "מילון חלופי משתמט"
 
-#: src/prefs_account.c:2147 src/prefs_account.c:3263
+#: src/prefs_account.c:2139 src/prefs_account.c:3255
 #: src/prefs_compose_writing.c:350 src/prefs_folder_item.c:1443
 #: src/prefs_folder_item.c:1834 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "הלחנה"
 
-#: src/prefs_account.c:2162 src/prefs_folder_item.c:1471 src/prefs_quote.c:134
-#: src/toolbar.c:407
+#: src/prefs_account.c:2154 src/prefs_folder_item.c:1471 src/prefs_quote.c:134
+#: src/toolbar.c:408
 msgid "Reply"
 msgstr "מענה"
 
-#: src/prefs_account.c:2177 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1499 src/prefs_quote.c:149 src/toolbar.c:411
+#: src/prefs_account.c:2169 src/prefs_filtering_action.c:191
+#: src/prefs_folder_item.c:1499 src/prefs_quote.c:149 src/toolbar.c:412
 msgid "Forward"
 msgstr "קידום"
 
-#: src/prefs_account.c:2224
+#: src/prefs_account.c:2216
 msgid "Default privacy system"
 msgstr "מערכת פרטיות משתמטת"
 
-#: src/prefs_account.c:2253
+#: src/prefs_account.c:2245
 msgid "Always sign messages"
 msgstr "חתום הודעות תמיד"
 
-#: src/prefs_account.c:2255
+#: src/prefs_account.c:2247
 msgid "Always encrypt messages"
 msgstr "הצפן הודעות תמיד"
 
-#: src/prefs_account.c:2257
+#: src/prefs_account.c:2249
 msgid "Always sign messages when replying to a signed message"
 msgstr "חתום הודעות תמיד בעת מענה אל הודעה חתומה"
 
-#: src/prefs_account.c:2260
+#: src/prefs_account.c:2252
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "הצפן הודעות תמיד בעת מענה אל הודעה מוצפנת"
 
-#: src/prefs_account.c:2263
+#: src/prefs_account.c:2255
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "הצפן הודעות נשלחות עם המפתח העצמי שלך בנוסף לזה של נמען"
 
 # ברור
-#: src/prefs_account.c:2265
+#: src/prefs_account.c:2257
 msgid "Save sent encrypted messages as clear text"
 msgstr "שמור הודעות מוצפנות שנשלחו כתמליל צלול"
 
 # לא לעשות שימוש בהצפנת
-#: src/prefs_account.c:2420 src/prefs_account.c:2435 src/prefs_account.c:2449
+#: src/prefs_account.c:2412 src/prefs_account.c:2427 src/prefs_account.c:2441
 msgid "Don't use SSL"
 msgstr "אל תשתמש בהצפנת SSL"
 
-#: src/prefs_account.c:2423
+#: src/prefs_account.c:2415
 msgid "Use SSL for POP3 connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור POP3"
 
-#: src/prefs_account.c:2426 src/prefs_account.c:2441 src/prefs_account.c:2472
+#: src/prefs_account.c:2418 src/prefs_account.c:2433 src/prefs_account.c:2464
 msgid "Use STARTTLS command to start SSL session"
 msgstr "השתמש בפקודת STARTTLS כדי להתחיל סשן SSL"
 
-#: src/prefs_account.c:2438
+#: src/prefs_account.c:2430
 msgid "Use SSL for IMAP4 connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור IMAP4"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2450
 msgid "Use SSL for NNTP connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור NNTP"
 
-#: src/prefs_account.c:2462
+#: src/prefs_account.c:2454
 msgid "Send (SMTP)"
 msgstr "שליחה (SMTP)"
 
-#: src/prefs_account.c:2466
+#: src/prefs_account.c:2458
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "אל תשתמש בהצפנת SSL (אולם, במידת וקיים הצורך, תתעל את STARTTLS)"
 
-#: src/prefs_account.c:2469
+#: src/prefs_account.c:2461
 msgid "Use SSL for SMTP connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור SMTP"
 
-#: src/prefs_account.c:2477
+#: src/prefs_account.c:2469
 msgid "Client certificates"
 msgstr "תעודות לקוח"
 
-#: src/prefs_account.c:2485
+#: src/prefs_account.c:2477
 msgid "Certificate for receiving"
 msgstr "תעודה עבור קבלה"
 
-#: src/prefs_account.c:2490 src/prefs_account.c:2492 src/prefs_account.c:2512
-#: src/prefs_account.c:2514
+#: src/prefs_account.c:2482 src/prefs_account.c:2484 src/prefs_account.c:2504
+#: src/prefs_account.c:2506
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "קובץ תעודת לקוח כקובץ PKCS12 או PEM"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2499
 msgid "Certificate for sending"
 msgstr "תעודה עבור שליחה"
 
-#: src/prefs_account.c:2540
+#: src/prefs_account.c:2532
 msgid "Use non-blocking SSL"
 msgstr "נצל SSL שאינו חוסם (non-blocking)"
 
-#: src/prefs_account.c:2552
+#: src/prefs_account.c:2544
 msgid "Turn this off if you have SSL connection problems"
 msgstr "כבה את העדפה זו אם קיימות אצלך בעיות התחברות הקשורות אל SSL"
 
-#: src/prefs_account.c:2668
+#: src/prefs_account.c:2660
 msgid "SMTP port"
 msgstr "פורט SMTP"
 
-#: src/prefs_account.c:2675
+#: src/prefs_account.c:2667
 msgid "POP3 port"
 msgstr "פורט POP3"
 
-#: src/prefs_account.c:2682
+#: src/prefs_account.c:2674
 msgid "IMAP4 port"
 msgstr "פורט IMAP4"
 
-#: src/prefs_account.c:2689
+#: src/prefs_account.c:2681
 msgid "NNTP port"
 msgstr "פורט NNTP"
 
-#: src/prefs_account.c:2695
+#: src/prefs_account.c:2687
 msgid "Domain name"
 msgstr "שם מתחם"
 
-#: src/prefs_account.c:2698
+#: src/prefs_account.c:2690
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
 msgstr "שם המתחם ינוצל בתוך Message-ID המולחנת, ובעת התקשרות עם שרתי SMTP."
 
-#: src/prefs_account.c:2712
+#: src/prefs_account.c:2704
 msgid "Use command to communicate with server"
 msgstr "השתמש בפקודה לתקשור עם שרת"
 
 # מוסר
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2712
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "העבר דואר מחוק אל אשפה והסירו לחלוטין לאלתר"
 
-#: src/prefs_account.c:2722
+#: src/prefs_account.c:2714
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
 msgstr ""
 "העבר דואר מחוק אל אשפה במקום לעשות שימוש בדגל ‪\\Deleted‬ ללא הסרה מוחלטת."
 
-#: src/prefs_account.c:2726
+#: src/prefs_account.c:2718
 msgid "Mark cross-posted messages as read and color:"
-msgstr ""
+msgstr "סמן הודעות פרסום-צולב בתור נקראו וצבע:"
 
 # השמת
-#: src/prefs_account.c:2782
+#: src/prefs_account.c:2774
 msgid "Put sent messages in"
 msgstr "השם הודעות שנשלחו בתוך"
 
-#: src/prefs_account.c:2784
+#: src/prefs_account.c:2776
 msgid "Put queued messages in"
 msgstr "השם הודעות בהמתנה בתוך"
 
-#: src/prefs_account.c:2786
+#: src/prefs_account.c:2778
 msgid "Put draft messages in"
 msgstr "השם הודעות טיוטה בתוך"
 
-#: src/prefs_account.c:2788
+#: src/prefs_account.c:2780
 msgid "Put deleted messages in"
 msgstr "השם הודעות מחוקות בתוך"
 
-#: src/prefs_account.c:2846
+#: src/prefs_account.c:2838
 msgid "Account name is not entered."
 msgstr "שם חשבון אינו מוזן."
 
-#: src/prefs_account.c:2850
+#: src/prefs_account.c:2842
 msgid "Mail address is not entered."
 msgstr "כתובת דואר אינה מוזנת."
 
-#: src/prefs_account.c:2857
+#: src/prefs_account.c:2849
 msgid "SMTP server is not entered."
 msgstr "שרת SMTP אינו מוזן."
 
-#: src/prefs_account.c:2862
+#: src/prefs_account.c:2854
 msgid "User ID is not entered."
 msgstr "מזהה משתמש לא מוזן."
 
-#: src/prefs_account.c:2867
+#: src/prefs_account.c:2859
 msgid "POP3 server is not entered."
 msgstr "שרתPOP3 אינו מוזן."
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2879
 msgid "The default Inbox folder doesn't exist."
 msgstr "תיקיית דואר נכנס משתמטת לא קיימת."
 
-#: src/prefs_account.c:2893
+#: src/prefs_account.c:2885
 msgid "IMAP4 server is not entered."
 msgstr "שרת IMAP4 אינו מוזן."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2890
 msgid "NNTP server is not entered."
 msgstr "שרת NNTP אינו מוזן."
 
-#: src/prefs_account.c:2904
+#: src/prefs_account.c:2896
 msgid "local mailbox filename is not entered."
 msgstr "שם קובץ תיבת דואר מקומית אינו מוזן."
 
-#: src/prefs_account.c:2910
+#: src/prefs_account.c:2902
 msgid "mail command is not entered."
 msgstr "פקודת דואר אינה מוזנת."
 
-#: src/prefs_account.c:3227
+#: src/prefs_account.c:3219
 msgid "Receive"
 msgstr "קבלה"
 
-#: src/prefs_account.c:3281 src/prefs_folder_item.c:1850 src/prefs_quote.c:238
+#: src/prefs_account.c:3273 src/prefs_folder_item.c:1850 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "תבניות"
 
-#: src/prefs_account.c:3299
+#: src/prefs_account.c:3291
 msgid "Privacy"
 msgstr "פרטיות"
 
@@ -13584,19 +13625,19 @@ msgstr "העדפות עבור חשבון חדש"
 msgid "%s - Account preferences"
 msgstr "‫%s - העדפות חשבון"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3794
 msgid "Select signature file"
 msgstr "בחירת קובץ חתימה"
 
-#: src/prefs_account.c:3813 src/prefs_account.c:3830 src/wizard.c:1237
+#: src/prefs_account.c:3812 src/prefs_account.c:3829 src/wizard.c:1053
 msgid "Select certificate file"
 msgstr "בחירת קובץ תעודה"
 
-#: src/prefs_account.c:3926
+#: src/prefs_account.c:3925
 msgid "Protocol:"
 msgstr "פרוטוקול:"
 
-#: src/prefs_account.c:4066
+#: src/prefs_account.c:4065
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (תוספת לא טעונה)"
@@ -13625,75 +13666,75 @@ msgstr "עריכת פעולת סינון"
 msgid "Append the new action above to the list"
 msgstr "צרף את הפעולה מעלה אל הרשימה"
 
-#: src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:768 src/prefs_template.c:309
-#: src/prefs_toolbar.c:1043
-msgid "Replace"
-msgstr "החלף"
-
 # החלפת הפעולה
 #: src/prefs_actions.c:335
 msgid "Replace the selected action in list with the action above"
 msgstr "החלף פעולה נבחרת ברשימה עם הפעולה מעלה"
 
-#: src/prefs_actions.c:343
+#: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:778 src/prefs_template.c:318
+#: src/prefs_toolbar.c:1056
+msgid "Re_move"
+msgstr "הס_ר"
+
+#: src/prefs_actions.c:345
 msgid "Delete the selected action from the list"
-msgstr "מחיקת הפקודה הנבחרת מן הרשימה"
+msgstr "מחיקת הפקודה הנבחרת מתוך הרשימה"
 
-#: src/prefs_actions.c:351 src/prefs_filtering.c:500 src/prefs_template.c:332
+#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:336
 msgid "Clear all the input fields in the dialog"
 msgstr "טהר את כל שדות הקלט בדו השיח"
 
-#: src/prefs_actions.c:359
+#: src/prefs_actions.c:363
 msgid "Show information on configuring actions"
 msgstr "הצג מידע על תצורת פעולות"
 
 # should we have "the"?
 # See: Move selected action down
-#: src/prefs_actions.c:390
+#: src/prefs_actions.c:394
 msgid "Move the selected action up"
 msgstr "הזזת הפעולה הנבחרת מעלה"
 
-#: src/prefs_actions.c:398
+#: src/prefs_actions.c:402
 msgid "Move selected action down"
 msgstr "הזזת פעולה נבחרת מטה"
 
-#: src/prefs_actions.c:531 src/prefs_filtering_action.c:702
-#: src/prefs_filtering.c:833 src/prefs_filtering.c:835
-#: src/prefs_filtering.c:836 src/prefs_filtering.c:946 src/prefs_matcher.c:891
-#: src/prefs_template.c:465
+#: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
+#: src/prefs_filtering.c:836 src/prefs_filtering.c:838
+#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:897
+#: src/prefs_template.c:469
 msgid "(New)"
 msgstr "(חדש)"
 
-#: src/prefs_actions.c:596
+#: src/prefs_actions.c:600
 msgid "Menu name is not set."
 msgstr "שם תפריט אינו מוגדר."
 
-#: src/prefs_actions.c:601
+#: src/prefs_actions.c:605
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "תו לוכסן '/' מנחה אינו מותר בשם התפריט."
 
-#: src/prefs_actions.c:606
+#: src/prefs_actions.c:610
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "תו נקודתיים ':' אינו מותר בשם התפריט."
 
-#: src/prefs_actions.c:612
+#: src/prefs_actions.c:616
 msgid "There is an action with this name already."
 msgstr "כבר קיימת פעולה עם שם זה."
 
-#: src/prefs_actions.c:631
+#: src/prefs_actions.c:635
 msgid "Menu name is too long."
 msgstr "שם תפריט ארוך מדי."
 
-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:644
 msgid "Command-line not set."
 msgstr "שורת-פקודה לא מוגדרת."
 
-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:649
 msgid "Menu name and command are too long."
 msgstr "שם תפריט ופקודה ארוכים מדי."
 
-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:655
 #, c-format
 msgid ""
 "The command\n"
@@ -13704,170 +13745,170 @@ msgstr ""
 "%s\n"
 "אין שגיאת תחביר."
 
-#: src/prefs_actions.c:709
+#: src/prefs_actions.c:713
 msgid "Delete action"
 msgstr "מחיקת פעולה"
 
-#: src/prefs_actions.c:710
+#: src/prefs_actions.c:714
 msgid "Do you really want to delete this action?"
-msgstr "האם באמת שברצונך למחוק את פעולה זו?"
+msgstr "האם אתה בטוח כי ברצונך למחוק את פעולה זו?"
 
-#: src/prefs_actions.c:730
+#: src/prefs_actions.c:734
 msgid "Delete all actions"
 msgstr "מחיקת כל הפעולות"
 
-#: src/prefs_actions.c:731
+#: src/prefs_actions.c:735
 msgid "Do you really want to delete all the actions?"
-msgstr "האם באמת שברצונך למחוק את כל הפעולות?"
+msgstr "האם אתה בטוח כי ברצונך למחוק את כל הפעולות?"
 
-#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1496
-#: src/prefs_filtering.c:1518 src/prefs_matcher.c:2103
-#: src/prefs_template.c:565 src/prefs_template.c:590
+#: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1499
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2109
+#: src/prefs_template.c:569 src/prefs_template.c:594
 msgid "Entry not saved"
 msgstr "רשומה לא נשמרה"
 
-#: src/prefs_actions.c:895 src/prefs_actions.c:926 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_template.c:566
-#: src/prefs_template.c:591
+#: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1522 src/prefs_template.c:570
+#: src/prefs_template.c:595
 msgid "The entry was not saved. Close anyway?"
 msgstr "רשומה לא נשמרה. לסגור למרות זאת?"
 
-#: src/prefs_actions.c:896 src/prefs_actions.c:901 src/prefs_actions.c:927
-#: src/prefs_filtering.c:1476 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_matcher.c:2105
-#: src/prefs_template.c:567 src/prefs_template.c:592 src/prefs_template.c:597
+#: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
+#: src/prefs_filtering.c:1479 src/prefs_filtering.c:1501
+#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2111
+#: src/prefs_template.c:571 src/prefs_template.c:596 src/prefs_template.c:601
 msgid "+_Continue editing"
 msgstr "+המשך _עריכה"
 
-#: src/prefs_actions.c:899
+#: src/prefs_actions.c:903
 msgid "Actions list not saved"
 msgstr "רשימת פקודות לא נשמרה"
 
-#: src/prefs_actions.c:900
+#: src/prefs_actions.c:904
 msgid "The actions list has been modified. Close anyway?"
 msgstr "רשימת פקודות שונתה. לסגור למרות זאת?"
 
-#: src/prefs_actions.c:970
+#: src/prefs_actions.c:974
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">שם תפריט:</span>"
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:975
 msgid "Use / in menu name to make submenus."
 msgstr "השתמש בתו / בשם תפריט כדי ליצור תפריט משנה."
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:977
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">שורת-פקודה:</span>"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:978
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">מתחילה עם:</span>"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:979
 msgid "to send message body or selection to command's standard input"
 msgstr "לשליחת גוף הודעה או בחירה אל קלט רגיל של פקודה"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:980
 msgid "to send user provided text to command's standard input"
 msgstr "לשליחת תמליל מסופק משתמש אל קלט רגיל של פקודה"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:981
 msgid "to send user provided hidden text to command's standard input"
 msgstr "לשליחת תמליל מוסתר מסופק משתמש אל קלט רגיל של פקודה"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:982
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">מסתיימת עם:</span>"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:983
 msgid "to replace message body or selection with command's standard output"
 msgstr "להחליף גוף הודעה או בחירה עם פלט רגיל של פקודה"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:984
 msgid "to insert command's standard output without replacing old text"
 msgstr "לשבץ פלט רגיל של פקודה ללא החלפת תמליל ישן"
 
 # לא מקביל
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:985
 msgid "to run command asynchronously"
 msgstr "להריץ פקודה באופן לא סינכרוני"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:986
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">שימוש:</span>"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:987
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "עבור הקובץ של התמליל הנבחר בפורמט RFC822/2822 "
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:988
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "עבור הרשימה של הקבצים של ההודעות הנבחרות בפורמט RFC822/2822"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:989
 msgid "for the file of the selected decoded message MIME part"
 msgstr "עבור הקובץ של אזור MIME של ההודעה המפוענחת הנבחרת"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:990
 msgid "for a user provided argument"
 msgstr "עבור ארגומנט מסופק משתמש"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:991
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "עבור ארגומנט מוסתר מסופק משתמש (למשל סיסמה)"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:992
 msgid "for the text selection"
 msgstr "עבור בחירת התמליל"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:993
 msgid "apply filtering actions between {} to selected messages"
 msgstr "החל סינון פעולות בין {} אל הודעות נבחרות"
 
 # נתונים יבשים
 # Ready for literal data
-#: src/prefs_actions.c:990
+#: src/prefs_actions.c:994
 msgid "for a literal %"
 msgstr "עבור % מילולי"
 
-#: src/prefs_actions.c:1000 src/prefs_themes.c:959
+#: src/prefs_actions.c:1004 src/prefs_themes.c:959
 msgid "Actions"
 msgstr "פעולות"
 
-#: src/prefs_actions.c:1001
+#: src/prefs_actions.c:1005
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
 msgstr ""
 "תכונת הפעולות הינה דרך עבור המשתמש לשגר פקודות חיצוניות כדי לעבד קובץ הודעה "
-"שלמה או רק חלק אחד מן אזוריה."
+"שלמה או רק חלק אחד מאזוריה."
 
-#: src/prefs_actions.c:1088 src/prefs_filtering.c:1694
-#: src/prefs_template.c:1097
+#: src/prefs_actions.c:1092 src/prefs_filtering.c:1697
+#: src/prefs_template.c:1101
 msgid "D_uplicate"
 msgstr "כ_פילות"
 
-#: src/prefs_actions.c:1215
+#: src/prefs_actions.c:1212
 msgid "Current actions"
 msgstr "פעולות נוכחיות"
 
-#: src/prefs_actions.c:1314 src/prefs_filtering.c:1071
-#: src/prefs_filtering.c:1129
+#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074
+#: src/prefs_filtering.c:1132
 msgid "Action string is not valid."
 msgstr "מחרוזת פעולה אינה תקפה."
 
-#: src/prefs_common.c:230 src/prefs_quote.c:69
+#: src/prefs_common.c:220 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "שלום,\\n"
 
 # ביום %d נכתב\\n
 # ע״י %f כדלקמן:\\n
-#: src/prefs_common.c:304
+#: src/prefs_common.c:294
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
-msgstr "‎תאריך: %d\\n  ‎מאת: %f\\n\\n%q\\n%X"
+msgstr "ביום %d\\nנכתב על ידי %f כדלקמן:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:310 src/prefs_quote.c:85
+#: src/prefs_common.c:300 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -13875,7 +13916,7 @@ msgstr ""
 "\\n\\nמתחיל הודעה מקודמת:\\n\\n?d{תאריך: %d\\n}?f{מאת: %f\\n}?t{אל: %t\\n}?c"
 "{עותק: %c\\n}?n{קבוצות דיונים: %n\\n}?s{נושא: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:450
+#: src/prefs_common.c:440
 msgid "%x(%a) %H:%M"
 msgstr ""
 
@@ -13948,7 +13989,7 @@ msgstr "קדם כתצריף"
 
 #: src/prefs_compose_writing.c:217
 msgid "Keep the original 'From' header when redirecting"
-msgstr "שמור על תקורת 'From' בעת הכוונה מחודשת"
+msgstr "שמור על תקורת 'From' בעת הכוונה מחדש"
 
 # השלכת
 #: src/prefs_compose_writing.c:220
@@ -13959,11 +14000,11 @@ msgstr "בעת שחרור קבצים אל תוך חלון ההלחנה"
 msgid "Ask"
 msgstr "שאל"
 
-#: src/prefs_compose_writing.c:230 src/toolbar.c:425
+#: src/prefs_compose_writing.c:230 src/toolbar.c:426
 msgid "Insert"
 msgstr "שבץ"
 
-#: src/prefs_compose_writing.c:231 src/toolbar.c:426
+#: src/prefs_compose_writing.c:231 src/toolbar.c:427
 msgid "Attach"
 msgstr "ספח"
 
@@ -13976,7 +14017,7 @@ msgid "Custom header configuration"
 msgstr "תצורת תקורה מותאמת"
 
 #: src/prefs_customheader.c:507 src/prefs_display_header.c:599
-#: src/prefs_matcher.c:1577 src/prefs_matcher.c:1592
+#: src/prefs_matcher.c:1583 src/prefs_matcher.c:1598
 msgid "Header name is not set."
 msgstr "שם תקורה אינו מוגדר."
 
@@ -14018,7 +14059,7 @@ msgstr "התמונה אינה בפורמט הנכון (XBM)."
 
 #: src/prefs_customheader.c:615
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
-msgstr "לא היה ניתן לקרוא ליישום `compface`. ודא שזה נמצא בתוך $PATH."
+msgstr "לא היתה אפשרות לקרוא ליישום `compface`. ודא כי זה נמצא בתוך $PATH."
 
 #: src/prefs_customheader.c:621
 #, c-format
@@ -14036,7 +14077,7 @@ msgstr "מחיקת תקורה"
 
 #: src/prefs_customheader.c:703
 msgid "Do you really want to delete this header?"
-msgstr "האם באמת שברצונך למחוק את תקורה זו?"
+msgstr "האם אתה בטוח כי ברצונך למחוק את תקורה זו?"
 
 #: src/prefs_customheader.c:876
 msgid "Current custom headers"
@@ -14077,30 +14118,32 @@ msgstr "‫‎%s יוחלף עם שם קובץ / URI"
 msgid "Use system defaults when possible"
 msgstr "השתמש ביישומים משתמטים שבמערכת כאשר ניתן"
 
-#: src/prefs_ext_prog.c:146
+#: src/prefs_ext_prog.c:141
 msgid "Web browser"
 msgstr "דפדפן רשת"
 
-#: src/prefs_ext_prog.c:180
+#: src/prefs_ext_prog.c:169
 msgid "Text editor"
 msgstr "עורך תמלילים"
 
-#: src/prefs_ext_prog.c:208
+#: src/prefs_ext_prog.c:197
 msgid "Command for 'Display as text'"
-msgstr "פקודה עבור 'הצגה כתמליל'"
+msgstr "פקודה עבור 'הצג בתור תמליל'"
 
-#: src/prefs_ext_prog.c:221
+#: src/prefs_ext_prog.c:210
 msgid ""
 "This option enables MIME parts to be displayed in the message view via a "
 "script when using the 'Display as text' contextual menu item"
 msgstr ""
+"אפשרות זו מתירה לחלקי MIME להיות מוצגים בתוך תצוגת הודעה מבעד לתסריט כאשר "
+"משתמשים בפריט התפריט ההקשרי 'הצג בתור תמליל'"
 
-#: src/prefs_ext_prog.c:280 src/prefs_image_viewer.c:138
+#: src/prefs_ext_prog.c:269 src/prefs_image_viewer.c:138
 #: src/prefs_message.c:354
 msgid "Message View"
 msgstr "תצוגת הודעה"
 
-#: src/prefs_ext_prog.c:281
+#: src/prefs_ext_prog.c:270
 msgid "External Programs"
 msgstr "תכנות חיצוניות"
 
@@ -14130,22 +14173,22 @@ msgstr "סימון"
 
 #: src/prefs_filtering_action.c:183
 msgid "Mark as read"
-msgstr "סמן כ־נקראה"
+msgstr "סמן בתור נקראה"
 
 #: src/prefs_filtering_action.c:184
 msgid "Mark as unread"
-msgstr "סמן כ־לא נקראה"
+msgstr "סמן בתור לא נקראה"
 
 #: src/prefs_filtering_action.c:185
 msgid "Mark as spam"
-msgstr "סמן כספאם"
+msgstr "סמן בתור ספאם"
 
 #: src/prefs_filtering_action.c:186
 msgid "Mark as ham"
-msgstr "סמן כלגיטימית"
+msgstr "סמן בתור לגיטימית"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1436
-#: src/toolbar.c:204 src/toolbar.c:435 src/toolbar.c:2106
+#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1438
+#: src/toolbar.c:205 src/toolbar.c:436 src/toolbar.c:2107
 msgid "Execute"
 msgstr "יישום"
 
@@ -14160,10 +14203,10 @@ msgstr "שליחה מחודשת"
 
 #: src/prefs_filtering_action.c:193
 msgid "Redirect"
-msgstr "הכוונה מחודשת"
+msgstr "הכוונה מחדש"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1440 src/prefs_matcher.c:626
+#: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:626
 #: src/prefs_summary_column.c:87 src/summaryview.c:449
 msgid "Score"
 msgstr "ניקוד"
@@ -14194,10 +14237,10 @@ msgstr "איפוס תגית"
 msgid "Clear tags"
 msgstr "טיהור תגית"
 
-# פתילי דיון
+# פתילים
 #: src/prefs_filtering_action.c:199 src/prefs_filtering_action.c:200
 msgid "Threads"
-msgstr "פתילים"
+msgstr "שרשורים"
 
 #: src/prefs_filtering_action.c:202
 msgid "Stop filter"
@@ -14207,7 +14250,7 @@ msgstr "הפסקת מסננת"
 msgid "Action configuration"
 msgstr "תצורת פעולה"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1892
+#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1888
 #: src/prefs_matcher.c:583
 msgid "Rule"
 msgstr "חוק"
@@ -14216,67 +14259,67 @@ msgstr "חוק"
 msgid "Action"
 msgstr "פעולה"
 
-#: src/prefs_filtering_action.c:933
+#: src/prefs_filtering_action.c:935
 msgid "Command-line not set"
 msgstr "שורת-פקודה לא מוגדרת"
 
-#: src/prefs_filtering_action.c:934
+#: src/prefs_filtering_action.c:936
 msgid "Destination is not set."
 msgstr "יעד אינו מוגדר."
 
-#: src/prefs_filtering_action.c:945
+#: src/prefs_filtering_action.c:947
 msgid "Recipient is not set."
 msgstr "נמען אינו מוגדר."
 
-#: src/prefs_filtering_action.c:963
+#: src/prefs_filtering_action.c:965
 msgid "Score is not set"
 msgstr "ניקוד אינו מוגדר"
 
-#: src/prefs_filtering_action.c:971
+#: src/prefs_filtering_action.c:973
 msgid "Header is not set."
 msgstr "תקורה אינה מוגדרת."
 
 # תיקיית יעד
-#: src/prefs_filtering_action.c:978
+#: src/prefs_filtering_action.c:980
 msgid "Target addressbook/folder is not set."
 msgstr "ספר/תיקיית כתובות מיועדים אינם מוגדרים."
 
-#: src/prefs_filtering_action.c:992
+#: src/prefs_filtering_action.c:994
 msgid "Tag name is empty."
 msgstr "שם תגית הינו ריק."
 
-#: src/prefs_filtering_action.c:1214
+#: src/prefs_filtering_action.c:1216
 msgid "No action was defined."
 msgstr "אף פעולה לא הוגדרה."
 
-#: src/prefs_filtering_action.c:1252 src/prefs_matcher.c:2147
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2153
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "% מילולי"
 
-#: src/prefs_filtering_action.c:1261 src/prefs_matcher.c:2156
+#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2162
 msgid "filename (should not be modified)"
 msgstr "שם קובץ (לא אמור להיות נתון לשינוי)"
 
-#: src/prefs_filtering_action.c:1262 src/prefs_matcher.c:2157
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2163
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "שורה חדשה"
 
 # דליפה
-#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2158
+#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2164
 msgid "escape character for quotes"
 msgstr "תו escape עבור ציטטות"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2159
+#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2165
 msgid "quote character"
 msgstr "תו ציטטה"
 
-#: src/prefs_filtering_action.c:1273
+#: src/prefs_filtering_action.c:1275
 msgid "Filtering Action: 'Execute'"
 msgstr "פעולת סינון: 'Execute'"
 
-#: src/prefs_filtering_action.c:1274
+#: src/prefs_filtering_action.c:1276
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
@@ -14285,23 +14328,23 @@ msgstr ""
 "‫'Execute' מתיר לך לשלוח הודעה או אלמנט של הודעה אל תוכנית חיצונית או תסריט.\n"
 "הסמלים הבאים ניתנים לשימוש:"
 
-#: src/prefs_filtering_action.c:1420
+#: src/prefs_filtering_action.c:1422
 msgid "Recipient"
 msgstr "נמען"
 
-#: src/prefs_filtering_action.c:1424
+#: src/prefs_filtering_action.c:1426
 msgid "Book/Folder"
 msgstr "ספר/תיקייה"
 
-#: src/prefs_filtering_action.c:1428
+#: src/prefs_filtering_action.c:1430
 msgid "Destination"
 msgstr "יעד"
 
-#: src/prefs_filtering_action.c:1432
+#: src/prefs_filtering_action.c:1434
 msgid "Color"
 msgstr "צבע"
 
-#: src/prefs_filtering_action.c:1518
+#: src/prefs_filtering_action.c:1520
 msgid "Current action list"
 msgstr "רשימת פעולה נוכחית"
 
@@ -14309,8 +14352,8 @@ msgstr "רשימת פעולה נוכחית"
 msgid "Filtering/Processing configuration"
 msgstr "תצורת סינון/עיבוד"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:864
-#: src/prefs_filtering.c:978
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
+#: src/prefs_filtering.c:981
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "כולם"
@@ -14319,9 +14362,13 @@ msgstr "כולם"
 msgid "Condition"
 msgstr "תנאי"
 
-#: src/prefs_filtering.c:424 src/prefs_filtering.c:446
-msgid " Define... "
-msgstr " הגדר... "
+#: src/prefs_filtering.c:424
+msgid " D_efine... "
+msgstr " ה_גדרה... "
+
+#: src/prefs_filtering.c:446
+msgid " De_fine... "
+msgstr " הג_דרה... "
 
 #: src/prefs_filtering.c:475
 msgid "Append the new rule above to the list"
@@ -14331,87 +14378,87 @@ msgstr "צרף את החוק מעלה אל הרשימה"
 msgid "Replace the selected rule in list with the rule above"
 msgstr "החלף חוק נבחר ברשימה עם החוק מעלה"
 
-#: src/prefs_filtering.c:492
+#: src/prefs_filtering.c:493
 msgid "Delete the selected rule from the list"
-msgstr "מחיקת החוק הנבחר מן הרשימה"
+msgstr "מחיקת החוק הנבחר מתוך הרשימה"
 
-#: src/prefs_filtering.c:529
+#: src/prefs_filtering.c:532
 msgid "Move the selected rule to the top"
 msgstr "הזזת החוק הנבחר אל הראש"
 
-#: src/prefs_filtering.c:532
-msgid "Page up"
-msgstr "עמוד מעלה"
+#: src/prefs_filtering.c:535
+msgid "Page u_p"
+msgstr "עמוד מ_עלה"
 
-#: src/prefs_filtering.c:540
+#: src/prefs_filtering.c:543
 msgid "Move the selected rule one page up"
 msgstr "הזזת החוק הנבחר עמוד אחד מעלה"
 
-#: src/prefs_filtering.c:549
+#: src/prefs_filtering.c:552
 msgid "Move the selected rule up"
 msgstr "הזזת החוק הנבחר מעלה"
 
-#: src/prefs_filtering.c:557
+#: src/prefs_filtering.c:560
 msgid "Move the selected rule down"
 msgstr "הזזת החוק הנבחר מטה"
 
-#: src/prefs_filtering.c:560
-msgid "Page down"
-msgstr "עמוד מטה"
+#: src/prefs_filtering.c:563
+msgid "Page dow_n"
+msgstr "עמוד מ_טה"
 
-#: src/prefs_filtering.c:568
+#: src/prefs_filtering.c:571
 msgid "Move the selected rule one page down"
 msgstr "הזזת החוק הנבחר עמוד אחד מטה"
 
-#: src/prefs_filtering.c:577
+#: src/prefs_filtering.c:580
 msgid "Move the selected rule to the bottom"
 msgstr "הזזת החוק הנבחר אל התחתית"
 
-#: src/prefs_filtering.c:1035 src/prefs_filtering.c:1121
+#: src/prefs_filtering.c:1038 src/prefs_filtering.c:1124
 msgid "Condition string is not valid."
 msgstr "מחרוזת תנאי אינה תקפה."
 
-#: src/prefs_filtering.c:1108
+#: src/prefs_filtering.c:1111
 msgid "Condition string is empty."
 msgstr "מחרוזת תנאי הינה ריקה."
 
-#: src/prefs_filtering.c:1114
+#: src/prefs_filtering.c:1117
 msgid "Action string is empty."
 msgstr "מחרוזת פעולה הינה ריקה."
 
-#: src/prefs_filtering.c:1202
+#: src/prefs_filtering.c:1205
 msgid "Delete rule"
 msgstr "מחיקת חוק"
 
-#: src/prefs_filtering.c:1203
+#: src/prefs_filtering.c:1206
 msgid "Do you really want to delete this rule?"
-msgstr "האם באמת שברצונך למחוק את חוק זה?"
+msgstr "האם אתה בטוח כי ברצונך למחוק את חוק זה?"
 
-#: src/prefs_filtering.c:1221
+#: src/prefs_filtering.c:1224
 msgid "Delete all rules"
 msgstr "מחיקת כל החוקים"
 
-#: src/prefs_filtering.c:1222
+#: src/prefs_filtering.c:1225
 msgid "Do you really want to delete all the rules?"
-msgstr "האם באמת שברצונך למחוק את כל החוקים?"
+msgstr "האם אתה בטוח כי ברצונך למחוק את כל החוקים?"
 
-#: src/prefs_filtering.c:1474
+#: src/prefs_filtering.c:1477
 msgid "Filtering rules not saved"
 msgstr "חוקי סינון לא נשמרו"
 
-#: src/prefs_filtering.c:1475
+#: src/prefs_filtering.c:1478
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "הרשימה של חוקי סינון שונתה. לסגור למרות זאת?"
 
-#: src/prefs_filtering.c:1697
+#: src/prefs_filtering.c:1700
 msgid "Move one page up"
 msgstr "הזז עמוד אחד מעלה"
 
-#: src/prefs_filtering.c:1698
+#: src/prefs_filtering.c:1701
 msgid "Move one page down"
 msgstr "הזז עמוד אחד מטה"
 
-#: src/prefs_filtering.c:1860
+#: src/prefs_filtering.c:1856
 msgid "Enable"
 msgstr "אפשר"
 
@@ -14424,7 +14471,7 @@ msgid ""
 "Select columns to be displayed in the folder list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
 msgstr ""
-"בחר טורים שיוצגו ברשימת תיקייה. ביכולתך להתאים את הסדר\n"
+"בחר טורים שיוצגו ברשימת תיקייה. באפשרותך להתאים את הסדר\n"
 "באמצעות הלחצנים מעלה / מטה או על ידי גרירת הפריטים."
 
 #: src/prefs_folder_column.c:258 src/prefs_summary_column.c:272
@@ -14437,7 +14484,7 @@ msgid "Displayed columns"
 msgstr "טורים מוצגים"
 
 #: src/prefs_folder_column.c:329 src/prefs_msg_colors.c:494
-#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1055
+#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1064
 msgid " Use default "
 msgstr " ברירת מחדל "
 
@@ -14448,7 +14495,7 @@ msgid ""
 "However, you can set them for the whole mailbox tree by using \"Apply to "
 "subfolders\".</i>"
 msgstr ""
-"<i>העדפות אלו לא תישמרנה כשם זו תיקיית רמת-שיא. בכל אופן, ביכולתך להסדירן "
+"<i>העדפות אלו לא תישמרנה כשם זו תיקיית רמת-שיא. בכל אופן, באפשרותך להסדירן "
 "עבור כל עץ תיבת הדואר בעזרת \"החל על תיקיות משנה\".</i>"
 
 #: src/prefs_folder_item.c:282 src/prefs_folder_item.c:890
@@ -14513,6 +14560,8 @@ msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
 msgstr ""
+"הדלק את אפשרות זו אם דואר נשלח ישירות אל תיקייה זו על ידי סינון מצד שרת על  "
+"IMAP או על ידי יישום חיצוני"
 
 #: src/prefs_folder_item.c:504
 msgid "Select the HTML part of multipart messages"
@@ -14575,7 +14624,7 @@ msgstr "סילוק מטמון"
 
 #: src/prefs_folder_item.c:1686
 msgid "Do you really want to discard the local cached data for this folder?"
-msgstr "האם באמת שברצונך לסלק את הנתונים המוטמנים מקומית עבור תיקייה זו?"
+msgstr "האם אתה בטוח כי ברצונך לסלק את הנתונים המוטמנים מקומית עבור תיקייה זו?"
 
 #: src/prefs_folder_item.c:1688
 msgid "+Discard"
@@ -14594,13 +14643,13 @@ msgstr "מאפיינים עבור תיקייה %s"
 msgid "Folder and Message Lists"
 msgstr "רשימת תיקיות והודעות"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2024
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2030
 msgid "Message"
 msgstr "הודעה"
 
 #: src/prefs_fonts.c:126
 msgid "Derive small and bold fonts from Folder and Message Lists font"
-msgstr "שאב גופנים קטנים ובולטים מן גופני רשימת תיקייה והודעה"
+msgstr "שאב גופנים קטנים ובולטים מתוך גופני רשימת תיקייה והודעה"
 
 #: src/prefs_fonts.c:136
 msgid "Small"
@@ -14627,7 +14676,7 @@ msgstr "תצוגה"
 msgid "Fonts"
 msgstr "גופנים"
 
-#: src/prefs_gtk.c:938 src/toolbar.c:212 src/toolbar.c:421
+#: src/prefs_gtk.c:938 src/toolbar.c:213 src/toolbar.c:422
 msgid "Preferences"
 msgstr "העדפות"
 
@@ -14641,7 +14690,7 @@ msgstr "שנה ממד תמונות מסופחות באופן משתמט"
 
 #: src/prefs_image_viewer.c:78
 msgid "Clicking image toggles scaling"
-msgstr ""
+msgstr "לחיצת תמונה משנה קנה מידה"
 
 #: src/prefs_image_viewer.c:83
 msgid "Display images inline"
@@ -14689,7 +14738,7 @@ msgstr ""
 
 #: src/prefs_logging.c:187
 msgid "Log filtering/processing when..."
-msgstr "רשום יומן סינון/עיבוד בעת... "
+msgstr "רשום יומן סינון/עיבוד כאשר... "
 
 #: src/prefs_logging.c:191
 msgid "filtering at incorporation"
@@ -14844,11 +14893,11 @@ msgstr "אזור גוף"
 msgid "whole message"
 msgstr "הודעה בשלמותה"
 
-#: src/prefs_matcher.c:389 src/summaryview.c:6302
+#: src/prefs_matcher.c:389 src/summaryview.c:6298
 msgid "Marked"
 msgstr "מסומנת"
 
-#: src/prefs_matcher.c:390 src/summaryview.c:6300
+#: src/prefs_matcher.c:390 src/summaryview.c:6296
 msgid "Deleted"
 msgstr "מחוקה"
 
@@ -14856,13 +14905,13 @@ msgstr "מחוקה"
 msgid "Replied"
 msgstr "נענתה"
 
-#: src/prefs_matcher.c:392 src/summaryview.c:6294
+#: src/prefs_matcher.c:392 src/summaryview.c:6290
 msgid "Forwarded"
 msgstr "קודמה"
 
 # דואר זבל
-#: src/prefs_matcher.c:394 src/summaryview.c:6284 src/toolbar.c:414
-#: src/toolbar.c:950 src/toolbar.c:1996
+#: src/prefs_matcher.c:394 src/summaryview.c:6280 src/toolbar.c:415
+#: src/toolbar.c:951 src/toolbar.c:1997
 msgid "Spam"
 msgstr "ספאם"
 
@@ -14870,7 +14919,7 @@ msgstr "ספאם"
 msgid "Has attachment"
 msgstr "מכילה תצריף"
 
-#: src/prefs_matcher.c:396 src/summaryview.c:6320
+#: src/prefs_matcher.c:396 src/summaryview.c:6316
 msgid "Signed"
 msgstr "חתומה"
 
@@ -14961,7 +15010,7 @@ msgstr "לצבע תוויות"
 
 #: src/prefs_matcher.c:625
 msgid "Thread"
-msgstr "פתיל"
+msgstr "שרשור"
 
 #: src/prefs_matcher.c:628
 msgid "Partially downloaded"
@@ -14971,55 +15020,55 @@ msgstr "למוּרד למחצה"
 msgid "External program test"
 msgstr "לבחינת תוכנית חיצונית"
 
-#: src/prefs_matcher.c:707 src/prefs_matcher.c:1598 src/prefs_matcher.c:1613
-#: src/prefs_matcher.c:2495
+#: src/prefs_matcher.c:707 src/prefs_matcher.c:1604 src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:2501
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "כולם"
 
-#: src/prefs_matcher.c:739
+#: src/prefs_matcher.c:741
 msgid "Use regexp"
 msgstr "נצל regexp"
 
 # להיות שקולה
-#: src/prefs_matcher.c:812
+#: src/prefs_matcher.c:818
 msgid "Message must match"
 msgstr "הודעה חייבת להתאים"
 
-#: src/prefs_matcher.c:816
+#: src/prefs_matcher.c:822
 msgid "at least one"
 msgstr "לפחות אחד מן"
 
-#: src/prefs_matcher.c:817
+#: src/prefs_matcher.c:823
 msgid "all"
 msgstr "את כל"
 
-#: src/prefs_matcher.c:820
+#: src/prefs_matcher.c:826
 msgid "of above rules"
 msgstr "החוקים מעלה"
 
-#: src/prefs_matcher.c:1516 src/prefs_matcher.c:1582
+#: src/prefs_matcher.c:1522 src/prefs_matcher.c:1588
 msgid "Search pattern is not set."
 msgstr "תבנית חיפוש אינה מוגדרת."
 
-#: src/prefs_matcher.c:1525
+#: src/prefs_matcher.c:1531
 msgid "Test command is not set."
 msgstr "פקודת מבחן אינה מוגדרת."
 
-#: src/prefs_matcher.c:1599
+#: src/prefs_matcher.c:1605
 msgid "all addresses in all headers"
 msgstr "כל הכתובות בכל התקורות"
 
-#: src/prefs_matcher.c:1602
+#: src/prefs_matcher.c:1608
 msgid "any address in any header"
 msgstr "כל כתובת בכל תקורה"
 
-#: src/prefs_matcher.c:1604
+#: src/prefs_matcher.c:1610
 #, c-format
 msgid "the address(es) in header '%s'"
-msgstr "הכתובת(ות) בתוך תקורת '%s'"
+msgstr "הכתוב(ו)ת בתוך תקורת '%s'"
 
-#: src/prefs_matcher.c:1605
+#: src/prefs_matcher.c:1611
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -15029,84 +15078,84 @@ msgid ""
 msgstr ""
 "נתיב ספר/תיקייה אינו מוגדר.\n"
 "\n"
-"אם ברצונך להתאים %s אל נגד כל ספר הכתובות, עליך לבחור '%s' מן הרשימה משולבת "
-"של ספר/תיקייה."
+"אם ברצונך להתאים %s אל נגד כל ספר הכתובות, עליך לבחור '%s' מתוך הרשימה "
+"משולבת של ספר/תיקייה."
 
-#: src/prefs_matcher.c:1824
+#: src/prefs_matcher.c:1830
 msgid "Headers part"
 msgstr "אזור תקורות"
 
-#: src/prefs_matcher.c:1828
+#: src/prefs_matcher.c:1834
 msgid "Body part"
 msgstr "אזור גוף"
 
-#: src/prefs_matcher.c:1832
+#: src/prefs_matcher.c:1838
 msgid "Whole message"
 msgstr "הודעה בשלמותה"
 
-#: src/prefs_matcher.c:1951 src/prefs_matcher.c:1995
+#: src/prefs_matcher.c:1957 src/prefs_matcher.c:2001
 msgid "in"
 msgstr "בתוך"
 
 # תכולה
-#: src/prefs_matcher.c:1953
+#: src/prefs_matcher.c:1959
 msgid "content is"
 msgstr "תוכן"
 
-#: src/prefs_matcher.c:1962
+#: src/prefs_matcher.c:1968
 msgid "Age is"
 msgstr "הגיל הוא"
 
-#: src/prefs_matcher.c:1967
+#: src/prefs_matcher.c:1973
 msgid "Flag"
 msgstr "דגלים"
 
-#: src/prefs_matcher.c:1968 src/prefs_matcher.c:1985
+#: src/prefs_matcher.c:1974 src/prefs_matcher.c:1991
 msgid "is"
 msgstr "הינו"
 
-#: src/prefs_matcher.c:1973
+#: src/prefs_matcher.c:1979
 msgid "Name:"
 msgstr "שם:"
 
-#: src/prefs_matcher.c:1984
+#: src/prefs_matcher.c:1990
 msgid "Label"
 msgstr "צבע תווית"
 
-#: src/prefs_matcher.c:1990
+#: src/prefs_matcher.c:1996
 msgid "Value:"
 msgstr "ערך:"
 
-#: src/prefs_matcher.c:2007
+#: src/prefs_matcher.c:2013
 msgid "Score is"
 msgstr "הניקוד"
 
-#: src/prefs_matcher.c:2008
+#: src/prefs_matcher.c:2014
 msgid "points"
 msgstr "נקודות"
 
-#: src/prefs_matcher.c:2018
+#: src/prefs_matcher.c:2024
 msgid "Size is"
 msgstr "הגודל הוא"
 
 # טווח
-#: src/prefs_matcher.c:2023
+#: src/prefs_matcher.c:2029
 msgid "Scope:"
 msgstr "היקף:"
 
-#: src/prefs_matcher.c:2025
+#: src/prefs_matcher.c:2031
 msgid "tags"
 msgstr "תגיות"
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2036
 msgid "type is"
 msgstr "טיפוס הינו"
 
-#: src/prefs_matcher.c:2034
+#: src/prefs_matcher.c:2040
 msgid "Program returns"
 msgstr "תוכנית מחזירה"
 
-#: src/prefs_matcher.c:2104
+#: src/prefs_matcher.c:2110
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -15114,11 +15163,11 @@ msgstr ""
 "רשומה לא נשמרה.\n"
 "לסגור למרות זאת?"
 
-#: src/prefs_matcher.c:2168
+#: src/prefs_matcher.c:2174
 msgid "Match Type: 'Test'"
 msgstr "הקבלת טיפוס: 'Test'"
 
-#: src/prefs_matcher.c:2169
+#: src/prefs_matcher.c:2175
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -15131,7 +15180,7 @@ msgstr ""
 "הסמלים הבאים ניתנים לשימוש:"
 
 # תנאי חוק
-#: src/prefs_matcher.c:2268
+#: src/prefs_matcher.c:2274
 msgid "Current condition rules"
 msgstr "חוקי תנאי נוכחיים"
 
@@ -15301,10 +15350,6 @@ msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "קטוף צבע עבור חתימות"
 
-#: src/prefs_msg_colors.c:362
-msgid "Signatures"
-msgstr "חתימות"
-
 #: src/prefs_msg_colors.c:367 src/prefs_summaries.c:354
 msgid "Folder list"
 msgstr "רשימת תיקייה"
@@ -15419,7 +15464,7 @@ msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
 msgstr ""
-"ביכולתך גם להתאים כל קיצור דרך תפריט על ידי לחיצה\n"
+"באפשרותך גם להתאים כל קיצור דרך תפריט על ידי לחיצה\n"
 "על כל מקש(ים) בעת מיקוד סמן העכבר על הפריט."
 
 #: src/prefs_other.c:479
@@ -15458,8 +15503,8 @@ msgid ""
 "by focusing on the menu item and pressing a key combination.\n"
 "Uncheck this option if you want to lock all existing keyboard shortcuts."
 msgstr ""
-"במידה ואפשרות זו מסומנת, ביכולתך לשנות קיצורי דרך מקלדת של רוב פריטי התפריט "
-"על ידי התמקדוד על פירטי תפריט ולחיצה על צירוף מקשים.\n"
+"במידה ואפשרות זו מסומנת, באפשרותך לשנות קיצורי דרך מקלדת של רוב פריטי התפריט "
+"על ידי התמקדות על פירטי תפריט ולחיצה על צירוף מקשים.\n"
 "אל תסמן את אפשרות זו אם ברצונך לנעול את כל קיצורי דרך מקלדת הקיימים."
 
 #: src/prefs_other.c:510
@@ -15530,263 +15575,255 @@ msgstr "שונות"
 # ע״י %f כדלקמן:\\n
 #: src/prefs_quote.c:77
 msgid "On %d\\n%f wrote:\\n\\n%q"
-msgstr "‎תאריך: %d\\n  ‎מאת: %f\\n\\n%q"
+msgstr "ביום %d\\nנכתב על ידי %f כדלקמן:\\n\\n%q"
 
-#: src/prefs_receive.c:137
+#: src/prefs_receive.c:123
 msgid "External incorporation program"
 msgstr "תוכנית מאוחדת חיצונית"
 
-#: src/prefs_receive.c:140
+#: src/prefs_receive.c:126
 msgid "Use external program for receiving mail"
 msgstr "השתמש בתוכנית חיצונית לקבלת דואר"
 
-#: src/prefs_receive.c:156
+#: src/prefs_receive.c:142
 msgid "Automatic checking"
 msgstr "בדיקה אוטומטית"
 
-#: src/prefs_receive.c:163
+#: src/prefs_receive.c:149
 msgid "Check for new mail every"
 msgstr "בדוק עבור דואר חדש כל"
 
-#: src/prefs_receive.c:181
+#: src/prefs_receive.c:167
 msgid "Check for new mail on start-up"
 msgstr "בדוק עבור דואר חדש בעת הפעלה"
 
-#: src/prefs_receive.c:184
+#: src/prefs_receive.c:170
 msgid "Dialogs"
 msgstr "דו שיח"
 
-#: src/prefs_receive.c:186
+#: src/prefs_receive.c:172
 msgid "Show receive dialog"
 msgstr "הצג דו שיח קבלה"
 
-#: src/prefs_receive.c:196
+#: src/prefs_receive.c:182
 msgid "Only on manual receiving"
 msgstr "רק בעת קבלה ידנית"
 
-#: src/prefs_receive.c:207
+#: src/prefs_receive.c:193
 msgid "Close receive dialog when finished"
 msgstr "סגור דו שיח קבלה בעת סיום"
 
-#: src/prefs_receive.c:210
+#: src/prefs_receive.c:196
 msgid "Don't popup error dialog on receive error"
 msgstr "אל תקפיץ דו שיח שגיאה בעת שגיאת קבלה"
 
-#: src/prefs_receive.c:213
-msgid "After checking for new mail"
-msgstr "עובר בדיקה עבור דואר חדש"
+#: src/prefs_receive.c:199
+msgid "After receiving new mail"
+msgstr "עובר קבלת דואר חדש"
 
 # הודעות שנכנסו
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:201
 msgid "Go to Inbox"
 msgstr "עבור אל תיקיית דואר נכנס"
 
 # עדכן כל תיקיות מקומיות
-#: src/prefs_receive.c:217
+#: src/prefs_receive.c:203
 msgid "Update all local folders"
 msgstr "עדכן את כל התיקיות המקומיות"
 
-#: src/prefs_receive.c:220
+#: src/prefs_receive.c:205
 msgid "Run command"
 msgstr "הרץ פקודה"
 
-#: src/prefs_receive.c:225
+#: src/prefs_receive.c:210
 msgid "after automatic check"
 msgstr "עובר בידוק אוטומטי"
 
-#: src/prefs_receive.c:227
+#: src/prefs_receive.c:212
 msgid "after manual check"
 msgstr "עובר בדיקה ידנית"
 
-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:220
 #, c-format
 msgid ""
 "Command to execute:\n"
 "(use %d as number of new mails)"
 msgstr ""
 "פקודה להרצה:\n"
-"(השתמש במשתנה ‎%d כמספר של דואר חדש)"
-
-#: src/prefs_receive.c:260
-msgid "Blink LED"
-msgstr "הבזק LED"
-
-#: src/prefs_receive.c:261
-msgid "Play sound"
-msgstr "ניגון צליל"
-
-#: src/prefs_receive.c:263
-msgid "Show info banner"
-msgstr "הצג כרזת מידע"
+"(השתמש במשתנה ‎%d בתור מספר של דואר חדש)"
 
 # טיפול בדואר
-#: src/prefs_receive.c:397 src/prefs_send.c:348
+#: src/prefs_receive.c:343 src/prefs_send.c:357
 msgid "Mail Handling"
 msgstr "ניהול דואר"
 
-#: src/prefs_receive.c:398
+#: src/prefs_receive.c:344
 msgid "Receiving"
 msgstr "קבלה"
 
-#: src/prefs_send.c:159
+#: src/prefs_send.c:161
 msgid "Save sent messages to Sent folder"
 msgstr "שמור הודעות שנשלחו אל תיקיית דואר יוצא"
 
-#: src/prefs_send.c:162
+#: src/prefs_send.c:164
 msgid "Confirm before sending queued messages"
 msgstr "ודא לפני שליחת הודעות בהמתנה"
 
-#: src/prefs_send.c:165
+#: src/prefs_send.c:167
 msgid "Never send Return Receipts"
 msgstr "אל תשלח אף פעם קבלת מסירה"
 
-#: src/prefs_send.c:168
+#: src/prefs_send.c:170
 msgid "Show send dialog"
 msgstr "הצג דו שיח שליחה"
 
-#: src/prefs_send.c:176
+#: src/prefs_send.c:172
+msgid "Warn when Subject is empty"
+msgstr "הזהר כאשר Subject (נושא) הינו ריק"
+
+#: src/prefs_send.c:180
 msgid "Outgoing encoding"
 msgstr "קידוד יוצא"
 
-#: src/prefs_send.c:201
+#: src/prefs_send.c:205
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgstr "אם 'אוטומטי' נבחרת, יעשה שימוש בקידוד האופטימלי עבור מקומיות נוכחית"
 
-#: src/prefs_send.c:216
+#: src/prefs_send.c:220
 msgid "Automatic (Recommended)"
 msgstr "אוטומטי (מומלצת)"
 
-#: src/prefs_send.c:218
+#: src/prefs_send.c:222
 msgid "7bit ASCII (US-ASCII)"
 msgstr "‫7bit ASCII ‫(US-ASCII)"
 
-#: src/prefs_send.c:219
+#: src/prefs_send.c:223
 msgid "Unicode (UTF-8)"
 msgstr "קידוד אוניברסלי (UTF-8)"
 
-#: src/prefs_send.c:221
+#: src/prefs_send.c:225
 msgid "Western European (ISO-8859-1)"
 msgstr "מערב אירופאי (ISO-8859-1)"
 
-#: src/prefs_send.c:222
+#: src/prefs_send.c:226
 msgid "Western European (ISO-8859-15)"
 msgstr "מערב אירופאי (ISO-8859-15)"
 
-#: src/prefs_send.c:224
+#: src/prefs_send.c:228
 msgid "Central European (ISO-8859-2)"
 msgstr "מרכז אירופאי (ISO-8859-2)"
 
-#: src/prefs_send.c:226
+#: src/prefs_send.c:230
 msgid "Baltic (ISO-8859-13)"
 msgstr "בלטי (ISO-8859-13)"
 
-#: src/prefs_send.c:227
+#: src/prefs_send.c:231
 msgid "Baltic (ISO-8859-4)"
 msgstr "בלטי (ISO-8859-4)"
 
-#: src/prefs_send.c:229
+#: src/prefs_send.c:233
 msgid "Greek (ISO-8859-7)"
 msgstr "יווני (ISO-8859-7)"
 
-#: src/prefs_send.c:231
+#: src/prefs_send.c:235
 msgid "Hebrew (ISO-8859-8)"
 msgstr "עברי (ISO-8859-8)"
 
-#: src/prefs_send.c:232
+#: src/prefs_send.c:236
 msgid "Hebrew (Windows-1255)"
 msgstr "עברי (Windows-1255)"
 
-#: src/prefs_send.c:234
+#: src/prefs_send.c:238
 msgid "Arabic (ISO-8859-6)"
 msgstr "ערבי (ISO-8859-6)"
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:239
 msgid "Arabic (Windows-1256)"
 msgstr "ערבי (Windows-1256)"
 
-#: src/prefs_send.c:237
+#: src/prefs_send.c:241
 msgid "Turkish (ISO-8859-9)"
 msgstr "טורקי (ISO-8859-9)"
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:243
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "קירילי (ISO-8859-5)"
 
-#: src/prefs_send.c:240
+#: src/prefs_send.c:244
 msgid "Cyrillic (KOI8-R)"
 msgstr "קירילי (KOI8-R)"
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:245
 msgid "Cyrillic (KOI8-U)"
 msgstr "קירילי (KOI8-U)"
 
-#: src/prefs_send.c:242
+#: src/prefs_send.c:246
 msgid "Cyrillic (Windows-1251)"
 msgstr "קירילי (Windows-1251)"
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:248
 msgid "Japanese (ISO-2022-JP)"
 msgstr "יפני (ISO-2022-JP)"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:250
 msgid "Japanese (EUC-JP)"
 msgstr "יפני (EUC-JP)"
 
-#: src/prefs_send.c:247
+#: src/prefs_send.c:251
 msgid "Japanese (Shift_JIS)"
 msgstr "יפני (Shift_JIS)"
 
-#: src/prefs_send.c:250
+#: src/prefs_send.c:254
 msgid "Simplified Chinese (GB18030)"
 msgstr "סינית מפושטת (GB18030)"
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:255
 msgid "Simplified Chinese (GB2312)"
 msgstr "סינית מפושטת (GB2312)"
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:256
 msgid "Simplified Chinese (GBK)"
 msgstr "סינית מפושטת (GBK)"
 
-#: src/prefs_send.c:253
+#: src/prefs_send.c:257
 msgid "Traditional Chinese (Big5)"
 msgstr "סינית מסורתית (Big5)"
 
-#: src/prefs_send.c:255
+#: src/prefs_send.c:259
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "סינית מסורתית (EUC-TW)"
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:260
 msgid "Chinese (ISO-2022-CN)"
 msgstr "סיני (ISO-2022-CN)"
 
-#: src/prefs_send.c:259
+#: src/prefs_send.c:263
 msgid "Korean (EUC-KR)"
 msgstr "קוריאני (EUC-KR)"
 
-#: src/prefs_send.c:261
+#: src/prefs_send.c:265
 msgid "Thai (TIS-620)"
 msgstr "תאי (TIS-620)"
 
-#: src/prefs_send.c:262
+#: src/prefs_send.c:266
 msgid "Thai (Windows-874)"
 msgstr "תאי (Windows-874)"
 
-#: src/prefs_send.c:266
+#: src/prefs_send.c:270
 msgid "Transfer encoding"
 msgstr "המרת קידוד"
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:281
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
-msgstr ""
+msgstr "ציין קידוד-העברת-תוכן בשימוש כאשר גוף הודעה מכיל תווים שאינם ASCII"
 
 # שולח כעת
-#: src/prefs_send.c:349 src/send_message.c:483 src/send_message.c:487
-#: src/send_message.c:492
+#: src/prefs_send.c:358 src/send_message.c:491 src/send_message.c:495
+#: src/send_message.c:500
 msgid "Sending"
 msgstr "שליחה"
 
@@ -15804,7 +15841,7 @@ msgstr "אפשר מילון חלופי"
 
 #: src/prefs_spelling.c:139
 msgid "Faster switching with last used dictionary"
-msgstr ""
+msgstr "החלפה מהירה יותר בעזרת מילון שבשימוש אחרון"
 
 #: src/prefs_spelling.c:141
 msgid "Automatic spell checking"
@@ -15866,27 +15903,27 @@ msgstr "מספר המאה (שנה/100)"
 
 #: src/prefs_summaries.c:158
 msgid "the day of the month as a decimal number"
-msgstr "היום של של החודש כמספר עשרוני"
+msgstr "היום של של החודש בתור מספר עשרוני"
 
 #: src/prefs_summaries.c:159
 msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "השעה כספרה עשרונית באמצעות שעון 24-שעות"
+msgstr "השעה בתור מספר עשרוני באמצעות שעון 24-שעות"
 
 #: src/prefs_summaries.c:160
 msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "השעה כספרה עשרונית באמצעות שעון 12-שעות"
+msgstr "השעה בתור מספר עשרוני באמצעות שעון 12-שעות"
 
 #: src/prefs_summaries.c:161
 msgid "the day of the year as a decimal number"
-msgstr "היום של של השנה כמספר עשרוני"
+msgstr "היום של של השנה בתור מספר עשרוני"
 
 #: src/prefs_summaries.c:162
 msgid "the month as a decimal number"
-msgstr "החודש כמספר עשרוני"
+msgstr "החודש בתור מספר עשרוני"
 
 #: src/prefs_summaries.c:163
 msgid "the minute as a decimal number"
-msgstr "הדקה כמספר עשרוני"
+msgstr "הדקה בתור מספר עשרוני"
 
 #: src/prefs_summaries.c:164
 msgid "either AM or PM"
@@ -15894,11 +15931,11 @@ msgstr "או AM או PM"
 
 #: src/prefs_summaries.c:165
 msgid "the second as a decimal number"
-msgstr "השניה כמספר עשרוני"
+msgstr "השניה בתור מספר עשרוני"
 
 #: src/prefs_summaries.c:166
 msgid "the day of the week as a decimal number"
-msgstr "היום של של השבוע כמספר עשרוני"
+msgstr "היום של של השבוע בתור מספר עשרוני"
 
 #: src/prefs_summaries.c:167
 msgid "the preferred date for the current locale"
@@ -15910,7 +15947,7 @@ msgstr "שתי הספרות האחרונות של השנה"
 
 #: src/prefs_summaries.c:169
 msgid "the year as a decimal number"
-msgstr "השנה כמספר עשרוני"
+msgstr "השנה בתור מספר עשרוני"
 
 #: src/prefs_summaries.c:170
 msgid "the time zone or name or abbreviation"
@@ -15985,7 +16022,7 @@ msgstr "כאשר תצוגת הודעה נראית לעין"
 
 #: src/prefs_summaries.c:470
 msgid "Thread using subject in addition to standard headers"
-msgstr "בנה פתיל בעזרת נושא בנוסף לתקורות סטנדרטיות"
+msgstr "בנה שרשור בעזרת נושא בנוסף לתקורות סטנדרטיות"
 
 # יישום מיידי
 #: src/prefs_summaries.c:474
@@ -16000,7 +16037,7 @@ msgstr "עיכוב העברה, העתקה ומחיקה של הודעות עד ש
 
 #: src/prefs_summaries.c:479
 msgid "Mark message as read"
-msgstr "סמן הודעה כ־נקראה"
+msgstr "סמן הודעה בתור נקראה"
 
 # בעת
 #: src/prefs_summaries.c:482
@@ -16018,7 +16055,7 @@ msgstr "הצג ממען בעזרת ספר כתובות"
 
 #: src/prefs_summaries.c:513
 msgid "Show tooltips"
-msgstr "הצג תיאורים קופצים"
+msgstr "הצג תיבות עזר"
 
 #: src/prefs_summaries.c:542
 msgid "Date format help"
@@ -16026,7 +16063,7 @@ msgstr "עזרת פורמט תאריך"
 
 #: src/prefs_summaries.c:560
 msgid "Confirm before marking all messages in a folder as read"
-msgstr "ודא טרם הפיכת כל ההודעות בתוך תיקייה כ־נקראו"
+msgstr "ודא טרם הפיכת כל ההודעות בתוך תיקייה בתור נקראו"
 
 #: src/prefs_summaries.c:563
 msgid "Translate header names"
@@ -16055,7 +16092,7 @@ msgid ""
 "Select columns to be displayed in the message list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
 msgstr ""
-"בחר טורים שיוצגו ברשימת הודעה. ביכולתך להתאים את הסדר\n"
+"בחר טורים שיוצגו ברשימת הודעה. באפשרותך להתאים את הסדר\n"
 "באמצעות הלחצנים מעלה / מטה או על ידי גרירת הפריטים."
 
 #: src/prefs_summary_open.c:109
@@ -16113,88 +16150,88 @@ msgstr "צרף את התבנית מעלה אל הרשימה"
 msgid "Replace the selected template in list with the template above"
 msgstr "החלף תבנית נבחרת ברשימה עם הפעולה מעלה"
 
-#: src/prefs_template.c:324
+#: src/prefs_template.c:326
 msgid "Delete the selected template from the list"
-msgstr "מחיקת התבנית הנבחרת מן הרשימה"
+msgstr "מחיקת התבנית הנבחרת מתוך הרשימה"
 
-#: src/prefs_template.c:340
+#: src/prefs_template.c:344
 msgid "Show information on configuring templates"
 msgstr "הצג מידע על תצורת תבניות"
 
-#: src/prefs_template.c:364
+#: src/prefs_template.c:368
 msgid "Move the selected template to the top"
 msgstr "הזזת התבנית הנבחרת אל הראש"
 
-#: src/prefs_template.c:374
+#: src/prefs_template.c:378
 msgid "Move the selected template up"
 msgstr "הזזת התבנית הנבחרת מעלה"
 
-#: src/prefs_template.c:382
+#: src/prefs_template.c:386
 msgid "Move the selected template down"
 msgstr "הזזת התבנית הנבחרת מטה"
 
-#: src/prefs_template.c:392
+#: src/prefs_template.c:396
 msgid "Move the selected template to the bottom"
 msgstr "הזזת התבנית הנבחרת התחתית"
 
-#: src/prefs_template.c:408
+#: src/prefs_template.c:412
 msgid "Template configuration"
 msgstr "תצורת תבנית"
 
 # typo: Template list
-#: src/prefs_template.c:595
+#: src/prefs_template.c:599
 msgid "Templates list not saved"
 msgstr "רשימת תבניות לא שמורה"
 
-#: src/prefs_template.c:596
+#: src/prefs_template.c:600
 msgid "The templates list has been modified. Close anyway?"
 msgstr "רשימת תבנית שונתה. לסגור למרות זאת?"
 
-#: src/prefs_template.c:757
+#: src/prefs_template.c:761
 msgid "The template's name is not set."
 msgstr "שם התבנית אינו מוגדר."
 
-#: src/prefs_template.c:794
+#: src/prefs_template.c:798
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "השדה \"From\" של התבנית מכיל כתובת דוא״ל שגויה."
 
-#: src/prefs_template.c:800
+#: src/prefs_template.c:804
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "השדה \"To\" של התבנית מכיל כתובת דוא״ל שגויה."
 
-#: src/prefs_template.c:806
+#: src/prefs_template.c:810
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "השדה \"Cc\" של התבנית מכיל כתובת דוא״ל שגויה."
 
-#: src/prefs_template.c:812
+#: src/prefs_template.c:816
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "השדה \"Bcc\" של התבנית מכיל כתובת דוא״ל שגויה."
 
-#: src/prefs_template.c:818
+#: src/prefs_template.c:822
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "השדה \"Subject\" של התבנית הינו שגוי."
 
-#: src/prefs_template.c:888
+#: src/prefs_template.c:892
 msgid "Delete template"
 msgstr "מחיקת תבנית"
 
-#: src/prefs_template.c:889
+#: src/prefs_template.c:893
 msgid "Do you really want to delete this template?"
-msgstr "האם באמת שברצונך למחוק את תבנית זו?"
+msgstr "האם אתה בטוח כי ברצונך למחוק את תבנית זו?"
 
-#: src/prefs_template.c:901
+#: src/prefs_template.c:905
 msgid "Delete all templates"
 msgstr "מחיקת כל התבניות"
 
-#: src/prefs_template.c:902
+#: src/prefs_template.c:906
 msgid "Do you really want to delete all the templates?"
-msgstr "האם באמת שברצונך למחוק את כל התבניות?"
+msgstr "האם אתה בטוח כי ברצונך למחוק את כל התבניות?"
 
-#: src/prefs_template.c:1224
+#: src/prefs_template.c:1221
 msgid "Current templates"
 msgstr "תבניות נוכחיות"
 
-#: src/prefs_template.c:1252
+#: src/prefs_template.c:1249
 msgid "Template"
 msgstr "תבנית"
 
@@ -16222,7 +16259,7 @@ msgstr "הסר מוטיב '%s'"
 
 #: src/prefs_themes.c:468
 msgid "Are you sure you want to remove this theme?"
-msgstr "האם אכן ברצונך להסיר את מוטיב זה?"
+msgstr "האם אתה בטוח כי ברצונך להסיר את מוטיב זה?"
 
 #: src/prefs_themes.c:478
 #, c-format
@@ -16281,12 +16318,12 @@ msgstr ""
 #: src/prefs_themes.c:557
 #, c-format
 msgid "Couldn't delete the old theme in %s."
-msgstr "לא היה ניתן למחוק את המוטיב הקודם בתוך %s."
+msgstr "לא היתה אפשרות למחוק את המוטיב הקודם בתוך %s."
 
 #: src/prefs_themes.c:565
 #, c-format
 msgid "Couldn't create destination directory %s."
-msgstr "לא היה ניתן ליצור מדור יעד %s."
+msgstr "לא היתה אפשרות ליצור מדור יעד %s."
 
 #: src/prefs_themes.c:578
 msgid "Theme installed successfully."
@@ -16294,7 +16331,7 @@ msgstr "מוטיב הותקן בהצלחה."
 
 #: src/prefs_themes.c:585
 msgid "Failed installing theme"
-msgstr "התקנת מוטיב נכשלה"
+msgstr "כשל בהתקנת מוטיב"
 
 #: src/prefs_themes.c:588
 #, c-format
@@ -16321,7 +16358,7 @@ msgstr "אין קובץ מידע זמין עבור מוטיב זה"
 
 #: src/prefs_themes.c:754
 msgid "Error: couldn't get theme status"
-msgstr "שגיאה: לא היה ניתן להשיג מצב מוטיב"
+msgstr "שגיאה: לא היתה אפשרות להשיג מצב מוטיב"
 
 #: src/prefs_themes.c:778
 #, c-format
@@ -16336,6 +16373,10 @@ msgstr "בורר"
 msgid "Install new..."
 msgstr "התקן חדש..."
 
+#: src/prefs_themes.c:843
+msgid "Get more..."
+msgstr "השג עוד..."
+
 #: src/prefs_themes.c:854
 msgid "Information"
 msgstr "מידע"
@@ -16363,7 +16404,7 @@ msgid ""
 "Please choose another Action from List"
 msgstr ""
 "פעולה נבחרת כבר מוגדרת.\n"
-"אנא בחר פעולה אחרת מן רשימה"
+"אנא בחר פעולה אחרת מתוך רשימה"
 
 #: src/prefs_toolbar.c:177
 msgid "Item has no icon defined."
@@ -16373,63 +16414,67 @@ msgstr "לפריט אין צלמית מוגדרת."
 msgid "Item has no text defined."
 msgstr "לפריט אין תמליל מוגדר."
 
-#: src/prefs_toolbar.c:911
+#: src/prefs_toolbar.c:916
 msgid "Toolbar item"
 msgstr "פריט סרגל כלים"
 
-#: src/prefs_toolbar.c:927
+#: src/prefs_toolbar.c:932
 msgid "Item type"
 msgstr "טיפוס פריט"
 
-#: src/prefs_toolbar.c:937
+#: src/prefs_toolbar.c:942
 msgid "Internal Function"
 msgstr "פונקציה פנימית"
 
-#: src/prefs_toolbar.c:938
+#: src/prefs_toolbar.c:943
 msgid "User Action"
 msgstr "פעולת משתמש"
 
-#: src/prefs_toolbar.c:940 src/toolbar.c:232
+#: src/prefs_toolbar.c:945 src/toolbar.c:233
 msgid "Separator"
 msgstr "חוצץ"
 
-#: src/prefs_toolbar.c:947
+#: src/prefs_toolbar.c:952
 msgid "Event executed on click"
 msgstr "מאורע שמוצא אל הפועל בקליק"
 
-#: src/prefs_toolbar.c:986
+#: src/prefs_toolbar.c:991
 msgid "Toolbar text"
 msgstr "תמליל סרגל כלים"
 
-#: src/prefs_toolbar.c:1001 src/prefs_toolbar.c:1372
+#: src/prefs_toolbar.c:1006 src/prefs_toolbar.c:1381
 msgid "Icon"
 msgstr "צלמית"
 
-#: src/prefs_toolbar.c:1252 src/prefs_toolbar.c:1266 src/prefs_toolbar.c:1280
+#: src/prefs_toolbar.c:1042
+msgid "A_dd"
+msgstr "הו_סף"
+
+#: src/prefs_toolbar.c:1261 src/prefs_toolbar.c:1275 src/prefs_toolbar.c:1289
 msgid "Toolbars"
 msgstr "סרגלי כלים"
 
-#: src/prefs_toolbar.c:1253
+#: src/prefs_toolbar.c:1262
 msgid "Main Window"
 msgstr "חלון ראשי"
 
-#: src/prefs_toolbar.c:1267
+#: src/prefs_toolbar.c:1276
 msgid "Message Window"
 msgstr "חלון הודעה"
 
-#: src/prefs_toolbar.c:1281
+#: src/prefs_toolbar.c:1290
 msgid "Compose Window"
 msgstr "חלון הלחנה"
 
-#: src/prefs_toolbar.c:1395
+#: src/prefs_toolbar.c:1404
 msgid "Icon text"
 msgstr "תמליל צלמית"
 
-#: src/prefs_toolbar.c:1404
+#: src/prefs_toolbar.c:1413
 msgid "Mapped event"
 msgstr "מאורע ממופה"
 
-#: src/prefs_toolbar.c:1701
+#: src/prefs_toolbar.c:1710
 msgid "Toolbar item icon"
 msgstr "צלמית פריט סרגל כלים"
 
@@ -16499,7 +16544,7 @@ msgstr "אין מידע זמין"
 msgid "No recipient keys defined."
 msgstr "אין מפתחות נמען מוגדרים."
 
-#: src/procmime.c:419 src/procmime.c:421 src/procmime.c:422
+#: src/procmime.c:422 src/procmime.c:424 src/procmime.c:425
 msgid "[Error decoding BASE64]\n"
 msgstr "[שגיאה בפענוח BASE64]\n"
 
@@ -16510,12 +16555,12 @@ msgstr "כבר מנסה לשלוח."
 #: src/procmsg.c:1561
 #, c-format
 msgid "Couldn't open file %s."
-msgstr "לא היה ניתן לפתוח קובץ %s."
+msgstr "לא היתה אפשרות לפתוח קובץ %s."
 
 #: src/procmsg.c:1657
 #, c-format
 msgid "Couldn't encrypt the email: %s"
-msgstr "לא היה ניתן להצפין את הדוא״ל: %s"
+msgstr "לא היתה אפשרות להצפין את הדוא״ל: %s"
 
 #: src/procmsg.c:1690
 msgid "Queued message header is broken."
@@ -16533,17 +16578,17 @@ msgid ""
 "SMTP session."
 msgstr "לא נמצא חשבון מסוים לשליחה, והתרחשה שגיאה במהלך סשן SMTP."
 
-# typo: informations > information
 #: src/procmsg.c:1732
 msgid ""
-"Couldn't determine sending informations. Maybe the email hasn't been "
+"Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
-"לא היה ניתן לקבוע מידע שליחה. ייתכן שהדוא״ל לא התחולל באמצעות Claws Mail."
+"לא היתה אפשרות לקבוע מידע שליחה. ייתכן כי הדוא״ל לא התחולל באמצעות Claws "
+"Mail."
 
 #: src/procmsg.c:1750
 msgid "Couldn't create temporary file for news sending."
-msgstr "לא היה ניתן ליצור קובץ זמני לשליחת חדשות."
+msgstr "לא היתה אפשרות ליצור קובץ זמני לשליחת חדשות."
 
 #: src/procmsg.c:1763
 msgid "Error when writing temporary file for news sending."
@@ -16552,11 +16597,11 @@ msgstr "שגיאה בעת כתיבת קובץ זמני לשליחת חדשות."
 #: src/procmsg.c:1777
 #, c-format
 msgid "Error occurred while posting the message to %s."
-msgstr "ארעה שגיאה במהלך פרסום ההודעה אצל %s."
+msgstr "אירעה שגיאה במהלך פרסום ההודעה אצל %s."
 
 #: src/procmsg.c:2341
 msgid "Filtering messages...\n"
-msgstr "מסנן כעת הודעות...\n"
+msgstr "כעת מסנן הודעות...\n"
 
 #: src/quote_fmt.c:47
 msgid "<span weight=\"bold\">symbols:</span>"
@@ -16758,7 +16803,7 @@ msgid ""
 "text that can contain any of the symbols or\n"
 "commands above"
 msgstr ""
-"תמליל שיכול להכיל כל אחד מן הסמלים או\n"
+"תמליל אשר יכול להכיל כל אחד מן הסמלים או\n"
 "פקודות מעלה"
 
 #: src/quote_fmt.c:99
@@ -16766,7 +16811,7 @@ msgid ""
 "text that can contain any of the symbols (no\n"
 "commands) above"
 msgstr ""
-"תמליל שיכול להכיל כל אחד מן הסמלים (לא\n"
+"תמליל אשר יכול להכיל כל אחד מן הסמלים (לא\n"
 "פקודות) מעלה"
 
 #: src/quote_fmt.c:100
@@ -16776,7 +16821,7 @@ msgid ""
 "of the contact if that address matches exactly\n"
 "one contact in the address book"
 msgstr ""
-"השלמה מן ספר כתובות עובדת רק עם הכתובת הראשונה\n"
+"השלמה מתוך ספר כתובות עובדת רק עם הכתובת הראשונה\n"
 "של התקורה, זו פולטת את השם המלא של איש הקשר\n"
 "אם הכתובת הזו תואמת איש קשר אחד בדיוק בספר\n"
 "הכתובות"
@@ -16809,7 +16854,7 @@ msgstr "עקוף תקורת מאת. זו לא משנה את החשבון שבש
 
 #: src/quote_fmt.c:332 src/quote_fmt.c:460
 msgid "Quotation mark"
-msgstr "סימן ציטטה"
+msgstr "מרכאות"
 
 #: src/quote_fmt.c:425
 msgid "Use template when forwarding messages"
@@ -16835,11 +16880,11 @@ msgstr "השדה \"נושא\" של התבנית \"הודעה חדשה\" הינו
 
 #: src/quote_fmt.c:577
 msgid "The \"Quotation mark\" field of the \"Reply\" template is invalid."
-msgstr "השדה \"סימן ציטטה\" של התבנית \"מענה\" הינו שגוי."
+msgstr "השדה \"סימן מרכאות\" של התבנית \"מענה\" הינו שגוי."
 
 #: src/quote_fmt.c:597
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
-msgstr "השדה \"סימן ציטטה\" של התבנית \"קידום\" הינו שגוי."
+msgstr "השדה \"סימן מרכאות\" של התבנית \"קידום\" הינו שגוי."
 
 #: src/quote_fmt_parse.y:509
 #, c-format
@@ -16858,87 +16903,87 @@ msgstr "שולח כעת הודעה באמצעות פקודה: %s\n"
 #: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
-msgstr "לא היה ניתן להוציא פקודה אל הפועל: %s"
+msgstr "לא היתה אפשרות להוציא פקודה אל הפועל: %s"
 
 #: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
-msgstr "ארעה שגיאה במהלך הוצאת פקודה אל הפועל: %s"
+msgstr "אירעה שגיאה במהלך הוצאת פקודה אל הפועל: %s"
 
-#: src/send_message.c:331
+#: src/send_message.c:339
 msgid "Connecting"
 msgstr "מתחבר כעת"
 
 # מקיים מיישם מבצע
-#: src/send_message.c:336
+#: src/send_message.c:344
 msgid "Doing POP before SMTP..."
 msgstr "קיים POP לפני SMTP..."
 
-#: src/send_message.c:339
+#: src/send_message.c:347
 msgid "POP before SMTP"
 msgstr "POP לפני SMTP"
 
-#: src/send_message.c:344
+#: src/send_message.c:352
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
-msgstr "חשבון '%s': מתחבר כעת אל שרת SMTP: ‫%s:%d..."
+msgstr "חשבון '%s': כעת מתחבר אל שרת SMTP: ‫%s:%d..."
 
-#: src/send_message.c:401
+#: src/send_message.c:409
 msgid "Mail sent successfully."
 msgstr "דואר נשלח בהצלחה."
 
-#: src/send_message.c:468
+#: src/send_message.c:476
 msgid "Sending HELO..."
-msgstr "שולח כעת HELO..."
+msgstr "כעת שולח HELO..."
 
-#: src/send_message.c:469 src/send_message.c:474 src/send_message.c:479
+#: src/send_message.c:477 src/send_message.c:482 src/send_message.c:487
 msgid "Authenticating"
 msgstr "מאמת כעת"
 
-#: src/send_message.c:470 src/send_message.c:475
+#: src/send_message.c:478 src/send_message.c:483
 msgid "Sending message..."
-msgstr "שולח כעת הודעה..."
+msgstr "כעת שולח הודעה..."
 
-#: src/send_message.c:473
+#: src/send_message.c:481
 msgid "Sending EHLO..."
-msgstr "שולח כעת EHLO..."
+msgstr "כעת שולח EHLO..."
 
-#: src/send_message.c:482
+#: src/send_message.c:490
 msgid "Sending MAIL FROM..."
-msgstr "שולח כעת MAIL FROM..."
+msgstr "כעת שולח MAIL FROM..."
 
-#: src/send_message.c:486
+#: src/send_message.c:494
 msgid "Sending RCPT TO..."
-msgstr "שולח כעת RCPT TO..."
+msgstr "כעת שולח RCPT TO..."
 
-#: src/send_message.c:491
+#: src/send_message.c:499
 msgid "Sending DATA..."
-msgstr "שולח כעת DATA..."
+msgstr "כעת שולח DATA..."
 
-#: src/send_message.c:495
+#: src/send_message.c:503
 msgid "Quitting..."
-msgstr "יוצא כעת..."
+msgstr "כעת יוצא..."
 
-#: src/send_message.c:524
+#: src/send_message.c:532
 #, c-format
 msgid "Sending message (%d / %d bytes)"
-msgstr "שולח כעת הודעה (%d / %d בתים)"
+msgstr "כעת שולח הודעה (%d / %d בתים)"
 
-#: src/send_message.c:577
+#: src/send_message.c:585
 msgid "Sending message"
-msgstr "שולח כעת הודעה"
+msgstr "כעת שולח הודעה"
 
-#: src/send_message.c:646 src/send_message.c:666
+#: src/send_message.c:654 src/send_message.c:674
 msgid "Error occurred while sending the message."
-msgstr "ארעה שגיאה במהלך שליחת ההודעה."
+msgstr "אירעה שגיאה במהלך שליחת ההודעה."
 
-#: src/send_message.c:649
+#: src/send_message.c:657
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
 "%s"
 msgstr ""
-"ארעה שגיאה במהלך שליחת ההודעה:\n"
+"אירעה שגיאה במהלך שליחת ההודעה:\n"
 "%s"
 
 #: src/setup.c:75
@@ -16954,7 +16999,7 @@ msgid ""
 "If you're not sure, just select OK."
 msgstr ""
 "ראשית, עליך להגדיר מיקום תיבת דואר.\n"
-"ביכולתך לעשות שימוש בתיבת דואר קיימת בפורמט MH\n"
+"באפשרותך לעשות שימוש בתיבת דואר קיימת בפורמט MH\n"
 "אם יש לך את האחד.\n"
 "אם אינך בטוח, בחר אישור."
 
@@ -16977,44 +17022,43 @@ msgstr "מחק תעודה"
 
 #: src/ssl_manager.c:429
 msgid "Do you really want to delete this certificate?"
-msgstr "האם באמת שברצונך למחוק את תעודה זו?"
+msgstr "האם אתה בטוח כי ברצונך למחוק את תעודה זו?"
 
-#: src/summary_search.c:266
+#: src/summary_search.c:271
 msgid "Search messages"
 msgstr "חיפוש הודעות"
 
-# מהבאים
-#: src/summary_search.c:292
+#: src/summary_search.c:293
 msgid "Match any of the following"
-msgstr "התאם את כל אחד מן הבאים"
+msgstr "התאם את כל אחד מהבאים"
 
-#: src/summary_search.c:294
+#: src/summary_search.c:295
 msgid "Match all of the following"
 msgstr "התאם את כל הבאים"
 
-#: src/summary_search.c:433
+#: src/summary_search.c:459
 msgid "Body:"
 msgstr "גוף:"
 
-#: src/summary_search.c:440
+#: src/summary_search.c:466
 msgid "Condition:"
 msgstr "תנאי:"
 
 # מציאה _מוחלטת
-#: src/summary_search.c:470
+#: src/summary_search.c:496
 msgid "Find _all"
 msgstr "מצא _הכל"
 
-#: src/summary_search.c:679 src/summaryview.c:1105 src/summaryview.c:1366
+#: src/summary_search.c:702 src/summaryview.c:1105 src/summaryview.c:1366
 #, c-format
 msgid "Searching in %s... \n"
-msgstr "מחפש כעת בתוך %s... \n"
+msgstr "כעת מחפש בתוך %s... \n"
 
-#: src/summary_search.c:776
+#: src/summary_search.c:799
 msgid "Beginning of list reached; continue from end?"
 msgstr "רשימה מוצתה עד תחילתה; האם להמשיך מן הסוף?"
 
-#: src/summary_search.c:778
+#: src/summary_search.c:801
 msgid "End of list reached; continue from beginning?"
 msgstr "רשימה מוצתה עד סופה; האם להמשיך מן ההתחלה?"
 
@@ -17041,7 +17085,7 @@ msgstr "נשארו כמה סימונים. לעבדם?"
 #: src/summaryview.c:1345
 #, c-format
 msgid "Scanning folder (%s)..."
-msgstr "סורק כעת תיקייה (%s)..."
+msgstr "כעת סורק תיקייה (%s)..."
 
 #: src/summaryview.c:1829 src/summaryview.c:1881
 msgid "No more unread messages"
@@ -17115,7 +17159,7 @@ msgstr "לא נמצאו הודעות מסווגות. לחפש מן ההתחלה?
 
 #: src/summaryview.c:2436
 msgid "Attracting messages by subject..."
-msgstr "מושך הודעות לפי נושא..."
+msgstr "כעת מושך הודעות לפי נושא..."
 
 #: src/summaryview.c:2619
 #, c-format
@@ -17183,11 +17227,11 @@ msgstr "%d/%d נבחרו (%s/%s), %d לא נקראו"
 
 #: src/summaryview.c:2972
 msgid "Sorting summary..."
-msgstr "ממיין כעת תמצית..."
+msgstr "כעת ממיין תמצית..."
 
 #: src/summaryview.c:3111
 msgid "Setting summary from message data..."
-msgstr "ממיין כעת תמצית מן נתוני הודעה..."
+msgstr "כעת ממיין תמצית מתוך נתוני הודעה..."
 
 #: src/summaryview.c:3316
 msgid "(No Date)"
@@ -17215,72 +17259,72 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>אל: %s, בתאריך %s</span>"
 
-#: src/summaryview.c:4290
+#: src/summaryview.c:4286
 msgid "You're not the author of the article.\n"
 msgstr "אינך המחבר של המאמר.\n"
 
-#: src/summaryview.c:4383
+#: src/summaryview.c:4379
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
-msgstr[0] "האם באמת שברצונך למחוק את ההודעה הנבחרת?"
-msgstr[1] "האם באמת שברצונך למחוק את %d ההודעות הנבחרות?"
+msgstr[0] "האם אתה בטוח כי ברצונך למחוק את ההודעה הנבחרת?"
+msgstr[1] "האם אתה בטוח כי ברצונך למחוק את %d ההודעות הנבחרות?"
 
-#: src/summaryview.c:4386
+#: src/summaryview.c:4382
 msgid "Delete message(s)"
 msgstr "מחיקת הודעה(ות)"
 
-#: src/summaryview.c:4549
+#: src/summaryview.c:4545
 msgid "Destination is same as current folder."
 msgstr "היעד הינו זהה לזה של התיקייה הנוכחית."
 
-#: src/summaryview.c:4648
+#: src/summaryview.c:4644
 msgid "Destination to copy is same as current folder."
 msgstr "היעד להעתקה הינו זהה לזה של התיקייה הנוכחית."
 
-#: src/summaryview.c:4821
+#: src/summaryview.c:4817
 msgid "Append or Overwrite"
 msgstr "הוספה על או החלפה"
 
-#: src/summaryview.c:4822
+#: src/summaryview.c:4818
 msgid "Append or overwrite existing file?"
 msgstr "הוסף על או החלף קובץ קיים?"
 
-#: src/summaryview.c:4823
+#: src/summaryview.c:4819
 msgid "_Append"
 msgstr "ל_צרף"
 
-#: src/summaryview.c:4823
+#: src/summaryview.c:4819
 msgid "_Overwrite"
 msgstr "_החלף"
 
-#: src/summaryview.c:4864
+#: src/summaryview.c:4860
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "בחרת להדפיס %d הודעות, בזו אחר זו. האם ברצונך להמשיך?"
 
-#: src/summaryview.c:5341
+#: src/summaryview.c:5337
 msgid "Building threads..."
-msgstr "בונה כעת פתילים..."
+msgstr "כעת בונה שרשורים..."
 
-#: src/summaryview.c:5587
+#: src/summaryview.c:5583
 msgid "Skip these rules"
 msgstr "דלג על חוקים אלו"
 
-#: src/summaryview.c:5590
+#: src/summaryview.c:5586
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "החל את חוקים אלו בלי להתחשב בחשבון לו הם שייכים"
 
-#: src/summaryview.c:5593
+#: src/summaryview.c:5589
 msgid "Apply these rules if they apply to the current account"
 msgstr "החל את חוקים אם הם חלים לחשבון הנוכחי"
 
-#: src/summaryview.c:5622
+#: src/summaryview.c:5618
 msgid "Filtering"
 msgstr "סינון"
 
-#: src/summaryview.c:5623
+#: src/summaryview.c:5619
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -17288,59 +17332,59 @@ msgstr ""
 "קיימים חוקים מסוימים ששייכים לחשבון.\n"
 "אנא בחר מה לעשות עם חוקים אלו:"
 
-#: src/summaryview.c:5625
+#: src/summaryview.c:5621
 msgid "_Filter"
-msgstr "_סינון"
+msgstr "_סנן"
 
-#: src/summaryview.c:5653
+#: src/summaryview.c:5649
 msgid "Filtering..."
-msgstr "מסנן כעת..."
+msgstr "כעת מסנן..."
 
-#: src/summaryview.c:5732
+#: src/summaryview.c:5728
 msgid "Processing configuration"
 msgstr "תצורת עיבוד"
 
-#: src/summaryview.c:6280
+#: src/summaryview.c:6276
 msgid "Ignored thread"
-msgstr "פתיל מנוכר"
+msgstr "שרשור מנוכר"
 
-#: src/summaryview.c:6282
+#: src/summaryview.c:6278
 msgid "Watched thread"
-msgstr "פתיל מפוקח"
+msgstr "שרשור מפוקח"
 
-#: src/summaryview.c:6290
+#: src/summaryview.c:6286
 msgid "Replied but also forwarded - click to see reply"
 msgstr "נענתה אך גם קודמה - הקלק כדי לראות מענה"
 
-#: src/summaryview.c:6292
+#: src/summaryview.c:6288
 msgid "Replied - click to see reply"
 msgstr "נענתה - הקלק כדי לראות מענה"
 
-#: src/summaryview.c:6304
+#: src/summaryview.c:6300
 msgid "To be moved"
 msgstr "להעברה"
 
-#: src/summaryview.c:6306
+#: src/summaryview.c:6302
 msgid "To be copied"
 msgstr "להעתקה"
 
-#: src/summaryview.c:6318
+#: src/summaryview.c:6314
 msgid "Signed, has attachment(s)"
 msgstr "חתומה, מכילה תצריף(ים)"
 
-#: src/summaryview.c:6322
+#: src/summaryview.c:6318
 msgid "Encrypted, has attachment(s)"
 msgstr "מוצפנת, מכילה תצריף(ים)"
 
-#: src/summaryview.c:6324
+#: src/summaryview.c:6320
 msgid "Encrypted"
 msgstr "מוצפנת"
 
-#: src/summaryview.c:6326
+#: src/summaryview.c:6322
 msgid "Has attachment(s)"
 msgstr "מכילה תצריף(ים)"
 
-#: src/summaryview.c:7963
+#: src/summaryview.c:7952
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -17349,11 +17393,11 @@ msgstr ""
 "שגיאת ביטוי רגולרי (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8071
+#: src/summaryview.c:8060
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "חזור אל רשימת התיקייה (יש לך הודעות שלא נקראו)"
 
-#: src/summaryview.c:8076
+#: src/summaryview.c:8065
 msgid "Go back to the folder list"
 msgstr "חזור אל רשימת התיקייה"
 
@@ -17383,7 +17427,7 @@ msgstr "_פתח תמונה"
 
 #: src/textview.c:255
 msgid "_Save image..."
-msgstr "_שמור תמונה..."
+msgstr "_שמירת תמונה..."
 
 #: src/textview.c:732
 #, c-format
@@ -17446,10 +17490,9 @@ msgstr " (מקש קיצור דרך: '"
 msgid "     - To display as text, select "
 msgstr "     - להצגה כתמליל, בחר "
 
-# הצגה
 #: src/textview.c:1001
 msgid "'Display as text'"
-msgstr "'הצגה כתמליל'"
+msgstr "'הצג בתור תמליל'"
 
 #: src/textview.c:1012
 msgid "     - To open with an external program, select "
@@ -17501,7 +17544,7 @@ msgid ""
 "\n"
 "Open it anyway?"
 msgstr ""
-"כתובת URL ממשית הינה שונה מן כתובת URL מוצגת.\n"
+"כתובת URL ממשית הינה שונה מכתובת URL מוצגת.\n"
 "\n"
 "<b>כתובת URL מוצגת:</b> %s\n"
 "\n"
@@ -17517,280 +17560,280 @@ msgstr "אזהרת ניסיון פישינג (Phishing)"
 msgid "_Open URL"
 msgstr "_פתח URL"
 
-#: src/toolbar.c:191 src/toolbar.c:1948
+#: src/toolbar.c:192 src/toolbar.c:1949
 msgid "Receive Mail from all Accounts"
 msgstr "קבלת דואר מכל החשבונות"
 
-#: src/toolbar.c:192 src/toolbar.c:1953
+#: src/toolbar.c:193 src/toolbar.c:1954
 msgid "Receive Mail from current Account"
-msgstr "קבלת דואר מן חשבון נוכחי"
+msgstr "קבלת דואר מתוך חשבון נוכחי"
 
-#: src/toolbar.c:193 src/toolbar.c:1957
+#: src/toolbar.c:194 src/toolbar.c:1958
 msgid "Send Queued Messages"
 msgstr "שליחת הודעות בהמתנה"
 
-#: src/toolbar.c:194 src/toolbar.c:918 src/toolbar.c:1975 src/toolbar.c:1986
+#: src/toolbar.c:195 src/toolbar.c:919 src/toolbar.c:1976 src/toolbar.c:1987
 msgid "Compose Email"
 msgstr "הלחנת דוא״ל"
 
-#: src/toolbar.c:195
+#: src/toolbar.c:196
 msgid "Compose News"
 msgstr "הלחנת חדשות"
 
-#: src/toolbar.c:196 src/toolbar.c:2014 src/toolbar.c:2024
+#: src/toolbar.c:197 src/toolbar.c:2015 src/toolbar.c:2025
 msgid "Reply to Message"
 msgstr "מענה להודעה"
 
-#: src/toolbar.c:197 src/toolbar.c:2031 src/toolbar.c:2041
+#: src/toolbar.c:198 src/toolbar.c:2032 src/toolbar.c:2042
 msgid "Reply to Sender"
 msgstr "מענה לממען"
 
-#: src/toolbar.c:198 src/toolbar.c:2048 src/toolbar.c:2058
+#: src/toolbar.c:199 src/toolbar.c:2049 src/toolbar.c:2059
 msgid "Reply to All"
 msgstr "מענה לכולם"
 
-#: src/toolbar.c:199 src/toolbar.c:2065 src/toolbar.c:2075
+#: src/toolbar.c:200 src/toolbar.c:2066 src/toolbar.c:2076
 msgid "Reply to Mailing-list"
 msgstr "מענה לרשימת-דיוור"
 
-#: src/toolbar.c:200 src/toolbar.c:1969
+#: src/toolbar.c:201 src/toolbar.c:1970
 msgid "Open email"
 msgstr "פתח דוא״ל"
 
-#: src/toolbar.c:201 src/toolbar.c:2082 src/toolbar.c:2093
+#: src/toolbar.c:202 src/toolbar.c:2083 src/toolbar.c:2094
 msgid "Forward Message"
 msgstr "קידום הודעה"
 
-#: src/toolbar.c:202 src/toolbar.c:2098
+#: src/toolbar.c:203 src/toolbar.c:2099
 msgid "Trash Message"
 msgstr "זריקת הודעה"
 
-#: src/toolbar.c:203 src/toolbar.c:2102
+#: src/toolbar.c:204 src/toolbar.c:2103
 msgid "Delete Message"
 msgstr "מחיקת הודעה"
 
 # עבור אל
-#: src/toolbar.c:205 src/toolbar.c:2110
+#: src/toolbar.c:206 src/toolbar.c:2111
 msgid "Go to Previous Unread Message"
 msgstr "מעבר אל הודעה קודמת שלא נקראה"
 
-#: src/toolbar.c:206 src/toolbar.c:2114
+#: src/toolbar.c:207 src/toolbar.c:2115
 msgid "Go to Next Unread Message"
-msgstr "מעבר אל הודעה באה של נקראה"
+msgstr "מעבר אל הודעה באה שלא נקראה"
 
-#: src/toolbar.c:209 src/toolbar.c:419
+#: src/toolbar.c:210 src/toolbar.c:420
 msgid "Print"
 msgstr "הדפסה"
 
-#: src/toolbar.c:210
+#: src/toolbar.c:211
 msgid "Learn Spam or Ham"
-msgstr "למד כספאם או כלגיטימית"
+msgstr "למד בתור ספאם או לגיטימית"
 
-#: src/toolbar.c:211
+#: src/toolbar.c:212
 msgid "Open folder/Go to folder list"
 msgstr "פתח תיקייה/עבור אל רשימת תיקייה"
 
-#: src/toolbar.c:214 src/toolbar.c:2120
+#: src/toolbar.c:215 src/toolbar.c:2121
 msgid "Send Message"
 msgstr "שליחת הודעה"
 
-#: src/toolbar.c:215 src/toolbar.c:2124
+#: src/toolbar.c:216 src/toolbar.c:2125
 msgid "Put into queue folder and send later"
 msgstr "השמה בתוך תיקיית תור ושליחה כעבור"
 
-#: src/toolbar.c:216 src/toolbar.c:2128
+#: src/toolbar.c:217 src/toolbar.c:2129
 msgid "Save to draft folder"
 msgstr "שמירה אל תיקיית טיוטה"
 
 # שילוב
-#: src/toolbar.c:217 src/toolbar.c:2132
+#: src/toolbar.c:218 src/toolbar.c:2133
 msgid "Insert file"
 msgstr "שיבוץ קובץ"
 
-#: src/toolbar.c:218 src/toolbar.c:2136
+#: src/toolbar.c:219 src/toolbar.c:2137
 msgid "Attach file"
 msgstr "סיפוח קובץ"
 
-#: src/toolbar.c:219 src/toolbar.c:2140
+#: src/toolbar.c:220 src/toolbar.c:2141
 msgid "Insert signature"
 msgstr "שיבוץ חתימה"
 
-#: src/toolbar.c:220 src/toolbar.c:2144
+#: src/toolbar.c:221 src/toolbar.c:2145
 msgid "Edit with external editor"
 msgstr "ערוך באמצעות עורך חיצוני"
 
-#: src/toolbar.c:221 src/toolbar.c:2148
+#: src/toolbar.c:222 src/toolbar.c:2149
 msgid "Wrap long lines of current paragraph"
 msgstr "כריכת שורות ארוכות של פסקה נוכחית"
 
-#: src/toolbar.c:222 src/toolbar.c:2152
+#: src/toolbar.c:223 src/toolbar.c:2153
 msgid "Wrap all long lines"
 msgstr "כריכת כל השורות הארוכות"
 
-#: src/toolbar.c:225 src/toolbar.c:437 src/toolbar.c:2161
+#: src/toolbar.c:226 src/toolbar.c:438 src/toolbar.c:2162
 msgid "Check spelling"
 msgstr "בדוק איות"
 
-#: src/toolbar.c:227
+#: src/toolbar.c:228
 msgid "Claws Mail Actions Feature"
 msgstr "תכונת פעולות Claws Mail"
 
-#: src/toolbar.c:228 src/toolbar.c:2177
+#: src/toolbar.c:229 src/toolbar.c:2178
 msgid "Cancel receiving"
 msgstr "ביטול קבלה"
 
-#: src/toolbar.c:230 src/toolbar.c:2185
+#: src/toolbar.c:231 src/toolbar.c:2186
 msgid "Cancel receiving/sending"
 msgstr "בטל קבלה/שליחה"
 
-#: src/toolbar.c:231 src/toolbar.c:1961
+#: src/toolbar.c:232 src/toolbar.c:1962
 msgid "Close window"
 msgstr "סגירת חלון"
 
-#: src/toolbar.c:233
+#: src/toolbar.c:234
 msgid "Claws Mail Plugins"
 msgstr "תוספות Claws Mail"
 
-#: src/toolbar.c:377 src/toolbar.c:412
+#: src/toolbar.c:378 src/toolbar.c:413
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "אשפה"
 
-#: src/toolbar.c:400
+#: src/toolbar.c:401
 msgid "Folders"
 msgstr "תיקיות"
 
-#: src/toolbar.c:402
+#: src/toolbar.c:403
 msgid "Get Mail"
 msgstr "השגת דואר"
 
-#: src/toolbar.c:403
+#: src/toolbar.c:404
 msgid "Get"
 msgstr "השגה"
 
-#: src/toolbar.c:405 src/toolbar.c:406
+#: src/toolbar.c:406 src/toolbar.c:407
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "הלחנה"
 
-#: src/toolbar.c:408
+#: src/toolbar.c:409
 msgid "All"
 msgstr "כולם"
 
-#: src/toolbar.c:409
+#: src/toolbar.c:410
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "ממען"
 
-#: src/toolbar.c:410
+#: src/toolbar.c:411
 msgid "List"
 msgstr "רשימה"
 
-#: src/toolbar.c:415
+#: src/toolbar.c:416
 msgid "Prev"
 msgstr "קודמת"
 
-#: src/toolbar.c:416
+#: src/toolbar.c:417
 msgid "Next"
 msgstr "הבאה"
 
-#: src/toolbar.c:424
+#: src/toolbar.c:425
 msgid "Draft"
 msgstr "טיוטה"
 
-#: src/toolbar.c:427
+#: src/toolbar.c:428
 msgid "Insert sig."
 msgstr "שיבוץ חת."
 
-#: src/toolbar.c:428
+#: src/toolbar.c:429
 msgid "Edit"
 msgstr "ערוך"
 
-#: src/toolbar.c:429
+#: src/toolbar.c:430
 msgid "Wrap para."
 msgstr "כריכת פס."
 
-#: src/toolbar.c:430
+#: src/toolbar.c:431
 msgid "Wrap all"
 msgstr "כריכה מוחלטת"
 
-#: src/toolbar.c:432 src/toolbar.c:433
+#: src/toolbar.c:433 src/toolbar.c:434
 msgid "Stop"
 msgstr "הפסק"
 
-#: src/toolbar.c:434
+#: src/toolbar.c:435
 msgid "Stop all"
 msgstr "הפסק הכל"
 
-#: src/toolbar.c:910
+#: src/toolbar.c:911
 msgid "Compose News message"
 msgstr "הלחן הודעת חדשות"
 
-#: src/toolbar.c:952
+#: src/toolbar.c:953
 msgid "Learn spam"
 msgstr "למד ספאם"
 
-#: src/toolbar.c:961
+#: src/toolbar.c:962
 msgid "Ham"
 msgstr "לגיטימית"
 
-#: src/toolbar.c:963
+#: src/toolbar.c:964
 msgid "Learn ham"
 msgstr "למד לגיטימית"
 
-#: src/toolbar.c:1943
+#: src/toolbar.c:1944
 msgid "Go to folder list"
 msgstr "מעבר אל רשימת תיקייה"
 
-#: src/toolbar.c:1949
+#: src/toolbar.c:1950
 msgid "Receive Mail from selected Account"
-msgstr "קבלת דואר מן חשבון נבחר"
+msgstr "קבלת דואר מתוך חשבון נבחר"
 
-#: src/toolbar.c:1965
+#: src/toolbar.c:1966
 msgid "Open preferences"
 msgstr "פתח העדפות"
 
-#: src/toolbar.c:1976
+#: src/toolbar.c:1977
 msgid "Compose with selected Account"
 msgstr "הלחנה עם חשבון נבחר"
 
-#: src/toolbar.c:1997
+#: src/toolbar.c:1998
 msgid "Learn as..."
-msgstr "למד כ..."
+msgstr "למד בתור..."
 
-#: src/toolbar.c:2007
+#: src/toolbar.c:2008
 msgid "Learn as _Spam"
-msgstr "למד כ_ספאם"
+msgstr "למד בתור _ספאם"
 
-#: src/toolbar.c:2008
+#: src/toolbar.c:2009
 msgid "Learn as _Ham"
-msgstr "למד כ_לגיטימית"
+msgstr "למד בתור _לגיטימית"
 
-#: src/toolbar.c:2015
+#: src/toolbar.c:2016
 msgid "Reply to Message options"
-msgstr "אפשרויות מענה להודעה"
+msgstr "אפשרויות מענה אל הודעה"
 
-#: src/toolbar.c:2019 src/toolbar.c:2036 src/toolbar.c:2053 src/toolbar.c:2070
+#: src/toolbar.c:2020 src/toolbar.c:2037 src/toolbar.c:2054 src/toolbar.c:2071
 msgid "_Reply with quote"
 msgstr "_מענה עם ציטוט"
 
-#: src/toolbar.c:2020 src/toolbar.c:2037 src/toolbar.c:2054 src/toolbar.c:2071
+#: src/toolbar.c:2021 src/toolbar.c:2038 src/toolbar.c:2055 src/toolbar.c:2072
 msgid "Reply without _quote"
 msgstr "מענה ללא _ציטוט"
 
-#: src/toolbar.c:2032
+#: src/toolbar.c:2033
 msgid "Reply to Sender options"
-msgstr "אפשרויות מענה לממען"
+msgstr "אפשרויות מענה אל ממען"
 
-#: src/toolbar.c:2049
+#: src/toolbar.c:2050
 msgid "Reply to All options"
-msgstr "אפשרויות מענה לכולם"
+msgstr "אפשרויות מענה אל כולם"
 
-#: src/toolbar.c:2066
+#: src/toolbar.c:2067
 msgid "Reply to Mailing-list options"
-msgstr "אפשרויות מענה לרשימת-דיוור"
+msgstr "אפשרויות מענה אל רשימת-דיוור"
 
-#: src/toolbar.c:2083
+#: src/toolbar.c:2084
 msgid "Forward Message options"
 msgstr "אפשרויות קידום הודעה"
 
@@ -17815,14 +17858,14 @@ msgstr "אנא בחר כתובת URL לפתיחה."
 msgid "Select All"
 msgstr "בחר הכל"
 
-#: src/wizard.c:539
+#: src/wizard.c:517
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "ברוך בואך אל Claws Mail"
 
 # כעת ש
 # ובכן מש
-#: src/wizard.c:562
+#: src/wizard.c:540
 #, c-format
 msgid ""
 "\n"
@@ -17872,189 +17915,173 @@ msgid ""
 msgstr ""
 "\n"
 "ברוך בואך אל Claws Mail\n"
-"---------------------\n"
+"-----------------------\n"
 "\n"
-"עתה משהסדרת את חשבונך ביכולתך לתפוס דואר על יד הקלקה על\n"
+"עתה משהסדרת את חשבונך באפשרותך לתפוס דואר על יד הקלקה על\n"
 "הלחצן 'השגת דואר' בימין סרגל הכלים.\n"
 "\n"
 "‫Claws Mail מכיל תכונות נוספות רבות הנגישות דרך תוספות,\n"
 "כגון אנטי-ספאם סינון ולמידה (דרך התוספות Bogofilter או\n"
 "‫SpamAssassin), הגנה על פרטיות (דרך PGP/Mime), מאגד\n"
-"‫RSS, לוח שנה, ועוד הרבה יותר. ביכולתך להטעינן מן רשומת\n"
+"‫RSS, לוח שנה, ועוד הרבה יותר. באפשרותך להטעינן מתוך\n"
 "התפריט '/תצורה/תוספות'.\n"
 "\n"
-"ביכולתך לשנות את העדפות חשבונך באמצעות רשומת\n"
+"באפשרותך לשנות את העדפות חשבונך באמצעות\n"
 "התפריט '/תצורה/העדפות עבור חשבון נוכחי' ולשנות\n"
 "את ההעדפות הכלליות באמצעות '/תצורה/העדפות'.\n"
 "\n"
-"ביכולתך למצוא מידע נוסף במדריך של Claws Mail,\n"
+"באפשרותך למצוא מידע נוסף במדריך של Claws Mail,\n"
 "שניתך לגישה באמצעות רשומת תפריט '/עזרה/מדריך'\n"
 "או באופן מקוון בכתובת הנתונה מטה.\n"
 "\n"
 "כתובות שימושיות\n"
-"-----------\n"
-"עמוד בית:      <%s>\n"
+"---------------\n"
+"עמוד בית:     <%s>\n"
 "מדריך:        <%s>\n"
-"שו״ת:\t       <%s>\n"
-"מוטיבים:        <%s>\n"
+"שו״ת:         <%s>\n"
+"מוטיבים:      <%s>\n"
 "רשימות דיוור: <%s>\n"
 "\n"
 "רשיון\n"
-"-------\n"
-"‫Claws Mail הינה תכנה חופשית, משוחררת תחת התנאים של\n"
+"-----\n"
+"‫Claws Mail הינו תכנה חופשית, משוחרר תחת התנאים של הרשיון\n"
 "‏GNU General Public License, גרסא 3 או מאוחרת יותר, כפי\n"
 "שפורסם על ידי Free Software Foundation, רחוב פרנקלין 51,\n"
 "קומה חמש, בוסטון, מסצ׳וסטס 02110-1301, ארה״ב. הרשיון\n"
 "ניתן למציאה אצל <%s>.\n"
 "\n"
 "תרומות\n"
-"---------\n"
-"אם ברצונך לתרום לפרויקט Claws Mail ביכולתך לעשות\n"
+"------\n"
+"אם ברצונך לתרום לפרויקט Claws Mail באפשרותך לעשות\n"
 "כן בכתובת <%s>.\n"
 "\n"
 
-#: src/wizard.c:638
+#: src/wizard.c:616
 msgid "Please enter the mailbox name."
 msgstr "אנא הזן את שם תיבת הדואר."
 
-#: src/wizard.c:681
+#: src/wizard.c:644
 msgid "Please enter your name and email address."
 msgstr "אנא הזן את שמך ואת כתובת הדוא״ל שלך."
 
-#: src/wizard.c:692
+#: src/wizard.c:655
 msgid "Please enter your receiving server and username."
 msgstr "אנא הזן את השרת המקבל שלך ושם משתמש."
 
-#: src/wizard.c:702
+#: src/wizard.c:665
 msgid "Please enter your username."
 msgstr "אנא הזן את שם המשתמש שלך."
 
-#: src/wizard.c:712
+#: src/wizard.c:675
 msgid "Please enter your SMTP server."
 msgstr "אנא הזן שרת SMTP."
 
-#: src/wizard.c:723
+#: src/wizard.c:686
 msgid "Please enter your SMTP username."
 msgstr "אנא הזן שם משתמש SMTP."
 
-#: src/wizard.c:1013
+#: src/wizard.c:965
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">שמך:</span>"
 
-#: src/wizard.c:1023
+#: src/wizard.c:975
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">כתובת הדוא״ל שלך:</span>"
 
-#: src/wizard.c:1033
+#: src/wizard.c:985
 msgid "Your organization:"
 msgstr "ארגונך:"
 
-#: src/wizard.c:1141
+#: src/wizard.c:1018
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">שם תיבת דואר:</span>"
 
-#: src/wizard.c:1149
+#: src/wizard.c:1026
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
-"ביכולתך גם לציין את הנתיב המוחלט, לדוגמא: \"/home/john/Documents/Mail\""
-
-#: src/wizard.c:1157
-msgid "on internal memory"
-msgstr "בזיכרון פנימי"
+"באפשרותך גם לציין את הנתיב המוחלט, לדוגמא: \"/home/john/Documents/Mail\""
 
-#: src/wizard.c:1160
-msgid "on external memory card"
-msgstr "בכרטיס זיכרון חיצוני"
-
-#: src/wizard.c:1163
-msgid "on internal memory card"
-msgstr "בכרטיס זיכרון פנימי"
-
-#: src/wizard.c:1213
-msgid "<span weight=\"bold\">Store data</span>"
-msgstr "<span weight=\"bold\">אחסון נתונים</span>"
-
-#: src/wizard.c:1281
+#: src/wizard.c:1097
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
-msgstr "ביכולתך לציין מספר פורט על ידי הוספתו בסוף: \"mail.example.com:25\""
+msgstr "באפשרותך לציין מספר פורט על ידי הוספתו בסוף: \"mail.example.com:25\""
 
-#: src/wizard.c:1284
+#: src/wizard.c:1100
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">כתובת שרת SMTP:</span>"
 
-#: src/wizard.c:1290
+#: src/wizard.c:1106
 msgid "Use authentication"
 msgstr "השתמש באימות"
 
 # בזה של
-#: src/wizard.c:1298
+#: src/wizard.c:1114
 msgid "<span size=\"small\">(empty to use the same as receive)</span>"
 msgstr "<span size=\"small\">(ריק כדי להשתמש באותו הדבר אצל קבלה)</span>"
 
-#: src/wizard.c:1312
+#: src/wizard.c:1128
 msgid "SMTP username:"
 msgstr "שם משתמש SMTP:"
 
-#: src/wizard.c:1323
+#: src/wizard.c:1139
 msgid "SMTP password:"
 msgstr "סיסמת SMTP:"
 
-#: src/wizard.c:1340
+#: src/wizard.c:1152
 msgid "Use SSL to connect to SMTP server"
 msgstr "השתמש בהצפנת SSL להתחברות אל שרת SMTP"
 
-#: src/wizard.c:1351 src/wizard.c:1630
+#: src/wizard.c:1163 src/wizard.c:1437
 msgid "Use SSL via STARTTLS"
 msgstr "SSL דרך STARTTLS"
 
-#: src/wizard.c:1363 src/wizard.c:1642
+#: src/wizard.c:1175 src/wizard.c:1449
 msgid "Client SSL certificate (optional)"
 msgstr "תעודת לקוח SSL (רשות)"
 
-#: src/wizard.c:1425 src/wizard.c:1450 src/wizard.c:1573
+#: src/wizard.c:1237 src/wizard.c:1262 src/wizard.c:1385
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">כתובת שרת:</span>"
 
-#: src/wizard.c:1480
+#: src/wizard.c:1292
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">תיבת דואר מקומית:</span>"
 
-#: src/wizard.c:1540
+#: src/wizard.c:1352
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">טיפוס שרת:</span>"
 
-#: src/wizard.c:1550
+#: src/wizard.c:1362
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1584
+#: src/wizard.c:1396
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr ""
-"ביכולתך לציין את מספר הפורט על ידי צירופו בקצה: \"mail.example.com:110\""
+"באפשרותך לציין את מספר הפורט על ידי צירופו בקצה: \"mail.example.com:110\""
 
-#: src/wizard.c:1589
+#: src/wizard.c:1401
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">שם משתמש:</span>"
 
-#: src/wizard.c:1619
+#: src/wizard.c:1426
 msgid "Use SSL to connect to receiving server"
 msgstr "השתמש בהצפנת SSL כדי להתחבר אל שרת קבלה"
 
-#: src/wizard.c:1684
+#: src/wizard.c:1491
 msgid "IMAP server directory:"
 msgstr "מדור שרת IMAP:"
 
-#: src/wizard.c:1695
+#: src/wizard.c:1502
 msgid "Show only subscribed folders"
 msgstr "הצג תיקיות רשומות בלבד"
 
-#: src/wizard.c:1703
+#: src/wizard.c:1510
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"
@@ -18062,15 +18089,15 @@ msgstr ""
 "<span weight=\"bold\">אזהרה: גרסא זו של Claws Mail\n"
 "נבנתה בלי תמיכה עבור IMAP.</span>"
 
-#: src/wizard.c:1823
+#: src/wizard.c:1628
 msgid "Claws Mail Setup Wizard"
-msgstr "אשף התקנת Claws Mail"
+msgstr "אשף הבניית Claws Mail"
 
-#: src/wizard.c:1857
+#: src/wizard.c:1662
 msgid "Welcome to Claws Mail"
 msgstr "ברוך בואך אל Claws Mail"
 
-#: src/wizard.c:1865
+#: src/wizard.c:1670
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -18078,42 +18105,125 @@ msgid ""
 "common mail options so that you can start to use Claws Mail in less than "
 "five minutes."
 msgstr ""
-"ברוך בואך אל אשף התקנת Claws Mail.\n"
+"ברוך בואך אל אשף הבניית Claws Mail.\n"
 "\n"
 "אנחנו נתחיל בהגדרת מידע בסיסי אודותייך ואפשרויות דואר שהכי נפוצות עבורך כדי "
-"שתעמוד לרשותך היכולת להתחיל את Claws Mail בתוך פחות מן חמש דקות."
+"שתעמוד לרשותך היכולת להתחיל את Claws Mail בתוך פחות מחמש דקות."
 
-#: src/wizard.c:1888
+#: src/wizard.c:1683
 msgid "About You"
 msgstr "אודותייך"
 
-#: src/wizard.c:1896 src/wizard.c:1911 src/wizard.c:1926 src/wizard.c:1942
+#: src/wizard.c:1691 src/wizard.c:1706 src/wizard.c:1721 src/wizard.c:1737
 msgid "Bold fields must be completed"
 msgstr "על שדות בולטות להיות מושלמות"
 
-#: src/wizard.c:1903
+#: src/wizard.c:1698
 msgid "Receiving mail"
 msgstr "קבלת דואר"
 
-#: src/wizard.c:1918
+#: src/wizard.c:1713
 msgid "Sending mail"
 msgstr "שליחת דואר"
 
-#: src/wizard.c:1934
+#: src/wizard.c:1729
 msgid "Saving mail on disk"
 msgstr "שמירת דואר בכונן"
 
-#: src/wizard.c:1950
+#: src/wizard.c:1745
 msgid "Configuration finished"
 msgstr "תצורה הושלמה"
 
-#: src/wizard.c:1958
+#: src/wizard.c:1753
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
-"Claws Mail הינו מוכן כעת.\n"
-"להתחלה, לחץ על שמירה."
+"‏Claws Mail הינו מוכן כעת.\n"
+"להתחלה, לחץ על שמור."
+
+#~ msgid "More plugins are available from the Claws Mail website."
+#~ msgstr "תוספות נוספות זמינות מן אתר הרשת של Claws Mail."
+
+#~ msgid "Claws Mail: %d new message"
+#~ msgid_plural "Claws Mail: %d new messages"
+#~ msgstr[0] "‫Claws Mail: הודעה חדשה %d"
+#~ msgstr[1] "‫Claws Mail: ‏%d הודעות חדשות"
+
+#~ msgid "Unable to connect: you are offline."
+#~ msgstr "אין אפשרות להתחבר: אתה לא מקוון."
+
+#~ msgid "Exiting..."
+#~ msgstr "יוצא כעת..."
+
+#~ msgid "Claws Mail can not start without its data volume (%s)."
+#~ msgstr "‏Claws Mail לא יכול להתחיל ללא כרך הנתונים שלו (%s)."
+
+#~ msgid "No registered viewer for this file type."
+#~ msgstr "אין מציגים רשומים עבור טיפוס קובץ זה."
+
+#~ msgid "Skip quoted lines"
+#~ msgstr "דלג על שורות מצוטטות"
+
+#~ msgid "Skip forwards and redirections"
+#~ msgstr "דלג על מקודמות ועל הכוונות מחדש"
+
+#~ msgid "Skip signature"
+#~ msgstr "דלג על חתימה"
+
+#~ msgid ""
+#~ "This plugin provides Python integration features.\n"
+#~ "\n"
+#~ "For the most up-to-date API documentation, type\n"
+#~ "\n"
+#~ " help(clawsmail)\n"
+#~ "\n"
+#~ "in the interactive Python console under Tools -> Show Python console.\n"
+#~ "\n"
+#~ "The source distribution of this plugin comes with various example scripts "
+#~ "in the \"examples\" subdirectory. If you wrote a script that you would be "
+#~ "interested in sharing, feel free to send it to me to have it considered "
+#~ "for inclusion in the examples.\n"
+#~ "\n"
+#~ "Feedback to <berndth at gmx.de> is welcome."
+#~ msgstr ""
+#~ "תוספת זו מספקת תכונות שילוב Python.\n"
+#~ "\n"
+#~ "לתיעוד עדכני ביותר API, הדפס\n"
+#~ "\n"
+#~ " help(clawsmail)\n"
+#~ "\n"
+#~ "במסוף Python אינטראקטיבי תחת כלים -> הצגת מסוף Python.\n"
+#~ "\n"
+#~ "תפוצת המקור של תוספת זו באה עם תסריטי דוגמא שונים בתיקיית המשנה \"examples"
+#~ "\". במידה וכתבת תסריט שיש לך עניין לשתפו, הרגש חופשי לשלוחו אליי כדי שאני "
+#~ "אשקול אותו להכללה בתוך הדוגמאות.\n"
+#~ "\n"
+#~ "משוב אל <berndth at gmx.de> מקודם בברכה."
+
+#~ msgid "Replace"
+#~ msgstr "החלף"
+
+#~ msgid "Blink LED"
+#~ msgstr "הבזק LED"
+
+#~ msgid "Play sound"
+#~ msgstr "ניגון צליל"
+
+#~ msgid "Show info banner"
+#~ msgstr "הצג כרזת מידע"
+
+#~ msgid "on internal memory"
+#~ msgstr "בזיכרון פנימי"
+
+#~ msgid "on external memory card"
+#~ msgstr "בכרטיס זיכרון חיצוני"
+
+#~ msgid "on internal memory card"
+#~ msgstr "בכרטיס זיכרון פנימי"
+
+#~ msgid "<span weight=\"bold\">Store data</span>"
+#~ msgstr "<span weight=\"bold\">אחסון נתונים</span>"
 
 #~ msgid "`%c' can't be included in folder name."
 #~ msgstr "‫`%c' לא יכול להיכלל בתוך שם תיקייה."
diff --git a/po/nl.po b/po/nl.po
index 11dcc32..893abe3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,45 +1,47 @@
-# Sylpheed.
+# Dutch translation of Claws-Mail.
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Vincent van Adrighem <V.vanAdrighem at ITS.TUDelft.nl>, 2001.
 # Claws merge by Alfons Hoogervorst <alfons at proteus.demon.nl>
 # Claws maintenance 2002 by Wilbert Berendsen <wbsoft at xs4all.nl>
 # Claws maintenance 2006-2007 by Tim Dijkstra <tim at famdijkstra.org>
-# Claws maintenance 2008-2010 by Marcel Pol <mpol at gmx.net>
+# Claws maintenance 2008-2013 by Marcel Pol <marcel at timelord.nl>
 #
-# kijken naar  
+# todo:
 # snelkoppelingen nalopen
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Sylpheed-Claws 2.0\n"
+"Project-Id-Version: Claws-Mail\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2013-02-20 17:49+0100\n"
-"PO-Revision-Date: 2010-04-24 14:38+0100\n"
-"Last-Translator: Marcel Pol <mpol at gmx.net>\n"
-"Language-Team: Nederlands <nl at li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2013-12-07 08:54+0000\n"
+"PO-Revision-Date: 2013-12-07 14:14+0100\n"
+"Last-Translator: Marcel Pol <marcel at timelord.nl>\n"
+"Language-Team:  <translators at lists.claws-mail.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: src/account.c:384
+#: src/account.c:392
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
 msgstr ""
 "Er zijn nog vensters open waarin berichten worden opgesteld.\n"
-"Deze moeten gesloten worden voordat u de accountinstellingen kunt veranderen."
+"Deze moeten gesloten worden voordat je de accountinstellingen kunt "
+"veranderen."
 
-#: src/account.c:431
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Kan map niet aanmaken."
 
-#: src/account.c:710
+#: src/account.c:717
 msgid "Edit accounts"
 msgstr "Accountbeheer"
 
-#: src/account.c:731
+#: src/account.c:734
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -49,14 +51,13 @@ msgstr ""
 "in de kolom 'O' geeft aan voor welke accounts dit wordt gedaan. Vetgedrukte "
 "tekst geeft het standaardaccount aan."
 
-#: src/account.c:802
+#: src/account.c:805
 msgid " _Set as default account "
 msgstr " _Instellen als standaard account "
 
 #: src/account.c:897
 msgid "Accounts with remote folders cannot be copied."
-msgstr ""
-"Accounts met mappen op een andere computer kunnen niet worden gekopieerd."
+msgstr "Accounts met mappen op de server kunnen niet worden gekopieerd."
 
 #: src/account.c:904
 #, c-format
@@ -66,7 +67,7 @@ msgstr "Kopie van %s"
 #: src/account.c:1064
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
-msgstr "Wilt u werkelijk het account '%s' verwijderen?"
+msgstr "Wil je werkelijk het account '%s' verwijderen?"
 
 #: src/account.c:1066
 msgid "(Untitled)"
@@ -76,31 +77,31 @@ msgstr "(Naamloos)"
 msgid "Delete account"
 msgstr "Verwijder account"
 
-#: src/account.c:1537
+#: src/account.c:1536
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "O"
 
-#: src/account.c:1543
+#: src/account.c:1542
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Ophalen' haalt berichten op voor de aangevinkte accounts"
 
-#: src/account.c:1550 src/addressadd.c:215 src/addressbook.c:125
-#: src/addrduplicates.c:481 src/compose.c:6984 src/editaddress.c:1270
-#: src/editaddress.c:1327 src/editaddress.c:1347 src/editbook.c:170
+#: src/account.c:1549 src/addressadd.c:215 src/addressbook.c:125
+#: src/addrduplicates.c:481 src/compose.c:7073 src/editaddress.c:1263
+#: src/editaddress.c:1320 src/editaddress.c:1340 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:284 src/plugins/pdf_viewer/poppler_viewer.c:1789
-#: src/plugins/pgpcore/select-keys.c:398 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1872 src/prefs_template.c:78
+#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1800
+#: src/plugins/pgpcore/select-keys.c:394 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1868 src/prefs_template.c:78
 msgid "Name"
 msgstr "Naam"
 
-#: src/account.c:1558 src/prefs_account.c:1089 src/prefs_account.c:3914
+#: src/account.c:1557 src/prefs_account.c:1097 src/prefs_account.c:3921
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/account.c:1566 src/ssl_manager.c:102
+#: src/account.c:1565 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Server"
 
@@ -140,7 +141,7 @@ msgstr ""
 "Ongeldige filteractie(s):\n"
 "%s"
 
-#: src/action.c:978
+#: src/action.c:988
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -151,7 +152,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:980 src/plugins/bogofilter/bogofilter.c:875
+#: src/action.c:990 src/plugins/bogofilter/bogofilter.c:875
 #: src/plugins/rssyl/feed.c:1734 src/plugins/rssyl/feed.c:1738
 #: src/plugins/tnef_parse/tnef_parse.c:67
 #: src/plugins/vcalendar/vcal_folder.c:1800
@@ -161,25 +162,25 @@ msgstr ""
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: src/action.c:1198 src/action.c:1368
+#: src/action.c:1208 src/action.c:1373
 msgid "Completed"
 msgstr "Voltooid"
 
-#: src/action.c:1234
+#: src/action.c:1244
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Starten: %s\n"
 
-#: src/action.c:1238
+#: src/action.c:1248
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Beëindigd: %s\n"
 
-#: src/action.c:1271
+#: src/action.c:1281
 msgid "Action's input/output"
 msgstr "Invoer en uitvoer van actie"
 
-#: src/action.c:1604
+#: src/action.c:1609
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -190,11 +191,11 @@ msgstr ""
 "('%%h' zal vervangen worden door het argument)\n"
 "  %s"
 
-#: src/action.c:1609
+#: src/action.c:1614
 msgid "Action's hidden user argument"
 msgstr "Verborgen gebruikersargument van actie"
 
-#: src/action.c:1613
+#: src/action.c:1618
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -204,11 +205,11 @@ msgstr ""
 "Geef het argument van de volgende actie:\n"
 "('%%u' zal vervangen worden door het argument)  %s"
 
-#: src/action.c:1618
+#: src/action.c:1623
 msgid "Action's user argument"
 msgstr "Gebruikersargument van actie"
 
-#: src/addr_compl.c:600 src/addressbook.c:4881
+#: src/addr_compl.c:600 src/addressbook.c:4870
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:314
 msgid "Group"
 msgstr "Groep"
@@ -259,7 +260,7 @@ msgstr "Alle gegevens verwijderen"
 
 #: src/addrcustomattr.c:157
 msgid "Do you really want to delete all attribute names?"
-msgstr "Wilt u deze gegevens werkelijk verwijderen?"
+msgstr "Wil je deze gegevens werkelijk verwijderen?"
 
 #: src/addrcustomattr.c:181
 msgid "Delete attribute name"
@@ -267,7 +268,7 @@ msgstr "Verwijder gegeven"
 
 #: src/addrcustomattr.c:182
 msgid "Do you really want to delete this attribute name?"
-msgstr "Wilt u werkelijk dit gegeven verwijderen?"
+msgstr "Wil je werkelijk dit gegeven verwijderen?"
 
 #: src/addrcustomattr.c:191
 msgid "Reset to default"
@@ -278,18 +279,18 @@ msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
 msgstr ""
-"Wilt u werkelijk alle gegevens vervangen door\n"
+"Wil je werkelijk alle gegevens vervangen door\n"
 "de standaard set?"
 
 #: src/addrcustomattr.c:212 src/addressbook.c:435 src/addressbook.c:463
 #: src/addressbook.c:480 src/edittags.c:271
-#: src/plugins/archive/archiver_gtk.c:1193 src/prefs_actions.c:1086
-#: src/prefs_filtering.c:1692 src/prefs_template.c:1095
+#: src/plugins/archive/archiver_gtk.c:1193 src/prefs_actions.c:1090
+#: src/prefs_filtering.c:1695 src/prefs_template.c:1099
 msgid "_Delete"
 msgstr "Ver_wijderen"
 
-#: src/addrcustomattr.c:213 src/edittags.c:272 src/prefs_actions.c:1087
-#: src/prefs_filtering.c:1693 src/prefs_template.c:1096
+#: src/addrcustomattr.c:213 src/edittags.c:272 src/prefs_actions.c:1091
+#: src/prefs_filtering.c:1696 src/prefs_template.c:1100
 msgid "Delete _all"
 msgstr "_Alles verwijderen"
 
@@ -297,20 +298,20 @@ msgstr "_Alles verwijderen"
 msgid "_Reset to default"
 msgstr "_Terugzetten naar standaard"
 
-#: src/addrcustomattr.c:410
+#: src/addrcustomattr.c:403
 msgid "Attribute name is not set."
 msgstr "Gegeven is niet ingesteld."
 
-#: src/addrcustomattr.c:469
+#: src/addrcustomattr.c:462
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Bewerk gegeven"
 
-#: src/addrcustomattr.c:483
+#: src/addrcustomattr.c:476
 msgid "New attribute name:"
 msgstr "Nieuw gegeven:"
 
-#: src/addrcustomattr.c:520
+#: src/addrcustomattr.c:513
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -327,12 +328,12 @@ msgid "Contact"
 msgstr "Contact"
 
 #: src/addressadd.c:227 src/addrduplicates.c:452
-#: src/plugins/pgpcore/select-keys.c:399 src/toolbar.c:431
+#: src/plugins/pgpcore/select-keys.c:395 src/toolbar.c:432
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1062
-#: src/editaddress.c:1137 src/editgroup.c:290
+#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1055
+#: src/editaddress.c:1130 src/editgroup.c:290
 msgid "Remarks"
 msgstr "Opmerkingen"
 
@@ -340,7 +341,7 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressadd.c:483 src/editaddress.c:1585 src/headerview.c:348
+#: src/addressadd.c:483 src/editaddress.c:1582 src/headerview.c:348
 #: src/textview.c:2110
 #, c-format
 msgid ""
@@ -350,7 +351,7 @@ msgstr ""
 "Opslaan afbeelding mislukt: \n"
 "%s"
 
-#: src/addressadd.c:532 src/addressbook.c:3221 src/addressbook.c:3272
+#: src/addressadd.c:532 src/addressbook.c:3210 src/addressbook.c:3261
 msgid "Add address(es)"
 msgstr "Voeg adres(sen) toe"
 
@@ -358,8 +359,8 @@ msgstr "Voeg adres(sen) toe"
 msgid "Can't add the specified address"
 msgstr "Kan het opgegeven adres niet toevoegen"
 
-#: src/addressbook.c:126 src/addressbook.c:4869 src/editaddress.c:1059
-#: src/editaddress.c:1120 src/editgroup.c:289 src/expldifdlg.c:517
+#: src/addressbook.c:126 src/addressbook.c:4858 src/editaddress.c:1052
+#: src/editaddress.c:1113 src/editgroup.c:289 src/expldifdlg.c:517
 #: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:782
 msgid "Email Address"
 msgstr "E-mailadres"
@@ -369,18 +370,18 @@ msgid "_Book"
 msgstr "_Boek"
 
 #: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
-#: src/addressbook.c:479 src/compose.c:576 src/gtk/quicksearch.c:799
-#: src/gtk/quicksearch.c:814 src/mainwindow.c:503 src/messageview.c:211
+#: src/addressbook.c:479 src/compose.c:578 src/mainwindow.c:504
+#: src/messageview.c:209
 msgid "_Edit"
 msgstr "B_ewerken"
 
-#: src/addressbook.c:404 src/compose.c:581 src/mainwindow.c:506
-#: src/messageview.c:214
+#: src/addressbook.c:404 src/compose.c:583 src/mainwindow.c:507
+#: src/messageview.c:212
 msgid "_Tools"
 msgstr "_Gereedschap"
 
-#: src/addressbook.c:405 src/compose.c:582 src/mainwindow.c:508
-#: src/messageview.c:215
+#: src/addressbook.c:405 src/compose.c:584 src/mainwindow.c:509
+#: src/messageview.c:213
 msgid "_Help"
 msgstr "_Help"
 
@@ -412,15 +413,15 @@ msgstr "_Bewerk boek"
 msgid "_Delete book"
 msgstr "_Verwijder boek"
 
-#: src/addressbook.c:424 src/compose.c:592
+#: src/addressbook.c:424 src/compose.c:595
 msgid "_Save"
 msgstr "_Opslaan"
 
-#: src/addressbook.c:425 src/compose.c:596 src/messageview.c:224
+#: src/addressbook.c:425 src/compose.c:599 src/messageview.c:222
 msgid "_Close"
 msgstr "_Sluiten"
 
-#: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:228
+#: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:226
 msgid "_Select all"
 msgstr "_Alles selecteren"
 
@@ -429,12 +430,12 @@ msgid "C_ut"
 msgstr "K_nippen"
 
 #: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:604 src/mainwindow.c:537 src/messageview.c:227
+#: src/compose.c:607 src/mainwindow.c:538 src/messageview.c:225
 msgid "_Copy"
 msgstr "_Kopiëren"
 
 #: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:605
+#: src/compose.c:608
 msgid "_Paste"
 msgstr "_Plakken"
 
@@ -478,8 +479,8 @@ msgstr "Vind dubbele adressen..."
 msgid "Edit custom attributes..."
 msgstr "Bewerk extra gegevens..."
 
-#: src/addressbook.c:455 src/compose.c:684 src/mainwindow.c:800
-#: src/messageview.c:340
+#: src/addressbook.c:455 src/compose.c:687 src/mainwindow.c:801
+#: src/messageview.c:338
 msgid "_About"
 msgstr "_Over"
 
@@ -488,7 +489,7 @@ msgid "_Browse Entry"
 msgstr "_Bekijk item"
 
 #: src/addressbook.c:504 src/crash.c:451 src/crash.c:470 src/importldif.c:115
-#: src/plugins/pgpcore/select-keys.c:255 src/plugins/pgpcore/sgpgme.c:140
+#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:140
 #: src/plugins/vcalendar/day-view.c:410 src/plugins/vcalendar/month-view.c:431
 #: src/prefs_themes.c:705 src/prefs_themes.c:737 src/prefs_themes.c:738
 msgid "Unknown"
@@ -590,125 +591,125 @@ msgstr "Een ander contact bestaat met die sleutel"
 msgid "Strong(er) authentication required"
 msgstr "Sterkere authenticatie gevraagd"
 
-#: src/addressbook.c:913
+#: src/addressbook.c:910
 msgid "Sources"
 msgstr "Bronnen"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:629 src/prefs_other.c:475
-#: src/toolbar.c:223 src/toolbar.c:2156
+#: src/addressbook.c:914 src/prefs_matcher.c:629 src/prefs_other.c:475
+#: src/toolbar.c:224 src/toolbar.c:2157
 msgid "Address book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:1120
+#: src/addressbook.c:1109
 msgid "Lookup name:"
 msgstr "Zoek naam:"
 
-#: src/addressbook.c:1444 src/addressbook.c:1497 src/addrduplicates.c:803
+#: src/addressbook.c:1433 src/addressbook.c:1486 src/addrduplicates.c:803
 msgid "Delete address(es)"
 msgstr "Verwijder adres(sen)"
 
-#: src/addressbook.c:1445 src/addrduplicates.c:853
+#: src/addressbook.c:1434 src/addrduplicates.c:853
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Deze adresgegevens zijn alleen-lezen en kunnen niet worden verwijderd."
 
-#: src/addressbook.c:1489
+#: src/addressbook.c:1478
 msgid "Delete group"
 msgstr "Verwijder groep"
 
-#: src/addressbook.c:1490
+#: src/addressbook.c:1479
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgstr ""
-"Wilt u deze groep(en) echt verwijderen?\n"
+"Wil je deze groep(en) echt verwijderen?\n"
 "De adressen die het bevat zullen niet verloren gaan."
 
-#: src/addressbook.c:1498 src/addrduplicates.c:804
+#: src/addressbook.c:1487 src/addrduplicates.c:804
 msgid "Really delete the address(es)?"
-msgstr "Wilt u de adressen echt verwijderen?"
+msgstr "Wil je de adressen echt verwijderen?"
 
-#: src/addressbook.c:2201
+#: src/addressbook.c:2190
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Kan niet plakken.  Doel adresboek is alleen-lezen."
 
-#: src/addressbook.c:2211
+#: src/addressbook.c:2200
 msgid "Cannot paste into an address group."
 msgstr "Kan niet plakken in een adresgroep."
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2906
 #, c-format
-msgid "Do you want to delete the query results and addresses in '%s' ?"
-msgstr "Wilt u de zoekresultaten en adressen in '%s' verwijderen?"
+msgid "Do you want to delete the query results and addresses in '%s'?"
+msgstr "Wil je de zoekresultaten en adressen in '%s' verwijderen?"
 
-#: src/addressbook.c:2920 src/addressbook.c:2946 src/addressbook.c:2953
+#: src/addressbook.c:2909 src/addressbook.c:2935 src/addressbook.c:2942
 #: src/plugins/archive/archiver_prefs.c:337 src/prefs_filtering_action.c:177
-#: src/toolbar.c:413
+#: src/toolbar.c:414
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2918
 #, c-format
 msgid ""
-"Do you want to delete '%s' ? If you delete the folder only, the addresses it "
+"Do you want to delete '%s'? If you delete the folder only, the addresses it "
 "contains will be moved into the parent folder."
 msgstr ""
-"Wilt u '%s' verwijderen? Als u alleen de map verwijdert zullen de adressen "
+"Wil je '%s' verwijderen? Als je alleen de map verwijdert zullen de adressen "
 "die het bevat verplaatst worden naar de bovenliggende map."
 
-#: src/addressbook.c:2932 src/imap_gtk.c:363 src/mh_gtk.c:202
-#: src/plugins/mailmbox/plugin_gtk.c:325 src/plugins/rssyl/rssyl_cb_menu.c:237
-#: src/plugins/vcalendar/vcal_folder.c:1953
+#: src/addressbook.c:2921 src/imap_gtk.c:363 src/mh_gtk.c:202
+#: src/plugins/mailmbox/plugin_gtk.c:324 src/plugins/rssyl/rssyl_cb_menu.c:237
+#: src/plugins/vcalendar/vcal_folder.c:1951
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "+Delete _folder only"
 msgstr "+Verwijder alleen _map"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "Delete folder and _addresses"
 msgstr "Verwijder map en _adressen"
 
-#: src/addressbook.c:2944
+#: src/addressbook.c:2933
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will not be lost."
 msgstr ""
-"Wilt u '%s' verwijderen?\n"
+"Wil je '%s' verwijderen?\n"
 "De adressen die het bevat zullen niet verloren gaan."
 
-#: src/addressbook.c:2951
+#: src/addressbook.c:2940
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will be lost."
 msgstr ""
-"Wilt u '%s' verwijderen?\n"
+"Wil je '%s' verwijderen?\n"
 "De adressen die het bevat zullen verloren gaan."
 
-#: src/addressbook.c:3065
+#: src/addressbook.c:3054
 #, c-format
 msgid "Search '%s'"
 msgstr "Zoek '%s'"
 
-#: src/addressbook.c:3203 src/addressbook.c:3253
+#: src/addressbook.c:3192 src/addressbook.c:3242
 msgid "New Contacts"
 msgstr "Nieuwe contacten"
 
-#: src/addressbook.c:4035
+#: src/addressbook.c:4024
 msgid "New user, could not save index file."
 msgstr "Nieuwe gebruiker, kon indexbestand niet bewaren"
 
-#: src/addressbook.c:4039
+#: src/addressbook.c:4028
 msgid "New user, could not save address book files."
 msgstr "Nieuwe gebruiker, kan adresboekbestanden niet bewaren."
 
-#: src/addressbook.c:4049
+#: src/addressbook.c:4038
 msgid "Old address book converted successfully."
 msgstr "Oud adresboek succesvol geconverteerd!"
 
-#: src/addressbook.c:4054
+#: src/addressbook.c:4043
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -716,7 +717,7 @@ msgstr ""
 "Oud adresboek geconverteerd,\n"
 "nieuwe indexbestand kon niet worden opgeslagen."
 
-#: src/addressbook.c:4067
+#: src/addressbook.c:4056
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -724,7 +725,7 @@ msgstr ""
 "Kon adresboek niet converteren, \n"
 "maar heb lege adresboekbestanden aangemaakt."
 
-#: src/addressbook.c:4073
+#: src/addressbook.c:4062
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -732,7 +733,7 @@ msgstr ""
 "Kon adresboek niet converteren,\n"
 "nieuw indexbestand kond niet worden aangemaakt."
 
-#: src/addressbook.c:4078
+#: src/addressbook.c:4067
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -740,53 +741,53 @@ msgstr ""
 "Kon adresboek niet converteren\n"
 "en kon nieuwe adresboekbestanden niet aanmaken."
 
-#: src/addressbook.c:4085 src/addressbook.c:4091
+#: src/addressbook.c:4074 src/addressbook.c:4080
 msgid "Addressbook conversion error"
 msgstr "Conversiefout adresboek"
 
-#: src/addressbook.c:4198
+#: src/addressbook.c:4187
 msgid "Addressbook Error"
 msgstr "Adressenboekfout"
 
-#: src/addressbook.c:4199
+#: src/addressbook.c:4188
 msgid "Could not read address index"
 msgstr "Kon adresindexbestand niet lezen."
 
-#: src/addressbook.c:4530
+#: src/addressbook.c:4519
 msgid "Busy searching..."
 msgstr "Bezig met zoeken..."
 
-#: src/addressbook.c:4833
+#: src/addressbook.c:4822
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4845 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
+#: src/addressbook.c:4834 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
 #: src/expldifdlg.c:388 src/exporthtml.c:984 src/importldif.c:657
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:4857
+#: src/addressbook.c:4846
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:4893 src/exporthtml.c:884 src/folderview.c:338
+#: src/addressbook.c:4882 src/exporthtml.c:884 src/folderview.c:338
 #: src/folderview.c:426 src/prefs_account.c:2738 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Map"
 
-#: src/addressbook.c:4905
+#: src/addressbook.c:4894
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4917 src/addressbook.c:4929
+#: src/addressbook.c:4906 src/addressbook.c:4918
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4941
+#: src/addressbook.c:4930
 msgid "LDAP servers"
 msgstr "LDAP-servers"
 
-#: src/addressbook.c:4953
+#: src/addressbook.c:4942
 msgid "LDAP Query"
 msgstr "LDAP-verzoek"
 
@@ -801,9 +802,9 @@ msgstr "LDAP-verzoek"
 #: src/plugins/spamassassin/spamassassin_gtk.c:443
 #: src/plugins/spamassassin/spamassassin_gtk.c:490
 #: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:672
-#: src/prefs_matcher.c:707 src/prefs_matcher.c:1601 src/prefs_matcher.c:1608
-#: src/prefs_matcher.c:1616 src/prefs_matcher.c:1618 src/prefs_matcher.c:2498
-#: src/prefs_matcher.c:2502
+#: src/prefs_matcher.c:707 src/prefs_matcher.c:1607 src/prefs_matcher.c:1614
+#: src/prefs_matcher.c:1622 src/prefs_matcher.c:1624 src/prefs_matcher.c:2504
+#: src/prefs_matcher.c:2508
 msgid "Any"
 msgstr "Elke"
 
@@ -812,9 +813,8 @@ msgid "Please specify name for address book."
 msgstr "Geef naam voor adresboek."
 
 #: src/addrgather.c:179
-#, fuzzy
 msgid "No available address book."
-msgstr "Beschikbare adressen"
+msgstr "Geen adresboek beschikbaar."
 
 #: src/addrgather.c:200
 msgid "Please select the mail headers to search."
@@ -826,7 +826,7 @@ msgstr "Bezig adressen te verzamelen..."
 
 #: src/addrgather.c:247
 msgid "address added by claws-mail"
-msgstr ""
+msgstr "adres toegevoegd door claws-mail"
 
 #: src/addrgather.c:275
 msgid "Addresses collected successfully."
@@ -857,7 +857,7 @@ msgstr "Deze headers doorzoeken"
 msgid "Include subfolders"
 msgstr "Doorzoek submappen"
 
-#: src/addrgather.c:456 src/prefs_filtering_action.c:1423
+#: src/addrgather.c:456 src/prefs_filtering_action.c:1425
 msgid "Header Name"
 msgstr "Header-naam"
 
@@ -939,18 +939,19 @@ msgstr "Pad naar adresboek"
 msgid "Delete address"
 msgstr "Verwijder adres"
 
-#: src/alertpanel.c:146 src/compose.c:9160
+#: src/alertpanel.c:146 src/compose.c:9217
 msgid "Notice"
 msgstr "Bericht"
 
-#: src/alertpanel.c:159 src/compose.c:5556 src/compose.c:6022
-#: src/compose.c:11468 src/messageview.c:874 src/messageview.c:887
-#: src/plugins/pgpcore/sgpgme.c:703 src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4868
+#: src/alertpanel.c:159 src/compose.c:5597 src/compose.c:6063
+#: src/compose.c:11533 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:852 src/messageview.c:865
+#: src/plugins/pgpcore/sgpgme.c:706 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4865
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5497 src/inc.c:666
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5538 src/inc.c:652
 #: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:246
 msgid "Error"
 msgstr "Fout"
@@ -1036,9 +1037,9 @@ msgid "Failed to allocate memory for Plugin"
 msgstr "Geheugen reserveren voor plugin mislukt"
 
 #: src/common/plugin.c:481
-#, fuzzy
 msgid "This module is not licensed under a GPL v3 or later compatible license."
-msgstr "Deze module heeft geen licentie die verenigbaar is met de GPL v2."
+msgstr ""
+"Deze module heeft geen licentie die verenigbaar is met de GPL v3 of nieuwer."
 
 #: src/common/plugin.c:490
 msgid "This module is for Claws Mail GTK1."
@@ -1050,7 +1051,7 @@ msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr ""
-"Uw versie van Claws Mail is nieuwer dan de versie waarmee de plugin '%s' "
+"Je versie van Claws Mail is nieuwer dan de versie waarmee de plugin '%s' "
 "gemaakt is."
 
 #: src/common/plugin.c:775
@@ -1058,31 +1059,29 @@ msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr ""
-"Uw versie van Claws Mail is nieuwer dan de versie waarmee de plugin gemaakt "
+"Je versie van Claws Mail is nieuwer dan de versie waarmee de plugin gemaakt "
 "is."
 
 #: src/common/plugin.c:784
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
-msgstr "Uw versie van Claws Mail is te oud voor de '%s'-plugin."
+msgstr "Je versie van Claws Mail is te oud voor de '%s'-plugin."
 
 #: src/common/plugin.c:786
 msgid "Your version of Claws Mail is too old for the plugin."
-msgstr "Uw versie van Claws Mail is te oud voor de plugin"
+msgstr "Je versie van Claws Mail is te oud voor de plugin."
 
-#: src/common/session.c:173 src/imap.c:1145
+#: src/common/session.c:175 src/imap.c:1145
 msgid "SSL handshake failed\n"
 msgstr "SSL-handdruk mislukt\n"
 
 #: src/common/smtp.c:180
-#, fuzzy
 msgid "No SMTP AUTH method available\n"
-msgstr "SMTP AUTH niet beschikbaar\n"
+msgstr "SMTP AUTH mothode niet beschikbaar\n"
 
 #: src/common/smtp.c:183
-#, fuzzy
 msgid "Selected SMTP AUTH method not available\n"
-msgstr "SMTP AUTH niet beschikbaar\n"
+msgstr "Geselecteerde SMTP AUTH methode niet beschikbaar\n"
 
 #: src/common/smtp.c:525 src/common/smtp.c:575
 msgid "bad SMTP response\n"
@@ -1106,39 +1105,37 @@ msgid "couldn't start TLS session\n"
 msgstr "kan de TLS-sessie niet tot stand brengen\n"
 
 #: src/common/socket.c:573
-#, fuzzy
 msgid "Socket IO timeout.\n"
-msgstr "Socket I/O tijdslimiet"
+msgstr "Socket IO tijdslimiet bereikt.\n"
 
 #: src/common/socket.c:602
-#, fuzzy
 msgid "Connection timed out.\n"
-msgstr "Verbinding met %s:%d niet binnen tijdslimiet tot stand gekomen."
+msgstr "Verbinding niet binnen tijdslimiet tot stand gekomen.\n"
 
 #: src/common/socket.c:630
 #, c-format
 msgid "%s: host lookup timed out.\n"
-msgstr ""
+msgstr "%s: tijd verlopen bij host opzoeken.\n"
 
 #: src/common/socket.c:643
-#, fuzzy, c-format
+#, c-format
 msgid "%s: unknown host.\n"
-msgstr "\"%s\" onbekend in %s"
+msgstr "\"%s: onbekende host.\n"
 
 #: src/common/socket.c:831
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d: connection failed (%s).\n"
-msgstr "Verbinding maken mislukt"
+msgstr "%s:%d: verbinding maken mislukt (%s).\n"
 
 #: src/common/socket.c:1071
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d: unknown host.\n"
-msgstr "\"%s\" onbekend in %s"
+msgstr "%s:%d: onbekende host.\n"
 
 #: src/common/socket.c:1166
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
-msgstr ""
+msgstr "%s:%s: host opzoeken mislukt (%s).\n"
 
 #: src/common/socket.c:1513
 #, c-format
@@ -1148,17 +1145,17 @@ msgstr "schrijf op fd%d: %s\n"
 #: src/common/ssl_certificate.c:277
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
-msgstr ""
+msgstr "Kan P12 certificaat bestand niet vinden (%s)\n"
 
 #: src/common/ssl_certificate.c:285
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
-msgstr ""
+msgstr "Kan P12 certificaat bestand niet lezen (%s)\n"
 
 #: src/common/ssl_certificate.c:294
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
-msgstr ""
+msgstr "Kan P12 certificaat bestand niet importeren (%s)\n"
 
 #: src/common/ssl_certificate.c:535
 msgid "Uncheckable"
@@ -1181,39 +1178,39 @@ msgid "Certificate issuer is not a CA"
 msgstr "Uitgever van certificaat is geen CA"
 
 #: src/common/ssl_certificate.c:663
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open certificate file %s: %s\n"
-msgstr "Kon gedecodeerd bestand %s niet openen"
+msgstr "Kan certificaat bestand %s niet openen: %s\n"
 
 #: src/common/ssl_certificate.c:667
-#, fuzzy, c-format
+#, c-format
 msgid "Certificate file %s missing (%s)\n"
-msgstr "Certificaat om te verzenden"
+msgstr "Certificaat bestand %s mist (%s)\n"
 
 #: src/common/ssl_certificate.c:686
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open key file %s (%s)\n"
-msgstr "Kon gedecodeerd bestand %s niet openen"
+msgstr "Kan sleutel bestand %s niet openen (%s)\n"
 
 #: src/common/ssl_certificate.c:690
 #, c-format
 msgid "Key file %s missing (%s)\n"
-msgstr ""
+msgstr "Sleutel bestand %s mist (%s)\n"
 
 #: src/common/ssl_certificate.c:838
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to read P12 certificate file %s\n"
-msgstr "Selecteer certificaat bestand"
+msgstr "Kan P12 certificaat bestand niet lezen %s\n"
 
 #: src/common/ssl_certificate.c:841
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
-msgstr ""
+msgstr "Kan P12 certificaat bestand niet openen %s (%s)\n"
 
 #: src/common/ssl_certificate.c:845
-#, fuzzy, c-format
+#, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
-msgstr "Certificaat om te verzenden"
+msgstr "P12 Certificaat bestand %s mist (%s)\n"
 
 #: src/common/ssl_certificate.c:870 src/gtk/sslcertwindow.c:85
 #: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
@@ -1226,613 +1223,612 @@ msgstr "<niet in certificaat>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Onderwerp gewist door RegExp)"
 
-#: src/common/utils.c:371
+#: src/common/utils.c:362
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
-#: src/common/utils.c:372
+#: src/common/utils.c:363
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d,%02dKB"
 
-#: src/common/utils.c:373
+#: src/common/utils.c:364
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d,%02dMB"
 
-#: src/common/utils.c:374
+#: src/common/utils.c:365
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4974
+#: src/common/utils.c:4946
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "zondag"
 
-#: src/common/utils.c:4975
+#: src/common/utils.c:4947
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "maandag"
 
-#: src/common/utils.c:4976
+#: src/common/utils.c:4948
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "dinsdag"
 
-#: src/common/utils.c:4977
+#: src/common/utils.c:4949
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "woensdag"
 
-#: src/common/utils.c:4978
+#: src/common/utils.c:4950
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "donderdag"
 
-#: src/common/utils.c:4979
+#: src/common/utils.c:4951
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "vrijdag"
 
-#: src/common/utils.c:4980
+#: src/common/utils.c:4952
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "zaterdag"
 
-#: src/common/utils.c:4982
+#: src/common/utils.c:4954
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "januari"
 
-#: src/common/utils.c:4983
+#: src/common/utils.c:4955
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "februari"
 
-#: src/common/utils.c:4984
+#: src/common/utils.c:4956
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "maart"
 
-#: src/common/utils.c:4985
+#: src/common/utils.c:4957
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "april"
 
-#: src/common/utils.c:4986
+#: src/common/utils.c:4958
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "mei"
 
-#: src/common/utils.c:4987
+#: src/common/utils.c:4959
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "juni"
 
-#: src/common/utils.c:4988
+#: src/common/utils.c:4960
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "juli"
 
-#: src/common/utils.c:4989
+#: src/common/utils.c:4961
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "augustus"
 
-#: src/common/utils.c:4990
+#: src/common/utils.c:4962
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "september"
 
-#: src/common/utils.c:4991
+#: src/common/utils.c:4963
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "oktober"
 
-#: src/common/utils.c:4992
+#: src/common/utils.c:4964
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "november"
 
-#: src/common/utils.c:4993
+#: src/common/utils.c:4965
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "december"
 
-#: src/common/utils.c:4995
+#: src/common/utils.c:4967
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "zo"
 
-#: src/common/utils.c:4996
+#: src/common/utils.c:4968
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "ma"
 
-#: src/common/utils.c:4997
+#: src/common/utils.c:4969
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "di"
 
-#: src/common/utils.c:4998
+#: src/common/utils.c:4970
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "wo"
 
-#: src/common/utils.c:4999
+#: src/common/utils.c:4971
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "do"
 
-#: src/common/utils.c:5000
+#: src/common/utils.c:4972
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "vr"
 
-#: src/common/utils.c:5001
+#: src/common/utils.c:4973
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "za"
 
-#: src/common/utils.c:5003
+#: src/common/utils.c:4975
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "jan"
 
-#: src/common/utils.c:5004
+#: src/common/utils.c:4976
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "feb"
 
-#: src/common/utils.c:5005
+#: src/common/utils.c:4977
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "mar"
 
-#: src/common/utils.c:5006
+#: src/common/utils.c:4978
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "apr"
 
-#: src/common/utils.c:5007
+#: src/common/utils.c:4979
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "mei"
 
-#: src/common/utils.c:5008
+#: src/common/utils.c:4980
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "jun"
 
-#: src/common/utils.c:5009
+#: src/common/utils.c:4981
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "jul"
 
-#: src/common/utils.c:5010
+#: src/common/utils.c:4982
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "aug"
 
-#: src/common/utils.c:5011
+#: src/common/utils.c:4983
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "sep"
 
-#: src/common/utils.c:5012
+#: src/common/utils.c:4984
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "okt"
 
-#: src/common/utils.c:5013
+#: src/common/utils.c:4985
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "nov"
 
-#: src/common/utils.c:5014
+#: src/common/utils.c:4986
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "dec"
 
-#: src/common/utils.c:5025
+#: src/common/utils.c:4997
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "a.m."
 
-#: src/common/utils.c:5026
+#: src/common/utils.c:4998
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "p.m."
 
-#: src/common/utils.c:5027
+#: src/common/utils.c:4999
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "a.m."
 
-#: src/common/utils.c:5028
+#: src/common/utils.c:5000
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "p.m."
 
-#: src/common/utils.c:5035
+#: src/common/utils.c:5007
 msgctxt "For use by strftime (default date+time format)"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %e %b %Y %H:%M:%S"
 
-#: src/common/utils.c:5036
+#: src/common/utils.c:5008
 msgctxt "For use by strftime (default date format)"
 msgid "%m/%d/%y"
 msgstr "%d-%m-%Y"
 
-#: src/common/utils.c:5037
+#: src/common/utils.c:5009
 msgctxt "For use by strftime (default time format)"
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
-#: src/common/utils.c:5039
+#: src/common/utils.c:5011
 msgctxt "For use by strftime (default 12-hour time format)"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
-#: src/compose.c:565
+#: src/compose.c:567
 msgid "_Add..."
 msgstr "_Toevoegen..."
 
-#: src/compose.c:566 src/mh_gtk.c:361 src/plugins/mailmbox/plugin_gtk.c:293
+#: src/compose.c:568 src/mh_gtk.c:361 src/plugins/mailmbox/plugin_gtk.c:293
 #: src/plugins/rssyl/rssyl_cb_menu.c:140
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: src/compose.c:568 src/folderview.c:234
+#: src/compose.c:570 src/folderview.c:234
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
-#: src/compose.c:575 src/mainwindow.c:505 src/messageview.c:213
+#: src/compose.c:577 src/mainwindow.c:506 src/messageview.c:211
 msgid "_Message"
 msgstr "Be_richt"
 
-#: src/compose.c:578
+#: src/compose.c:580
 msgid "_Spelling"
 msgstr "_Spelling"
 
-#: src/compose.c:580 src/compose.c:646
+#: src/compose.c:582 src/compose.c:649
 msgid "_Options"
 msgstr "_Opties"
 
-#: src/compose.c:584
+#: src/compose.c:586
 msgid "S_end"
 msgstr "_Verzenden"
 
-#: src/compose.c:585
+#: src/compose.c:587
 msgid "Send _later"
 msgstr "_Wachtrij"
 
-#: src/compose.c:588
+#: src/compose.c:590
 msgid "_Attach file"
 msgstr "Bestand _bijvoegen"
 
-#: src/compose.c:589
+#: src/compose.c:591
 msgid "_Insert file"
 msgstr "Bestand _invoegen"
 
-#: src/compose.c:590
+#: src/compose.c:592
 msgid "Insert si_gnature"
 msgstr "_Handtekening invoegen"
 
-#: src/compose.c:594
-#, fuzzy
+#: src/compose.c:593
+msgid "_Replace signature"
+msgstr "_Vervang ondertekening"
+
+#: src/compose.c:597
 msgid "_Print"
-msgstr "Afdrukken"
+msgstr "_Afdrukken"
 
-#: src/compose.c:599
+#: src/compose.c:602
 msgid "_Undo"
 msgstr "_Ongedaan maken"
 
-#: src/compose.c:600
+#: src/compose.c:603
 msgid "_Redo"
 msgstr "Op_nieuw"
 
-#: src/compose.c:603
+#: src/compose.c:606
 msgid "Cu_t"
 msgstr "K_nippen"
 
-#: src/compose.c:607
-#, fuzzy
+#: src/compose.c:610
 msgid "_Special paste"
 msgstr "_Plakken speciaal"
 
-#: src/compose.c:608
-#, fuzzy
+#: src/compose.c:611
 msgid "As _quotation"
 msgstr "Als _citaten"
 
-#: src/compose.c:609
-#, fuzzy
+#: src/compose.c:612
 msgid "_Wrapped"
-msgstr "afge_broken"
+msgstr "Afge_broken"
 
-#: src/compose.c:610
-#, fuzzy
+#: src/compose.c:613
 msgid "_Unwrapped"
-msgstr "niet afgeb_roken"
+msgstr "Niet afgeb_roken"
 
-#: src/compose.c:612 src/mainwindow.c:538
+#: src/compose.c:615 src/mainwindow.c:539
 msgid "Select _all"
 msgstr "_Alles selecteren"
 
-#: src/compose.c:614
+#: src/compose.c:617
 msgid "A_dvanced"
 msgstr "_Geavanceerd"
 
-#: src/compose.c:615
+#: src/compose.c:618
 msgid "Move a character backward"
 msgstr "Ga een teken terug"
 
-#: src/compose.c:616
+#: src/compose.c:619
 msgid "Move a character forward"
 msgstr "Ga een teken verder"
 
-#: src/compose.c:617
+#: src/compose.c:620
 msgid "Move a word backward"
 msgstr "Ga een woord terug"
 
-#: src/compose.c:618
+#: src/compose.c:621
 msgid "Move a word forward"
 msgstr "Ga een woord verder"
 
-#: src/compose.c:619
+#: src/compose.c:622
 msgid "Move to beginning of line"
 msgstr "Ga naar begin van regel"
 
-#: src/compose.c:620
+#: src/compose.c:623
 msgid "Move to end of line"
 msgstr "Ga naar eind van regel"
 
-#: src/compose.c:621
+#: src/compose.c:624
 msgid "Move to previous line"
 msgstr "Ga een regel terug"
 
-#: src/compose.c:622
+#: src/compose.c:625
 msgid "Move to next line"
 msgstr "Ga een regel verder"
 
-#: src/compose.c:623
+#: src/compose.c:626
 msgid "Delete a character backward"
 msgstr "Verwijder vorige teken"
 
-#: src/compose.c:624
+#: src/compose.c:627
 msgid "Delete a character forward"
 msgstr "Verwijder volgende teken"
 
-#: src/compose.c:625
+#: src/compose.c:628
 msgid "Delete a word backward"
 msgstr "Verwijder vorig woord"
 
-#: src/compose.c:626
+#: src/compose.c:629
 msgid "Delete a word forward"
 msgstr "Verwijder volgend woord"
 
-#: src/compose.c:627
+#: src/compose.c:630
 msgid "Delete line"
 msgstr "Verwijder deze regel"
 
-#: src/compose.c:628
+#: src/compose.c:631
 msgid "Delete to end of line"
 msgstr "Verwijder tot eind van regel"
 
-#: src/compose.c:631 src/messageview.c:230
+#: src/compose.c:634 src/messageview.c:228
 msgid "_Find"
 msgstr "_Vinden"
 
-#: src/compose.c:634
+#: src/compose.c:637
 msgid "_Wrap current paragraph"
 msgstr "Regels afbreken in _huidige paragraaf"
 
-#: src/compose.c:635
+#: src/compose.c:638
 msgid "Wrap all long _lines"
 msgstr "Regelterugloop voor alle regels"
 
-#: src/compose.c:637
+#: src/compose.c:640
 msgid "Edit with e_xternal editor"
 msgstr "Aanpassen met e_xterne editor"
 
-#: src/compose.c:640
+#: src/compose.c:643
 msgid "_Check all or check selection"
 msgstr "_Controleer alles of selectie"
 
-#: src/compose.c:641
+#: src/compose.c:644
 msgid "_Highlight all misspelled words"
 msgstr "Toon alle _onjuist gespelde woorden"
 
-#: src/compose.c:642
+#: src/compose.c:645
 msgid "Check _backwards misspelled word"
 msgstr "Controleer _vorig onjuist gespeld woord"
 
-#: src/compose.c:643
+#: src/compose.c:646
 msgid "_Forward to next misspelled word"
 msgstr "Ga naar _volgend onjuist gespeld woord"
 
-#: src/compose.c:651
+#: src/compose.c:654
 msgid "Reply _mode"
 msgstr "_Beantwoord afzender"
 
-#: src/compose.c:653
+#: src/compose.c:656
 msgid "Privacy _System"
 msgstr "Privacy-_systeem"
 
-#: src/compose.c:658
+#: src/compose.c:661
 msgid "_Priority"
 msgstr "_Prioriteit"
 
-#: src/compose.c:660 src/mainwindow.c:602 src/messageview.c:266
+#: src/compose.c:663 src/mainwindow.c:603 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "Tekenset_codering"
 
-#: src/compose.c:665 src/mainwindow.c:607 src/messageview.c:271
+#: src/compose.c:668 src/mainwindow.c:608 src/messageview.c:269
 msgid "Western European"
 msgstr "Westeuropees"
 
-#: src/compose.c:666 src/mainwindow.c:608 src/messageview.c:272
+#: src/compose.c:669 src/mainwindow.c:609 src/messageview.c:270
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: src/compose.c:667 src/mainwindow.c:609 src/messageview.c:273
+#: src/compose.c:670 src/mainwindow.c:610 src/messageview.c:271
 msgid "Hebrew"
 msgstr "Hebreeuws"
 
-#: src/compose.c:668 src/mainwindow.c:610 src/messageview.c:274
+#: src/compose.c:671 src/mainwindow.c:611 src/messageview.c:272
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: src/compose.c:669 src/mainwindow.c:611 src/messageview.c:275
+#: src/compose.c:672 src/mainwindow.c:612 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "Cyrillisch"
 
-#: src/compose.c:670 src/mainwindow.c:612 src/messageview.c:276
+#: src/compose.c:673 src/mainwindow.c:613 src/messageview.c:274
 msgid "Japanese"
 msgstr "Japans"
 
-#: src/compose.c:671 src/mainwindow.c:613 src/messageview.c:277
+#: src/compose.c:674 src/mainwindow.c:614 src/messageview.c:275
 msgid "Chinese"
 msgstr "Chinees"
 
-#: src/compose.c:672 src/mainwindow.c:614 src/messageview.c:278
+#: src/compose.c:675 src/mainwindow.c:615 src/messageview.c:276
 msgid "Korean"
 msgstr "Koreaans"
 
-#: src/compose.c:673 src/mainwindow.c:615 src/messageview.c:279
+#: src/compose.c:676 src/mainwindow.c:616 src/messageview.c:277
 msgid "Thai"
 msgstr "Thai"
 
-#: src/compose.c:676 src/mainwindow.c:722 src/messageview.c:315
+#: src/compose.c:679 src/mainwindow.c:723 src/messageview.c:313
 msgid "_Address book"
 msgstr "_Adresboek"
 
-#: src/compose.c:678
+#: src/compose.c:681
 msgid "_Template"
 msgstr "_Sjabloon"
 
-#: src/compose.c:680 src/mainwindow.c:750 src/messageview.c:336
+#: src/compose.c:683 src/mainwindow.c:751 src/messageview.c:334
 msgid "Actio_ns"
 msgstr "Ac_ties"
 
-#: src/compose.c:689
+#: src/compose.c:692
 msgid "Aut_o wrapping"
 msgstr "Aut_omatisch afbreken"
 
-#: src/compose.c:690
+#: src/compose.c:693
 msgid "Auto _indent"
 msgstr "Automatisch _inspringen"
 
-#: src/compose.c:691
+#: src/compose.c:694
 msgid "Si_gn"
 msgstr "_Ondertekenen"
 
-#: src/compose.c:692
+#: src/compose.c:695
 msgid "_Encrypt"
 msgstr "_Versleutelen"
 
-#: src/compose.c:693
+#: src/compose.c:696
 msgid "_Request Return Receipt"
 msgstr "_Ontvangstbevestiging"
 
-#: src/compose.c:694
+#: src/compose.c:697
 msgid "Remo_ve references"
 msgstr "Ver_wijder verwijzingen..."
 
-#: src/compose.c:695
+#: src/compose.c:698
 msgid "Show _ruler"
 msgstr "_Lineaal weergeven"
 
-#: src/compose.c:700 src/compose.c:710
+#: src/compose.c:703 src/compose.c:713
 msgid "_Normal"
 msgstr "_Normaal"
 
-#: src/compose.c:701 src/mainwindow.c:656 src/messageview.c:304
+#: src/compose.c:704 src/mainwindow.c:657 src/messageview.c:302
 msgid "_All"
 msgstr "_Allen"
 
-#: src/compose.c:702 src/mainwindow.c:657 src/messageview.c:305
+#: src/compose.c:705 src/mainwindow.c:658 src/messageview.c:303
 msgid "_Sender"
 msgstr "_Afzender"
 
-#: src/compose.c:703
+#: src/compose.c:706
 msgid "_Mailing-list"
 msgstr "_Mailing-lijst"
 
-#: src/compose.c:708
+#: src/compose.c:711
 msgid "_Highest"
 msgstr "_Hoogste"
 
-#: src/compose.c:709
+#: src/compose.c:712
 msgid "Hi_gh"
 msgstr "H_oog"
 
-#: src/compose.c:711
+#: src/compose.c:714
 msgid "Lo_w"
 msgstr "Laa_g"
 
-#: src/compose.c:712
+#: src/compose.c:715
 msgid "_Lowest"
 msgstr "_Laagste"
 
-#: src/compose.c:717 src/mainwindow.c:866 src/messageview.c:353
+#: src/compose.c:720 src/mainwindow.c:865 src/messageview.c:351
 msgid "_Automatic"
 msgstr "_Automatisch"
 
-#: src/compose.c:718 src/mainwindow.c:867 src/messageview.c:354
+#: src/compose.c:721 src/mainwindow.c:866 src/messageview.c:352
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:719 src/mainwindow.c:868 src/messageview.c:355
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:353
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:723 src/mainwindow.c:872 src/messageview.c:359
+#: src/compose.c:726 src/mainwindow.c:871 src/messageview.c:357
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centraaleuropees (ISO-8859-_2)"
 
-#: src/compose.c:726 src/mainwindow.c:875 src/messageview.c:362
+#: src/compose.c:729 src/mainwindow.c:874 src/messageview.c:360
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grieks (ISO-8859-_7)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:367
+#: src/compose.c:734 src/mainwindow.c:879 src/messageview.c:365
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turks (ISO-8859-_9)"
 
-#: src/compose.c:1034
+#: src/compose.c:1062
 msgid "New message From format error."
 msgstr "Opmaakfout in Van header van nieuw bericht."
 
-#: src/compose.c:1126
+#: src/compose.c:1154
 msgid "New message subject format error."
 msgstr "Opmaakfout in onderwerp van nieuw bericht."
 
-#: src/compose.c:1157 src/quote_fmt.c:563
+#: src/compose.c:1185 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Opmaakfout in berichttekst van \"Nieuw bericht\" op regel %d."
 
-#: src/compose.c:1413
+#: src/compose.c:1439
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr ""
 "Niet mogelijk te antwoorden. De originele e-mail bestaat waarschijnlijk niet."
 
-#: src/compose.c:1596 src/quote_fmt.c:580
+#: src/compose.c:1622 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 "Het \"Van\" veld van de \"Antwoord\" sjabloon bevat een ongeldig e-mailadres."
 
-#: src/compose.c:1644 src/quote_fmt.c:583
+#: src/compose.c:1670 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Opmaakfout in berichttekst van de \"Antwoord\" sjabloon op regel %d."
 
-#: src/compose.c:1780 src/compose.c:1972 src/quote_fmt.c:600
+#: src/compose.c:1806 src/compose.c:1998 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1840,56 +1836,56 @@ msgstr ""
 "Het \"Van\" veld van de \"Doorsturen\" sjabloon bevat een ongeldig e-mail "
 "adres."
 
-#: src/compose.c:1840 src/quote_fmt.c:603
+#: src/compose.c:1866 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "De tekst van de \"Doorsturen\" sjabloon heeft een fout op regel %d."
 
-#: src/compose.c:2014
+#: src/compose.c:2040
 msgid "Fw: multiple emails"
 msgstr "Doorsturen: meerdere e-mails"
 
 # TPTD
-#: src/compose.c:2456
+#: src/compose.c:2482
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "De tekst van de \"Herverwijzen\" sjabloon heeft en fout op regel %d."
 
-#: src/compose.c:2522 src/gtk/headers.h:13
+#: src/compose.c:2549 src/gtk/headers.h:13
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2525 src/gtk/headers.h:14
+#: src/compose.c:2552 src/gtk/headers.h:14
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2528 src/gtk/headers.h:11
+#: src/compose.c:2555 src/gtk/headers.h:11
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
-#: src/compose.c:2531 src/compose.c:4818 src/compose.c:4820
+#: src/compose.c:2558 src/compose.c:4854 src/compose.c:4856
 #: src/gtk/headers.h:32
 msgid "Newsgroups:"
 msgstr "Nieuwsgroepen:"
 
-#: src/compose.c:2534 src/gtk/headers.h:33
+#: src/compose.c:2561 src/gtk/headers.h:33
 msgid "Followup-To:"
 msgstr "Followup-To:"
 
-#: src/compose.c:2537 src/gtk/headers.h:16
+#: src/compose.c:2564 src/gtk/headers.h:16
 msgid "In-Reply-To:"
 msgstr "In antwoord aan:"
 
-#: src/compose.c:2541 src/compose.c:4815 src/compose.c:4823
-#: src/gtk/headers.h:12 src/summary_search.c:419
+#: src/compose.c:2568 src/compose.c:4851 src/compose.c:4859
+#: src/gtk/headers.h:12 src/summary_search.c:445
 msgid "To:"
 msgstr "Aan:"
 
-#: src/compose.c:2747
+#: src/compose.c:2774
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Kan bestand niet toevoegen (omzetten van de tekenset is mislukt)."
 
-#: src/compose.c:2753
+#: src/compose.c:2780
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1900,66 +1896,66 @@ msgid_plural ""
 msgstr[0] "Het bestand '%s' is toegevoegd:"
 msgstr[1] "De bestanden '%s' zijn toegevoegd:"
 
-#: src/compose.c:3026
+#: src/compose.c:3053
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "De \"Citatie markering\" van de sjabloon is ongeldig."
 
-#: src/compose.c:3514
+#: src/compose.c:3542
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Kon grootte van bestand '%s' niet opvragen"
 
-#: src/compose.c:3525
+#: src/compose.c:3553
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr ""
-"U staat op het moment om een bestand van %s in de berichttekst in te voegen. "
-"Wilt u doorgaan?"
+"Je staat op het moment om een bestand van %s in de berichttekst in te "
+"voegen. Wil je doorgaan?"
 
-#: src/compose.c:3528
+#: src/compose.c:3556
 msgid "Are you sure?"
-msgstr "Wilt u doorgaan?"
+msgstr "Wil je doorgaan?"
 
-#: src/compose.c:3529 src/compose.c:10962
+#: src/compose.c:3557 src/compose.c:11027
 msgid "+_Insert"
 msgstr "+_Invoegen"
 
-#: src/compose.c:3639
+#: src/compose.c:3672
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg."
 
-#: src/compose.c:3643
+#: src/compose.c:3676
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet lezen."
 
-#: src/compose.c:3670
+#: src/compose.c:3703
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:4658 src/plugins/python/composewindowtype.c:428
+#: src/compose.c:4691 src/plugins/python/composewindowtype.c:432
 msgid " [Edited]"
 msgstr " [Aangepast]"
 
-#: src/compose.c:4665 src/plugins/python/composewindowtype.c:431
+#: src/compose.c:4698 src/plugins/python/composewindowtype.c:435
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Bericht opstellen%s"
 
-#: src/compose.c:4668 src/plugins/python/composewindowtype.c:434
+#: src/compose.c:4701 src/plugins/python/composewindowtype.c:438
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[geen onderwerp] - Bericht opstellen%s"
 
-#: src/compose.c:4670 src/plugins/python/composewindowtype.c:422
+#: src/compose.c:4703 src/plugins/python/composewindowtype.c:426
 msgid "Compose message"
 msgstr "Bericht opstellen"
 
-#: src/compose.c:4697 src/messageview.c:909
+#: src/compose.c:4730 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1967,51 +1963,51 @@ msgstr ""
 "Geen account opgegeven voor het verzenden van berichten.\n"
 "Selecteer eerst een account."
 
-#: src/compose.c:4914 src/compose.c:4946 src/compose.c:4988
-#: src/plugins/attachwarner/attachwarner.c:312 src/prefs_account.c:3237
-#: src/toolbar.c:404 src/toolbar.c:422
+#: src/compose.c:4950 src/compose.c:4982 src/compose.c:5024
+#: src/plugins/attachwarner/attachwarner.c:219 src/prefs_account.c:3237
+#: src/toolbar.c:405 src/toolbar.c:423
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/compose.c:4915
+#: src/compose.c:4951
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "De enige ontvanger is het standaard CC-adres. Toch verzenden?"
 
-#: src/compose.c:4916 src/compose.c:4948 src/compose.c:4981 src/compose.c:5497
-#: src/plugins/attachwarner/attachwarner.c:304
+#: src/compose.c:4952 src/compose.c:4984 src/compose.c:5017 src/compose.c:5538
+#: src/plugins/attachwarner/attachwarner.c:211
 msgid "+_Send"
 msgstr "+_Verzenden"
 
-#: src/compose.c:4947
+#: src/compose.c:4983
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "De enige ontvanger is het standaard BCC-adres. Toch verzenden?"
 
-#: src/compose.c:4964
+#: src/compose.c:5000
 msgid "Recipient is not specified."
 msgstr "Geen ontvanger opgegeven."
 
-#: src/compose.c:4983 src/plugins/attachwarner/attachwarner.c:306
+#: src/compose.c:5019 src/plugins/attachwarner/attachwarner.c:213
 msgid "+_Queue"
 msgstr "+_Wachtrij"
 
-#: src/compose.c:4984
+#: src/compose.c:5020
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Het onderwerp is leeg. %s"
 
-#: src/compose.c:4985
+#: src/compose.c:5021
 msgid "Send it anyway?"
 msgstr "Toch verzenden?"
 
-#: src/compose.c:4986
+#: src/compose.c:5022
 msgid "Queue it anyway?"
 msgstr "Toch in de wachtrij zetten?"
 
-#: src/compose.c:4988 src/toolbar.c:423
+#: src/compose.c:5024 src/toolbar.c:424
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/compose.c:5036 src/compose.c:9585
+#: src/compose.c:5077 src/compose.c:9643
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2021,7 +2017,7 @@ msgstr ""
 "\n"
 "Omzetten van de tekenset mislukt."
 
-#: src/compose.c:5039 src/compose.c:9588
+#: src/compose.c:5080 src/compose.c:9646
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2031,7 +2027,7 @@ msgstr ""
 "\n"
 "Kon de sleutel van de ontvanger, nodig voor versleutelen, niet vinden."
 
-#: src/compose.c:5045 src/compose.c:9582
+#: src/compose.c:5086 src/compose.c:9640
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2042,7 +2038,7 @@ msgstr ""
 "\n"
 "Ondertekenen mislukt: %s"
 
-#: src/compose.c:5048
+#: src/compose.c:5089
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2053,30 +2049,30 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5050
+#: src/compose.c:5091
 msgid "Could not queue message for sending."
 msgstr "Kon bericht niet in de wachtrij zetten."
 
-#: src/compose.c:5065 src/compose.c:5125
+#: src/compose.c:5106 src/compose.c:5166
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "Het bericht is in de wachtrij gezet maar niet verstuurd.\n"
-"Gebruik \"Verzend berichten uit de wachtrij\"  van het hoofdvenster om  het "
+"Gebruik \"Verzend berichten uit de wachtrij\" van het hoofdvenster om het "
 "opnieuw te proberen."
 
-#: src/compose.c:5121
+#: src/compose.c:5162
 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "%s\n"
-"Gebruik \"Verzend berichten uit de wachtrij\"  van het hoofdvenster om  het "
+"Gebruik \"Verzend berichten uit de wachtrij\" van het hoofdvenster om het "
 "opnieuw te proberen."
 
-#: src/compose.c:5494
+#: src/compose.c:5535
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2087,7 +2083,7 @@ msgstr ""
 "naar de opgegeven tekenset '%s'.\n"
 "Verzenden met tekenset %s?"
 
-#: src/compose.c:5552
+#: src/compose.c:5593
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2100,67 +2096,67 @@ msgstr ""
 "worden.\n"
 "Toch verzenden?"
 
-#: src/compose.c:5733
+#: src/compose.c:5774
 msgid "Encryption warning"
 msgstr "Coderen waarschuwing"
 
-#: src/compose.c:5734
+#: src/compose.c:5775
 msgid "+C_ontinue"
 msgstr "+Ga _door met bewerken"
 
-#: src/compose.c:5783
+#: src/compose.c:5824
 msgid "No account for sending mails available!"
 msgstr "Geen account beschikbaar voor het verzenden!"
 
-#: src/compose.c:5792
+#: src/compose.c:5833
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "geselecteerd account is geen NNTP: Posten is niet mogelijk."
 
-#: src/compose.c:6021
+#: src/compose.c:6062
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Bijvoegsel %s bestaat niet meer. Negeren?"
 
-#: src/compose.c:6022 src/mainwindow.c:647 src/toolbar.c:229
-#: src/toolbar.c:2181
+#: src/compose.c:6063 src/mainwindow.c:648 src/toolbar.c:230
+#: src/toolbar.c:2182
 msgid "Cancel sending"
 msgstr "Verzenden annuleren"
 
-#: src/compose.c:6022
+#: src/compose.c:6063
 msgid "Ignore attachment"
 msgstr "Negeer bijvoegsel"
 
-#: src/compose.c:6061
+#: src/compose.c:6102
 #, c-format
 msgid "Original %s part"
-msgstr ""
+msgstr "Origineel %s gedeelte"
 
-#: src/compose.c:6592
+#: src/compose.c:6681
 msgid "Add to address _book"
 msgstr "Toevoegen aan adres_boek"
 
-#: src/compose.c:6748
+#: src/compose.c:6837
 msgid "Delete entry contents"
 msgstr "Verwijder inhoud"
 
-#: src/compose.c:6752 src/plugins/vcalendar/vcal_meeting_gtk.c:295
+#: src/compose.c:6841 src/plugins/vcalendar/vcal_meeting_gtk.c:295
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Gebruik <tab> om adressen automatisch af te maken"
 
-#: src/compose.c:6972
+#: src/compose.c:7061
 msgid "Mime type"
 msgstr "MIME-type"
 
-#: src/compose.c:6978 src/mimeview.c:283 src/plugins/pgpcore/select-keys.c:396
+#: src/compose.c:7067 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:392
 #: src/prefs_matcher.c:627 src/prefs_summary_column.c:85 src/summaryview.c:447
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:7048
+#: src/compose.c:7130
 msgid "Save Message to "
 msgstr "Bericht bewaren in"
 
-#: src/compose.c:7081 src/editjpilot.c:276 src/editldap.c:520
+#: src/compose.c:7167 src/editjpilot.c:276 src/editldap.c:520
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1028
 #: src/plugins/bogofilter/bogofilter_gtk.c:188
@@ -2171,24 +2167,24 @@ msgstr "Bericht bewaren in"
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: src/compose.c:7569
+#: src/compose.c:7643
 msgid "Hea_der"
 msgstr "Hea_der"
 
-#: src/compose.c:7574
+#: src/compose.c:7648
 msgid "_Attachments"
 msgstr "_Bijvoegsels"
 
-#: src/compose.c:7588
+#: src/compose.c:7662
 msgid "Othe_rs"
 msgstr "Anderen"
 
-#: src/compose.c:7603 src/gtk/headers.h:18
-#: src/plugins/pdf_viewer/poppler_viewer.c:704 src/summary_search.c:426
+#: src/compose.c:7677 src/gtk/headers.h:18
+#: src/plugins/pdf_viewer/poppler_viewer.c:704 src/summary_search.c:452
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: src/compose.c:7830
+#: src/compose.c:7891
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2197,20 +2193,20 @@ msgstr ""
 "Spellingcontrole kon niet gestart worden.\n"
 "%s"
 
-#: src/compose.c:7943
+#: src/compose.c:8000
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Van: <i>%s</i>"
 
-#: src/compose.c:7977
+#: src/compose.c:8034
 msgid "Account to use for this email"
 msgstr "Te gebruiken account voor dit bericht"
 
-#: src/compose.c:7979
+#: src/compose.c:8036
 msgid "Sender address to be used"
 msgstr "Een afzender-adres is verplicht."
 
-#: src/compose.c:8143
+#: src/compose.c:8200
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2219,64 +2215,64 @@ msgstr ""
 "Het privacy-systeem '%s' kon niet worden geladen. Het zal niet mogelijk zijn "
 "om dit bericht te ondertekenen of te versleutelen."
 
-#: src/compose.c:8243 src/plugins/archive/archiver_gtk.c:1082
+#: src/compose.c:8300 src/plugins/archive/archiver_gtk.c:1082
 msgid "_None"
 msgstr "G_een"
 
-#: src/compose.c:8344 src/prefs_template.c:749
+#: src/compose.c:8401 src/prefs_template.c:753
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Opmaakfout in berichttekst-sjabloon op regel %d."
 
-#: src/compose.c:8460
+#: src/compose.c:8517
 msgid "Template From format error."
 msgstr "Opmaakfout in Van-sjabloon."
 
-#: src/compose.c:8478
+#: src/compose.c:8535
 msgid "Template To format error."
 msgstr "Opmaakfout in Aan-sjabloon."
 
-#: src/compose.c:8496
+#: src/compose.c:8553
 msgid "Template Cc format error."
 msgstr "Opmaakfout in Cc-sjabloon."
 
-#: src/compose.c:8514
+#: src/compose.c:8571
 msgid "Template Bcc format error."
 msgstr "Opmaakfout in Bcc-sjabloon."
 
-#: src/compose.c:8533
+#: src/compose.c:8590
 msgid "Template subject format error."
 msgstr "Opmaakfout in Onderwerp-sjabloon."
 
-#: src/compose.c:8797
+#: src/compose.c:8854
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:8812
+#: src/compose.c:8869
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:8886
+#: src/compose.c:8943
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:8903
+#: src/compose.c:8960
 msgid "MIME type"
 msgstr "MIME type"
 
-#: src/compose.c:8944
+#: src/compose.c:9001
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:8964
+#: src/compose.c:9021
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:8965
+#: src/compose.c:9022
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:9157
+#: src/compose.c:9214
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2287,16 +2283,16 @@ msgstr ""
 "Zal ik het programma afbreken?\n"
 "procesgroep id: %d"
 
-#: src/compose.c:9551 src/messageview.c:1116
+#: src/compose.c:9609 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 "Claws Mail heeft netwerktoegang nodig voor het verzenden van deze e-mail."
 
-#: src/compose.c:9577
+#: src/compose.c:9635
 msgid "Could not queue message."
 msgstr "Kon bericht niet in de wachtrij zetten."
 
-#: src/compose.c:9579
+#: src/compose.c:9637
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2307,40 +2303,40 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:9747
+#: src/compose.c:9805
 msgid "Could not save draft."
 msgstr "Kon klad niet opslaan."
 
-#: src/compose.c:9751
+#: src/compose.c:9809
 msgid "Could not save draft"
 msgstr "Kon klad niet opslaan"
 
-#: src/compose.c:9752
+#: src/compose.c:9810
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
 msgstr ""
 "Kon klad niet opslaan.\n"
-"Wilt u deze e-mail annuleren of weggooien?"
+"Wil je deze e-mail annuleren of weggooien?"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Cancel exit"
 msgstr "_Annuleren"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Discard email"
 msgstr "_Gooi e-mail weg"
 
-#: src/compose.c:9914 src/compose.c:9928
+#: src/compose.c:9972 src/compose.c:9986
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:9942
+#: src/compose.c:10000
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Bestand '%s' kon niet gelezen worden."
 
-#: src/compose.c:9944
+#: src/compose.c:10002
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2349,84 +2345,86 @@ msgstr ""
 "Bestand '%s' bevat ongeldige characters\n"
 "voor de huidige codering, invoeging kan onjuist zijn."
 
-#: src/compose.c:10016
+#: src/compose.c:10081
 msgid "Discard message"
 msgstr "Gooi bericht weg"
 
-#: src/compose.c:10017
+#: src/compose.c:10082
 msgid "This message has been modified. Discard it?"
 msgstr "Bericht is gewijzigd, veranderingen laten vervallen?"
 
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Discard"
 msgstr "_Gooi weg"
 
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Save to Drafts"
 msgstr "Opslaan als _klad"
 
-#: src/compose.c:10020
+#: src/compose.c:10085
 msgid "Save changes"
 msgstr "Veranderingen opslaan"
 
-#: src/compose.c:10021
+#: src/compose.c:10086
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Bericht is gewijzigd. Veranderingen opslaan?"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "_Don't save"
 msgstr "_Niet opslaan"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "+_Save to Drafts"
 msgstr "+Opslaan als _Klad"
 
-#: src/compose.c:10092
+#: src/compose.c:10157
 #, c-format
-msgid "Do you want to apply the template '%s' ?"
-msgstr "Wilt u sjabloon '%s' toepassen?"
+msgid "Do you want to apply the template '%s'?"
+msgstr "Wil je sjabloon '%s' toepassen?"
 
-#: src/compose.c:10094
+#: src/compose.c:10159
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:10095
+#: src/compose.c:10160 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:772 src/prefs_template.c:309 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Vervang"
 
-#: src/compose.c:10095
+#: src/compose.c:10160
 msgid "_Insert"
 msgstr "_Invoegen"
 
-#: src/compose.c:10959
+#: src/compose.c:11024
 msgid "Insert or attach?"
 msgstr "In- of Bijvoegen"
 
-#: src/compose.c:10960
+#: src/compose.c:11025
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr ""
-"Wilt u de inhoud van de bestand(en) invoegen in de tekst van het bericht of "
+"Wil je de inhoud van de bestand(en) invoegen in de tekst van het bericht of "
 "bij het bericht voegen als het verstuurd wordt?"
 
-#: src/compose.c:10962
+#: src/compose.c:11027
 msgid "_Attach"
 msgstr "_Bijvoegen"
 
-#: src/compose.c:11178
+#: src/compose.c:11243
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Opmaakfout in citaat op regel %d."
 
-#: src/compose.c:11462
+#: src/compose.c:11527
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 "time. Do you want to continue?"
 msgstr ""
-"U staat op het moment om op %d berichten te reageren. Het openene van de "
-"vensters kan enige tijd duren. Wilt u doorgaan?"
+"Je staat op het moment om op %d berichten te reageren. Het openen van de "
+"vensters kan enige tijd duren. Wil je doorgaan?"
 
 #: src/crash.c:141
 #, c-format
@@ -2445,13 +2443,13 @@ msgid ""
 "Please file a bug report and include the information below."
 msgstr ""
 "%s.\n"
-"Rapporteer een bug-verslag, vermeld onderstaande informatie in uw bericht."
+"Rapporteer een bug-verslag, vermeld onderstaande informatie in je bericht."
 
 #: src/crash.c:208
 msgid "Debug log"
 msgstr "Debug log"
 
-#: src/crash.c:252 src/toolbar.c:420
+#: src/crash.c:252 src/toolbar.c:421
 msgid "Close"
 msgstr "Sluiten"
 
@@ -2569,41 +2567,41 @@ msgstr "_Afbeelding verwijderen"
 msgid "Photo"
 msgstr "Foto"
 
-#: src/editaddress.c:959 src/editaddress.c:961 src/expldifdlg.c:516
+#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:516
 #: src/exporthtml.c:761 src/ldif.c:766
 msgid "Display Name"
 msgstr "Weergegeven naam"
 
-#: src/editaddress.c:968 src/editaddress.c:972 src/ldif.c:774
+#: src/editaddress.c:961 src/editaddress.c:965 src/ldif.c:774
 msgid "Last Name"
 msgstr "Achternaam"
 
-#: src/editaddress.c:969 src/editaddress.c:971 src/ldif.c:770
+#: src/editaddress.c:962 src/editaddress.c:964 src/ldif.c:770
 msgid "First Name"
 msgstr "Voornaam"
 
-#: src/editaddress.c:975 src/editaddress.c:977
+#: src/editaddress.c:968 src/editaddress.c:970
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: src/editaddress.c:1061 src/editaddress.c:1129
+#: src/editaddress.c:1054 src/editaddress.c:1122
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1271 src/editaddress.c:1340 src/editaddress.c:1360
+#: src/editaddress.c:1264 src/editaddress.c:1333 src/editaddress.c:1353
 #: src/prefs_customheader.c:223
 msgid "Value"
 msgstr "Waarde"
 
-#: src/editaddress.c:1427
+#: src/editaddress.c:1424
 msgid "_User Data"
 msgstr "_Gebruikersgegevens"
 
-#: src/editaddress.c:1428
+#: src/editaddress.c:1425
 msgid "_Email Addresses"
 msgstr "_E-mailadres"
 
-#: src/editaddress.c:1431 src/editaddress.c:1434
+#: src/editaddress.c:1428 src/editaddress.c:1431
 msgid "O_ther Attributes"
 msgstr "O_verige Gegevens"
 
@@ -2629,7 +2627,7 @@ msgstr " Controleer bestand"
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
 #: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1934
-#: src/wizard.c:1371 src/wizard.c:1650
+#: src/wizard.c:1183 src/wizard.c:1457
 msgid "File"
 msgstr "Bestand"
 
@@ -2746,13 +2744,13 @@ msgstr "Een hostnaam voor de server is verplicht."
 
 #: src/editldap.c:177
 msgid "At least one LDAP search attribute should be supplied."
-msgstr "U dient op z'n minst een LDAP-gegeven op te geven."
+msgstr "Je dient op z'n minst een LDAP-gegeven op te geven."
 
 #: src/editldap.c:278
 msgid "Connected successfully to server"
 msgstr "Verbonden met server"
 
-#: src/editldap.c:336 src/editldap.c:980
+#: src/editldap.c:336 src/editldap.c:976
 msgid "Edit LDAP Server"
 msgstr "Wijzig LDAP server"
 
@@ -2768,8 +2766,8 @@ msgid ""
 "computer as Claws Mail."
 msgstr ""
 "Dit is de hostnaam van de server. \"ldap.mijndomein.nl\" is mogelijk de "
-"goede naam voor organisatie \"mijndomein.nl\". U mag ook een IP-adres "
-"opgeven. U kunt \"localhost\" opgeven als de LDAP-server op dezelfde "
+"goede naam voor organisatie \"mijndomein.nl\". Je mag ook een IP-adres "
+"opgeven. Je kunt \"localhost\" opgeven als de LDAP-server op dezelfde "
 "computer draait als Claws Mail."
 
 #: src/editldap.c:470
@@ -2781,7 +2779,6 @@ msgid "SSL"
 msgstr "SSL"
 
 #: src/editldap.c:475
-#, fuzzy
 msgid ""
 "Enable secure connection to the LDAP server via TLS. If connection fails, be "
 "sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
@@ -2792,7 +2789,6 @@ msgstr ""
 "(de velden TLS_CACERTDIR en TLS_REQCERT)."
 
 #: src/editldap.c:479
-#, fuzzy
 msgid ""
 "Enable secure connection to the LDAP server via SSL. If connection fails, be "
 "sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
@@ -2878,16 +2874,16 @@ msgid ""
 "This is useful for servers that have slow response times at the expense of "
 "more memory to cache results."
 msgstr ""
-"Dit bepaald de maximale tijd (in seconden) dat een adreszoekresultaat geldig "
-"blijft voor het aanvullen van een adres. Zoekresultaten worden gedurende die "
-"periode opgeslagen in het geheugen. Dit zal de responstijd verbeteren als u "
-"dezelfde naam of hetzelfde adres nogmaals probeert te zoeken. De opgeslagen "
-"zoekresultaten zullen dan eerst doorzocht worden voor dat een nieuwe "
-"zoekopdracht aan de server wordt gegeven. De standaardwaarde 600 seconden "
-"(10 minuten), zal voldoen voor de meeste servers. Een hogere waarde zal de "
-"zoektijd voor opeenvolgende zoekopdrachten verder verkleinen. Dit is handig "
-"voor langzame servers, maar dat kost wel meer geheugen om de resultaten op "
-"te slaan."
+"Dit bepaald de maximale tijd (in seconden) dat een adres zoekresultaat "
+"geldig blijft voor het aanvullen van een adres. Zoekresultaten worden "
+"gedurende die periode opgeslagen in het geheugen. Dit zal de responstijd "
+"verbeteren als je dezelfde naam of hetzelfde adres nogmaals probeert te "
+"zoeken. De opgeslagen zoekresultaten zullen dan eerst doorzocht worden "
+"voordat een nieuwe zoekopdracht aan de server wordt gegeven. De "
+"standaardwaarde 600 seconden (10 minuten), zal voldoen voor de meeste "
+"servers. Een hogere waarde zal de zoektijd voor opeenvolgende zoekopdrachten "
+"verder verkleinen. Dit is handig voor langzame servers, maar dat kost wel "
+"meer geheugen om de resultaten op te slaan."
 
 #: src/editldap.c:634
 msgid "Include server in dynamic search"
@@ -2898,7 +2894,7 @@ msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
 msgstr ""
-"Vink deze optie aan als u deze server wilt gebruiken voor dynamisch zoeken "
+"Vink deze optie aan als je deze server wilt gebruiken voor dynamisch zoeken "
 "tijdens het automatisch aanvullen van adressen."
 
 #: src/editldap.c:645
@@ -2940,48 +2936,48 @@ msgstr ""
 msgid "Bind Password"
 msgstr "Wachtwoord"
 
-#: src/editldap.c:733
+#: src/editldap.c:729
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr ""
 "Het te gebruiken wachtwoord bij het maken van een verbinding als de \"Bind DN"
 "\" gebruiker."
 
-#: src/editldap.c:738
+#: src/editldap.c:734
 msgid "Timeout (secs)"
 msgstr "Tijdslimiet (sec)"
 
-#: src/editldap.c:752
+#: src/editldap.c:748
 msgid "The timeout period in seconds."
 msgstr "De tijdslimiet in seconden."
 
-#: src/editldap.c:756
+#: src/editldap.c:752
 msgid "Maximum Entries"
 msgstr "Maximum aantal ingangen"
 
-#: src/editldap.c:770
+#: src/editldap.c:766
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 "Het maximaal aantal ingangen dat moet worden teruggegeven in een "
 "zoekresultaat."
 
-#: src/editldap.c:785 src/prefs_account.c:3201
+#: src/editldap.c:781 src/prefs_account.c:3201
 msgid "Basic"
 msgstr "Algemeen"
 
-#: src/editldap.c:786
+#: src/editldap.c:782
 msgid "Search"
 msgstr "Zoek"
 
-#: src/editldap.c:787 src/gtk/quicksearch.c:661
+#: src/editldap.c:783 src/gtk/quicksearch.c:670
 msgid "Extended"
 msgstr "Uitgebreid"
 
-#: src/editldap.c:985
+#: src/editldap.c:981
 msgid "Add New LDAP Server"
 msgstr "Nieuwe LDAP server"
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1444
+#: src/edittags.c:187 src/prefs_filtering_action.c:1446
 msgid "Tag"
 msgstr "Tag"
 
@@ -2991,7 +2987,7 @@ msgstr "Verwijder tag"
 
 #: src/edittags.c:216
 msgid "Do you really want to delete this tag?"
-msgstr "Wilt u deze tag werkelijk verwijderen?"
+msgstr "Wil je deze tag werkelijk verwijderen?"
 
 #: src/edittags.c:243
 msgid "Delete all tags"
@@ -2999,26 +2995,26 @@ msgstr "Verwijder alle tags"
 
 #: src/edittags.c:244
 msgid "Do you really want to delete all tags?"
-msgstr "Wil u alle tags werkelijk verwijderen?"
+msgstr "Wil je alle tags werkelijk verwijderen?"
 
-#: src/edittags.c:422
+#: src/edittags.c:415
 msgid "You entered a reserved tag name, please choose another instead."
-msgstr ""
+msgstr "Je voerde een gereserveerde tag naam in, kies een andere naam."
 
-#: src/edittags.c:464
+#: src/edittags.c:457
 msgid "Tag is not set."
 msgstr "Tag is niet ingesteld."
 
-#: src/edittags.c:529
+#: src/edittags.c:522
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "Pas tags toe"
 
-#: src/edittags.c:543
+#: src/edittags.c:536
 msgid "New tag:"
 msgstr "Nieuwe tag:"
 
-#: src/edittags.c:576
+#: src/edittags.c:569
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr "Selecteer tags om onmiddelijk toe te passen of te verwijderen."
 
@@ -3040,7 +3036,7 @@ msgstr "Toevoegen nieuwe VCard"
 
 #: src/etpan/imap-thread.c:585 src/etpan/nntp-thread.c:439
 msgid "Impossible to set the client certificate.\n"
-msgstr ""
+msgstr "Niet mogelijk om het client certificaat in te stellen.\n"
 
 #: src/exphtmldlg.c:106
 msgid "Please specify output directory and file to create."
@@ -3060,8 +3056,8 @@ msgid ""
 "HTML Output Directory '%s'\n"
 "does not exist. OK to create new directory?"
 msgstr ""
-"HTML uitvoerdirectory '%s'\n"
-"bestaat niet. Wilt u een nieuwe directory aanmaken?"
+"HTML uitvoermap '%s'\n"
+"bestaat niet. Wil je een nieuwe map aanmaken?"
 
 #: src/exphtmldlg.c:180 src/expldifdlg.c:190
 msgid "Create Directory"
@@ -3102,9 +3098,9 @@ msgid "Stylesheet"
 msgstr "Stylesheet"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:133 src/mainwindow.c:1174
-#: src/plugins/archive/archiver_prefs.c:241 src/prefs_account.c:938
-#: src/prefs_toolbar.c:775 src/prefs_toolbar.c:1456 src/summaryview.c:6009
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1173
+#: src/plugins/archive/archiver_prefs.c:241 src/prefs_account.c:946
+#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1465 src/summaryview.c:6006
 msgid "None"
 msgstr "Geen"
 
@@ -3113,7 +3109,7 @@ msgstr "Geen"
 msgid "Default"
 msgstr "Standaard"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:248
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
 #: src/plugins/pgpcore/sgpgme.c:148
 msgid "Full"
 msgstr "Volledig"
@@ -3184,7 +3180,7 @@ msgstr "Formaat"
 
 #: src/expldifdlg.c:108
 msgid "Please specify output directory and LDIF filename to create."
-msgstr "Geef uitvoerdirectory en bestandsnaam van LDIF-uitvoerbestand."
+msgstr "Geef uitvoermap en bestandsnaam van LDIF-uitvoerbestand."
 
 #: src/expldifdlg.c:111
 msgid "Specify parameters to format distinguished name."
@@ -3196,8 +3192,8 @@ msgid ""
 "LDIF Output Directory '%s'\n"
 "does not exist. OK to create new directory?"
 msgstr ""
-"LDIF-uitvoerdirectory '%s'\n"
-"bestaat niet. Wilt u een nieuwe directory aanmaken?"
+"LDIF-uitvoermap '%s'\n"
+"bestaat niet. Wil je een nieuwe map aanmaken?"
 
 #: src/expldifdlg.c:199
 #, c-format
@@ -3205,7 +3201,7 @@ msgid ""
 "Could not create output directory for LDIF file:\n"
 "%s"
 msgstr ""
-"Kon uitvoerdirectory voor LDIF-bestand niet aanmaken:\n"
+"Kon uitvoermap voor LDIF-bestand niet aanmaken:\n"
 "%s"
 
 #: src/expldifdlg.c:241
@@ -3217,8 +3213,8 @@ msgid ""
 "A suffix is required if data is to be used for an LDAP server. Are you sure "
 "you wish to proceed without a suffix?"
 msgstr ""
-"Een achtervoegsel is noodzakelijk als u de gegevens wilt gebruiken voor een "
-"LDAP-server. Weet u zeker dat u wilt doorgaan?"
+"Een achtervoegsel is noodzakelijk als je de gegevens wilt gebruiken voor een "
+"LDAP-server. Weet je zeker dat je wilt doorgaan?"
 
 #: src/expldifdlg.c:261
 msgid "Error creating LDIF file"
@@ -3340,7 +3336,7 @@ msgstr "Exporteren Adresboek naar LDIF-bestand"
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:113 src/summaryview.c:8161
+#: src/export.c:113 src/summaryview.c:8143
 msgid "Export to mbox file"
 msgstr "Exporteer naar mbox-bestand"
 
@@ -3401,52 +3397,71 @@ msgstr "De naam is te lang."
 msgid "Not specified."
 msgstr "Niet aangegeven."
 
-#: src/folder.c:1571 src/foldersel.c:374 src/prefs_folder_item.c:308
+#: src/file_checker.c:76
+#, c-format
+msgid "The file %s is missing! Do you want to use the backup file from %s?"
+msgstr "Het bestand %s mist! Wil je het backup bestand gebruiken van %s?"
+
+#: src/file_checker.c:84 src/file_checker.c:106
+#, c-format
+msgid "Could not copy %s to %s"
+msgstr "Kon %s niet kopiëren naar %s"
+
+#: src/file_checker.c:98
+#, c-format
+msgid ""
+"The file %s is empty or corrupted! Do you want to use the backup file from "
+"%s?"
+msgstr ""
+"Het bestand %s is leeg of beschadigd! Wil je het backup bestand gebruiken "
+"van %s?"
+
+#: src/folder.c:1577 src/foldersel.c:374 src/prefs_folder_item.c:308
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/folder.c:1575 src/foldersel.c:378
+#: src/folder.c:1581 src/foldersel.c:378
 msgid "Sent"
 msgstr "Verzonden"
 
-#: src/folder.c:1579 src/foldersel.c:382
-#: src/plugins/attachwarner/attachwarner.c:312 src/prefs_folder_item.c:311
+#: src/folder.c:1585 src/foldersel.c:382
+#: src/plugins/attachwarner/attachwarner.c:219 src/prefs_folder_item.c:311
 msgid "Queue"
 msgstr "Wachtrij"
 
-#: src/folder.c:1583 src/foldersel.c:386 src/prefs_folder_item.c:312
+#: src/folder.c:1589 src/foldersel.c:386 src/prefs_folder_item.c:312
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: src/folder.c:1587 src/foldersel.c:390 src/prefs_folder_item.c:310
+#: src/folder.c:1593 src/foldersel.c:390 src/prefs_folder_item.c:310
 msgid "Drafts"
 msgstr "Klad"
 
-#: src/folder.c:2017
+#: src/folder.c:2023
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Bezig met verwerken (%s)...\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Bezig met kopiëren van %s naar %s...\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Bezig met verplaatsen van %s naar %s...\n"
 
-#: src/folder.c:3563
+#: src/folder.c:3569
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Cache voor %s wordt bijgewerkt ..."
 
-#: src/folder.c:4435
+#: src/folder.c:4443
 msgid "Processing messages..."
 msgstr "Berichten verwerken..."
 
-#: src/folder.c:4571
+#: src/folder.c:4579
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchroniseren %s voor offline gebruik... \n"
@@ -3461,23 +3476,26 @@ msgid "NewFolder"
 msgstr "NieuweMap"
 
 #: src/foldersel.c:562 src/imap_gtk.c:210 src/imap_gtk.c:216
-#: src/imap_gtk.c:272 src/mh_gtk.c:155 src/mh_gtk.c:259 src/news_gtk.c:314
-#: src/plugins/rssyl/rssyl_cb_menu.c:97 src/plugins/rssyl/rssyl_cb_menu.c:341
-#: src/plugins/vcalendar/vcal_folder.c:2025
+#: src/imap_gtk.c:272 src/imap_gtk.c:277 src/mh_gtk.c:155 src/mh_gtk.c:259
+#: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:249
+#: src/plugins/mailmbox/plugin_gtk.c:416 src/plugins/rssyl/rssyl_cb_menu.c:97
+#: src/plugins/rssyl/rssyl_cb_menu.c:341
+#: src/plugins/vcalendar/vcal_folder.c:2026
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map voorkomen."
 
 #: src/foldersel.c:572 src/imap_gtk.c:226 src/imap_gtk.c:284 src/mh_gtk.c:165
-#: src/mh_gtk.c:266 src/news_gtk.c:321 src/plugins/rssyl/rssyl_cb_menu.c:107
+#: src/mh_gtk.c:266 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:261
+#: src/plugins/mailmbox/plugin_gtk.c:425 src/plugins/rssyl/rssyl_cb_menu.c:107
 #: src/plugins/rssyl/rssyl_cb_menu.c:348
-#: src/plugins/vcalendar/vcal_folder.c:2032
+#: src/plugins/vcalendar/vcal_folder.c:2033
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "De map '%s' bestaat al."
 
 #: src/foldersel.c:579 src/imap_gtk.c:232 src/mh_gtk.c:171
-#: src/plugins/rssyl/rssyl_cb_menu.c:113
+#: src/plugins/mailmbox/plugin_gtk.c:268 src/plugins/rssyl/rssyl_cb_menu.c:113
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Kan map '%s' niet aanmaken."
@@ -3490,7 +3508,7 @@ msgstr "_Alles gelezen"
 msgid "R_un processing rules"
 msgstr "_Verwerkingsregel draaien"
 
-#: src/folderview.c:233 src/mainwindow.c:543
+#: src/folderview.c:233 src/mainwindow.c:544
 msgid "_Search folder..."
 msgstr "_Map doorzoeken..."
 
@@ -3508,13 +3526,13 @@ msgstr "Verzend wacht_rij..."
 
 #: src/folderview.c:380 src/folderview.c:427
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:388 src/summaryview.c:6293
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:388 src/summaryview.c:6282
 msgid "New"
 msgstr "Nieuw"
 
 #: src/folderview.c:381 src/folderview.c:428
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:387 src/summaryview.c:6295
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:387 src/summaryview.c:6284
 msgid "Unread"
 msgstr "Ongelezen"
 
@@ -3528,107 +3546,107 @@ msgstr "Totaal"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:734
+#: src/folderview.c:727
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:797 src/summaryview.c:4111 src/summaryview.c:4113
+#: src/folderview.c:790 src/summaryview.c:4109 src/summaryview.c:4111
 msgid "Mark all as read"
 msgstr "Markeer alles als gelezen"
 
-#: src/folderview.c:798 src/summaryview.c:4112
-msgid "Do you really want to mark all mails in this folder as read ?"
-msgstr "Wilt u werkelijk alle berichten in deze map als gelezen markeren?"
+#: src/folderview.c:791 src/summaryview.c:4110
+msgid "Do you really want to mark all mails in this folder as read?"
+msgstr "Wil je werkelijk alle berichten in deze map als gelezen markeren?"
 
-#: src/folderview.c:1021 src/imap.c:4490 src/mainwindow.c:5316 src/setup.c:91
+#: src/folderview.c:1014 src/imap.c:4497 src/mainwindow.c:5128 src/setup.c:91
 #, c-format
-msgid "Scanning folder %s%c%s ..."
-msgstr "Map wordt ingelezen %s%c%s ..."
+msgid "Scanning folder %s%c%s..."
+msgstr "Map wordt ingelezen %s%c%s..."
 
-#: src/folderview.c:1025 src/imap.c:4495 src/mainwindow.c:5321 src/setup.c:96
+#: src/folderview.c:1018 src/imap.c:4502 src/mainwindow.c:5133 src/setup.c:96
 #, c-format
-msgid "Scanning folder %s ..."
-msgstr "Map wordt ingelezen %s ..."
+msgid "Scanning folder %s..."
+msgstr "Map wordt ingelezen %s..."
 
-#: src/folderview.c:1056
+#: src/folderview.c:1049
 msgid "Rebuild folder tree"
 msgstr "Vernieuw mappenboom"
 
-#: src/folderview.c:1057
+#: src/folderview.c:1050
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
-msgstr "Mappenboom vernieuwen verwijdert lokale caches. Wilt u doorgaan?"
+msgstr "Mappenboom vernieuwen verwijdert lokale caches. Wil je doorgaan?"
 
-#: src/folderview.c:1067
+#: src/folderview.c:1060
 msgid "Rebuilding folder tree..."
 msgstr "Mappenboom wordt opnieuw aangemaakt..."
 
-#: src/folderview.c:1069 src/folderview.c:1110
+#: src/folderview.c:1062 src/folderview.c:1103
 msgid "Scanning folder tree..."
 msgstr "Mappenboom wordt ingelezen ..."
 
-#: src/folderview.c:1201
+#: src/folderview.c:1194
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Kan map '%s' niet inlezen\n"
 
-#: src/folderview.c:1255
+#: src/folderview.c:1248
 msgid "Checking for new messages in all folders..."
 msgstr "Alle mappen worden gecontroleerd op nieuwe berichten..."
 
-#: src/folderview.c:2083
-#, fuzzy, c-format
+#: src/folderview.c:2076
+#, c-format
 msgid "Closing folder %s..."
-msgstr "Map %s wordt gesloten ..."
+msgstr "Map %s wordt gesloten..."
 
-#: src/folderview.c:2178
-#, fuzzy, c-format
+#: src/folderview.c:2171
+#, c-format
 msgid "Opening folder %s..."
-msgstr "Map %s wordt geopend ..."
+msgstr "Map %s wordt geopend..."
 
-#: src/folderview.c:2196
+#: src/folderview.c:2189
 msgid "Folder could not be opened."
 msgstr "Map kon niet worden geopend."
 
-#: src/folderview.c:2337 src/mainwindow.c:3070 src/mainwindow.c:3074
+#: src/folderview.c:2330 src/mainwindow.c:2877 src/mainwindow.c:2881
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2331
 msgid "Delete all messages in trash?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/folderview.c:2339
+#: src/folderview.c:2332
 msgid "+_Empty trash"
 msgstr "+Prullenbak leegmaken"
 
-#: src/folderview.c:2383 src/inc.c:1620 src/toolbar.c:2689
+#: src/folderview.c:2376 src/inc.c:1528 src/toolbar.c:2678
 msgid "Offline warning"
 msgstr "Off-line waarschuwing"
 
-#: src/folderview.c:2384 src/toolbar.c:2690
+#: src/folderview.c:2377 src/toolbar.c:2679
 msgid "You're working offline. Override?"
-msgstr "U bent momenteel niet online.  Toch doorgaan?"
+msgstr "Je bent momenteel niet online. Toch doorgaan?"
 
-#: src/folderview.c:2395 src/toolbar.c:2709
+#: src/folderview.c:2388 src/toolbar.c:2698
 msgid "Send queued messages"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/folderview.c:2396 src/toolbar.c:2710
+#: src/folderview.c:2389 src/toolbar.c:2699
 msgid "Send all queued messages?"
 msgstr "Alle berichten uit de wachtrij verzenden?"
 
-#: src/folderview.c:2397 src/messageview.c:875 src/messageview.c:892
-#: src/toolbar.c:2711
+#: src/folderview.c:2390 src/messageview.c:853 src/messageview.c:870
+#: src/toolbar.c:2700
 msgid "_Send"
 msgstr "_Verzenden"
 
-#: src/folderview.c:2405 src/toolbar.c:2729
+#: src/folderview.c:2398 src/toolbar.c:2718
 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 "Er is een fout opgetreden bij het verzenden van berichten in de wachtrij."
 
-#: src/folderview.c:2408 src/main.c:2853 src/toolbar.c:2732
+#: src/folderview.c:2401 src/main.c:2689 src/toolbar.c:2721
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3637,64 +3655,64 @@ msgstr ""
 "Er zijn fouten opgetreden bij het verzenden van berichten in de wachtrij:\n"
 "%s"
 
-#: src/folderview.c:2485
+#: src/folderview.c:2478
 #, c-format
-msgid "Do you really want to copy folder '%s' in '%s' ?"
-msgstr "Wilt u werkelijk map '%s' kopiëren naar '%s'?"
+msgid "Do you really want to copy folder '%s' in '%s'?"
+msgstr "Wil je werkelijk map '%s' kopiëren naar '%s'?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2479
 #, c-format
-msgid "Do you really want to make folder '%s' a subfolder of '%s' ?"
-msgstr "Wilt u werkelijk van map '%s' een submap maken van '%s'?"
+msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
+msgstr "Wil je werkelijk van map '%s' een submap maken van '%s'?"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Copy folder"
 msgstr "Kopieer map"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Move folder"
 msgstr "Verplaats map"
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Bezig %s te kopiëren naar %s ..."
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Bezig %s te verplaatsen naar %s ..."
 
-#: src/folderview.c:2530
+#: src/folderview.c:2523
 msgid "Source and destination are the same."
 msgstr "Bron en bestemming zijn hetzelfde."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2526
 msgid "Can't copy a folder to one of its children."
 msgstr "Kan een map niet kopiëren naar een van z'n submappen."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2527
 msgid "Can't move a folder to one of its children."
 msgstr "Kan een map niet verplaatsen naar een van z'n submappen."
 
-#: src/folderview.c:2537
+#: src/folderview.c:2530
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Kan een map niet naar een ander postvak verplaatsen."
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Copy failed!"
 msgstr "Kopiëren mislukt!"
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Move failed!"
 msgstr "Verplaatsen mislukt!"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2584
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Instellingen voor map '%s' wordt verwerkt"
 
-#: src/folderview.c:3018 src/summaryview.c:4553 src/summaryview.c:4652
+#: src/folderview.c:3011 src/summaryview.c:4550 src/summaryview.c:4649
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Doel-map kan alleen gebruikt worden om submappen op te slaan."
 
@@ -3769,9 +3787,12 @@ msgid ""
 "\n"
 "For support and discussion subscribe to the Claws Mail users' mailing list:\n"
 msgstr ""
+"\n"
+"\n"
+"Voor ondersteuning en discussie kun je je inschrijven voor de Claws Mail "
+"gebruikers mailinglijst:\n"
 
 #: src/gtk/about.c:143
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -3780,7 +3801,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Claws Mail is vrije software uitgegeven onder de GPL licentie. Als u een "
+"Claws Mail is vrije software uitgegeven onder de GPL licentie. Als je een "
 "donatie wenst te maken aan het Claws Mail project, kan dat hier:\n"
 
 #: src/gtk/about.c:159
@@ -3791,6 +3812,11 @@ msgid ""
 "The Claws Mail Team\n"
 " and Hiroyuki Yamamoto"
 msgstr ""
+"\n"
+"\n"
+"Auteursrecht (C) 1999-2013\n"
+"Het Claws Mail Team\n"
+"en Hiroyuki Yamamoto"
 
 #: src/gtk/about.c:162
 msgid ""
@@ -3835,7 +3861,7 @@ msgstr ""
 "Taaldefinitie: %s (tekenset: %s)\n"
 "Besturingssysteem: unknown"
 
-#: src/gtk/about.c:243 src/prefs_themes.c:728 src/wizard.c:545
+#: src/gtk/about.c:243 src/prefs_themes.c:728 src/wizard.c:523
 msgid "The Claws Mail Team"
 msgstr "Het Claws Mail Team"
 
@@ -3926,10 +3952,10 @@ msgid ""
 "version.\n"
 "\n"
 msgstr ""
-"Dit programma is vrije software. U kunt het verspreiden en/of aanpassen "
+"Dit programma is vrije software. Je kunt het verspreiden en/of aanpassen "
 "binnen de afspraken die in de GNU General Public License zijn gepubliceerd. "
-"U mag zelf kiezen of u versie 3 of (als u dat wenst) iedere latere versie "
-"van het GPL hanteert.\n"
+"Je mag zelf kiezen of je versie 3 of (als je dat wenst) iedere latere versie "
+"van de GPL hanteert.\n"
 "\n"
 
 #: src/gtk/about.c:550
@@ -3951,7 +3977,7 @@ msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see <"
 msgstr ""
-"U zou een kopie van de GNU General Public License ontvangen moeten hebben "
+"Je zou een kopie van de GNU General Public License ontvangen moeten hebben "
 "bij dit programma. Als dit niet het geval is, zie <"
 
 #: src/gtk/about.c:573
@@ -3962,48 +3988,47 @@ msgstr ""
 ">. \n"
 "\n"
 
-#: src/gtk/about.c:699 src/main.c:2680
-#, fuzzy
+#: src/gtk/about.c:699 src/main.c:2516
 msgid "Session statistics\n"
-msgstr "Sessie verlopen\n"
+msgstr "Sessie statistieken\n"
 
-#: src/gtk/about.c:709 src/gtk/about.c:712 src/main.c:2690 src/main.c:2693
-#, fuzzy, c-format
+#: src/gtk/about.c:709 src/gtk/about.c:712 src/main.c:2526 src/main.c:2529
+#, c-format
 msgid "Started: %s\n"
-msgstr "schrijf op fd%d: %s\n"
+msgstr "Gestart: %s\n"
 
-#: src/gtk/about.c:719 src/main.c:2699
+#: src/gtk/about.c:719 src/main.c:2535
 msgid "Incoming traffic\n"
-msgstr ""
+msgstr "Inkomend verkeer\n"
 
-#: src/gtk/about.c:722 src/main.c:2702
-#, fuzzy, c-format
+#: src/gtk/about.c:722 src/main.c:2538
+#, c-format
 msgid "Received messages: %d\n"
-msgstr "verwijderde berichten"
+msgstr "Ontvangen berichten: %d\n"
 
-#: src/gtk/about.c:729 src/main.c:2708
+#: src/gtk/about.c:729 src/main.c:2544
 msgid "Outgoing traffic\n"
-msgstr ""
+msgstr "Uitgaand verkeer\n"
 
-#: src/gtk/about.c:732 src/main.c:2711
-#, fuzzy, c-format
+#: src/gtk/about.c:732 src/main.c:2547
+#, c-format
 msgid "New/redirected messages: %d\n"
-msgstr "Selectie _filteren"
+msgstr "Nieuwe/doorverwezen berichten: %d\n"
 
-#: src/gtk/about.c:737 src/main.c:2715
-#, fuzzy, c-format
+#: src/gtk/about.c:737 src/main.c:2551
+#, c-format
 msgid "Replied messages: %d\n"
-msgstr "verwijderde berichten"
+msgstr "Beantwoorde berichten: %d\n"
 
-#: src/gtk/about.c:742 src/main.c:2719
-#, fuzzy, c-format
+#: src/gtk/about.c:742 src/main.c:2555
+#, c-format
 msgid "Forwarded messages: %d\n"
-msgstr "doorgestuurde berichten"
+msgstr "Doorgestuurde berichten: %d\n"
 
-#: src/gtk/about.c:747 src/main.c:2723
-#, fuzzy, c-format
+#: src/gtk/about.c:747 src/main.c:2559
+#, c-format
 msgid "Total outgoing messages: %d\n"
-msgstr "Berichten sorteren...\n"
+msgstr "Totaal uitgaande berichten: %d\n"
 
 #: src/gtk/about.c:774
 msgid "About Claws Mail"
@@ -4015,6 +4040,9 @@ msgid ""
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
+"Auteursrecht (C) 1999-2013\n"
+"Het Claws Mail Team\n"
+"en Hiroyuki Yamamoto"
 
 #: src/gtk/about.c:846
 msgid "_Info"
@@ -4038,84 +4066,81 @@ msgstr "_Opmerkingen bij deze uitgave"
 
 #: src/gtk/about.c:878
 msgid "_Statistics"
-msgstr ""
+msgstr "_Statistieken"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:358
 msgid "Orange"
 msgstr "Oranje"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:362
 msgid "Red"
 msgstr "Rood"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:366
 msgid "Pink"
 msgstr "Roze"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:370
 msgid "Sky blue"
 msgstr "Hemelsblauw"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:374
 msgid "Blue"
 msgstr "Blauw"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:378
 msgid "Green"
 msgstr "Groen"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:382
 msgid "Brown"
 msgstr "Bruin"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:386
 msgid "Grey"
 msgstr "Grijs"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:390
 msgid "Light brown"
 msgstr "Lichtbruin"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:394
 msgid "Dark red"
 msgstr "Donkerrood"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:398
 msgid "Dark pink"
 msgstr "Donker roze"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:402
 msgid "Steel blue"
 msgstr "Staalblauw"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:406
 msgid "Gold"
 msgstr "Goud"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:410
 msgid "Bright green"
 msgstr "Heldergroen"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:424
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:414
 msgid "Magenta"
 msgstr "Magenta"
 
 #: src/gtk/foldersort.c:156
-#, fuzzy
 msgid "Set mailbox order"
-msgstr "Bepaal map volgorde"
+msgstr "Bepaal postvak volgorde"
 
 #: src/gtk/foldersort.c:190
-#, fuzzy
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
-"Beweeg mappen op of neer om de sorteervolgorde in de mappenboom te "
+"Beweeg postvakken op of neer om de sorteervolgorde in de mappenboom te "
 "veranderen."
 
 #: src/gtk/foldersort.c:216
-#, fuzzy
 msgid "Mailboxes"
-msgstr "Postvak"
+msgstr "Postvakken"
 
 #: src/gtk/gtkaspell.c:341 src/gtk/gtkaspell.c:660
 msgid "No dictionary selected."
@@ -4157,18 +4182,17 @@ msgstr ""
 "om woord te leren.\n"
 
 #: src/gtk/gtkaspell.c:1800
-#, fuzzy
 msgid "Change to..."
-msgstr "Wijzig score"
+msgstr "Wijzig in..."
 
 #: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
 msgid "More..."
 msgstr "Verder..."
 
 #: src/gtk/gtkaspell.c:1867
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
-msgstr "\"%s\" onbekend in %s"
+msgstr "\"%s\" onbekend in woordenboek '%s'"
 
 #: src/gtk/gtkaspell.c:1883
 msgid "Accept in this session"
@@ -4227,8 +4251,8 @@ msgstr ""
 "De spellingcontrole kon de alternatieve woordenlijst niet veranderen.\n"
 "%s"
 
-#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1257
-#: src/prefs_matcher.c:2152 src/prefs_summary_column.c:84 src/quote_fmt.c:49
+#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1259
+#: src/prefs_matcher.c:2158 src/prefs_summary_column.c:84 src/quote_fmt.c:49
 #: src/summaryview.c:446
 msgid "Date"
 msgstr "Datum"
@@ -4237,13 +4261,13 @@ msgstr "Datum"
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1254
-#: src/prefs_matcher.c:2149 src/prefs_summary_column.c:82 src/quote_fmt.c:50
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1256
+#: src/prefs_matcher.c:2155 src/prefs_summary_column.c:82 src/quote_fmt.c:50
 #: src/summaryview.c:444
 msgid "From"
 msgstr "Afzender"
 
-#: src/gtk/headers.h:9 src/summary_search.c:412
+#: src/gtk/headers.h:9 src/summary_search.c:438
 msgid "From:"
 msgstr "Afzender:"
 
@@ -4259,14 +4283,14 @@ msgstr "Afzender:"
 msgid "Reply-To"
 msgstr "Antwoord aan"
 
-#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2150 src/prefs_summary_column.c:83 src/quote_fmt.c:57
+#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1257
+#: src/prefs_matcher.c:2156 src/prefs_summary_column.c:83 src/quote_fmt.c:57
 #: src/summaryview.c:445
 msgid "To"
 msgstr "Aan"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2151 src/quote_fmt.c:58
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1258
+#: src/prefs_matcher.c:2157 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
@@ -4274,8 +4298,8 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1258
-#: src/prefs_matcher.c:2153 src/quote_fmt.c:61
+#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1260
+#: src/prefs_matcher.c:2159 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Bericht-ID"
 
@@ -4287,8 +4311,8 @@ msgstr "Bericht-ID:"
 msgid "In-Reply-To"
 msgstr "In antwoord aan"
 
-#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2155 src/quote_fmt.c:60
+#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1262
+#: src/prefs_matcher.c:2161 src/quote_fmt.c:60
 msgid "References"
 msgstr "Verwijzingen"
 
@@ -4296,8 +4320,8 @@ msgstr "Verwijzingen"
 msgid "References:"
 msgstr "Verwijzingen:"
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1253
-#: src/prefs_matcher.c:2148 src/prefs_summary_column.c:81 src/quote_fmt.c:56
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1255
+#: src/prefs_matcher.c:2154 src/prefs_summary_column.c:81 src/quote_fmt.c:56
 #: src/summaryview.c:443
 msgid "Subject"
 msgstr "Onderwerp"
@@ -4390,8 +4414,8 @@ msgstr "Ontvangen"
 msgid "Received:"
 msgstr "Ontvangen:"
 
-#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2154 src/quote_fmt.c:59
+#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1261
+#: src/prefs_matcher.c:2160 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Nieuwsgroepen"
 
@@ -4489,7 +4513,7 @@ msgstr "Voorrang"
 msgid "Precedence:"
 msgstr "Voorrang:"
 
-#: src/gtk/headers.h:45 src/prefs_account.c:1059
+#: src/gtk/headers.h:45 src/prefs_account.c:1067
 msgid "Organization"
 msgstr "Organisatie"
 
@@ -4634,9 +4658,8 @@ msgid "Message has been forwarded"
 msgstr "Is doorgestuurd"
 
 #: src/gtk/icon_legend.c:68
-#, fuzzy
 msgid "Message has been forwarded and replied to"
-msgstr "Is beantwoord"
+msgstr "Bericht is doorgestuurd en beantwoord"
 
 #: src/gtk/icon_legend.c:69
 msgid "Message is in an ignored thread"
@@ -4714,44 +4737,47 @@ msgstr ""
 "<span weight=\"bold\">De volgende pictogrammen worden gebruikt om de status "
 "van een bericht of map weer te geven:</span>"
 
-#: src/gtk/inputdialog.c:246 src/gtk/inputdialog.c:268
+#: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Geef wachtwoord voor %s op %s:"
 
-#: src/gtk/inputdialog.c:249 src/gtk/inputdialog.c:252
-#: src/gtk/inputdialog.c:271 src/gtk/inputdialog.c:274
+#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
+#: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
 #, c-format
 msgid "Input password for %s:"
 msgstr "Geef wachtwoord voor %s:"
 
-#: src/gtk/inputdialog.c:255 src/gtk/inputdialog.c:277
+#: src/gtk/inputdialog.c:242 src/gtk/inputdialog.c:264
 msgid "Input password:"
 msgstr "Geef wachtwoord:"
 
-#: src/gtk/inputdialog.c:256 src/gtk/inputdialog.c:284
-#: src/gtk/inputdialog.c:296
+#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
+#: src/gtk/inputdialog.c:283
 msgid "Input password"
 msgstr "Geef wachtwoord"
 
-#: src/gtk/inputdialog.c:286
+#: src/gtk/inputdialog.c:273
 msgid "Remember password for this session"
 msgstr "Onthoud wachtwoord voor deze sessie"
 
-#: src/gtk/inputdialog.c:385 src/gtk/inputdialog.c:434
+#: src/gtk/inputdialog.c:372 src/gtk/inputdialog.c:421
 msgid "Remember this"
 msgstr "Onthoud dit"
 
-#: src/gtk/logwindow.c:451
+#: src/gtk/logwindow.c:447
 msgid "Clear _Log"
 msgstr "Leeg _Log"
 
-#: src/gtk/menu.c:145
+#: src/gtk/menu.c:137
 msgid ""
 "<span><b>Warning:</b> This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
 "corrupted, malformed or part of some DoS attempt.</span>"
 msgstr ""
+"<span><b>Waarschuwing:</b> Deze URL was te lang om weer te\n"
+"geven en is ingekort. Dit bericht kan beschadigd zijn, of\n"
+"onderdeel van een DoS poging.</span>"
 
 #: src/gtk/pluginwindow.c:164 src/gtk/pluginwindow.c:169
 msgid ""
@@ -4788,13 +4814,12 @@ msgstr ""
 
 #: src/gtk/pluginwindow.c:304 src/plugins/acpi_notifier/acpi_notifier.c:790
 #: src/plugins/archive/archiver_prefs.c:92
-#: src/plugins/att_remover/att_remover.c:519
-#: src/plugins/attachwarner/attachwarner_prefs.c:201
-#: src/plugins/address_keeper/address_keeper_prefs.c:208
+#: src/plugins/attachwarner/attachwarner_prefs.c:228
+#: src/plugins/address_keeper/address_keeper_prefs.c:248
 #: src/plugins/bogofilter/bogofilter_gtk.c:457
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
 #: src/plugins/clamd/clamav_plugin_gtk.c:549
-#: src/plugins/fancy/fancy_prefs.c:110
+#: src/plugins/fancy/fancy_prefs.c:109
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:178
 #: src/plugins/gdata/cm_gdata_prefs.c:145
 #: src/plugins/notification/notification_prefs.c:396
@@ -4808,7 +4833,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:557 src/plugins/rssyl/rssyl_prefs.c:63
 #: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:648
-#: src/plugins/vcalendar/vcal_prefs.c:645 src/prefs_toolbar.c:939
+#: src/plugins/vcalendar/vcal_prefs.c:647 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4824,301 +4849,295 @@ msgstr "Verwijderen"
 msgid "Description"
 msgstr "Beschrijving"
 
-#: src/gtk/pluginwindow.c:373
-msgid "More plugins are available from the Claws Mail website."
-msgstr "Meer plugins zijn beschikbaar van de Claws Mail website."
-
-#: src/gtk/pluginwindow.c:379 src/prefs_themes.c:843
-msgid "Get more..."
-msgstr "Haal er meer..."
+#: src/gtk/pluginwindow.c:374
+#, c-format
+msgid ""
+"For more information about plugins see the <a href=\"%s\"><span underline="
+"\"none\">Claws Mail website</span></a>."
+msgstr ""
+"Voor meer informatie over plugins ga naar de <a href=\"%s\"><span underline="
+"\"none\">Claws Mail website</span></a>."
 
-#: src/gtk/pluginwindow.c:415
+#: src/gtk/pluginwindow.c:414
 msgid "Click here to load one or more plugins"
 msgstr "Klik hier om een of meerdere plugins te laden"
 
-#: src/gtk/pluginwindow.c:418
+#: src/gtk/pluginwindow.c:417
 msgid "Unload the selected plugin"
 msgstr "Ontlaad de geselecteerde plugins"
 
-#: src/gtk/pluginwindow.c:483
+#: src/gtk/pluginwindow.c:482
 msgid "Loaded plugins"
 msgstr "Plugins geladen"
 
-#: src/gtk/prefswindow.c:679
+#: src/gtk/prefswindow.c:671
 msgid "Page Index"
-msgstr "Pagina-inhoudsopgave"
+msgstr "Pagina Inhoudsopgave"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:829
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:828
 msgid "_Hide"
 msgstr "_Verberg"
 
 #: src/gtk/progressdialog.c:141 src/prefs_account.c:3200
 #: src/prefs_account.c:3218 src/prefs_account.c:3236 src/prefs_account.c:3254
 #: src/prefs_account.c:3272 src/prefs_account.c:3290 src/prefs_account.c:3309
-#: src/prefs_account.c:3391 src/prefs_filtering_action.c:1419
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1881
+#: src/prefs_account.c:3399 src/prefs_filtering_action.c:1421
+#: src/prefs_filtering.c:397 src/prefs_filtering.c:1877
 msgid "Account"
 msgstr "Account"
 
-#: src/gtk/quicksearch.c:433
+#: src/gtk/quicksearch.c:442
 msgid "all messages"
 msgstr "alle berichten"
 
-#: src/gtk/quicksearch.c:434
-#, fuzzy
+#: src/gtk/quicksearch.c:443
 msgid "messages whose age is greater than # days"
-msgstr "berichten die ouder zijn dan #"
+msgstr "berichten die ouder zijn dan # dagen"
 
-#: src/gtk/quicksearch.c:435
-#, fuzzy
+#: src/gtk/quicksearch.c:444
 msgid "messages whose age is less than # days"
-msgstr "berichten die jonger zijn dan #"
+msgstr "berichten die jonger zijn dan # dagen"
 
-#: src/gtk/quicksearch.c:436
-#, fuzzy
+#: src/gtk/quicksearch.c:445
 msgid "messages whose age is greater than # hours"
-msgstr "berichten die ouder zijn dan #"
+msgstr "berichten die ouder zijn dan # uur"
 
-#: src/gtk/quicksearch.c:437
-#, fuzzy
+#: src/gtk/quicksearch.c:446
 msgid "messages whose age is less than # hours"
-msgstr "berichten die jonger zijn dan #"
+msgstr "berichten die jonger zijn dan # uur"
 
-#: src/gtk/quicksearch.c:438
+#: src/gtk/quicksearch.c:447
 msgid "messages which contain S in the message body"
 msgstr "berichten waarvan de berichttekst S bevat"
 
-#: src/gtk/quicksearch.c:439
+#: src/gtk/quicksearch.c:448
 msgid "messages which contain S in the whole message"
 msgstr "berichten waarin S voorkomt (in berichttekst of headers)"
 
-#: src/gtk/quicksearch.c:440
+#: src/gtk/quicksearch.c:449
 msgid "messages carbon-copied to S"
 msgstr "berichten waarvan S een kopie (cc) onving"
 
-#: src/gtk/quicksearch.c:441
+#: src/gtk/quicksearch.c:450
 msgid "message is either to: or cc: to S"
 msgstr "berichten die S ontving (zowel to: als cc:)"
 
-#: src/gtk/quicksearch.c:442
+#: src/gtk/quicksearch.c:451
 msgid "deleted messages"
 msgstr "verwijderde berichten"
 
-#: src/gtk/quicksearch.c:443
+#: src/gtk/quicksearch.c:452
 msgid "messages which contain S in the Sender field"
 msgstr "berichten waarin S voorkomt in het veld 'Afzender'"
 
-#: src/gtk/quicksearch.c:444
+#: src/gtk/quicksearch.c:453
 msgid "true if execute \"S\" succeeds"
 msgstr "waar als de uitvoer van \"S\" succesvol is"
 
-#: src/gtk/quicksearch.c:445
+#: src/gtk/quicksearch.c:454
 msgid "messages originating from user S"
 msgstr "berichten die komen van gebruiker S"
 
-#: src/gtk/quicksearch.c:446
+#: src/gtk/quicksearch.c:455
 msgid "forwarded messages"
 msgstr "doorgestuurde berichten"
 
-#: src/gtk/quicksearch.c:447
-#, fuzzy
+#: src/gtk/quicksearch.c:456
 msgid "messages which have attachments"
-msgstr "berichten die getagged zijn"
+msgstr "berichten die bijvoegsels hebben"
 
-#: src/gtk/quicksearch.c:448
+#: src/gtk/quicksearch.c:457
 msgid "messages which contain header S"
 msgstr "berichten die header S bevatten"
 
-#: src/gtk/quicksearch.c:449
+#: src/gtk/quicksearch.c:458
 msgid "messages which contain S in Message-ID header"
 msgstr "berichten waarin S in de header 'Bericht-ID' voorkomt"
 
-#: src/gtk/quicksearch.c:450
+#: src/gtk/quicksearch.c:459
 msgid "messages which contain S in In-Reply-To header"
 msgstr "berichten waarin S in de header In-Reply-To voorkomt"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:460
 msgid "messages which are marked with color #"
 msgstr "berichten die zijn gemarkeerd met kleur #"
 
-#: src/gtk/quicksearch.c:452
+#: src/gtk/quicksearch.c:461
 msgid "locked messages"
 msgstr "berichten die opslot zitten"
 
-#: src/gtk/quicksearch.c:453
+#: src/gtk/quicksearch.c:462
 msgid "messages which are in newsgroup S"
 msgstr "berichten in newsgroup S"
 
-#: src/gtk/quicksearch.c:454
+#: src/gtk/quicksearch.c:463
 msgid "new messages"
 msgstr "nieuwe berichten"
 
-#: src/gtk/quicksearch.c:455
+#: src/gtk/quicksearch.c:464
 msgid "old messages"
 msgstr "oude berichten"
 
-#: src/gtk/quicksearch.c:456
+#: src/gtk/quicksearch.c:465
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "niet complete berichten (niet geheel opgehaald)"
 
-#: src/gtk/quicksearch.c:457
+#: src/gtk/quicksearch.c:466
 msgid "messages which have been replied to"
 msgstr "berichten die zijn beantwoord"
 
-#: src/gtk/quicksearch.c:458
+#: src/gtk/quicksearch.c:467
 msgid "read messages"
 msgstr "gelezen berichten"
 
-#: src/gtk/quicksearch.c:459
+#: src/gtk/quicksearch.c:468
 msgid "messages which contain S in subject"
 msgstr "berichten waarin S voorkomt in het onderwerp"
 
-#: src/gtk/quicksearch.c:460
-#, fuzzy
+#: src/gtk/quicksearch.c:469
 msgid "messages whose score is equal to # points"
-msgstr "berichten waarvan de score gelijk is aan #"
+msgstr "berichten waarvan de score gelijk is aan # punten"
 
-#: src/gtk/quicksearch.c:461
-#, fuzzy
+#: src/gtk/quicksearch.c:470
 msgid "messages whose score is greater than # points"
-msgstr "berichten waarvan de score hoger is dan #"
+msgstr "berichten waarvan de score hoger is dan # punten"
 
-#: src/gtk/quicksearch.c:462
-#, fuzzy
+#: src/gtk/quicksearch.c:471
 msgid "messages whose score is lower than # points"
-msgstr "berichten waarvan de score lager is dan #"
+msgstr "berichten waarvan de score lager is dan # punten"
 
-#: src/gtk/quicksearch.c:463
-#, fuzzy
+#: src/gtk/quicksearch.c:472
 msgid "messages whose size is equal to # bytes"
-msgstr "berichten met grootte gelijk is aan #"
+msgstr "berichten met grootte gelijk is aan # bytes"
 
-#: src/gtk/quicksearch.c:464
-#, fuzzy
+#: src/gtk/quicksearch.c:473
 msgid "messages whose size is greater than # bytes"
-msgstr "berichten die groter zijn dan #"
+msgstr "berichten die groter zijn dan # bytes"
 
-#: src/gtk/quicksearch.c:465
-#, fuzzy
+#: src/gtk/quicksearch.c:474
 msgid "messages whose size is smaller than # bytes"
-msgstr "berichten die kleiner zijn dan #"
+msgstr "berichten die kleiner zijn dan # bytes"
 
-#: src/gtk/quicksearch.c:466
+#: src/gtk/quicksearch.c:475
 msgid "messages which have been sent to S"
 msgstr "berichten die zijn gestuurd aan S"
 
-#: src/gtk/quicksearch.c:467
+#: src/gtk/quicksearch.c:476
 msgid "messages which tags contain S"
 msgstr "berichten die tags met S bevatten"
 
-#: src/gtk/quicksearch.c:468
+#: src/gtk/quicksearch.c:477
 msgid "messages which have tag(s)"
 msgstr "berichten die getagged zijn"
 
-#: src/gtk/quicksearch.c:469
+#: src/gtk/quicksearch.c:478
 msgid "marked messages"
 msgstr "gemarkeerde berichten"
 
-#: src/gtk/quicksearch.c:470
+#: src/gtk/quicksearch.c:479
 msgid "unread messages"
 msgstr "ongelezen berichten"
 
-#: src/gtk/quicksearch.c:471
+#: src/gtk/quicksearch.c:480
 msgid "messages which contain S in References header"
 msgstr "berichten waarin S in de header 'References' voorkomt"
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:481
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "berichten die 0 teruggeven als ze aan opdracht worden doorgegeven - %F is "
 "bestand met het bericht"
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:482
 msgid "messages which contain S in X-Label header"
 msgstr "berichten waarin S in de header 'X-label' voorkomt"
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:484
 msgid "logical AND operator"
 msgstr "logische EN operator"
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:485
 msgid "logical OR operator"
 msgstr "logische OF-operator"
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:486
 msgid "logical NOT operator"
 msgstr "logische NIET-operator"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:487
 msgid "case sensitive search"
 msgstr "hoofdlettergevoelig zoeken"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:488
 msgid "match using regular expressions instead of substring search"
 msgstr ""
+"Overeenkomsten zoeken met reguliere expressies in plaats van substring zoeken"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:490
 msgid "all filtering expressions are allowed"
 msgstr "alle filter-uitdrukkingen zijn toegestaan"
 
-#: src/gtk/quicksearch.c:490 src/summary_search.c:457
+#: src/gtk/quicksearch.c:499 src/summary_search.c:483
 msgid "Extended Search"
 msgstr "Uitgebreid Zoeken"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:500
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
 "The following symbols can be used:"
 msgstr ""
-"Met 'Uitgebreid Zoeken' kunt u criteria opstellen waaraan berichten moeten "
+"Met 'Uitgebreid Zoeken' kun je criteria opstellen waaraan berichten moeten "
 "voldoen alvorens ze zichtbaar worden in de berichtenlijst.\n"
 "De volgende speciale tekens kunnen worden gebruikt:"
 
-#: src/gtk/quicksearch.c:591
+#: src/gtk/quicksearch.c:600
 msgid "Something went wrong during search. Please check your logs."
-msgstr ""
+msgstr "Er ging iets mis tijdens het zoeken. Controleer de logs."
 
-#: src/gtk/quicksearch.c:657
+#: src/gtk/quicksearch.c:666
 msgid "From/To/Subject/Tag"
 msgstr "Van/Aan/Onderwerp/Vlag"
 
-#: src/gtk/quicksearch.c:668 src/plugins/archive/archiver_prefs.c:322
+#: src/gtk/quicksearch.c:677 src/plugins/archive/archiver_prefs.c:322
 msgid "Recursive"
 msgstr "Recursief"
 
-#: src/gtk/quicksearch.c:677
+#: src/gtk/quicksearch.c:686
 msgid "Sticky"
 msgstr "Plakkend"
 
-#: src/gtk/quicksearch.c:687
+#: src/gtk/quicksearch.c:696
 msgid "Type-ahead"
 msgstr "Aanvullen"
 
-#: src/gtk/quicksearch.c:699
+#: src/gtk/quicksearch.c:708
 msgid "Run on select"
 msgstr "Draai bij het selecteren"
 
-#: src/gtk/quicksearch.c:741
+#: src/gtk/quicksearch.c:750
 msgid "Clear the current search"
 msgstr "Wis de huidige zoekopdracht"
 
-#: src/gtk/quicksearch.c:751 src/summary_search.c:410
+#: src/gtk/quicksearch.c:760 src/summary_search.c:436
 msgid "Edit search criteria"
 msgstr "Bewerk zoekcriterie"
 
-#: src/gtk/quicksearch.c:760
+#: src/gtk/quicksearch.c:769
 msgid "Information about extended symbols"
 msgstr "Informatie over uitgebreide speciale tekens"
 
-#: src/gtk/quicksearch.c:798 src/gtk/quicksearch.c:813
-#, fuzzy
+#: src/gtk/quicksearch.c:807 src/gtk/quicksearch.c:822
 msgid "_Information"
-msgstr "Informatie"
+msgstr "_Informatie"
+
+#: src/gtk/quicksearch.c:808 src/gtk/quicksearch.c:823
+msgid "E_dit"
+msgstr "_Wijzigen"
 
-#: src/gtk/quicksearch.c:800 src/gtk/quicksearch.c:815
-#, fuzzy
+#: src/gtk/quicksearch.c:809 src/gtk/quicksearch.c:824 src/prefs_actions.c:347
+#: src/prefs_filtering.c:495 src/prefs_template.c:328
 msgid "C_lear"
 msgstr "Leeg _Log"
 
@@ -5172,15 +5191,18 @@ msgid ""
 "You may be connecting to a rogue server.\n"
 "\n"
 msgstr ""
+"Certificaat is voor %s, maar de verbinding is met %s.\n"
+"Mogelijk verbind je met een onbetrouwbare server.\n"
+"\n"
 
 #: src/gtk/sslcertwindow.c:338
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
 "%sDo you want to accept it?"
 msgstr ""
 "Certificaat voor %s is onbekend.\n"
-"Wilt u het accepteren?"
+"%sWil je het accepteren?"
 
 #: src/gtk/sslcertwindow.c:350 src/gtk/sslcertwindow.c:400
 #: src/gtk/sslcertwindow.c:464
@@ -5193,14 +5215,12 @@ msgid "_View certificate"
 msgstr "_Bekijk certificaat"
 
 #: src/gtk/sslcertwindow.c:364
-#, fuzzy
 msgid "SSL certificate is invalid"
-msgstr "SSL-cer_tificaten"
+msgstr "Certificaten is ongeldig"
 
 #: src/gtk/sslcertwindow.c:366
-#, fuzzy
 msgid "SSL certificate is unknown"
-msgstr "SSL-cer_tificaten"
+msgstr "SSL certificaat is onbekend"
 
 #: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:419
 #: src/gtk/sslcertwindow.c:481
@@ -5212,22 +5232,21 @@ msgid "_Accept and save"
 msgstr "_Accepteer en sla op"
 
 #: src/gtk/sslcertwindow.c:387
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Certificate for %s is expired.\n"
 "%sDo you want to continue?"
 msgstr ""
 "Certificaat voor %s is verlopen.\n"
-"Wilt u het accepteren?"
+"%sWil je doorgaan?"
 
 #: src/gtk/sslcertwindow.c:414
 msgid "SSL certificate is invalid and expired"
-msgstr ""
+msgstr "SSL certificaat is ongeldig en verlopen"
 
 #: src/gtk/sslcertwindow.c:416
-#, fuzzy
 msgid "SSL certificate is expired"
-msgstr "SSL-cer_tificaten"
+msgstr "SSL certificaat is verlopen"
 
 #: src/gtk/sslcertwindow.c:419
 msgid "_Accept"
@@ -5242,25 +5261,25 @@ msgid "Known certificate:"
 msgstr "Bekend certificaat:"
 
 #: src/gtk/sslcertwindow.c:451
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Certificate for %s has changed.\n"
 "%sDo you want to accept it?"
-msgstr "Certificaat voor %s is veranderd. Wilt u het accepteren?"
+msgstr ""
+"Certificaat voor %s is veranderd.\n"
+"%sWil je het accepteren?"
 
 #: src/gtk/sslcertwindow.c:472
 msgid "_View certificates"
 msgstr "_Bekijk certificaten"
 
 #: src/gtk/sslcertwindow.c:477
-#, fuzzy
 msgid "SSL certificate changed and is invalid"
-msgstr "SSL-certificaat voor %s"
+msgstr "SSL certificaat is veranderd en ongeldig"
 
 #: src/gtk/sslcertwindow.c:479
-#, fuzzy
 msgid "SSL certificate changed"
-msgstr "SSL-cer_tificaten"
+msgstr "SSL certificaat is veranderd"
 
 #: src/headerview.c:107
 msgid "Tags:"
@@ -5268,15 +5287,15 @@ msgstr "Tags:"
 
 #: src/headerview.c:216 src/plugins/notification/notification_popup.c:316
 #: src/plugins/notification/notification_popup.c:621
-#: src/plugins/notification/notification_trayicon.c:854 src/summaryview.c:3342
-#: src/summaryview.c:3359 src/summaryview.c:3380
+#: src/plugins/notification/notification_trayicon.c:854 src/summaryview.c:3344
+#: src/summaryview.c:3361 src/summaryview.c:3382
 msgid "(No From)"
 msgstr "(Geen afzender)"
 
 #: src/headerview.c:231 src/plugins/notification/notification_popup.c:318
 #: src/plugins/notification/notification_popup.c:625
-#: src/plugins/notification/notification_trayicon.c:857 src/summaryview.c:3393
-#: src/summaryview.c:3397
+#: src/plugins/notification/notification_trayicon.c:857 src/summaryview.c:3395
+#: src/summaryview.c:3399
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
@@ -5284,7 +5303,7 @@ msgstr "(Geen onderwerp)"
 msgid "Error:"
 msgstr "Fout:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2555
+#: src/image_viewer.c:299 src/mimeview.c:2546
 #: src/plugins/pdf_viewer/poppler_viewer.c:700
 msgid "Filename:"
 msgstr "Bestandsnaam:"
@@ -5564,16 +5583,16 @@ msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "IMAP4 verbinding naar %s is verbroken. Contact wordt opnieuw gelegd...\n"
 
-#: src/imap.c:992 src/imap.c:3539 src/imap.c:4199 src/imap.c:4296
-#: src/imap.c:4479 src/imap.c:5276
+#: src/imap.c:992 src/imap.c:3546 src/imap.c:4206 src/imap.c:4303
+#: src/imap.c:4486 src/imap.c:5283
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail heeft netwerktoegang nodig voor toegang tot de IMAP-server."
 
-#: src/imap.c:1086 src/inc.c:816 src/news.c:394 src/send_message.c:305
+#: src/imap.c:1086 src/inc.c:802 src/news.c:388 src/send_message.c:269
 msgid "Insecure connection"
 msgstr "Onveilige verbinding"
 
-#: src/imap.c:1087 src/inc.c:817 src/news.c:395 src/send_message.c:306
+#: src/imap.c:1087 src/inc.c:803 src/news.c:389 src/send_message.c:270
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5584,17 +5603,17 @@ msgstr ""
 "Deze verbinding is geconfigureerd om beveiligd te worden met SSL, maar SSL "
 "is niet beschikbaar in deze 'build' van Claws Mail. \n"
 "\n"
-"Wilt u de verbinding met deze server toch maken? De communicatie wordt dan "
-"niet beveiligd."
+"Wil je de verbinding met deze server toch maken? De communicatie is dan niet "
+"beveiligd."
 
-#: src/imap.c:1093 src/inc.c:823 src/news.c:401 src/send_message.c:312
+#: src/imap.c:1093 src/inc.c:809 src/news.c:395 src/send_message.c:276
 msgid "Con_tinue connecting"
 msgstr "Verbinding _hervatten"
 
 #: src/imap.c:1103
-#, fuzzy, c-format
+#, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
-msgstr "Verbinding met IMAP4-server wordt gemaakt: %s ..."
+msgstr "Account '%s': Verbinden met IMAP4-server: %s:%d..."
 
 #: src/imap.c:1151
 #, c-format
@@ -5606,89 +5625,89 @@ msgstr "Kan geen verbinding maken met de IMAP4-server: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan geen verbinding maken met de IMAP4-server: %s:%d\n"
 
-#: src/imap.c:1187 src/imap.c:3961
+#: src/imap.c:1187 src/imap.c:3968
 msgid "Can't start TLS session.\n"
 msgstr "Kan TLS sessie niet tot stand brengen.\n"
 
-#: src/imap.c:1243
+#: src/imap.c:1250
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kon niet inloggen op IMAP-server %s.\n"
 
-#: src/imap.c:1246
+#: src/imap.c:1253
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kon niet inloggen op IMAP-server %s."
 
-#: src/imap.c:1640
+#: src/imap.c:1647
 msgid "Adding messages..."
 msgstr "Berichten worden toegevoegd..."
 
-#: src/imap.c:1842 src/mh.c:520
+#: src/imap.c:1849 src/mh.c:520
 msgid "Copying messages..."
 msgstr "Berichten worden gekopieerd..."
 
-#: src/imap.c:2421
+#: src/imap.c:2428
 msgid "can't set deleted flags\n"
 msgstr "kan \"verwijderd\" vlaggen niet instellen\n"
 
-#: src/imap.c:2428 src/imap.c:4906
+#: src/imap.c:2435 src/imap.c:4913
 msgid "can't expunge\n"
 msgstr "kan niet wissen\n"
 
-#: src/imap.c:2779
+#: src/imap.c:2786
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Zoeken naar niet-geabonneerde mappen in %s..."
 
-#: src/imap.c:2782
+#: src/imap.c:2789
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Zoeken naar submappen van %s..."
 
-#: src/imap.c:3078
+#: src/imap.c:3085
 msgid "can't create mailbox: LIST failed\n"
 msgstr "LIST mislukt; kan postvak niet aanmaken\n"
 
-#: src/imap.c:3093
+#: src/imap.c:3100
 msgid "can't create mailbox\n"
 msgstr "kan postvak niet aanmaken\n"
 
-#: src/imap.c:3184
+#: src/imap.c:3191
 msgid "New folder name must not contain the namespace path separator"
 msgstr "Een nieuwe mapnaam mag geen 'namespace path separator' bevatten"
 
-#: src/imap.c:3221
+#: src/imap.c:3228
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan postvak niet hernoemen: %s naar %s\n"
 
-#: src/imap.c:3333
+#: src/imap.c:3340
 msgid "can't delete mailbox\n"
 msgstr "kan postvak niet verwijderen\n"
 
-#: src/imap.c:3620
+#: src/imap.c:3627
 msgid "LIST failed\n"
 msgstr "LIST mislukt\n"
 
-#: src/imap.c:3705
+#: src/imap.c:3712
 msgid "Flagging messages..."
 msgstr "Berichten afvlaggen..."
 
-#: src/imap.c:3806
+#: src/imap.c:3813
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: src/imap.c:3958
+#: src/imap.c:3965
 msgid "Server requires TLS to log in.\n"
 msgstr "Server vereist TLS om in te loggen.\n"
 
-#: src/imap.c:3968
+#: src/imap.c:3975
 msgid "Can't refresh capabilities.\n"
 msgstr "Kan 'capabilities' niet verversen.\n"
 
-#: src/imap.c:3973
+#: src/imap.c:3980
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5697,20 +5716,20 @@ msgstr ""
 "Verbinden me %s mislukt: de server vereist TLS, maar Claws Mail is niet "
 "vertaald met OpenSSL-ondersteuning.\n"
 
-#: src/imap.c:3981
+#: src/imap.c:3988
 msgid "Server logins are disabled.\n"
 msgstr "Inloggen op servers staat uit.\n"
 
-#: src/imap.c:4204
+#: src/imap.c:4211
 msgid "Fetching message..."
 msgstr "Berichten worden opgehaald..."
 
-#: src/imap.c:4899
+#: src/imap.c:4906
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan \"verwijderd\" vlaggen: %d niet instellen\n"
 
-#: src/imap.c:5932
+#: src/imap.c:5939
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -5718,11 +5737,11 @@ msgid ""
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
-"U heeft een of meer IMAP-accounts ingesteld. Deze versie van Claws Mail is "
-"echter gebouwd zonder IMAP-ondersteuning; uw IMAP-account(s) werken dus "
+"Je hebt een of meer IMAP-accounts ingesteld. Deze versie van Claws Mail is "
+"echter gebouwd zonder IMAP-ondersteuning; je IMAP-account(s) werken dus "
 "niet.\n"
 "\n"
-"U dient waarschijnlijk libetpan te installeren en Claws Mail opnieuw te "
+"Je dient waarschijnlijk libetpan te installeren en Claws Mail opnieuw te "
 "compileren."
 
 #: src/imap_gtk.c:63 src/mh_gtk.c:55 src/plugins/mailmbox/plugin_gtk.c:59
@@ -5799,27 +5818,21 @@ msgid "Inherit properties from parent folder"
 msgstr "Neem eigenschappen over van bovenliggende map"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:249 src/news_gtk.c:305
-#: src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/vcalendar/vcal_folder.c:2017
+#: src/plugins/mailmbox/plugin_gtk.c:405 src/plugins/rssyl/rssyl_cb_menu.c:333
+#: src/plugins/vcalendar/vcal_folder.c:2018
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
-#: src/imap_gtk.c:263 src/mh_gtk.c:251 src/plugins/mailmbox/plugin_gtk.c:409
+#: src/imap_gtk.c:263 src/mh_gtk.c:251 src/plugins/mailmbox/plugin_gtk.c:406
 #: src/plugins/rssyl/rssyl_cb_menu.c:334
-#: src/plugins/vcalendar/vcal_folder.c:2018
+#: src/plugins/vcalendar/vcal_folder.c:2019
 msgid "Rename folder"
 msgstr "Hernoem map"
 
-#: src/imap_gtk.c:277 src/plugins/mailmbox/plugin_gtk.c:249
-#: src/plugins/mailmbox/plugin_gtk.c:419
-#, c-format
-msgid "`%c' can't be included in folder name."
-msgstr "'%c' mag niet in de naam van een map voorkomen."
-
 #: src/imap_gtk.c:292 src/mh_gtk.c:274 src/news_gtk.c:327
-#: src/plugins/mailmbox/plugin_gtk.c:438 src/plugins/rssyl/rssyl_cb_menu.c:354
-#: src/plugins/vcalendar/vcal_folder.c:2038
+#: src/plugins/mailmbox/plugin_gtk.c:433 src/plugins/rssyl/rssyl_cb_menu.c:354
+#: src/plugins/vcalendar/vcal_folder.c:2039
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -5837,11 +5850,11 @@ msgid ""
 msgstr ""
 "Alle mappen en berichten in '%s' zullen worden verwijderd. Terughalen is "
 "niet mogelijk.\n"
-"Wilt u werkelijk verwijderen?"
+"Wil je werkelijk verwijderen?"
 
 #: src/imap_gtk.c:381 src/mh_gtk.c:220 src/news_gtk.c:280
-#: src/plugins/rssyl/rssyl_cb_menu.c:256
-#: src/plugins/vcalendar/vcal_folder.c:1974
+#: src/plugins/mailmbox/plugin_gtk.c:341 src/plugins/rssyl/rssyl_cb_menu.c:256
+#: src/plugins/vcalendar/vcal_folder.c:1972
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan map '%s' niet verwijderen."
@@ -5849,7 +5862,7 @@ msgstr "Kan map '%s' niet verwijderen."
 #: src/imap_gtk.c:507
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
-msgstr "Wilt u zoeken naar niet-ingeschreven submappen van '%s'?"
+msgstr "Wil je zoeken naar niet-ingeschreven submappen van '%s'?"
 
 #: src/imap_gtk.c:510
 msgid "Search recursively"
@@ -5868,7 +5881,7 @@ msgstr "+_Zoek"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Kies een submap van %s om op te abonneren: "
 
-#: src/imap_gtk.c:537 src/mainwindow.c:671
+#: src/imap_gtk.c:537 src/mainwindow.c:672
 msgid "Subscribe"
 msgstr "Abonneren"
 
@@ -5883,15 +5896,15 @@ msgid ""
 "If there are new folders, created and subscribed to from another client, use "
 "\"Check for new folders\" at the mailbox's root folder."
 msgstr ""
-"Deze map bent u al op geabonneerd en heeft geen niet-geabonneerde mappen.\n"
+"Deze map ben je al op geabonneerd en heeft geen niet-geabonneerde mappen.\n"
 "\n"
 "Als er nieuwe mappen zijn, gemaakt met een ander programma, gebruik "
-"\"Controleer op nieuwe mappen\" op het postvaks hoofdmap."
+"\"Controleer op nieuwe mappen\" op de postvaks hoofdmap."
 
 #: src/imap_gtk.c:566
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
-msgstr "Wilt u '%s' toepassen op de %s map?"
+msgstr "Wil je '%s' toepassen op de %s map?"
 
 #: src/imap_gtk.c:567
 msgid "subscribe"
@@ -6033,7 +6046,7 @@ msgstr ""
 "\"kolom), zullen automatisch worden geïmporteerd en kunnen niet worden "
 "hernoemd. Een enkele klik in de selecteer-kolom (\"S\") of een dubbele klik "
 "ergens anders in de rij, zal die rij selecteren voor importeren. Een enkele "
-"klik ergens in de rij selecteert de rij voor hernoemen en brengt u in het "
+"klik ergens in de rij selecteert de rij voor hernoemen en brengt je in het "
 "hernoem gedeelte onderin het scherm."
 
 #: src/importldif.c:822
@@ -6098,141 +6111,141 @@ msgstr "Selecteer Pine-bestand"
 msgid "Import Pine file into Address Book"
 msgstr "Importeren Pine-bestand in adressenboek"
 
-#: src/inc.c:205 src/inc.c:312 src/inc.c:339
+#: src/inc.c:186 src/inc.c:293 src/inc.c:320
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail heeft netwerktoegang nodig voor het onvangen van e-mail."
 
-#: src/inc.c:361
+#: src/inc.c:342
 #, c-format
 msgid "%s failed\n"
 msgstr "%s mislukt\n"
 
-#: src/inc.c:432
+#: src/inc.c:413
 msgid "Retrieving new messages"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:493
+#: src/inc.c:474
 msgid "Standby"
 msgstr "Een ogenblik geduld alstublieft"
 
-#: src/inc.c:618 src/inc.c:672
+#: src/inc.c:604 src/inc.c:658
 msgid "Cancelled"
 msgstr "Afgebroken"
 
-#: src/inc.c:629
+#: src/inc.c:615
 msgid "Retrieving"
 msgstr "Bezig met ophalen"
 
-#: src/inc.c:638
+#: src/inc.c:624
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Klaar (%d bericht (%s) ontvangen)"
 msgstr[1] "Klaar (%d berichten (%s) ontvangen)"
 
-#: src/inc.c:644
+#: src/inc.c:630
 msgid "Done (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:649
+#: src/inc.c:635
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:652
+#: src/inc.c:638
 msgid "Auth failed"
 msgstr "Authenticatie mislukt"
 
-#: src/inc.c:659 src/prefs_matcher.c:393 src/prefs_summary_column.c:88
-#: src/summaryview.c:2782 src/summaryview.c:6319
+#: src/inc.c:645 src/prefs_matcher.c:393 src/prefs_summary_column.c:88
+#: src/summaryview.c:2782 src/summaryview.c:6308
 msgid "Locked"
 msgstr "Beveiligd"
 
-#: src/inc.c:669 src/plugins/spamassassin/spamassassin_gtk.c:378
+#: src/inc.c:655 src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Timeout"
 msgstr "Wachttijd"
 
-#: src/inc.c:756
+#: src/inc.c:742
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Klaar (%d nieuw bericht)"
-msgstr[1] "KLaar (%d nieuwe berichten)"
+msgstr[1] "Klaar (%d nieuwe berichten)"
 
-#: src/inc.c:760
+#: src/inc.c:746
 msgid "Finished (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:799
+#: src/inc.c:785
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:832
-#, fuzzy, c-format
+#: src/inc.c:818
+#, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
-msgstr "Verbinden met POP3-server: %s ..."
+msgstr "Account '%s': Verbinden met POP3-server: %s:%d..."
 
-#: src/inc.c:850
+#: src/inc.c:836
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Kan geen verbinding maken met POP3 server: %s:%d"
 
-#: src/inc.c:854
+#: src/inc.c:840
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan geen verbinding maken met POP3 server: %s:%d\n"
 
-#: src/inc.c:934 src/send_message.c:475
+#: src/inc.c:920 src/send_message.c:486
 msgid "Authenticating..."
 msgstr "Authenticatie..."
 
-#: src/inc.c:936
+#: src/inc.c:922
 #, c-format
-msgid "Retrieving messages from %s (%s) ..."
-msgstr "Berichten worden opgehaald van %s (%s) ..."
+msgid "Retrieving messages from %s (%s)..."
+msgstr "Berichten ophalen van %s (%s)..."
 
-#: src/inc.c:942
+#: src/inc.c:928
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/inc.c:946
+#: src/inc.c:932
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Opvragen van het aantal nieuwe berichten (LAST)..."
 
-#: src/inc.c:950
+#: src/inc.c:936
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
 
-#: src/inc.c:954
+#: src/inc.c:940
 msgid "Getting the size of messages (LIST)..."
 msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:493
+#: src/inc.c:947 src/send_message.c:504
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
-#: src/inc.c:986
+#: src/inc.c:972
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 
-#: src/inc.c:999
+#: src/inc.c:985
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Bezig met ophalen (%d bericht (%s) ontvangen)"
 msgstr[1] "Bezig met ophalen (%d berichten (%s) ontvangen)"
 
-#: src/inc.c:1158
+#: src/inc.c:1144
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Verbinding maken met %s:%d mislukt."
 
-#: src/inc.c:1163
+#: src/inc.c:1149
 msgid "Error occurred while processing mail."
 msgstr "Fout bij het verwerken van de e-mail."
 
-#: src/inc.c:1169
+#: src/inc.c:1155
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6241,37 +6254,37 @@ msgstr ""
 "Fout bij het verwerken van e-mail:\n"
 "%s"
 
-#: src/inc.c:1175
+#: src/inc.c:1161
 msgid "No disk space left."
 msgstr "De schijf is vol."
 
-#: src/inc.c:1180
+#: src/inc.c:1166
 msgid "Can't write file."
 msgstr "Het bestand is niet beschrijfbaar."
 
-#: src/inc.c:1185
+#: src/inc.c:1171
 msgid "Socket error."
 msgstr "Socket-fout."
 
-#: src/inc.c:1188
+#: src/inc.c:1174
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Socket-fout bij verbinding met %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:403 src/send_message.c:667
+#: src/inc.c:1179 src/send_message.c:414 src/send_message.c:678
 msgid "Connection closed by the remote host."
-msgstr "Verbinding gesloten door de andere kant."
+msgstr "Verbinding gesloten door de server."
 
-#: src/inc.c:1196
+#: src/inc.c:1182
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Verbinding met %s:%d gesloten door de server."
 
-#: src/inc.c:1201
+#: src/inc.c:1187
 msgid "Mailbox is locked."
 msgstr "Postvak zit op slot."
 
-#: src/inc.c:1205
+#: src/inc.c:1191
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6280,11 +6293,11 @@ msgstr ""
 "Postvak zit op slot:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:652
+#: src/inc.c:1197 src/send_message.c:663
 msgid "Authentication failed."
 msgstr "Authenticatie mislukt."
 
-#: src/inc.c:1217 src/send_message.c:655
+#: src/inc.c:1203 src/send_message.c:666
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6293,45 +6306,34 @@ msgstr ""
 "Authenticatie mislukt:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:671
+#: src/inc.c:1208 src/send_message.c:682
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
 msgstr ""
-"Sessie verlopen. Mogelijk kunt u herstellen door de tijdslimiet te verhogen "
+"Sessie verlopen. Mogelijk kun je herstellen door de tijdslimiet te verhogen "
 "in Voorkeuren/Diversen/Overige."
 
-#: src/inc.c:1227
+#: src/inc.c:1213
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Verbinding met %s:%d niet binnen tijdslimiet tot stand gekomen."
 
-#: src/inc.c:1265
+#: src/inc.c:1251
 msgid "Incorporation cancelled\n"
 msgstr "Het inbedden is afgelast\n"
 
-#: src/inc.c:1457
-#, c-format
-msgid "Claws Mail: %d new message"
-msgid_plural "Claws Mail: %d new messages"
-msgstr[0] "Claws Mail: %d nieuw bericht"
-msgstr[1] "Claws Mail: %d nieuwe berichten"
-
-#: src/inc.c:1584
-msgid "Unable to connect: you are offline."
-msgstr "Onmogelijk te verbinden: u bent offline."
-
-#: src/inc.c:1610
+#: src/inc.c:1518
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
-msgstr "%s%sU bent nu offline; toch doorgaan gedurende %d minuten?"
+msgstr "%s%sJe bent nu offline; toch doorgaan gedurende %d minuten?"
 
-#: src/inc.c:1616
+#: src/inc.c:1524
 #, c-format
 msgid "%s%sYou're working offline. Override?"
-msgstr "%s%sU bent momenteel niet online.  Toch doorgaan?"
+msgstr "%s%sJe bent momenteel niet online. Toch doorgaan?"
 
-#: src/inc.c:1623
+#: src/inc.c:1531
 msgid "On_ly once"
 msgstr "_Eenmalig"
 
@@ -6339,7 +6341,7 @@ msgstr "_Eenmalig"
 msgid "Nick Name"
 msgstr "Bijnaam"
 
-#: src/main.c:271
+#: src/main.c:241
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6348,20 +6350,16 @@ msgstr ""
 "Bestand '%s' bestaat al.\n"
 "Kan geen map aanmaken."
 
-#: src/main.c:293 src/main.c:306
-msgid "Exiting..."
-msgstr "Bezig met sluiten..."
-
-#: src/main.c:437
+#: src/main.c:362
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
 "Do you want to migrate this configuration?"
 msgstr ""
 "Er is een configuratiebestand %s gevonden.\n"
-"Wilt u dit configuratiebestand overzetten?"
+"Wil je dit configuratiebestand overzetten?"
 
-#: src/main.c:439
+#: src/main.c:364
 #, c-format
 msgid ""
 "\n"
@@ -6371,64 +6369,64 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Uw Sylpheed filterregels kunnen omgezet worden door\n"
+"Je Sylpheed filterregels kunnen omgezet worden door\n"
 "een script beschikbaar op %s."
 
-#: src/main.c:451
+#: src/main.c:376
 msgid "Keep old configuration"
 msgstr "Oude configuratie behouden"
 
-#: src/main.c:454
+#: src/main.c:379
 msgid ""
 "Keeping a backup will allow you to go back to an older version, but may take "
 "a while if you have cached IMAP or News data, and will take some extra room "
 "on your disk."
 msgstr ""
 "Een backup bewaren maakt het mogelijk terug te gaan naar een oudere versie, "
-"maar kan even duren als u veel IMAP of Nieuws data gecached heeft, en zal "
-"wat extra disk-ruimte gebruiken."
+"maar kan even duren als je veel IMAP of Nieuws data gecached hebt, en zal "
+"wat extra schijfruimte gebruiken."
 
-#: src/main.c:462
+#: src/main.c:387
 msgid "Migration of configuration"
 msgstr "Configuratiebestand overzetten"
 
-#: src/main.c:473
+#: src/main.c:398
 msgid "Copying configuration... This may take a while..."
 msgstr "Configuratiebestand wordt gekopiëerd... Dit kan even duren..."
 
-#: src/main.c:482
+#: src/main.c:407
 msgid "Migration failed!"
 msgstr "Overzetten mislukt"
 
-#: src/main.c:491
+#: src/main.c:416
 msgid "Migrating configuration..."
 msgstr "Configuratiebestand overzetten..."
 
-#: src/main.c:1038
+#: src/main.c:934
 msgid "Failed to register folder item update hook"
 msgstr "Registreren van map-item-bijwerk-haak mislukt"
 
-#: src/main.c:1045
+#: src/main.c:941
 msgid "Failed to register folder update hook"
 msgstr "Registreren van map-bijwerk-haak mislukt"
 
-#: src/main.c:1224
+#: src/main.c:1110
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread niet ondersteund door glib.\n"
 
-#: src/main.c:1243
+#: src/main.c:1129
 msgid "Sylpheed-Claws 2.6.0 (or older)"
 msgstr "Sylpheed-Claws 2.6.0 (of ouder)"
 
-#: src/main.c:1246
+#: src/main.c:1132
 msgid "Sylpheed-Claws 1.9.15 (or older)"
 msgstr "Sylpheed-Claws 1.9.15 (of ouder)"
 
-#: src/main.c:1249
+#: src/main.c:1135
 msgid "Sylpheed-Claws 1.0.5 (or older)"
 msgstr "Sylpheed-Claws 1.0.5 (of ouder)"
 
-#: src/main.c:1572
+#: src/main.c:1434
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6447,7 +6445,7 @@ msgstr[1] ""
 "instellingen voor meer informatie:\n"
 "%s"
 
-#: src/main.c:1600
+#: src/main.c:1462
 msgid ""
 "Claws Mail has detected a configured mailbox, but it is incomplete. It is "
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
@@ -6457,7 +6455,7 @@ msgstr ""
 "incompleet. Dit komt waarschijnlijk door een IMAP-account dat niet werkt. "
 "Gebruik \"Ververs mappenboom\"op deze map om dit proberen te repareren."
 
-#: src/main.c:1606
+#: src/main.c:1468
 msgid ""
 "Claws Mail has detected a configured mailbox, but could not load it. It is "
 "probably provided by an out-of-date external plugin. Please reinstall the "
@@ -6467,43 +6465,36 @@ msgstr ""
 "laden. Het postvak komt waarschijnlijk van een oude en externe plugin. "
 "Herinstalleer alstublieft deze plugin en probeer het nogmaals."
 
-#: src/main.c:1635
-#, c-format
-msgid "Claws Mail can not start without its data volume (%s)."
-msgstr "Claws Mail kan niet starten zonder zijn data volume (%s)."
-
-#: src/main.c:1882
+#: src/main.c:1711
 msgid "Missing filename\n"
-msgstr ""
+msgstr "Bestandsnaam mist\n"
 
-#: src/main.c:1889
+#: src/main.c:1718
 msgid "Cannot open filename for reading\n"
-msgstr ""
+msgstr "Kan bestandsnaam niet openen om te lezen\n"
 
-#: src/main.c:1900
-#, fuzzy
+#: src/main.c:1729
 msgid "Malformed header\n"
-msgstr "Verwijder header"
+msgstr "Vervormde header\n"
 
-#: src/main.c:1907
+#: src/main.c:1736
 msgid "Duplicated 'To:' header\n"
-msgstr ""
+msgstr "Gedupliceerde 'Aan' header\n"
 
-#: src/main.c:1922
-#, fuzzy
+#: src/main.c:1751
 msgid "Missing required 'To:' header\n"
-msgstr "Benodigde informatie mist"
+msgstr "Benodigde header 'Aan:' mist\n"
 
-#: src/main.c:2067
+#: src/main.c:1898
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Gebruik: %s [OPTIES]...\n"
 
-#: src/main.c:2069
+#: src/main.c:1900
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      open venster \"Bericht opstellen\""
 
-#: src/main.c:2070
+#: src/main.c:1901
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6513,12 +6504,21 @@ msgid ""
 "an\n"
 "                         empty line, then mail body until end of file."
 msgstr ""
-
-#: src/main.c:2075
+"  --compose-from-file bestand\n"
+"                         open schrijfvenster met gegevens van opgegeven "
+"bestand;\n"
+"                         gebruik - als bestandsnaam voor lezen van standaard "
+"invoer;\n"
+"                         inhoud formaat: headers eerst (Aan: verplicht) tot "
+"een\n"
+"                         lege regel, daarna de e-mail inhoud tot het einde "
+"van het bestand."
+
+#: src/main.c:1906
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      abonneer indien mogelijk op gegeven URI"
 
-#: src/main.c:2076
+#: src/main.c:1907
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6529,25 +6529,23 @@ msgstr ""
 "bestanden\n"
 "                         toegevoegd"
 
-#: src/main.c:2079
+#: src/main.c:1910
 msgid "  --receive              receive new messages"
 msgstr "  --receive              haal nieuwe berichten op"
 
-#: src/main.c:2080
+#: src/main.c:1911
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          berichten ophalen van alle accounts"
 
-#: src/main.c:2081
-#, fuzzy
+#: src/main.c:1912
 msgid "  --cancel-receiving     cancel receiving of messages"
-msgstr "  --receive              haal nieuwe berichten op"
+msgstr "  --cancel-receiving     annuleer het ophalen van berichten"
 
-#: src/main.c:2082
-#, fuzzy
+#: src/main.c:1913
 msgid "  --cancel-sending       cancel sending of messages"
-msgstr "  --receive              haal nieuwe berichten op"
+msgstr "  --cancel-sending       annuleer verzenden van berichten"
 
-#: src/main.c:2083
+#: src/main.c:1914
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6558,15 +6556,15 @@ msgid ""
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr ""
 
-#: src/main.c:2090
+#: src/main.c:1921
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 verzend alle berichten in de wachtrij"
 
-#: src/main.c:2091
+#: src/main.c:1922
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [map]...      weergeven totaal aantal berichten"
 
-#: src/main.c:2092
+#: src/main.c:1923
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6574,15 +6572,15 @@ msgstr ""
 "  --status-full [map]...\n"
 "                         weergeven status van mappen"
 
-#: src/main.c:2094
+#: src/main.c:1925
 msgid "  --statistics           show session statistics"
-msgstr ""
+msgstr "  --statistics           toon statistieken van de sessie"
 
-#: src/main.c:2095
+#: src/main.c:1926
 msgid "  --reset-statistics     reset session statistics"
-msgstr ""
+msgstr "  --reset-statistics     sessie statistieken terugzetten"
 
-#: src/main.c:2096
+#: src/main.c:1927
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6590,31 +6588,35 @@ msgstr ""
 "  --select folder[/msg]  ga naar opgegeven map/bericht\n"
 "                         map is een map-ID zoals 'map/submap'"
 
-#: src/main.c:2098
+#: src/main.c:1929
 msgid "  --online               switch to online mode"
 msgstr "  --online               schakel over naar online-modus"
 
-#: src/main.c:2099
+#: src/main.c:1930
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              schakel over naar offline-modus"
 
-#: src/main.c:2100
+#: src/main.c:1931
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       sluit Claws Mail af"
 
-#: src/main.c:2101
+#: src/main.c:1932
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug modus"
 
-#: src/main.c:2102
+#: src/main.c:1933
+msgid "  --toggle-debug         toggle debug mode"
+msgstr "  --toggle-debug         debug modus aan of uit zetten"
+
+#: src/main.c:1934
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              geef deze hulp weer"
 
-#: src/main.c:2103
+#: src/main.c:1935
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           geef versie informatie en sluit af"
 
-#: src/main.c:2104
+#: src/main.c:1936
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6622,11 +6624,11 @@ msgstr ""
 "  --version-full -V      geef versie informatie en ingebouwde mogelijkheden "
 "en sluit af"
 
-#: src/main.c:2105
+#: src/main.c:1937
 msgid "  --config-dir           output configuration directory"
-msgstr "  --config-dir            print configuratiemap"
+msgstr "  --config-dir           print configuratiemap"
 
-#: src/main.c:2106
+#: src/main.c:1938
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6634,668 +6636,647 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                         gebruik opgegeven configuratiemap"
 
-#: src/main.c:2156
+#: src/main.c:1988
 msgid "Unknown option\n"
 msgstr "Onbekende optie\n"
 
-#: src/main.c:2174
+#: src/main.c:2006
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Verwerken (%s)..."
 
-#: src/main.c:2177
+#: src/main.c:2009
 msgid "top level folder"
 msgstr "map op hoogste niveaux"
 
-#: src/main.c:2260
+#: src/main.c:2092
 msgid "Queued messages"
 msgstr "Berichten zijn in de wachtrij gezet"
 
-#: src/main.c:2261
+#: src/main.c:2093
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Er staan nog berichten in de wachtrij. Toch afsluiten?"
 
-#: src/main.c:2990
+#: src/main.c:2818
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: netwerk is beschikbaar.\n"
 
-#: src/main.c:2996
+#: src/main.c:2824
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: netwerk is niet beschikbaar.\n"
 
-#: src/mainwindow.c:502 src/messageview.c:210
+#: src/mainwindow.c:503 src/messageview.c:208
 msgid "_File"
 msgstr "_Bestand"
 
-#: src/mainwindow.c:504 src/messageview.c:212 src/summaryview.c:436
+#: src/mainwindow.c:505 src/messageview.c:210 src/summaryview.c:436
 msgid "_View"
 msgstr "Beel_d"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:508
 msgid "_Configuration"
 msgstr "_Instellingen"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:512
 msgid "_Add mailbox"
 msgstr "_Postvak toevoegen"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:513
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:515
-#, fuzzy
+#: src/mainwindow.c:516
 msgid "Change mailbox order..."
-msgstr "_Verander mapvolgorde..."
+msgstr "Verander postvak volgorde..."
 
-#: src/mainwindow.c:518
+#: src/mainwindow.c:519
 msgid "_Import mbox file..."
 msgstr "_Importeer mbox-bestand"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:520
 msgid "_Export to mbox file..."
 msgstr "_Exporteer naar mbox-bestand"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:521
 msgid "_Export selected to mbox file..."
 msgstr "E_xporteer selectie naar mbox-bestand..."
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:523
 msgid "Empty all _Trash folders"
 msgstr "Alle prullenbakken _leegmaken"
 
-#: src/mainwindow.c:525 src/messageview.c:219
-#, fuzzy
+#: src/mainwindow.c:526 src/messageview.c:217
 msgid "_Save email as..."
-msgstr "_Opslaan als..."
+msgstr "_Opslaan e-mail als..."
 
-#: src/mainwindow.c:526 src/messageview.c:220
-#, fuzzy
+#: src/mainwindow.c:527 src/messageview.c:218
 msgid "_Save part as..."
-msgstr "_Opslaan als..."
+msgstr "Opslaan _Deel als..."
 
-#: src/mainwindow.c:529 src/messageview.c:221
+#: src/mainwindow.c:530 src/messageview.c:219
 msgid "Page setup..."
 msgstr "Pagina instellingen..."
 
-#: src/mainwindow.c:530 src/messageview.c:222
+#: src/mainwindow.c:531 src/messageview.c:220
 msgid "_Print..."
 msgstr "Af_drukken..."
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:533
 msgid "Synchronise folders"
 msgstr "Synchroniseer mappen"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:535
 msgid "E_xit"
 msgstr "Af_sluiten"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:540
 msgid "Select _thread"
 msgstr "_Discussie-draad selecteren"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:541
 msgid "_Delete thread"
 msgstr "_Verwijder draad"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:543
 msgid "_Find in current message..."
 msgstr "_Zoek in huidige bericht"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:545
 msgid "_Quick search"
 msgstr "_Snelzoeken"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:548
 msgid "Show or hi_de"
 msgstr "_Toon of verberg"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:549
 msgid "_Toolbar"
 msgstr "_Werkbalk"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:551
 msgid "Set displayed _columns"
 msgstr "Weergegeven _kolommen instellen"
 
-#: src/mainwindow.c:551
-#, fuzzy
+#: src/mainwindow.c:552
 msgid "In _folder list..."
-msgstr "in _Mappenlijst"
+msgstr "in _mappenlijst..."
 
-#: src/mainwindow.c:552
-#, fuzzy
+#: src/mainwindow.c:553
 msgid "In _message list..."
-msgstr "in _Berichtenlijst"
+msgstr "in _berichtenlijst..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:558
 msgid "La_yout"
 msgstr "_Weergave"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:561
 msgid "_Sort"
 msgstr "_Sorteer"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:563
 msgid "_Attract by subject"
 msgstr "Ge_lijksoortige onderwerpen bij elkaar"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:565
 msgid "E_xpand all threads"
 msgstr "Berichtenboom _uitklappen"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:566
 msgid "Co_llapse all threads"
 msgstr "Berichtenboom _inklappen"
 
-#: src/mainwindow.c:567 src/messageview.c:233
+#: src/mainwindow.c:568 src/messageview.c:231
 msgid "_Go to"
 msgstr "_Ga naar"
 
-#: src/mainwindow.c:568 src/messageview.c:234
+#: src/mainwindow.c:569 src/messageview.c:232
 msgid "_Previous message"
 msgstr "_Vorige pagina"
 
-#: src/mainwindow.c:569 src/messageview.c:235
+#: src/mainwindow.c:570 src/messageview.c:233
 msgid "_Next message"
 msgstr "V_olgende bericht"
 
-#: src/mainwindow.c:571 src/messageview.c:237
+#: src/mainwindow.c:572 src/messageview.c:235
 msgid "P_revious unread message"
 msgstr "Vo_rige ongelezen bericht"
 
-#: src/mainwindow.c:572 src/messageview.c:238
+#: src/mainwindow.c:573 src/messageview.c:236
 msgid "N_ext unread message"
 msgstr "Volgende o_ngelezen bericht"
 
-#: src/mainwindow.c:574 src/messageview.c:240
+#: src/mainwindow.c:575 src/messageview.c:238
 msgid "Previous ne_w message"
 msgstr "Vo_rige nieuwe bericht"
 
-#: src/mainwindow.c:575 src/messageview.c:241
+#: src/mainwindow.c:576 src/messageview.c:239
 msgid "Ne_xt new message"
 msgstr "Volge_nde nieuwe bericht"
 
-#: src/mainwindow.c:577 src/messageview.c:243
+#: src/mainwindow.c:578 src/messageview.c:241
 msgid "Previous _marked message"
 msgstr "Vorige ge_markeerde bericht"
 
-#: src/mainwindow.c:578 src/messageview.c:244
+#: src/mainwindow.c:579 src/messageview.c:242
 msgid "Next m_arked message"
 msgstr "Volgende gem_arkeerde bericht"
 
-#: src/mainwindow.c:580 src/messageview.c:246
+#: src/mainwindow.c:581 src/messageview.c:244
 msgid "Previous _labeled message"
 msgstr "Vorige bericht met _label"
 
-#: src/mainwindow.c:581 src/messageview.c:247
+#: src/mainwindow.c:582 src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "Volgende bericht met l_abel"
 
-#: src/mainwindow.c:583 src/messageview.c:249
-#, fuzzy
+#: src/mainwindow.c:584 src/messageview.c:247
 msgid "Previous opened message"
-msgstr "Vo_rige nieuwe bericht"
+msgstr "Vorige geopende bericht"
 
-#: src/mainwindow.c:584 src/messageview.c:250
-#, fuzzy
+#: src/mainwindow.c:585 src/messageview.c:248
 msgid "Next opened message"
-msgstr "Volge_nde nieuwe bericht"
+msgstr "Volgende geopende bericht"
 
-#: src/mainwindow.c:586 src/messageview.c:252
+#: src/mainwindow.c:587 src/messageview.c:250
 msgid "Parent message"
 msgstr "Bovenliggende bericht"
 
-#: src/mainwindow.c:588 src/messageview.c:254
+#: src/mainwindow.c:589 src/messageview.c:252
 msgid "Next unread _folder"
 msgstr "Volgende _ongelezen bericht"
 
-#: src/mainwindow.c:589 src/messageview.c:255
+#: src/mainwindow.c:590 src/messageview.c:253
 msgid "_Other folder..."
 msgstr "An_dere map..."
 
-#: src/mainwindow.c:591 src/messageview.c:257 src/mimeview.c:210
-#, fuzzy
+#: src/mainwindow.c:592 src/messageview.c:255 src/mimeview.c:201
 msgid "Next part"
-msgstr "Volgende deel (a)"
+msgstr "Volgende deel"
 
-#: src/mainwindow.c:592 src/messageview.c:258 src/mimeview.c:211
-#, fuzzy
+#: src/mainwindow.c:593 src/messageview.c:256 src/mimeview.c:202
 msgid "Previous part"
-msgstr "Vorige pagina"
+msgstr "Vorige deel"
 
-#: src/mainwindow.c:595 src/messageview.c:259
-#, fuzzy
+#: src/mainwindow.c:596 src/messageview.c:257
 msgid "Message scroll"
-msgstr "Berichten"
+msgstr "Berichten schuiven"
 
-#: src/mainwindow.c:596 src/messageview.c:260
-#, fuzzy
+#: src/mainwindow.c:597 src/messageview.c:258
 msgid "Previous line"
-msgstr "Vorige pagina"
+msgstr "Vorige regel"
 
-#: src/mainwindow.c:597 src/messageview.c:261
-#, fuzzy
+#: src/mainwindow.c:598 src/messageview.c:259
 msgid "Next line"
-msgstr "nieuwe regel"
+msgstr "Volgende regel"
 
-#: src/mainwindow.c:598 src/messageview.c:262 src/printing.c:487
+#: src/mainwindow.c:599 src/messageview.c:260 src/printing.c:487
 msgid "Previous page"
 msgstr "Vorige pagina"
 
-#: src/mainwindow.c:599 src/messageview.c:263 src/printing.c:494
+#: src/mainwindow.c:600 src/messageview.c:261 src/printing.c:494
 msgid "Next page"
 msgstr "Volgende pagina"
 
-#: src/mainwindow.c:617 src/messageview.c:281
+#: src/mainwindow.c:618 src/messageview.c:279
 msgid "Decode"
 msgstr "Decodeer"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:625
 msgid "Open in new _window"
 msgstr "_Nieuw venster"
 
-#: src/mainwindow.c:625 src/messageview.c:288
+#: src/mainwindow.c:626 src/messageview.c:286
 msgid "Mess_age source"
 msgstr "Br_on weergeven"
 
-#: src/mainwindow.c:627 src/messageview.c:289
-#, fuzzy
+#: src/mainwindow.c:628 src/messageview.c:287
 msgid "Message part"
-msgstr "Berichtenlijst"
+msgstr "Bericht deel"
 
-#: src/mainwindow.c:628 src/messageview.c:290
-#, fuzzy
+#: src/mainwindow.c:629 src/messageview.c:288
 msgid "View as text"
-msgstr "'Als tekst weergeven'"
+msgstr "Als tekst weergeven"
 
-#: src/mainwindow.c:629 src/messageview.c:291 src/toolbar.c:401
+#: src/mainwindow.c:630 src/messageview.c:289 src/toolbar.c:402
 msgid "Open"
 msgstr "Openen"
 
-#: src/mainwindow.c:631 src/messageview.c:293
-#, fuzzy
+#: src/mainwindow.c:632 src/messageview.c:291
 msgid "Open with..."
-msgstr "'Open met...'"
+msgstr "Openen met..."
 
-#: src/mainwindow.c:635 src/messageview.c:296
+#: src/mainwindow.c:636 src/messageview.c:294
 msgid "Quotes"
 msgstr "Citaties"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:638
 msgid "_Update summary"
 msgstr "Berichtenlijst v_erversen"
 
-#: src/mainwindow.c:640
+#: src/mainwindow.c:641
 msgid "Recei_ve"
 msgstr "Ont_vangen"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:642
 msgid "Get from _current account"
 msgstr "Ophalen van _huidige account"
 
-#: src/mainwindow.c:642
+#: src/mainwindow.c:643
 msgid "Get from _all accounts"
 msgstr "Ophalen van _alle accounts"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:644
 msgid "Cancel receivin_g"
 msgstr "Ophalen ann_uleren"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:647
 msgid "_Send queued messages"
 msgstr "Verzend berichten uit de _wachtrij"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:652
 msgid "Compose a_n email message"
 msgstr "Nieuw _e-mail bericht opstellen"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:653
 msgid "Compose a news message"
 msgstr "Nieuw _Nieuwsbericht opstellen"
 
-#: src/mainwindow.c:654 src/messageview.c:302
+#: src/mainwindow.c:655 src/messageview.c:300
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Beantwoorden"
 
-#: src/mainwindow.c:655 src/messageview.c:303 src/summaryview.c:428
+#: src/mainwindow.c:656 src/messageview.c:301 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "Be_antwoord"
 
-#: src/mainwindow.c:658 src/messageview.c:306
-#, fuzzy
+#: src/mainwindow.c:659 src/messageview.c:304
 msgid "Mailing _list"
-msgstr "mailing-_lijst"
+msgstr "Mailing-_lijst"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:660
 msgid "Follow-up and reply to"
 msgstr "Beantwoorden en _opvolgen"
 
-#: src/mainwindow.c:662 src/messageview.c:309 src/toolbar.c:2087
+#: src/mainwindow.c:663 src/messageview.c:307 src/toolbar.c:2088
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: src/mainwindow.c:663 src/messageview.c:310 src/toolbar.c:2088
+#: src/mainwindow.c:664 src/messageview.c:308 src/toolbar.c:2089
 msgid "For_ward as attachment"
 msgstr "Doorsturen als bijvoegsel"
 
-#: src/mainwindow.c:664 src/messageview.c:311 src/toolbar.c:2089
+#: src/mainwindow.c:665 src/messageview.c:309 src/toolbar.c:2090
 msgid "Redirec_t"
 msgstr "Herverwi_jzen"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:667
 msgid "Mailing-_List"
 msgstr "Mailing-_Lijst"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:668
 msgid "Post"
 msgstr "Posten"
 
-#: src/mainwindow.c:669
+#: src/mainwindow.c:670
 msgid "Help"
 msgstr "Help"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:674
 msgid "Unsubscribe"
 msgstr "Afmelden"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:676
 msgid "View archive"
 msgstr "Bekijk archief"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:678
 msgid "Contact owner"
 msgstr "Contact eigenaar"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:682
 msgid "M_ove..."
 msgstr "Ver_plaatsen..."
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:683
 msgid "_Copy..."
 msgstr "K_opiëren..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:684
 msgid "Move to _trash"
 msgstr "Naar _prullenbak"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:685
 msgid "_Delete..."
 msgstr "Ver_wijderen..."
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:686
 msgid "Cancel a news message"
 msgstr "Trek nieuwsartikel in"
 
-#: src/mainwindow.c:688 src/mainwindow.c:689 src/summaryview.c:429
+#: src/mainwindow.c:689 src/mainwindow.c:690 src/summaryview.c:429
 msgid "_Mark"
 msgstr "_Markeren"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:691
 msgid "_Unmark"
 msgstr "_Demarkeer"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:694
 msgid "Mark as unr_ead"
 msgstr "Markeer _ongelezen"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:695
 msgid "Mark as rea_d"
 msgstr "Markeer _gelezen"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:697
 msgid "Mark all read"
 msgstr "Alles gelezen"
 
-#: src/mainwindow.c:698 src/prefs_filtering_action.c:199 src/toolbar.c:207
-#: src/toolbar.c:417
+#: src/mainwindow.c:699 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/toolbar.c:418
 msgid "Ignore thread"
 msgstr "Draad negeren"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:700
 msgid "Unignore thread"
 msgstr "Draad niet meer negeren"
 
-#: src/mainwindow.c:700 src/prefs_filtering_action.c:200 src/toolbar.c:208
-#: src/toolbar.c:418
+#: src/mainwindow.c:701 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/toolbar.c:419
 msgid "Watch thread"
 msgstr "Volg draad"
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:702
 msgid "Unwatch thread"
 msgstr "Volg draad niet meer"
 
-#: src/mainwindow.c:704
-#, fuzzy
+#: src/mainwindow.c:705
 msgid "Mark as _spam"
-msgstr "Markeer als spam"
+msgstr "Markeer als _spam"
 
-#: src/mainwindow.c:705
-#, fuzzy
+#: src/mainwindow.c:706
 msgid "Mark as _ham"
-msgstr "Markeer als ham"
+msgstr "Markeer als _ham"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:709 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Op slot"
 
-#: src/mainwindow.c:709 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:710 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Van slot"
 
-#: src/mainwindow.c:711 src/summaryview.c:430
+#: src/mainwindow.c:712 src/summaryview.c:430
 msgid "Color la_bel"
 msgstr "_Kleurlabel"
 
-#: src/mainwindow.c:712 src/summaryview.c:431
+#: src/mainwindow.c:713 src/summaryview.c:431
 msgid "Ta_gs"
 msgstr "Ta_gs"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:716
 msgid "Re-_edit"
 msgstr "_Wijzigen"
 
-#: src/mainwindow.c:718 src/messageview.c:312 src/mimeview.c:1028
+#: src/mainwindow.c:719 src/messageview.c:310 src/mimeview.c:1030
 msgid "Check signature"
 msgstr "Verifieer ondertekening"
 
-#: src/mainwindow.c:723 src/messageview.c:316
+#: src/mainwindow.c:724 src/messageview.c:314
 msgid "Add sender to address boo_k"
 msgstr "A_fzender toevoegen aan adresboek"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:726
 msgid "C_ollect addresses"
 msgstr "_Verzamel adressen"
 
-#: src/mainwindow.c:726
-#, fuzzy
+#: src/mainwindow.c:727
 msgid "From current _folder..."
-msgstr "van Huidige _map..."
+msgstr "Van huidige _map..."
 
-#: src/mainwindow.c:727
-#, fuzzy
+#: src/mainwindow.c:728
 msgid "From selected _messages..."
-msgstr "van Verwijderde _berichten..."
+msgstr "Van geselecteerde _berichten..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:731
 msgid "_Filter all messages in folder"
 msgstr "Alle berichten _filteren"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:732
 msgid "Filter _selected messages"
 msgstr "Selectie _filteren"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:733
 msgid "Run folder pr_ocessing rules"
 msgstr "_Verwerkingsregels draaien voor map"
 
-#: src/mainwindow.c:734 src/messageview.c:319
+#: src/mainwindow.c:735 src/messageview.c:317
 msgid "_Create filter rule"
 msgstr "_Filterregel aanmaken"
 
-#: src/mainwindow.c:735 src/mainwindow.c:741 src/messageview.c:320
-#: src/messageview.c:326
+#: src/mainwindow.c:736 src/mainwindow.c:742 src/messageview.c:318
+#: src/messageview.c:324
 msgid "_Automatically"
 msgstr "_Automatisch"
 
-#: src/mainwindow.c:736 src/mainwindow.c:742 src/mainwindow.c:846
-#: src/messageview.c:321 src/messageview.c:327
+#: src/mainwindow.c:737 src/mainwindow.c:743 src/mainwindow.c:845
+#: src/messageview.c:319 src/messageview.c:325
 msgid "By _From"
 msgstr "A_fzender"
 
-#: src/mainwindow.c:737 src/mainwindow.c:743 src/mainwindow.c:847
-#: src/messageview.c:322 src/messageview.c:328
+#: src/mainwindow.c:738 src/mainwindow.c:744 src/mainwindow.c:846
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _To"
 msgstr "Aan"
 
-#: src/mainwindow.c:738 src/mainwindow.c:744 src/messageview.c:323
-#: src/messageview.c:329
+#: src/mainwindow.c:739 src/mainwindow.c:745 src/messageview.c:321
+#: src/messageview.c:327
 msgid "By _Subject"
 msgstr "_Onderwerp"
 
-#: src/mainwindow.c:740 src/messageview.c:325 src/summaryview.c:434
+#: src/mainwindow.c:741 src/messageview.c:323 src/summaryview.c:434
 msgid "Create processing rule"
 msgstr "Verwerkingsregel aanmaken"
 
-#: src/mainwindow.c:747 src/messageview.c:333
+#: src/mainwindow.c:748 src/messageview.c:331
 msgid "List _URLs..."
 msgstr "Geef _URLs weer..."
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:755
 msgid "Ch_eck for new messages in all folders"
 msgstr "Alle mappen worden gecontroleerd op nieuwe berichten"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:756
 msgid "Delete du_plicated messages"
 msgstr "Verwijder _dubbele berichten"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:757
 msgid "In selected folder"
 msgstr "In geselecteerde map"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:758
 msgid "In all folders"
 msgstr "In alle mappen"
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:761
 msgid "E_xecute"
 msgstr "_Doen!"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:762
 msgid "Exp_unge"
 msgstr "Gooi _weg"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:765
 msgid "SSL cer_tificates"
 msgstr "SSL-cer_tificaten"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:769
 msgid "Filtering Lo_g"
 msgstr "Filter Lo_g"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:771
 msgid "Network _Log"
 msgstr "Netwerk _Log"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:773
 msgid "_Forget all session passwords"
 msgstr "_Vergeet alle wachtwoorden van de sessie"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:776
 msgid "C_hange current account"
 msgstr "_Huidig account veranderen"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:778
 msgid "_Preferences for current account..."
 msgstr "V_oorkeuren huidig account..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:779
 msgid "Create _new account..."
 msgstr "_Nieuw account aanmaken..."
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:780
 msgid "_Edit accounts..."
 msgstr "Account_beheer..."
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:783
 msgid "P_references..."
 msgstr "_Voorkeuren..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:784
 msgid "Pre-pr_ocessing..."
 msgstr "_Voorverwerken..."
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:785
 msgid "Post-pro_cessing..."
 msgstr "_Naverwerken..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:786
 msgid "_Filtering..."
 msgstr "Bezig met _filteren..."
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:787
 msgid "_Templates..."
 msgstr "_Sjablonen..."
 
-#: src/mainwindow.c:787
+#: src/mainwindow.c:788
 msgid "_Actions..."
 msgstr "_Acties..."
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:789
 msgid "Tag_s..."
 msgstr "Tag_s..."
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:791
 msgid "Plu_gins..."
 msgstr "Plu_gins..."
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:794
 msgid "_Manual"
 msgstr "_Handboek"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:795
 msgid "_Online User-contributed FAQ"
 msgstr "_On-line FAQ met bijdragen van gebruikers"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:796
 msgid "Icon _Legend"
 msgstr "Pictogram_legenda"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:798
 msgid "Set as default client"
 msgstr "Instellen als standaard programma"
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:805
 msgid "Offline _mode"
 msgstr "_Werk offline"
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:806
 msgid "_Message view"
 msgstr "_Berichtweergave"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:808
 msgid "Status _bar"
 msgstr "_Status balk"
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:810
 msgid "Column headers"
 msgstr "Kolom koppen"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:811
 msgid "Th_read view"
 msgstr "Toon berichtenlijst in _boomvorm"
 
-#: src/mainwindow.c:811
-#, fuzzy
+#: src/mainwindow.c:812
 msgid "Hide read threads"
-msgstr "Gelezen berichten _verbergen"
+msgstr "Gelezen draden verbergen"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:813
 msgid "_Hide read messages"
 msgstr "Gelezen berichten _verbergen"
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:814
 msgid "Hide deleted messages"
 msgstr "Verberg verwijderde berichten"
 
@@ -7303,197 +7284,182 @@ msgstr "Verberg verwijderde berichten"
 msgid "_Fullscreen"
 msgstr "_Volledig scherm"
 
-#: src/mainwindow.c:817 src/messageview.c:345
+#: src/mainwindow.c:816 src/messageview.c:343
 msgid "Show all _headers"
 msgstr "Vo_lledige header weergeven"
 
-#: src/mainwindow.c:818 src/messageview.c:346
-#, fuzzy
+#: src/mainwindow.c:817 src/messageview.c:344
 msgid "_Collapse all"
-msgstr "Berichtenboom _inklappen"
+msgstr "Alles _opvouwen"
 
-#: src/mainwindow.c:819 src/messageview.c:347
-#, fuzzy
+#: src/mainwindow.c:818 src/messageview.c:345
 msgid "Collapse from level _2"
 msgstr "Opvouwen vanaf niveau _2"
 
-#: src/mainwindow.c:820 src/messageview.c:348
-#, fuzzy
+#: src/mainwindow.c:819 src/messageview.c:346
 msgid "Collapse from level _3"
 msgstr "Opvouwen vanaf niveau _3"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:823
 msgid "Text _below icons"
 msgstr "Tekst _onder pictogrammen"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:824
 msgid "Text be_side icons"
 msgstr "Tekst _naast pictogrammen"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:825
 msgid "_Icons only"
 msgstr "Alleen _pictogrammen"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:826
 msgid "_Text only"
 msgstr "Alleen _tekst"
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:833
 msgid "_Standard"
 msgstr "_Standaard"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:834
 msgid "_Three columns"
 msgstr "3 _Kolommen"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:835
 msgid "_Wide message"
 msgstr "_Hele bericht"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:836
 msgid "W_ide message list"
 msgstr "_Brede berichtenlijst"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:837
 msgid "S_mall screen"
 msgstr "K_lein scherm"
 
-#: src/mainwindow.c:842
-#, fuzzy
+#: src/mainwindow.c:841
 msgid "By _number"
-msgstr "_Nummer"
+msgstr "Volgens _nummer"
 
-#: src/mainwindow.c:843
-#, fuzzy
+#: src/mainwindow.c:842
 msgid "By s_ize"
-msgstr "_Grootte"
+msgstr "Volgens _grootte"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:843
 msgid "By _date"
-msgstr ""
+msgstr "Op _datum"
 
-#: src/mainwindow.c:845
-#, fuzzy
+#: src/mainwindow.c:844
 msgid "By thread date"
-msgstr "Dat_um van draad"
+msgstr "Volgens datum van draad"
 
-#: src/mainwindow.c:848
-#, fuzzy
+#: src/mainwindow.c:847
 msgid "By s_ubject"
-msgstr "_Onderwerp"
+msgstr "Volgens _onderwerp"
 
-#: src/mainwindow.c:849
-#, fuzzy
+#: src/mainwindow.c:848
 msgid "By _color label"
-msgstr "_Kleurlabel"
+msgstr "Volgens _kleurlabel"
 
-#: src/mainwindow.c:850
-#, fuzzy
+#: src/mainwindow.c:849
 msgid "By tag"
-msgstr "Elke tag"
+msgstr "Volgens tag"
 
-#: src/mainwindow.c:851
-#, fuzzy
+#: src/mainwindow.c:850
 msgid "By _mark"
-msgstr "_Demarkeer"
+msgstr "Volgens _markering"
 
-#: src/mainwindow.c:852
-#, fuzzy
+#: src/mainwindow.c:851
 msgid "By _status"
-msgstr "_Status"
+msgstr "Volgens _status"
 
-#: src/mainwindow.c:853
-#, fuzzy
+#: src/mainwindow.c:852
 msgid "By a_ttachment"
-msgstr "_Bijvoegsel"
+msgstr "Volgens _bijvoegsel"
 
-#: src/mainwindow.c:854
-#, fuzzy
+#: src/mainwindow.c:853
 msgid "By score"
-msgstr "Score"
+msgstr "Volgens sc_ore"
 
-#: src/mainwindow.c:855
-#, fuzzy
+#: src/mainwindow.c:854
 msgid "By locked"
-msgstr "Beveiligd"
+msgstr "Volgens beveiligd"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:855
 msgid "D_on't sort"
 msgstr "Ni_et sorteren"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:859
 msgid "Ascending"
 msgstr "Oplopend"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:860
 msgid "Descending"
 msgstr "Aflopend"
 
-#: src/mainwindow.c:902 src/messageview.c:389
+#: src/mainwindow.c:901 src/messageview.c:387
 msgid "_Auto detect"
 msgstr "_Automatisch detecteren"
 
-#: src/mainwindow.c:1306 src/summaryview.c:6245
+#: src/mainwindow.c:1297 src/summaryview.c:6234
 msgid "Apply tags..."
 msgstr "Tags toepassen..."
 
-#: src/mainwindow.c:2123
+#: src/mainwindow.c:1935
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Fout(en) voorgekomen. Klik hier om het log te zien."
 
-#: src/mainwindow.c:2138
+#: src/mainwindow.c:1950
 msgid "You are online. Click the icon to go offline"
-msgstr "U bent on-line. Klik op het pictogram om offline te gaan"
+msgstr "Je bent on-line. Klik op het pictogram om offline te gaan"
 
-#: src/mainwindow.c:2141
+#: src/mainwindow.c:1953
 msgid "You are offline. Click the icon to go online"
-msgstr "U bent offline. Klik op het pictogram om on-line te gaan"
+msgstr "Je bent offline. Klik op het pictogram om on-line te gaan"
 
-#: src/mainwindow.c:2155
+#: src/mainwindow.c:1967
 msgid "Select account"
 msgstr "Selecteer account"
 
-#: src/mainwindow.c:2182 src/prefs_logging.c:140
+#: src/mainwindow.c:1994 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Netwerk log"
 
-#: src/mainwindow.c:2186
-#, fuzzy
+#: src/mainwindow.c:1998
 msgid "Filtering/Processing debug log"
 msgstr "Filteren/Verwerkingen debug log"
 
-#: src/mainwindow.c:2205 src/prefs_logging.c:392
+#: src/mainwindow.c:2017 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "filter log staat aan\n"
 
-#: src/mainwindow.c:2207 src/prefs_logging.c:394
+#: src/mainwindow.c:2019 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "filter log staat uit.\n"
 
-#: src/mainwindow.c:2653 src/mainwindow.c:2660 src/mainwindow.c:2703
-#: src/mainwindow.c:2736 src/mainwindow.c:2768 src/mainwindow.c:2813
+#: src/mainwindow.c:2460 src/mainwindow.c:2467 src/mainwindow.c:2510
+#: src/mainwindow.c:2543 src/mainwindow.c:2575 src/mainwindow.c:2620
 #: src/plugins/notification/notification_trayicon.c:363
 #: src/prefs_folder_item.c:1067
 msgid "Untitled"
 msgstr "Naamloos"
 
-#: src/mainwindow.c:2814 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2621 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "niets"
 
-#: src/mainwindow.c:3071 src/mainwindow.c:3075
+#: src/mainwindow.c:2878 src/mainwindow.c:2882
 msgid "Delete all messages in trash folders?"
 msgstr "Alle berichten uit de prullenbakken weggooien?"
 
-#: src/mainwindow.c:3072
+#: src/mainwindow.c:2879
 msgid "Don't quit"
 msgstr "Niet afsluiten"
 
-#: src/mainwindow.c:3101 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2908 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Postvak toevoegen"
 
-#: src/mainwindow.c:3102
+#: src/mainwindow.c:2909
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7503,17 +7469,18 @@ msgstr ""
 "Als een bestaand postvak wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: src/mainwindow.c:3108 src/plugins/rssyl/rssyl_gtk.c:158
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/plugins/rssyl/rssyl_gtk.c:158
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Het postvak '%s' bestaat al."
 
-#: src/mainwindow.c:3113 src/plugins/mailmbox/plugin_gtk.c:202 src/setup.c:52
-#: src/wizard.c:774
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:202 src/setup.c:52
+#: src/wizard.c:737
 msgid "Mailbox"
 msgstr "Postvak"
 
-#: src/mainwindow.c:3118 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:55
+#: src/mainwindow.c:2925 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7523,79 +7490,79 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
 "schrijven."
 
-#: src/mainwindow.c:3563
+#: src/mainwindow.c:3373
 msgid "No posting allowed"
 msgstr "Versturen niet toegestaan"
 
-#: src/mainwindow.c:4141
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "Fout bij importeren mbox-bestand."
 
-#: src/mainwindow.c:4150 src/mainwindow.c:4159
+#: src/mainwindow.c:3960 src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "Exporteren naar mbox-bestand mislukt."
 
-#: src/mainwindow.c:4200 src/plugins/notification/notification_trayicon.c:518
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:518
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:4200 src/plugins/notification/notification_trayicon.c:518
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:518
 msgid "Exit Claws Mail?"
 msgstr "Claws Mail afsluiten?"
 
-#: src/mainwindow.c:4387
+#: src/mainwindow.c:4199
 msgid "Folder synchronisation"
 msgstr "Map synchronisatie"
 
-#: src/mainwindow.c:4388
+#: src/mainwindow.c:4200
 msgid "Do you want to synchronise your folders now?"
-msgstr "Wilt u alle mappen nu synchroniseren?"
+msgstr "Wil je alle mappen nu synchroniseren?"
 
-#: src/mainwindow.c:4389
+#: src/mainwindow.c:4201
 msgid "+_Synchronise"
 msgstr "+_Synchroniseer"
 
-#: src/mainwindow.c:4818
+#: src/mainwindow.c:4630
 msgid "Deleting duplicated messages..."
 msgstr "Dubbele berichten worden verwijderd..."
 
-#: src/mainwindow.c:4855
+#: src/mainwindow.c:4667
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d dubbel bericht verwijderd in %d map.\n"
 msgstr[1] "%d dubbele berichten verwijderd in %d mappen.\n"
 
-#: src/mainwindow.c:5110 src/summaryview.c:5726
+#: src/mainwindow.c:4922 src/summaryview.c:5723
 msgid "Processing rules to apply before folder rules"
 msgstr "Verwerkingsregels toepassen voor mapregels"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:4930
 msgid "Processing rules to apply after folder rules"
 msgstr "Verwerkingsregels toepassen na mapregels"
 
-#: src/mainwindow.c:5126 src/summaryview.c:5737
+#: src/mainwindow.c:4938 src/summaryview.c:5734
 msgid "Filtering configuration"
 msgstr "Filters instellen"
 
-#: src/mainwindow.c:5241
+#: src/mainwindow.c:5053
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Kan niet registreren als standaard mailprogramma: niet mogelijk om het "
 "uitvoerpad te vinden."
 
-#: src/mainwindow.c:5300
+#: src/mainwindow.c:5112
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail is geregistreerd als standaard mailprogramma."
 
-#: src/mainwindow.c:5302
+#: src/mainwindow.c:5114
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Kan niet registreren als standaard mailprogramma: niet mogelijk om te "
 "schrijven naar het register."
 
-#: src/mainwindow.c:5460
+#: src/mainwindow.c:5272
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7621,34 +7588,33 @@ msgid "body line"
 msgstr "Inhoud regel"
 
 #: src/matcher.c:219
-#, fuzzy
 msgid "tag"
-msgstr "tags"
+msgstr "tag"
 
-#: src/matcher.c:517 src/matcher.c:522 src/matcher.c:542 src/matcher.c:547
-#: src/message_search.c:212 src/prefs_matcher.c:737 src/summary_search.c:452
+#: src/matcher.c:523 src/matcher.c:528 src/matcher.c:548 src/matcher.c:553
+#: src/message_search.c:217 src/prefs_matcher.c:739 src/summary_search.c:478
 msgid "Case sensitive"
 msgstr "Hoofd / kleine letters onderscheiden"
 
-#: src/matcher.c:517 src/matcher.c:522 src/matcher.c:542 src/matcher.c:547
+#: src/matcher.c:523 src/matcher.c:528 src/matcher.c:548 src/matcher.c:553
 msgid "Case insensitive"
 msgstr "Hoofd / kleine letters niet onderscheiden"
 
-#: src/matcher.c:1712
+#: src/matcher.c:1819
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "Controleren of bericht overeenkomt met [ %s ]\n"
 
-#: src/matcher.c:1781 src/matcher.c:1800 src/matcher.c:1813
+#: src/matcher.c:1888 src/matcher.c:1907 src/matcher.c:1920
 msgid "message matches\n"
 msgstr "bericht komt overeen\n"
 
-#: src/matcher.c:1788 src/matcher.c:1806 src/matcher.c:1815
+#: src/matcher.c:1895 src/matcher.c:1913 src/matcher.c:1922
 msgid "message does not match\n"
 msgstr "bericht komt niet overeen\n"
 
-#: src/matcher.c:2078 src/matcher.c:2079 src/matcher.c:2080 src/matcher.c:2081
-#: src/matcher.c:2082 src/matcher.c:2083 src/matcher.c:2084 src/matcher.c:2085
+#: src/matcher.c:2185 src/matcher.c:2186 src/matcher.c:2187 src/matcher.c:2188
+#: src/matcher.c:2189 src/matcher.c:2190 src/matcher.c:2191 src/matcher.c:2192
 msgid "(none)"
 msgstr "(niets)"
 
@@ -7662,9 +7628,9 @@ msgstr ""
 "%s\n"
 
 #: src/mbox.c:144
-#, fuzzy, c-format
+#, c-format
 msgid "Importing from mbox... (%d mail imported)"
-msgid_plural "Importing from mbox ... (%d mails imported)"
+msgid_plural "Importing from mbox... (%d mails imported)"
 msgstr[0] "Importeren van mbox... (%d berichten geïmporteerd)"
 msgstr[1] "Importeren van mbox... (%d berichten geïmporteerd)"
 
@@ -7674,9 +7640,9 @@ msgstr "Mbox-bestand overschrijven"
 
 #: src/mbox.c:554
 msgid "This file already exists. Do you want to overwrite it?"
-msgstr "Dit bestand bestaat reeds. Wilt u het overschrijven?"
+msgstr "Dit bestand bestaat reeds. Wil je het overschrijven?"
 
-#: src/mbox.c:555 src/messageview.c:1867 src/mimeview.c:1827
+#: src/mbox.c:555 src/messageview.c:1843 src/mimeview.c:1844
 #: src/prefs_themes.c:553 src/textview.c:3120
 msgid "Overwrite"
 msgstr "Overschrijven"
@@ -7702,39 +7668,39 @@ msgstr "Zoek in huidige bericht"
 msgid "Find text:"
 msgstr "Zoek tekst:"
 
-#: src/message_search.c:332 src/summary_search.c:768
+#: src/message_search.c:346 src/summary_search.c:791
 msgid "Search failed"
 msgstr "Zoeken mislukt"
 
-#: src/message_search.c:333 src/summary_search.c:769
+#: src/message_search.c:347 src/summary_search.c:792
 msgid "Search string not found."
 msgstr "Opgegeven tekst niet gevonden"
 
-#: src/message_search.c:342
+#: src/message_search.c:356
 msgid "Beginning of message reached; continue from end?"
 msgstr "Begin van bericht bereikt; verdergaan vanaf het einde?"
 
-#: src/message_search.c:345
+#: src/message_search.c:359
 msgid "End of message reached; continue from beginning?"
 msgstr "Einde van bericht bereikt; verdergaan vanaf het begin?"
 
-#: src/message_search.c:348 src/summary_search.c:780
+#: src/message_search.c:362 src/summary_search.c:803
 msgid "Search finished"
 msgstr "Zoeken voltooid"
 
-#: src/messageview.c:299 src/textview.c:245
+#: src/messageview.c:297 src/textview.c:245
 msgid "Compose _new message"
 msgstr "Nieuw bericht opstellen"
 
-#: src/messageview.c:729 src/messageview.c:1413 src/messageview.c:1609
+#: src/messageview.c:711 src/messageview.c:1388 src/messageview.c:1585
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Berichtenvenster"
 
-#: src/messageview.c:860
+#: src/messageview.c:838
 msgid "<No Return-Path found>"
 msgstr "<Geen Return-Path gevonden>"
 
-#: src/messageview.c:868
+#: src/messageview.c:846
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7747,13 +7713,13 @@ msgstr ""
 "komt niet overeen met het \"return path\"\n"
 "Opgegeven adres: %s\n"
 "Return path: %s\n"
-"U wordt afgeraden een onvangstbevestiging te versturen."
+"Je wordt afgeraden een onvangstbevestiging te versturen."
 
-#: src/messageview.c:875 src/messageview.c:892
+#: src/messageview.c:853 src/messageview.c:870
 msgid "_Don't Send"
 msgstr "_Niet versturen"
 
-#: src/messageview.c:888
+#: src/messageview.c:866
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7762,71 +7728,71 @@ msgid ""
 msgstr ""
 "Dit bericht vraagt om een ontvangstbevestiging,\n"
 "maar volgens de 'Aan:'- en 'CC:'-headers was het niet\n"
-"officieel aan u gericht.\n"
-"U wordt afgeraden een onvangstbevestiging te versturen."
+"officieel aan je gericht.\n"
+"Je wordt afgeraden een onvangstbevestiging te versturen."
 
-#: src/messageview.c:1341
+#: src/messageview.c:1319
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Ophalen van bericht (%s)..."
 
-#: src/messageview.c:1377 src/procmime.c:983
+#: src/messageview.c:1355 src/procmime.c:986
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Decoderen mislukt: %s"
 
-#: src/messageview.c:1460 src/messageview.c:1468
+#: src/messageview.c:1435 src/messageview.c:1443
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Bericht is niet conform de MIME standaard. Het zou verkeerd weergegeven "
 "kunnen worden."
 
-#: src/messageview.c:1859 src/messageview.c:1862 src/mimeview.c:1980
-#: src/plugins/fancy/fancy_viewer.c:788 src/summaryview.c:4813
-#: src/summaryview.c:4816 src/textview.c:3108
+#: src/messageview.c:1835 src/messageview.c:1838 src/mimeview.c:1997
+#: src/plugins/fancy/fancy_viewer.c:668 src/summaryview.c:4810
+#: src/summaryview.c:4813 src/textview.c:3108
 msgid "Save as"
 msgstr "Opslaan als"
 
-#: src/messageview.c:1868
+#: src/messageview.c:1844
 msgid "Overwrite existing file?"
 msgstr "Bestaand bestand overschrijven?"
 
-#: src/messageview.c:1876 src/summaryview.c:4833 src/summaryview.c:4836
-#: src/summaryview.c:4851
+#: src/messageview.c:1852 src/summaryview.c:4830 src/summaryview.c:4833
+#: src/summaryview.c:4848
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Kan bestand '%s' niet opslaan."
 
-#: src/messageview.c:1930
+#: src/messageview.c:1905
 #, c-format
 msgid "Show all %s."
 msgstr "Geef alle %s weer."
 
-#: src/messageview.c:1932
+#: src/messageview.c:1907
 msgid "Only the first megabyte of text is shown."
 msgstr "Alleen de eesrste megabyte tekst is weergegeven."
 
-#: src/messageview.c:1963
+#: src/messageview.c:1938
 msgid ""
 "You got a return receipt for this message : it has been displayed by the "
 "recipient."
 msgstr ""
-"U kreeg een ontvangstbevestiging in dit bericht : het is gezien door de "
+"Je kreeg een ontvangstbevestiging in dit bericht : het is gezien door de "
 "ontvanger."
 
-#: src/messageview.c:1966
+#: src/messageview.c:1941
 msgid "You asked for a return receipt in this message."
-msgstr "U heeft om een ontvangstbevestiging gevraagd voor dit bericht."
+msgstr "Je hebt om een ontvangstbevestiging gevraagd voor dit bericht."
 
-#: src/messageview.c:1972
+#: src/messageview.c:1947
 msgid "This message asks for a return receipt."
 msgstr "Dit bericht vraagt om een ontvangstbevestiging."
 
-#: src/messageview.c:1973
+#: src/messageview.c:1948
 msgid "Send receipt"
 msgstr "Ontvangstbevestiging versturen"
 
-#: src/messageview.c:2016
+#: src/messageview.c:1991
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -7834,7 +7800,7 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald;\n"
 "en is verwijderd van de server."
 
-#: src/messageview.c:2022
+#: src/messageview.c:1997
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7843,15 +7809,15 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald;\n"
 "het is %s."
 
-#: src/messageview.c:2026 src/messageview.c:2048
+#: src/messageview.c:2001 src/messageview.c:2023
 msgid "Mark for download"
 msgstr "Markeer voor ophalen"
 
-#: src/messageview.c:2027 src/messageview.c:2039
+#: src/messageview.c:2002 src/messageview.c:2014
 msgid "Mark for deletion"
 msgstr "Gemarkeerd om te verwijderen"
 
-#: src/messageview.c:2032
+#: src/messageview.c:2007
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7860,12 +7826,12 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald;\n"
 "het is %s en zal worden opgehaald."
 
-#: src/messageview.c:2037 src/messageview.c:2050
+#: src/messageview.c:2012 src/messageview.c:2025
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Demarkeer"
 
-#: src/messageview.c:2043
+#: src/messageview.c:2018
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7874,54 +7840,58 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald;\n"
 "het is %s en zal worden verwijderd."
 
-#: src/messageview.c:2116
+#: src/messageview.c:2091
 msgid "Return Receipt Notification"
 msgstr "Verstuur Ontvangstbevestiging"
 
-#: src/messageview.c:2117
+#: src/messageview.c:2092
 msgid ""
-"The message was sent to several of your accounts.\n"
-"Please choose which account do you want to use for sending the receipt "
+"More than one of your accounts uses the address that this message was sent "
+"to.\n"
+"Please choose which account you want to use for sending the receipt "
 "notification:"
 msgstr ""
-"Dit bericht werd verzonden naar meerdere accounts van u.\n"
-"Kies het account vanaf welke u de ontvangstbevestiging wilt versturen:"
+"Dit bericht werd verzonden naar meerdere accounts van je\n"
+"Kies het account vanaf welke je de ontvangstbevestiging wilt versturen:"
 
-#: src/messageview.c:2121 src/plugins/rssyl/rssyl_gtk.c:480
+#: src/messageview.c:2096 src/plugins/rssyl/rssyl_gtk.c:480
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: src/messageview.c:2121
+#: src/messageview.c:2096
 msgid "_Send Notification"
 msgstr "_Stuur Bevestiging"
 
-#: src/messageview.c:2188
+#: src/messageview.c:2163
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Kan niet afdrukken: het bericht bevat geen tekst."
 
-#: src/messageview.c:2957
-#, fuzzy
+#: src/messageview.c:2932
 msgid ""
 "\n"
 "  There are no messages in this folder"
-msgstr "Alle berichten uit de prullenbakken weggooien?"
+msgstr ""
+"\n"
+" Er zijn geen berichten in deze map"
 
-#: src/messageview.c:2965
-#, fuzzy
+#: src/messageview.c:2940
 msgid ""
 "\n"
 "  Message has been deleted"
-msgstr "Is beantwoord"
+msgstr ""
+"\n"
+" Bericht is verwijderd"
 
-#: src/messageview.c:2966
-#, fuzzy
+#: src/messageview.c:2941
 msgid ""
 "\n"
-"  Message has been moved to trash"
-msgstr "Is beantwoord"
+"  Message has been deleted or moved to another folder"
+msgstr ""
+"\n"
+"  Bericht is verplaatst naar de prullenbak of naar een andere map"
 
-#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4185
-#: src/summaryview.c:6982
+#: src/messageview.c:2974 src/messageview.c:2980 src/summaryview.c:4183
+#: src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "Er is een fout opgetreden tijdens het leren.\n"
 
@@ -7942,108 +7912,114 @@ msgstr "Berichten worden verwijderd..."
 msgid "Remove _mailbox..."
 msgstr "Verwijder _postvak..."
 
-#: src/mh_gtk.c:358
+#: src/mh_gtk.c:358 src/plugins/mailmbox/plugin_gtk.c:290
 #, c-format
 msgid ""
-"Really remove the mailbox '%s' ?\n"
+"Really remove the mailbox '%s'?\n"
 "(The messages are NOT deleted from the disk)"
 msgstr ""
-"Wilt u het postvak '%s' werkelijk verwijderen?\n"
+"Wil je het postvak '%s' werkelijk verwijderen?\n"
 "(De berichten zullen niet van de schijf worden verwijderd)"
 
 #: src/mh_gtk.c:360 src/plugins/mailmbox/plugin_gtk.c:292
 msgid "Remove mailbox"
 msgstr "Verwijder postvak"
 
-#: src/mimeview.c:202
-#, fuzzy
+#: src/mimeview.c:193
 msgid "_Open"
-msgstr "Openen"
+msgstr "_Openen"
 
-#: src/mimeview.c:204
-#, fuzzy
+#: src/mimeview.c:195
 msgid "Open _with..."
-msgstr "'Open met...'"
+msgstr "Openen met..."
 
-#: src/mimeview.c:206
-#, fuzzy
+#: src/mimeview.c:197
 msgid "Send to..."
-msgstr "Verzend wacht_rij..."
+msgstr "Verzenden naar..."
 
-#: src/mimeview.c:207
-#, fuzzy
+#: src/mimeview.c:198
 msgid "_Display as text"
-msgstr "'Als tekst weergeven'"
+msgstr "Als _tekst weergeven"
 
-#: src/mimeview.c:208
+#: src/mimeview.c:199
 msgid "_Save as..."
 msgstr "_Opslaan als..."
 
-#: src/mimeview.c:209
+#: src/mimeview.c:200
 msgid "Save _all..."
 msgstr "_Alles op_slaan..."
 
-#: src/mimeview.c:282
+#: src/mimeview.c:273
 msgid "MIME Type"
 msgstr "MIME Type"
 
-#: src/mimeview.c:1033 src/mimeview.c:1038 src/mimeview.c:1043
-#: src/mimeview.c:1048
+#: src/mimeview.c:1035 src/mimeview.c:1040 src/mimeview.c:1045
+#: src/mimeview.c:1050
 msgid "View full information"
 msgstr "Bekijk volledige informatie"
 
-#: src/mimeview.c:1054
+#: src/mimeview.c:1056
 msgid "Check again"
 msgstr "Opnieuw controleren"
 
-#: src/mimeview.c:1064
-msgid "Click the icon or hit 'C' to check it."
-msgstr "Klik het pictogram of druk op 'C' om te controleren."
+#: src/mimeview.c:1068
+#, c-format
+msgid "%s Click the icon to check it."
+msgstr "%s Klik het pictogram om te controleren."
+
+#: src/mimeview.c:1070
+#, c-format
+msgid "%s Click the icon or hit '%s' to check it."
+msgstr "%s Klik het pictogram of druk op '%s' om te controleren."
+
+#: src/mimeview.c:1080
+msgid "Timeout checking the signature. Click the icon to try again."
+msgstr ""
+"Controleren van ondertekening niet gelukt binnen de tijdslimiet. Klik het "
+"pictogram om het opnieuw te proberen."
 
-#: src/mimeview.c:1069
-msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
+#: src/mimeview.c:1082
+#, c-format
+msgid ""
+"Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
 "Controleren van ondertekening niet gelukt binnen de tijdslimiet. Klik het "
-"pictogram of druk op 'C' om het opnieuw te proberen."
+"pictogram of druk op '%s' om het opnieuw te proberen."
 
-#: src/mimeview.c:1307
+#: src/mimeview.c:1322
 msgid "Checking signature..."
 msgstr "Ondertekening wordt geverifieerd..."
 
-#: src/mimeview.c:1350
+#: src/mimeview.c:1363
 msgid "Go back to email"
 msgstr "Ga terug naar bericht"
 
-#: src/mimeview.c:1746 src/mimeview.c:1835 src/mimeview.c:2027
-#: src/mimeview.c:2070 src/mimeview.c:2201
-#: src/plugins/fancy/fancy_viewer.c:461
+#: src/mimeview.c:1763 src/mimeview.c:1852 src/mimeview.c:2044
+#: src/mimeview.c:2080 src/mimeview.c:2192
+#: src/plugins/fancy/fancy_viewer.c:421
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Kan het deel van een meerdelig bericht niet opslaan: %s"
 
-#: src/mimeview.c:1824 src/textview.c:3118
+#: src/mimeview.c:1841 src/textview.c:3118
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Bestaand bestand '%s' overschrijven?"
 
-#: src/mimeview.c:1866 src/plugins/archive/archiver_prefs.c:128
+#: src/mimeview.c:1883 src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
 msgstr "Selecteer doel-map"
 
-#: src/mimeview.c:1873 src/plugins/archive/archiver_prefs.c:134
+#: src/mimeview.c:1890 src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' is geen map."
 
-#: src/mimeview.c:2102
-msgid "No registered viewer for this file type."
-msgstr "Geen geregistreerde weergever voor dit bestandstype."
-
-#: src/mimeview.c:2134 src/mimeview.c:2141 src/textview.c:3039
+#: src/mimeview.c:2127 src/mimeview.c:2134 src/textview.c:3039
 msgid "Open with"
 msgstr "Open met"
 
-#: src/mimeview.c:2135 src/mimeview.c:2142 src/textview.c:3040
+#: src/mimeview.c:2128 src/mimeview.c:2135 src/textview.c:3040
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8052,11 +8028,11 @@ msgstr ""
 "Geef de opdracht om het bestand mee te openen:\n"
 "('%s' zal vervangen worden door de bestandsnaam)"
 
-#: src/mimeview.c:2235
+#: src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "Onbekend programma uitvoeren?"
 
-#: src/mimeview.c:2236
+#: src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8065,101 +8041,101 @@ msgid ""
 msgstr ""
 "Dit bijvoegsel is een uitvoerbaar bestand. Uitvoeren van onbekende "
 "programma's is gevaarlijk en kan mogelijk leiden tot het onveilig maken van "
-"uw computer.\n"
+"je computer.\n"
 "\n"
-"Wilt u dit programma uitvoeren?"
+"Wil je dit programma uitvoeren?"
 
-#: src/mimeview.c:2240
+#: src/mimeview.c:2231
 msgid "Run binary"
 msgstr "Draai programma"
 
-#: src/mimeview.c:2542
+#: src/mimeview.c:2533
 msgid "Type:"
 msgstr "Type:"
 
-#: src/mimeview.c:2543 src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/mimeview.c:2534 src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Size:"
 msgstr "Grootte:"
 
-#: src/mimeview.c:2555 src/plugins/vcalendar/vcalendar.c:1271
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1730
+#: src/mimeview.c:2546 src/plugins/vcalendar/vcalendar.c:1271
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1741
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1751
 msgid "Description:"
 msgstr "Beschrijving:"
 
-#: src/news.c:300
-#, fuzzy, c-format
+#: src/news.c:302
+#, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
-msgstr ""
-"De NNTP-verbinding %s:%d is verbroken. Opnieuw contact aan het leggen...\n"
+msgstr "De NNTP-verbinding naar %s:%d is verbroken.\n"
 
-#: src/news.c:333
-#, fuzzy, c-format
+#: src/news.c:335
+#, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
-msgstr "Verbinding met SMTP server wordt gemaakt: %s ..."
+msgstr "Account '%s': Verbinden met NNTP server: %s:%d...\n"
 
-#: src/news.c:354
+#: src/news.c:356
 #, c-format
-msgid "Error logging in to %s:%d ...\n"
-msgstr "Fout tijdens verbinden met %s:%d ...\n"
+msgid "Error logging in to %s:%d...\n"
+msgstr "Fout tijdens inloggen op %s:%d...\n"
 
-#: src/news.c:432
+#: src/news.c:438
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
+"Libetpan ondersteunt return code 480 niet dus voor nu kunnen we doorgaan\n"
 
-#: src/news.c:441
+#: src/news.c:447
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr ""
 
-#: src/news.c:445
-#, fuzzy, c-format
+#: src/news.c:451
+#, c-format
 msgid "Error creating session with %s:%d\n"
-msgstr "Fout tijdens verbinden met %s:%d ...\n"
+msgstr "Fout bij aanmaken sessie met %s:%d\n"
 
-#: src/news.c:459
+#: src/news.c:466
 #, c-format
-msgid "Error authenticating to %s:%d ...\n"
-msgstr "Fout tijdens authenticatie met %s:%d ...\n"
+msgid "Error authenticating to %s:%d...\n"
+msgstr "Fout tijdens authenticatie met %s:%d...\n"
 
-#: src/news.c:484
+#: src/news.c:491
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "Claws Mail heeft voor contact met de Nieuwsserver netwerktoegang nodig."
 
-#: src/news.c:853
+#: src/news.c:862
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "kan groep '%s' niet selecteren\n"
 
-#: src/news.c:1042 src/news.c:1212
+#: src/news.c:1051 src/news.c:1221
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "kan groep niet instellen: %s\n"
 
-#: src/news.c:1051
+#: src/news.c:1060
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ongeldig artikelbereik: %d - %d\n"
 
-#: src/news.c:1121 src/news.c:1145 src/news.c:1169
+#: src/news.c:1130 src/news.c:1154 src/news.c:1178
 msgid "couldn't get xhdr\n"
 msgstr "Kan xhdr niet ophalen\n"
 
-#: src/news.c:1205
+#: src/news.c:1214
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "xover %d - %d uit %s wordt opgehaald...\n"
 
-#: src/news.c:1220
+#: src/news.c:1229
 msgid "couldn't get xover\n"
 msgstr "Kan xover niet ophalen\n"
 
-#: src/news.c:1235
+#: src/news.c:1244
 msgid "invalid xover line\n"
 msgstr "ongeldige xover regel\n"
 
-#: src/news.c:1450
+#: src/news.c:1459
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -8167,11 +8143,11 @@ msgid ""
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
-"U heeft een of meer Nieuws-accounts ingesteld. Deze versie van Claws Mail is "
-"echter gebouwd zonder Nieuws-ondersteuning; uw Nieuws-account(s) werken dus "
+"Je hebt een of meer Nieuws-accounts ingesteld. Deze versie van Claws Mail is "
+"echter gebouwd zonder Nieuws-ondersteuning; je Nieuws-account(s) werken dus "
 "niet.\n"
 "\n"
-"U dient waarschijnlijk libetpan te installeren en Claws Mail opnieuw te "
+"Je dient waarschijnlijk libetpan te installeren en Claws Mail opnieuw te "
 "compileren."
 
 #: src/news_gtk.c:56
@@ -8317,7 +8293,8 @@ msgstr "Mail Archiveerder"
 msgid "Create Archive..."
 msgstr "Maak Archief Aan..."
 
-#: src/plugins/archive/archiver.c:113
+#: src/plugins/archive/archiver.c:126
+#, c-format
 msgid ""
 "This plugin adds archiving features to Claws Mail.\n"
 "\n"
@@ -8333,10 +8310,7 @@ msgid ""
 "\tCPIO\n"
 "\n"
 "The archive can be compressed using:\n"
-"\tGZIP/ZIP\n"
-"\tBZIP2\n"
-"\tCOMPRESS\n"
-"\n"
+"%s\n"
 "The archives can be restored with any standard tool that supports the chosen "
 "format and compression.\n"
 "\n"
@@ -8349,8 +8323,8 @@ msgid ""
 msgstr ""
 "Deze plugin voegt archiverings mogelijkheden toe aan Claws Mail.\n"
 "\n"
-"Het biedt de mogelijkheid om een mail map te selecteren dat je gearchiveerd "
-"wilt hebben, en dan een naam, formaat en lokatie te kiezen voor het archief."
+"Het biedt de mogelijkheid om een mail map te selecteren die je gearchiveerd "
+"wilt hebben, en dan een naam, formaat en lokatie te kiezen voor het archief. "
 "Submappen kunnen bijgevoegd worden en MD5 checksums kunnen toegevoegd worden "
 "voor elk bestand in het archief. Meerdere archiveringsopties zijn verder nog "
 "beschikbaar.\n"
@@ -8362,10 +8336,7 @@ msgstr ""
 "\tCPIO\n"
 "\n"
 "Het archief kan gecomprimeerd worden met:\n"
-"\tGZIP/ZIP\n"
-"\tBZIP2\n"
-"\tCOMPRESS\n"
-"\n"
+"%s\n"
 "De archieven kunnen teruggehaald worden met iedere standaard tool dat het "
 "gekozen formaat en compressie ondersteunt.\n"
 "\n"
@@ -8373,10 +8344,10 @@ msgstr ""
 "\n"
 "Om de archivering te activeren ga naar /Gereedschap/Maak Archief Aan\n"
 "\n"
-"Standaard opties kunnen ingesteld worden in /Configuratie/Voorkeuren/"
-"Plugins/ Mail Archiveerder"
+"Standaard opties kunnen ingesteld worden in /Configuratie/Voorkeuren/Plugins/"
+"Mail Archiveerder"
 
-#: src/plugins/archive/archiver.c:145
+#: src/plugins/archive/archiver.c:156
 msgid "Archiver"
 msgstr "Archiveerder"
 
@@ -8564,7 +8535,7 @@ msgstr "Lokatie en naam van het archief"
 
 #: src/plugins/archive/archiver_gtk.c:1045
 #: src/plugins/archive/archiver_prefs.c:198
-#: src/plugins/pgpcore/select-keys.c:424
+#: src/plugins/pgpcore/select-keys.c:420
 msgid "_Select"
 msgstr "_Selecteer"
 
@@ -8635,8 +8606,8 @@ msgid ""
 "will take to create the archive"
 msgstr ""
 "Kies deze optie om MD5sums toe te voegen voor ieder bestand in het archief.\n"
-"Wees u ervan bewust dat dit de tijd die het duurt om het archief te creeren "
-"drastisch verhoogt"
+"Wees je ervan bewust dat dit de tijd die het duurt om het archief aan te "
+"maken drastisch verhoogt"
 
 #: src/plugins/archive/archiver_gtk.c:1185
 msgid "R_ename"
@@ -8744,7 +8715,7 @@ msgid ""
 msgstr ""
 "Kies deze optie om standaard MD5sums toe te voegen voor ieder bestand in de "
 "archieven.\n"
-"Wees u ervan bewust dat dit de tijd die nodig is om de archieven aan te "
+"Wees je ervan bewust dat dit de tijd die nodig is om de archieven aan te "
 "maken drastisch verhoogt"
 
 #: src/plugins/archive/archiver_prefs.c:331
@@ -8756,24 +8727,20 @@ msgid "Choose this option to delete mails after archiving"
 msgstr "Kies deze optie om e-mails te verwijderen na het archiveren"
 
 #: src/plugins/att_remover/att_remover.c:299
-#, fuzzy
 msgid "<b>Type: </b>"
-msgstr "<b> om:</b>"
+msgstr "<b>Type: </b>"
 
 #: src/plugins/att_remover/att_remover.c:300
-#, fuzzy
 msgid "<b>Size: </b>"
-msgstr "<b> om:</b>"
+msgstr "<b>Grootte:</b>"
 
 #: src/plugins/att_remover/att_remover.c:301
-#, fuzzy
 msgid "<b>Filename: </b>"
-msgstr "Bestandsnaam:"
+msgstr "<b>Bestandsnaam: </b>"
 
 #: src/plugins/att_remover/att_remover.c:332
-#, fuzzy
 msgid "Remove attachments"
-msgstr "Negeer bijvoegsel"
+msgstr "Verwijder bijvoegsels"
 
 #: src/plugins/att_remover/att_remover.c:357
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:330 src/prefs_themes.c:973
@@ -8786,47 +8753,50 @@ msgid "Attachment"
 msgstr "Bijvoegsel"
 
 #: src/plugins/att_remover/att_remover.c:417
-#, fuzzy
 msgid "Destroy attachments"
-msgstr "Heeft bijvoegsel"
+msgstr "Vernietig bijvoegsels"
 
 #: src/plugins/att_remover/att_remover.c:418
 msgid ""
-"Do you really want to remove all attachments from the selected messages ?\n"
+"Do you really want to remove all attachments from the selected messages?\n"
 "\n"
 "The deleted data will be unrecoverable."
 msgstr ""
+"Wil je werkelijk alle bijvoegsels verwijderen van de geselecteerde "
+"berichten?\n"
+"\n"
+"De verwijderde gegevens kunnen niet teruggehaald worden."
 
 #: src/plugins/att_remover/att_remover.c:479
-#, fuzzy
 msgid "This message doesn't have any attachments."
-msgstr "berichten die getagged zijn"
+msgstr "Dit bericht bevat geen bijvoegsels."
 
 #: src/plugins/att_remover/att_remover.c:494
-#, fuzzy
 msgid "Remove attachments..."
-msgstr "Negeer bijvoegsel"
+msgstr "Verwijder bijvoegsels..."
 
-#: src/plugins/att_remover/att_remover.c:507
-#: src/plugins/att_remover/att_remover.c:574
-#, fuzzy
+#: src/plugins/att_remover/att_remover.c:506
+#: src/plugins/att_remover/att_remover.c:566
 msgid "AttRemover"
-msgstr "Verwijderen"
+msgstr "Bijvoegsel Verwijderaar"
 
-#: src/plugins/att_remover/att_remover.c:579
+#: src/plugins/att_remover/att_remover.c:571
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
 "Warning: this operation will be completely un-cancellable and the deleted "
 "attachments will be lost forever, and ever, and ever."
 msgstr ""
+"Deze plugin verwijdert bijvoegsels van e-mails.\n"
+"\n"
+"Waarschuwing: deze operatie is volledig onomkeerbaar en de verwijderde "
+"bijvoegsels zijn voor eeuwig en eeuwig verloren."
 
-#: src/plugins/att_remover/att_remover.c:603
-#, fuzzy
+#: src/plugins/att_remover/att_remover.c:595
 msgid "Attachment handling"
-msgstr "Bijvoegsel waarschuwing"
+msgstr "Bijvoegsel afhandeling"
 
-#: src/plugins/attachwarner/attachwarner.c:309
+#: src/plugins/attachwarner/attachwarner.c:216
 #, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
@@ -8835,23 +8805,28 @@ msgid ""
 "\n"
 "%s it anyway?"
 msgstr ""
+"Een bijvoegsel wordt vermeld in de e-mail die je verstuurt, maar er was geen "
+"bestand bijgevoegd. De melding verschijnt op regel %d, die begint met de "
+"tekst: <span weight=\"bold\">%.20s</span>...\n"
+"\n"
+"%s het toch nog?"
 
-#: src/plugins/attachwarner/attachwarner.c:313
+#: src/plugins/attachwarner/attachwarner.c:220
 msgid "Attachment warning"
 msgstr "Bijvoegsel waarschuwing"
 
-#: src/plugins/attachwarner/attachwarner.c:338
-#: src/plugins/attachwarner/attachwarner.c:375
-#: src/plugins/attachwarner/attachwarner.c:427
+#: src/plugins/attachwarner/attachwarner.c:245
+#: src/plugins/attachwarner/attachwarner.c:282
+#: src/plugins/attachwarner/attachwarner.c:334
 msgid "Attach warner"
 msgstr "Voeg waarschuwing bij"
 
-#: src/plugins/attachwarner/attachwarner.c:345
-#: src/plugins/address_keeper/address_keeper.c:221
+#: src/plugins/attachwarner/attachwarner.c:252
+#: src/plugins/address_keeper/address_keeper.c:254
 msgid "Failed to register check before send hook"
 msgstr "Niet gelukt om de controleer voor verzenden haak te registreren"
 
-#: src/plugins/attachwarner/attachwarner.c:385
+#: src/plugins/attachwarner/attachwarner.c:292
 msgid ""
 "Warns user if some reference to attachments is found in the message text and "
 "no file is attached."
@@ -8859,107 +8834,130 @@ msgstr ""
 "Waarschuw gebruiker als er een referentie naar bijvoegsels is gevonden in de "
 "berichttekst en er is geen bestand bijgevoegd"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:53
+#: src/plugins/attachwarner/attachwarner_prefs.c:54
 msgid "attach"
 msgstr "voeg bij"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:80
-msgid ""
-"Warn when matching the following regular expressions:\n"
-"(one per line)"
+#: src/plugins/attachwarner/attachwarner_prefs.c:85
+msgid "One of the following regular expressions is matched (one per line):"
+msgstr "Een van de volgende reguliere expressies kwam overeen (een per regel):"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:89
+msgid "Expressions are case sensitive"
+msgstr "Expressies zijn hoofdlettergevoelig"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:96
+msgid "Case sensitive when matching for the regular expressions in the list"
 msgstr ""
-"Waarschuw bij het voorkomen van de volgende reguliere expressies:\n"
-"een per regel"
+"Hoofdlettergevoelig bij het voorkomen van de reguliere expressies in de lijst"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:99
-msgid "Skip quoted lines"
-msgstr "Sla geciteerde regels over"
+#: src/plugins/attachwarner/attachwarner_prefs.c:114
+msgid "Lines starting with quotation marks"
+msgstr "Regels beginnend met citaat markeringen"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:106
-msgid "Exclude quoted lines from checking for the regular expressions above"
-msgstr "Negeer geciteerde regels bij het controleren van reguliere expressies"
+#: src/plugins/attachwarner/attachwarner_prefs.c:121
+msgid ""
+"Exclude quoted lines from checking for the regular expressions above. Note "
+"that handmade quotes cannot be distinguished from quotes generated by "
+"replying."
+msgstr ""
+"Negeer geciteerde regels bij het controleren van reguliere expressies. "
+"Opmerking: handgemaakte citaten kunnen niet worden onderscheiden van citaten "
+"die gegenereerd zijn bij het antwoorden."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:109
-msgid "Skip forwards and redirections"
-msgstr "Sla doorsturingen en herverwijzingen over"
+#: src/plugins/attachwarner/attachwarner_prefs.c:124
+msgid "Forwarded or redirected messages"
+msgstr "doorgestuurde of herverwezen berichten"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:116
+#: src/plugins/attachwarner/attachwarner_prefs.c:131
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr ""
 "Controleer niet op missende bijvoegsels bij doorgestuurde of herverwezen "
 "berichten"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:119
-#, fuzzy
-msgid "Skip signature"
-msgstr "Handtekening"
+#: src/plugins/attachwarner/attachwarner_prefs.c:134
+#: src/prefs_msg_colors.c:362
+msgid "Signatures"
+msgstr "Handtekeningen"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:126
+#: src/plugins/attachwarner/attachwarner_prefs.c:141
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
 msgstr ""
+"Negeer regels van de eerste handtekening-scheiding en verder bij het "
+"controleren op de reguliere expressie hierboven"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:147
+msgid "Warn when"
+msgstr "Waarschuwen wanneer"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:202
+#: src/plugins/attachwarner/attachwarner_prefs.c:151
+msgid "Excluding"
+msgstr "Negeren"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:229
 msgid "Attach Warner"
 msgstr "Attach Warner"
 
-#: src/plugins/address_keeper/address_keeper.c:261
-#, fuzzy
+#: src/plugins/address_keeper/address_keeper.c:294
 msgid "Keeps all recipient addresses in an addressbook folder."
-msgstr "Alleen voor afzenders uit het adresboek/map"
+msgstr "Bewaart alle ontvangers in een adresboek map."
 
-#: src/plugins/address_keeper/address_keeper.c:302
+#: src/plugins/address_keeper/address_keeper.c:335
 #: src/plugins/address_keeper/address_keeper.h:34
-#: src/plugins/address_keeper/address_keeper_prefs.c:209
-#, fuzzy
+#: src/plugins/address_keeper/address_keeper_prefs.c:249
 msgid "Address Keeper"
-msgstr "Adres"
+msgstr "Adres Bewaarder"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:97
-#, fuzzy
+#: src/plugins/address_keeper/address_keeper_prefs.c:104
 msgid "Keep to folder"
-msgstr "Verwijder map"
+msgstr "Bewaar in map"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:105
+#: src/plugins/address_keeper/address_keeper_prefs.c:112
 msgid "Address book path where addresses are kept"
-msgstr ""
+msgstr "Adresboek pad waar adressen opgeslagen worden"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:107
-#, fuzzy
+#: src/plugins/address_keeper/address_keeper_prefs.c:114
+#: src/plugins/bogofilter/bogofilter_gtk.c:234
+#: src/plugins/bsfilter/bsfilter_gtk.c:201
+#: src/plugins/spamassassin/spamassassin_gtk.c:447
+#: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
+#: src/prefs_matcher.c:676
 msgid "Select..."
-msgstr "Selecteer..."
+msgstr "Selecteren..."
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:123
-#, fuzzy
+#: src/plugins/address_keeper/address_keeper_prefs.c:130
 msgid "Keep 'To' addresses"
-msgstr "Persoonlijke adressen"
+msgstr "Bewaar 'Aan' adressen"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:128
-#, fuzzy
+#: src/plugins/address_keeper/address_keeper_prefs.c:135
 msgid "Keep addresses which appear in 'To' headers"
-msgstr "alle adressen in alle headers"
+msgstr "Bewaar adressen die in 'Aan' headers voorkomen"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:133
-#, fuzzy
+#: src/plugins/address_keeper/address_keeper_prefs.c:140
 msgid "Keep 'Cc' addresses"
-msgstr "_Verzamel adressen"
+msgstr "Bewaar 'Cc'  adressen"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:138
-#, fuzzy
+#: src/plugins/address_keeper/address_keeper_prefs.c:145
 msgid "Keep addresses which appear in 'Cc' headers"
-msgstr "alle adressen in alle headers"
+msgstr "Bewaar adressen die in 'Cc' headers vooromen"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:143
-#, fuzzy
+#: src/plugins/address_keeper/address_keeper_prefs.c:150
 msgid "Keep 'Bcc' addresses"
-msgstr "_Verzamel adressen"
+msgstr "Bewaar 'Bcc' adressen"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:148
-#, fuzzy
+#: src/plugins/address_keeper/address_keeper_prefs.c:155
 msgid "Keep addresses which appear in 'Bcc' headers"
-msgstr "alle adressen in alle headers"
+msgstr "Bewaar adressen die in 'Bcc' headers voorkomen"
+
+#: src/plugins/address_keeper/address_keeper_prefs.c:160
+msgid ""
+"Exclude addresses matching the following regular expressions (one per line):"
+msgstr ""
+"Negeer adressen bij het voorkomen van de volgende reguliere expressies (een "
+"per regel):"
 
 #: src/plugins/bogofilter/bogofilter.c:81
 #: src/plugins/bogofilter/bogofilter_gtk.c:458
@@ -9033,12 +9031,12 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
 msgstr ""
-"Deze plugin controleert alle berichten die binnen komen via een IMAP, LOCAL "
-"of POP account op spam met gebruik van Bogofilter. Voor deze plugin heeft U "
+"Deze plugin controleert alle berichten die binnen komen via een IMAP, LOKAAL "
+"of POP account op spam met gebruik van Bogofilter. Voor deze plugin heb je "
 "een lokale installatie van Bogofilter nodig.\n"
 "\n"
-"Voordat Bogofilter spamberichten kan herkennen moet het getraind worden "
-"doorhet markeren van enkele honderden spam- en hamberichten mbv \"/Markeer/"
+"Voordat Bogofilter spamberichten kan herkennen moet het getraind worden door "
+"het markeren van enkele honderden spam- en hamberichten mbv \"/Markeer/"
 "Markeer als spam\" en \"/Markeer/Markeer als ham\".\n"
 "\n"
 "Als een bericht geïdentificeerd is als spam kan het worden verwijderd of "
@@ -9047,13 +9045,13 @@ msgstr ""
 "Opties kunnen worden gevonden in /Instellingen/Voorkeuren/Plugins/Bogofilter"
 
 #: src/plugins/bogofilter/bogofilter.c:1035
-#: src/plugins/bsfilter/bsfilter.c:670
+#: src/plugins/bsfilter/bsfilter.c:674
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Spam detecteren"
 
 #: src/plugins/bogofilter/bogofilter.c:1036
-#: src/plugins/bsfilter/bsfilter.c:671
+#: src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Spam leren"
@@ -9078,7 +9076,7 @@ msgstr "Berichten groter dan dit zullen niet worden gecontroleerd"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:170
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1479
+#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1483
 msgid "KB"
 msgstr "KB"
 
@@ -9145,14 +9143,6 @@ msgstr ""
 "Berichten komend vanaf contacten in het adresboek zullen worden geplaatst in "
 "de gewone map zelfs als ze als spam herkend worden"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:234
-#: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:447
-#: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
-#: src/prefs_matcher.c:676
-msgid "Select ..."
-msgstr "Selecteer..."
-
 #: src/plugins/bogofilter/bogofilter_gtk.c:238
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
 #: src/plugins/spamassassin/spamassassin_gtk.c:451
@@ -9239,7 +9229,7 @@ msgstr ""
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: leren van bericht..."
 
-#: src/plugins/bsfilter/bsfilter.c:637
+#: src/plugins/bsfilter/bsfilter.c:641
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -9255,10 +9245,10 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Bsfilter"
 msgstr ""
 "Deze plugin kan alle berichten die van een IMAP, lokaal of POP account wordt "
-"ontvangen controleren op spam met gebruik van Bsfilter. U hebt een "
+"ontvangen controleren op spam met gebruik van Bsfilter. Je hebt een "
 "installatie van Bsfilter lokaal nodig.\n"
 "\n"
-"Voordat Bsfilter spam berichten kan herkennen, moet u het trainen door het "
+"Voordat Bsfilter spam berichten kan herkennen, moet je het trainen door het "
 "markeren van enkele honderden spam en ham berichten door het gebruik van \"/"
 "Markeren/Markeer als spam\" en \"/Markeren/Markeer als ham\".\n"
 "\n"
@@ -9267,62 +9257,74 @@ msgstr ""
 "\n"
 "Opties kunnen gevonden worden in /Instellingen/Voorkeuren/Plugins/Bsfilter"
 
-#: src/plugins/clamd/clamav_plugin.c:45
+#: src/plugins/clamd/clamav_plugin.c:47
 #: src/plugins/clamd/clamav_plugin_gtk.c:550
 msgid "Clam AntiVirus"
-msgstr ""
+msgstr "Clam AntiVirus"
 
-#: src/plugins/clamd/clamav_plugin.c:103
+#: src/plugins/clamd/clamav_plugin.c:106
 msgid ""
 "Scanning\n"
 "No socket information.\n"
 "Antivirus disabled."
 msgstr ""
+"Scannen\n"
+"Geen socket informatie.\n"
+"Antivirus uitgeschakeld."
 
-#: src/plugins/clamd/clamav_plugin.c:107
+#: src/plugins/clamd/clamav_plugin.c:110
 msgid ""
 "Scanning\n"
 "Clamd does not respond to ping.\n"
 "Is clamd running?"
 msgstr ""
+"Scannen\n"
+"Clamd reageert niet op ping.\n"
+"Draait clamd wel?"
 
-#: src/plugins/clamd/clamav_plugin.c:111
+#: src/plugins/clamd/clamav_plugin.c:113
 #, c-format
 msgid "Detected %s virus."
-msgstr ""
+msgstr "%s virus ontdekt."
 
-#: src/plugins/clamd/clamav_plugin.c:115
-#, fuzzy, c-format
+#: src/plugins/clamd/clamav_plugin.c:127
+#, c-format
 msgid ""
 "Scanning error:\n"
 "%s"
-msgstr "Map wordt ingelezen %s ..."
+msgstr ""
+"Fout bij scannen:\n"
+"%s"
 
-#: src/plugins/clamd/clamav_plugin.c:149
-#, fuzzy
+#: src/plugins/clamd/clamav_plugin.c:161
 msgid "ClamAV: scanning message..."
-msgstr "Berichten afvlaggen..."
+msgstr "ClamAV: scannen bericht..."
 
-#: src/plugins/clamd/clamav_plugin.c:250
-#, fuzzy
+#: src/plugins/clamd/clamav_plugin.c:262
 msgid "Failed to register mail filtering hook"
-msgstr "Registreren van log-tekst-haak mislukt"
+msgstr "Registreren van mail filter haak mislukt"
 
-#: src/plugins/clamd/clamav_plugin.c:267
+#: src/plugins/clamd/clamav_plugin.c:279
 msgid ""
 "Init\n"
 "No socket information.\n"
 "Antivirus disabled."
 msgstr ""
+"Initialisatie\n"
+"Geen socket informatie.\n"
+"Antivirus uitgeschakeld."
 
-#: src/plugins/clamd/clamav_plugin.c:271
+#: src/plugins/clamd/clamav_plugin.c:283
 msgid ""
 "Init\n"
 "Clamd does not respond to ping.\n"
 "Is clamd running?"
 msgstr ""
+"Initialisatie\n"
+"Clamd reageert niet op ping.\n"
+"Draait clamd wel?"
 
-#: src/plugins/clamd/clamav_plugin.c:302
+#: src/plugins/clamd/clamav_plugin.c:314
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
@@ -9344,104 +9346,117 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
 msgstr ""
+"Deze plugin gebruikt Clam AntiVirus om alle berichten te scannen die "
+"ontvangen zijn via een IMAP, LOKAAL of POP account.\n"
+"\n"
+"Wanneer in een bijvoegsel een virus is gevonden kan het verwijderd worden of "
+"opgeslagen in een speciaal daarvoor bestemde map.\n"
+"\n"
+"Omdat deze plugin communiceert met clamd via een \n"
+"socket zijn er wat minimale eisen voor de permissies van\n"
+"je home map en de .claws-mail map wanneer de\n"
+"clamav-daemon geconfigureerd is om te communiceren\n"
+"via een unix socket.\n"
+"Alle gebruikers moeten minstens uitvoer permissies geven op\n"
+"deze mappen.\n"
+"\n"
+"Om het wijzigen van de permissies te vermijden kun je ook\n"
+"de clamav-daemon configureren om te communiceren via een\n"
+"TCP socket en handmatige configuratie kiezen voor clamd.\n"
+"\n"
+"Opties kunnen gevonden worden in\n"
+"/Configuratie/Voorkeuren/Plugins/Clam AntiVirus"
 
-#: src/plugins/clamd/clamav_plugin.c:341
-#, fuzzy
+#: src/plugins/clamd/clamav_plugin.c:353
 msgid "Virus detection"
-msgstr "Spam detecteren"
+msgstr "Virus detecteren"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:246
 msgid "Enable virus scanning"
-msgstr ""
+msgstr "Zet virus scannen aan"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:256
-#, fuzzy
 msgid "Maximum attachment size"
-msgstr "Maximale grootte"
+msgstr "Maximale grootte bijvoegsel"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:267
-#, fuzzy
 msgid "Message attachments larger than this will not be scanned"
 msgstr "Berichten groter dan dit zullen niet worden gecontroleerd"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:271
 msgid "MB"
-msgstr ""
+msgstr "MB"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:280
-#, fuzzy
 msgid "Save infected mail in"
-msgstr "E-mail opslaan op schijf"
+msgstr "Geïnfecteerde e-mail opslaan in"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:284
 msgid "Save mail that contains viruses"
-msgstr ""
+msgstr "Bewaar e-mail die virussen bevat"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:292
-#, fuzzy
 msgid ""
 "Folder for storing infected mail. Leave empty to use the default trash folder"
 msgstr ""
-"Map om spam in op te slaan. Laat leeg om de standaard prullenbak te "
-"gebruiken."
+"Map om geïnfecteerde e-mail in op te slaan. Laat leeg om de standaard "
+"prullenbak te gebruiken"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:300
-#, fuzzy
 msgid "Click this button to select a folder for storing infected mail"
 msgstr ""
-"Klik op deze knop om een map te selecteren voor het opslaan van mogelijke "
-"spam."
+"Klik op deze knop om een map te selecteren voor het opslaan van "
+"geïnfecteerde e-mail"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:308
-#, fuzzy
 msgid "Automatic configuration"
-msgstr "Acties instellen"
+msgstr "Automatische instellingen"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:313
 msgid "Should configuration be done automatic or manual"
-msgstr ""
+msgstr "Moet configuratie automatisch of handmatig gedaan worden"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:321
 msgid "Where is clamd.conf"
-msgstr ""
+msgstr "Waar is clamd.conf"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:329
 msgid ""
 "Full path to clamd.conf. If this field is not empty then the plugin has been "
 "able to locate the file automatically"
 msgstr ""
+"Volledige pad naar clamd.conf. Als dit veld niet leeg is dan kon de plugin "
+"het bestand automatisch vinden"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:333
-#, fuzzy
 msgid "Br_owse"
-msgstr "Bekijk"
+msgstr "Be_kijk"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:337
-#, fuzzy
 msgid "Click this button to select full path to clamd.conf"
-msgstr "Klik op deze knop om een map te selecteren voor het opslaan van spam"
+msgstr "Klik op deze knop om het volledige pad te selecteren naar clamd.conf"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:345
 msgid "Check permission for folders and adjust if necessary"
-msgstr ""
+msgstr "Controleer permissies voor mappen en wijzig indien noodzakelijk"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:358
-#, fuzzy
 msgid "Click this button to check and adjust folder permissions"
-msgstr "Klik op deze knop om een map te selecteren voor het opslaan van spam"
+msgstr ""
+"Klik op deze knop om te controleren op bestandspermissies en deze aan te "
+"passen"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:366
-#, fuzzy
 msgid "Remote Host"
-msgstr "Verwijder na"
+msgstr "Server"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:374
 msgid "Hostname or IP for remote host running clamav daemon"
-msgstr ""
+msgstr "Hostnaam of IP voor de server die de clamav daemon draait"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:396
 msgid "Port number where clamav daemon is listening"
-msgstr ""
+msgstr "Poort nummer waarop de clamav daemon luistert"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:525
 msgid ""
@@ -9449,6 +9464,9 @@ msgid ""
 "No socket information.\n"
 "Antivirus disabled."
 msgstr ""
+"Nieuwe configuratie\n"
+"Geen socket informatie.\n"
+"Antivirus uitgezet."
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:529
 msgid ""
@@ -9456,6 +9474,9 @@ msgid ""
 "Clamd does not respond to ping.\n"
 "Is clamd running?"
 msgstr ""
+"Nieuwe configuratie\n"
+"Clamd reageert niet op ping.\n"
+"Draait clamd wel?"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:117
 #, c-format
@@ -9463,6 +9484,8 @@ msgid ""
 "%s: Unable to open\n"
 "clamd will be disabled"
 msgstr ""
+"%s: Niet in staat te openen\n"
+"clamd wordt uitgezet"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:215
 #, c-format
@@ -9470,39 +9493,35 @@ msgid ""
 "%s: Not able to find required information\n"
 "clamd will be disabled"
 msgstr ""
+"%s: Niet in staat de benodigde informatie te vinden\n"
+"clamd wordt uitgezet"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:249
-#, fuzzy
 msgid "Could not create socket"
-msgstr ""
-"Kon mbox-bestand niet aanmaken:\n"
-"%s\n"
+msgstr "Kon socket niet aanmaken"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:420
-#, fuzzy
 msgid ": File does not exist"
-msgstr "Beheer bestand bestaat niet."
+msgstr ": Bestand bestaat niet"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:433
 msgid ": Unable to open"
-msgstr ""
+msgstr ": Niet in staat te openen"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:446
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Error reading"
-msgstr "Fout bij lezen bestand"
+msgstr "%s: Fout bij lezen"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:457
 #: src/plugins/clamd/libclamd/clamd-plugin.c:462
 #: src/plugins/clamd/libclamd/clamd-plugin.c:471
-#, fuzzy
 msgid "Socket write error"
-msgstr "Socket-fout."
+msgstr "Socket schrijffout"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:478
-#, fuzzy
 msgid "Socket read error"
-msgstr "Socket-fout."
+msgstr "Socket leesfout"
 
 #: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:100
 msgid "Demo"
@@ -9525,168 +9544,199 @@ msgstr ""
 "\n"
 "De plugin is als plugin niet echt echt nuttig"
 
-#: src/plugins/fancy/fancy_viewer.c:188
-#, c-format
-msgid ""
-"Printing failed:\n"
-" %s"
-msgstr ""
-"Printen mislukt:\n"
-" %s"
-
-#: src/plugins/fancy/fancy_viewer.c:216
-msgid "Printing HTML is only possible if the program 'html2ps' is installed."
-msgstr "HTML printen kan alleen als het 'html2ps' programma geinstalleerd is."
-
-#: src/plugins/fancy/fancy_viewer.c:221
-msgid "Filename is null."
-msgstr "Bestandsnaam is niet ingevuld."
-
-#: src/plugins/fancy/fancy_viewer.c:237
-msgid "Conversion to postscript failed."
-msgstr "Conversie naar postscript mislukt."
-
-#: src/plugins/fancy/fancy_viewer.c:244 src/toolbar.c:209 src/toolbar.c:419
-msgid "Print"
-msgstr "Afdrukken"
-
-#: src/plugins/fancy/fancy_viewer.c:267
-#, c-format
-msgid "Printer %s doesn't accept PostScript files."
-msgstr "Printer %s accepteert geen Postscript bestanden."
-
-#: src/plugins/fancy/fancy_viewer.c:281
-#, c-format
-msgid ""
-"Printing failed:\n"
-"%s"
-msgstr ""
-"Printen mislukt:\n"
-"%s"
-
-#: src/plugins/fancy/fancy_viewer.c:419
-#, c-format
-msgid "Navigation to %s blocked"
-msgstr ""
+#: src/plugins/fancy/fancy_viewer.c:392
+msgid "Remote content loading is disabled."
+msgstr "Inhoud van de server laden is uitgezet."
 
-#: src/plugins/fancy/fancy_viewer.c:583
+#: src/plugins/fancy/fancy_viewer.c:469
 msgid "Load images"
 msgstr "Laad afbeeldingen"
 
-#: src/plugins/fancy/fancy_viewer.c:587
-msgid "Unblock external content"
-msgstr "Blokkeer externe inhoud"
+#: src/plugins/fancy/fancy_viewer.c:471
+msgid "Enable remote content"
+msgstr "Deblokkeer externe inhoud"
 
-#: src/plugins/fancy/fancy_viewer.c:591 src/plugins/fancy/fancy_prefs.c:194
+#: src/plugins/fancy/fancy_viewer.c:473
 msgid "Enable Javascript"
 msgstr "Zet Javascript Aan"
 
-#: src/plugins/fancy/fancy_viewer.c:595 src/plugins/fancy/fancy_prefs.c:200
+#: src/plugins/fancy/fancy_viewer.c:475
 msgid "Enable Plugins"
 msgstr "Zet Plugins Aan"
 
-#: src/plugins/fancy/fancy_viewer.c:598 src/plugins/fancy/fancy_prefs.c:205
-#, fuzzy
+#: src/plugins/fancy/fancy_viewer.c:477
 msgid "Enable Java"
-msgstr "Aanzetten"
+msgstr "Java aanzetten"
 
-#: src/plugins/fancy/fancy_viewer.c:601 src/plugins/fancy/fancy_prefs.c:210
+#: src/plugins/fancy/fancy_viewer.c:479
 msgid "Open links with external browser"
 msgstr "Open links met externe browser"
 
-#: src/plugins/fancy/fancy_viewer.c:768
+#: src/plugins/fancy/fancy_viewer.c:648
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Een fout gebeurde: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:819
+#: src/plugins/fancy/fancy_viewer.c:704
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s is een foutgevormde of niet-ondersteunde feed"
 
-#: src/plugins/fancy/fancy_viewer.c:830
+#: src/plugins/fancy/fancy_viewer.c:715
 msgid "Search the Web"
 msgstr "Zoeken op het Web"
 
-#: src/plugins/fancy/fancy_viewer.c:846
+#: src/plugins/fancy/fancy_viewer.c:727
+msgid "Open in Viewer"
+msgstr "Open in Bladerprogramma"
+
+#: src/plugins/fancy/fancy_viewer.c:729
+msgid "Open in Viewer (enable remote content)"
+msgstr "Open in Browser (laad inhoud van de server)"
+
+#: src/plugins/fancy/fancy_viewer.c:738
 msgid "Open in Browser"
 msgstr "Open in Bladerprogramma"
 
-#: src/plugins/fancy/fancy_viewer.c:856
+#: src/plugins/fancy/fancy_viewer.c:748
 msgid "Open Image"
 msgstr "Open Afbeelding"
 
-#: src/plugins/fancy/fancy_viewer.c:865
+#: src/plugins/fancy/fancy_viewer.c:757
 msgid "Copy Link"
 msgstr "Kopieer Koppeling"
 
-#: src/plugins/fancy/fancy_viewer.c:871
+#: src/plugins/fancy/fancy_viewer.c:761
 msgid "Download Link"
 msgstr "Haal Koppeling Op"
 
-#: src/plugins/fancy/fancy_viewer.c:893
+#: src/plugins/fancy/fancy_viewer.c:772
 msgid "Save Image As"
 msgstr "Sla Afbeelding Op Als"
 
-#: src/plugins/fancy/fancy_viewer.c:914
+#: src/plugins/fancy/fancy_viewer.c:782
 msgid "Copy Image"
 msgstr "Kopieer Afbeelding"
 
-#: src/plugins/fancy/fancy_viewer.c:933
+#: src/plugins/fancy/fancy_viewer.c:800
 msgid "Import feed"
 msgstr "Importeer feed"
 
-#: src/plugins/fancy/fancy_viewer.c:1162
+#: src/plugins/fancy/fancy_viewer.c:1013
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1187
+#: src/plugins/fancy/fancy_viewer.c:1038
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML Weergever"
 
-#: src/plugins/fancy/fancy_viewer.c:1192
-#, fuzzy, c-format
+#: src/plugins/fancy/fancy_viewer.c:1043
+#, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
-"By default all remote content is blocked and images are not automatically "
-"loaded. Options can be found in /Configuration/Preferences/Plugins/Fancy"
+"By default all remote content is blocked. Options can be found in /"
+"Configuration/Preferences/Plugins/Fancy"
 msgstr ""
-"Deze plugin geeft HTML-berichten weer met de Dillo webbrowser.\n"
-"\n"
-"Opties kunnen worden gevonden in /Instellingen/Voorkeuren/Plugins/Dillo "
-"Browser"
+"Deze plugin geeft HTML-berichten weer met de WebKit %d.%d.%d bibliotheek.\n"
+"Standaard is alle van afstand geladen inhoud geblokkeerd en afbeeldingen "
+"worden niet automatisch geladen. Opties kunnen worden gevonden in /"
+"Instellingen/Voorkeuren/Plugins/Fancy"
+
+#: src/plugins/fancy/fancy_prefs.c:141
+msgid "Display images"
+msgstr "Afbeeldingen weergeven"
+
+#: src/plugins/fancy/fancy_prefs.c:142
+msgid "Display embedded images"
+msgstr "Weergeven ingesloten afbeeldingen"
+
+#: src/plugins/fancy/fancy_prefs.c:146
+msgid "Execute javascript"
+msgstr "Zet Javascript aan"
+
+#: src/plugins/fancy/fancy_prefs.c:147
+msgid "Execute embedded javascript"
+msgstr "Ingesloten Javascript uitvoeren"
+
+#: src/plugins/fancy/fancy_prefs.c:151
+msgid "Execute Java applets"
+msgstr "Java applets uitvoeren"
+
+#: src/plugins/fancy/fancy_prefs.c:152
+msgid "Execute embedded Java applets"
+msgstr "Ingesloten Java applets uitvoeren"
 
 #: src/plugins/fancy/fancy_prefs.c:156
-#, fuzzy
-msgid "Proxy Setting"
-msgstr "Postvakinstelling"
+msgid "Render objects using plugins"
+msgstr "Toon objecten met behulp van plugins"
+
+#: src/plugins/fancy/fancy_prefs.c:157
+msgid "Render embedded objects using plugins"
+msgstr "Toon ingesloten objecten met behulp van plugins"
+
+#: src/plugins/fancy/fancy_prefs.c:164
+msgid "Open in viewer (remote content is enabled)"
+msgstr "Open in browser (inhoud van de server wordt geladen)"
+
+#: src/plugins/fancy/fancy_prefs.c:167
+msgid "Do nothing (remote content is disabled)"
+msgstr "Doe niets (inhoud van de server wordt niet geladen)"
+
+#: src/plugins/fancy/fancy_prefs.c:200
+msgid "Proxy"
+msgstr "Proxy"
 
-#: src/plugins/fancy/fancy_prefs.c:172
-msgid "Use GNOME proxy setting"
+#: src/plugins/fancy/fancy_prefs.c:202
+msgid "Use GNOME's proxy settings"
+msgstr "Gebruik GNOME's proxy instellingen"
+
+#: src/plugins/fancy/fancy_prefs.c:212
+msgid "Use proxy:"
+msgstr "Gebruik proxy:"
+
+#: src/plugins/fancy/fancy_prefs.c:226
+msgid "Remote resources"
+msgstr "Bronnen van de server"
+
+#: src/plugins/fancy/fancy_prefs.c:227
+msgid ""
+"Loading remote resources can lead to some privacy issues.\n"
+"When remote content loading is disabled, nothing will be requested\n"
+"from the network. Rendering of images, scripts, plugin objects or\n"
+"Java applets can still be enabled for content that is attached\n"
+"in the email."
 msgstr ""
+"Inhoud van de server laden kan leiden tot privacy problemen.\n"
+"Wanneer inhoud van de server uitstaat, wordt er niets\n"
+"opgevraagd van het netwerk. Weergeven van afbeeldingen,\n"
+"scripts, plugin objecten of Java applets kan nog steeds\n"
+"worden aangezet voor inhoud die is bijgevoegd in de e-mail."
 
-#: src/plugins/fancy/fancy_prefs.c:182
-msgid "Auto-Load images"
-msgstr "Auto-Laad Afbeeldingen"
+#: src/plugins/fancy/fancy_prefs.c:233
+msgid "Enable loading of remote content"
+msgstr "Inhoud van de server laden"
 
-#: src/plugins/fancy/fancy_prefs.c:188
-msgid "Block external content"
-msgstr "Blokkeer externe inhoud"
+#: src/plugins/fancy/fancy_prefs.c:265
+msgid "When clicking on a link, by default:"
+msgstr "Bij klikken op een link, standaard:"
+
+#: src/plugins/fancy/fancy_prefs.c:273
+msgid "Open in external browser"
+msgstr "Open met externe browser"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:151
 msgid "failed to write Fetchinfo configuration to file\n"
-msgstr ""
+msgstr "Kon Fetchinfo instellingen niet naar bestand schrijven.\n"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:167
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:200
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:179
 msgid "Fetchinfo"
-msgstr ""
+msgstr "Fetchinfo"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:173
-#, fuzzy
 msgid "Failed to register mail receive hook"
-msgstr "Registreren van sluiten-haak mislukt"
+msgstr "Registreren van ontvangen-haak mislukt"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:209
 msgid ""
@@ -9696,92 +9746,92 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Fetchinfo"
 msgstr ""
+"Deze plugin bewerkt gedownloade berichten. Het voegt headers toe met "
+"download informatie: UIDL, Claws Mail account naam, POP server, gebruikers "
+"ID en ophaal tijd.\n"
+"\n"
+"Opties kunnen gevonden worden in /Instellingen/Voorkeuren/Plugins/Fetchinfo"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:236
-#, fuzzy
 msgid "Mail marking"
-msgstr "E-mailverwerking"
+msgstr "E-mail marketing"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:94
-#, fuzzy
 msgid "Add fetchinfo headers"
-msgstr "Verborgen headers"
+msgstr "Toevoegen fetchinfo headers"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:101
 msgid "UIDL"
-msgstr ""
+msgstr "UIDL"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:103
-#, fuzzy
 msgid "Account name"
-msgstr "Account"
+msgstr "Account naam"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:105
-#, fuzzy
 msgid "Receive server"
-msgstr "Ontvangen"
+msgstr "Server om van te ontvangen"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:107
-#, fuzzy
 msgid "UserID"
 msgstr "Gebruikersnaam"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:109
 msgid "Fetch time"
-msgstr ""
+msgstr "Fetch tijd"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:188
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
-msgstr ""
+msgstr "GData plugin: Fout bij het ophalen van contacten: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:204
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Toevoegen %d van"
+msgstr[1] "Toevoegen %d van"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:206
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "1 contact aan de cache"
+msgstr[1] "%d contacten aan de cache"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:216
 msgid "GData plugin: Starting async contacts query\n"
-msgstr ""
+msgstr "GData plugin: Starten asynchronisch contacten ophalen\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:241
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
-msgstr ""
+msgstr "GData plugin: Fout bij ophalen van groepen: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:278
 msgid "GData plugin: Groups received\n"
-msgstr ""
+msgstr "GData plugin: Groepen ontvangen\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:290
 msgid "GData plugin: Starting async groups query\n"
-msgstr ""
+msgstr "GData plugin: Starten asynchronisch groepen ophalen\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:308
 #: src/plugins/gdata/cm_gdata_contacts.c:334
 #, c-format
 msgid "GData plugin: Authentication error: %s\n"
-msgstr ""
+msgstr "GData plugin: Authenticatie fout: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:314
 #: src/plugins/gdata/cm_gdata_contacts.c:340
 msgid "GData plugin: Authenticated\n"
-msgstr ""
+msgstr "GData plugin: Ge-authenticeerd\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:360
 msgid "GData plugin: Starting async authentication\n"
-msgstr ""
+msgstr "GData plugin: Starten asynchronische authenticatie\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:78 src/prefs_account.c:1716
+#: src/plugins/gdata/cm_gdata_prefs.c:78 src/prefs_account.c:1720
 msgid "Authentication"
 msgstr "Authenticatie"
 
@@ -9791,38 +9841,38 @@ msgid "Username:"
 msgstr "Gebruikersnaam:"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:91
-#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1601
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1413
 msgid "Password:"
 msgstr "Wachtwoord:"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:103
 msgid "Polling interval (seconds):"
-msgstr ""
+msgstr "Polling interval (secondes):"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:110
-#, fuzzy
 msgid "Maximum number of results:"
-msgstr "Maximum aantal artikelen dat zal worden opgehaald"
+msgstr "Maximum aantal resultaten:"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:146 src/plugins/gdata/gdata_plugin.c:101
 #: src/plugins/gdata/gdata_plugin.c:156
 msgid "GData"
-msgstr ""
+msgstr "GData"
 
 #: src/plugins/gdata/gdata_plugin.c:75
 msgid ""
 "\n"
 "GData Plugin: Failed to write plugin configuration to file\n"
 msgstr ""
+"\n"
+"GData Plugin: Kon plugin instellingen niet naar bestand wegschrijven\n"
 
 #: src/plugins/gdata/gdata_plugin.c:107
 msgid "Failed to register address completion hook in the GData plugin"
-msgstr ""
+msgstr "Kon adres-completeren-haak niet registreren in de GData plugin"
 
 #: src/plugins/gdata/gdata_plugin.c:114
-#, fuzzy
 msgid "Failed to register offline switch hook in the GData plugin"
-msgstr "Registreren van offline-gaan-haak mislukt"
+msgstr "Registreren van offline-gaan-haak mislukt in de GData plugin"
 
 #: src/plugins/gdata/gdata_plugin.c:161
 msgid ""
@@ -9834,30 +9884,36 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
+"Deze plugin biedt toegang tot het GData protocol voor Claws Mail.\n"
+"\n"
+"Het GData protocol is een interface voor Google diensten\n"
+"Op dit moment is de enige geïmplementeerde functionaliteit om Google "
+"Contacten te gebruiken bij het aanvullen van adressen met behulp van de Tab-"
+"toets.\n"
+"\n"
+"Feedback naar <berndth at gmx.de> is welkom."
 
 #: src/plugins/gdata/gdata_plugin.c:187
-#, fuzzy
 msgid "GData integration"
-msgstr "Doel"
+msgstr "GData integratie"
 
 #: src/plugins/mailmbox/plugin.c:58
 msgid "mailmbox folder (etPan!)"
-msgstr ""
+msgstr "mailmbox folder (etPan!)"
 
 #: src/plugins/mailmbox/plugin.c:63
 msgid "This is a plugin to handle mailboxes in mbox format."
-msgstr ""
+msgstr "Dit is een plugin die inboxen in mbox formaat afhandelt."
 
 #: src/plugins/mailmbox/plugin.c:84
 msgid "MBOX"
-msgstr ""
+msgstr "MBOX"
 
 #: src/plugins/mailmbox/plugin_gtk.c:86
 msgid "mbox (etPan!)..."
-msgstr ""
+msgstr "mbox (etPan!)"
 
 #: src/plugins/mailmbox/plugin_gtk.c:190
-#, fuzzy
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -9867,90 +9923,48 @@ msgstr ""
 "Als een bestaand postvak wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: src/plugins/mailmbox/plugin_gtk.c:196
-#, fuzzy, c-format
-msgid "The mailbox `%s' already exists."
-msgstr "Het postvak '%s' bestaat al."
-
-#: src/plugins/mailmbox/plugin_gtk.c:261 src/plugins/mailmbox/plugin_gtk.c:428
-#, fuzzy, c-format
-msgid "The folder `%s' already exists."
-msgstr "De map '%s' bestaat al."
-
-#: src/plugins/mailmbox/plugin_gtk.c:268
-#, fuzzy, c-format
-msgid "Can't create the folder `%s'."
-msgstr "Kan map '%s' niet aanmaken."
-
-#: src/plugins/mailmbox/plugin_gtk.c:290
-#, fuzzy, c-format
-msgid ""
-"Really remove the mailbox `%s' ?\n"
-"(The messages are NOT deleted from the disk)"
-msgstr ""
-"Wilt u het postvak '%s' werkelijk verwijderen?\n"
-"(De berichten zullen niet van de schijf worden verwijderd)"
-
-#: src/plugins/mailmbox/plugin_gtk.c:323
-#, fuzzy, c-format
+#: src/plugins/mailmbox/plugin_gtk.c:322
+#, c-format
 msgid ""
-"All folder(s) and message(s) under `%s' will be deleted.\n"
+"All folder(s) and message(s) under '%s' will be deleted.\n"
 "Do you really want to delete?"
 msgstr ""
-"Alle mappen en berichten in '%s' zullen worden verwijderd. Terughalen is "
-"niet mogelijk.\n"
-"Wilt u werkelijk verwijderen?"
-
-#: src/plugins/mailmbox/plugin_gtk.c:343
-#, fuzzy, c-format
-msgid "Can't remove the folder `%s'."
-msgstr "Kan map '%s' niet verwijderen."
-
-#: src/plugins/mailmbox/plugin_gtk.c:408
-#, fuzzy, c-format
-msgid "Input new name for `%s':"
-msgstr "Geef een nieuwe naam voor '%s':"
-
-#: src/plugins/newmail/newmail.c:91
-#, fuzzy, c-format
-msgid "Newmail plugin unloaded\n"
-msgstr "%s (plugin niet geladen)"
+"Alle map(pen) en bericht(en) in '%s' zullen worden verwijderd.\n"
+"Wilt je werkelijk verwijderen?"
 
-#: src/plugins/newmail/newmail.c:98 src/plugins/newmail/newmail.c:137
-#, fuzzy
+#: src/plugins/newmail/newmail.c:111 src/plugins/newmail/newmail.c:162
 msgid "NewMail"
-msgstr "Ophalen"
+msgstr "Nieuwe Mail"
 
-#: src/plugins/newmail/newmail.c:103
-#, fuzzy
+#: src/plugins/newmail/newmail.c:116
 msgid "Failed to register newmail hook"
-msgstr "Registreren van sluiten-haak mislukt"
-
-#: src/plugins/newmail/newmail.c:115
-msgid ""
-"Cannot load plugin NewMail\n"
-"$HOME is too long\n"
-msgstr ""
+msgstr "Registreren van nieuwe-mail-haak mislukt"
 
-#: src/plugins/newmail/newmail.c:130
+#: src/plugins/newmail/newmail.c:137 src/plugins/newmail/newmail.c:140
 #, c-format
-msgid ""
-"Newmail plugin loaded\n"
-"Message header summaries written to %s\n"
-msgstr ""
+msgid "Could not open log file %s: %s\n"
+msgstr "Kon log bestand %s niet openen: %s\n"
 
-#: src/plugins/newmail/newmail.c:142
+#: src/plugins/newmail/newmail.c:154
+#, c-format
 msgid ""
-"This Plugin writes a header summary to a log file for each mail received "
+"This plugin writes a header summary to a log file for each mail received "
 "after sorting.\n"
 "\n"
-"Default is ~/Mail/NewLog"
+"Default is ~/Mail/NewLog\n"
+"\n"
+"Current log is %s"
 msgstr ""
+"Deze plugin schrijft een header samenvatting van een log bestand voor elke "
+"ontvangen e-mail na het sorteren.\n"
+"\n"
+"Standaard is ~/Mail/NewLog\n"
+"\n"
+"Huidige log is %s"
 
-#: src/plugins/newmail/newmail.c:165
-#, fuzzy
+#: src/plugins/newmail/newmail.c:188
 msgid "Log file"
-msgstr "Log niveau"
+msgstr "Log bestand"
 
 #: src/plugins/notification/notification_banner.c:356
 msgid "Folder:"
@@ -10082,6 +10096,11 @@ msgstr "Nieuw onbekend bericht"
 msgid "Unknown message type arrived"
 msgstr "Onbekend berichttype aangekomen"
 
+#: src/plugins/notification/notification_popup.c:381
+#: src/plugins/notification/notification_trayicon.c:647
+msgid "Present main window"
+msgstr "Toon hoofdvenster"
+
 #: src/plugins/notification/notification_popup.c:491
 msgid "Mail message"
 msgstr "E-mail bericht"
@@ -10141,7 +10160,7 @@ msgid "Popup"
 msgstr "Popup"
 
 #: src/plugins/notification/notification_prefs.c:464 src/prefs_actions.c:263
-#: src/prefs_receive.c:147
+#: src/prefs_receive.c:133
 msgid "Command"
 msgstr "Opdracht"
 
@@ -10210,12 +10229,12 @@ msgid "Show banner"
 msgstr "Laat banner zien"
 
 #: src/plugins/notification/notification_prefs.c:746
-#: src/plugins/pgpcore/select-keys.c:242 src/plugins/pgpcore/sgpgme.c:144
-#: src/prefs_receive.c:197 src/prefs_summaries.c:462
+#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:144
+#: src/prefs_receive.c:183 src/prefs_summaries.c:462
 msgid "Never"
 msgstr "Nooit"
 
-#: src/plugins/notification/notification_prefs.c:748 src/prefs_receive.c:195
+#: src/plugins/notification/notification_prefs.c:748 src/prefs_receive.c:181
 #: src/prefs_summaries.c:444 src/prefs_summaries.c:463
 msgid "Always"
 msgstr "Altijd"
@@ -10405,14 +10424,16 @@ msgstr "Gebruik globale sneltoetsen"
 #, c-format
 msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
 msgstr ""
+"Voorbeelden van toestenbordcombinaties zijn onder andere <b>%s</b> en <b>%s</"
+"b>"
 
 #: src/plugins/notification/notification_prefs.c:1894
 msgid "<control><shift>F11"
-msgstr ""
+msgstr "<control><shift>F11"
 
 #: src/plugins/notification/notification_prefs.c:1894
 msgid "<alt>N"
-msgstr ""
+msgstr "<alt>N"
 
 #: src/plugins/notification/notification_prefs.c:1905
 msgid "Toggle minimize:"
@@ -10494,125 +10515,113 @@ msgstr[1] "%d nieuwe artikelen in RSS feeds aangekomen"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:703
 msgid "Title:"
-msgstr ""
+msgstr "Titel:"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
-#, fuzzy
 msgid "Author:"
 msgstr "Auteur: "
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:707
 msgid "Creator:"
-msgstr ""
+msgstr "Maker"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:708
 msgid "Producer:"
-msgstr ""
+msgstr "Producent:"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:711
 msgid "Created:"
-msgstr ""
+msgstr "Aangemaakt:"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:715
 msgid "Modified:"
-msgstr ""
+msgstr "Gewijzigd:"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:718
-#, fuzzy
 msgid "Format:"
-msgstr "Formaat"
+msgstr "Formaat:"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:720
 #: src/plugins/pdf_viewer/poppler_viewer.c:723
 msgid "Optimized:"
-msgstr ""
+msgstr "Geoptimaliseerd:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1166
-msgid "PDF Viewer Plugin"
-msgstr ""
+#: src/plugins/pdf_viewer/poppler_viewer.c:1181
+msgid "PDF properties"
+msgstr "PDF eigenschappen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1268
-#, fuzzy
+#: src/plugins/pdf_viewer/poppler_viewer.c:1279
 msgid "Loading..."
-msgstr "Laad..."
+msgstr "Laden..."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1327
+#: src/plugins/pdf_viewer/poppler_viewer.c:1338
 #, c-format
 msgid "%s Document"
-msgstr ""
+msgstr "%s Document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1333
-#, fuzzy, c-format
+#: src/plugins/pdf_viewer/poppler_viewer.c:1344
+#, c-format
 msgid "of %d"
-msgstr "%ld of %ld"
+msgstr "van %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1710
-#: src/plugins/pdf_viewer/poppler_viewer.c:1932
-#, fuzzy
+#: src/plugins/pdf_viewer/poppler_viewer.c:1721
+#: src/plugins/pdf_viewer/poppler_viewer.c:1943
 msgid "Document Index"
-msgstr "Documentatieteam"
+msgstr "Inhoudsopgave"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1900
-#, fuzzy
+#: src/plugins/pdf_viewer/poppler_viewer.c:1911
 msgid "First Page"
-msgstr "eerste pagina"
+msgstr "Eerste Pagina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1903
-#, fuzzy
+#: src/plugins/pdf_viewer/poppler_viewer.c:1914
 msgid "Previous Page"
-msgstr "Vorige pagina"
+msgstr "Vorige Pagina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1906
-#, fuzzy
+#: src/plugins/pdf_viewer/poppler_viewer.c:1917
 msgid "Next Page"
-msgstr "Volgende pagina"
+msgstr "Volgende Pagina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1909
-#, fuzzy
+#: src/plugins/pdf_viewer/poppler_viewer.c:1920
 msgid "Last Page"
-msgstr "Laatste pagina"
+msgstr "Laatste Pagina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1912
-#, fuzzy
+#: src/plugins/pdf_viewer/poppler_viewer.c:1923
 msgid "Zoom In"
 msgstr "Zoom in"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1914
-#, fuzzy
+#: src/plugins/pdf_viewer/poppler_viewer.c:1925
 msgid "Zoom Out"
 msgstr "Zoom uit"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1917
+#: src/plugins/pdf_viewer/poppler_viewer.c:1928
 msgid "Fit Page"
-msgstr ""
+msgstr "Passend"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1920
+#: src/plugins/pdf_viewer/poppler_viewer.c:1931
 msgid "Fit Page Width"
-msgstr ""
+msgstr "Paginabreed passend"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1923
+#: src/plugins/pdf_viewer/poppler_viewer.c:1934
 msgid "Rotate Left"
-msgstr ""
+msgstr "Roteer naar links"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1926
+#: src/plugins/pdf_viewer/poppler_viewer.c:1937
 msgid "Rotate Right"
-msgstr ""
+msgstr "Roteer naar rechts"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1929
+#: src/plugins/pdf_viewer/poppler_viewer.c:1940
 msgid "Document Info"
-msgstr ""
+msgstr "Document Info"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1934
-#, fuzzy
+#: src/plugins/pdf_viewer/poppler_viewer.c:1945
 msgid "Page Number"
-msgstr "Nummer"
+msgstr "Pagina Nummer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1936
-#, fuzzy
+#: src/plugins/pdf_viewer/poppler_viewer.c:1947
 msgid "Zoom Factor"
-msgstr "Zoom passend"
+msgstr "Zoom Factor"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2041
+#: src/plugins/pdf_viewer/poppler_viewer.c:2052
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -10620,15 +10629,18 @@ msgid ""
 "\n"
 "Any feedback is welcome: iwkse at claws-mail.org"
 msgstr ""
+"Deze plugin maakt het mogelijk om PDF en PostScript bijvoegsels te bekijken "
+"met behulp van de Poppler %s bibliotheek en het gs gereedschap.\n"
+"\n"
+"Feedback is welkom: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2047
-#: src/plugins/pdf_viewer/poppler_viewer.c:2055
-#: src/plugins/pdf_viewer/poppler_viewer.c:2075
-#, fuzzy
+#: src/plugins/pdf_viewer/poppler_viewer.c:2058
+#: src/plugins/pdf_viewer/poppler_viewer.c:2066
+#: src/plugins/pdf_viewer/poppler_viewer.c:2086
 msgid "PDF Viewer"
-msgstr "een weergever"
+msgstr "PDF Weergever"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2051
+#: src/plugins/pdf_viewer/poppler_viewer.c:2062
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -10637,45 +10649,79 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Waarschuwing: kon het ghostscript programma (gs) niet vinden. Deze is nodig "
+"om via de %s plugin PostScript bijvoegsels te bekijken. Nu kunnen alleen PDF "
+"bijvoegsels worden getoond. Om PostScript te ondersteunen kun je het gs "
+"programma installeren.\n"
+"\n"
+"%s"
 
-#: src/plugins/python/python_plugin.c:338
-#: src/plugins/python/python_plugin.c:482
+#: src/plugins/python/python_plugin.c:358
+#: src/plugins/python/python_plugin.c:502
 msgid "Python scripts"
 msgstr "Python scripts"
 
-#: src/plugins/python/python_plugin.c:477
+#: src/plugins/python/python_plugin.c:497
 msgid "Show Python console..."
 msgstr "Geef Python console weer..."
 
-#: src/plugins/python/python_plugin.c:483
+#: src/plugins/python/python_plugin.c:503
 msgid "Refresh"
 msgstr "Verversen"
 
-#: src/plugins/python/python_plugin.c:485 src/prefs_account.c:2480
-#: src/prefs_account.c:2502 src/prefs_account.c:2761 src/wizard.c:1379
-#: src/wizard.c:1658
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2480
+#: src/prefs_account.c:2502 src/prefs_account.c:2761 src/wizard.c:1191
+#: src/wizard.c:1465
 msgid "Browse"
 msgstr "Bekijk"
 
-#: src/plugins/python/python_plugin.c:548
-#: src/plugins/python/python_plugin.c:602
+#: src/plugins/python/python_plugin.c:646
+#: src/plugins/python/python_plugin.c:725
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:554
-#, fuzzy
+#: src/plugins/python/python_plugin.c:652
 msgid "Failed to register \"compose create hook\" in the Python plugin"
-msgstr "Registreren van sluiten-haak mislukt"
+msgstr "Registreren van \"aanmaken-maak-haak\" mislukt in de Python plugin"
 
-#: src/plugins/python/python_plugin.c:607
+#: src/plugins/python/python_plugin.c:730
 msgid ""
 "This plugin provides Python integration features.\n"
+"Python code can be entered interactively into an embedded Python console, "
+"under Tools -> Show Python console, or stored in scripts.\n"
+"\n"
+"These scripts are then available via the menu. You can assign keyboard "
+"shortcuts to them just like it is done with other menu items. You can also "
+"put buttons for script invokation into the toolbars using Claws Mail's "
+"builtin toolbar editor.\n"
+"\n"
+"You can provide scripts working on the main window by placing files into ~/."
+"claws-mail/python-scripts/main.\n"
+"\n"
+"You can also provide scripts working on an open compose window by placing "
+"files into ~/.claws-mail/python-scripts/compose.\n"
+"\n"
+"The folder ~/.claws-mail/python-scripts/auto/ may contain some scripts that "
+"are automatically executed when certain events occur. Currently, the "
+"following files in this directory are recognised:\n"
+"\n"
+"compose_any\n"
+"Gets executed whenever a compose window is opened, no matterif that opening "
+"happened as a result of composing a new message,replying or forwarding a "
+"message.\n"
+"\n"
+"startup\n"
+"Executed at plugin load\n"
+"\n"
+"shutdown\n"
+"Executed at plugin unload\n"
+"\n"
 "\n"
 "For the most up-to-date API documentation, type\n"
 "\n"
 " help(clawsmail)\n"
 "\n"
-"in the interactive Python console under Tools -> Show Python console.\n"
+"in the interactive Python console.\n"
 "\n"
 "The source distribution of this plugin comes with various example scripts in "
 "the \"examples\" subdirectory. If you wrote a script that you would be "
@@ -10684,8 +10730,52 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
+"Deze plugin biedt Python integratie mogelijkheden.\n"
+"Python code kan interactief ingevoerd worden in een ingesloten Python "
+"console, onder Gereedschap -> Toon Python console, of opgeslagen in "
+"scripts.\n"
+"\n"
+"Deze scripts zijn dan beschikbaar in het menu. Je kunt er snelkoppelingen "
+"aan toewijzen zoals met andere menu items. Je kunt ook knoppen toevoegen aan "
+"de werkbalk om scripts te starten met behulp van Claws Mail's ingebouwde "
+"werkbalk bewerker.\n"
+"\n"
+"Je kunt scripts toevoegen aan het hoofdvenster door bestanden te plaatsen in "
+"~/.claws-mail/python-scripts/main.\n"
+"\n"
+"Je kunt ook scripts toevoegen aan een open schrijfvenster door bestanden te "
+"plaatsen in ~/.claws-mail/python-scripts/compose.\n"
+"\n"
+"De map ~/.claws-mail/python-scripts/auto/ kan scripts bevatten die "
+"automatisch gestart worden wanneer bepaalde events gebeuren. Op dit moment "
+"worden de volgende bestanden herkend:\n"
+"\n"
+"compose_any\n"
+"Wordt uitgevoerd wanneer een schrijfvenster wordt geopend, onafhankelijk of "
+"dat gebeurt als gevolg van het schijven van een nieuw bericht, of antwoorden "
+"of doorsturen.\n"
+"\n"
+"startup\n"
+"Uitgevoerd bij het laden van de plugin\n"
+"\n"
+"shutdown\n"
+"Uitgevoerd bij het ontladen van de plugin\n"
+"\n"
+"\n"
+"Voor de meest bijgewerkte API documentatie, type\n"
+"\n"
+" help(clawsmail)\n"
+"\n"
+"in de interactieve Python console\n"
+"\n"
+"De broncode distributie van deze plugin komt met verschillende voorbeeld "
+"scripts in de \"examples\" submap. Als je een script hebt geschreven dat je "
+"wilt delen, stuur het naar mij zodat ik kan overwegen het aan de voorbeelden "
+"toe te voegen.\n"
+"\n"
+"Feedback naar <berndth at gmx.de> is welkom."
 
-#: src/plugins/python/python_plugin.c:636
+#: src/plugins/python/python_plugin.c:781
 msgid "Python integration"
 msgstr "Python integratie"
 
@@ -10693,12 +10783,12 @@ msgstr "Python integratie"
 msgid "Passphrase"
 msgstr "Wachtwoord"
 
-#: src/plugins/pgpcore/passphrase.c:253
+#: src/plugins/pgpcore/passphrase.c:249
 msgid "[no user id]"
 msgstr "[geen gebruikersnaam]"
 
 # c-format
-#: src/plugins/pgpcore/passphrase.c:264
+#: src/plugins/pgpcore/passphrase.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the "
@@ -10711,12 +10801,12 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:267
+#: src/plugins/pgpcore/passphrase.c:263
 msgid "Passphrases did not match.\n"
 msgstr "Wachtwoord was niet hetzelfde.\n"
 
 # c-format
-#: src/plugins/pgpcore/passphrase.c:270
+#: src/plugins/pgpcore/passphrase.c:266
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the "
@@ -10730,7 +10820,7 @@ msgstr ""
 "%.*s\n"
 
 # c-format
-#: src/plugins/pgpcore/passphrase.c:274
+#: src/plugins/pgpcore/passphrase.c:270
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
@@ -10742,7 +10832,7 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:277
+#: src/plugins/pgpcore/passphrase.c:273
 msgid "Bad passphrase.\n"
 msgstr "Fout wachtwoord! Probeer opnieuw...\n"
 
@@ -10755,7 +10845,7 @@ msgid ""
 "This key is not in your keyring. Do you want Claws Mail to try and import it "
 "from a keyserver?"
 msgstr ""
-"Deze seutel zit niet aan uw sleutelring. Wilt u dat Claws Mail probeert om "
+"Deze sleutel zit niet aan je sleutelring. Wil je dat Claws Mail probeert om "
 "hem te importeren van een sleutelserver?"
 
 #: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:201
@@ -10779,7 +10869,7 @@ msgid ""
 "when working online,\n"
 "   or "
 msgstr ""
-"als u offline werkt,\n"
+"als je offline werkt,\n"
 "   of "
 
 #: src/plugins/pgpcore/pgp_viewer.c:136
@@ -10802,11 +10892,11 @@ msgstr ""
 
 #: src/plugins/pgpcore/pgp_viewer.c:186
 msgid "   This key has been imported to your keyring.\n"
-msgstr "   Deze sleutel is geïmporteerd in uw seutelring.\n"
+msgstr "   Deze sleutel is geïmporteerd in je sleutelring.\n"
 
 #: src/plugins/pgpcore/pgp_viewer.c:188
 msgid "   This key couldn't be imported to your keyring.\n"
-msgstr "   Deze seutel kon niet geïmporteerd worden in uw seutelring.\n"
+msgstr "   Deze sleutel kon niet geïmporteerd worden in je sleutelring.\n"
 
 #: src/plugins/pgpcore/pgp_viewer.c:189
 msgid "   Key servers are sometimes slow.\n"
@@ -10818,7 +10908,7 @@ msgid ""
 "\n"
 "     "
 msgstr ""
-"   Uw kunt proberen hem handmatig te importeren met de opdracht:\n"
+"   Je kunt proberen hem handmatig te importeren met de opdracht:\n"
 "\n"
 "     "
 
@@ -10828,7 +10918,7 @@ msgstr "   Seutels importeren is niet geïmplementeerd onder Windows.\n"
 
 #: src/plugins/pgpcore/pgp_viewer.c:204
 msgid "   This key is in your keyring.\n"
-msgstr "   Deze sleutel zit aan uw sleutelring.\n"
+msgstr "   Deze sleutel zit aan je sleutelring.\n"
 
 #: src/plugins/pgpcore/plugin.c:36
 msgid "PGP/Core"
@@ -10882,7 +10972,7 @@ msgstr ""
 "Instellen op 0 zal het wachtwoord voor de hele\n"
 "sessie opslaan"
 
-#: src/plugins/pgpcore/prefs_gpg.c:145 src/prefs_receive.c:173
+#: src/plugins/pgpcore/prefs_gpg.c:145 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "minute(n)"
 
@@ -10936,53 +11026,53 @@ msgstr "Geen exacte overeenkomst gevonden voor '%s'; selecteer de sleutel."
 msgid "Collecting info for '%s' ... %c"
 msgstr "Info wordt verzameld voor '%s' ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:142
 msgid "Undefined"
 msgstr "Niet gedefiniëerd"
 
-#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:146
+#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:146
 msgid "Marginal"
 msgstr "Marginaal"
 
-#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:150
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:150
 msgid "Ultimate"
 msgstr "Ultiem"
 
-#: src/plugins/pgpcore/select-keys.c:370
+#: src/plugins/pgpcore/select-keys.c:366
 msgid "Select Keys"
 msgstr "Selecteer sleutels"
 
-#: src/plugins/pgpcore/select-keys.c:397
+#: src/plugins/pgpcore/select-keys.c:393
 msgid "Key ID"
 msgstr "Sleutel ID"
 
-#: src/plugins/pgpcore/select-keys.c:400
+#: src/plugins/pgpcore/select-keys.c:396
 msgid "Trust"
 msgstr "Vertrouw"
 
-#: src/plugins/pgpcore/select-keys.c:425
+#: src/plugins/pgpcore/select-keys.c:421
 msgid "_Other"
 msgstr "D_iversen"
 
-#: src/plugins/pgpcore/select-keys.c:426
+#: src/plugins/pgpcore/select-keys.c:422
 msgid "Do_n't encrypt"
 msgstr "_Niet versleutelen"
 
-#: src/plugins/pgpcore/select-keys.c:585
+#: src/plugins/pgpcore/select-keys.c:581
 msgid "Add key"
 msgstr "Sleutel toevoegen"
 
-#: src/plugins/pgpcore/select-keys.c:586
+#: src/plugins/pgpcore/select-keys.c:582
 msgid "Enter another user or key ID:"
 msgstr "Kies een ander gebruikers- of sleutel-ID"
 
-#: src/plugins/pgpcore/select-keys.c:608
-#, fuzzy, c-format
+#: src/plugins/pgpcore/select-keys.c:604
+#, c-format
 msgid "Encrypt to %s <%s>"
-msgstr "Coderen mislukt, %s"
+msgstr "Versleutelen naar %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:609
-#, fuzzy, c-format
+#: src/plugins/pgpcore/select-keys.c:605
+#, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
 "If you choose to encrypt the message with this key, you don't\n"
@@ -10992,11 +11082,14 @@ msgid ""
 "\n"
 "Do you trust this key enough to use it anyway?"
 msgstr ""
-"De sleutel van '%s' wordt niet volledig vertrouwd.\n"
-"Als u kiest om dit bericht te versleutelen met deze sleutel, weet u niet "
+"De sleutel wordt niet volledig vertrouwd.\n"
+"Als je kiest om dit bericht te versleutelen met deze sleutel, weet je niet "
 "zeker\n"
-"of dit bericht daadwerkelijk naar de persoon gaat die u bedoelt.\n"
-"Vertrouwd u de sleutel genoeg om hem toch te gebruiken?"
+"of dit bericht daadwerkelijk naar de persoon gaat die je bedoelt.\n"
+"\n"
+"Sleutel details: ID %s, primaire identiteit %s <%s>\n"
+"\n"
+"Vertrouw je deze sleutel genoeg om hem toch te gebruiken?"
 
 #: src/plugins/pgpcore/sgpgme.c:80 src/privacy.c:249 src/privacy.c:253
 #: src/privacy.c:270 src/privacy.c:274
@@ -11051,83 +11144,82 @@ msgstr "Sleutel 0x%s niet voorhanden om deze ondertekening te verifiëren"
 msgid "Error checking signature: no status\n"
 msgstr "Fout bij het controleren van de ondertekening: no status\n"
 
-#: src/plugins/pgpcore/sgpgme.c:278
+#: src/plugins/pgpcore/sgpgme.c:280
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Fout bij het controleren van de ondertekening: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:294
+#: src/plugins/pgpcore/sgpgme.c:299
 #, c-format
-msgid "Signature made using %s key ID %s\n"
-msgstr "Ondertekening gemaakt met %s sleutel ID %s\n"
+msgid "Signature made on %s using %s key ID %s\n"
+msgstr "Ondertekening gemaakt op %s met %s sleutel ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:301
+#: src/plugins/pgpcore/sgpgme.c:306
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Goedgekeurde ondertekening van \"%s\" (Vertrouwen: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:306
+#: src/plugins/pgpcore/sgpgme.c:311
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Verlopen ondertekening van uid \"%s\" (Vertrouwen: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:311
+#: src/plugins/pgpcore/sgpgme.c:316
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "FOUTIEVE ondertekening van \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:322
+#: src/plugins/pgpcore/sgpgme.c:327
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                alias \"%s\" (Vertrouwen: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:329
-#, fuzzy
+#: src/plugins/pgpcore/sgpgme.c:334
 msgid "Primary key fingerprint:"
-msgstr "Vingerafdruk van primaire sleutel: %s\n"
+msgstr "Vingerafdruk van primaire sleutel:"
 
-#: src/plugins/pgpcore/sgpgme.c:347
+#: src/plugins/pgpcore/sgpgme.c:352
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 "Waarschuwing: Adres van ondertekenaar \"%s\" klopt niet met DNS ingang\n"
 
-#: src/plugins/pgpcore/sgpgme.c:353
+#: src/plugins/pgpcore/sgpgme.c:358
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Adres van geverifieerde ondertekenaar is \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:395
+#: src/plugins/pgpcore/sgpgme.c:400
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Kon gegevens van bericht verkrijgen, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:411
+#: src/plugins/pgpcore/sgpgme.c:416
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Kon gegevens initialiseren, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:556
+#: src/plugins/pgpcore/sgpgme.c:561
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Geheime sleutel niet gevonden (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:585
+#: src/plugins/pgpcore/sgpgme.c:590
 msgid "Secret key specification is ambiguous"
 msgstr "Geheime sleutel specificatie is onduidelijk"
 
-#: src/plugins/pgpcore/sgpgme.c:597
+#: src/plugins/pgpcore/sgpgme.c:602
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Fout bij instellen geheime sleutel: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:674
+#: src/plugins/pgpcore/sgpgme.c:677
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme-protocol '%s' is onbruikbaar: Engine '%s' is niet goed geïnstalleerd."
 
-#: src/plugins/pgpcore/sgpgme.c:680
+#: src/plugins/pgpcore/sgpgme.c:683
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -11136,12 +11228,12 @@ msgstr ""
 "Gpgme-protocol '%s' is onbruikbaar: Engine '%s' versie %s is geïnstalleerd, "
 "maar versie %s is nodig.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:688
+#: src/plugins/pgpcore/sgpgme.c:691
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme-protocol '%s' is onbruikbaar (onbekend probleem)"
 
-#: src/plugins/pgpcore/sgpgme.c:704
+#: src/plugins/pgpcore/sgpgme.c:707
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -11149,46 +11241,46 @@ msgstr ""
 "GnuPG is niet goed geïnstalleerd of moet worden bijgewerkt.\n"
 "OpenPGP ondersteuning wordt uitgeschakeld."
 
-#: src/plugins/pgpcore/sgpgme.c:738
+#: src/plugins/pgpcore/sgpgme.c:741
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr ""
-"U dient de informatie van het account op te slaan met door op \"OK\" te "
-"drukken alvorens u een sleutelpaar kunt aanmaken.\n"
+"Je dient de informatie van het account op te slaan door op \"OK\" te drukken "
+"alvorens je een sleutelpaar kunt aanmaken.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:743
+#: src/plugins/pgpcore/sgpgme.c:746
 msgid "No PGP key found"
 msgstr "Geen PGP-sleutel gevonden"
 
-#: src/plugins/pgpcore/sgpgme.c:744
+#: src/plugins/pgpcore/sgpgme.c:747
 msgid ""
 "Claws Mail did not find a secret PGP key, which means that you won't be able "
 "to sign emails or receive encrypted emails.\n"
 "Do you want to create a new key pair now?"
 msgstr ""
-"Claws Mail heeft geen geheime PGP-sleutel gevonden. Dit betekent dat u geen "
-"berichten kan ondertekenen of versleutelde berichten kunt ontvangen.\n"
-"Wilt u nu een sleutelpaar aanmaken?"
+"Claws Mail heeft geen geheime PGP-sleutel gevonden. Dit betekent dat je geen "
+"berichten kunt ondertekenen of versleutelde berichten kunt ontvangen.\n"
+"Wil je nu een sleutelpaar aanmaken?"
 
-#: src/plugins/pgpcore/sgpgme.c:814 src/plugins/pgpcore/sgpgme.c:830
+#: src/plugins/pgpcore/sgpgme.c:817 src/plugins/pgpcore/sgpgme.c:833
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Kon nieuw sleutelpaar niet aanmaken: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:821
+#: src/plugins/pgpcore/sgpgme.c:824
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr ""
-"Uw nieuw sleutelpaar wordt nu aangemaakt... Beweeg uw muis heen en weer om "
+"Je nieuwe sleutelpaar wordt nu aangemaakt... Beweeg je muis heen en weer om "
 "te helpen bij het maken van entropie..."
 
-#: src/plugins/pgpcore/sgpgme.c:836
+#: src/plugins/pgpcore/sgpgme.c:839
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Kon nieuw sleutelpaar niet aanmaken: onbekende fout"
 
-#: src/plugins/pgpcore/sgpgme.c:840
+#: src/plugins/pgpcore/sgpgme.c:843
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -11196,71 +11288,71 @@ msgid ""
 "\n"
 "Do you want to export it to a keyserver?"
 msgstr ""
-"Uw nieuw sleutelpaar is aangemaakt. De vingerafdruk is:\n"
+"Je nieuwe sleutelpaar is aangemaakt. De vingerafdruk is:\n"
 "%s\n"
 "\n"
-"Wilt u de sleutel exporteren naar een sleutel-server?"
+"Wil je de sleutel exporteren naar een sleutel-server?"
 
-#: src/plugins/pgpcore/sgpgme.c:844
+#: src/plugins/pgpcore/sgpgme.c:847
 msgid "Key generated"
 msgstr "Seutel aangemaakt"
 
-#: src/plugins/pgpcore/sgpgme.c:883
+#: src/plugins/pgpcore/sgpgme.c:886
 msgid "Key exported."
 msgstr "Sleutel geëxporteerd."
 
-#: src/plugins/pgpcore/sgpgme.c:885
+#: src/plugins/pgpcore/sgpgme.c:888
 msgid "Couldn't export key."
 msgstr "Kon seutel niet exporteren."
 
-#: src/plugins/pgpcore/sgpgme.c:889
+#: src/plugins/pgpcore/sgpgme.c:892
 msgid "Key export isn't implemented in Windows."
 msgstr "Seutels exporteren is niet geïmplementeerd onder Windows."
 
-#: src/plugins/pgpinline/pgpinline.c:242
+#: src/plugins/pgpinline/pgpinline.c:156
 msgid "Incorrect part"
 msgstr "incorrect gedeelte"
 
-#: src/plugins/pgpinline/pgpinline.c:246
+#: src/plugins/pgpinline/pgpinline.c:160
 msgid "Not a text part"
 msgstr "Geen tekst gedeelte"
 
-#: src/plugins/pgpinline/pgpinline.c:257 src/plugins/pgpinline/pgpinline.c:414
+#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
 msgid "Couldn't get text data."
 msgstr "Kon tekstgegevens niet vinden."
 
-#: src/plugins/pgpinline/pgpinline.c:275
+#: src/plugins/pgpinline/pgpinline.c:189
 msgid "Couldn't convert text data to any sane charset."
 msgstr "Kon tekstgegevens naar geen enkel zinnige karakterset converteren."
 
-#: src/plugins/pgpinline/pgpinline.c:283 src/plugins/pgpinline/pgpinline.c:608
-#: src/plugins/pgpinline/pgpinline.c:747 src/plugins/pgpinline/pgpinline.c:803
-#: src/plugins/pgpmime/pgpmime.c:73 src/plugins/pgpmime/pgpmime.c:182
-#: src/plugins/pgpmime/pgpmime.c:322 src/plugins/pgpmime/pgpmime.c:500
-#: src/plugins/pgpmime/pgpmime.c:644 src/plugins/smime/smime.c:406
+#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:517
+#: src/plugins/pgpinline/pgpinline.c:656 src/plugins/pgpinline/pgpinline.c:712
+#: src/plugins/pgpmime/pgpmime.c:74 src/plugins/pgpmime/pgpmime.c:183
+#: src/plugins/pgpmime/pgpmime.c:329 src/plugins/pgpmime/pgpmime.c:507
+#: src/plugins/pgpmime/pgpmime.c:651 src/plugins/smime/smime.c:395
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Kon de GPG-context niet initializeren, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:407
+#: src/plugins/pgpinline/pgpinline.c:316
 msgid "Couldn't parse mime part."
 msgstr "Kon mime-gedeelte van bericht niet lezen."
 
-#: src/plugins/pgpinline/pgpinline.c:437 src/plugins/pgpmime/pgpmime.c:345
+#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:352
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Kon gedecodeerd bestand %s niet openen"
 
-#: src/plugins/pgpinline/pgpinline.c:454 src/plugins/pgpinline/pgpinline.c:463
-#: src/plugins/pgpinline/pgpinline.c:472 src/plugins/pgpinline/pgpinline.c:480
-#: src/plugins/pgpinline/pgpinline.c:490 src/plugins/pgpinline/pgpinline.c:499
-#: src/plugins/pgpmime/pgpmime.c:356 src/plugins/pgpmime/pgpmime.c:370
+#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
+#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
+#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
+#: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "Kon gedecodeerd bestand %s niet wegschrijven"
 
-#: src/plugins/pgpinline/pgpinline.c:468 src/plugins/pgpinline/pgpinline.c:469
-#: src/plugins/pgpinline/pgpinline.c:470
+#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:379
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -11268,52 +11360,51 @@ msgstr ""
 "\n"
 "--- Begin van PGP/Ingesloten versleutelde data ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:486 src/plugins/pgpinline/pgpinline.c:487
-#: src/plugins/pgpinline/pgpinline.c:488
+#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:397
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Einde van PGP/Ingesloten versleutelde data ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:507 src/plugins/pgpmime/pgpmime.c:382
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:389
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "Kon gedecodeerd bestand %s niet sluiten"
 
-#: src/plugins/pgpinline/pgpinline.c:519
+#: src/plugins/pgpinline/pgpinline.c:428
 msgid "Couldn't scan decrypted file."
 msgstr "Kon gedecodeerd bestand niet scannen."
 
-#: src/plugins/pgpinline/pgpinline.c:527
+#: src/plugins/pgpinline/pgpinline.c:436
 msgid "Couldn't scan decrypted file parts."
 msgstr "Kon gedecodeerde bestandsonderdelen niet scannen."
 
-#: src/plugins/pgpinline/pgpinline.c:582 src/plugins/pgpinline/pgpinline.c:774
-#, fuzzy
+#: src/plugins/pgpinline/pgpinline.c:491 src/plugins/pgpinline/pgpinline.c:683
 msgid "Malformed message"
-msgstr "Gemarkeerd"
+msgstr "Vervormd bericht"
 
-#: src/plugins/pgpinline/pgpinline.c:593
+#: src/plugins/pgpinline/pgpinline.c:502
 msgid "Couldn't create temporary file."
 msgstr "Kon tijdelijk bestand niet aanmaken."
 
-#: src/plugins/pgpinline/pgpinline.c:632 src/plugins/pgpmime/pgpmime.c:527
+#: src/plugins/pgpinline/pgpinline.c:541 src/plugins/pgpmime/pgpmime.c:534
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Gegevens ondertekenen mislukt, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:650 src/plugins/pgpmime/pgpmime.c:552
+#: src/plugins/pgpinline/pgpinline.c:559 src/plugins/pgpmime/pgpmime.c:559
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Gegevens ondertekenen mislukt wegens ongeldige ondertekenaar: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:659 src/plugins/pgpmime/pgpmime.c:561
+#: src/plugins/pgpinline/pgpinline.c:568 src/plugins/pgpmime/pgpmime.c:568
 msgid "Data signing failed, no results."
 msgstr "Gegevens ondertekenen mislukt, geen resultaten."
 
-#: src/plugins/pgpinline/pgpinline.c:669 src/plugins/pgpmime/pgpmime.c:572
+#: src/plugins/pgpinline/pgpinline.c:578 src/plugins/pgpmime/pgpmime.c:579
 msgid "Data signing failed, no contents."
 msgstr "Gegevens ondertekenen mislukt, geen inhoud."
 
-#: src/plugins/pgpinline/pgpinline.c:713
+#: src/plugins/pgpinline/pgpinline.c:622
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
@@ -11321,22 +11412,22 @@ msgstr ""
 "Let op dat bijvoegsels niet worden versleuteld door het PGP/Ingesloten "
 "systeem, noch e-mail headers, zoals Onderwerp."
 
-#: src/plugins/pgpinline/pgpinline.c:757 src/plugins/pgpmime/pgpmime.c:654
+#: src/plugins/pgpinline/pgpinline.c:666 src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Kon GPG-sleutel niet toevoegen %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:785 src/plugins/pgpmime/pgpmime.c:683
+#: src/plugins/pgpinline/pgpinline.c:694 src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Kon tijdelijk bestand niet aanmaken, %s."
 
-#: src/plugins/pgpinline/pgpinline.c:816 src/plugins/pgpmime/pgpmime.c:710
+#: src/plugins/pgpinline/pgpinline.c:725 src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Coderen mislukt, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:883
+#: src/plugins/pgpinline/pgpinline.c:793
 msgid "PGP/Inline"
 msgstr "PGP/Ingesloten"
 
@@ -11358,36 +11449,36 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Deze plugin ondersteund de achterhaalde manier van ingesloten ondertekenen "
-"en/of versleutelen van berichten. U kunt berichten decoderen, "
+"Deze plugin ondersteunt de achterhaalde manier van ingesloten ondertekenen "
+"en/of versleutelen van berichten. Je kunt berichten decoderen, "
 "ondertekeningen verifiëren of zelf berichten versleutelen en ondertekenen.\n"
 "\n"
-"U kunt het selecteren als het standaard privacy systeem in /Instellingen/"
-"[Account voorkeuren]/Privacy en wanneer u een bericht aan het opstellen bent "
-"in /Opties/Privacy systeem\n"
+"Je kunt het selecteren als het standaard privacy systeem in /Instellingen/"
+"[Account voorkeuren]/Privacy en wanneer je een bericht aan het opstellen "
+"bent in /Opties/Privacy systeem\n"
 "\n"
 "De plugin gebruikt de GPGME-bibliotheek als een schil om GnuPG.\n"
 "\n"
 "GPGME auteursrecht 2001 door Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:202
+#: src/plugins/pgpmime/pgpmime.c:203
 msgid "Signature boundary not found."
 msgstr "Grens van ondertekening niet gevonden"
 
-#: src/plugins/pgpmime/pgpmime.c:394 src/plugins/smime/smime.c:487
+#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:476
 msgid "Couldn't parse decrypted file."
 msgstr "Kon gedecodeerd bestand niet lezen."
 
-#: src/plugins/pgpmime/pgpmime.c:400 src/plugins/smime/smime.c:494
+#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:483
 msgid "Couldn't parse decrypted file parts."
 msgstr "Kon gedecodeerde bestandsonderdelen niet lezen."
 
-#: src/plugins/pgpmime/pgpmime.c:446 src/plugins/pgpmime/pgpmime.c:485
+#: src/plugins/pgpmime/pgpmime.c:453 src/plugins/pgpmime/pgpmime.c:492
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Kon tijdelijk bestand niet aanmaken: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:610
+#: src/plugins/pgpmime/pgpmime.c:617
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -11395,7 +11486,7 @@ msgstr ""
 "Let op dat e-mail headers, zoals Onderwerp, niet versleuteld worden door het "
 "PGP/Mime systeem."
 
-#: src/plugins/pgpmime/pgpmime.c:780
+#: src/plugins/pgpmime/pgpmime.c:788
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -11416,13 +11507,13 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Deze plugin verwerkt PGP/MIME ondertekende en/of versleutelde berichten. U "
+"Deze plugin verwerkt PGP/MIME ondertekende en/of versleutelde berichten. Je "
 "kunt berichten decoderen, ondertekeningen verifiëren en zelf berichten "
 "ondertekenen en versleutelen.\n"
 "\n"
-"U kunt het selecteren als het standaard privacy systeem in /Instellingen/"
-"[Account voorkeuren]/Privacy en wanneer u een bericht aan het opstellen bent "
-"in /Opties/Privacy systeem\n"
+"Je kunt het selecteren als het standaard privacy systeem in /Instellingen/"
+"[Account voorkeuren]/Privacy en wanneer je een bericht aan het opstellen "
+"bent in /Opties/Privacy systeem\n"
 "\n"
 "De plugin gebruikt de GPGME-bibliotheek als een schil om GnuPG.\n"
 "\n"
@@ -11454,7 +11545,7 @@ msgstr "Pad naar het cookies bestand"
 
 #: src/plugins/rssyl/rssyl_prefs.c:146
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
-msgstr "Pad naar Netscape-stijl cookies.txt bestand dat uw cookies bevat"
+msgstr "Pad naar Netscape-stijl cookies.txt bestand dat je cookies bevat"
 
 #: src/plugins/rssyl/rssyl.h:8
 msgid "RSSyl"
@@ -11515,7 +11606,7 @@ msgid ""
 "there?"
 msgstr ""
 "Aanmaken van mappenboom is mislukt.\n"
-"Misschien dat sommige bestanden al bestaan, of u heeft geen permissie om "
+"Misschien dat sommige bestanden al bestaan, of je hebt geen permissie om "
 "daar te schrijven?"
 
 #: src/plugins/rssyl/rssyl_gtk.c:184
@@ -11593,7 +11684,7 @@ msgstr "Afmelden feed"
 
 #: src/plugins/rssyl/rssyl_gtk.c:659
 msgid "Do you really want to remove feed"
-msgstr "Wilt u werkelijk de feed verwijderen"
+msgstr "Wil je werkelijk de feed verwijderen"
 
 #: src/plugins/rssyl/rssyl_gtk.c:665
 msgid "Remove cached entries"
@@ -11607,11 +11698,11 @@ msgid ""
 "Each newsfeed will create a folder with appropriate entries, fetched from "
 "the web. You can read them, and delete or keep old entries."
 msgstr ""
-"Deze plugin maakt het mogelijk om een mailbox boom aan te maken waar u "
+"Deze plugin maakt het mogelijk om een mailbox boom aan te maken waar je "
 "nieuwsfeeds aan kunt toevoegen in RSS 1.0, RSS 2.0 of Atom formaat.\n"
 "\n"
-"Elke nieuwsfeed zal en map aanmaken met ingangen gehaald van het web. U kunt "
-"ze lezen, verwijderen of bewaren."
+"Elke nieuwsfeed zal een map aanmaken met ingangen gehaald van het web. Je "
+"kunt ze lezen, verwijderen of bewaren."
 
 #: src/plugins/rssyl/plugin.c:87
 msgid "RSS feed"
@@ -11657,11 +11748,11 @@ msgstr "Abonneer op feed"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:63
 msgid "Input the URL of the news feed you wish to subscribe:"
-msgstr "Voer de URL in van de nieuws feed waarop u wenst te abonneren:"
+msgstr "Voer de URL in van de nieuwsfeed waarop je wilt abonneren:"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:138
 #, c-format
-msgid "Really remove the folder tree '%s' ?\n"
+msgid "Really remove the folder tree '%s'?\n"
 msgstr "Werkelijk de mappenboom '%s' verwijderen?\n"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:139
@@ -11765,7 +11856,7 @@ msgstr ""
 
 #: src/plugins/rssyl/feed.c:1722
 msgid "You are already subscribed to this feed."
-msgstr "U bent al ge-abonneerd op deze feed."
+msgstr "Je bent al geabonneerd op deze feed."
 
 #: src/plugins/rssyl/feed.c:1733
 #, c-format
@@ -11789,7 +11880,7 @@ msgid "Can't subscribe feed '%s'."
 msgstr "Kon niet abonneren op feed '%s'"
 
 #: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:924
+#: src/plugins/smime/smime.c:883
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -11812,16 +11903,16 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Deze plugin verwerkt S/MIME ondertekende en/of versleutelde berichten. U "
+"Deze plugin verwerkt S/MIME ondertekende en/of versleutelde berichten. Je "
 "kunt berichten decoderen, ondertekeningen verifiëren en zelf berichten "
 "ondertekenen en versleutelen.\n"
 "\n"
-"U kunt het selecteren als het standaard privacy systeem in /Instellingen/"
-"[Voorkeuren huidig account]/Privacy en wanneer u een bericht aan het "
+"Je kunt het selecteren als het standaard privacy systeem in /Instellingen/"
+"[Voorkeuren huidig account]/Privacy en wanneer je een bericht aan het "
 "opstellen bent in /Opties/Privacy-systeem\n"
 "\n"
 "De plugin gebruikt de GPGME-bibliotheek als een schil om GnuPG.\n"
-"De plugin heeft ook gpgsm, gnupg-agent en dirmngr nodig, geinstalleerd en "
+"De plugin heeft ook gpgsm, gnupg-agent en dirmngr nodig, geïnstalleerd en "
 "geconfigureerd.\n"
 "\n"
 "Informatie over hoe S/MIME certificaten werken met GPGSM kan gevonden worden "
@@ -11830,24 +11921,24 @@ msgstr ""
 "\n"
 "GPGME auteursrecht 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:414
+#: src/plugins/smime/smime.c:403
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "Kon het GPG protocol niet instellen, %s"
 
-#: src/plugins/smime/smime.c:442
+#: src/plugins/smime/smime.c:431
 msgid "Couldn't open temporary file"
 msgstr "Kon tijdelijk bestand niet openen"
 
-#: src/plugins/smime/smime.c:453 src/plugins/smime/smime.c:468
+#: src/plugins/smime/smime.c:442 src/plugins/smime/smime.c:457
 msgid "Couldn't write to temporary file"
 msgstr "Kon niet schrijven naar tijdelijk bestand"
 
-#: src/plugins/smime/smime.c:479
+#: src/plugins/smime/smime.c:468
 msgid "Couldn't close temporary file"
 msgstr "Kon tijdelijk bestand niet sluiten"
 
-#: src/plugins/smime/smime.c:695
+#: src/plugins/smime/smime.c:684
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
@@ -11856,8 +11947,8 @@ msgstr ""
 "S/MIME systeem."
 
 #: src/plugins/spam_report/spam_report_prefs.c:80
-#: src/plugins/spam_report/spam_report.c:340
-#: src/plugins/spam_report/spam_report.c:380
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
 msgid "SpamReport"
 msgstr "SpamRapport"
 
@@ -11869,15 +11960,15 @@ msgstr "Aangezet"
 msgid "Forward to:"
 msgstr "Doorsturen aan:"
 
-#: src/plugins/spam_report/spam_report.c:294
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Rapporteer spam..."
 
-#: src/plugins/spam_report/spam_report.c:329
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Rapporteer spam online..."
 
-#: src/plugins/spam_report/spam_report.c:385
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -11893,7 +11984,7 @@ msgstr ""
 " * spamcop.net\n"
 " * lists.debian.org nomination system"
 
-#: src/plugins/spam_report/spam_report.c:410
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Spam rapportering"
 
@@ -11957,9 +12048,9 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
-"Deze plugin controleert alle berichten die binnen komen via een IMAP, LOCAL "
+"Deze plugin controleert alle berichten die binnen komen via een IMAP, LOKAAL "
 "of POP account op spam met behulp van een SpamAssassin-server. Voor deze "
-"plugin heeft U toegang tot een SpamAssassin-server (spamd) nodig.\n"
+"plugin heb je toegang tot een SpamAssassin-server (spamd) nodig.\n"
 "\n"
 "De plugin kan ook gebruikt worden om berichten te markeren als Ham of Spam.\n"
 "\n"
@@ -12072,6 +12163,22 @@ msgstr ""
 "De plugin gebruikt de Ytnef bibliotheek, welke valt onder auteursrecht "
 "2002-2007 door Randall Hand <yerase at yerot.com>"
 
+#: src/plugins/vcalendar/common-views.c:62
+msgid "_Edit this meeting..."
+msgstr "_Bewerken afspraak..."
+
+#: src/plugins/vcalendar/common-views.c:63
+msgid "_Cancel this meeting..."
+msgstr "_Afzeggen afspraak..."
+
+#: src/plugins/vcalendar/common-views.c:65
+msgid "_Create new meeting..."
+msgstr "Aanmaken nieuwe afspraak..."
+
+#: src/plugins/vcalendar/common-views.c:67
+msgid "_Go to today"
+msgstr "_Ga naar vandaag"
+
 #: src/plugins/vcalendar/vcalendar.c:100
 msgid "Create meeting from message..."
 msgstr "Maak afspraak van bericht..."
@@ -12081,7 +12188,7 @@ msgstr "Maak afspraak van bericht..."
 msgid ""
 "You are about to create %d meetings, one by one. Do you want to continue?"
 msgstr ""
-"U bent bezig om %d afspraken aan te maken, een voor een. Wilt u doorgaan?"
+"Je bent bezig om %d afspraken aan te maken, één voor één. Wil je doorgaan?"
 
 #: src/plugins/vcalendar/vcalendar.c:139
 msgid "Creating meeting..."
@@ -12105,7 +12212,7 @@ msgstr "Afwijzen"
 
 #: src/plugins/vcalendar/vcalendar.c:482
 msgid "You have a Todo item."
-msgstr "U hebt een Todo item"
+msgstr "Je hebt een Todo item."
 
 #: src/plugins/vcalendar/vcalendar.c:483 src/plugins/vcalendar/vcalendar.c:490
 #: src/plugins/vcalendar/vcalendar.c:495 src/plugins/vcalendar/vcalendar.c:503
@@ -12115,19 +12222,19 @@ msgstr "Details volgen:"
 
 #: src/plugins/vcalendar/vcalendar.c:489
 msgid "You have created a meeting."
-msgstr "U hebt een afspraak aangemaakt."
+msgstr "Je hebt een afspraak aangemaakt."
 
 #: src/plugins/vcalendar/vcalendar.c:494
 msgid "You have been invited to a meeting."
-msgstr "U bent uitgenodigd voor een afspraak."
+msgstr "Je bent uitgenodigd voor een afspraak."
 
 #: src/plugins/vcalendar/vcalendar.c:502
 msgid "A meeting to which you had been invited has been cancelled."
-msgstr "Een afspraak waar u voor uitgenodigd was is afgezegd."
+msgstr "Een afspraak waar je voor uitgenodigd was is afgezegd."
 
 #: src/plugins/vcalendar/vcalendar.c:511
 msgid "You have been forwarded an appointment."
-msgstr "U hebt een afspraak doorgestuurd gekregen."
+msgstr "Je hebt een afspraak doorgestuurd gekregen."
 
 #: src/plugins/vcalendar/vcalendar.c:564
 #, c-format
@@ -12144,7 +12251,7 @@ msgstr ""
 
 #: src/plugins/vcalendar/vcalendar.c:749
 msgid "You have received an answer to an unknown meeting proposal."
-msgstr "U hebt antwoord ontvangen op een onbekende afspraak voorstel."
+msgstr "Je hebt antwoord ontvangen op een onbekend afspraak voorstel."
 
 #: src/plugins/vcalendar/vcalendar.c:753
 #, c-format
@@ -12152,7 +12259,7 @@ msgid ""
 "You have received an answer to a meeting proposal.\n"
 "%s has %s the invitation whose details follow:"
 msgstr ""
-"U hebt antwoord ontvangen op een afspraak voorstel.\n"
+"Je hebt antwoord ontvangen op een afspraak voorstel.\n"
 "%s heeft %s de uitnodiging met de volgende details:"
 
 #: src/plugins/vcalendar/vcalendar.c:832
@@ -12177,7 +12284,7 @@ msgstr "Zeg afspraak af"
 
 #: src/plugins/vcalendar/vcalendar.c:992
 msgid "Are you sure you want to cancel this meeting?"
-msgstr "Wet u zeker dat u deze afspraak wilt afzeggen?"
+msgstr "Weet je zeker dat je deze afspraak wilt afzeggen?"
 
 #: src/plugins/vcalendar/vcalendar.c:1087
 msgid "No account found"
@@ -12186,10 +12293,10 @@ msgstr "Geen account gevonden"
 #: src/plugins/vcalendar/vcalendar.c:1088
 msgid ""
 "You have no account matching any attendee.\n"
-"Do you want to reply anyway ?"
+"Do you want to reply anyway?"
 msgstr ""
-"U hebt geen account dat overeenkomt met een genodigde.\n"
-"Wilt u toch antwoorden?"
+"Je hebt geen account dat overeenkomt met een genodigde.\n"
+"Wil je toch antwoorden?"
 
 #: src/plugins/vcalendar/vcalendar.c:1090
 msgid "+Reply anyway"
@@ -12213,28 +12320,28 @@ msgstr "Ga naar website"
 
 #: src/plugins/vcalendar/vcalendar.c:1226
 msgid "You are already busy at this time."
-msgstr "U bent al bezet op dit moment."
+msgstr "Je bent al bezet op dit moment."
 
 #: src/plugins/vcalendar/vcalendar.c:1265
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1759
 msgid "Event:"
 msgstr "Gebeurtenis:"
 
 #: src/plugins/vcalendar/vcalendar.c:1266
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1727
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1737
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1748
 msgid "Organizer:"
 msgstr "Agenda:"
 
 #: src/plugins/vcalendar/vcalendar.c:1267
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1729
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1740
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1750
 msgid "Location:"
 msgstr "Lokatie:"
 
 #: src/plugins/vcalendar/vcalendar.c:1268
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1717
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1728
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1749
 msgid "Summary:"
 msgstr "Samenvatting:"
 
@@ -12247,8 +12354,8 @@ msgid "Ending:"
 msgstr "Einde:"
 
 #: src/plugins/vcalendar/vcalendar.c:1272
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1752
 msgid "Attendees:"
 msgstr "Genodigden:"
 
@@ -12256,86 +12363,86 @@ msgstr "Genodigden:"
 msgid "Action:"
 msgstr "Actie:"
 
-#: src/plugins/vcalendar/vcal_prefs.c:256
+#: src/plugins/vcalendar/vcal_prefs.c:258
 msgid "Reminders"
 msgstr "Herinneringen"
 
-#: src/plugins/vcalendar/vcal_prefs.c:265
+#: src/plugins/vcalendar/vcal_prefs.c:267
 msgid "Alert me"
 msgstr "Waarschuw me"
 
-#: src/plugins/vcalendar/vcal_prefs.c:277
+#: src/plugins/vcalendar/vcal_prefs.c:279
 msgid "minutes before an event"
 msgstr "minuten voor een afspraak"
 
-#: src/plugins/vcalendar/vcal_prefs.c:289
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Calendar export"
 msgstr "Agenda export"
 
-#: src/plugins/vcalendar/vcal_prefs.c:300
+#: src/plugins/vcalendar/vcal_prefs.c:302
 msgid "Automatically export calendar to"
 msgstr "Automatisch agenda exporteren naar"
 
-#: src/plugins/vcalendar/vcal_prefs.c:309
-#: src/plugins/vcalendar/vcal_prefs.c:415
+#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:417
 msgid "You can export to a local file or URL"
-msgstr "U kunt naar een lokaal bestand of URL exporteren"
+msgstr "Je kunt naar een lokaal bestand of URL exporteren"
 
-#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:313
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Geef een lokaal bestand of URL op (http://server/path/file.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:319
-#: src/plugins/vcalendar/vcal_prefs.c:425 src/prefs_account.c:1255
-#: src/prefs_account.c:1762
+#: src/plugins/vcalendar/vcal_prefs.c:321
+#: src/plugins/vcalendar/vcal_prefs.c:427 src/prefs_account.c:1259
+#: src/prefs_account.c:1766
 msgid "User ID"
 msgstr "Gebruikersnaam"
 
-#: src/plugins/vcalendar/vcal_prefs.c:327
-#: src/plugins/vcalendar/vcal_prefs.c:433 src/prefs_account.c:1261
-#: src/prefs_account.c:1782 src/prefs_account.c:2491 src/prefs_account.c:2513
-#: src/wizard.c:1389 src/wizard.c:1668
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1265
+#: src/prefs_account.c:1786 src/prefs_account.c:2491 src/prefs_account.c:2513
+#: src/wizard.c:1201 src/wizard.c:1475
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: src/plugins/vcalendar/vcal_prefs.c:341
+#: src/plugins/vcalendar/vcal_prefs.c:343
 msgid "Include webcal subscriptions in export"
 msgstr "Voeg webcal inschrijvingen bij het exporteren in"
 
-#: src/plugins/vcalendar/vcal_prefs.c:351
+#: src/plugins/vcalendar/vcal_prefs.c:353
 msgid "Command to run after calendar export"
 msgstr "Opdracht om te starten na het exporteren van de agenda"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:382
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Registreer Claws' agenda in XFCE's Orage klok"
 
-#: src/plugins/vcalendar/vcal_prefs.c:382
+#: src/plugins/vcalendar/vcal_prefs.c:384
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
 "Sta Orage (versie 4.4 of nieuwer) toe om Claws Mail's agaenda in te zien"
 
-#: src/plugins/vcalendar/vcal_prefs.c:394
+#: src/plugins/vcalendar/vcal_prefs.c:396
 msgid "Free/Busy information"
 msgstr "Vrij/Bezet informatie"
 
-#: src/plugins/vcalendar/vcal_prefs.c:406
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Automatically export free/busy status to"
 msgstr "Automatisch exporteren van vrij/bezet status naar"
 
-#: src/plugins/vcalendar/vcal_prefs.c:417
+#: src/plugins/vcalendar/vcal_prefs.c:419
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Geef een lokaal bestand of URL (http://server/path/file.ifb) op"
 
-#: src/plugins/vcalendar/vcal_prefs.c:447
+#: src/plugins/vcalendar/vcal_prefs.c:449
 msgid "Command to run after free/busy status export"
 msgstr "Opdracht om te starten na het exporteren van vrij/bezet status"
 
-#: src/plugins/vcalendar/vcal_prefs.c:474
+#: src/plugins/vcalendar/vcal_prefs.c:476
 msgid "Get free/busy status of others from"
 msgstr "Haal vrij/bezet status van anderen van"
 
-#: src/plugins/vcalendar/vcal_prefs.c:482
+#: src/plugins/vcalendar/vcal_prefs.c:484
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -12344,7 +12451,7 @@ msgstr ""
 "Geef een lokaal bestand of URL (http://server/path/file.ifb) op. Gebruik %u "
 "voor het linker deel van het e-mail adres, %d voor het domein"
 
-#: src/plugins/vcalendar/vcal_prefs.c:646 src/plugins/vcalendar/plugin.c:43
+#: src/plugins/vcalendar/vcal_prefs.c:648 src/plugins/vcalendar/plugin.c:43
 #: src/plugins/vcalendar/plugin.c:64
 msgid "vCalendar"
 msgstr "vCalendar"
@@ -12359,7 +12466,7 @@ msgstr "_Exporteer agenda..."
 
 #: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
-msgstr "_Schrijf u in voor webCal..."
+msgstr "_Schrijf je in voor webCal..."
 
 #: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
@@ -12381,6 +12488,10 @@ msgstr "_Week beeld"
 msgid "_Month view"
 msgstr "_Maand beeld"
 
+#: src/plugins/vcalendar/vcal_folder.c:1091
+msgid "Meetings"
+msgstr "Afspraken"
+
 #: src/plugins/vcalendar/vcal_folder.c:1475
 msgid "in the past"
 msgstr "in het verleden"
@@ -12468,14 +12579,13 @@ msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail heeft netwerk toegang nodig om de Webcal feed te verversen."
 
 #: src/plugins/vcalendar/vcal_folder.c:1885
-#, fuzzy, c-format
+#, c-format
 msgid "Fetching calendar for %s..."
-msgstr "Cache voor %s wordt bijgewerkt ..."
+msgstr "Kalender voor %s wordt bijgewerkt..."
 
 #: src/plugins/vcalendar/vcal_folder.c:1886
-#, fuzzy
 msgid "new subscription"
-msgstr "Nieuwsgroep-abonnementen"
+msgstr "Nieuw abonnement"
 
 #: src/plugins/vcalendar/vcal_folder.c:1897
 msgid "Claws Mail needs network access in order to update the subscription."
@@ -12489,13 +12599,13 @@ msgstr "Abonneren op WebCal"
 msgid "Enter the WebCal URL:"
 msgstr "Voer de WebCal URL in:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1923
+#: src/plugins/vcalendar/vcal_folder.c:1921
 msgid "Could not parse the URL."
 msgstr "Kon de URL niet verwerken."
 
-#: src/plugins/vcalendar/vcal_folder.c:1952
+#: src/plugins/vcalendar/vcal_folder.c:1950
 msgid "Do you really want to unsubscribe?"
-msgstr "Wilt u echt uitschrijven?"
+msgstr "Wil je echt uitschrijven?"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:313
 msgid "Individual"
@@ -12529,7 +12639,7 @@ msgstr "U"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:790
 msgid "You are busy at the time of your planned meeting"
-msgstr "U bent bezet op het moment van de geplande afspraak"
+msgstr "Je bent bezet op het moment van de geplande afspraak"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:792
 #, c-format
@@ -12645,7 +12755,7 @@ msgid "available"
 msgstr "beschikbaar"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:899
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1150
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1151
 msgid "Free/busy retrieval failed"
 msgstr "Vrij/bezet ophalen mislukt"
 
@@ -12661,22 +12771,22 @@ msgstr "Verstuur toch"
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr "Niet iedereen is beschikbaar. Zie tooltips voor meer info..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1132
-#, fuzzy, c-format
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1133
+#, c-format
 msgid "Fetching planning for %s..."
-msgstr "Map wordt ingelezen %s ..."
+msgstr "Planning voor %s wordt bijgewerkt..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1159
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1160
 msgid "Available"
 msgstr "Beschikbaar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1172
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1179
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1187
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1180
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
 msgid "Everyone is available."
 msgstr "Iedereen is beschikbaar."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1189
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
@@ -12684,7 +12794,7 @@ msgstr ""
 "Iedereen lijkt beschikbaar, maar sommige vrij/bezet informatie kon niet "
 "opgehaald worden."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1360
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1361
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -12692,61 +12802,61 @@ msgstr ""
 "Kon de uitnodiging niet versturen.\n"
 "Controleer de ontvangers."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1476
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1493
 msgid "Save & Send"
 msgstr "Opslaan en verzenden"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1494
 msgid "Check availability"
 msgstr "Controleer beschikbaarheid"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1600
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "<b>Starts at:</b> "
 msgstr "<b>Begint om:</b>"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1627
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1623
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1647
 msgid "<b> on:</b>"
 msgstr "<b> om:</b>"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1641
 msgid "<b>Ends at:</b> "
 msgstr "<b>Eindigt om:</b> "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1661
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1682
 msgid "New meeting"
 msgstr "Nieuwe afspraak"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1663
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1684
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Pas afspraak aan"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1763
 msgid "Time:"
 msgstr "Tijd:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1878
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1896
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d uur"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1881
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1899
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minuten"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1892
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Eerstvolgende afspraak: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1893
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1911
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -12756,46 +12866,46 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"U hebt binnenkort een afspraak.\n"
+"Je hebt binnenkort een afspraak.\n"
 "Het begint om %s en eindigt %s later.\n"
 "Lokatie: %s\n"
 "Meer informatie:\n"
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1928
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "Herinner me over %d minuut"
 msgstr[1] "Herinner me over %d minuten"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2036
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2054
 msgid "Empty calendar"
 msgstr "Lege agenda"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2037
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2055
 msgid "There is nothing to export."
 msgstr "Er is niets te exporteren."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2077
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2095
 msgid "Could not export the calendar."
 msgstr "Kon de agenda niet exporteren"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2112
 msgid "Export calendar to ICS"
 msgstr "Exporteer agenda nar ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2135
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "Kon agenda niet exporteren naar '%s'\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2232
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2251
 msgid "Could not export the freebusy info."
 msgstr "Kon de vrij/bezet info niet exporteren."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2263
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2283
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Kon vrij/bezet niet exporteren naar '%s'\n"
@@ -12873,7 +12983,7 @@ msgid "Show"
 msgstr "Laat zien"
 
 #: src/plugins/vcalendar/day-view.c:622 src/plugins/vcalendar/month-view.c:722
-#: src/prefs_account.c:1448 src/prefs_folder_item.c:562
+#: src/prefs_account.c:1452 src/prefs_folder_item.c:562
 #: src/prefs_matcher.c:334
 msgid "days"
 msgstr "dagen"
@@ -12898,14 +13008,14 @@ msgstr ""
 "deze gemaakt worden door Evolution of Outlook.\n"
 "\n"
 "Wanneer geladen, zal het een vCalendar mailbox aanmaken in de Mappen Lijst, "
-"welke volgemaakt wordt met afspraken die u hebt geaccepteerd of gemaakt.\n"
-"Afspraak verzoeken die u ontvangt zullen gepresenteerd worden en u bent "
-"mogelijk ze te accepteren of te weigeren.\n"
+"welke volgemaakt wordt met afspraken die je hebt geaccepteerd of gemaakt.\n"
+"Afspraak verzoeken die je ontvangt zullen gepresenteerd worden en je kunt ze "
+"accepteren of weigeren.\n"
 "Om een nieuwe afspraak aan te maken rechts-klik op de vCalendar of Afspraken "
 "map en kies \"Nieuwe afspraak...\".\n"
 "\n"
-"Het is ook mogelijk te in te schrijven op webCal feeds, uw afspraken en "
-"agenda te exporteren, uw vrij/bezet informatie te publiceren, en die "
+"Het is ook mogelijk je in te schrijven op webCal feeds, je afspraken en "
+"agenda te exporteren, je vrij/bezet informatie te publiceren, en die "
 "informatie op te halen van anderen."
 
 #: src/plugins/vcalendar/plugin.c:102
@@ -13051,12 +13161,12 @@ msgstr "er is een fout opgetreden in de POP3-sessie\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP-opdracht wordt niet ondersteund\n"
 
-#: src/prefs_account.c:332 src/prefs_account.c:1422 src/prefs_account.c:2408
-#: src/wizard.c:1549
+#: src/prefs_account.c:332 src/prefs_account.c:1426 src/prefs_account.c:2408
+#: src/wizard.c:1361
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1535 src/prefs_account.c:2423
+#: src/prefs_account.c:335 src/prefs_account.c:1539 src/prefs_account.c:2423
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -13064,7 +13174,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "Nieuws (NNTP)"
 
-#: src/prefs_account.c:337 src/wizard.c:1551
+#: src/prefs_account.c:337 src/wizard.c:1363
 msgid "Local mbox file"
 msgstr "Lokaal mbox-bestand"
 
@@ -13072,31 +13182,31 @@ msgstr "Lokaal mbox-bestand"
 msgid "None (SMTP only)"
 msgstr "Niets (alleen SMTP)"
 
-#: src/prefs_account.c:1021
+#: src/prefs_account.c:1029
 msgid "Name of account"
 msgstr "Naam van dit account"
 
-#: src/prefs_account.c:1030
+#: src/prefs_account.c:1038
 msgid "Set as default"
 msgstr "Instellen als standaardaccount "
 
-#: src/prefs_account.c:1038
+#: src/prefs_account.c:1046
 msgid "Personal information"
 msgstr "Persoonlijke informatie"
 
-#: src/prefs_account.c:1047
+#: src/prefs_account.c:1055
 msgid "Full name"
 msgstr "Volledige naam"
 
-#: src/prefs_account.c:1053
+#: src/prefs_account.c:1061
 msgid "Mail address"
 msgstr "E-mail adres"
 
-#: src/prefs_account.c:1083
+#: src/prefs_account.c:1091
 msgid "Server information"
 msgstr "Serverinformatie"
 
-#: src/prefs_account.c:1118
+#: src/prefs_account.c:1126
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support.</span>"
@@ -13104,171 +13214,170 @@ msgstr ""
 "<span weight=\"bold\">Waarschuwing: deze versie van Claws Mail\n"
 "is gebouwd zonder ondersteuning voor IMAP en Nieuws.</span>"
 
-#: src/prefs_account.c:1147
+#: src/prefs_account.c:1155
 msgid "This server requires authentication"
 msgstr "Deze server vereist authenticatie"
 
-#: src/prefs_account.c:1154
+#: src/prefs_account.c:1162
 msgid "Authenticate on connect"
 msgstr "Authenticatie bij verbinding maken"
 
-#: src/prefs_account.c:1212
+#: src/prefs_account.c:1216
 msgid "News server"
 msgstr "Nieuwsserver"
 
-#: src/prefs_account.c:1218
+#: src/prefs_account.c:1222
 msgid "Server for receiving"
 msgstr "Server om van te ontvangen"
 
-#: src/prefs_account.c:1224
+#: src/prefs_account.c:1228
 msgid "Local mailbox"
 msgstr "Lokaal postvak"
 
-#: src/prefs_account.c:1231
+#: src/prefs_account.c:1235
 msgid "SMTP server (send)"
 msgstr "SMTP server (zenden)"
 
-#: src/prefs_account.c:1239
+#: src/prefs_account.c:1243
 msgid "Use mail command rather than SMTP server"
 msgstr "Gebruik mail opdracht ipv SMTP"
 
-#: src/prefs_account.c:1248
+#: src/prefs_account.c:1252
 msgid "command to send mails"
 msgstr "opdracht voor versturen berichten"
 
-#: src/prefs_account.c:1310
+#: src/prefs_account.c:1314
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account.c:1396
+#: src/prefs_account.c:1400
 msgid "Local"
 msgstr "Lokaal"
 
-#: src/prefs_account.c:1402 src/prefs_account.c:1491
+#: src/prefs_account.c:1406 src/prefs_account.c:1495
 msgid "Default Inbox"
 msgstr "Standaard Inbox"
 
-#: src/prefs_account.c:1409 src/prefs_account.c:1416 src/prefs_account.c:1498
-#: src/prefs_account.c:1505
+#: src/prefs_account.c:1413 src/prefs_account.c:1420 src/prefs_account.c:1502
+#: src/prefs_account.c:1509
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ongefilterde berichten gaan in deze map"
 
-#: src/prefs_account.c:1413 src/prefs_account.c:1502 src/prefs_account.c:1966
+#: src/prefs_account.c:1417 src/prefs_account.c:1506 src/prefs_account.c:1966
 #: src/prefs_customheader.c:237
 msgid "Bro_wse"
 msgstr "Bekijk"
 
-#: src/prefs_account.c:1424
+#: src/prefs_account.c:1428
 msgid "Use secure authentication (APOP)"
 msgstr "Gebruik beveiligde authenticatie (APOP)"
 
-#: src/prefs_account.c:1427
+#: src/prefs_account.c:1431
 msgid "Remove messages on server when received"
 msgstr "Verwijder reeds ontvangen berichten van de server"
 
-#: src/prefs_account.c:1438
+#: src/prefs_account.c:1442
 msgid "Remove after"
 msgstr "Verwijder na"
 
-#: src/prefs_account.c:1445 src/prefs_account.c:1455
+#: src/prefs_account.c:1449 src/prefs_account.c:1459
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dagen en 0 uur: verwijder meteen"
 
-#: src/prefs_account.c:1458 src/prefs_matcher.c:333
+#: src/prefs_account.c:1462 src/prefs_matcher.c:333
 msgid "hours"
 msgstr "uur"
 
-#: src/prefs_account.c:1468
+#: src/prefs_account.c:1472
 msgid "Receive size limit"
 msgstr "Limiet op grootte"
 
-#: src/prefs_account.c:1471
+#: src/prefs_account.c:1475
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgstr ""
 "Berichten die groter zijn dan deze limiet zullen gedeeltelijk worden "
-"opgehaald. Als u zo'n bericht selecteert, kunt u kiezen om het helemaal op "
+"opgehaald. Als je zo'n bericht selecteert, kun je kiezen om het helemaal op "
 "te halen of te verwijderen."
 
-#: src/prefs_account.c:1511 src/prefs_account.c:2438
+#: src/prefs_account.c:1515 src/prefs_account.c:2438
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1518
+#: src/prefs_account.c:1522
 msgid "Maximum number of articles to download"
 msgstr "Maximum aantal artikelen dat zal worden opgehaald"
 
-#: src/prefs_account.c:1528
+#: src/prefs_account.c:1532
 msgid "unlimited if 0 is specified"
 msgstr "ongelimiteerd als 0 is opgegeven"
 
-#: src/prefs_account.c:1541 src/prefs_account.c:1734
+#: src/prefs_account.c:1545 src/prefs_account.c:1738
 msgid "Authentication method"
 msgstr "Authenticatie-methode"
 
-#: src/prefs_account.c:1551 src/prefs_account.c:1743 src/prefs_send.c:286
+#: src/prefs_account.c:1555 src/prefs_account.c:1747 src/prefs_send.c:290
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/prefs_account.c:1563
+#: src/prefs_account.c:1567
 msgid "IMAP server directory"
 msgstr "IMAP-servermap"
 
-#: src/prefs_account.c:1567
+#: src/prefs_account.c:1571
 msgid "(usually empty)"
 msgstr "(gewoonlijk leeg)"
 
-#: src/prefs_account.c:1581
+#: src/prefs_account.c:1585
 msgid "Show subscribed folders only"
 msgstr "Geef alleen geabonneerde mappen weer"
 
-#: src/prefs_account.c:1588
+#: src/prefs_account.c:1592
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Bandbreedte-efficiente methode (vermijdt ophalen van tags)"
 
-#: src/prefs_account.c:1590
+#: src/prefs_account.c:1594
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Deze methode gebruikt minder bandbreedte, maar kan langzamer zijn met "
 "bepaalde servers."
 
-#: src/prefs_account.c:1597
+#: src/prefs_account.c:1601
 msgid "Filter messages on receiving"
 msgstr "Filter de berichten bij het ophalen"
 
-#: src/prefs_account.c:1604
+#: src/prefs_account.c:1608
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filter de berichten bij het ophalen met behulp van plugins"
 
-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1612
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Ophalen' haalt de e-mail voor dit account op"
 
-#: src/prefs_account.c:1689 src/prefs_customheader.c:209
-#: src/prefs_matcher.c:620 src/prefs_matcher.c:1952 src/prefs_matcher.c:1974
+#: src/prefs_account.c:1693 src/prefs_customheader.c:209
+#: src/prefs_matcher.c:620 src/prefs_matcher.c:1958 src/prefs_matcher.c:1980
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account.c:1691
+#: src/prefs_account.c:1695
 msgid "Generate Message-ID"
 msgstr "Bericht-ID aanmaken"
 
-#: src/prefs_account.c:1694
+#: src/prefs_account.c:1698
 msgid "Send account mail address in Message-ID"
 msgstr "Stuur account e-mail adres in Bericht-Id"
 
-#: src/prefs_account.c:1697
-#, fuzzy
+#: src/prefs_account.c:1701
 msgid "Generate X-Mailer header"
-msgstr "Genereer een nieuw sleutelpaar"
+msgstr "Genereer X-Mailer header"
 
-#: src/prefs_account.c:1704
+#: src/prefs_account.c:1708
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account.c:1719
+#: src/prefs_account.c:1723
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-authenticatie (SMTP AUTH)"
 
@@ -13277,7 +13386,7 @@ msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
-"Als u deze velden leeg laat, worden dezelfde\n"
+"Als je deze velden leeg laat, worden dezelfde\n"
 "gebruikersnaam en wachtwoord gebruikt als bij ontvangen."
 
 #: src/prefs_account.c:1819
@@ -13334,12 +13443,12 @@ msgid "Compose"
 msgstr "Opstellen"
 
 #: src/prefs_account.c:2154 src/prefs_folder_item.c:1471 src/prefs_quote.c:134
-#: src/toolbar.c:407
+#: src/toolbar.c:408
 msgid "Reply"
 msgstr "Antwoord"
 
 #: src/prefs_account.c:2169 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1499 src/prefs_quote.c:149 src/toolbar.c:411
+#: src/prefs_folder_item.c:1499 src/prefs_quote.c:149 src/toolbar.c:412
 msgid "Forward"
 msgstr "Doorsturen"
 
@@ -13369,7 +13478,7 @@ msgstr ""
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Versleutel verzonden berichten behalve met de sleutel van de ontvanger ook "
-"met uw eigen sleutel"
+"met je eigen sleutel"
 
 #: src/prefs_account.c:2257
 msgid "Save sent encrypted messages as clear text"
@@ -13430,7 +13539,7 @@ msgstr "Gebruik niet-blokkerende SSL"
 
 #: src/prefs_account.c:2544
 msgid "Turn this off if you have SSL connection problems"
-msgstr "Zet dit uit als u problemen heeft met SSL-verbindingen"
+msgstr "Zet dit uit als je problemen hebt met SSL-verbindingen"
 
 #: src/prefs_account.c:2660
 msgid "SMTP port"
@@ -13498,23 +13607,23 @@ msgstr "Plaats verwijderde berichten in"
 
 #: src/prefs_account.c:2838
 msgid "Account name is not entered."
-msgstr "U heeft geen accountnaam opgegeven."
+msgstr "Je hebt geen accountnaam opgegeven."
 
 #: src/prefs_account.c:2842
 msgid "Mail address is not entered."
-msgstr "U heeft geen e-mailadres opgegeven."
+msgstr "Je hebt geen e-mailadres opgegeven."
 
 #: src/prefs_account.c:2849
 msgid "SMTP server is not entered."
-msgstr "U heeft geen SMTP server opgegeven."
+msgstr "Je hebt geen SMTP server opgegeven."
 
 #: src/prefs_account.c:2854
 msgid "User ID is not entered."
-msgstr "U heeft geen gebruikersnaam opgegeven."
+msgstr "Je hebt geen gebruikersnaam opgegeven."
 
 #: src/prefs_account.c:2859
 msgid "POP3 server is not entered."
-msgstr "U heeft geen POP3 server opgegeven."
+msgstr "Je hebt geen POP3 server opgegeven."
 
 #: src/prefs_account.c:2879
 msgid "The default Inbox folder doesn't exist."
@@ -13522,19 +13631,19 @@ msgstr "De standaard Inbox-map bestaat niet."
 
 #: src/prefs_account.c:2885
 msgid "IMAP4 server is not entered."
-msgstr "U heeft geen IMAP4 server opgegeven."
+msgstr "Je hebt geen IMAP4 server opgegeven."
 
 #: src/prefs_account.c:2890
 msgid "NNTP server is not entered."
-msgstr "U heeft geen NNTP server opgegeven."
+msgstr "Je hebt geen NNTP server opgegeven."
 
 #: src/prefs_account.c:2896
 msgid "local mailbox filename is not entered."
-msgstr "U heeft geen bestandsnaam voor het lokale postvak opgegeven."
+msgstr "Je hebt geen bestandsnaam voor het lokale postvak opgegeven."
 
 #: src/prefs_account.c:2902
 msgid "mail command is not entered."
-msgstr "U heeft geen mail opdrachtregel opgegeven."
+msgstr "Je hebt geen mail opdrachtregel opgegeven."
 
 #: src/prefs_account.c:3219
 msgid "Receive"
@@ -13548,32 +13657,32 @@ msgstr "Sjablonen"
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account.c:3392
+#: src/prefs_account.c:3400
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: src/prefs_account.c:3680
+#: src/prefs_account.c:3688
 msgid "Preferences for new account"
 msgstr "Voorkeuren voor nieuw account"
 
-#: src/prefs_account.c:3682
+#: src/prefs_account.c:3690
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - accountvoorkeuren"
 
-#: src/prefs_account.c:3787
+#: src/prefs_account.c:3794
 msgid "Select signature file"
 msgstr "Selecteer bestand met handtekening"
 
-#: src/prefs_account.c:3805 src/prefs_account.c:3822 src/wizard.c:1237
+#: src/prefs_account.c:3812 src/prefs_account.c:3829 src/wizard.c:1053
 msgid "Select certificate file"
 msgstr "Selecteer certificaat bestand"
 
-#: src/prefs_account.c:3918
+#: src/prefs_account.c:3925
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/prefs_account.c:4058
+#: src/prefs_account.c:4065
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin niet geladen)"
@@ -13602,73 +13711,72 @@ msgstr "Bewerk filter actie"
 msgid "Append the new action above to the list"
 msgstr "Plaats de nieuwe actie bovenaan de lijst"
 
-#: src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:768 src/prefs_template.c:309
-#: src/prefs_toolbar.c:1043
-msgid "Replace"
-msgstr "Vervang"
-
 #: src/prefs_actions.c:335
 msgid "Replace the selected action in list with the action above"
 msgstr "Vervang de geselecteerde actie in de lijst met bovenstaande actie"
 
-#: src/prefs_actions.c:343
+#: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:778 src/prefs_template.c:318
+#: src/prefs_toolbar.c:1056
+msgid "Re_move"
+msgstr "_Verwijderen"
+
+#: src/prefs_actions.c:345
 msgid "Delete the selected action from the list"
 msgstr "Verwijder de geselecteerde actie van de lijst"
 
-#: src/prefs_actions.c:351 src/prefs_filtering.c:500 src/prefs_template.c:332
+#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:336
 msgid "Clear all the input fields in the dialog"
 msgstr "Wis alle invoervelden in de dialoog"
 
-#: src/prefs_actions.c:359
+#: src/prefs_actions.c:363
 msgid "Show information on configuring actions"
 msgstr "Geef informatie weer over configureren van acties"
 
-#: src/prefs_actions.c:390
+#: src/prefs_actions.c:394
 msgid "Move the selected action up"
 msgstr "Verplaats de geselecteerde actie naar boven"
 
-#: src/prefs_actions.c:398
+#: src/prefs_actions.c:402
 msgid "Move selected action down"
 msgstr "Verplaats de geselecteerde actie naar onderen"
 
-#: src/prefs_actions.c:531 src/prefs_filtering_action.c:702
-#: src/prefs_filtering.c:833 src/prefs_filtering.c:835
-#: src/prefs_filtering.c:836 src/prefs_filtering.c:946 src/prefs_matcher.c:891
-#: src/prefs_template.c:465
+#: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
+#: src/prefs_filtering.c:836 src/prefs_filtering.c:838
+#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:897
+#: src/prefs_template.c:469
 msgid "(New)"
 msgstr "(Nieuw)"
 
-#: src/prefs_actions.c:596
+#: src/prefs_actions.c:600
 msgid "Menu name is not set."
 msgstr "Menunaam is niet ingevoerd."
 
-#: src/prefs_actions.c:601
+#: src/prefs_actions.c:605
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "Een menunaam mag niet met een '/' beginnen."
 
-#: src/prefs_actions.c:606
+#: src/prefs_actions.c:610
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Dubbele punt ':' is niet toegestaan in de menunaam."
 
-#: src/prefs_actions.c:612
-#, fuzzy
+#: src/prefs_actions.c:616
 msgid "There is an action with this name already."
-msgstr "Oriëntatie van het Systeemvak"
+msgstr "Er is al een actie met deze naam."
 
-#: src/prefs_actions.c:631
+#: src/prefs_actions.c:635
 msgid "Menu name is too long."
 msgstr "Menunaam is te lang."
 
-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:644
 msgid "Command-line not set."
 msgstr "Opdrachtregel is niet ingevoerd."
 
-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:649
 msgid "Menu name and command are too long."
 msgstr "Menunaam en opdrachtregel zijn te lang."
 
-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:655
 #, c-format
 msgid ""
 "The command\n"
@@ -13679,149 +13787,149 @@ msgstr ""
 "%s\n"
 "bevat een syntaxis fout."
 
-#: src/prefs_actions.c:709
+#: src/prefs_actions.c:713
 msgid "Delete action"
 msgstr "Verwijder actie"
 
-#: src/prefs_actions.c:710
+#: src/prefs_actions.c:714
 msgid "Do you really want to delete this action?"
-msgstr "Wilt u werkelijk deze actie verwijderen?"
+msgstr "Wil je werkelijk deze actie verwijderen?"
 
-#: src/prefs_actions.c:730
+#: src/prefs_actions.c:734
 msgid "Delete all actions"
 msgstr "Verwijder alle acties"
 
-#: src/prefs_actions.c:731
+#: src/prefs_actions.c:735
 msgid "Do you really want to delete all the actions?"
-msgstr "Wilt u werkelijk alle acties verwijderen?"
+msgstr "Wil je werkelijk alle acties verwijderen?"
 
-#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1496
-#: src/prefs_filtering.c:1518 src/prefs_matcher.c:2103
-#: src/prefs_template.c:565 src/prefs_template.c:590
+#: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1499
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2109
+#: src/prefs_template.c:569 src/prefs_template.c:594
 msgid "Entry not saved"
 msgstr "Ingang niet opgeslagen"
 
-#: src/prefs_actions.c:895 src/prefs_actions.c:926 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_template.c:566
-#: src/prefs_template.c:591
+#: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1522 src/prefs_template.c:570
+#: src/prefs_template.c:595
 msgid "The entry was not saved. Close anyway?"
 msgstr "Deze ingang is nie opgeslagen. Toch afsluiten?"
 
-#: src/prefs_actions.c:896 src/prefs_actions.c:901 src/prefs_actions.c:927
-#: src/prefs_filtering.c:1476 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_matcher.c:2105
-#: src/prefs_template.c:567 src/prefs_template.c:592 src/prefs_template.c:597
+#: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
+#: src/prefs_filtering.c:1479 src/prefs_filtering.c:1501
+#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2111
+#: src/prefs_template.c:571 src/prefs_template.c:596 src/prefs_template.c:601
 msgid "+_Continue editing"
 msgstr "+Ga _door met bewerken"
 
-#: src/prefs_actions.c:899
+#: src/prefs_actions.c:903
 msgid "Actions list not saved"
 msgstr "Actielijst is niet bewaard"
 
-#: src/prefs_actions.c:900
+#: src/prefs_actions.c:904
 msgid "The actions list has been modified. Close anyway?"
 msgstr "De actielijst is gewijzigd. Toch afsluiten?"
 
-#: src/prefs_actions.c:970
+#: src/prefs_actions.c:974
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Menunaam:</span>"
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:975
 msgid "Use / in menu name to make submenus."
 msgstr "Gebruik '/' in een menunaam om submenus te maken."
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:977
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Opdrachtregel:</span>"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:978
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Begin met:</span>"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:979
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "om de berichttekst of selectie naar de standaard input van de opdracht te "
 "sturen."
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:980
 msgid "to send user provided text to command's standard input"
 msgstr ""
 "om door de gebruiker opgegeven tekst naar de standaard input van de opdracht "
 "te sturen."
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:981
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "om door de gebruiker opgegeven, maar verborgen, tekst naar de standaard "
 "input van de opdracht te sturen."
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:982
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Eindig met:</span>"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:983
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "om de berichttekst of selectie te vervangen met de standaard output van de "
 "opdracht."
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:984
 msgid "to insert command's standard output without replacing old text"
 msgstr ""
 "de standaard output van de opdracht in te voegen, zonder de oude tekst te "
 "vervangen."
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:985
 msgid "to run command asynchronously"
 msgstr "om de opdracht asynchroon uit te voeren"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:986
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Gebruik:</span>"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:987
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr ""
 "voor het bestand met daarin het geselecteerde bericht in RFC822/2822 format"
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:988
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 "voor de lijst van bestanden van de geselecteerde berichten in RFC822/2822 "
 "format"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:989
 msgid "for the file of the selected decoded message MIME part"
 msgstr "voor het bestand van het geselecteerde berichtonderdeel"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:990
 msgid "for a user provided argument"
 msgstr "voor een door de gebruiker opgegeven argument"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:991
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr ""
 "voor een door de gebruiker opgegeven verborgen argument (bijv. wachtwoord)"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:992
 msgid "for the text selection"
 msgstr "voor de tekst selectie"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:993
 msgid "apply filtering actions between {} to selected messages"
 msgstr "voer de filteracties tussen de {} uit op de geselecteerde berichten"
 
-#: src/prefs_actions.c:990
+#: src/prefs_actions.c:994
 msgid "for a literal %"
 msgstr "letterlijke %"
 
-#: src/prefs_actions.c:1000 src/prefs_themes.c:959
+#: src/prefs_actions.c:1004 src/prefs_themes.c:959
 msgid "Actions"
 msgstr "Acties"
 
-#: src/prefs_actions.c:1001
+#: src/prefs_actions.c:1005
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
@@ -13829,29 +13937,29 @@ msgstr ""
 "Met 'Acties' kunt externe programma's uitvoeren om berichten of gedeelten "
 "daarvan te verwerken."
 
-#: src/prefs_actions.c:1088 src/prefs_filtering.c:1694
-#: src/prefs_template.c:1097
+#: src/prefs_actions.c:1092 src/prefs_filtering.c:1697
+#: src/prefs_template.c:1101
 msgid "D_uplicate"
 msgstr "D_ubbele"
 
-#: src/prefs_actions.c:1215
+#: src/prefs_actions.c:1212
 msgid "Current actions"
 msgstr "Huidige acties"
 
-#: src/prefs_actions.c:1314 src/prefs_filtering.c:1071
-#: src/prefs_filtering.c:1129
+#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074
+#: src/prefs_filtering.c:1132
 msgid "Action string is not valid."
 msgstr "Actie-regel is niet geldig."
 
-#: src/prefs_common.c:230 src/prefs_quote.c:69
+#: src/prefs_common.c:220 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hallo,\\n"
 
-#: src/prefs_common.c:304
+#: src/prefs_common.c:294
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "Op %d\\n%f schreef:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:310 src/prefs_quote.c:85
+#: src/prefs_common.c:300 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -13859,10 +13967,9 @@ msgstr ""
 "\\n\\nBegin doorgestuurd bericht:\\n\\n?d{Datum: %d\\n}?f{Van: %f\\n}?t{Aan: "
 "%t\\n}?c{Cc: %c\\n}?n{Nieuwsgroepen: %n\\n}?s{Onderwerp: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:450
-#, fuzzy
+#: src/prefs_common.c:440
 msgid "%x(%a) %H:%M"
-msgstr "%a %d/%m/%y %H:%M"
+msgstr "%x(%a) %H:%M"
 
 #: src/prefs_compose_writing.c:121
 msgid "Automatic account selection"
@@ -13940,11 +14047,11 @@ msgstr "Bij het laten vallen van bestanden in het opstelscherm"
 msgid "Ask"
 msgstr "Vraag"
 
-#: src/prefs_compose_writing.c:230 src/toolbar.c:425
+#: src/prefs_compose_writing.c:230 src/toolbar.c:426
 msgid "Insert"
 msgstr "Invoegen"
 
-#: src/prefs_compose_writing.c:231 src/toolbar.c:426
+#: src/prefs_compose_writing.c:231 src/toolbar.c:427
 msgid "Attach"
 msgstr "Bijvoegen"
 
@@ -13957,7 +14064,7 @@ msgid "Custom header configuration"
 msgstr "Aangepaste header instellen"
 
 #: src/prefs_customheader.c:507 src/prefs_display_header.c:599
-#: src/prefs_matcher.c:1577 src/prefs_matcher.c:1592
+#: src/prefs_matcher.c:1583 src/prefs_matcher.c:1598
 msgid "Header name is not set."
 msgstr "Header-naam niet ingevoerd."
 
@@ -14000,7 +14107,7 @@ msgstr "De afbeelding heeft niet het goede format (XBM)."
 #: src/prefs_customheader.c:615
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
-"Kon 'compface' niet aanroepen. Zorg ervoor dat het in uw $PATH voorkomt."
+"Kon 'compface' niet aanroepen. Zorg ervoor dat het in je $PATH voorkomt."
 
 #: src/prefs_customheader.c:621
 #, c-format
@@ -14056,19 +14163,19 @@ msgstr "%s wordt vervangen door de bestandsnaam of URI"
 msgid "Use system defaults when possible"
 msgstr "Gebruik standaard systeeminstellingen wanneer mogelijk"
 
-#: src/prefs_ext_prog.c:146
+#: src/prefs_ext_prog.c:141
 msgid "Web browser"
 msgstr "Webbrowser"
 
-#: src/prefs_ext_prog.c:180
+#: src/prefs_ext_prog.c:169
 msgid "Text editor"
 msgstr "Tekst editor"
 
-#: src/prefs_ext_prog.c:208
+#: src/prefs_ext_prog.c:197
 msgid "Command for 'Display as text'"
 msgstr "Opdracht voor 'Als tekst weergeven'"
 
-#: src/prefs_ext_prog.c:221
+#: src/prefs_ext_prog.c:210
 msgid ""
 "This option enables MIME parts to be displayed in the message view via a "
 "script when using the 'Display as text' contextual menu item"
@@ -14077,12 +14184,12 @@ msgstr ""
 "de 'Als tekst weergeven'-optie worden weergegeven, dit te laten doen door "
 "middel van een script."
 
-#: src/prefs_ext_prog.c:280 src/prefs_image_viewer.c:138
+#: src/prefs_ext_prog.c:269 src/prefs_image_viewer.c:138
 #: src/prefs_message.c:354
 msgid "Message View"
 msgstr "Berichtweergave"
 
-#: src/prefs_ext_prog.c:281
+#: src/prefs_ext_prog.c:270
 msgid "External Programs"
 msgstr "Externe programma's"
 
@@ -14126,8 +14233,8 @@ msgstr "Markeer als spam"
 msgid "Mark as ham"
 msgstr "Markeer als ham"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1436
-#: src/toolbar.c:204 src/toolbar.c:435 src/toolbar.c:2106
+#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1438
+#: src/toolbar.c:205 src/toolbar.c:436 src/toolbar.c:2107
 msgid "Execute"
 msgstr "Doen!"
 
@@ -14145,7 +14252,7 @@ msgid "Redirect"
 msgstr "Herverwijzen"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1440 src/prefs_matcher.c:626
+#: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:626
 #: src/prefs_summary_column.c:87 src/summaryview.c:449
 msgid "Score"
 msgstr "Score"
@@ -14188,7 +14295,7 @@ msgstr "Stop filter"
 msgid "Action configuration"
 msgstr "Acties instellen"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1892
+#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1888
 #: src/prefs_matcher.c:583
 msgid "Rule"
 msgstr "Regel"
@@ -14197,92 +14304,92 @@ msgstr "Regel"
 msgid "Action"
 msgstr "Actie"
 
-#: src/prefs_filtering_action.c:933
+#: src/prefs_filtering_action.c:935
 msgid "Command-line not set"
 msgstr "Opdrachtregel is niet ingevoerd."
 
-#: src/prefs_filtering_action.c:934
+#: src/prefs_filtering_action.c:936
 msgid "Destination is not set."
 msgstr "Er is geen map gekozen om naar te verplaatsen."
 
-#: src/prefs_filtering_action.c:945
+#: src/prefs_filtering_action.c:947
 msgid "Recipient is not set."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/prefs_filtering_action.c:963
+#: src/prefs_filtering_action.c:965
 msgid "Score is not set"
 msgstr "Score niet ingesteld."
 
-#: src/prefs_filtering_action.c:971
+#: src/prefs_filtering_action.c:973
 msgid "Header is not set."
 msgstr "Header-naam niet ingevoerd."
 
-#: src/prefs_filtering_action.c:978
+#: src/prefs_filtering_action.c:980
 msgid "Target addressbook/folder is not set."
 msgstr "Doel adresboek/map is niet opgegeven."
 
-#: src/prefs_filtering_action.c:992
+#: src/prefs_filtering_action.c:994
 msgid "Tag name is empty."
 msgstr "Vlagnaam niet ingevoerd."
 
-#: src/prefs_filtering_action.c:1214
+#: src/prefs_filtering_action.c:1216
 msgid "No action was defined."
 msgstr "Geen acties gedefinieerd."
 
-#: src/prefs_filtering_action.c:1252 src/prefs_matcher.c:2147
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2153
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "Letterlijke %"
 
-#: src/prefs_filtering_action.c:1261 src/prefs_matcher.c:2156
+#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2162
 msgid "filename (should not be modified)"
 msgstr "bestandsnaam (dient niet veranderd te worden)"
 
-#: src/prefs_filtering_action.c:1262 src/prefs_matcher.c:2157
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2163
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "nieuwe regel"
 
-#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2158
+#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2164
 msgid "escape character for quotes"
 msgstr "escape-teken voor aanhalingstekens"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2159
+#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2165
 msgid "quote character"
 msgstr "aanhalingsteken"
 
-#: src/prefs_filtering_action.c:1273
+#: src/prefs_filtering_action.c:1275
 msgid "Filtering Action: 'Execute'"
 msgstr "Filteractie: 'Uitvoeren'"
 
-#: src/prefs_filtering_action.c:1274
+#: src/prefs_filtering_action.c:1276
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
 "The following symbols can be used:"
 msgstr ""
-"Met 'Uitvoeren' kunt u een bericht of een gedeelte van een bericht naar een "
+"Met 'Uitvoeren' kun je een bericht of een gedeelte van een bericht naar een "
 "extern programma of script sturen.\n"
 "\n"
 "De volgende speciale tekens kunnen worden gebruikt:"
 
-#: src/prefs_filtering_action.c:1420
+#: src/prefs_filtering_action.c:1422
 msgid "Recipient"
 msgstr "Ontvanger"
 
-#: src/prefs_filtering_action.c:1424
+#: src/prefs_filtering_action.c:1426
 msgid "Book/Folder"
 msgstr "Boek/Map"
 
-#: src/prefs_filtering_action.c:1428
+#: src/prefs_filtering_action.c:1430
 msgid "Destination"
 msgstr "Doel"
 
-#: src/prefs_filtering_action.c:1432
+#: src/prefs_filtering_action.c:1434
 msgid "Color"
 msgstr "Kleur"
 
-#: src/prefs_filtering_action.c:1518
+#: src/prefs_filtering_action.c:1520
 msgid "Current action list"
 msgstr "Huidige actielijst"
 
@@ -14291,8 +14398,8 @@ msgid "Filtering/Processing configuration"
 msgstr "Filteren/Verwerken instellen"
 
 # TPTD: Check this
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:864
-#: src/prefs_filtering.c:978
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
+#: src/prefs_filtering.c:981
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Alle"
@@ -14301,9 +14408,13 @@ msgstr "Alle"
 msgid "Condition"
 msgstr "Voorwaarde"
 
-#: src/prefs_filtering.c:424 src/prefs_filtering.c:446
-msgid " Define... "
-msgstr " Definieer... "
+#: src/prefs_filtering.c:424
+msgid " D_efine... "
+msgstr " D_efinieer... "
+
+#: src/prefs_filtering.c:446
+msgid " De_fine... "
+msgstr " De_finieer... "
 
 #: src/prefs_filtering.c:475
 msgid "Append the new rule above to the list"
@@ -14313,87 +14424,87 @@ msgstr "Voeg de nieuwe bovenstaande regel toe aan de lijst"
 msgid "Replace the selected rule in list with the rule above"
 msgstr "Vervang de geselecteerde regel in de lijst met bovenstaande regel"
 
-#: src/prefs_filtering.c:492
+#: src/prefs_filtering.c:493
 msgid "Delete the selected rule from the list"
 msgstr "Verwijder de geselecteerde regel van de lijst"
 
-#: src/prefs_filtering.c:529
+#: src/prefs_filtering.c:532
 msgid "Move the selected rule to the top"
 msgstr "Verplaats de geselecteerde regel naar bovenaan"
 
-#: src/prefs_filtering.c:532
-msgid "Page up"
-msgstr "Pagina naar boven"
+#: src/prefs_filtering.c:535
+msgid "Page u_p"
+msgstr "Pagina naar _boven"
 
-#: src/prefs_filtering.c:540
+#: src/prefs_filtering.c:543
 msgid "Move the selected rule one page up"
 msgstr "Verplaats de geselecteerde regel een pagina naar boven"
 
-#: src/prefs_filtering.c:549
+#: src/prefs_filtering.c:552
 msgid "Move the selected rule up"
 msgstr "Verplaats de geselecteerde regel naar boven"
 
-#: src/prefs_filtering.c:557
+#: src/prefs_filtering.c:560
 msgid "Move the selected rule down"
 msgstr "Verplaats e geselecteerde regel naar onderen"
 
-#: src/prefs_filtering.c:560
-msgid "Page down"
-msgstr "Pagina naar beneden"
+#: src/prefs_filtering.c:563
+msgid "Page dow_n"
+msgstr "Pagina naar b_eneden"
 
-#: src/prefs_filtering.c:568
+#: src/prefs_filtering.c:571
 msgid "Move the selected rule one page down"
 msgstr "Verplaats de geselecteerde regel een pagina naar beneden"
 
-#: src/prefs_filtering.c:577
+#: src/prefs_filtering.c:580
 msgid "Move the selected rule to the bottom"
 msgstr "Verplaats de geselecteerde regel naar benedenaan"
 
-#: src/prefs_filtering.c:1035 src/prefs_filtering.c:1121
+#: src/prefs_filtering.c:1038 src/prefs_filtering.c:1124
 msgid "Condition string is not valid."
 msgstr "Voorwaarde-regel is niet geldig."
 
-#: src/prefs_filtering.c:1108
+#: src/prefs_filtering.c:1111
 msgid "Condition string is empty."
 msgstr "Voorwaarde-regel is leeg."
 
-#: src/prefs_filtering.c:1114
+#: src/prefs_filtering.c:1117
 msgid "Action string is empty."
 msgstr "Actie-regel is leeg."
 
-#: src/prefs_filtering.c:1202
+#: src/prefs_filtering.c:1205
 msgid "Delete rule"
 msgstr "Verwijder deze regel"
 
-#: src/prefs_filtering.c:1203
+#: src/prefs_filtering.c:1206
 msgid "Do you really want to delete this rule?"
 msgstr "Wil je deze regel werkelijk verwijderen?"
 
-#: src/prefs_filtering.c:1221
+#: src/prefs_filtering.c:1224
 msgid "Delete all rules"
 msgstr "Verwijder alle regels"
 
-#: src/prefs_filtering.c:1222
+#: src/prefs_filtering.c:1225
 msgid "Do you really want to delete all the rules?"
-msgstr "Wilt u alle regels werkelijk verwijderen?"
+msgstr "Wil je alle regels werkelijk verwijderen?"
 
-#: src/prefs_filtering.c:1474
+#: src/prefs_filtering.c:1477
 msgid "Filtering rules not saved"
 msgstr "Filterregels niet bewaard"
 
-#: src/prefs_filtering.c:1475
+#: src/prefs_filtering.c:1478
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "De lijst met filterregels is gewijzigd. Toch afsluiten?"
 
-#: src/prefs_filtering.c:1697
+#: src/prefs_filtering.c:1700
 msgid "Move one page up"
 msgstr "Ga een pagina naar boven"
 
-#: src/prefs_filtering.c:1698
+#: src/prefs_filtering.c:1701
 msgid "Move one page down"
 msgstr "Ga een pagina naar beneden"
 
-#: src/prefs_filtering.c:1860
+#: src/prefs_filtering.c:1856
 msgid "Enable"
 msgstr "Aanzetten"
 
@@ -14419,7 +14530,7 @@ msgid "Displayed columns"
 msgstr "Weergegeven kolommen"
 
 #: src/prefs_folder_column.c:329 src/prefs_msg_colors.c:494
-#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1055
+#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1064
 msgid " Use default "
 msgstr " Gebruik de standaard "
 
@@ -14431,7 +14542,7 @@ msgid ""
 "subfolders\".</i>"
 msgstr ""
 "<i>Deze voorkeuren zullen niet worden opgeslagen omdat dit een map is van "
-"het eerste niveau. U kunt deze voorkeuren echter wel gebruiken om ze in te "
+"het eerste niveau. Je kunt deze voorkeuren echter wel gebruiken om ze in te "
 "stellen voor de hele mappenboom door gebruik te maken van \"Pas toe op "
 "submappen\".</i>"
 
@@ -14461,11 +14572,11 @@ msgstr "Verkorte onderwerpweergave RegExp"
 
 #: src/prefs_folder_item.c:364
 msgid "Test string:"
-msgstr ""
+msgstr "Test string:"
 
 #: src/prefs_folder_item.c:381
 msgid "Result:"
-msgstr ""
+msgstr "Resultaat:"
 
 # TPTD: ugly
 #: src/prefs_folder_item.c:396
@@ -14501,15 +14612,16 @@ msgstr ""
 "filteren op de IMAP-server of door een externe applicatie"
 
 #: src/prefs_folder_item.c:504
-#, fuzzy
 msgid "Select the HTML part of multipart messages"
-msgstr "Selecteer het HTML gedeelte van meerdelige/alternatieve berichten"
+msgstr "Selecteer het HTML gedeelte van meerdelige berichten"
 
 #: src/prefs_folder_item.c:521
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
 msgstr ""
+"\"Standaard\" volgt de globale voorkeuren (gevonden in /Voorkeuren/"
+"Berichtweergave/Tekstopties)"
 
 #: src/prefs_folder_item.c:531
 msgid "Synchronise for offline use"
@@ -14559,7 +14671,7 @@ msgstr "Gooi cache weg"
 
 #: src/prefs_folder_item.c:1686
 msgid "Do you really want to discard the local cached data for this folder?"
-msgstr "Wilt u werkelijk de lokale cache voor deze map verwijderen?"
+msgstr "Wil je werkelijk de lokale cache voor deze map verwijderen?"
 
 #: src/prefs_folder_item.c:1688
 msgid "+Discard"
@@ -14578,7 +14690,7 @@ msgstr "Eigenschappen voor map %s"
 msgid "Folder and Message Lists"
 msgstr "Mappen- en berichtenlijst"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2024
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2030
 msgid "Message"
 msgstr "Bericht"
 
@@ -14611,7 +14723,7 @@ msgstr "Beeld"
 msgid "Fonts"
 msgstr "Lettertypes"
 
-#: src/prefs_gtk.c:938 src/toolbar.c:212 src/toolbar.c:421
+#: src/prefs_gtk.c:938 src/toolbar.c:213 src/toolbar.c:422
 msgid "Preferences"
 msgstr "Voorkeuren"
 
@@ -14667,7 +14779,7 @@ msgid ""
 "might be critical when applying many rules upon thousands of messages."
 msgstr ""
 "Dit zet loggen van de filter- en verwerkingsregels aan.\n"
-"Toegang tot het log vindt u via 'Gereedschap/Filter log'\n"
+"Toegang tot het log vind je via 'Gereedschap/Filter log'\n"
 "Let op: deze optie aanzetten zal tot vertraging leiden bij het filter/"
 "verwerkingsproces, dit kan belangrijk zijn bij het toepassen van veel regels "
 "op duizenden berichten."
@@ -14828,11 +14940,11 @@ msgstr "berichtinhoud"
 msgid "whole message"
 msgstr "hele bericht"
 
-#: src/prefs_matcher.c:389 src/summaryview.c:6309
+#: src/prefs_matcher.c:389 src/summaryview.c:6298
 msgid "Marked"
 msgstr "Markeer"
 
-#: src/prefs_matcher.c:390 src/summaryview.c:6307
+#: src/prefs_matcher.c:390 src/summaryview.c:6296
 msgid "Deleted"
 msgstr "Verwijderd"
 
@@ -14840,12 +14952,12 @@ msgstr "Verwijderd"
 msgid "Replied"
 msgstr "Beantwoord"
 
-#: src/prefs_matcher.c:392 src/summaryview.c:6301
+#: src/prefs_matcher.c:392 src/summaryview.c:6290
 msgid "Forwarded"
 msgstr "Doorgestuurd"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6291 src/toolbar.c:414
-#: src/toolbar.c:950 src/toolbar.c:1996
+#: src/prefs_matcher.c:394 src/summaryview.c:6280 src/toolbar.c:415
+#: src/toolbar.c:951 src/toolbar.c:1997
 msgid "Spam"
 msgstr "Spam"
 
@@ -14853,7 +14965,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Heeft bijvoegsel"
 
-#: src/prefs_matcher.c:396 src/summaryview.c:6327
+#: src/prefs_matcher.c:396 src/summaryview.c:6316
 msgid "Signed"
 msgstr "Ondertekend"
 
@@ -14953,54 +15065,54 @@ msgstr "Gedeeltelijk opgehaald"
 msgid "External program test"
 msgstr "Externe programma test"
 
-#: src/prefs_matcher.c:707 src/prefs_matcher.c:1598 src/prefs_matcher.c:1613
-#: src/prefs_matcher.c:2495
+#: src/prefs_matcher.c:707 src/prefs_matcher.c:1604 src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:2501
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Alle"
 
-#: src/prefs_matcher.c:739
+#: src/prefs_matcher.c:741
 msgid "Use regexp"
 msgstr "Gebruik regex"
 
-#: src/prefs_matcher.c:812
+#: src/prefs_matcher.c:818
 msgid "Message must match"
 msgstr "Bericht moet overeenkomen met"
 
-#: src/prefs_matcher.c:816
+#: src/prefs_matcher.c:822
 msgid "at least one"
 msgstr "minstens een"
 
-#: src/prefs_matcher.c:817
+#: src/prefs_matcher.c:823
 msgid "all"
 msgstr "elke"
 
-#: src/prefs_matcher.c:820
+#: src/prefs_matcher.c:826
 msgid "of above rules"
 msgstr "van bovenstaande regels"
 
-#: src/prefs_matcher.c:1516 src/prefs_matcher.c:1582
+#: src/prefs_matcher.c:1522 src/prefs_matcher.c:1588
 msgid "Search pattern is not set."
 msgstr "Zoekcriteria niet ingevoerd."
 
-#: src/prefs_matcher.c:1525
+#: src/prefs_matcher.c:1531
 msgid "Test command is not set."
 msgstr "Test-opdrachtregel is niet ingevoerd."
 
-#: src/prefs_matcher.c:1599
+#: src/prefs_matcher.c:1605
 msgid "all addresses in all headers"
 msgstr "alle adressen in alle headers"
 
-#: src/prefs_matcher.c:1602
+#: src/prefs_matcher.c:1608
 msgid "any address in any header"
 msgstr "elk adres in elke header"
 
-#: src/prefs_matcher.c:1604
+#: src/prefs_matcher.c:1610
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "de adres(sen) in header '%s'"
 
-#: src/prefs_matcher.c:1605
+#: src/prefs_matcher.c:1611
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -15013,79 +15125,79 @@ msgstr ""
 "Als je %s wilt vergelijken met alle ingangen in het adresboek, dan dien je "
 "'%s' te selecteren van de boek/map-keuzelijst."
 
-#: src/prefs_matcher.c:1824
+#: src/prefs_matcher.c:1830
 msgid "Headers part"
 msgstr "Header-deel"
 
-#: src/prefs_matcher.c:1828
+#: src/prefs_matcher.c:1834
 msgid "Body part"
 msgstr "Berichtinhoud"
 
-#: src/prefs_matcher.c:1832
+#: src/prefs_matcher.c:1838
 msgid "Whole message"
 msgstr "Hele bericht"
 
-#: src/prefs_matcher.c:1951 src/prefs_matcher.c:1995
+#: src/prefs_matcher.c:1957 src/prefs_matcher.c:2001
 msgid "in"
 msgstr "in"
 
-#: src/prefs_matcher.c:1953
+#: src/prefs_matcher.c:1959
 msgid "content is"
 msgstr "inhoud is"
 
-#: src/prefs_matcher.c:1962
+#: src/prefs_matcher.c:1968
 msgid "Age is"
 msgstr "Leeftijd is"
 
-#: src/prefs_matcher.c:1967
+#: src/prefs_matcher.c:1973
 msgid "Flag"
 msgstr "Vlag"
 
-#: src/prefs_matcher.c:1968 src/prefs_matcher.c:1985
+#: src/prefs_matcher.c:1974 src/prefs_matcher.c:1991
 msgid "is"
 msgstr "is"
 
-#: src/prefs_matcher.c:1973
+#: src/prefs_matcher.c:1979
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/prefs_matcher.c:1984
+#: src/prefs_matcher.c:1990
 msgid "Label"
 msgstr "Label"
 
-#: src/prefs_matcher.c:1990
+#: src/prefs_matcher.c:1996
 msgid "Value:"
 msgstr "Waarde:"
 
-#: src/prefs_matcher.c:2007
+#: src/prefs_matcher.c:2013
 msgid "Score is"
 msgstr "Score is"
 
-#: src/prefs_matcher.c:2008
+#: src/prefs_matcher.c:2014
 msgid "points"
 msgstr "punten"
 
-#: src/prefs_matcher.c:2018
+#: src/prefs_matcher.c:2024
 msgid "Size is"
 msgstr "Grootte is"
 
-#: src/prefs_matcher.c:2023
+#: src/prefs_matcher.c:2029
 msgid "Scope:"
 msgstr "Breedte:"
 
-#: src/prefs_matcher.c:2025
+#: src/prefs_matcher.c:2031
 msgid "tags"
 msgstr "tags"
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2036
 msgid "type is"
 msgstr "type is"
 
-#: src/prefs_matcher.c:2034
+#: src/prefs_matcher.c:2040
 msgid "Program returns"
 msgstr "Programma komt terug"
 
-#: src/prefs_matcher.c:2104
+#: src/prefs_matcher.c:2110
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -15093,24 +15205,24 @@ msgstr ""
 "Deze ingang is niet opgeslagen.\n"
 "Toch sluiten?"
 
-#: src/prefs_matcher.c:2168
+#: src/prefs_matcher.c:2174
 msgid "Match Type: 'Test'"
 msgstr "Zoek Type: 'Test'"
 
-#: src/prefs_matcher.c:2169
+#: src/prefs_matcher.c:2175
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
 "\n"
 "The following symbols can be used:"
 msgstr ""
-"Met 'Test' kunt u een bericht of een gedeelte daarvan\n"
+"Met 'Test' kun je een bericht of een gedeelte daarvan\n"
 "met behulp van een extern programma of script testen.\n"
 "Het programma dient 0 of 1 terug te geven.\n"
 "\n"
 "De volgende speciale tekens kunnen gebruikt worden:"
 
-#: src/prefs_matcher.c:2268
+#: src/prefs_matcher.c:2274
 msgid "Current condition rules"
 msgstr "Huidige voorwaarden"
 
@@ -15179,13 +15291,12 @@ msgid "Show attachment descriptions (rather than names)"
 msgstr "Toon beschrijving van bijvoegsels (i.p.v de namen)"
 
 #: src/prefs_message.c:233
-#, fuzzy
 msgid "Quotation"
-msgstr "Citeerformaat"
+msgstr "Citaat"
 
 #: src/prefs_message.c:242
 msgid "Collapse quoted text on double click"
-msgstr ""
+msgstr "Vouw citaat in bij dubbelklik"
 
 #: src/prefs_message.c:249
 msgid "Treat these characters as quotation marks: "
@@ -15282,10 +15393,6 @@ msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Selecteer kleur voor handtekeningen"
 
-#: src/prefs_msg_colors.c:362
-msgid "Signatures"
-msgstr "Handtekeningen"
-
 #: src/prefs_msg_colors.c:367 src/prefs_summaries.c:354
 msgid "Folder list"
 msgstr "Mappenlijst"
@@ -15401,7 +15508,7 @@ msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
 msgstr ""
-"U kunt ook altijd sneltoetsen van menu items veranderen door\n"
+"Je kunt ook altijd sneltoetsen van menu items veranderen door\n"
 "met de muis op dat item te gaan staan, en dan de gewenste toets in te "
 "drukken."
 
@@ -15439,9 +15546,9 @@ msgid ""
 "by focusing on the menu item and pressing a key combination.\n"
 "Uncheck this option if you want to lock all existing keyboard shortcuts."
 msgstr ""
-"Hiermee kunt u de sneltoetsen aanpassen van de meeste menu-items door met de "
+"Hiermee kun je de sneltoetsen aanpassen van de meeste menu-items door met de "
 "muis op dat item te gaan staan, en dan de gewenste toets in te drukken\n"
-"Laat deze optie uit als u alle sneltoetsen wilt vastzetten."
+"Laat deze optie uit als je alle sneltoetsen wilt vastzetten."
 
 #: src/prefs_other.c:510
 msgid " Choose preset keyboard shortcuts... "
@@ -15513,72 +15620,72 @@ msgstr "Overige"
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Op %d\\nschreef %f:\\n\\n%q"
 
-#: src/prefs_receive.c:137
+#: src/prefs_receive.c:123
 msgid "External incorporation program"
 msgstr "Extern invoegprogramma"
 
-#: src/prefs_receive.c:140
+#: src/prefs_receive.c:126
 msgid "Use external program for receiving mail"
 msgstr "Gebruik extern programma voor ontvangen van e-mail"
 
-#: src/prefs_receive.c:156
+#: src/prefs_receive.c:142
 msgid "Automatic checking"
 msgstr "Automatisch controleren"
 
 # TPTD: check
-#: src/prefs_receive.c:163
+#: src/prefs_receive.c:149
 msgid "Check for new mail every"
 msgstr "Controleer op nieuwe berichten elke"
 
-#: src/prefs_receive.c:181
+#: src/prefs_receive.c:167
 msgid "Check for new mail on start-up"
 msgstr "Controleer op nieuwe berichten tijdens het opstarten"
 
-#: src/prefs_receive.c:184
+#: src/prefs_receive.c:170
 msgid "Dialogs"
 msgstr "Dialogen"
 
-#: src/prefs_receive.c:186
+#: src/prefs_receive.c:172
 msgid "Show receive dialog"
 msgstr "Ontvangstvenster weergeven"
 
-#: src/prefs_receive.c:196
+#: src/prefs_receive.c:182
 msgid "Only on manual receiving"
 msgstr "Alleen bij het ophalen met de hand"
 
-#: src/prefs_receive.c:207
+#: src/prefs_receive.c:193
 msgid "Close receive dialog when finished"
 msgstr "Na het ophalen onvangstvenster sluiten"
 
-#: src/prefs_receive.c:210
+#: src/prefs_receive.c:196
 msgid "Don't popup error dialog on receive error"
 msgstr "Geen pop-up waarschuwingscherm bij ontvangstfouten"
 
-#: src/prefs_receive.c:213
-msgid "After checking for new mail"
+#: src/prefs_receive.c:199
+msgid "After receiving new mail"
 msgstr "Na ontvangen van nieuwe e-mail"
 
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:201
 msgid "Go to Inbox"
 msgstr "Ga naar Inbox"
 
-#: src/prefs_receive.c:217
+#: src/prefs_receive.c:203
 msgid "Update all local folders"
 msgstr "Alle lokale mappen bijwerken"
 
-#: src/prefs_receive.c:220
+#: src/prefs_receive.c:205
 msgid "Run command"
 msgstr "Voer opdracht uit"
 
-#: src/prefs_receive.c:225
+#: src/prefs_receive.c:210
 msgid "after automatic check"
 msgstr "na automatisch ophalen"
 
-#: src/prefs_receive.c:227
+#: src/prefs_receive.c:212
 msgid "after manual check"
 msgstr "na handmatig ophalen"
 
-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:220
 #, c-format
 msgid ""
 "Command to execute:\n"
@@ -15587,47 +15694,39 @@ msgstr ""
 "Opdracht om uit te voeren:\n"
 "(gebruik %d voor het aantal nieuwe berichten)"
 
-#: src/prefs_receive.c:260
-msgid "Blink LED"
-msgstr "Knipperend LED"
-
-#: src/prefs_receive.c:261
-msgid "Play sound"
-msgstr "Speel geluid af"
-
-#: src/prefs_receive.c:263
-msgid "Show info banner"
-msgstr "Geef informatie banner weer"
-
-#: src/prefs_receive.c:397 src/prefs_send.c:348
+#: src/prefs_receive.c:343 src/prefs_send.c:357
 msgid "Mail Handling"
 msgstr "E-mailverwerking"
 
-#: src/prefs_receive.c:398
+#: src/prefs_receive.c:344
 msgid "Receiving"
 msgstr "Ontvangen"
 
-#: src/prefs_send.c:159
+#: src/prefs_send.c:161
 msgid "Save sent messages to Sent folder"
 msgstr "Bewaar verzonden berichten in Verzonden"
 
-#: src/prefs_send.c:162
+#: src/prefs_send.c:164
 msgid "Confirm before sending queued messages"
 msgstr "Bevestig voor verzenden van berichten uit de wachtrij."
 
-#: src/prefs_send.c:165
+#: src/prefs_send.c:167
 msgid "Never send Return Receipts"
 msgstr "Stuur nooit een ontvangstbevestiging"
 
-#: src/prefs_send.c:168
+#: src/prefs_send.c:170
 msgid "Show send dialog"
 msgstr "Verstuurvenster weergeven"
 
-#: src/prefs_send.c:176
+#: src/prefs_send.c:172
+msgid "Warn when Subject is empty"
+msgstr "Waarschuwen wanneer het Onderwerp leeg is"
+
+#: src/prefs_send.c:180
 msgid "Outgoing encoding"
 msgstr "Codering voor uitgaande berichten"
 
-#: src/prefs_send.c:201
+#: src/prefs_send.c:205
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
@@ -15635,131 +15734,131 @@ msgstr ""
 "Als 'Automatisch' is ingesteld wordt de optimale codering\n"
 "gebruikt voor de huidige locale."
 
-#: src/prefs_send.c:216
+#: src/prefs_send.c:220
 msgid "Automatic (Recommended)"
 msgstr "Automatisch (Aanbevolen)"
 
-#: src/prefs_send.c:218
+#: src/prefs_send.c:222
 msgid "7bit ASCII (US-ASCII)"
 msgstr "7bit ASCII (US-ASCII)"
 
-#: src/prefs_send.c:219
+#: src/prefs_send.c:223
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_send.c:221
+#: src/prefs_send.c:225
 msgid "Western European (ISO-8859-1)"
 msgstr "Westeuropees (ISO-8859-1)"
 
-#: src/prefs_send.c:222
+#: src/prefs_send.c:226
 msgid "Western European (ISO-8859-15)"
 msgstr "Westeuropees (ISO-8859-15)"
 
-#: src/prefs_send.c:224
+#: src/prefs_send.c:228
 msgid "Central European (ISO-8859-2)"
 msgstr "Centraaleuropees (ISO-8859-2)"
 
-#: src/prefs_send.c:226
+#: src/prefs_send.c:230
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
-#: src/prefs_send.c:227
+#: src/prefs_send.c:231
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
-#: src/prefs_send.c:229
+#: src/prefs_send.c:233
 msgid "Greek (ISO-8859-7)"
 msgstr "Grieks (ISO-8859-7)"
 
-#: src/prefs_send.c:231
+#: src/prefs_send.c:235
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreeuws (ISO-8859-7)"
 
-#: src/prefs_send.c:232
+#: src/prefs_send.c:236
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreeuws (Windows-1251)"
 
-#: src/prefs_send.c:234
+#: src/prefs_send.c:238
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabisch (ISO-8859-6)"
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:239
 msgid "Arabic (Windows-1256)"
 msgstr "Arabisch (Windows-1256)"
 
-#: src/prefs_send.c:237
+#: src/prefs_send.c:241
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turks (ISO-8859-9)"
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:243
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillisch (ISO-8859-5)"
 
-#: src/prefs_send.c:240
+#: src/prefs_send.c:244
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillisch (KOI8-R)"
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:245
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillisch (KOI8-U)"
 
-#: src/prefs_send.c:242
+#: src/prefs_send.c:246
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillisch (Windows-1251)"
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:248
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japans (ISO-2022-JP)"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:250
 msgid "Japanese (EUC-JP)"
 msgstr "Japans (EUC-JP)"
 
-#: src/prefs_send.c:247
+#: src/prefs_send.c:251
 msgid "Japanese (Shift_JIS)"
 msgstr "Japans (Shift_JIS)"
 
-#: src/prefs_send.c:250
+#: src/prefs_send.c:254
 msgid "Simplified Chinese (GB18030)"
 msgstr "Vereenvoudigd Chinees (GB18030)"
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:255
 msgid "Simplified Chinese (GB2312)"
 msgstr "Vereenvoudigd Chinees (GB2312)"
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:256
 msgid "Simplified Chinese (GBK)"
 msgstr "Vereenvoudigd Chinees (GBK)"
 
-#: src/prefs_send.c:253
+#: src/prefs_send.c:257
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditioneel Chinees (Big5)"
 
-#: src/prefs_send.c:255
+#: src/prefs_send.c:259
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditioneel Chinees (EUC-TW)"
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:260
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinees (ISO-2022-CN)"
 
-#: src/prefs_send.c:259
+#: src/prefs_send.c:263
 msgid "Korean (EUC-KR)"
 msgstr "Koreaans (EUC-KR)"
 
-#: src/prefs_send.c:261
+#: src/prefs_send.c:265
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_send.c:262
+#: src/prefs_send.c:266
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_send.c:266
+#: src/prefs_send.c:270
 msgid "Transfer encoding"
 msgstr "Overdracht-codering"
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:281
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
@@ -15767,8 +15866,8 @@ msgstr ""
 "Specificeer de Inhoud-Overdracht-Codering (Content-Transfer-Encoding) die "
 "gebruikt moet worden als de tekst van het bericht niet-ASCII tekens bevat"
 
-#: src/prefs_send.c:349 src/send_message.c:480 src/send_message.c:484
-#: src/send_message.c:489
+#: src/prefs_send.c:358 src/send_message.c:491 src/send_message.c:495
+#: src/send_message.c:500
 msgid "Sending"
 msgstr "Verzenden"
 
@@ -15805,9 +15904,8 @@ msgid "Check with both dictionaries"
 msgstr "Controleer met beide woordenlijsten"
 
 #: src/prefs_spelling.c:197
-#, fuzzy
 msgid "Get more dictionaries..."
-msgstr "Gebruik beide woordenlijsten"
+msgstr "Haal meer woordenlijsten op..."
 
 #: src/prefs_spelling.c:207
 msgid "Misspelled word color"
@@ -15823,9 +15921,8 @@ msgid "Spell Checking"
 msgstr "Spellingcontrole"
 
 #: src/prefs_summaries.c:152
-#, fuzzy
 msgid "the abbreviated weekday name"
-msgstr "Afkorting naam van de dag"
+msgstr "afkorting naam van de dag"
 
 #: src/prefs_summaries.c:153
 msgid "the full weekday name"
@@ -15979,7 +16076,7 @@ msgid ""
 "Defers moving, copying and deleting of messages until you choose 'Tools/"
 "Execute'"
 msgstr ""
-"Stelt verplaatsen, kopiëren en verwijderen van berichten uit totdat u "
+"Stelt verplaatsen, kopiëren en verwijderen van berichten uit totdat je "
 "'Gereedschap/Opdracht Uitvoeren' kiest"
 
 #: src/prefs_summaries.c:479
@@ -16020,7 +16117,7 @@ msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
 msgstr ""
-"De standaardheaders (zoals 'From:', 'Subject:') zullen in uw eigen taal "
+"De standaardheaders (zoals 'From:', 'Subject:') zullen in je eigen taal "
 "worden weergegeven."
 
 #: src/prefs_summaries.c:682
@@ -16100,87 +16197,87 @@ msgid "Replace the selected template in list with the template above"
 msgstr ""
 "Vervang de geselecteerde sjabloon in de lijst met bovenstaande sjabloon"
 
-#: src/prefs_template.c:324
+#: src/prefs_template.c:326
 msgid "Delete the selected template from the list"
 msgstr "Verwijder de geselecteerde sjabloon van de lijst"
 
-#: src/prefs_template.c:340
+#: src/prefs_template.c:344
 msgid "Show information on configuring templates"
 msgstr "Geef informatie weer over het configureren van sjablonen"
 
-#: src/prefs_template.c:364
+#: src/prefs_template.c:368
 msgid "Move the selected template to the top"
 msgstr "Verplaats de geselecteerde sjabloon naar bovenaan"
 
-#: src/prefs_template.c:374
+#: src/prefs_template.c:378
 msgid "Move the selected template up"
 msgstr "Verplaats de geselecteerde sjabloon naar boven"
 
-#: src/prefs_template.c:382
+#: src/prefs_template.c:386
 msgid "Move the selected template down"
 msgstr "Verplaats de geselecteerde sjabloon naar onderen"
 
-#: src/prefs_template.c:392
+#: src/prefs_template.c:396
 msgid "Move the selected template to the bottom"
 msgstr "Verplaats de geselecteerde sjabloon naar onderaan"
 
-#: src/prefs_template.c:408
+#: src/prefs_template.c:412
 msgid "Template configuration"
 msgstr "Sjabloon-instellingen"
 
-#: src/prefs_template.c:595
+#: src/prefs_template.c:599
 msgid "Templates list not saved"
 msgstr "Sjabloonlijst niet opgeslagen"
 
-#: src/prefs_template.c:596
+#: src/prefs_template.c:600
 msgid "The templates list has been modified. Close anyway?"
 msgstr "De sjabloonlijst is niet opgeslagen. Toch afsluiten?"
 
-#: src/prefs_template.c:757
+#: src/prefs_template.c:761
 msgid "The template's name is not set."
 msgstr "De sjabloonnaam is niet ingevoerd."
 
-#: src/prefs_template.c:794
+#: src/prefs_template.c:798
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "Het \"Van\" veld van de sjabloon bevat een ongeldig e-mail adres."
 
-#: src/prefs_template.c:800
+#: src/prefs_template.c:804
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "Het \"Aan\" veld van de sjabloon bevat een ongeldig e-mail adres."
 
-#: src/prefs_template.c:806
+#: src/prefs_template.c:810
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "Het \"Cc\" veld van de sjabloon bevat een ongeldig e-mail adres."
 
-#: src/prefs_template.c:812
+#: src/prefs_template.c:816
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "Het \"Bcc\" veld van de sjabloon bevat een ongeldig e-mail adres."
 
-#: src/prefs_template.c:818
+#: src/prefs_template.c:822
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "Het \"Onderwerp\" veld van de sjabloon is ongeldig."
 
-#: src/prefs_template.c:888
+#: src/prefs_template.c:892
 msgid "Delete template"
 msgstr "Verwijder sjabloon"
 
-#: src/prefs_template.c:889
+#: src/prefs_template.c:893
 msgid "Do you really want to delete this template?"
-msgstr "Wilt u deze sjabloon werkelijk verwijderen?"
+msgstr "Wil je deze sjabloon werkelijk verwijderen?"
 
-#: src/prefs_template.c:901
+#: src/prefs_template.c:905
 msgid "Delete all templates"
 msgstr "Verwijder alle sjablonen?"
 
-#: src/prefs_template.c:902
+#: src/prefs_template.c:906
 msgid "Do you really want to delete all the templates?"
-msgstr "Wilt u alle sjablonen werkelijk verwijderen?"
+msgstr "Wil je alle sjablonen werkelijk verwijderen?"
 
-#: src/prefs_template.c:1224
+#: src/prefs_template.c:1221
 msgid "Current templates"
 msgstr "Huidige sjablonen"
 
-#: src/prefs_template.c:1252
+#: src/prefs_template.c:1249
 msgid "Template"
 msgstr "Sjabloon"
 
@@ -16208,7 +16305,7 @@ msgstr "Verwijder thema '%s'"
 
 #: src/prefs_themes.c:468
 msgid "Are you sure you want to remove this theme?"
-msgstr "Wilt u dit thema werkelijk verwijderen?"
+msgstr "Wil je dit thema werkelijk verwijderen?"
 
 #: src/prefs_themes.c:478
 #, c-format
@@ -16246,7 +16343,7 @@ msgstr ""
 
 #: src/prefs_themes.c:530
 msgid "Do you want to install theme for all users?"
-msgstr "Wilt u dit thema voor alle gebruikers installeren?"
+msgstr "Wil je dit thema voor alle gebruikers installeren?"
 
 #: src/prefs_themes.c:550
 msgid "Theme exists"
@@ -16262,7 +16359,7 @@ msgstr ""
 "Een thema met dezelfde naam is al\n"
 "geïnstalleerd op deze plek.\n"
 "\n"
-"Wilt u het vervangen?"
+"Wil je het vervangen?"
 
 #: src/prefs_themes.c:557
 #, c-format
@@ -16322,6 +16419,10 @@ msgstr "Selecteer"
 msgid "Install new..."
 msgstr "Installeer nieuwe..."
 
+#: src/prefs_themes.c:843
+msgid "Get more..."
+msgstr "Haal er meer..."
+
 #: src/prefs_themes.c:854
 msgid "Information"
 msgstr "Informatie"
@@ -16358,63 +16459,67 @@ msgstr "Item heeft geen pictogram ingesteld."
 msgid "Item has no text defined."
 msgstr "Item heeft geen tekst ingesteld."
 
-#: src/prefs_toolbar.c:911
+#: src/prefs_toolbar.c:916
 msgid "Toolbar item"
 msgstr "Werkbalk item"
 
-#: src/prefs_toolbar.c:927
+#: src/prefs_toolbar.c:932
 msgid "Item type"
 msgstr "Item-type"
 
-#: src/prefs_toolbar.c:937
+#: src/prefs_toolbar.c:942
 msgid "Internal Function"
 msgstr "Interne Functie"
 
-#: src/prefs_toolbar.c:938
+#: src/prefs_toolbar.c:943
 msgid "User Action"
 msgstr "Gebruikers Actie"
 
-#: src/prefs_toolbar.c:940 src/toolbar.c:232
+#: src/prefs_toolbar.c:945 src/toolbar.c:233
 msgid "Separator"
 msgstr "Scheidingsteken"
 
-#: src/prefs_toolbar.c:947
+#: src/prefs_toolbar.c:952
 msgid "Event executed on click"
 msgstr "Gebeurtenis uitgevoerd na klikken"
 
-#: src/prefs_toolbar.c:986
+#: src/prefs_toolbar.c:991
 msgid "Toolbar text"
 msgstr "Tekst van werkbalk"
 
-#: src/prefs_toolbar.c:1001 src/prefs_toolbar.c:1372
+#: src/prefs_toolbar.c:1006 src/prefs_toolbar.c:1381
 msgid "Icon"
 msgstr "Pictogram"
 
-#: src/prefs_toolbar.c:1252 src/prefs_toolbar.c:1266 src/prefs_toolbar.c:1280
+#: src/prefs_toolbar.c:1042
+msgid "A_dd"
+msgstr "_Toevoegen"
+
+#: src/prefs_toolbar.c:1261 src/prefs_toolbar.c:1275 src/prefs_toolbar.c:1289
 msgid "Toolbars"
 msgstr "Werkbalken"
 
-#: src/prefs_toolbar.c:1253
+#: src/prefs_toolbar.c:1262
 msgid "Main Window"
 msgstr "Hoofdvenster"
 
-#: src/prefs_toolbar.c:1267
+#: src/prefs_toolbar.c:1276
 msgid "Message Window"
 msgstr "Berichtvenster"
 
-#: src/prefs_toolbar.c:1281
+#: src/prefs_toolbar.c:1290
 msgid "Compose Window"
 msgstr "Venster sluiten"
 
-#: src/prefs_toolbar.c:1395
+#: src/prefs_toolbar.c:1404
 msgid "Icon text"
 msgstr "Pictogramtekst"
 
-#: src/prefs_toolbar.c:1404
+#: src/prefs_toolbar.c:1413
 msgid "Mapped event"
 msgstr "Gebeurtenis"
 
-#: src/prefs_toolbar.c:1701
+#: src/prefs_toolbar.c:1710
 msgid "Toolbar item icon"
 msgstr "Werkbalk item pictogram"
 
@@ -16483,7 +16588,7 @@ msgstr "Geen informatie beschikbaar"
 msgid "No recipient keys defined."
 msgstr "Geen sleutel van ontvanger gedefinieerd."
 
-#: src/procmime.c:419 src/procmime.c:421 src/procmime.c:422
+#: src/procmime.c:422 src/procmime.c:424 src/procmime.c:425
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fout bij decoderen BASE64]\n"
 
@@ -16519,10 +16624,10 @@ msgstr ""
 
 #: src/procmsg.c:1732
 msgid ""
-"Couldn't determine sending informations. Maybe the email hasn't been "
+"Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
-"Kon verzend-informatie niet vinden. Misschien is dit bericht niet gemaakt "
+"Kon verzend-informatie niet vinden. Misschien is deze e-mail niet gemaakt "
 "met Claws Mail."
 
 #: src/procmsg.c:1750
@@ -16601,11 +16706,11 @@ msgstr "positie van cursor"
 
 #: src/quote_fmt.c:69
 msgid "account property: your name"
-msgstr "account-eigenschap: uw naam"
+msgstr "account-eigenschap: je naam"
 
 #: src/quote_fmt.c:70
 msgid "account property: your email address"
-msgstr "account-eigenschap: uw e-mail adres"
+msgstr "account-eigenschap: je e-mail adres"
 
 #: src/quote_fmt.c:71
 msgid "account property: account name"
@@ -16617,11 +16722,11 @@ msgstr "account-eigenschap: organisatie"
 
 #: src/quote_fmt.c:73
 msgid "account property: signature"
-msgstr "account-eigenschap: uw handtekening"
+msgstr "account-eigenschap: je handtekening"
 
 #: src/quote_fmt.c:74
 msgid "account property: signature path"
-msgstr "account-eigenschap: pad naar uw handtekening"
+msgstr "account-eigenschap: pad naar je handtekening"
 
 #: src/quote_fmt.c:75
 msgid "account property: default dictionary"
@@ -16857,73 +16962,73 @@ msgstr "Kon de externe opdracht '%s' niet uitvoeren"
 msgid "Error occurred while executing command: %s"
 msgstr "Fout bij uitvoeren van opdracht: %s"
 
-#: src/send_message.c:328
+#: src/send_message.c:339
 msgid "Connecting"
 msgstr "Verbinding wordt gemaakt"
 
-#: src/send_message.c:333
+#: src/send_message.c:344
 msgid "Doing POP before SMTP..."
 msgstr "Bezig met POP voor SMTP..."
 
-#: src/send_message.c:336
+#: src/send_message.c:347
 msgid "POP before SMTP"
 msgstr "POP voor SMTP"
 
-#: src/send_message.c:341
-#, fuzzy, c-format
+#: src/send_message.c:352
+#, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
-msgstr "Verbinding met SMTP server wordt gemaakt: %s ..."
+msgstr "Account '%s': Verbinden met SMTP server: %s:%d..."
 
-#: src/send_message.c:398
+#: src/send_message.c:409
 msgid "Mail sent successfully."
 msgstr "Bestand succesvol verzonden."
 
-#: src/send_message.c:465
+#: src/send_message.c:476
 msgid "Sending HELO..."
 msgstr "HELO wordt verstuurd..."
 
-#: src/send_message.c:466 src/send_message.c:471 src/send_message.c:476
+#: src/send_message.c:477 src/send_message.c:482 src/send_message.c:487
 msgid "Authenticating"
 msgstr "Bezig met authenticatie"
 
-#: src/send_message.c:467 src/send_message.c:472
+#: src/send_message.c:478 src/send_message.c:483
 msgid "Sending message..."
 msgstr "Bericht wordt verzonden..."
 
-#: src/send_message.c:470
+#: src/send_message.c:481
 msgid "Sending EHLO..."
 msgstr "EHLO wordt verstuurd..."
 
-#: src/send_message.c:479
+#: src/send_message.c:490
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM wordt verstuurd..."
 
-#: src/send_message.c:483
+#: src/send_message.c:494
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO wordt verstuurd..."
 
-#: src/send_message.c:488
+#: src/send_message.c:499
 msgid "Sending DATA..."
 msgstr "DATA wordt verstuurd..."
 
-#: src/send_message.c:492
+#: src/send_message.c:503
 msgid "Quitting..."
 msgstr "Bezig met sluiten..."
 
-#: src/send_message.c:521
+#: src/send_message.c:532
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Bericht wordt verzonden (%d / %d bytes)"
 
-#: src/send_message.c:574
+#: src/send_message.c:585
 msgid "Sending message"
 msgstr "Bericht wordt verzonden"
 
-#: src/send_message.c:643 src/send_message.c:663
+#: src/send_message.c:654 src/send_message.c:674
 msgid "Error occurred while sending the message."
 msgstr "Er is een fout opgetreden bij het verzenden."
 
-#: src/send_message.c:646
+#: src/send_message.c:657
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -16943,9 +17048,9 @@ msgid ""
 "if you have the one.\n"
 "If you're not sure, just select OK."
 msgstr ""
-"U zult eerst de lokatie van het postvak moeten geven.\n"
-"U kunt een bestaande postvak in MH formaat gebruiken.\n"
-"Als u twijfelt kunt u het beste gewoon op OK klikken."
+"Je zal eerst de lokatie van het postvak moeten geven.\n"
+"Je kunt een bestaand postvak in MH formaat gebruiken.\n"
+"Als je twijfelt kun je het beste gewoon op OK klikken."
 
 #: src/sourcewindow.c:64
 msgid "Source of the message"
@@ -16957,9 +17062,8 @@ msgid "%s - Source"
 msgstr "%s - Bron"
 
 #: src/ssl_manager.c:157
-#, fuzzy
 msgid "Saved SSL certificates"
-msgstr "SSL-certificaat opgeslagen"
+msgstr "Opgeslagen SSL-certificaten"
 
 #: src/ssl_manager.c:428
 msgid "Delete certificate"
@@ -16967,42 +17071,42 @@ msgstr "Certificaat verwijderen"
 
 #: src/ssl_manager.c:429
 msgid "Do you really want to delete this certificate?"
-msgstr "Wilt u dit certificaat werkelijk verwijderen?"
+msgstr "Wil je dit certificaat werkelijk verwijderen?"
 
-#: src/summary_search.c:266
+#: src/summary_search.c:271
 msgid "Search messages"
 msgstr "Zoek berichten"
 
-#: src/summary_search.c:292
+#: src/summary_search.c:293
 msgid "Match any of the following"
 msgstr "Zoek één van de zoektermen"
 
-#: src/summary_search.c:294
+#: src/summary_search.c:295
 msgid "Match all of the following"
 msgstr "Zoek alle zoektermen"
 
-#: src/summary_search.c:433
+#: src/summary_search.c:459
 msgid "Body:"
 msgstr "Berichttekst:"
 
-#: src/summary_search.c:440
+#: src/summary_search.c:466
 msgid "Condition:"
 msgstr "Voorwaarde:"
 
-#: src/summary_search.c:470
+#: src/summary_search.c:496
 msgid "Find _all"
 msgstr "Vind _alles"
 
-#: src/summary_search.c:679 src/summaryview.c:1105 src/summaryview.c:1366
+#: src/summary_search.c:702 src/summaryview.c:1105 src/summaryview.c:1366
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Bezig met zoeken in %s...\n"
 
-#: src/summary_search.c:776
+#: src/summary_search.c:799
 msgid "Beginning of list reached; continue from end?"
 msgstr "Begin van de lijst bereikt; verdergaan vanaf het einde?"
 
-#: src/summary_search.c:778
+#: src/summary_search.c:801
 msgid "End of list reached; continue from beginning?"
 msgstr "Einde van de lijst bereikt; verdergaan vanaf het begin?"
 
@@ -17126,11 +17230,10 @@ msgid "%s%d copied"
 msgstr "%s%d gekopieerd"
 
 #: src/summaryview.c:2643
-#, fuzzy
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " item geselecteerd"
-msgstr[1] " item geselecteerd"
+msgstr[1] " items geselecteerd"
 
 #: src/summaryview.c:2661 src/summaryview.c:2697
 #, c-format
@@ -17175,19 +17278,19 @@ msgstr "%d/%d geselecteerd (%s/%s, %d ongelezen"
 msgid "Sorting summary..."
 msgstr "Lijst wordt gesorteerd..."
 
-#: src/summaryview.c:3110
+#: src/summaryview.c:3111
 msgid "Setting summary from message data..."
 msgstr "Lijst wordt ingesteld van berichtinformatie..."
 
-#: src/summaryview.c:3314
+#: src/summaryview.c:3316
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
-#: src/summaryview.c:3365
+#: src/summaryview.c:3367
 msgid "(No Recipient)"
 msgstr "(Geen ontvanger)"
 
-#: src/summaryview.c:3400
+#: src/summaryview.c:3402
 #, c-format
 msgid ""
 "%s\n"
@@ -17196,7 +17299,7 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Van: %s, op %s</span>"
 
-#: src/summaryview.c:3407
+#: src/summaryview.c:3409
 #, c-format
 msgid ""
 "%s\n"
@@ -17205,72 +17308,72 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Aan: %s, op %s</span>"
 
-#: src/summaryview.c:4288
+#: src/summaryview.c:4286
 msgid "You're not the author of the article.\n"
-msgstr "U bent niet de auteur van het artikel.\n"
+msgstr "Je bent niet de auteur van het artikel.\n"
 
-#: src/summaryview.c:4380
+#: src/summaryview.c:4379
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
-msgstr[0] "Wilt u werkelijk het geselecteerde bericht verwijderen?"
-msgstr[1] "Wilt u werkelijk de %d geselecteerde berichten verwijderen?"
+msgstr[0] "Wil je werkelijk het geselecteerde bericht verwijderen?"
+msgstr[1] "Wil je werkelijk de %d geselecteerde berichten verwijderen?"
 
-#: src/summaryview.c:4383
+#: src/summaryview.c:4382
 msgid "Delete message(s)"
 msgstr "Verwijder bericht(en)"
 
-#: src/summaryview.c:4548
+#: src/summaryview.c:4545
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:4647
+#: src/summaryview.c:4644
 msgid "Destination to copy is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:4820
+#: src/summaryview.c:4817
 msgid "Append or Overwrite"
 msgstr "Toevoegen of Overschrijven"
 
-#: src/summaryview.c:4821
+#: src/summaryview.c:4818
 msgid "Append or overwrite existing file?"
 msgstr "Aan bestaand bestand toevoegen of overschrijven?"
 
-#: src/summaryview.c:4822
+#: src/summaryview.c:4819
 msgid "_Append"
 msgstr "_Toevoegen"
 
-#: src/summaryview.c:4822
+#: src/summaryview.c:4819
 msgid "_Overwrite"
 msgstr "_Overschrijven"
 
-#: src/summaryview.c:4863
+#: src/summaryview.c:4860
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
-msgstr "U staat op het moment om %d berichten af te drukken. Wilt u doorgaan?"
+msgstr "Je staat op het moment om %d berichten af te drukken. Wil je doorgaan?"
 
-#: src/summaryview.c:5340
+#: src/summaryview.c:5337
 msgid "Building threads..."
 msgstr "Discussie-draden worden opgebouwd..."
 
-#: src/summaryview.c:5586
+#: src/summaryview.c:5583
 msgid "Skip these rules"
 msgstr "Sla deze regels over"
 
-#: src/summaryview.c:5589
+#: src/summaryview.c:5586
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Pas deze regels toe, ongeacht welk account ze bij horen."
 
-#: src/summaryview.c:5592
+#: src/summaryview.c:5589
 msgid "Apply these rules if they apply to the current account"
 msgstr "Pas deze regels toe als ze betrekking hebben op het huidige account."
 
-#: src/summaryview.c:5621
+#: src/summaryview.c:5618
 msgid "Filtering"
 msgstr "Filteren"
 
-#: src/summaryview.c:5622
+#: src/summaryview.c:5619
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -17278,60 +17381,59 @@ msgstr ""
 "Er zijn filterregels die bij een account horen.\n"
 "Kies wat te doen met deze regels:"
 
-#: src/summaryview.c:5624
+#: src/summaryview.c:5621
 msgid "_Filter"
 msgstr "_Filter"
 
-#: src/summaryview.c:5652
+#: src/summaryview.c:5649
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:5731
+#: src/summaryview.c:5728
 msgid "Processing configuration"
 msgstr "Verwerken instellen"
 
-#: src/summaryview.c:6287
+#: src/summaryview.c:6276
 msgid "Ignored thread"
 msgstr "Genegeerde draad"
 
-#: src/summaryview.c:6289
+#: src/summaryview.c:6278
 msgid "Watched thread"
 msgstr "Gevolgde draad"
 
-#: src/summaryview.c:6297
-#, fuzzy
+#: src/summaryview.c:6286
 msgid "Replied but also forwarded - click to see reply"
-msgstr "Beantwoord - klik om het antwoord te zien"
+msgstr "Beantwoord maar ook doorgestuurd - klik om het antwoord te zien"
 
-#: src/summaryview.c:6299
+#: src/summaryview.c:6288
 msgid "Replied - click to see reply"
 msgstr "Beantwoord - klik om het antwoord te zien"
 
-#: src/summaryview.c:6311
+#: src/summaryview.c:6300
 msgid "To be moved"
 msgstr "Nog te verplaatsen"
 
-#: src/summaryview.c:6313
+#: src/summaryview.c:6302
 msgid "To be copied"
 msgstr "Nog te kopiëren"
 
-#: src/summaryview.c:6325
+#: src/summaryview.c:6314
 msgid "Signed, has attachment(s)"
 msgstr "Getekend, heeft bijvoegsel(s)"
 
-#: src/summaryview.c:6329
+#: src/summaryview.c:6318
 msgid "Encrypted, has attachment(s)"
 msgstr "Versleuteld, heeft bijvoegsel(s)"
 
-#: src/summaryview.c:6331
+#: src/summaryview.c:6320
 msgid "Encrypted"
 msgstr "Versleuteld"
 
-#: src/summaryview.c:6333
+#: src/summaryview.c:6322
 msgid "Has attachment(s)"
 msgstr "Heeft bijvoegsel(s)"
 
-#: src/summaryview.c:7970
+#: src/summaryview.c:7952
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -17340,11 +17442,11 @@ msgstr ""
 "Reguliere expressie (regexp) fout:\n"
 "%s"
 
-#: src/summaryview.c:8078
+#: src/summaryview.c:8060
 msgid "Go back to the folder list (You have unread messages)"
-msgstr "Ga terug in de mappenlijst (U heeft ongelezen berichten)"
+msgstr "Ga terug in de mappenlijst (Je heeft ongelezen berichten)"
 
-#: src/summaryview.c:8083
+#: src/summaryview.c:8065
 msgid "Go back to the folder list"
 msgstr "Ga terug naar de mappenlijst"
 
@@ -17401,9 +17503,8 @@ msgstr ""
 "  Gebruik "
 
 #: src/textview.c:919
-#, fuzzy
 msgid "'Network Log'"
-msgstr "Netwerk _Log"
+msgstr "'Netwerk Log'"
 
 #: src/textview.c:920
 msgid " in the Tools menu for more information."
@@ -17427,9 +17528,8 @@ msgstr "'Opslaan als...'"
 
 #: src/textview.c:992 src/textview.c:1004 src/textview.c:1016
 #: src/textview.c:1026
-#, fuzzy
 msgid " (Shortcut key: '"
-msgstr " (Sneltoets: 'y')"
+msgstr " (Sneltoets: '"
 
 #: src/textview.c:1000
 msgid "     - To display as text, select "
@@ -17505,281 +17605,278 @@ msgstr "Phishing-waarschuwing"
 msgid "_Open URL"
 msgstr "_Open URL"
 
-#: src/toolbar.c:191 src/toolbar.c:1948
-#, fuzzy
+#: src/toolbar.c:192 src/toolbar.c:1949
 msgid "Receive Mail from all Accounts"
-msgstr "E-mail voor alle accounts ophalen"
+msgstr "E-mail voor alle Accounts ophalen"
 
-#: src/toolbar.c:192 src/toolbar.c:1953
-#, fuzzy
+#: src/toolbar.c:193 src/toolbar.c:1954
 msgid "Receive Mail from current Account"
-msgstr "E-mail voor huidige account ophalen"
+msgstr "E-mail voor huidige Account ophalen"
 
-#: src/toolbar.c:193 src/toolbar.c:1957
+#: src/toolbar.c:194 src/toolbar.c:1958
 msgid "Send Queued Messages"
 msgstr "Berichten uit de wachtrij verzenden"
 
-#: src/toolbar.c:194 src/toolbar.c:918 src/toolbar.c:1975 src/toolbar.c:1986
+#: src/toolbar.c:195 src/toolbar.c:919 src/toolbar.c:1976 src/toolbar.c:1987
 msgid "Compose Email"
 msgstr "E-mail opstellen"
 
-#: src/toolbar.c:195
+#: src/toolbar.c:196
 msgid "Compose News"
 msgstr "Nieuws opstellen"
 
-#: src/toolbar.c:196 src/toolbar.c:2014 src/toolbar.c:2024
+#: src/toolbar.c:197 src/toolbar.c:2015 src/toolbar.c:2025
 msgid "Reply to Message"
 msgstr "Beantwoord bericht"
 
-#: src/toolbar.c:197 src/toolbar.c:2031 src/toolbar.c:2041
+#: src/toolbar.c:198 src/toolbar.c:2032 src/toolbar.c:2042
 msgid "Reply to Sender"
 msgstr "Beantwoord afzender"
 
-#: src/toolbar.c:198 src/toolbar.c:2048 src/toolbar.c:2058
+#: src/toolbar.c:199 src/toolbar.c:2049 src/toolbar.c:2059
 msgid "Reply to All"
 msgstr "Beantwoord allen"
 
-#: src/toolbar.c:199 src/toolbar.c:2065 src/toolbar.c:2075
+#: src/toolbar.c:200 src/toolbar.c:2066 src/toolbar.c:2076
 msgid "Reply to Mailing-list"
 msgstr "Beantwoord mailing-lijst"
 
-#: src/toolbar.c:200 src/toolbar.c:1969
+#: src/toolbar.c:201 src/toolbar.c:1970
 msgid "Open email"
 msgstr "Open e-mail"
 
-#: src/toolbar.c:201 src/toolbar.c:2082 src/toolbar.c:2093
+#: src/toolbar.c:202 src/toolbar.c:2083 src/toolbar.c:2094
 msgid "Forward Message"
 msgstr "Stuur bericht door"
 
-#: src/toolbar.c:202 src/toolbar.c:2098
+#: src/toolbar.c:203 src/toolbar.c:2099
 msgid "Trash Message"
 msgstr "Bericht naar prullenbak"
 
-#: src/toolbar.c:203 src/toolbar.c:2102
+#: src/toolbar.c:204 src/toolbar.c:2103
 msgid "Delete Message"
 msgstr "Verwijder bericht"
 
-#: src/toolbar.c:205 src/toolbar.c:2110
+#: src/toolbar.c:206 src/toolbar.c:2111
 msgid "Go to Previous Unread Message"
 msgstr "Ga naar vorige ongelezen bericht"
 
-#: src/toolbar.c:206 src/toolbar.c:2114
+#: src/toolbar.c:207 src/toolbar.c:2115
 msgid "Go to Next Unread Message"
 msgstr "Ga naar volgende ongelezen bericht"
 
-#: src/toolbar.c:210
+#: src/toolbar.c:210 src/toolbar.c:420
+msgid "Print"
+msgstr "Afdrukken"
+
+#: src/toolbar.c:211
 msgid "Learn Spam or Ham"
 msgstr "Leer spam of ham"
 
-#: src/toolbar.c:211
+#: src/toolbar.c:212
 msgid "Open folder/Go to folder list"
 msgstr "Open map/Ga naar mappenlijst"
 
-#: src/toolbar.c:214 src/toolbar.c:2120
+#: src/toolbar.c:215 src/toolbar.c:2121
 msgid "Send Message"
 msgstr "Verzend bericht"
 
-#: src/toolbar.c:215 src/toolbar.c:2124
+#: src/toolbar.c:216 src/toolbar.c:2125
 msgid "Put into queue folder and send later"
 msgstr "In de wachtrij plaatsen en later verzenden"
 
-#: src/toolbar.c:216 src/toolbar.c:2128
+#: src/toolbar.c:217 src/toolbar.c:2129
 msgid "Save to draft folder"
 msgstr "Opslaan als klad"
 
-#: src/toolbar.c:217 src/toolbar.c:2132
+#: src/toolbar.c:218 src/toolbar.c:2133
 msgid "Insert file"
 msgstr "Bestand invoegen"
 
-#: src/toolbar.c:218 src/toolbar.c:2136
+#: src/toolbar.c:219 src/toolbar.c:2137
 msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
-#: src/toolbar.c:219 src/toolbar.c:2140
+#: src/toolbar.c:220 src/toolbar.c:2141
 msgid "Insert signature"
 msgstr "Handtekening invoegen"
 
-#: src/toolbar.c:220 src/toolbar.c:2144
+#: src/toolbar.c:221 src/toolbar.c:2145
 msgid "Edit with external editor"
 msgstr "Aanpassen met externe editor"
 
-#: src/toolbar.c:221 src/toolbar.c:2148
+#: src/toolbar.c:222 src/toolbar.c:2149
 msgid "Wrap long lines of current paragraph"
 msgstr "Lange regels van huige paragraaf afbreken"
 
-#: src/toolbar.c:222 src/toolbar.c:2152
+#: src/toolbar.c:223 src/toolbar.c:2153
 msgid "Wrap all long lines"
 msgstr "Regelterugloop voor alle regels"
 
-#: src/toolbar.c:225 src/toolbar.c:437 src/toolbar.c:2161
+#: src/toolbar.c:226 src/toolbar.c:438 src/toolbar.c:2162
 msgid "Check spelling"
 msgstr "Controleer spelling"
 
-#: src/toolbar.c:227
+#: src/toolbar.c:228
 msgid "Claws Mail Actions Feature"
 msgstr "Claws Mail Acties Kenmerken"
 
-#: src/toolbar.c:228 src/toolbar.c:2177
+#: src/toolbar.c:229 src/toolbar.c:2178
 msgid "Cancel receiving"
 msgstr "Ophalen annuleren"
 
-#: src/toolbar.c:230 src/toolbar.c:2185
-#, fuzzy
+#: src/toolbar.c:231 src/toolbar.c:2186
 msgid "Cancel receiving/sending"
-msgstr "Ophalen annuleren"
+msgstr "Ophalen/verzenden annuleren"
 
-#: src/toolbar.c:231 src/toolbar.c:1961
+#: src/toolbar.c:232 src/toolbar.c:1962
 msgid "Close window"
 msgstr "Venster sluiten"
 
-#: src/toolbar.c:233
+#: src/toolbar.c:234
 msgid "Claws Mail Plugins"
 msgstr "Claws Mail Plugins"
 
-#: src/toolbar.c:377 src/toolbar.c:412
-#, fuzzy
+#: src/toolbar.c:378 src/toolbar.c:413
 msgctxt "Toolbar"
 msgid "Trash"
-msgstr "Werkbalken"
+msgstr "Prullenbak"
 
-#: src/toolbar.c:400
+#: src/toolbar.c:401
 msgid "Folders"
 msgstr "Mappen"
 
-#: src/toolbar.c:402
+#: src/toolbar.c:403
 msgid "Get Mail"
 msgstr "Ophalen"
 
-#: src/toolbar.c:403
+#: src/toolbar.c:404
 msgid "Get"
 msgstr "Ophalen"
 
-#: src/toolbar.c:405 src/toolbar.c:406
+#: src/toolbar.c:406 src/toolbar.c:407
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/toolbar.c:408
+#: src/toolbar.c:409
 msgid "All"
 msgstr "Allen"
 
-#: src/toolbar.c:409
-#, fuzzy
+#: src/toolbar.c:410
 msgctxt "Toolbar"
 msgid "Sender"
-msgstr "_Werkbalk"
+msgstr "Afzender"
 
-#: src/toolbar.c:410
+#: src/toolbar.c:411
 msgid "List"
 msgstr "Lijst"
 
-#: src/toolbar.c:415
+#: src/toolbar.c:416
 msgid "Prev"
 msgstr "Vorige"
 
-#: src/toolbar.c:416
+#: src/toolbar.c:417
 msgid "Next"
 msgstr "Volgende"
 
-#: src/toolbar.c:424
+#: src/toolbar.c:425
 msgid "Draft"
 msgstr "Klad"
 
-#: src/toolbar.c:427
+#: src/toolbar.c:428
 msgid "Insert sig."
 msgstr "Handtekening invoegen"
 
-#: src/toolbar.c:428
+#: src/toolbar.c:429
 msgid "Edit"
 msgstr "Bewerken"
 
-#: src/toolbar.c:429
+#: src/toolbar.c:430
 msgid "Wrap para."
 msgstr "Breek para af"
 
-#: src/toolbar.c:430
+#: src/toolbar.c:431
 msgid "Wrap all"
 msgstr "Breek allen af"
 
-#: src/toolbar.c:432 src/toolbar.c:433
+#: src/toolbar.c:433 src/toolbar.c:434
 msgid "Stop"
 msgstr "Stop"
 
-#: src/toolbar.c:434
-#, fuzzy
+#: src/toolbar.c:435
 msgid "Stop all"
-msgstr "Stop"
+msgstr "Stop alles"
 
-#: src/toolbar.c:910
+#: src/toolbar.c:911
 msgid "Compose News message"
 msgstr "Nieuw Nieuwsbericht opstellen"
 
-#: src/toolbar.c:952
+#: src/toolbar.c:953
 msgid "Learn spam"
 msgstr "Spam leren"
 
-#: src/toolbar.c:961
+#: src/toolbar.c:962
 msgid "Ham"
 msgstr "Ham"
 
-#: src/toolbar.c:963
+#: src/toolbar.c:964
 msgid "Learn ham"
 msgstr "Ham leren"
 
-#: src/toolbar.c:1943
+#: src/toolbar.c:1944
 msgid "Go to folder list"
 msgstr "Ga naar mappenlijst"
 
-#: src/toolbar.c:1949
-#, fuzzy
+#: src/toolbar.c:1950
 msgid "Receive Mail from selected Account"
-msgstr "E-mail voor geselecteerde Accounts ophalen"
+msgstr "E-mail voor geselecteerde Account ophalen"
 
-#: src/toolbar.c:1965
+#: src/toolbar.c:1966
 msgid "Open preferences"
 msgstr "Open voorkeuren"
 
-#: src/toolbar.c:1976
+#: src/toolbar.c:1977
 msgid "Compose with selected Account"
 msgstr "E-mail opstellen met geselecteerde Account"
 
-#: src/toolbar.c:1997
+#: src/toolbar.c:1998
 msgid "Learn as..."
 msgstr "leren als..."
 
-#: src/toolbar.c:2007
+#: src/toolbar.c:2008
 msgid "Learn as _Spam"
 msgstr "Leer als _Spam"
 
-#: src/toolbar.c:2008
+#: src/toolbar.c:2009
 msgid "Learn as _Ham"
 msgstr "Leer als _Ham"
 
-#: src/toolbar.c:2015
+#: src/toolbar.c:2016
 msgid "Reply to Message options"
 msgstr "Opties voor bericht beantwoorden"
 
-#: src/toolbar.c:2019 src/toolbar.c:2036 src/toolbar.c:2053 src/toolbar.c:2070
+#: src/toolbar.c:2020 src/toolbar.c:2037 src/toolbar.c:2054 src/toolbar.c:2071
 msgid "_Reply with quote"
 msgstr "Antwoord met _citaat"
 
-#: src/toolbar.c:2020 src/toolbar.c:2037 src/toolbar.c:2054 src/toolbar.c:2071
+#: src/toolbar.c:2021 src/toolbar.c:2038 src/toolbar.c:2055 src/toolbar.c:2072
 msgid "Reply without _quote"
 msgstr "Antwoord _zonder citaat"
 
-#: src/toolbar.c:2032
+#: src/toolbar.c:2033
 msgid "Reply to Sender options"
 msgstr "Opties voor afzender antwoorden"
 
-#: src/toolbar.c:2049
+#: src/toolbar.c:2050
 msgid "Reply to All options"
 msgstr "Opties voor allen beantwoorden"
 
-#: src/toolbar.c:2066
+#: src/toolbar.c:2067
 msgid "Reply to Mailing-list options"
 msgstr "Opties voor mailing-lijst beantwoorden"
 
-#: src/toolbar.c:2083
+#: src/toolbar.c:2084
 msgid "Forward Message options"
 msgstr "Opties voor bericht doorsturen"
 
@@ -17804,12 +17901,12 @@ msgstr "Selecteer een adres om te openen."
 msgid "Select All"
 msgstr "Alles selecteren"
 
-#: src/wizard.c:539
+#: src/wizard.c:517
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Welkom bij Claws Mail"
 
-#: src/wizard.c:562
+#: src/wizard.c:540
 #, c-format
 msgid ""
 "\n"
@@ -17861,21 +17958,21 @@ msgstr ""
 "Welkom bij Claws Mail\n"
 "---------------------\n"
 "\n"
-"Nu u uw account heeft ingesteld, kunt u uw e-mail ophalen door op de\n"
+"Nu je je account hebt ingesteld, kun je je e-mail ophalen door op de\n"
 "'Ophalen' knop helemaal links in de werkbalk te drukken.\n"
 "\n"
 "Claws Mail heeft vele extra opties die toegankelijk zijn via plugins,\n"
 " o.a. anti-spam filters en training (via de Bogofilter of SpamAssassin "
 "plugins), privacy-beveiliging (via PGP/Mime), een RSS-aggregator, een "
-"kalender en veel meer. U kunt deze plugins laden via de menu-ingang '/"
+"kalender en veel meer. Je kunt deze plugins laden via de menu-ingang '/"
 "Instellingen/Plugins'.\n"
 "\n"
-"U kunt uw account-voorkeuren veranderen door de menu-ingang\n"
+"Je kunt je account-voorkeuren veranderen door de menu-ingang\n"
 "'/Instellingen/Voorkeuren huidige account' te gebruiken. De algemene\n"
-" instellingen verandert u via '/Instellingen/Voorkeuren'.\n"
+" instellingen verander je via '/Instellingen/Voorkeuren'.\n"
 "\n"
-"Meer informatie vindt u in de handleiding van Claws Mail, die \n"
-"kunt u vinden via de menu-ingang '/Help/Handleiding' of on-line via \n"
+"Meer informatie vind je in de handleiding van Claws Mail, die \n"
+"kun je vinden via de menu-ingang '/Help/Handleiding' of on-line via \n"
 "de URL hier beneden aangegeven.\n"
 "\n"
 "Handige URLs\n"
@@ -17891,165 +17988,146 @@ msgstr ""
 "Claws Mail is vrije software, uitgegeven onder de bepalingen van\n"
 "van de GNU Algemene Publieke Licentie, versie 3 of later, zoals\n"
 "uitgegeven door de Free Software Foundation, 51 Franklin Street,\n"
-"Fifth Floor, Boston, MA 02110-1301, USA. U kunt de licentietekst\n"
+"Fifth Floor, Boston, MA 02110-1301, USA. Je kunt de licentietekst\n"
 "vinden te <%s>.\n"
 "\n"
 "DONATIES\n"
 "--------\n"
-"Als u een donatie wilt doen aan het Claws Mail-project kunt u \n"
+"Als je een donatie wilt doen aan het Claws Mail-project kun je \n"
 "dat doen te <%s>.\n"
 "\n"
 
-#: src/wizard.c:638
+#: src/wizard.c:616
 msgid "Please enter the mailbox name."
 msgstr "Geef naam van postvak."
 
-#: src/wizard.c:681
+#: src/wizard.c:644
 msgid "Please enter your name and email address."
 msgstr "Geef naam en e-mailadres."
 
-#: src/wizard.c:692
+#: src/wizard.c:655
 msgid "Please enter your receiving server and username."
 msgstr "Geef onvangende server en gebruikersnaam."
 
-#: src/wizard.c:702
+#: src/wizard.c:665
 msgid "Please enter your username."
-msgstr "Geef uw gebruikersnaam."
+msgstr "Geef je gebruikersnaam."
 
-#: src/wizard.c:712
+#: src/wizard.c:675
 msgid "Please enter your SMTP server."
-msgstr "Geef uw SMTP-server."
+msgstr "Geef je SMTP-server."
 
-#: src/wizard.c:723
+#: src/wizard.c:686
 msgid "Please enter your SMTP username."
-msgstr "Geef uw SMTP-gebruikersnaam."
+msgstr "Geef je SMTP-gebruikersnaam."
 
-#: src/wizard.c:1013
+#: src/wizard.c:965
 msgid "<span weight=\"bold\">Your name:</span>"
-msgstr "<span weight=\"bold\">Uw naam:</span>"
+msgstr "<span weight=\"bold\">Je naam:</span>"
 
-#: src/wizard.c:1023
+#: src/wizard.c:975
 msgid "<span weight=\"bold\">Your email address:</span>"
-msgstr "<span weight=\"bold\">Uw e-mailadres:</span>"
+msgstr "<span weight=\"bold\">Je e-mailadres:</span>"
 
-#: src/wizard.c:1033
+#: src/wizard.c:985
 msgid "Your organization:"
-msgstr "Uw organisatie:"
+msgstr "Je organisatie:"
 
-#: src/wizard.c:1141
+#: src/wizard.c:1018
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Postvaknaam:</span>"
 
-#: src/wizard.c:1149
+#: src/wizard.c:1026
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
-"U kunt ook een absoluut pad opgeven, bijvoorbeeld: \"/home/john/Documents/"
+"Je kunt ook een absoluut pad opgeven, bijvoorbeeld: \"/home/kees/Documenten/"
 "Mail\""
 
-#: src/wizard.c:1157
-msgid "on internal memory"
-msgstr "op intern geheugen"
-
-#: src/wizard.c:1160
-msgid "on external memory card"
-msgstr "op externe geheugenkaart"
-
-#: src/wizard.c:1163
-msgid "on internal memory card"
-msgstr "op interne geheugenkaart"
-
-#: src/wizard.c:1213
-msgid "<span weight=\"bold\">Store data</span>"
-msgstr "<span weight=\"bold\">Sla informatie op</span>"
-
-#: src/wizard.c:1281
+#: src/wizard.c:1097
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr ""
-"U kunt het poortnummer specificeren door het aan het eind toe te voegen: "
+"Je kunt het poortnummer specificeren door het aan het eind toe te voegen: "
 "\"mail.voorbeeld.com:25\""
 
-#: src/wizard.c:1284
+#: src/wizard.c:1100
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">SMTP-serveradres:</span>"
 
-#: src/wizard.c:1290
+#: src/wizard.c:1106
 msgid "Use authentication"
 msgstr "Gebruik authenticatie"
 
-#: src/wizard.c:1298
-#, fuzzy
+#: src/wizard.c:1114
 msgid "<span size=\"small\">(empty to use the same as receive)</span>"
 msgstr ""
-"SMTP-gebruikersnaam:\n"
 "<span size=\"small\">(laat leeg om dezelfde als bij ontvangen te gebruiken)</"
 "span>"
 
-#: src/wizard.c:1312
+#: src/wizard.c:1128
 msgid "SMTP username:"
-msgstr ""
+msgstr "SMTP gebruikersnaam"
 
-#: src/wizard.c:1323
-#, fuzzy
+#: src/wizard.c:1139
 msgid "SMTP password:"
-msgstr "Wachtwoord:"
+msgstr "SMTP wachtwoord:"
 
-#: src/wizard.c:1340
+#: src/wizard.c:1152
 msgid "Use SSL to connect to SMTP server"
 msgstr "Gebruik SSL voor verbinding met de SMTP-server"
 
-#: src/wizard.c:1351 src/wizard.c:1630
+#: src/wizard.c:1163 src/wizard.c:1437
 msgid "Use SSL via STARTTLS"
 msgstr "Gebruik SSL via STARTTLS"
 
-#: src/wizard.c:1363 src/wizard.c:1642
+#: src/wizard.c:1175 src/wizard.c:1449
 msgid "Client SSL certificate (optional)"
 msgstr "Client SSL-certificaat (optioneel)"
 
-#: src/wizard.c:1425 src/wizard.c:1450 src/wizard.c:1573
+#: src/wizard.c:1237 src/wizard.c:1262 src/wizard.c:1385
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Serveradres:</span>"
 
-#: src/wizard.c:1480
+#: src/wizard.c:1292
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Lokaal postvak:</span>"
 
-#: src/wizard.c:1540
+#: src/wizard.c:1352
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Servertype:</span>"
 
-#: src/wizard.c:1550
+#: src/wizard.c:1362
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1584
+#: src/wizard.c:1396
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr ""
-"U kunt het poortnummer specificeren door het aan het eind toe te voegen: "
+"Je kunt het poortnummer specificeren door het aan het eind toe te voegen: "
 "\"mail.voorbeeld.com:110\""
 
-#: src/wizard.c:1589
+#: src/wizard.c:1401
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Gebruikersnaam:</span>"
 
-#: src/wizard.c:1619
+#: src/wizard.c:1426
 msgid "Use SSL to connect to receiving server"
 msgstr "Gebruik SSL voor verbinding met de ontvangende server"
 
-#: src/wizard.c:1684
+#: src/wizard.c:1491
 msgid "IMAP server directory:"
 msgstr "IMAP-serverdirectory:"
 
-#: src/wizard.c:1695
+#: src/wizard.c:1502
 msgid "Show only subscribed folders"
 msgstr "Alleen ge-abonneerde mappen weergeven"
 
-#: src/wizard.c:1703
+#: src/wizard.c:1510
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"
@@ -18057,15 +18135,15 @@ msgstr ""
 "<span weight=\"bold\">Waarschuwing: deze versie van Claws Mail\n"
 "is vertaald zonder ondersteuning voor IMAP.</span>"
 
-#: src/wizard.c:1823
+#: src/wizard.c:1628
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws Mail Setup-assistent"
 
-#: src/wizard.c:1857
+#: src/wizard.c:1662
 msgid "Welcome to Claws Mail"
 msgstr "Welkom by Claws Mail"
 
-#: src/wizard.c:1865
+#: src/wizard.c:1670
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -18075,308 +18153,38 @@ msgid ""
 msgstr ""
 "Welkom bij de Claws Mail configuratie-assistent.\n"
 "\n"
-"We zullen beginnen met het instellen van enkele van uw gegevens en de meest "
-"gebruikte e-mailopties zodat u binnen vijf minuten Claws Mail kunt gebruiken."
+"We zullen beginnen met het instellen van enkele van je gegevens en de meest "
+"gebruikte e-mailopties zodat je binnen vijf minuten Claws Mail kunt "
+"gebruiken."
 
-#: src/wizard.c:1888
+#: src/wizard.c:1683
 msgid "About You"
 msgstr "Over u"
 
-#: src/wizard.c:1896 src/wizard.c:1911 src/wizard.c:1926 src/wizard.c:1942
+#: src/wizard.c:1691 src/wizard.c:1706 src/wizard.c:1721 src/wizard.c:1737
 msgid "Bold fields must be completed"
 msgstr "Velden in vet zijn verplicht"
 
-#: src/wizard.c:1903
+#: src/wizard.c:1698
 msgid "Receiving mail"
 msgstr "E-mail ontvangen"
 
-#: src/wizard.c:1918
+#: src/wizard.c:1713
 msgid "Sending mail"
 msgstr "E-mail verzenden"
 
-#: src/wizard.c:1934
+#: src/wizard.c:1729
 msgid "Saving mail on disk"
 msgstr "E-mail opslaan op schijf"
 
-#: src/wizard.c:1950
+#: src/wizard.c:1745
 msgid "Configuration finished"
 msgstr "Klaar met instellen"
 
-#: src/wizard.c:1958
+#: src/wizard.c:1753
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
 "Claws Mail is nu klaar.\n"
 "Klik op 'Opslaan' om te starten."
-
-#~ msgid "Dillo Browser"
-#~ msgstr "Dillo Browser"
-
-#~ msgid "Load remote links in mails"
-#~ msgstr "Laad links op afstand in e-mails"
-
-#~ msgid "Equivalent to Dillo's '--local' option"
-#~ msgstr "Equivalent aan Dillo's '--local' optie"
-
-#~ msgid "You can still load remote links by reloading the page"
-#~ msgstr "U kunt wel links op afstand laden door de pagina te herladen"
-
-#~ msgid "Only for senders found in address book/folder"
-#~ msgstr "Alleen voor afzenders uit het adresboek/map"
-
-#~ msgid "Full window mode (hide controls)"
-#~ msgstr "Modus 'Volledig scherm' (verberg besturing)"
-
-#~ msgid "Equivalent to Dillo's '--fullwindow' option"
-#~ msgstr "Equivalent aan Dillo's '--fullwindow' optie"
-
-#~ msgid "Dillo HTML Viewer"
-#~ msgstr "Dillo HTML-weergever"
-
-#~ msgid "Can't find the dillo executable in PATH. Is it installed?"
-#~ msgstr ""
-#~ "Kan het dillo programma niet vinden in PATH. Is het wel geinstalleerd?"
-
-#~ msgid ""
-#~ "This plugin renders HTML mail using the Dillo web browser.\n"
-#~ "\n"
-#~ "Options can be found in /Configuration/Preferences/Plugins/Dillo Browser"
-#~ msgstr ""
-#~ "Deze plugin geeft HTML-berichten weer met de Dillo webbrowser.\n"
-#~ "\n"
-#~ "Opties kunnen worden gevonden in /Instellingen/Voorkeuren/Plugins/Dillo "
-#~ "Browser"
-
-#~ msgid "Trayicon"
-#~ msgstr "Systeemvakpictogram"
-
-#, fuzzy
-#~ msgid "Claws Mail"
-#~ msgstr "Over Claws Mail"
-
-#~ msgid "Failed to register offline switch hook"
-#~ msgstr "Registreren van offline-gaan-haak mislukt"
-
-#~ msgid "Failed to register account list changed hook"
-#~ msgstr "Registreren van account-lijst-veranderd-haak mislukt"
-
-#~ msgid "Failed to register close hook"
-#~ msgstr "Registreren van sluiten-haak mislukt"
-
-#~ msgid "Failed to register got iconified hook"
-#~ msgstr "Registreren van werd-ge-iconiseerd-haak mislukt"
-
-#~ msgid "Failed to register theme change hook"
-#~ msgstr "Registreren van thema-veranderd-haak mislukt"
-
-#~ msgid ""
-#~ "This plugin places a mailbox icon in the system tray that indicates if "
-#~ "you have new or unread mail.\n"
-#~ "\n"
-#~ "The mailbox is empty if you have no unread mail, otherwise it contains a "
-#~ "letter. A tooltip shows new, unread and total number of messages."
-#~ msgstr ""
-#~ "Deze plugin plaatst een postbus-pictogram in het systeemvak die aangeeft "
-#~ "of u nieuwe of ongelezen berichten heeft.\n"
-#~ "\n"
-#~ "De postbus is leeg als u geen ongelezen berichten heeft, anders bevat het "
-#~ "een brief. Een tekstballon geeft het aantal nieuwe, ongelezen en het "
-#~ "totaal aantal berichten weer."
-
-#~ msgid "Hide Claws Mail at start-up"
-#~ msgstr "Verberg Claws Mail bij opstarten"
-
-#~ msgid ""
-#~ "Hide Claws Mail using the tray icon instead of closing it\n"
-#~ "when the window close button is clicked"
-#~ msgstr ""
-#~ "Verberg Claws Mail mbv het systeemvak pictogram in plaats van\n"
-#~ "afsluiten wanneer de afsluitknop is aangeklikt"
-
-#~ msgid "Minimize to tray"
-#~ msgstr "Verklein naar systeemvak"
-
-#~ msgid "Hide Claws Mail using the tray icon instead of minimizing it"
-#~ msgstr ""
-#~ "Verberg Claws Mail mbv het systeemvak pictogram in plaats van "
-#~ "minimaliseren"
-
-#~ msgid "Failed to register compose create hook int the Python plugin"
-#~ msgstr "Registreren van compose create haak in de Python plugin mislukt"
-
-#~ msgid ""
-#~ "This plugin provides Python integration features.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome."
-#~ msgstr ""
-#~ "Deze plugin biedt Python integratie mogelijkheden.\n"
-#~ "\n"
-#~ "Feedback naar <berndth at gmx.de> is welkom."
-
-#~ msgid ""
-#~ "An attachment is mentioned in the mail you're sending, but no file was "
-#~ "attached. %s it anyway?"
-#~ msgstr ""
-#~ "Een bijvoegsel wordt genoemd in de e-mail die u zend, maar geen bestand "
-#~ "was bijgevoegd. Toch %s?"
-
-#~ msgid ""
-#~ "Command could not be started. Pipe creation failed.\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Opdracht kon niet worden gestart. Aanmaken van de pipe mislukt.\n"
-#~ "%s"
-
-#~ msgid "Compose: input from monitoring process\n"
-#~ msgstr "Opstellen: invoer van \"monitoring process\"\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1999-2010\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Auteursrecht (C) 1999-2010\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "en het Claws Mail team"
-
-#~ msgid ""
-#~ "Copyright (C) 1999-2010\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-#~ msgstr ""
-#~ "Auteursrecht (C) 1999-2010\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "en het Claws Mail team"
-
-#~ msgid "Change dictionary"
-#~ msgstr "Andere woordenboek"
-
-#~ msgid "Unknown SSL Certificate"
-#~ msgstr "Onbekend SSL-certificaat"
-
-#~ msgid "Expired SSL Certificate"
-#~ msgstr "Verlopen SSL-certificaat"
-
-#~ msgid "Changed SSL Certificate"
-#~ msgstr "Veranderde SSL-certificaten"
-
-#~ msgid "Connecting to IMAP4 server %s...\n"
-#~ msgstr "Verbinding met IMAP4-server wordt gemaakt %s ...\n"
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with a more recent GTK+ library than is "
-#~ "currently available. This will cause crashes. You need to upgrade GTK+ or "
-#~ "recompile Claws Mail."
-#~ msgstr ""
-#~ "Claws Mail is vertaald met een recentere versie van de GTK+-bibliotheek "
-#~ "dan op het moment beschikbaar is. Dit zal voor crashes zorgen. U dient de "
-#~ "GTK+-bibliotheek bij te werken naar een nieuwere versie of Claws Mail "
-#~ "opnieuw te bouwen."
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with an older GTK+ library than is currently "
-#~ "available. This will cause crashes. You need to recompile Claws Mail."
-#~ msgstr ""
-#~ "Claws Mail is vertaald met een oudere versie van de GTK+-bibliotheek dan "
-#~ "op het moment beschikbaar is. Dit zal voor crashes zorgen. U dient Claws "
-#~ "Mail opnieuw te bouwen."
-
-#~ msgid "Last read message"
-#~ msgstr "Laatst gelezen bericht"
-
-#~ msgid "_all"
-#~ msgstr "_allen"
-
-#~ msgid "_sender"
-#~ msgstr "af_zender"
-
-#~ msgid "_Fold all"
-#~ msgstr "Vouw _alles op"
-
-#~ msgid "by _Date"
-#~ msgstr "_Datum"
-
-#~ msgid "by _From"
-#~ msgstr "Af_zender"
-
-#~ msgid "by _To"
-#~ msgstr "_Aan"
-
-#~ msgid "by S_ubject"
-#~ msgstr "_Onderwerp"
-
-#~ msgid "by Tag"
-#~ msgstr "Tag"
-
-#~ msgid "by _Mark"
-#~ msgstr "_Markering"
-
-#~ msgid "headers line"
-#~ msgstr "headers regel"
-
-#~ msgid "message line"
-#~ msgstr "Bericht regel"
-
-#~ msgid "_Open (l)"
-#~ msgstr "_Openen (l)"
-
-#~ msgid "Open _with (o)..."
-#~ msgstr "Open _met (o)..."
-
-#~ msgid "_Display as text (t)"
-#~ msgstr "Als _tekst weergeven (t)"
-
-#~ msgid "_Save as (y)..."
-#~ msgstr "Op_slaan als (y)..."
-
-#~ msgid "creating NNTP connection to %s:%d ...\n"
-#~ msgstr "verbinding met nieuwsserver (NNTP) %s%d wordt opgezet...\n"
-
-#~ msgid "Trust key"
-#~ msgstr "Vertrouw sleutel"
-
-#~ msgid "Orientation"
-#~ msgstr "Oriëntatie"
-
-#~ msgid "Test RegExp"
-#~ msgstr "Test RegExp"
-
-#~ msgid "Quotation characters"
-#~ msgstr "Citaat-tekens"
-
-#~ msgid "Main toolbar configuration"
-#~ msgstr "Werkbalk van hoofdvenster instellen"
-
-#~ msgid "Compose toolbar configuration"
-#~ msgstr "Werkbalk van Opstelvenster instellen"
-
-#~ msgid "Message view toolbar configuration"
-#~ msgstr "Werkbalk van berichtweergave instellen"
-
-#~ msgid " items selected"
-#~ msgstr " items geselecteerd"
-
-#~ msgid "'View Log'"
-#~ msgstr "'Bekijk log'"
-
-#~ msgid " (Shortcut key: 't')"
-#~ msgstr " (Sneltoets: 't')"
-
-#~ msgid " (Shortcut key: 'l')\n"
-#~ msgstr " (Sneltoets: 'l'),\n"
-
-#~ msgid " (Shortcut key: 'o')"
-#~ msgstr " (Sneltoets: 'o')"
-
-#~ msgid ""
-#~ "SMTP password:\n"
-#~ "<span size=\"small\">(empty to use the same as receive)</span>"
-#~ msgstr ""
-#~ "SMTP-wachtwoord:\n"
-#~ "<span size=\"small\">(laat leeg om dezelfde als bij ontvangen te "
-#~ "gebruiken)</span>"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 381b146..f77a3f5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,22 +1,22 @@
 # Brazilian Portuguese translation of Claws Mail
 #
-# Frederico Goncalves Guimaraes <frederico at teia.bio.br>, 2006-2012, 2013.
+# Frederico Goncalves Guimaraes <frederico at teia.bio.br>, 2006-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2013-04-29 10:32+0100\n"
-"PO-Revision-Date: 2013-05-02 21:51-0300\n"
-"Last-Translator: \n"
-"Language-Team: Brazilian Portuguese <kde-i18n-pt_BR at kde.org>\n"
+"POT-Creation-Date: 2013-12-07 08:54+0000\n"
+"PO-Revision-Date: 2013-12-12 21:54-0200\n"
+"Last-Translator: Frederico Goncalves Guimaraes <frederico at teia.bio.br>\n"
+"Language-Team: Brazilian Portuguese <>\n"
 "Language: Brazilian Portuguese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
 
-#: src/account.c:393
+#: src/account.c:392
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -24,15 +24,15 @@ msgstr ""
 "Algumas janelas de composição estão abertas.\n"
 "Por favor, feche todas essas janelas antes de editar as contas."
 
-#: src/account.c:438
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Não foi possível criar a pasta."
 
-#: src/account.c:719
+#: src/account.c:717
 msgid "Edit accounts"
 msgstr "Editar contas"
 
-#: src/account.c:740
+#: src/account.c:734
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -42,73 +42,57 @@ msgstr ""
 "contas, na ordem fornecida. As caixas de checagem indicam quais contas serão "
 "incluídas. A conta padrão possui o seu texto em negrito."
 
-#: src/account.c:811
+#: src/account.c:805
 msgid " _Set as default account "
 msgstr " Definir como conta _padrão "
 
-#: src/account.c:906
+#: src/account.c:897
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Contas com pastas remotas não podem ser copiadas."
 
-#: src/account.c:913
+#: src/account.c:904
 #, c-format
 msgid "Copy of %s"
 msgstr "Cópia de %s"
 
-#: src/account.c:1073
+#: src/account.c:1064
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Deseja realmente excluir a conta '%s'?"
 
-#: src/account.c:1075
+#: src/account.c:1066
 msgid "(Untitled)"
 msgstr "(Sem título)"
 
-#: src/account.c:1076
+#: src/account.c:1067
 msgid "Delete account"
 msgstr "Excluir conta"
 
-#: src/account.c:1546
+#: src/account.c:1536
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "R"
 
-#: src/account.c:1552
+#: src/account.c:1542
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Receber mensagem' busca os e-mails das contas marcadas"
 
-#: src/account.c:1559
-#: src/addressadd.c:215
-#: src/addressbook.c:125
-#: src/addrduplicates.c:481
-#: src/compose.c:6984
-#: src/editaddress.c:1270
-#: src/editaddress.c:1327
-#: src/editaddress.c:1347
-#: src/editbook.c:170
-#: src/editgroup.c:288
-#: src/editjpilot.c:257
-#: src/editldap.c:428
-#: src/editvcard.c:173
-#: src/importmutt.c:223
-#: src/importpine.c:222
-#: src/mimeview.c:284
-#: src/plugins/pdf_viewer/poppler_viewer.c:1784
-#: src/plugins/pgpcore/select-keys.c:398
-#: src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1872
-#: src/prefs_template.c:78
+#: src/account.c:1549 src/addressadd.c:215 src/addressbook.c:125
+#: src/addrduplicates.c:481 src/compose.c:7073 src/editaddress.c:1263
+#: src/editaddress.c:1320 src/editaddress.c:1340 src/editbook.c:170
+#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
+#: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
+#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1800
+#: src/plugins/pgpcore/select-keys.c:394 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1868 src/prefs_template.c:78
 msgid "Name"
 msgstr "Nome"
 
-#: src/account.c:1567
-#: src/prefs_account.c:1097
-#: src/prefs_account.c:3922
+#: src/account.c:1557 src/prefs_account.c:1097 src/prefs_account.c:3921
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/account.c:1575
-#: src/ssl_manager.c:102
+#: src/account.c:1565 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Servidor"
 
@@ -148,7 +132,7 @@ msgstr ""
 "Ação(ões) de filtragem inválida(s):\n"
 "%s"
 
-#: src/action.c:978
+#: src/action.c:988
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -159,39 +143,35 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:980
-#: src/plugins/bogofilter/bogofilter.c:875
-#: src/plugins/rssyl/feed.c:1734
-#: src/plugins/rssyl/feed.c:1738
+#: src/action.c:990 src/plugins/bogofilter/bogofilter.c:875
+#: src/plugins/rssyl/feed.c:1734 src/plugins/rssyl/feed.c:1738
 #: src/plugins/tnef_parse/tnef_parse.c:67
 #: src/plugins/vcalendar/vcal_folder.c:1800
 #: src/plugins/vcalendar/vcal_folder.c:1804
 #: src/plugins/vcalendar/vcal_folder.c:1815
-#: src/plugins/vcalendar/vcal_folder.c:1818
-#: src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1818 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: src/action.c:1198
-#: src/action.c:1368
+#: src/action.c:1208 src/action.c:1373
 msgid "Completed"
 msgstr "Completado"
 
-#: src/action.c:1234
+#: src/action.c:1244
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Executando: %s\n"
 
-#: src/action.c:1238
+#: src/action.c:1248
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Finalizado: %s\n"
 
-#: src/action.c:1271
+#: src/action.c:1281
 msgid "Action's input/output"
 msgstr "Entrada/saída da ação"
 
-#: src/action.c:1604
+#: src/action.c:1609
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -202,11 +182,11 @@ msgstr ""
 "('%%h' será substituído pelo argumento)\n"
 "  %s"
 
-#: src/action.c:1609
+#: src/action.c:1614
 msgid "Action's hidden user argument"
 msgstr "Argumento do usuário para a ação escondido"
 
-#: src/action.c:1613
+#: src/action.c:1618
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -217,12 +197,11 @@ msgstr ""
 "('%%u' será substituído pelo argumento)\n"
 "  %s"
 
-#: src/action.c:1618
+#: src/action.c:1623
 msgid "Action's user argument"
 msgstr "Argumento do usuário para ação"
 
-#: src/addr_compl.c:600
-#: src/addressbook.c:4881
+#: src/addr_compl.c:600 src/addressbook.c:4870
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:314
 msgid "Group"
 msgstr "Grupo"
@@ -295,23 +274,15 @@ msgstr ""
 "Deseja realmente substituir todos os nomes de\n"
 "atributos pelos valores originais?"
 
-#: src/addrcustomattr.c:212
-#: src/addressbook.c:435
-#: src/addressbook.c:463
-#: src/addressbook.c:480
-#: src/edittags.c:271
-#: src/plugins/archive/archiver_gtk.c:1193
-#: src/prefs_actions.c:1086
-#: src/prefs_filtering.c:1692
-#: src/prefs_template.c:1095
+#: src/addrcustomattr.c:212 src/addressbook.c:435 src/addressbook.c:463
+#: src/addressbook.c:480 src/edittags.c:271
+#: src/plugins/archive/archiver_gtk.c:1193 src/prefs_actions.c:1090
+#: src/prefs_filtering.c:1695 src/prefs_template.c:1099
 msgid "_Delete"
 msgstr "E_xcluir"
 
-#: src/addrcustomattr.c:213
-#: src/edittags.c:272
-#: src/prefs_actions.c:1087
-#: src/prefs_filtering.c:1693
-#: src/prefs_template.c:1096
+#: src/addrcustomattr.c:213 src/edittags.c:272 src/prefs_actions.c:1091
+#: src/prefs_filtering.c:1696 src/prefs_template.c:1100
 msgid "Delete _all"
 msgstr "Excluir _todos"
 
@@ -319,20 +290,20 @@ msgstr "Excluir _todos"
 msgid "_Reset to default"
 msgstr "_Restaurar os valores originais"
 
-#: src/addrcustomattr.c:410
+#: src/addrcustomattr.c:403
 msgid "Attribute name is not set."
 msgstr "O nome do atributo não foi definido."
 
-#: src/addrcustomattr.c:469
+#: src/addrcustomattr.c:462
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Editar nomes dos atributos"
 
-#: src/addrcustomattr.c:483
+#: src/addrcustomattr.c:476
 msgid "New attribute name:"
 msgstr "Novo nome de atributo:"
 
-#: src/addrcustomattr.c:520
+#: src/addrcustomattr.c:513
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -340,8 +311,7 @@ msgstr ""
 "A adição ou remoção de nomes de atributos não afetará os atributos já "
 "definidos para os contatos."
 
-#: src/addressadd.c:185
-#: src/prefs_filtering_action.c:201
+#: src/addressadd.c:185 src/prefs_filtering_action.c:201
 msgid "Add to address book"
 msgstr "Adicionar ao Livro de Endereços"
 
@@ -349,29 +319,21 @@ msgstr "Adicionar ao Livro de Endereços"
 msgid "Contact"
 msgstr "Contato"
 
-#: src/addressadd.c:227
-#: src/addrduplicates.c:452
-#: src/plugins/pgpcore/select-keys.c:399
-#: src/toolbar.c:431
+#: src/addressadd.c:227 src/addrduplicates.c:452
+#: src/plugins/pgpcore/select-keys.c:395 src/toolbar.c:432
 msgid "Address"
 msgstr "Endereço"
 
-#: src/addressadd.c:238
-#: src/addressbook.c:127
-#: src/editaddress.c:1062
-#: src/editaddress.c:1137
-#: src/editgroup.c:290
+#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1055
+#: src/editaddress.c:1130 src/editgroup.c:290
 msgid "Remarks"
 msgstr "Notas"
 
-#: src/addressadd.c:257
-#: src/addressbook_foldersel.c:158
+#: src/addressadd.c:257 src/addressbook_foldersel.c:158
 msgid "Select Address Book Folder"
 msgstr "Selecione a pasta do Livro de Endereços"
 
-#: src/addressadd.c:483
-#: src/editaddress.c:1585
-#: src/headerview.c:348
+#: src/addressadd.c:483 src/editaddress.c:1582 src/headerview.c:348
 #: src/textview.c:2110
 #, c-format
 msgid ""
@@ -381,9 +343,7 @@ msgstr ""
 "Não foi possível salvar a imagem: \n"
 "%s"
 
-#: src/addressadd.c:532
-#: src/addressbook.c:3221
-#: src/addressbook.c:3272
+#: src/addressadd.c:532 src/addressbook.c:3210 src/addressbook.c:3261
 msgid "Add address(es)"
 msgstr "Adicionar endereço(s)"
 
@@ -391,15 +351,9 @@ msgstr "Adicionar endereço(s)"
 msgid "Can't add the specified address"
 msgstr "Não foi possível adicionar o endereço especificado"
 
-#: src/addressbook.c:126
-#: src/addressbook.c:4869
-#: src/editaddress.c:1059
-#: src/editaddress.c:1120
-#: src/editgroup.c:289
-#: src/expldifdlg.c:517
-#: src/exporthtml.c:600
-#: src/exporthtml.c:764
-#: src/ldif.c:782
+#: src/addressbook.c:126 src/addressbook.c:4858 src/editaddress.c:1052
+#: src/editaddress.c:1113 src/editgroup.c:289 src/expldifdlg.c:517
+#: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:782
 msgid "Email Address"
 msgstr "Endereço de e-mail"
 
@@ -407,39 +361,27 @@ msgstr "Endereço de e-mail"
 msgid "_Book"
 msgstr "Li_vro"
 
-#: src/addressbook.c:403
-#: src/addressbook.c:434
-#: src/addressbook.c:462
-#: src/addressbook.c:479
-#: src/compose.c:576
-#: src/gtk/quicksearch.c:799
-#: src/gtk/quicksearch.c:814
-#: src/mainwindow.c:504
-#: src/messageview.c:211
+#: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
+#: src/addressbook.c:479 src/compose.c:578 src/mainwindow.c:504
+#: src/messageview.c:209
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/addressbook.c:404
-#: src/compose.c:581
-#: src/mainwindow.c:507
-#: src/messageview.c:214
+#: src/addressbook.c:404 src/compose.c:583 src/mainwindow.c:507
+#: src/messageview.c:212
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: src/addressbook.c:405
-#: src/compose.c:582
-#: src/mainwindow.c:509
-#: src/messageview.c:215
+#: src/addressbook.c:405 src/compose.c:584 src/mainwindow.c:509
+#: src/messageview.c:213
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: src/addressbook.c:408
-#: src/addressbook.c:465
+#: src/addressbook.c:408 src/addressbook.c:465
 msgid "New _Book"
 msgstr "Novo li_vro"
 
-#: src/addressbook.c:409
-#: src/addressbook.c:466
+#: src/addressbook.c:409 src/addressbook.c:466
 msgid "New _Folder"
 msgstr "Nova _pasta"
 
@@ -463,58 +405,41 @@ msgstr "_Editar livro"
 msgid "_Delete book"
 msgstr "E_xcluir livro"
 
-#: src/addressbook.c:424
-#: src/compose.c:592
+#: src/addressbook.c:424 src/compose.c:595
 msgid "_Save"
 msgstr "_Salvar"
 
-#: src/addressbook.c:425
-#: src/compose.c:596
-#: src/messageview.c:224
+#: src/addressbook.c:425 src/compose.c:599 src/messageview.c:222
 msgid "_Close"
 msgstr "_Fechar"
 
-#: src/addressbook.c:428
-#: src/addressbook.c:477
-#: src/messageview.c:228
+#: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:226
 msgid "_Select all"
 msgstr "Selecionar _todos"
 
-#: src/addressbook.c:430
-#: src/addressbook.c:469
-#: src/addressbook.c:485
+#: src/addressbook.c:430 src/addressbook.c:469 src/addressbook.c:485
 msgid "C_ut"
 msgstr "_Recortar"
 
-#: src/addressbook.c:431
-#: src/addressbook.c:470
-#: src/addressbook.c:486
-#: src/compose.c:604
-#: src/mainwindow.c:538
-#: src/messageview.c:227
+#: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
+#: src/compose.c:607 src/mainwindow.c:538 src/messageview.c:225
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/addressbook.c:432
-#: src/addressbook.c:471
-#: src/addressbook.c:487
-#: src/compose.c:605
+#: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
+#: src/compose.c:608
 msgid "_Paste"
 msgstr "Co_lar"
 
-#: src/addressbook.c:437
-#: src/addressbook.c:482
+#: src/addressbook.c:437 src/addressbook.c:482
 msgid "New _Address"
 msgstr "Novo e_ndereço"
 
-#: src/addressbook.c:438
-#: src/addressbook.c:467
-#: src/addressbook.c:483
+#: src/addressbook.c:438 src/addressbook.c:467 src/addressbook.c:483
 msgid "New _Group"
 msgstr "Novo _grupo"
 
-#: src/addressbook.c:440
-#: src/addressbook.c:489
+#: src/addressbook.c:440 src/addressbook.c:489
 msgid "_Mail To"
 msgstr "Enviar _mensagem para"
 
@@ -546,10 +471,8 @@ msgstr "Encontrar d_uplicatas..."
 msgid "Edit custom attributes..."
 msgstr "Editar atributos _personalizados..."
 
-#: src/addressbook.c:455
-#: src/compose.c:684
-#: src/mainwindow.c:801
-#: src/messageview.c:340
+#: src/addressbook.c:455 src/compose.c:687 src/mainwindow.c:801
+#: src/messageview.c:338
 msgid "_About"
 msgstr "_Sobre"
 
@@ -557,73 +480,54 @@ msgstr "_Sobre"
 msgid "_Browse Entry"
 msgstr "Percorrer a entra_da"
 
-#: src/addressbook.c:504
-#: src/crash.c:451
-#: src/crash.c:470
-#: src/importldif.c:115
-#: src/plugins/pgpcore/select-keys.c:255
-#: src/plugins/pgpcore/sgpgme.c:140
-#: src/plugins/vcalendar/day-view.c:410
-#: src/plugins/vcalendar/month-view.c:431
-#: src/prefs_themes.c:705
-#: src/prefs_themes.c:737
-#: src/prefs_themes.c:738
+#: src/addressbook.c:504 src/crash.c:451 src/crash.c:470 src/importldif.c:115
+#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:140
+#: src/plugins/vcalendar/day-view.c:410 src/plugins/vcalendar/month-view.c:431
+#: src/prefs_themes.c:705 src/prefs_themes.c:737 src/prefs_themes.c:738
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/addressbook.c:511
-#: src/addressbook.c:530
-#: src/importldif.c:122
+#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:122
 msgid "Success"
 msgstr "Sucesso"
 
-#: src/addressbook.c:512
-#: src/importldif.c:123
+#: src/addressbook.c:512 src/importldif.c:123
 msgid "Bad arguments"
 msgstr "Argumentos incorretos"
 
-#: src/addressbook.c:513
-#: src/importldif.c:124
+#: src/addressbook.c:513 src/importldif.c:124
 msgid "File not specified"
 msgstr "Arquivo não especificado"
 
-#: src/addressbook.c:514
-#: src/importldif.c:125
+#: src/addressbook.c:514 src/importldif.c:125
 msgid "Error opening file"
 msgstr "Ocorreu um erro ao abrir o arquivo"
 
-#: src/addressbook.c:515
-#: src/importldif.c:126
+#: src/addressbook.c:515 src/importldif.c:126
 msgid "Error reading file"
 msgstr "Ocorreu um erro ao ler o arquivo"
 
-#: src/addressbook.c:516
-#: src/importldif.c:127
+#: src/addressbook.c:516 src/importldif.c:127
 msgid "End of file encountered"
 msgstr "Foi encontrado o fim do arquivo"
 
-#: src/addressbook.c:517
-#: src/importldif.c:128
+#: src/addressbook.c:517 src/importldif.c:128
 msgid "Error allocating memory"
 msgstr "Ocorreu um erro de alocação de memória"
 
-#: src/addressbook.c:518
-#: src/importldif.c:129
+#: src/addressbook.c:518 src/importldif.c:129
 msgid "Bad file format"
 msgstr "Formato do arquivo incorreto"
 
-#: src/addressbook.c:519
-#: src/importldif.c:130
+#: src/addressbook.c:519 src/importldif.c:130
 msgid "Error writing to file"
 msgstr "Ocorreu um erro ao escrever no arquivo"
 
-#: src/addressbook.c:520
-#: src/importldif.c:131
+#: src/addressbook.c:520 src/importldif.c:131
 msgid "Error opening directory"
 msgstr "Ocorreu um erro ao abrir o diretório"
 
-#: src/addressbook.c:521
-#: src/importldif.c:132
+#: src/addressbook.c:521 src/importldif.c:132
 msgid "No path specified"
 msgstr "Não foi especificado nenhum caminho"
 
@@ -679,40 +583,34 @@ msgstr "Já existe outro contato com essa chave"
 msgid "Strong(er) authentication required"
 msgstr "Foi requerida uma autenticação (mais) forte"
 
-#: src/addressbook.c:913
+#: src/addressbook.c:910
 msgid "Sources"
 msgstr "Fontes"
 
-#: src/addressbook.c:917
-#: src/prefs_matcher.c:629
-#: src/prefs_other.c:475
-#: src/toolbar.c:223
-#: src/toolbar.c:2156
+#: src/addressbook.c:914 src/prefs_matcher.c:629 src/prefs_other.c:475
+#: src/toolbar.c:224 src/toolbar.c:2157
 msgid "Address book"
 msgstr "Livro de endereços"
 
-#: src/addressbook.c:1120
+#: src/addressbook.c:1109
 msgid "Lookup name:"
 msgstr "Nome de referência:"
 
-#: src/addressbook.c:1444
-#: src/addressbook.c:1497
-#: src/addrduplicates.c:803
+#: src/addressbook.c:1433 src/addressbook.c:1486 src/addrduplicates.c:803
 msgid "Delete address(es)"
 msgstr "Excluir endereço(s)"
 
-#: src/addressbook.c:1445
-#: src/addrduplicates.c:853
+#: src/addressbook.c:1434 src/addrduplicates.c:853
 msgid "This address data is readonly and cannot be deleted."
 msgstr ""
 "Os dados deste endereço são \"somente para leitura\" e não podem ser "
 "excluídos."
 
-#: src/addressbook.c:1489
+#: src/addressbook.c:1478
 msgid "Delete group"
 msgstr "Excluir grupo"
 
-#: src/addressbook.c:1490
+#: src/addressbook.c:1479
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -720,36 +618,32 @@ msgstr ""
 "Deseja realmente excluir esse(s) grupo(s)?\n"
 "Os endereços nele(s) contidos não serão perdidos."
 
-#: src/addressbook.c:1498
-#: src/addrduplicates.c:804
+#: src/addressbook.c:1487 src/addrduplicates.c:804
 msgid "Really delete the address(es)?"
 msgstr "Deseja realmente excluir o(s) endereço(s)?"
 
-#: src/addressbook.c:2201
+#: src/addressbook.c:2190
 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
 "Não é possível colar. O livro de endereços de destino é \"somente para "
 "leitura\"."
 
-#: src/addressbook.c:2211
+#: src/addressbook.c:2200
 msgid "Cannot paste into an address group."
 msgstr "Não é possível colar em um grupo de endereços."
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2906
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Deseja excluir os resultados da consulta e endereços em '%s'?"
 
-#: src/addressbook.c:2920
-#: src/addressbook.c:2946
-#: src/addressbook.c:2953
-#: src/plugins/archive/archiver_prefs.c:337
-#: src/prefs_filtering_action.c:177
-#: src/toolbar.c:413
+#: src/addressbook.c:2909 src/addressbook.c:2935 src/addressbook.c:2942
+#: src/plugins/archive/archiver_prefs.c:337 src/prefs_filtering_action.c:177
+#: src/toolbar.c:414
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2918
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -758,24 +652,21 @@ msgstr ""
 "Deseja excluir '%s'? Se você excluir somente a pasta, os endereços nela "
 "contidos serão movidos para a pasta superior."
 
-#: src/addressbook.c:2932
-#: src/imap_gtk.c:363
-#: src/mh_gtk.c:202
-#: src/plugins/mailmbox/plugin_gtk.c:325
-#: src/plugins/rssyl/rssyl_cb_menu.c:237
-#: src/plugins/vcalendar/vcal_folder.c:1953
+#: src/addressbook.c:2921 src/imap_gtk.c:363 src/mh_gtk.c:202
+#: src/plugins/mailmbox/plugin_gtk.c:324 src/plugins/rssyl/rssyl_cb_menu.c:237
+#: src/plugins/vcalendar/vcal_folder.c:1951
 msgid "Delete folder"
 msgstr "Excluir a pasta"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "+Delete _folder only"
 msgstr "+Excluir somente a _pasta"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "Delete folder and _addresses"
 msgstr "Excluir a pasta e os _endereços"
 
-#: src/addressbook.c:2944
+#: src/addressbook.c:2933
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -784,7 +675,7 @@ msgstr ""
 "Deseja excluir '%s'?\n"
 "Os endereços nela contidos não serão perdidos."
 
-#: src/addressbook.c:2951
+#: src/addressbook.c:2940
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -793,30 +684,29 @@ msgstr ""
 "Deseja excluir '%s'?\n"
 "Os endereços nela contidos serão perdidos."
 
-#: src/addressbook.c:3065
+#: src/addressbook.c:3054
 #, c-format
 msgid "Search '%s'"
 msgstr "Pesquisar '%s'"
 
-#: src/addressbook.c:3203
-#: src/addressbook.c:3253
+#: src/addressbook.c:3192 src/addressbook.c:3242
 msgid "New Contacts"
 msgstr "Novos contatos"
 
-#: src/addressbook.c:4035
+#: src/addressbook.c:4024
 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 
-#: src/addressbook.c:4039
+#: src/addressbook.c:4028
 msgid "New user, could not save address book files."
 msgstr ""
 "Novo usuário, não foi possível salvar os arquivos do livros de endereços."
 
-#: src/addressbook.c:4049
+#: src/addressbook.c:4038
 msgid "Old address book converted successfully."
 msgstr "A versão anterior do Livro de Endereços foi convertida com sucesso."
 
-#: src/addressbook.c:4054
+#: src/addressbook.c:4043
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -824,7 +714,7 @@ msgstr ""
 "O Livro de Endereços antigo foi convertido,\n"
 "não foi possível salvar o novo arquivo de índice dos endereços."
 
-#: src/addressbook.c:4067
+#: src/addressbook.c:4056
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -832,7 +722,7 @@ msgstr ""
 "Não foi possível converter o Livro de\n"
 "Endereços, mas foi criado um novo, em branco."
 
-#: src/addressbook.c:4073
+#: src/addressbook.c:4062
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -840,7 +730,7 @@ msgstr ""
 "Não foi possível converter o Livro de Endereços,\n"
 "nem foi possível salvar o novo arquivo de índice dos endereços."
 
-#: src/addressbook.c:4078
+#: src/addressbook.c:4067
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -848,87 +738,70 @@ msgstr ""
 "Não foi possível converter o Livro de Endereços, e não\n"
 "foi possível criar os novos arquivos do Livro de Endereços."
 
-#: src/addressbook.c:4085
-#: src/addressbook.c:4091
+#: src/addressbook.c:4074 src/addressbook.c:4080
 msgid "Addressbook conversion error"
 msgstr "Ocorreu um erro na conversão do Livro de Endereços"
 
-#: src/addressbook.c:4198
+#: src/addressbook.c:4187
 msgid "Addressbook Error"
 msgstr "Erro no Livro de Endereços"
 
-#: src/addressbook.c:4199
+#: src/addressbook.c:4188
 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice dos endereços"
 
-#: src/addressbook.c:4530
+#: src/addressbook.c:4519
 msgid "Busy searching..."
 msgstr "Ocupado pesquisando..."
 
-#: src/addressbook.c:4833
+#: src/addressbook.c:4822
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4845
-#: src/addressbook_foldersel.c:182
-#: src/exphtmldlg.c:371
-#: src/expldifdlg.c:388
-#: src/exporthtml.c:984
-#: src/importldif.c:657
+#: src/addressbook.c:4834 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
+#: src/expldifdlg.c:388 src/exporthtml.c:984 src/importldif.c:657
 msgid "Address Book"
 msgstr "Livro de Endereços"
 
-#: src/addressbook.c:4857
+#: src/addressbook.c:4846
 msgid "Person"
 msgstr "Pessoa"
 
-#: src/addressbook.c:4893
-#: src/exporthtml.c:884
-#: src/folderview.c:338
-#: src/folderview.c:426
-#: src/prefs_account.c:2746
-#: src/prefs_folder_column.c:78
+#: src/addressbook.c:4882 src/exporthtml.c:884 src/folderview.c:338
+#: src/folderview.c:426 src/prefs_account.c:2738 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Pasta"
 
-#: src/addressbook.c:4905
+#: src/addressbook.c:4894
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4917
-#: src/addressbook.c:4929
+#: src/addressbook.c:4906 src/addressbook.c:4918
 msgid "JPilot"
 msgstr "JPllot"
 
-#: src/addressbook.c:4941
+#: src/addressbook.c:4930
 msgid "LDAP servers"
 msgstr "Servidores LDAP"
 
-#: src/addressbook.c:4953
+#: src/addressbook.c:4942
 msgid "LDAP Query"
 msgstr "Consulta LDAP"
 
-#: src/addressbook_foldersel.c:388
-#: src/plugins/bogofilter/bogofilter.c:107
+#: src/addressbook_foldersel.c:388 src/plugins/bogofilter/bogofilter.c:107
 #: src/plugins/bogofilter/bogofilter_gtk.c:230
 #: src/plugins/bogofilter/bogofilter_gtk.c:306
 #: src/plugins/bogofilter/bogofilter_gtk.c:383
 #: src/plugins/bsfilter/bsfilter_gtk.c:197
 #: src/plugins/bsfilter/bsfilter_gtk.c:266
-#: src/plugins/bsfilter/bsfilter_gtk.c:326
-#: src/plugins/bsfilter/bsfilter.c:107
+#: src/plugins/bsfilter/bsfilter_gtk.c:326 src/plugins/bsfilter/bsfilter.c:107
 #: src/plugins/spamassassin/spamassassin.c:117
 #: src/plugins/spamassassin/spamassassin_gtk.c:443
 #: src/plugins/spamassassin/spamassassin_gtk.c:490
-#: src/plugins/spamassassin/spamassassin_gtk.c:613
-#: src/prefs_matcher.c:672
-#: src/prefs_matcher.c:707
-#: src/prefs_matcher.c:1601
-#: src/prefs_matcher.c:1608
-#: src/prefs_matcher.c:1616
-#: src/prefs_matcher.c:1618
-#: src/prefs_matcher.c:2498
-#: src/prefs_matcher.c:2502
+#: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:672
+#: src/prefs_matcher.c:707 src/prefs_matcher.c:1607 src/prefs_matcher.c:1614
+#: src/prefs_matcher.c:1622 src/prefs_matcher.c:1624 src/prefs_matcher.c:2504
+#: src/prefs_matcher.c:2508
 msgid "Any"
 msgstr "Qualquer"
 
@@ -968,8 +841,7 @@ msgstr "Nome do Livro de Endereços:"
 msgid "Address book folder size:"
 msgstr "Tamanho da pasta do Livro de Endereços:"
 
-#: src/addrgather.c:399
-#: src/addrgather.c:409
+#: src/addrgather.c:399 src/addrgather.c:409
 msgid ""
 "Maximum amount of entries per folder within the newly created address book"
 msgstr ""
@@ -983,8 +855,7 @@ msgstr "Processar estes campos de cabeçalho do e-mail"
 msgid "Include subfolders"
 msgstr "Incluir sub-pastas"
 
-#: src/addrgather.c:456
-#: src/prefs_filtering_action.c:1423
+#: src/addrgather.c:456 src/prefs_filtering_action.c:1425
 msgid "Header Name"
 msgstr "Nome do cabeçalho"
 
@@ -996,9 +867,7 @@ msgstr "Contagem de endereços"
 msgid "Header Fields"
 msgstr "Campos do cabeçalho"
 
-#: src/addrgather.c:568
-#: src/exphtmldlg.c:658
-#: src/expldifdlg.c:722
+#: src/addrgather.c:568 src/exphtmldlg.c:658 src/expldifdlg.c:722
 #: src/importldif.c:1022
 msgid "Finish"
 msgstr "Finalizar"
@@ -1072,34 +941,24 @@ msgstr "Caminho do livro de endereços"
 msgid "Delete address"
 msgstr "Excluir endereço"
 
-#: src/alertpanel.c:146
-#: src/compose.c:9160
+#: src/alertpanel.c:146 src/compose.c:9217
 msgid "Notice"
 msgstr "Nota"
 
-#: src/alertpanel.c:159
-#: src/compose.c:5556
-#: src/compose.c:6022
-#: src/compose.c:11468
-#: src/messageview.c:874
-#: src/messageview.c:887
-#: src/plugins/pgpcore/sgpgme.c:706
-#: src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4869
+#: src/alertpanel.c:159 src/compose.c:5597 src/compose.c:6063
+#: src/compose.c:11533 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:852 src/messageview.c:865
+#: src/plugins/pgpcore/sgpgme.c:706 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4865
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:172
-#: src/alertpanel.c:195
-#: src/compose.c:5497
-#: src/inc.c:666
-#: src/plugins/pgpcore/sgpgme.c:152
-#: src/plugins/pgpcore/sgpgme.c:246
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5538 src/inc.c:652
+#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:246
 msgid "Error"
 msgstr "Erro"
 
-#: src/alertpanel.c:196
-#: src/gtk/progressdialog.c:94
+#: src/alertpanel.c:196 src/gtk/progressdialog.c:94
 msgid "_View log"
 msgstr "_Ver relatório"
 
@@ -1193,16 +1052,16 @@ msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr ""
-"A sua versão do Claws Mail é mais recente do que a utilizada para construir o "
-"plugin '%s'."
+"A sua versão do Claws Mail é mais recente do que a utilizada para construir "
+"o plugin '%s'."
 
 #: src/common/plugin.c:775
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr ""
-"A sua versão do Claws Mail é mais recente do que a utilizada para construir o "
-"plugin."
+"A sua versão do Claws Mail é mais recente do que a utilizada para construir "
+"o plugin."
 
 #: src/common/plugin.c:784
 #, c-format
@@ -1213,8 +1072,7 @@ msgstr "A sua versão do Claws Mail é muito antiga para o plugin '%s'."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "A sua versão do Claws Mail é muito antiga para o plugin."
 
-#: src/common/session.c:175
-#: src/imap.c:1145
+#: src/common/session.c:175 src/imap.c:1145
 msgid "SSL handshake failed\n"
 msgstr "Não foi possível efetuar o handshake do SSL\n"
 
@@ -1226,19 +1084,15 @@ msgstr "Nenhum método SMTP AUTH disponível\n"
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "O método SMTP AUTH selecionado não está disponível\n"
 
-#: src/common/smtp.c:525
-#: src/common/smtp.c:575
+#: src/common/smtp.c:525 src/common/smtp.c:575
 msgid "bad SMTP response\n"
 msgstr "resposta incorreta do SMTP\n"
 
-#: src/common/smtp.c:546
-#: src/common/smtp.c:564
-#: src/common/smtp.c:683
+#: src/common/smtp.c:546 src/common/smtp.c:564 src/common/smtp.c:683
 msgid "error occurred on SMTP session\n"
 msgstr "ocorreu um erro durante a sessão SMTP\n"
 
-#: src/common/smtp.c:555
-#: src/pop.c:895
+#: src/common/smtp.c:555 src/pop.c:895
 msgid "error occurred on authentication\n"
 msgstr "ocorreu um erro na autenticação\n"
 
@@ -1247,8 +1101,7 @@ msgstr "ocorreu um erro na autenticação\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "A mensagem é muito grande (o tamanho máximo é %s)\n"
 
-#: src/common/smtp.c:642
-#: src/pop.c:888
+#: src/common/smtp.c:642 src/pop.c:888
 msgid "couldn't start TLS session\n"
 msgstr "não foi possível iniciar a sessão TLS\n"
 
@@ -1361,12 +1214,9 @@ msgstr "Não foi possível abrir o arquivo de certificado P12 %s (%s)\n"
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "O arquivo de certificado P12 %s não foi encontrado (%s)\n"
 
-#: src/common/ssl_certificate.c:870
-#: src/gtk/sslcertwindow.c:85
-#: src/gtk/sslcertwindow.c:92
-#: src/gtk/sslcertwindow.c:107
-#: src/gtk/sslcertwindow.c:112
-#: src/gtk/sslcertwindow.c:119
+#: src/common/ssl_certificate.c:870 src/gtk/sslcertwindow.c:85
+#: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
+#: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
 #: src/gtk/sslcertwindow.c:134
 msgid "<not in certificate>"
 msgstr "<não está no certificado>"
@@ -1375,730 +1225,670 @@ msgstr "<não está no certificado>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Assunto eliminado pela expressão regular)"
 
-#: src/common/utils.c:371
+#: src/common/utils.c:362
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
-#: src/common/utils.c:372
+#: src/common/utils.c:363
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d,%02dKb"
 
-#: src/common/utils.c:373
+#: src/common/utils.c:364
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d,%02dMb"
 
-#: src/common/utils.c:374
+#: src/common/utils.c:365
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGb"
 
-#: src/common/utils.c:4974
+#: src/common/utils.c:4946
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/common/utils.c:4975
+#: src/common/utils.c:4947
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: src/common/utils.c:4976
+#: src/common/utils.c:4948
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: src/common/utils.c:4977
+#: src/common/utils.c:4949
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: src/common/utils.c:4978
+#: src/common/utils.c:4950
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: src/common/utils.c:4979
+#: src/common/utils.c:4951
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: src/common/utils.c:4980
+#: src/common/utils.c:4952
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/common/utils.c:4982
+#: src/common/utils.c:4954
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Janeiro"
 
-#: src/common/utils.c:4983
+#: src/common/utils.c:4955
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Fevereiro"
 
-#: src/common/utils.c:4984
+#: src/common/utils.c:4956
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Março"
 
-#: src/common/utils.c:4985
+#: src/common/utils.c:4957
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Abril"
 
-#: src/common/utils.c:4986
+#: src/common/utils.c:4958
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Maio"
 
-#: src/common/utils.c:4987
+#: src/common/utils.c:4959
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Junho"
 
-#: src/common/utils.c:4988
+#: src/common/utils.c:4960
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Julho"
 
-#: src/common/utils.c:4989
+#: src/common/utils.c:4961
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Agosto"
 
-#: src/common/utils.c:4990
+#: src/common/utils.c:4962
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Setembro"
 
-#: src/common/utils.c:4991
+#: src/common/utils.c:4963
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Outubro"
 
-#: src/common/utils.c:4992
+#: src/common/utils.c:4964
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Novembro"
 
-#: src/common/utils.c:4993
+#: src/common/utils.c:4965
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Dezembro"
 
-#: src/common/utils.c:4995
+#: src/common/utils.c:4967
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dom"
 
-#: src/common/utils.c:4996
+#: src/common/utils.c:4968
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Seg"
 
-#: src/common/utils.c:4997
+#: src/common/utils.c:4969
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Ter"
 
-#: src/common/utils.c:4998
+#: src/common/utils.c:4970
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Qua"
 
-#: src/common/utils.c:4999
+#: src/common/utils.c:4971
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Qui"
 
-#: src/common/utils.c:5000
+#: src/common/utils.c:4972
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Sex"
 
-#: src/common/utils.c:5001
+#: src/common/utils.c:4973
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sáb"
 
-#: src/common/utils.c:5003
+#: src/common/utils.c:4975
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:5004
+#: src/common/utils.c:4976
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Fev"
 
-#: src/common/utils.c:5005
+#: src/common/utils.c:4977
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:5006
+#: src/common/utils.c:4978
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Abr"
 
-#: src/common/utils.c:5007
+#: src/common/utils.c:4979
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:5008
+#: src/common/utils.c:4980
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:5009
+#: src/common/utils.c:4981
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:5010
+#: src/common/utils.c:4982
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ago"
 
-#: src/common/utils.c:5011
+#: src/common/utils.c:4983
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Set"
 
-#: src/common/utils.c:5012
+#: src/common/utils.c:4984
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Out"
 
-#: src/common/utils.c:5013
+#: src/common/utils.c:4985
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:5014
+#: src/common/utils.c:4986
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dez"
 
-#: src/common/utils.c:5025
+#: src/common/utils.c:4997
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:5026
+#: src/common/utils.c:4998
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:5027
+#: src/common/utils.c:4999
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:5028
+#: src/common/utils.c:5000
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/common/utils.c:5035
+#: src/common/utils.c:5007
 msgctxt "For use by strftime (default date+time format)"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a-%d/%m/%y %H:%M:%S"
 
-#: src/common/utils.c:5036
+#: src/common/utils.c:5008
 msgctxt "For use by strftime (default date format)"
 msgid "%m/%d/%y"
 msgstr "%m/%d/%y"
 
-#: src/common/utils.c:5037
+#: src/common/utils.c:5009
 msgctxt "For use by strftime (default time format)"
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
-#: src/common/utils.c:5039
+#: src/common/utils.c:5011
 msgctxt "For use by strftime (default 12-hour time format)"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
-#: src/compose.c:565
+#: src/compose.c:567
 msgid "_Add..."
 msgstr "_Adicionar..."
 
-#: src/compose.c:566
-#: src/mh_gtk.c:361
-#: src/plugins/mailmbox/plugin_gtk.c:293
+#: src/compose.c:568 src/mh_gtk.c:361 src/plugins/mailmbox/plugin_gtk.c:293
 #: src/plugins/rssyl/rssyl_cb_menu.c:140
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/compose.c:568
-#: src/folderview.c:234
+#: src/compose.c:570 src/folderview.c:234
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
-#: src/compose.c:575
-#: src/mainwindow.c:506
-#: src/messageview.c:213
+#: src/compose.c:577 src/mainwindow.c:506 src/messageview.c:211
 msgid "_Message"
 msgstr "_Mensagem"
 
-#: src/compose.c:578
+#: src/compose.c:580
 msgid "_Spelling"
 msgstr "Orto_grafia"
 
-#: src/compose.c:580
-#: src/compose.c:646
+#: src/compose.c:582 src/compose.c:649
 msgid "_Options"
 msgstr "_Opções"
 
-#: src/compose.c:584
+#: src/compose.c:586
 msgid "S_end"
 msgstr "_Enviar"
 
-#: src/compose.c:585
+#: src/compose.c:587
 msgid "Send _later"
 msgstr "Enviar _mais tarde"
 
-#: src/compose.c:588
+#: src/compose.c:590
 msgid "_Attach file"
 msgstr "_Anexar arquivo"
 
-#: src/compose.c:589
+#: src/compose.c:591
 msgid "_Insert file"
 msgstr "_Inserir arquivo"
 
-#: src/compose.c:590
+#: src/compose.c:592
 msgid "Insert si_gnature"
 msgstr "Inserir assina_tura"
 
-#: src/compose.c:594
+#: src/compose.c:593
+msgid "_Replace signature"
+msgstr "S_ubstituir assinatura"
+
+#: src/compose.c:597
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: src/compose.c:599
+#: src/compose.c:602
 msgid "_Undo"
 msgstr "_Desfazer"
 
-#: src/compose.c:600
+#: src/compose.c:603
 msgid "_Redo"
 msgstr "Re_fazer"
 
-#: src/compose.c:603
+#: src/compose.c:606
 msgid "Cu_t"
 msgstr "_Recortar"
 
-#: src/compose.c:607
+#: src/compose.c:610
 msgid "_Special paste"
 msgstr "Colar _especial"
 
-#: src/compose.c:608
+#: src/compose.c:611
 msgid "As _quotation"
 msgstr "Como _citação"
 
-#: src/compose.c:609
+#: src/compose.c:612
 msgid "_Wrapped"
 msgstr "Com _quebra de linhas"
 
-#: src/compose.c:610
+#: src/compose.c:613
 msgid "_Unwrapped"
 msgstr "_Sem quebra de linhas"
 
-#: src/compose.c:612
-#: src/mainwindow.c:539
+#: src/compose.c:615 src/mainwindow.c:539
 msgid "Select _all"
 msgstr "Selecionar _tudo"
 
-#: src/compose.c:614
+#: src/compose.c:617
 msgid "A_dvanced"
 msgstr "_Avançado"
 
-#: src/compose.c:615
+#: src/compose.c:618
 msgid "Move a character backward"
 msgstr "Mover um caractere para trás"
 
-#: src/compose.c:616
+#: src/compose.c:619
 msgid "Move a character forward"
 msgstr "Mover um caractere para frente"
 
-#: src/compose.c:617
+#: src/compose.c:620
 msgid "Move a word backward"
 msgstr "Mover uma palavra para trás"
 
-#: src/compose.c:618
+#: src/compose.c:621
 msgid "Move a word forward"
 msgstr "Mover uma palavra para frente"
 
-#: src/compose.c:619
+#: src/compose.c:622
 msgid "Move to beginning of line"
 msgstr "Mover para o início da linha"
 
-#: src/compose.c:620
+#: src/compose.c:623
 msgid "Move to end of line"
 msgstr "Mover para o final da linha"
 
-#: src/compose.c:621
+#: src/compose.c:624
 msgid "Move to previous line"
 msgstr "Mover para a linha anterior"
 
-#: src/compose.c:622
+#: src/compose.c:625
 msgid "Move to next line"
 msgstr "Mover para a próxima linha"
 
-#: src/compose.c:623
+#: src/compose.c:626
 msgid "Delete a character backward"
 msgstr "Apagar um caractere para trás"
 
-#: src/compose.c:624
+#: src/compose.c:627
 msgid "Delete a character forward"
 msgstr "Apagar um caractere para frente"
 
-#: src/compose.c:625
+#: src/compose.c:628
 msgid "Delete a word backward"
 msgstr "Apagar uma palavra para trás"
 
-#: src/compose.c:626
+#: src/compose.c:629
 msgid "Delete a word forward"
 msgstr "Apagar uma palavra para frente"
 
-#: src/compose.c:627
+#: src/compose.c:630
 msgid "Delete line"
 msgstr "Apagar a linha"
 
-#: src/compose.c:628
+#: src/compose.c:631
 msgid "Delete to end of line"
 msgstr "Apagar até o final da linha"
 
-#: src/compose.c:631
-#: src/messageview.c:230
+#: src/compose.c:634 src/messageview.c:228
 msgid "_Find"
 msgstr "Locali_zar"
 
-#: src/compose.c:634
+#: src/compose.c:637
 msgid "_Wrap current paragraph"
 msgstr "_Quebrar parágrafo atual"
 
-#: src/compose.c:635
+#: src/compose.c:638
 msgid "Wrap all long _lines"
 msgstr "Quebrar todas as l_inhas longas"
 
-#: src/compose.c:637
+#: src/compose.c:640
 msgid "Edit with e_xternal editor"
 msgstr "Editar com um programa e_xterno"
 
-#: src/compose.c:640
+#: src/compose.c:643
 msgid "_Check all or check selection"
 msgstr "_Verificar tudo ou somente a seleção"
 
-#: src/compose.c:641
+#: src/compose.c:644
 msgid "_Highlight all misspelled words"
 msgstr "_Destacar todas as palavras erradas"
 
-#: src/compose.c:642
+#: src/compose.c:645
 msgid "Check _backwards misspelled word"
 msgstr "Verificar palavras erradas _anteriores"
 
-#: src/compose.c:643
+#: src/compose.c:646
 msgid "_Forward to next misspelled word"
 msgstr "Avançar para a _próxima palavra errada"
 
-#: src/compose.c:651
+#: src/compose.c:654
 msgid "Reply _mode"
 msgstr "Modo da _resposta"
 
-#: src/compose.c:653
+#: src/compose.c:656
 msgid "Privacy _System"
 msgstr "Sistema de _privacidade"
 
-#: src/compose.c:658
+#: src/compose.c:661
 msgid "_Priority"
 msgstr "_Prioridade"
 
-#: src/compose.c:660
-#: src/mainwindow.c:603
-#: src/messageview.c:266
+#: src/compose.c:663 src/mainwindow.c:603 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "_Codificação dos caracteres"
 
-#: src/compose.c:665
-#: src/mainwindow.c:608
-#: src/messageview.c:271
+#: src/compose.c:668 src/mainwindow.c:608 src/messageview.c:269
 msgid "Western European"
 msgstr "Europeu Ocidental"
 
-#: src/compose.c:666
-#: src/mainwindow.c:609
-#: src/messageview.c:272
+#: src/compose.c:669 src/mainwindow.c:609 src/messageview.c:270
 msgid "Baltic"
 msgstr "Báltico"
 
-#: src/compose.c:667
-#: src/mainwindow.c:610
-#: src/messageview.c:273
+#: src/compose.c:670 src/mainwindow.c:610 src/messageview.c:271
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: src/compose.c:668
-#: src/mainwindow.c:611
-#: src/messageview.c:274
+#: src/compose.c:671 src/mainwindow.c:611 src/messageview.c:272
 msgid "Arabic"
 msgstr "Árabe"
 
-#: src/compose.c:669
-#: src/mainwindow.c:612
-#: src/messageview.c:275
+#: src/compose.c:672 src/mainwindow.c:612 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: src/compose.c:670
-#: src/mainwindow.c:613
-#: src/messageview.c:276
+#: src/compose.c:673 src/mainwindow.c:613 src/messageview.c:274
 msgid "Japanese"
 msgstr "Japonês"
 
-#: src/compose.c:671
-#: src/mainwindow.c:614
-#: src/messageview.c:277
+#: src/compose.c:674 src/mainwindow.c:614 src/messageview.c:275
 msgid "Chinese"
 msgstr "Chinês"
 
-#: src/compose.c:672
-#: src/mainwindow.c:615
-#: src/messageview.c:278
+#: src/compose.c:675 src/mainwindow.c:615 src/messageview.c:276
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/compose.c:673
-#: src/mainwindow.c:616
-#: src/messageview.c:279
+#: src/compose.c:676 src/mainwindow.c:616 src/messageview.c:277
 msgid "Thai"
 msgstr "Tailandês"
 
-#: src/compose.c:676
-#: src/mainwindow.c:723
-#: src/messageview.c:315
+#: src/compose.c:679 src/mainwindow.c:723 src/messageview.c:313
 msgid "_Address book"
 msgstr "_Livro de endereços"
 
-#: src/compose.c:678
+#: src/compose.c:681
 msgid "_Template"
 msgstr "_Modelo"
 
-#: src/compose.c:680
-#: src/mainwindow.c:751
-#: src/messageview.c:336
+#: src/compose.c:683 src/mainwindow.c:751 src/messageview.c:334
 msgid "Actio_ns"
 msgstr "_Ações"
 
-#: src/compose.c:689
+#: src/compose.c:692
 msgid "Aut_o wrapping"
 msgstr "Quebra auto_mática"
 
-#: src/compose.c:690
+#: src/compose.c:693
 msgid "Auto _indent"
 msgstr "Rec_uo automático"
 
-#: src/compose.c:691
+#: src/compose.c:694
 msgid "Si_gn"
 msgstr "_Assinar"
 
-#: src/compose.c:692
+#: src/compose.c:695
 msgid "_Encrypt"
 msgstr "_Criptografar"
 
-#: src/compose.c:693
+#: src/compose.c:696
 msgid "_Request Return Receipt"
 msgstr "_Solicitar confirmação de recebimento"
 
-#: src/compose.c:694
+#: src/compose.c:697
 msgid "Remo_ve references"
 msgstr "_Remover referências"
 
-#: src/compose.c:695
+#: src/compose.c:698
 msgid "Show _ruler"
 msgstr "Exibir _régua"
 
-#: src/compose.c:700
-#: src/compose.c:710
+#: src/compose.c:703 src/compose.c:713
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:701
-#: src/mainwindow.c:657
-#: src/messageview.c:304
+#: src/compose.c:704 src/mainwindow.c:657 src/messageview.c:302
 msgid "_All"
 msgstr "_Todos"
 
-#: src/compose.c:702
-#: src/mainwindow.c:658
-#: src/messageview.c:305
+#: src/compose.c:705 src/mainwindow.c:658 src/messageview.c:303
 msgid "_Sender"
 msgstr "_Remetente"
 
-#: src/compose.c:703
+#: src/compose.c:706
 msgid "_Mailing-list"
 msgstr "_Lista de discussão"
 
-#: src/compose.c:708
+#: src/compose.c:711
 msgid "_Highest"
 msgstr "_Altíssima"
 
-#: src/compose.c:709
+#: src/compose.c:712
 msgid "Hi_gh"
 msgstr "A_lta"
 
-#: src/compose.c:711
+#: src/compose.c:714
 msgid "Lo_w"
 msgstr "_Baixa"
 
-#: src/compose.c:712
+#: src/compose.c:715
 msgid "_Lowest"
 msgstr "Bai_xíssima"
 
-#: src/compose.c:717
-#: src/mainwindow.c:867
-#: src/messageview.c:353
+#: src/compose.c:720 src/mainwindow.c:865 src/messageview.c:351
 msgid "_Automatic"
 msgstr "_Automática"
 
-#: src/compose.c:718
-#: src/mainwindow.c:868
-#: src/messageview.c:354
+#: src/compose.c:721 src/mainwindow.c:866 src/messageview.c:352
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:719
-#: src/mainwindow.c:869
-#: src/messageview.c:355
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:353
 msgid "Unicode (_UTF-8)"
 msgstr "U_nicode (UTF-8)"
 
-#: src/compose.c:723
-#: src/mainwindow.c:873
-#: src/messageview.c:359
+#: src/compose.c:726 src/mainwindow.c:871 src/messageview.c:357
 msgid "Central European (ISO-8859-_2)"
 msgstr "Europeu Central (ISO-8859-_2)"
 
-#: src/compose.c:726
-#: src/mainwindow.c:876
-#: src/messageview.c:362
+#: src/compose.c:729 src/mainwindow.c:874 src/messageview.c:360
 msgid "Greek (ISO-8859-_7)"
 msgstr "_Grego (ISO-8859-7)"
 
-#: src/compose.c:731
-#: src/mainwindow.c:881
-#: src/messageview.c:367
+#: src/compose.c:734 src/mainwindow.c:879 src/messageview.c:365
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turco (ISO-8859-_9)"
 
-#: src/compose.c:1034
+#: src/compose.c:1062
 msgid "New message From format error."
 msgstr "Erro no formato do remetente da mensagem."
 
-#: src/compose.c:1126
+#: src/compose.c:1154
 msgid "New message subject format error."
 msgstr "Erro no formato do assunto da mensagem."
 
-#: src/compose.c:1157
-#: src/quote_fmt.c:563
+#: src/compose.c:1185 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "O corpo do modelo \"Nova mensagem\" possui um erro na linha %d."
 
-#: src/compose.c:1413
+#: src/compose.c:1439
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr ""
 "Não foi possível responder. A mensagem original provavelmente não existe."
 
-#: src/compose.c:1596
-#: src/quote_fmt.c:580
+#: src/compose.c:1622 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 "O campo \"De\" do modelo \"Responder\" possui um endereço de e-mail inválido."
 
-#: src/compose.c:1644
-#: src/quote_fmt.c:583
+#: src/compose.c:1670 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "O corpo do modelo \"Responder\" possui um erro na linha %d."
 
-#: src/compose.c:1780
-#: src/compose.c:1972
-#: src/quote_fmt.c:600
+#: src/compose.c:1806 src/compose.c:1998 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr ""
-"O campo \"De\" do modelo \"Encaminhar\" possui um endereço de e-mail inválido."
+"O campo \"De\" do modelo \"Encaminhar\" possui um endereço de e-mail "
+"inválido."
 
-#: src/compose.c:1840
-#: src/quote_fmt.c:603
+#: src/compose.c:1866 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "O corpo do modelo \"Encaminhar\" possui um erro na linha %d."
 
-#: src/compose.c:2014
+#: src/compose.c:2040
 msgid "Fw: multiple emails"
 msgstr "Enc: múltiplos e-mails"
 
-#: src/compose.c:2456
+#: src/compose.c:2482
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "O corpo do modelo \"Redirecionar\" possui um erro na linha %d."
 
-#: src/compose.c:2522
-#: src/gtk/headers.h:13
+#: src/compose.c:2549 src/gtk/headers.h:13
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2525
-#: src/gtk/headers.h:14
+#: src/compose.c:2552 src/gtk/headers.h:14
 msgid "Bcc:"
 msgstr "Cco:"
 
-#: src/compose.c:2528
-#: src/gtk/headers.h:11
+#: src/compose.c:2555 src/gtk/headers.h:11
 msgid "Reply-To:"
 msgstr "Responder para:"
 
-#: src/compose.c:2531
-#: src/compose.c:4818
-#: src/compose.c:4820
+#: src/compose.c:2558 src/compose.c:4854 src/compose.c:4856
 #: src/gtk/headers.h:32
 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 
-#: src/compose.c:2534
-#: src/gtk/headers.h:33
+#: src/compose.c:2561 src/gtk/headers.h:33
 msgid "Followup-To:"
 msgstr "Seguir a:"
 
-#: src/compose.c:2537
-#: src/gtk/headers.h:16
+#: src/compose.c:2564 src/gtk/headers.h:16
 msgid "In-Reply-To:"
 msgstr "Respondendo a:"
 
-#: src/compose.c:2541
-#: src/compose.c:4815
-#: src/compose.c:4823
-#: src/gtk/headers.h:12
-#: src/summary_search.c:419
+#: src/compose.c:2568 src/compose.c:4851 src/compose.c:4859
+#: src/gtk/headers.h:12 src/summary_search.c:445
 msgid "To:"
 msgstr "Para:"
 
-#: src/compose.c:2747
+#: src/compose.c:2774
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Não foi possível anexar o arquivo (erro na conversão da codificação dos "
 "caracteres)."
 
-#: src/compose.c:2753
+#: src/compose.c:2780
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2113,16 +1903,16 @@ msgstr[1] ""
 "Os seguintes arquivos foram anexados: \n"
 "%s"
 
-#: src/compose.c:3026
+#: src/compose.c:3053
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "A \"Marca de citação\" do modelo é inválida."
 
-#: src/compose.c:3514
+#: src/compose.c:3542
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Não foi possível obter o tamanho do arquivo '%s'."
 
-#: src/compose.c:3525
+#: src/compose.c:3553
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -2131,54 +1921,48 @@ msgstr ""
 "Você esta prestes a inserir um arquivo de %s no corpo da mensagem. Deseja "
 "realmente fazer isso?"
 
-#: src/compose.c:3528
+#: src/compose.c:3556
 msgid "Are you sure?"
 msgstr "Tem certeza?"
 
-#: src/compose.c:3529
-#: src/compose.c:10962
+#: src/compose.c:3557 src/compose.c:11027
 msgid "+_Insert"
 msgstr "+_Inserir"
 
-#: src/compose.c:3639
+#: src/compose.c:3672
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:3643
+#: src/compose.c:3676
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:3670
+#: src/compose.c:3703
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:4658
-#: src/plugins/python/composewindowtype.c:428
+#: src/compose.c:4691 src/plugins/python/composewindowtype.c:432
 msgid " [Edited]"
 msgstr " [Editada]"
 
-#: src/compose.c:4665
-#: src/plugins/python/composewindowtype.c:431
+#: src/compose.c:4698 src/plugins/python/composewindowtype.c:435
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Escrever mensagem%s"
 
-#: src/compose.c:4668
-#: src/plugins/python/composewindowtype.c:434
+#: src/compose.c:4701 src/plugins/python/composewindowtype.c:438
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sem assunto] - Escrever mensagem%s"
 
-#: src/compose.c:4670
-#: src/plugins/python/composewindowtype.c:422
+#: src/compose.c:4703 src/plugins/python/composewindowtype.c:426
 msgid "Compose message"
 msgstr "Escrever mensagem"
 
-#: src/compose.c:4697
-#: src/messageview.c:909
+#: src/compose.c:4730 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2186,61 +1970,51 @@ msgstr ""
 "Não foi especificada uma conta para o envio da\n"
 "mensagem. Por favor, selecione uma conta antes de enviar."
 
-#: src/compose.c:4914
-#: src/compose.c:4946
-#: src/compose.c:4988
-#: src/plugins/attachwarner/attachwarner.c:219
-#: src/prefs_account.c:3245
-#: src/toolbar.c:404
-#: src/toolbar.c:422
+#: src/compose.c:4950 src/compose.c:4982 src/compose.c:5024
+#: src/plugins/attachwarner/attachwarner.c:219 src/prefs_account.c:3237
+#: src/toolbar.c:405 src/toolbar.c:423
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4915
+#: src/compose.c:4951
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "O único destinatário é o endereço Cc padrão. Enviar mesmo assim?"
 
-#: src/compose.c:4916
-#: src/compose.c:4948
-#: src/compose.c:4981
-#: src/compose.c:5497
+#: src/compose.c:4952 src/compose.c:4984 src/compose.c:5017 src/compose.c:5538
 #: src/plugins/attachwarner/attachwarner.c:211
 msgid "+_Send"
 msgstr "+Enviar _agora"
 
-#: src/compose.c:4947
+#: src/compose.c:4983
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "O único destinatário é o endereço Cco padrão. Enviar mesmo assim?"
 
-#: src/compose.c:4964
+#: src/compose.c:5000
 msgid "Recipient is not specified."
 msgstr "O destinatário não foi especificado."
 
-#: src/compose.c:4983
-#: src/plugins/attachwarner/attachwarner.c:213
+#: src/compose.c:5019 src/plugins/attachwarner/attachwarner.c:213
 msgid "+_Queue"
 msgstr "+Mandar para a _Fila de Saída"
 
-#: src/compose.c:4984
+#: src/compose.c:5020
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "A mensagem está sem assunto. %s"
 
-#: src/compose.c:4985
+#: src/compose.c:5021
 msgid "Send it anyway?"
 msgstr "Enviar mesmo assim?"
 
-#: src/compose.c:4986
+#: src/compose.c:5022
 msgid "Queue it anyway?"
 msgstr "Mandar para a Fila de Saída mesmo assim?"
 
-#: src/compose.c:4988
-#: src/toolbar.c:423
+#: src/compose.c:5024 src/toolbar.c:424
 msgid "Send later"
 msgstr "Enviar mais tarde"
 
-#: src/compose.c:5036
-#: src/compose.c:9585
+#: src/compose.c:5077 src/compose.c:9643
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2250,8 +2024,7 @@ msgstr ""
 "\n"
 "Ocorreu um erro na conversão da codificação dos caracteres."
 
-#: src/compose.c:5039
-#: src/compose.c:9588
+#: src/compose.c:5080 src/compose.c:9646
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2261,8 +2034,7 @@ msgstr ""
 "\n"
 "Não foi possível obter a chave de criptografia do destinatário."
 
-#: src/compose.c:5045
-#: src/compose.c:9582
+#: src/compose.c:5086 src/compose.c:9640
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2273,7 +2045,7 @@ msgstr ""
 "\n"
 "Falha na assinatura: %s"
 
-#: src/compose.c:5048
+#: src/compose.c:5089
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2284,12 +2056,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5050
+#: src/compose.c:5091
 msgid "Could not queue message for sending."
 msgstr "Não foi possível acrescentar a mensagem à Fila de Saída."
 
-#: src/compose.c:5065
-#: src/compose.c:5125
+#: src/compose.c:5106 src/compose.c:5166
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2298,7 +2069,7 @@ msgstr ""
 "Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para "
 "tentar novamente."
 
-#: src/compose.c:5121
+#: src/compose.c:5162
 #, c-format
 msgid ""
 "%s\n"
@@ -2308,7 +2079,7 @@ msgstr ""
 "Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para "
 "tentar novamente."
 
-#: src/compose.c:5494
+#: src/compose.c:5535
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2319,7 +2090,7 @@ msgstr ""
 "para a codificação %s especificada.\n"
 "Enviá-la como %s?"
 
-#: src/compose.c:5552
+#: src/compose.c:5593
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2332,83 +2103,70 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:5733
+#: src/compose.c:5774
 msgid "Encryption warning"
 msgstr "Aviso de criptografia"
 
-#: src/compose.c:5734
+#: src/compose.c:5775
 msgid "+C_ontinue"
 msgstr "+C_ontinuar"
 
-#: src/compose.c:5783
+#: src/compose.c:5824
 msgid "No account for sending mails available!"
 msgstr "Não existem contas para enviar a mensagem!"
 
-#: src/compose.c:5792
+#: src/compose.c:5833
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "A conta selecionada não é NNTP: é impossível enviar a mensagem."
 
-#: src/compose.c:6021
+#: src/compose.c:6062
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "O anexo %s não existe mais. Devo ignorar?"
 
-#: src/compose.c:6022
-#: src/mainwindow.c:648
-#: src/toolbar.c:229
-#: src/toolbar.c:2181
+#: src/compose.c:6063 src/mainwindow.c:648 src/toolbar.c:230
+#: src/toolbar.c:2182
 msgid "Cancel sending"
 msgstr "Cancelar o envio"
 
-#: src/compose.c:6022
+#: src/compose.c:6063
 msgid "Ignore attachment"
 msgstr "Ignorar o anexo"
 
-#: src/compose.c:6061
+#: src/compose.c:6102
 #, c-format
 msgid "Original %s part"
 msgstr "Parte %s original"
 
-#: src/compose.c:6592
+#: src/compose.c:6681
 msgid "Add to address _book"
 msgstr "Adicionar ao _Livro de Endereços"
 
-#: src/compose.c:6748
+#: src/compose.c:6837
 msgid "Delete entry contents"
 msgstr "Excluir o conteúdo da entrada"
 
-#: src/compose.c:6752
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:295
+#: src/compose.c:6841 src/plugins/vcalendar/vcal_meeting_gtk.c:295
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 "Use <tab> para completar automaticamente a partir do Livro de Endereços"
 
-#: src/compose.c:6972
+#: src/compose.c:7061
 msgid "Mime type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:6978
-#: src/mimeview.c:283
-#: src/plugins/pgpcore/select-keys.c:396
-#: src/prefs_matcher.c:627
-#: src/prefs_summary_column.c:85
-#: src/summaryview.c:447
+#: src/compose.c:7067 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:392
+#: src/prefs_matcher.c:627 src/prefs_summary_column.c:85 src/summaryview.c:447
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:7048
+#: src/compose.c:7130
 msgid "Save Message to "
 msgstr "Salvar mensagem em "
 
-#: src/compose.c:7081
-#: src/editjpilot.c:276
-#: src/editldap.c:520
-#: src/editvcard.c:192
-#: src/export.c:164
-#: src/import.c:163
-#: src/importmutt.c:239
-#: src/importpine.c:238
-#: src/plugins/archive/archiver_gtk.c:1028
+#: src/compose.c:7167 src/editjpilot.c:276 src/editldap.c:520
+#: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
+#: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1028
 #: src/plugins/bogofilter/bogofilter_gtk.c:188
 #: src/plugins/bogofilter/bogofilter_gtk.c:208
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
@@ -2417,26 +2175,24 @@ msgstr "Salvar mensagem em "
 msgid "_Browse"
 msgstr "Nav_egar"
 
-#: src/compose.c:7569
+#: src/compose.c:7643
 msgid "Hea_der"
 msgstr "_Cabeçalho"
 
-#: src/compose.c:7574
+#: src/compose.c:7648
 msgid "_Attachments"
 msgstr "_Anexos"
 
-#: src/compose.c:7588
+#: src/compose.c:7662
 msgid "Othe_rs"
 msgstr "_Outros"
 
-#: src/compose.c:7603
-#: src/gtk/headers.h:18
-#: src/plugins/pdf_viewer/poppler_viewer.c:704
-#: src/summary_search.c:426
+#: src/compose.c:7677 src/gtk/headers.h:18
+#: src/plugins/pdf_viewer/poppler_viewer.c:704 src/summary_search.c:452
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: src/compose.c:7830
+#: src/compose.c:7891
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2445,20 +2201,20 @@ msgstr ""
 "Não foi possível iniciar o verificador ortográfico.\n"
 "%s"
 
-#: src/compose.c:7943
+#: src/compose.c:8000
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "De: <i>%s</i>"
 
-#: src/compose.c:7977
+#: src/compose.c:8034
 msgid "Account to use for this email"
 msgstr "Conta a ser usada por esse e-mail"
 
-#: src/compose.c:7979
+#: src/compose.c:8036
 msgid "Sender address to be used"
 msgstr "Endereço do remetente a ser usado"
 
-#: src/compose.c:8143
+#: src/compose.c:8200
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2467,66 +2223,64 @@ msgstr ""
 "Não foi possível carregar o sistema de privacidade '%s'. Você não poderá "
 "assinar ou criptografar essa mensagem."
 
-#: src/compose.c:8243
-#: src/plugins/archive/archiver_gtk.c:1082
+#: src/compose.c:8300 src/plugins/archive/archiver_gtk.c:1082
 msgid "_None"
 msgstr "_Nenhum"
 
-#: src/compose.c:8344
-#: src/prefs_template.c:749
+#: src/compose.c:8401 src/prefs_template.c:753
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "O corpo do modelo possui um erro na linha %d."
 
-#: src/compose.c:8460
+#: src/compose.c:8517
 msgid "Template From format error."
 msgstr "Erro no formato do Remetente do modelo."
 
-#: src/compose.c:8478
+#: src/compose.c:8535
 msgid "Template To format error."
 msgstr "Erro no formato do Destinatário do modelo."
 
-#: src/compose.c:8496
+#: src/compose.c:8553
 msgid "Template Cc format error."
 msgstr "Erro no formato da Cc do modelo."
 
-#: src/compose.c:8514
+#: src/compose.c:8571
 msgid "Template Bcc format error."
 msgstr "Erro no formato da Cco do modelo."
 
-#: src/compose.c:8533
+#: src/compose.c:8590
 msgid "Template subject format error."
 msgstr "Erro no formato do assunto do modelo."
 
-#: src/compose.c:8797
+#: src/compose.c:8854
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:8812
+#: src/compose.c:8869
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:8886
+#: src/compose.c:8943
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:8903
+#: src/compose.c:8960
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:8944
+#: src/compose.c:9001
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:8964
+#: src/compose.c:9021
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:8965
+#: src/compose.c:9022
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:9157
+#: src/compose.c:9214
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2537,16 +2291,15 @@ msgstr ""
 "Deseja terminar o processo?\n"
 "Id do grupo do processo: %d"
 
-#: src/compose.c:9551
-#: src/messageview.c:1116
+#: src/compose.c:9609 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "O Claws Mail necessita de acesso à rede para enviar essa mensagem."
 
-#: src/compose.c:9577
+#: src/compose.c:9635
 msgid "Could not queue message."
 msgstr "Não foi possível adicionar a mensagem à Fila de Saída."
 
-#: src/compose.c:9579
+#: src/compose.c:9637
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2557,15 +2310,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:9747
+#: src/compose.c:9805
 msgid "Could not save draft."
 msgstr "Não foi possível salvar o rascunho."
 
-#: src/compose.c:9751
+#: src/compose.c:9809
 msgid "Could not save draft"
 msgstr "Não foi possível salvar o rascunho"
 
-#: src/compose.c:9752
+#: src/compose.c:9810
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2573,25 +2326,24 @@ msgstr ""
 "Não foi possível salvar o rascunho.\n"
 "Deseja cancelar a saída ou descartar essa mensagem?"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Cancel exit"
 msgstr "_Cancelar a saída"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Discard email"
 msgstr "_Descartar a mensagem"
 
-#: src/compose.c:9914
-#: src/compose.c:9928
+#: src/compose.c:9972 src/compose.c:9986
 msgid "Select file"
 msgstr "Selecione o arquivo"
 
-#: src/compose.c:9942
+#: src/compose.c:10000
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Não foi possível ler o arquivo '%s'."
 
-#: src/compose.c:9944
+#: src/compose.c:10002
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2600,60 +2352,62 @@ msgstr ""
 "O arquivo '%s' continha caracteres inválidos para a\n"
 "codificação atual, a inserção pode estar incorreta."
 
-#: src/compose.c:10016
+#: src/compose.c:10081
 msgid "Discard message"
 msgstr "Descartar a mensagem"
 
-#: src/compose.c:10017
+#: src/compose.c:10082
 msgid "This message has been modified. Discard it?"
 msgstr "Essa mensagem foi modificada. Deseja descartá-la ?"
 
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Save to Drafts"
 msgstr "Salvar em _Rascunhos"
 
-#: src/compose.c:10020
+#: src/compose.c:10085
 msgid "Save changes"
 msgstr "Salvar alterações"
 
-#: src/compose.c:10021
+#: src/compose.c:10086
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Essa mensagem foi modificada. Deseja salvar as últimas alterações?"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "_Don't save"
 msgstr "_Não salvar"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "+_Save to Drafts"
 msgstr "+Salvar em _Rascunhos"
 
-#: src/compose.c:10092
+#: src/compose.c:10157
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Deseja aplicar o modelo '%s'?"
 
-#: src/compose.c:10094
+#: src/compose.c:10159
 msgid "Apply template"
 msgstr "Aplicar o modelo"
 
-#: src/compose.c:10095
+#: src/compose.c:10160 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:772 src/prefs_template.c:309 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:10095
+#: src/compose.c:10160
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: src/compose.c:10959
+#: src/compose.c:11024
 msgid "Insert or attach?"
 msgstr "Inserir ou anexar?"
 
-#: src/compose.c:10960
+#: src/compose.c:11025
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2661,16 +2415,16 @@ msgstr ""
 "Você deseja inserir o conteúdo do(s) arquivo(s) no corpo da mensagem ou "
 "anexá-lo ao e-mail?"
 
-#: src/compose.c:10962
+#: src/compose.c:11027
 msgid "_Attach"
 msgstr "_Anexar"
 
-#: src/compose.c:11178
+#: src/compose.c:11243
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erro no formato da citação, na linha %d."
 
-#: src/compose.c:11462
+#: src/compose.c:11527
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2701,8 +2455,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Relatório de depuração"
 
-#: src/crash.c:252
-#: src/toolbar.c:420
+#: src/crash.c:252 src/toolbar.c:421
 msgid "Close"
 msgstr "Fechar"
 
@@ -2718,8 +2471,7 @@ msgstr "Criar relatório de erros"
 msgid "Save crash information"
 msgstr "Salvar as informações do problema"
 
-#: src/editaddress.c:156
-#: src/editaddress.c:232
+#: src/editaddress.c:156 src/editaddress.c:232
 msgid "Add New Person"
 msgstr "Adicionar uma nova pessoa"
 
@@ -2791,8 +2543,7 @@ msgstr "Descartar"
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/editaddress.c:707
-#: src/editaddress.c:756
+#: src/editaddress.c:707 src/editaddress.c:756
 msgid "Edit Person Data"
 msgstr "Editar os dados da pessoa"
 
@@ -2821,53 +2572,41 @@ msgstr "_Excluir a imagem"
 msgid "Photo"
 msgstr "Foto"
 
-#: src/editaddress.c:959
-#: src/editaddress.c:961
-#: src/expldifdlg.c:516
-#: src/exporthtml.c:761
-#: src/ldif.c:766
+#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:516
+#: src/exporthtml.c:761 src/ldif.c:766
 msgid "Display Name"
 msgstr "Nome exibido"
 
-#: src/editaddress.c:968
-#: src/editaddress.c:972
-#: src/ldif.c:774
+#: src/editaddress.c:961 src/editaddress.c:965 src/ldif.c:774
 msgid "Last Name"
 msgstr "Sobrenome"
 
-#: src/editaddress.c:969
-#: src/editaddress.c:971
-#: src/ldif.c:770
+#: src/editaddress.c:962 src/editaddress.c:964 src/ldif.c:770
 msgid "First Name"
 msgstr "Primeiro Nome"
 
-#: src/editaddress.c:975
-#: src/editaddress.c:977
+#: src/editaddress.c:968 src/editaddress.c:970
 msgid "Nickname"
 msgstr "Apelido"
 
-#: src/editaddress.c:1061
-#: src/editaddress.c:1129
+#: src/editaddress.c:1054 src/editaddress.c:1122
 msgid "Alias"
 msgstr "Pseudônimo"
 
-#: src/editaddress.c:1271
-#: src/editaddress.c:1340
-#: src/editaddress.c:1360
+#: src/editaddress.c:1264 src/editaddress.c:1333 src/editaddress.c:1353
 #: src/prefs_customheader.c:223
 msgid "Value"
 msgstr "Valor"
 
-#: src/editaddress.c:1427
+#: src/editaddress.c:1424
 msgid "_User Data"
 msgstr "Dados do _usuário"
 
-#: src/editaddress.c:1428
+#: src/editaddress.c:1425
 msgid "_Email Addresses"
 msgstr "Endereços de _e-mail"
 
-#: src/editaddress.c:1431
-#: src/editaddress.c:1434
+#: src/editaddress.c:1428 src/editaddress.c:1431
 msgid "O_ther Attributes"
 msgstr "Outros _atributos"
 
@@ -2879,31 +2618,21 @@ msgstr "O arquivo parece estar ok."
 msgid "File does not appear to be a valid address book format."
 msgstr "O arquivo não parece estar em um formato de Livro de Endereços válido."
 
-#: src/editbook.c:115
-#: src/editjpilot.c:191
-#: src/editvcard.c:98
+#: src/editbook.c:115 src/editjpilot.c:191 src/editvcard.c:98
 msgid "Could not read file."
 msgstr "Não foi possível ler o arquivo."
 
-#: src/editbook.c:149
-#: src/editbook.c:262
+#: src/editbook.c:149 src/editbook.c:262
 msgid "Edit Addressbook"
 msgstr "Editar o Livro de Endereço"
 
-#: src/editbook.c:177
-#: src/editjpilot.c:264
-#: src/editvcard.c:180
+#: src/editbook.c:177 src/editjpilot.c:264 src/editvcard.c:180
 msgid " Check File "
 msgstr " Verificar o arquivo "
 
-#: src/editbook.c:182
-#: src/editjpilot.c:269
-#: src/editvcard.c:185
-#: src/importmutt.c:232
-#: src/importpine.c:231
-#: src/prefs_account.c:1942
-#: src/wizard.c:1371
-#: src/wizard.c:1650
+#: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1934
+#: src/wizard.c:1183 src/wizard.c:1457
 msgid "File"
 msgstr "Arquivo"
 
@@ -2919,8 +2648,7 @@ msgstr "Você deve informar um nome para o grupo."
 msgid "Edit Group Data"
 msgstr "Editar os dados do grupo"
 
-#: src/editgroup.c:323
-#: src/exporthtml.c:597
+#: src/editgroup.c:323 src/exporthtml.c:597
 msgid "Group Name"
 msgstr "Nome do grupo"
 
@@ -2952,20 +2680,13 @@ msgstr "Editar a pasta"
 msgid "Input the new name of folder:"
 msgstr "Digite o novo nome da pasta:"
 
-#: src/editgroup.c:556
-#: src/foldersel.c:552
-#: src/imap_gtk.c:195
-#: src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:239
-#: src/plugins/rssyl/rssyl_cb_menu.c:89
+#: src/editgroup.c:556 src/foldersel.c:552 src/imap_gtk.c:195 src/mh_gtk.c:145
+#: src/plugins/mailmbox/plugin_gtk.c:239 src/plugins/rssyl/rssyl_cb_menu.c:89
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:557
-#: src/foldersel.c:553
-#: src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:240
-#: src/plugins/rssyl/rssyl_cb_menu.c:90
+#: src/editgroup.c:557 src/foldersel.c:553 src/mh_gtk.c:146
+#: src/plugins/mailmbox/plugin_gtk.c:240 src/plugins/rssyl/rssyl_cb_menu.c:90
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -2977,8 +2698,7 @@ msgstr "O arquivo não parece estar no formato JPilot."
 msgid "Select JPilot File"
 msgstr "Selecione o arquivo JPilot"
 
-#: src/editjpilot.c:236
-#: src/editjpilot.c:365
+#: src/editjpilot.c:236 src/editjpilot.c:365
 msgid "Edit JPilot Entry"
 msgstr "Editar a entrada JPilot"
 
@@ -2994,20 +2714,16 @@ msgstr "Adicionar uma nova entrada JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Editar LDAP - Selecionar a base de pesquisa"
 
-#: src/editldap_basedn.c:157
-#: src/editldap.c:441
+#: src/editldap_basedn.c:157 src/editldap.c:441
 msgid "Hostname"
 msgstr "Endereço do servidor"
 
-#: src/editldap_basedn.c:167
-#: src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:386
-#: src/ssl_manager.c:110
+#: src/editldap_basedn.c:167 src/editldap.c:458
+#: src/plugins/clamd/clamav_plugin_gtk.c:386 src/ssl_manager.c:110
 msgid "Port"
 msgstr "Porta"
 
-#: src/editldap_basedn.c:177
-#: src/editldap.c:504
+#: src/editldap_basedn.c:177 src/editldap.c:504
 msgid "Search Base"
 msgstr "Base de pesquisa"
 
@@ -3018,11 +2734,10 @@ msgstr "Base(s) de pesquisa disponíveis"
 #: src/editldap_basedn.c:288
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
-"Não foi possível ler a(s) base(s) de pesquisa do servidor - por favor, defina "
-"manualmente"
+"Não foi possível ler a(s) base(s) de pesquisa do servidor - por favor, "
+"defina manualmente"
 
-#: src/editldap_basedn.c:292
-#: src/editldap.c:281
+#: src/editldap_basedn.c:292 src/editldap.c:281
 msgid "Could not connect to server"
 msgstr "Não foi possível conectar ao servidor"
 
@@ -3042,8 +2757,7 @@ msgstr "Você deve informar ao menos um atributo de pesquisa no LDAP."
 msgid "Connected successfully to server"
 msgstr "A conexão com o servidor foi bem sucedida"
 
-#: src/editldap.c:336
-#: src/editldap.c:980
+#: src/editldap.c:336 src/editldap.c:976
 msgid "Edit LDAP Server"
 msgstr "Editar o servidor LDAP"
 
@@ -3053,9 +2767,9 @@ msgstr "O nome pelo qual você deseja chamar o servidor."
 
 #: src/editldap.c:450
 msgid ""
-"This is the hostname of the server. For example, \"ldap.mydomain.com\" may be "
-"appropriate for the \"mydomain.com\" organization. An IP address may also be "
-"used. You may specify \"localhost\" if running an LDAP server on the same "
+"This is the hostname of the server. For example, \"ldap.mydomain.com\" may "
+"be appropriate for the \"mydomain.com\" organization. An IP address may also "
+"be used. You may specify \"localhost\" if running an LDAP server on the same "
 "computer as Claws Mail."
 msgstr ""
 "Este é o endereço do servidor. Por exemplo, \"ldap.meudominio.com\" pode ser "
@@ -3067,8 +2781,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:471
-#: src/prefs_account.c:3318
+#: src/editldap.c:471 src/prefs_account.c:3310
 msgid "SSL"
 msgstr "SSL"
 
@@ -3135,8 +2848,8 @@ msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
 msgstr ""
-"Uma lista dos nomes dos atributos LDAP que devem ser pesquisados ao se tentar "
-"encontrar um nome ou endereço."
+"Uma lista dos nomes dos atributos LDAP que devem ser pesquisados ao se "
+"tentar encontrar um nome ou endereço."
 
 #: src/editldap.c:592
 msgid " Defaults "
@@ -3158,22 +2871,22 @@ msgstr "Duração máxima da consulta (seg)"
 #: src/editldap.c:617
 msgid ""
 "This defines the maximum period of time (in seconds) that an address search "
-"result is valid for address completion purposes. Search results are stored in "
-"a cache until this period of time has passed and then retired. This will "
+"result is valid for address completion purposes. Search results are stored "
+"in a cache until this period of time has passed and then retired. This will "
 "improve the response time when attempting to search for the same name or "
-"address on subsequent address completion requests. The cache will be searched "
-"in preference to performing a new server search request. The default value of "
-"600 seconds (10 minutes), should be sufficient for most servers. A larger "
-"value will reduce the search time for subsequent searches. This is useful for "
-"servers that have slow response times at the expense of more memory to cache "
-"results."
+"address on subsequent address completion requests. The cache will be "
+"searched in preference to performing a new server search request. The "
+"default value of 600 seconds (10 minutes), should be sufficient for most "
+"servers. A larger value will reduce the search time for subsequent searches. "
+"This is useful for servers that have slow response times at the expense of "
+"more memory to cache results."
 msgstr ""
 "Isso define o período máximo de tempo (em segundos) que um resultado de "
 "pesquisa de endereço tem validade para completar endereços. Resultados da "
 "pesquisa são armazenadas em um cache até que esse período de tempo tenha "
-"passado quando, então são retirados. Isso melhora o tempo de resposta durante "
-"as tentativas de pesquisar o mesmo nome ou endereço em requisições de "
-"complemento de endereço subsequentes. A busca ocorre preferencialmente no "
+"passado quando, então são retirados. Isso melhora o tempo de resposta "
+"durante as tentativas de pesquisar o mesmo nome ou endereço em requisições "
+"de complemento de endereço subsequentes. A busca ocorre preferencialmente no "
 "cache nas novas requisições de pesquisa no servidor. O valor padrão de 600 "
 "segundos (10 minutos) normalmente é suficiente na maioria dos servidores. Um "
 "valor mais alto reduz o tempo gasto em pesquisas subsequentes. Esse é um "
@@ -3198,17 +2911,18 @@ msgstr "Encontrar nomes que 'contenham' o termo da pesquisa"
 
 #: src/editldap.c:650
 msgid ""
-"Searches for names and addresses can be performed either using "
-"\"begins-with\" or \"contains\" search term. Check this option to perform a "
-"\"contains\" search; this type of search usually takes longer to complete. "
-"Note that for performance reasons, address completion uses \"begins-with\" "
-"for all searches against other address interfaces."
+"Searches for names and addresses can be performed either using \"begins-with"
+"\" or \"contains\" search term. Check this option to perform a \"contains\" "
+"search; this type of search usually takes longer to complete. Note that for "
+"performance reasons, address completion uses \"begins-with\" for all "
+"searches against other address interfaces."
 msgstr ""
 "As pesquisas de nomes e endereços podem ser realizadas com os critérios "
 "\"começar com \" ou \"contém\". Marque essa opção para efetuar uma pesquisa "
 "do tipo \"contém\"; esse tipo de pesquisa geralmente demora mais tempo. Note "
 "que, por motivos de performance, a complementação de endereço usa \"começar "
-"com\" para todas as pesquisas, ao contrário das outras interfaces de endereço."
+"com\" para todas as pesquisas, ao contrário das outras interfaces de "
+"endereço."
 
 #: src/editldap.c:703
 msgid "Bind DN"
@@ -3217,9 +2931,9 @@ msgstr "DN associado"
 #: src/editldap.c:712
 msgid ""
 "The LDAP user account name to be used to connect to the server. This is "
-"usually only used for protected servers. This name is typically formatted as: "
-"\"cn=user,dc=claws-mail,dc=org\". This is usually left empty when performing "
-"a search."
+"usually only used for protected servers. This name is typically formatted "
+"as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when "
+"performing a search."
 msgstr ""
 "A conta do usuário LDAP a ser utilizado na conexão com o servidor. Isso "
 "normalmente só é utilizado em servidores protegidos. O formato típico desse "
@@ -3230,50 +2944,47 @@ msgstr ""
 msgid "Bind Password"
 msgstr "Senha associada"
 
-#: src/editldap.c:733
+#: src/editldap.c:729
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr ""
 "A senha a ser usada quando se conectar como usuário o \"DN associado\"."
 
-#: src/editldap.c:738
+#: src/editldap.c:734
 msgid "Timeout (secs)"
 msgstr "Limite de tempo (seg)"
 
-#: src/editldap.c:752
+#: src/editldap.c:748
 msgid "The timeout period in seconds."
 msgstr "O limite de tempo em segundos."
 
-#: src/editldap.c:756
+#: src/editldap.c:752
 msgid "Maximum Entries"
 msgstr "Número máximo de entradas"
 
-#: src/editldap.c:770
+#: src/editldap.c:766
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 "O número máximo de entradas que devem ser apresentadas como resultado da "
 "pesquisa."
 
-#: src/editldap.c:785
-#: src/prefs_account.c:3209
+#: src/editldap.c:781 src/prefs_account.c:3201
 msgid "Basic"
 msgstr "Básico"
 
-#: src/editldap.c:786
+#: src/editldap.c:782
 msgid "Search"
 msgstr "Pesquisar"
 
-#: src/editldap.c:787
-#: src/gtk/quicksearch.c:661
+#: src/editldap.c:783 src/gtk/quicksearch.c:670
 msgid "Extended"
 msgstr "Extendido"
 
-#: src/editldap.c:985
+#: src/editldap.c:981
 msgid "Add New LDAP Server"
 msgstr "Adicionar um novo Servidor LDAP"
 
-#: src/edittags.c:187
-#: src/prefs_filtering_action.c:1444
+#: src/edittags.c:187 src/prefs_filtering_action.c:1446
 msgid "Tag"
 msgstr "Etiqueta"
 
@@ -3293,25 +3004,25 @@ msgstr "Excluir todas as etiquetas"
 msgid "Do you really want to delete all tags?"
 msgstr "Deseja realmente excluir todas as etiquetas?"
 
-#: src/edittags.c:422
+#: src/edittags.c:415
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr ""
 "Você digitou um nome reservado para esta etiqueta. Por favor, escolha outro."
 
-#: src/edittags.c:464
+#: src/edittags.c:457
 msgid "Tag is not set."
 msgstr "A etiqueta não foi definida."
 
-#: src/edittags.c:529
+#: src/edittags.c:522
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "Aplicar etiquetas"
 
-#: src/edittags.c:543
+#: src/edittags.c:536
 msgid "New tag:"
 msgstr "Nova etiqueta:"
 
-#: src/edittags.c:576
+#: src/edittags.c:569
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr ""
 "Por favor, selecione as etiquetas a serem aplicadas/removidas. As mudanças "
@@ -3325,8 +3036,7 @@ msgstr "O arquivo não parece estar no formato vCard."
 msgid "Select vCard File"
 msgstr "Selecionar o arquivo vCard"
 
-#: src/editvcard.c:152
-#: src/editvcard.c:256
+#: src/editvcard.c:152 src/editvcard.c:256
 msgid "Edit vCard Entry"
 msgstr "Editar a entrada vCard"
 
@@ -3334,22 +3044,21 @@ msgstr "Editar a entrada vCard"
 msgid "Add New vCard Entry"
 msgstr "Adicionar uma nova entrada vCard"
 
-#: src/etpan/imap-thread.c:585
-#: src/etpan/nntp-thread.c:439
+#: src/etpan/imap-thread.c:585 src/etpan/nntp-thread.c:439
 msgid "Impossible to set the client certificate.\n"
 msgstr "Não foi possível definir o certificado do cliente.\n"
 
 #: src/exphtmldlg.c:106
 msgid "Please specify output directory and file to create."
 msgstr ""
-"Por favor, especifique o nome do diretório de saída e do arquivo a ser criado."
+"Por favor, especifique o nome do diretório de saída e do arquivo a ser "
+"criado."
 
 #: src/exphtmldlg.c:109
 msgid "Select stylesheet and formatting."
 msgstr "Selecione a folha de estilo e a formatação."
 
-#: src/exphtmldlg.c:112
-#: src/expldifdlg.c:114
+#: src/exphtmldlg.c:112 src/expldifdlg.c:114
 msgid "File exported successfully."
 msgstr "O arquivo foi exportado com sucesso."
 
@@ -3362,8 +3071,7 @@ msgstr ""
 "O diretório de saída HTML '%s'\n"
 "não existe. Deseja criá-lo?"
 
-#: src/exphtmldlg.c:180
-#: src/expldifdlg.c:190
+#: src/exphtmldlg.c:180 src/expldifdlg.c:190
 msgid "Create Directory"
 msgstr "Criar diretório"
 
@@ -3376,8 +3084,7 @@ msgstr ""
 "Não foi possível criar o diretório de saída para o arquivo HTML:\n"
 "%s"
 
-#: src/exphtmldlg.c:191
-#: src/expldifdlg.c:201
+#: src/exphtmldlg.c:191 src/expldifdlg.c:201
 msgid "Failed to Create Directory"
 msgstr "Não foi possível criar o diretório"
 
@@ -3393,10 +3100,7 @@ msgstr "Selecione o arquivo HTML de saída"
 msgid "HTML Output File"
 msgstr "Arquivo HTML de saída"
 
-#: src/exphtmldlg.c:392
-#: src/expldifdlg.c:409
-#: src/export.c:171
-#: src/import.c:170
+#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:171 src/import.c:170
 #: src/importldif.c:684
 msgid "B_rowse"
 msgstr "Explo_rar"
@@ -3405,29 +3109,19 @@ msgstr "Explo_rar"
 msgid "Stylesheet"
 msgstr "Folha de Estilo"
 
-#: src/exphtmldlg.c:453
-#: src/gtk/colorlabel.c:406
-#: src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231
-#: src/gtk/menu.c:133
-#: src/mainwindow.c:1175
-#: src/plugins/archive/archiver_prefs.c:241
-#: src/prefs_account.c:946
-#: src/prefs_toolbar.c:775
-#: src/prefs_toolbar.c:1456
-#: src/summaryview.c:6010
+#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1173
+#: src/plugins/archive/archiver_prefs.c:241 src/prefs_account.c:946
+#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1465 src/summaryview.c:6006
 msgid "None"
 msgstr "Nenhum"
 
-#: src/exphtmldlg.c:454
-#: src/prefs_folder_item.c:514
-#: src/prefs_other.c:116
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:514 src/prefs_other.c:116
 #: src/prefs_other.c:408
 msgid "Default"
 msgstr "Padrão"
 
-#: src/exphtmldlg.c:455
-#: src/plugins/pgpcore/select-keys.c:248
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
 #: src/plugins/pgpcore/sgpgme.c:148
 msgid "Full"
 msgstr "Completo"
@@ -3472,15 +3166,11 @@ msgstr "Formatar os links do e-mail"
 msgid "Format User Attributes"
 msgstr "Formatar os atributos do usuário"
 
-#: src/exphtmldlg.c:539
-#: src/expldifdlg.c:612
-#: src/importldif.c:891
+#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:891
 msgid "Address Book :"
 msgstr "Livro de endereços:"
 
-#: src/exphtmldlg.c:549
-#: src/expldifdlg.c:622
-#: src/importldif.c:901
+#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:901
 msgid "File Name :"
 msgstr "Nome do arquivo:"
 
@@ -3492,9 +3182,7 @@ msgstr "Abrir com o navegador Web"
 msgid "Export Address Book to HTML File"
 msgstr "Exportar o Livro de Endereços para um arquivo HTML"
 
-#: src/exphtmldlg.c:656
-#: src/expldifdlg.c:720
-#: src/importldif.c:1020
+#: src/exphtmldlg.c:656 src/expldifdlg.c:720 src/importldif.c:1020
 msgid "File Info"
 msgstr "Informações do arquivo"
 
@@ -3582,8 +3270,8 @@ msgid ""
 "formatted similar to:\n"
 "  mail=john.doe at domain.com,ou=people,dc=claws-mail,dc=org"
 msgstr ""
-"O primeiro endereço de e-mail pertencente a uma pessoa  é usado para criar um "
-"DN que tem um formato similar a:\n"
+"O primeiro endereço de e-mail pertencente a uma pessoa  é usado para criar "
+"um DN que tem um formato similar a:\n"
 "  mail=fulano.tal at dominio.com,ou=pessoas,dc=claws-mail,dc=org"
 
 #: src/expldifdlg.c:489
@@ -3621,11 +3309,11 @@ msgid ""
 "available RDN options that will be used to create the DN."
 msgstr ""
 "O arquivo LDIF contém vários registros que são geralmente carregados em um "
-"servidor LDAP. Cada registro no arquivo LDIF é identificado com exclusividade "
-"por um \"Nome DIstinto\" (Distinguished Name ou DN). O sufixo é adicionado ao "
-"\"Nome Distinto Relativo\" (Relative Distinguished Name ou RDN) para criar o "
-"DN. Por favor, selecione uma das opções de RDN disponíveis que serão "
-"utilizadas para criar o DN."
+"servidor LDAP. Cada registro no arquivo LDIF é identificado com "
+"exclusividade por um \"Nome DIstinto\" (Distinguished Name ou DN). O sufixo "
+"é adicionado ao \"Nome Distinto Relativo\" (Relative Distinguished Name ou "
+"RDN) para criar o DN. Por favor, selecione uma das opções de RDN disponíveis "
+"que serão utilizadas para criar o DN."
 
 #: src/expldifdlg.c:543
 msgid "Use DN attribute if present in data"
@@ -3641,8 +3329,8 @@ msgstr ""
 "O Livro de Endereços pode conter entradas importadas previamente de um "
 "arquivo LDIF. Caso o atributo de usuário \"Nome Distinto\" (DN) esteja "
 "presente nos dados do Livro de Endereços, ele pode ser usado no arquivo LDIF "
-"exportado. O RDN selecionado acima será usado se o atributo de usuário DN não "
-"for encontrado."
+"exportado. O RDN selecionado acima será usado se o atributo de usuário DN "
+"não for encontrado."
 
 #: src/expldifdlg.c:558
 msgid "Exclude record if no Email Address"
@@ -3650,8 +3338,8 @@ msgstr "Excluir os registros que não possuam endereço de e-mail"
 
 #: src/expldifdlg.c:563
 msgid ""
-"An addressbook may contain entries without Email Addresses. Check this option "
-"to ignore these records."
+"An addressbook may contain entries without Email Addresses. Check this "
+"option to ignore these records."
 msgstr ""
 "Um Livro de Endereços pode conter entradas sem um endereço de e-mail. Marque "
 "essa opção para ignorar estes registros."
@@ -3664,8 +3352,7 @@ msgstr "Exportar o Livro de Endereços para um arquivo LDIF"
 msgid "Distinguished Name"
 msgstr "Nome Distinto (dn)"
 
-#: src/export.c:113
-#: src/summaryview.c:8154
+#: src/export.c:113 src/summaryview.c:8143
 msgid "Export to mbox file"
 msgstr "Exporta para arquivo mbox"
 
@@ -3677,8 +3364,7 @@ msgstr "Localize a pasta a ser exportada e especifique o arquivo mbox."
 msgid "Source folder:"
 msgstr "Pasta de origem:"
 
-#: src/export.c:148
-#: src/import.c:142
+#: src/export.c:148 src/import.c:142
 msgid "Mbox file:"
 msgstr "Arquivo mbox:"
 
@@ -3702,8 +3388,7 @@ msgstr "Selecione arquivo de exportação"
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: src/exporthtml.c:771
-#: src/importldif.c:1021
+#: src/exporthtml.c:771 src/importldif.c:1021
 #: src/plugins/archive/archiver_gtk.c:736
 msgid "Attributes"
 msgstr "Atributos"
@@ -3712,81 +3397,88 @@ msgstr "Atributos"
 msgid "Claws Mail Address Book"
 msgstr "Livro de Endereços do Claws Mail"
 
-#: src/exporthtml.c:1088
-#: src/exportldif.c:623
+#: src/exporthtml.c:1088 src/exportldif.c:623
 msgid "Name already exists but is not a directory."
 msgstr "O nome já existe, mas não é um diretório."
 
-#: src/exporthtml.c:1091
-#: src/exportldif.c:626
+#: src/exporthtml.c:1091 src/exportldif.c:626
 msgid "No permissions to create directory."
 msgstr "Sem permissão para criar diretório."
 
-#: src/exporthtml.c:1094
-#: src/exportldif.c:629
+#: src/exporthtml.c:1094 src/exportldif.c:629
 msgid "Name is too long."
 msgstr "O nome é muito longo."
 
-#: src/exporthtml.c:1097
-#: src/exportldif.c:632
+#: src/exporthtml.c:1097 src/exportldif.c:632
 msgid "Not specified."
 msgstr "Não especificado."
 
-#: src/folder.c:1571
-#: src/foldersel.c:374
-#: src/prefs_folder_item.c:308
+#: src/file_checker.c:76
+#, c-format
+msgid "The file %s is missing! Do you want to use the backup file from %s?"
+msgstr ""
+"O arquivo %s não foi encontrado. Deseja usar o arquivo de backup de %s?"
+
+#: src/file_checker.c:84 src/file_checker.c:106
+#, c-format
+msgid "Could not copy %s to %s"
+msgstr "Não foi possível copiar %s para %s"
+
+#: src/file_checker.c:98
+#, c-format
+msgid ""
+"The file %s is empty or corrupted! Do you want to use the backup file from "
+"%s?"
+msgstr ""
+"O arquivo %s está vazio ou foi corrompido. Deseja usar o arquivo de backup de "
+"%s?"
+
+#: src/folder.c:1577 src/foldersel.c:374 src/prefs_folder_item.c:308
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: src/folder.c:1575
-#: src/foldersel.c:378
+#: src/folder.c:1581 src/foldersel.c:378
 msgid "Sent"
 msgstr "Enviadas"
 
-#: src/folder.c:1579
-#: src/foldersel.c:382
-#: src/plugins/attachwarner/attachwarner.c:219
-#: src/prefs_folder_item.c:311
+#: src/folder.c:1585 src/foldersel.c:382
+#: src/plugins/attachwarner/attachwarner.c:219 src/prefs_folder_item.c:311
 msgid "Queue"
 msgstr "Fila de Saída"
 
-#: src/folder.c:1583
-#: src/foldersel.c:386
-#: src/prefs_folder_item.c:312
+#: src/folder.c:1589 src/foldersel.c:386 src/prefs_folder_item.c:312
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/folder.c:1587
-#: src/foldersel.c:390
-#: src/prefs_folder_item.c:310
+#: src/folder.c:1593 src/foldersel.c:390 src/prefs_folder_item.c:310
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: src/folder.c:2017
+#: src/folder.c:2023
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Processando (%s)...\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copiando %s para %s...\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Movendo %s para %s...\n"
 
-#: src/folder.c:3563
+#: src/folder.c:3569
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Atualizando o cache para %s ..."
 
-#: src/folder.c:4435
+#: src/folder.c:4443
 msgid "Processing messages..."
 msgstr "Processando as mensagens..."
 
-#: src/folder.c:4571
+#: src/folder.c:4579
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Sincronizando %s para uso desconectado...\n"
@@ -3795,51 +3487,32 @@ msgstr "Sincronizando %s para uso desconectado...\n"
 msgid "Select folder"
 msgstr "Selecione a pasta"
 
-#: src/foldersel.c:554
-#: src/imap_gtk.c:199
-#: src/mh_gtk.c:147
-#: src/plugins/mailmbox/plugin_gtk.c:241
-#: src/plugins/rssyl/rssyl_cb_menu.c:91
+#: src/foldersel.c:554 src/imap_gtk.c:199 src/mh_gtk.c:147
+#: src/plugins/mailmbox/plugin_gtk.c:241 src/plugins/rssyl/rssyl_cb_menu.c:91
 msgid "NewFolder"
 msgstr "NovaPasta"
 
-#: src/foldersel.c:562
-#: src/imap_gtk.c:210
-#: src/imap_gtk.c:216
-#: src/imap_gtk.c:272
-#: src/imap_gtk.c:277
-#: src/mh_gtk.c:155
-#: src/mh_gtk.c:259
-#: src/news_gtk.c:314
-#: src/plugins/mailmbox/plugin_gtk.c:249
-#: src/plugins/mailmbox/plugin_gtk.c:419
-#: src/plugins/rssyl/rssyl_cb_menu.c:97
+#: src/foldersel.c:562 src/imap_gtk.c:210 src/imap_gtk.c:216
+#: src/imap_gtk.c:272 src/imap_gtk.c:277 src/mh_gtk.c:155 src/mh_gtk.c:259
+#: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:249
+#: src/plugins/mailmbox/plugin_gtk.c:416 src/plugins/rssyl/rssyl_cb_menu.c:97
 #: src/plugins/rssyl/rssyl_cb_menu.c:341
-#: src/plugins/vcalendar/vcal_folder.c:2028
+#: src/plugins/vcalendar/vcal_folder.c:2026
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' não pode ser incluído no nome da pasta."
 
-#: src/foldersel.c:572
-#: src/imap_gtk.c:226
-#: src/imap_gtk.c:284
-#: src/mh_gtk.c:165
-#: src/mh_gtk.c:266
-#: src/news_gtk.c:321
-#: src/plugins/mailmbox/plugin_gtk.c:261
-#: src/plugins/mailmbox/plugin_gtk.c:428
-#: src/plugins/rssyl/rssyl_cb_menu.c:107
+#: src/foldersel.c:572 src/imap_gtk.c:226 src/imap_gtk.c:284 src/mh_gtk.c:165
+#: src/mh_gtk.c:266 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:261
+#: src/plugins/mailmbox/plugin_gtk.c:425 src/plugins/rssyl/rssyl_cb_menu.c:107
 #: src/plugins/rssyl/rssyl_cb_menu.c:348
-#: src/plugins/vcalendar/vcal_folder.c:2035
+#: src/plugins/vcalendar/vcal_folder.c:2033
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "A pasta '%s' já existe."
 
-#: src/foldersel.c:579
-#: src/imap_gtk.c:232
-#: src/mh_gtk.c:171
-#: src/plugins/mailmbox/plugin_gtk.c:268
-#: src/plugins/rssyl/rssyl_cb_menu.c:113
+#: src/foldersel.c:579 src/imap_gtk.c:232 src/mh_gtk.c:171
+#: src/plugins/mailmbox/plugin_gtk.c:268 src/plugins/rssyl/rssyl_cb_menu.c:113
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Não foi possível criar a pasta '%s'."
@@ -3852,8 +3525,7 @@ msgstr "Marcar _todas como lidas"
 msgid "R_un processing rules"
 msgstr "E_xecutar regras de processamento"
 
-#: src/folderview.c:233
-#: src/mainwindow.c:544
+#: src/folderview.c:233 src/mainwindow.c:544
 msgid "_Search folder..."
 msgstr "_Pesquisar na pasta..."
 
@@ -3869,160 +3541,130 @@ msgstr "Esvaziar _Lixeira..."
 msgid "Send _queue..."
 msgstr "Enviar mensagens da _fila..."
 
-#: src/folderview.c:380
-#: src/folderview.c:427
+#: src/folderview.c:380 src/folderview.c:427
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79
-#: src/prefs_matcher.c:388
-#: src/summaryview.c:6286
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:388 src/summaryview.c:6282
 msgid "New"
 msgstr "Nova"
 
-#: src/folderview.c:381
-#: src/folderview.c:428
+#: src/folderview.c:381 src/folderview.c:428
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80
-#: src/prefs_matcher.c:387
-#: src/summaryview.c:6288
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:387 src/summaryview.c:6284
 msgid "Unread"
 msgstr "Não lida"
 
-#: src/folderview.c:382
-#: src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:382 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:81
 msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:430
-#: src/summaryview.c:448
+#: src/folderview.c:430 src/summaryview.c:448
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:734
+#: src/folderview.c:727
 msgid "Setting folder info..."
 msgstr "Configurando as informações da pasta..."
 
-#: src/folderview.c:797
-#: src/summaryview.c:4113
-#: src/summaryview.c:4115
+#: src/folderview.c:790 src/summaryview.c:4109 src/summaryview.c:4111
 msgid "Mark all as read"
 msgstr "Marcar todas como lidas"
 
-#: src/folderview.c:798
-#: src/summaryview.c:4114
+#: src/folderview.c:791 src/summaryview.c:4110
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Deseja realmente marcar todas as mensagens dessa pasta como lidas?"
 
-#: src/folderview.c:1021
-#: src/imap.c:4490
-#: src/mainwindow.c:5308
-#: src/setup.c:91
+#: src/folderview.c:1014 src/imap.c:4497 src/mainwindow.c:5128 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Vasculhando a pasta %s%c%s..."
 
-#: src/folderview.c:1025
-#: src/imap.c:4495
-#: src/mainwindow.c:5313
-#: src/setup.c:96
+#: src/folderview.c:1018 src/imap.c:4502 src/mainwindow.c:5133 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Vasculhando a pasta %s..."
 
-#: src/folderview.c:1056
+#: src/folderview.c:1049
 msgid "Rebuild folder tree"
 msgstr "Reconstruir a árvore de pastas"
 
-#: src/folderview.c:1057
+#: src/folderview.c:1050
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "A reconstrução da árvore de pastas irá remover os caches locais. Deseja "
 "continuar?"
 
-#: src/folderview.c:1067
+#: src/folderview.c:1060
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruindo a árvore de pastas..."
 
-#: src/folderview.c:1069
-#: src/folderview.c:1110
+#: src/folderview.c:1062 src/folderview.c:1103
 msgid "Scanning folder tree..."
 msgstr "Vasculhando a árvore de pastas..."
 
-#: src/folderview.c:1201
+#: src/folderview.c:1194
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Não foi possível vasculhar a pasta %s\n"
 
-#: src/folderview.c:1255
+#: src/folderview.c:1248
 msgid "Checking for new messages in all folders..."
 msgstr "Verificando se há novas mensagens em todas as pastas..."
 
-#: src/folderview.c:2083
+#: src/folderview.c:2076
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Fechando a pasta %s..."
 
-#: src/folderview.c:2178
+#: src/folderview.c:2171
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Abrindo a pasta %s..."
 
-#: src/folderview.c:2196
+#: src/folderview.c:2189
 msgid "Folder could not be opened."
 msgstr "Não foi possível abrir a pasta."
 
-#: src/folderview.c:2337
-#: src/mainwindow.c:3059
-#: src/mainwindow.c:3063
+#: src/folderview.c:2330 src/mainwindow.c:2877 src/mainwindow.c:2881
 msgid "Empty trash"
 msgstr "Esvaziar Lixeira"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2331
 msgid "Delete all messages in trash?"
 msgstr "Excluir todas as mensagens da Lixeira?"
 
-#: src/folderview.c:2339
+#: src/folderview.c:2332
 msgid "+_Empty trash"
 msgstr "+_Esvaziar Lixeira"
 
-#: src/folderview.c:2383
-#: src/inc.c:1620
-#: src/toolbar.c:2689
+#: src/folderview.c:2376 src/inc.c:1528 src/toolbar.c:2678
 msgid "Offline warning"
 msgstr "Aviso de modo desconectado"
 
-#: src/folderview.c:2384
-#: src/toolbar.c:2690
+#: src/folderview.c:2377 src/toolbar.c:2679
 msgid "You're working offline. Override?"
 msgstr "Você está trabalhando em modo desconectado. Redefinir?"
 
-#: src/folderview.c:2395
-#: src/toolbar.c:2709
+#: src/folderview.c:2388 src/toolbar.c:2698
 msgid "Send queued messages"
 msgstr "Enviar mensagens da Fila de Saída"
 
-#: src/folderview.c:2396
-#: src/toolbar.c:2710
+#: src/folderview.c:2389 src/toolbar.c:2699
 msgid "Send all queued messages?"
 msgstr "Enviar todas as mensagens da Fila de Saída?"
 
-#: src/folderview.c:2397
-#: src/messageview.c:875
-#: src/messageview.c:892
-#: src/toolbar.c:2711
+#: src/folderview.c:2390 src/messageview.c:853 src/messageview.c:870
+#: src/toolbar.c:2700
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/folderview.c:2405
-#: src/toolbar.c:2729
+#: src/folderview.c:2398 src/toolbar.c:2718
 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocorreram erros durante o envio das mensagens da Fila de Saída."
 
-#: src/folderview.c:2408
-#: src/main.c:2862
-#: src/toolbar.c:2732
+#: src/folderview.c:2401 src/main.c:2689 src/toolbar.c:2721
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4031,66 +3673,64 @@ msgstr ""
 "Ocorreram erros durante o envio de mensagens da Fila de Saída:\n"
 "%s"
 
-#: src/folderview.c:2485
+#: src/folderview.c:2478
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Deseja realmente copiar a pasta '%s' para '%s'?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2479
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Deseja realmente tornar a pasta '%s' uma sub-pasta de '%s'?"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Copy folder"
 msgstr "Copiar a pasta"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Move folder"
 msgstr "Mover a pasta"
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s para %s..."
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Movendo %s para %s..."
 
-#: src/folderview.c:2530
+#: src/folderview.c:2523
 msgid "Source and destination are the same."
 msgstr "A pasta de origem e a de destino são a mesma."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2526
 msgid "Can't copy a folder to one of its children."
 msgstr "Não é possível copiar a pasta para dentro dela mesma."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2527
 msgid "Can't move a folder to one of its children."
 msgstr "Não é possível mover a pasta para dentro dela mesma."
 
-#: src/folderview.c:2537
+#: src/folderview.c:2530
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Não é possivel mover pastas entre caixas postais diferentes."
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Copy failed!"
 msgstr "Não foi possível copiar!"
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Move failed!"
 msgstr "Não foi possível mover!"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2584
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuração de processamento da pasta %s"
 
-#: src/folderview.c:3018
-#: src/summaryview.c:4554
-#: src/summaryview.c:4653
+#: src/folderview.c:3011 src/summaryview.c:4550 src/summaryview.c:4649
 msgid "The destination folder can only be used to store subfolders."
 msgstr "A pasta de destino só pode ser usada para armazenar sub-pastas."
 
@@ -4130,8 +3770,7 @@ msgstr "moderado"
 msgid "readonly"
 msgstr "somente leitura"
 
-#: src/grouplistdialog.c:351
-#: src/plugins/att_remover/att_remover.c:297
+#: src/grouplistdialog.c:351 src/plugins/att_remover/att_remover.c:297
 #: src/plugins/vcalendar/vcal_manager.c:113
 #: src/plugins/vcalendar/vcal_manager.c:146
 msgid "unknown"
@@ -4141,8 +3780,7 @@ msgstr "desconhecido"
 msgid "Can't retrieve newsgroup list."
 msgstr "Não foi possível obter a lista do newsgroup."
 
-#: src/grouplistdialog.c:459
-#: src/summaryview.c:1579
+#: src/grouplistdialog.c:459 src/summaryview.c:1579
 msgid "Done."
 msgstr "Pronto."
 
@@ -4241,9 +3879,7 @@ msgstr ""
 "Locale: %s (codificação dos caracteres: %s)\n"
 "Sistema operacional: desconhecido"
 
-#: src/gtk/about.c:243
-#: src/prefs_themes.c:728
-#: src/wizard.c:545
+#: src/gtk/about.c:243 src/prefs_themes.c:728 src/wizard.c:523
 msgid "The Claws Mail Team"
 msgstr "A equipe do Claws Mail"
 
@@ -4329,29 +3965,30 @@ msgstr "adiciona suporte a detecção de mudanças na conexão de rede\n"
 
 #: src/gtk/about.c:544
 msgid ""
-"This program is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 3, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 3, or (at your option) any later "
+"version.\n"
 "\n"
 msgstr ""
 "Este programa é um software livre; você pode redistribuí-lo e/ou modificá-lo "
-"de acordo com os termos da GNU General Public License tal como publicada pela "
-"Free Software Foundation; tanto a versão 3, ou (opcionalmente) qualquer "
+"de acordo com os termos da GNU General Public License tal como publicada "
+"pela Free Software Foundation; tanto a versão 3, ou (opcionalmente) qualquer "
 "versão posterior.\n"
 "\n"
 
 #: src/gtk/about.c:550
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more "
-"details.\n"
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
 msgstr ""
-"Este programa é distribuido com a esperança de que seja útil, mas SEM NENHUMA "
-"GARANTIA; nem mesmo a garantia implícita de COMERCIALIDADE ou ADEQUAÇÃO PARA "
-"ALGUM PROPÓSITO PARTICULAR. Veja a GNU General Public License para maiores "
-"detalhes.\n"
+"Este programa é distribuido com a esperança de que seja útil, mas SEM "
+"NENHUMA GARANTIA; nem mesmo a garantia implícita de COMERCIALIDADE ou "
+"ADEQUAÇÃO PARA ALGUM PROPÓSITO PARTICULAR. Veja a GNU General Public License "
+"para maiores detalhes.\n"
 "\n"
 
 #: src/gtk/about.c:568
@@ -4359,8 +3996,8 @@ msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see <"
 msgstr ""
-"Você deve ter recebido uma cópia da GNU General Public License juntamente com "
-"este programa. Caso contrário, veja <"
+"Você deve ter recebido uma cópia da GNU General Public License juntamente "
+"com este programa. Caso contrário, veja <"
 
 #: src/gtk/about.c:573
 msgid ""
@@ -4370,55 +4007,44 @@ msgstr ""
 ">. \n"
 "\n"
 
-#: src/gtk/about.c:699
-#: src/main.c:2689
+#: src/gtk/about.c:699 src/main.c:2516
 msgid "Session statistics\n"
 msgstr "Estatísticas da sessão\n"
 
-#: src/gtk/about.c:709
-#: src/gtk/about.c:712
-#: src/main.c:2699
-#: src/main.c:2702
+#: src/gtk/about.c:709 src/gtk/about.c:712 src/main.c:2526 src/main.c:2529
 #, c-format
 msgid "Started: %s\n"
 msgstr "Início: %s\n"
 
-#: src/gtk/about.c:719
-#: src/main.c:2708
+#: src/gtk/about.c:719 src/main.c:2535
 msgid "Incoming traffic\n"
 msgstr "Tráfego de entrada\n"
 
-#: src/gtk/about.c:722
-#: src/main.c:2711
+#: src/gtk/about.c:722 src/main.c:2538
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Mensagens recebidas: %d\n"
 
-#: src/gtk/about.c:729
-#: src/main.c:2717
+#: src/gtk/about.c:729 src/main.c:2544
 msgid "Outgoing traffic\n"
 msgstr "Tráfego de saída\n"
 
-#: src/gtk/about.c:732
-#: src/main.c:2720
+#: src/gtk/about.c:732 src/main.c:2547
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Mensagens novas/redirecionadas: %d\n"
 
-#: src/gtk/about.c:737
-#: src/main.c:2724
+#: src/gtk/about.c:737 src/main.c:2551
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Mensagens respondidas: %d\n"
 
-#: src/gtk/about.c:742
-#: src/main.c:2728
+#: src/gtk/about.c:742 src/main.c:2555
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Mensagens encaminhadas: %d\n"
 
-#: src/gtk/about.c:747
-#: src/main.c:2732
+#: src/gtk/about.c:747 src/main.c:2559
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total de mensagens enviadas: %d\n"
@@ -4461,78 +4087,63 @@ msgstr "_Notas do lançamento"
 msgid "_Statistics"
 msgstr "_Estatísticas"
 
-#: src/gtk/colorlabel.c:38
-#: src/prefs_common.c:368
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:358
 msgid "Orange"
 msgstr "Laranja"
 
-#: src/gtk/colorlabel.c:39
-#: src/prefs_common.c:372
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:362
 msgid "Red"
 msgstr "Vermelho"
 
-#: src/gtk/colorlabel.c:40
-#: src/prefs_common.c:376
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:366
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/gtk/colorlabel.c:41
-#: src/prefs_common.c:380
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:370
 msgid "Sky blue"
 msgstr "Azul celeste"
 
-#: src/gtk/colorlabel.c:42
-#: src/prefs_common.c:384
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:374
 msgid "Blue"
 msgstr "Azul"
 
-#: src/gtk/colorlabel.c:43
-#: src/prefs_common.c:388
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:378
 msgid "Green"
 msgstr "Verde"
 
-#: src/gtk/colorlabel.c:44
-#: src/prefs_common.c:392
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:382
 msgid "Brown"
 msgstr "Marrom"
 
-#: src/gtk/colorlabel.c:45
-#: src/prefs_common.c:396
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:386
 msgid "Grey"
 msgstr "Cinza"
 
-#: src/gtk/colorlabel.c:46
-#: src/prefs_common.c:400
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:390
 msgid "Light brown"
 msgstr "Marrom claro"
 
-#: src/gtk/colorlabel.c:47
-#: src/prefs_common.c:404
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:394
 msgid "Dark red"
 msgstr "Vermelho escuro"
 
-#: src/gtk/colorlabel.c:48
-#: src/prefs_common.c:408
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:398
 msgid "Dark pink"
 msgstr "Rosa escuro"
 
-#: src/gtk/colorlabel.c:49
-#: src/prefs_common.c:412
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:402
 msgid "Steel blue"
 msgstr "Azul metálico"
 
-#: src/gtk/colorlabel.c:50
-#: src/prefs_common.c:416
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:406
 msgid "Gold"
 msgstr "Dourado"
 
-#: src/gtk/colorlabel.c:51
-#: src/prefs_common.c:420
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:410
 msgid "Bright green"
 msgstr "Verde brilhante"
 
-#: src/gtk/colorlabel.c:52
-#: src/prefs_common.c:424
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:414
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -4543,20 +4154,18 @@ msgstr "Configure a ordem da caixa postal"
 #: src/gtk/foldersort.c:190
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
-"Mova as caixas postais para cima ou para baixo para mudar a ordem na lista de "
-"pastas."
+"Mova as caixas postais para cima ou para baixo para mudar a ordem na lista "
+"de pastas."
 
 #: src/gtk/foldersort.c:216
 msgid "Mailboxes"
 msgstr "Caixas postais"
 
-#: src/gtk/gtkaspell.c:341
-#: src/gtk/gtkaspell.c:660
+#: src/gtk/gtkaspell.c:341 src/gtk/gtkaspell.c:660
 msgid "No dictionary selected."
 msgstr "Nenhum dicionário selecionado."
 
-#: src/gtk/gtkaspell.c:365
-#: src/gtk/gtkaspell.c:395
+#: src/gtk/gtkaspell.c:365 src/gtk/gtkaspell.c:395
 #, c-format
 msgid "Couldn't initialize %s speller."
 msgstr "Não foi possível iniciar o verificador %s."
@@ -4595,8 +4204,7 @@ msgstr ""
 msgid "Change to..."
 msgstr "Mudar para..."
 
-#: src/gtk/gtkaspell.c:1811
-#: src/gtk/gtkaspell.c:1949
+#: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
 msgid "More..."
 msgstr "Mais..."
 
@@ -4640,8 +4248,7 @@ msgstr "Utilizar alternativo (%s)"
 msgid "Use both dictionaries"
 msgstr "Usar ambos os dicionários"
 
-#: src/gtk/gtkaspell.c:2054
-#: src/prefs_spelling.c:144
+#: src/gtk/gtkaspell.c:2054 src/prefs_spelling.c:144
 msgid "Check while typing"
 msgstr "Verificar durante a digitação"
 
@@ -4663,11 +4270,8 @@ msgstr ""
 "O verificador ortográfico não conseguiu trocar o dicionário alternativo.\n"
 "%s"
 
-#: src/gtk/headers.h:8
-#: src/prefs_filtering_action.c:1257
-#: src/prefs_matcher.c:2152
-#: src/prefs_summary_column.c:84
-#: src/quote_fmt.c:49
+#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1259
+#: src/prefs_matcher.c:2158 src/prefs_summary_column.c:84 src/quote_fmt.c:49
 #: src/summaryview.c:446
 msgid "Date"
 msgstr "Data"
@@ -4676,17 +4280,13 @@ msgstr "Data"
 msgid "Date:"
 msgstr "Data:"
 
-#: src/gtk/headers.h:9
-#: src/prefs_filtering_action.c:1254
-#: src/prefs_matcher.c:2149
-#: src/prefs_summary_column.c:82
-#: src/quote_fmt.c:50
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1256
+#: src/prefs_matcher.c:2155 src/prefs_summary_column.c:82 src/quote_fmt.c:50
 #: src/summaryview.c:444
 msgid "From"
 msgstr "De"
 
-#: src/gtk/headers.h:9
-#: src/summary_search.c:412
+#: src/gtk/headers.h:9 src/summary_search.c:438
 msgid "From:"
 msgstr "De:"
 
@@ -4702,19 +4302,14 @@ msgstr "Remetente:"
 msgid "Reply-To"
 msgstr "Responder para"
 
-#: src/gtk/headers.h:12
-#: src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2150
-#: src/prefs_summary_column.c:83
-#: src/quote_fmt.c:57
+#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1257
+#: src/prefs_matcher.c:2156 src/prefs_summary_column.c:83 src/quote_fmt.c:57
 #: src/summaryview.c:445
 msgid "To"
 msgstr "Para"
 
-#: src/gtk/headers.h:13
-#: src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2151
-#: src/quote_fmt.c:58
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1258
+#: src/prefs_matcher.c:2157 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
@@ -4722,10 +4317,8 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Cco"
 
-#: src/gtk/headers.h:15
-#: src/prefs_filtering_action.c:1258
-#: src/prefs_matcher.c:2153
-#: src/quote_fmt.c:61
+#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1260
+#: src/prefs_matcher.c:2159 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "ID da Mensagem"
 
@@ -4737,10 +4330,8 @@ msgstr "ID da Mensagem:"
 msgid "In-Reply-To"
 msgstr "Respondendo a"
 
-#: src/gtk/headers.h:17
-#: src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2155
-#: src/quote_fmt.c:60
+#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1262
+#: src/prefs_matcher.c:2161 src/quote_fmt.c:60
 msgid "References"
 msgstr "Referências"
 
@@ -4748,11 +4339,8 @@ msgstr "Referências"
 msgid "References:"
 msgstr "Referências:"
 
-#: src/gtk/headers.h:18
-#: src/prefs_filtering_action.c:1253
-#: src/prefs_matcher.c:2148
-#: src/prefs_summary_column.c:81
-#: src/quote_fmt.c:56
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1255
+#: src/prefs_matcher.c:2154 src/prefs_summary_column.c:81 src/quote_fmt.c:56
 #: src/summaryview.c:443
 msgid "Subject"
 msgstr "Assunto"
@@ -4769,8 +4357,7 @@ msgstr "Comentários:"
 msgid "Keywords"
 msgstr "Palavras-chave"
 
-#: src/gtk/headers.h:20
-#: src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/gtk/headers.h:20 src/plugins/pdf_viewer/poppler_viewer.c:706
 msgid "Keywords:"
 msgstr "Palavras-chave:"
 
@@ -4846,10 +4433,8 @@ msgstr "Recebido"
 msgid "Received:"
 msgstr "Recebido:"
 
-#: src/gtk/headers.h:32
-#: src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2154
-#: src/quote_fmt.c:59
+#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1261
+#: src/prefs_matcher.c:2160 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
@@ -4873,16 +4458,13 @@ msgstr "Visualizado"
 msgid "Seen:"
 msgstr "Visualizado:"
 
-#: src/gtk/headers.h:36
-#: src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164
-#: src/prefs_summary_column.c:79
+#: src/gtk/headers.h:36 src/gtk/progressdialog.c:149
+#: src/gtk/sslcertwindow.c:164 src/prefs_summary_column.c:79
 #: src/summaryview.c:2786
 msgid "Status"
 msgstr "Status"
 
-#: src/gtk/headers.h:36
-#: src/prefs_themes.c:904
+#: src/gtk/headers.h:36 src/prefs_themes.c:904
 msgid "Status:"
 msgstr "Status:"
 
@@ -4922,8 +4504,7 @@ msgstr "Cliente de e-mail do remetente:"
 msgid "Content-Type"
 msgstr "Formato do conteúdo"
 
-#: src/gtk/headers.h:41
-#: src/image_viewer.c:327
+#: src/gtk/headers.h:41 src/image_viewer.c:327
 msgid "Content-Type:"
 msgstr "Formato do conteúdo:"
 
@@ -4951,8 +4532,7 @@ msgstr "Precedência"
 msgid "Precedence:"
 msgstr "Precedência:"
 
-#: src/gtk/headers.h:45
-#: src/prefs_account.c:1067
+#: src/gtk/headers.h:45 src/prefs_account.c:1067
 msgid "Organization"
 msgstr "Organização"
 
@@ -5176,45 +4756,39 @@ msgstr ""
 "<span weight=\"bold\">Os seguintes ícones são usados para mostrar o status "
 "das mensagens e pastas:</span>"
 
-#: src/gtk/inputdialog.c:246
-#: src/gtk/inputdialog.c:268
+#: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Digite a senha para %s em %s:"
 
-#: src/gtk/inputdialog.c:249
-#: src/gtk/inputdialog.c:252
-#: src/gtk/inputdialog.c:271
-#: src/gtk/inputdialog.c:274
+#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
+#: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
 #, c-format
 msgid "Input password for %s:"
 msgstr "Digite a senha para %s:"
 
-#: src/gtk/inputdialog.c:255
-#: src/gtk/inputdialog.c:277
+#: src/gtk/inputdialog.c:242 src/gtk/inputdialog.c:264
 msgid "Input password:"
 msgstr "Digite a senha:"
 
-#: src/gtk/inputdialog.c:256
-#: src/gtk/inputdialog.c:284
-#: src/gtk/inputdialog.c:296
+#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
+#: src/gtk/inputdialog.c:283
 msgid "Input password"
 msgstr "Digite a senha"
 
-#: src/gtk/inputdialog.c:286
+#: src/gtk/inputdialog.c:273
 msgid "Remember password for this session"
 msgstr "Lembrar a senha para essa sessão"
 
-#: src/gtk/inputdialog.c:385
-#: src/gtk/inputdialog.c:434
+#: src/gtk/inputdialog.c:372 src/gtk/inputdialog.c:421
 msgid "Remember this"
 msgstr "Lembrar disso"
 
-#: src/gtk/logwindow.c:451
+#: src/gtk/logwindow.c:447
 msgid "Clear _Log"
 msgstr "Limpar _relatório"
 
-#: src/gtk/menu.c:145
+#: src/gtk/menu.c:137
 msgid ""
 "<span><b>Warning:</b> This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -5224,8 +4798,7 @@ msgstr ""
 "exibida e foi truncada por segurança. Esta mensagem pode estar\n"
 "corrompida, malformatada ou ser parte de uma tentativa de DoS.</span>"
 
-#: src/gtk/pluginwindow.c:164
-#: src/gtk/pluginwindow.c:169
+#: src/gtk/pluginwindow.c:164 src/gtk/pluginwindow.c:169
 msgid ""
 "\n"
 "\n"
@@ -5258,11 +4831,9 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:304
-#: src/plugins/acpi_notifier/acpi_notifier.c:790
+#: src/gtk/pluginwindow.c:304 src/plugins/acpi_notifier/acpi_notifier.c:790
 #: src/plugins/archive/archiver_prefs.c:92
-#: src/plugins/att_remover/att_remover.c:519
-#: src/plugins/attachwarner/attachwarner_prefs.c:201
+#: src/plugins/attachwarner/attachwarner_prefs.c:228
 #: src/plugins/address_keeper/address_keeper_prefs.c:248
 #: src/plugins/bogofilter/bogofilter_gtk.c:457
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
@@ -5278,12 +4849,10 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:479
 #: src/plugins/notification/notification_prefs.c:496
 #: src/plugins/notification/notification_prefs.c:513
-#: src/plugins/pgpcore/prefs_gpg.c:557
-#: src/plugins/rssyl/rssyl_prefs.c:63
+#: src/plugins/pgpcore/prefs_gpg.c:557 src/plugins/rssyl/rssyl_prefs.c:63
 #: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:648
-#: src/plugins/vcalendar/vcal_prefs.c:645
-#: src/prefs_toolbar.c:939
+#: src/plugins/vcalendar/vcal_prefs.c:647 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -5295,257 +4864,247 @@ msgstr "Carregar..."
 msgid "Unload"
 msgstr "Descarregar"
 
-#: src/gtk/pluginwindow.c:351
-#: src/prefs_summaries.c:221
+#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:221
 msgid "Description"
 msgstr "Descrição"
 
-#: src/gtk/pluginwindow.c:373
-msgid "More plugins are available from the Claws Mail website."
-msgstr "Existem mais plugins disponíveis no site do Claws Mail."
-
-#: src/gtk/pluginwindow.c:379
-#: src/prefs_themes.c:843
-msgid "Get more..."
-msgstr "Obter mais..."
+#: src/gtk/pluginwindow.c:374
+#, c-format
+msgid ""
+"For more information about plugins see the <a href=\"%s\"><span underline="
+"\"none\">Claws Mail website</span></a>."
+msgstr ""
+"Para maiores informações sobre os plugins, dê uma olhada no "
+"<a href=\"%s\"><span underline=\"none\">site web do Claws Mail</span></a>."
 
-#: src/gtk/pluginwindow.c:415
+#: src/gtk/pluginwindow.c:414
 msgid "Click here to load one or more plugins"
 msgstr "Clique aqui para transferir um ou mais plugins"
 
-#: src/gtk/pluginwindow.c:418
+#: src/gtk/pluginwindow.c:417
 msgid "Unload the selected plugin"
 msgstr "Descarregar o plugin selecionado"
 
-#: src/gtk/pluginwindow.c:483
+#: src/gtk/pluginwindow.c:482
 msgid "Loaded plugins"
 msgstr "Plugins carregados"
 
-#: src/gtk/prefswindow.c:679
+#: src/gtk/prefswindow.c:671
 msgid "Page Index"
 msgstr "Índice da Página"
 
-#: src/gtk/progressdialog.c:91
-#: src/mainwindow.c:830
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:828
 msgid "_Hide"
 msgstr "_Esconder"
 
-#: src/gtk/progressdialog.c:141
-#: src/prefs_account.c:3208
-#: src/prefs_account.c:3226
-#: src/prefs_account.c:3244
-#: src/prefs_account.c:3262
-#: src/prefs_account.c:3280
-#: src/prefs_account.c:3298
-#: src/prefs_account.c:3317
-#: src/prefs_account.c:3399
-#: src/prefs_filtering_action.c:1419
-#: src/prefs_filtering.c:397
-#: src/prefs_filtering.c:1881
+#: src/gtk/progressdialog.c:141 src/prefs_account.c:3200
+#: src/prefs_account.c:3218 src/prefs_account.c:3236 src/prefs_account.c:3254
+#: src/prefs_account.c:3272 src/prefs_account.c:3290 src/prefs_account.c:3309
+#: src/prefs_account.c:3399 src/prefs_filtering_action.c:1421
+#: src/prefs_filtering.c:397 src/prefs_filtering.c:1877
 msgid "Account"
 msgstr "Conta"
 
-#: src/gtk/quicksearch.c:433
+#: src/gtk/quicksearch.c:442
 msgid "all messages"
 msgstr "todas as mensagens"
 
-#: src/gtk/quicksearch.c:434
+#: src/gtk/quicksearch.c:443
 msgid "messages whose age is greater than # days"
 msgstr "mensagens anteriores a # dias"
 
-#: src/gtk/quicksearch.c:435
+#: src/gtk/quicksearch.c:444
 msgid "messages whose age is less than # days"
 msgstr "mensagens posteriores a # dias"
 
-#: src/gtk/quicksearch.c:436
+#: src/gtk/quicksearch.c:445
 msgid "messages whose age is greater than # hours"
 msgstr "mensagens anteriores a # horas"
 
-#: src/gtk/quicksearch.c:437
+#: src/gtk/quicksearch.c:446
 msgid "messages whose age is less than # hours"
 msgstr "mensagens posteriores a # horas"
 
-#: src/gtk/quicksearch.c:438
+#: src/gtk/quicksearch.c:447
 msgid "messages which contain S in the message body"
 msgstr "mensagens que contenham S no corpo"
 
-#: src/gtk/quicksearch.c:439
+#: src/gtk/quicksearch.c:448
 msgid "messages which contain S in the whole message"
 msgstr "mensagens que contenham S em qualquer parte"
 
-#: src/gtk/quicksearch.c:440
+#: src/gtk/quicksearch.c:449
 msgid "messages carbon-copied to S"
 msgstr "mensagens com cópia-carbono para S"
 
-#: src/gtk/quicksearch.c:441
+#: src/gtk/quicksearch.c:450
 msgid "message is either to: or cc: to S"
 msgstr "mensagem que seja 'Para:' ou 'Cc:' para S"
 
-#: src/gtk/quicksearch.c:442
+#: src/gtk/quicksearch.c:451
 msgid "deleted messages"
 msgstr "mensagens excluídas"
 
-#: src/gtk/quicksearch.c:443
+#: src/gtk/quicksearch.c:452
 msgid "messages which contain S in the Sender field"
 msgstr "mensagens que contenham S no campo remetente"
 
-#: src/gtk/quicksearch.c:444
+#: src/gtk/quicksearch.c:453
 msgid "true if execute \"S\" succeeds"
 msgstr "verdadeiro se a execução \"S\" for bem sucedida"
 
-#: src/gtk/quicksearch.c:445
+#: src/gtk/quicksearch.c:454
 msgid "messages originating from user S"
 msgstr "mensagens originárias do usuário S"
 
-#: src/gtk/quicksearch.c:446
+#: src/gtk/quicksearch.c:455
 msgid "forwarded messages"
 msgstr "mensagens encaminhadas"
 
-#: src/gtk/quicksearch.c:447
+#: src/gtk/quicksearch.c:456
 msgid "messages which have attachments"
 msgstr "mensagens que tenham anexos"
 
-#: src/gtk/quicksearch.c:448
+#: src/gtk/quicksearch.c:457
 msgid "messages which contain header S"
 msgstr "mensagens que contenham o cabeçalho S"
 
-#: src/gtk/quicksearch.c:449
+#: src/gtk/quicksearch.c:458
 msgid "messages which contain S in Message-ID header"
 msgstr "mensagens que contenham S no cabeçalho Message-Id"
 
-#: src/gtk/quicksearch.c:450
+#: src/gtk/quicksearch.c:459
 msgid "messages which contain S in In-Reply-To header"
 msgstr "mensagens que contenham S no cabeçalho 'In-Reply-To'"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:460
 msgid "messages which are marked with color #"
 msgstr "mensagens que estão marcadas com a cor #"
 
-#: src/gtk/quicksearch.c:452
+#: src/gtk/quicksearch.c:461
 msgid "locked messages"
 msgstr "mensagens travadas"
 
-#: src/gtk/quicksearch.c:453
+#: src/gtk/quicksearch.c:462
 msgid "messages which are in newsgroup S"
 msgstr "mensagens que estão no newsgroup S"
 
-#: src/gtk/quicksearch.c:454
+#: src/gtk/quicksearch.c:463
 msgid "new messages"
 msgstr "novas mensagens"
 
-#: src/gtk/quicksearch.c:455
+#: src/gtk/quicksearch.c:464
 msgid "old messages"
 msgstr "mensagens antigas"
 
-#: src/gtk/quicksearch.c:456
+#: src/gtk/quicksearch.c:465
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "mensagens incompletas (que não foram recebidas integralmente)"
 
-#: src/gtk/quicksearch.c:457
+#: src/gtk/quicksearch.c:466
 msgid "messages which have been replied to"
 msgstr "mensagens que foram respondidas"
 
-#: src/gtk/quicksearch.c:458
+#: src/gtk/quicksearch.c:467
 msgid "read messages"
 msgstr "mensagens lidas"
 
-#: src/gtk/quicksearch.c:459
+#: src/gtk/quicksearch.c:468
 msgid "messages which contain S in subject"
 msgstr "mensagens que contenham S no assunto"
 
-#: src/gtk/quicksearch.c:460
+#: src/gtk/quicksearch.c:469
 msgid "messages whose score is equal to # points"
 msgstr "mensagens com pontuação igual a #"
 
-#: src/gtk/quicksearch.c:461
+#: src/gtk/quicksearch.c:470
 msgid "messages whose score is greater than # points"
 msgstr "mensagens com pontuação maior que #"
 
-#: src/gtk/quicksearch.c:462
+#: src/gtk/quicksearch.c:471
 msgid "messages whose score is lower than # points"
 msgstr "mensagens com pontuação menor que #"
 
-#: src/gtk/quicksearch.c:463
+#: src/gtk/quicksearch.c:472
 msgid "messages whose size is equal to # bytes"
 msgstr "mensagens com tamanho igual a # bytes"
 
-#: src/gtk/quicksearch.c:464
+#: src/gtk/quicksearch.c:473
 msgid "messages whose size is greater than # bytes"
 msgstr "mensagens com tamanho maior que # bytes"
 
-#: src/gtk/quicksearch.c:465
+#: src/gtk/quicksearch.c:474
 msgid "messages whose size is smaller than # bytes"
 msgstr "mensagens com tamanho menor que # bytes"
 
-#: src/gtk/quicksearch.c:466
+#: src/gtk/quicksearch.c:475
 msgid "messages which have been sent to S"
 msgstr "mensagens que foram enviadas para S"
 
-#: src/gtk/quicksearch.c:467
+#: src/gtk/quicksearch.c:476
 msgid "messages which tags contain S"
 msgstr "mensagens cujas etiquetas contenham S"
 
-#: src/gtk/quicksearch.c:468
+#: src/gtk/quicksearch.c:477
 msgid "messages which have tag(s)"
 msgstr "mensagens que tenham etiqueta(s)"
 
-#: src/gtk/quicksearch.c:469
+#: src/gtk/quicksearch.c:478
 msgid "marked messages"
 msgstr "mensagens marcadas"
 
-#: src/gtk/quicksearch.c:470
+#: src/gtk/quicksearch.c:479
 msgid "unread messages"
 msgstr "mensagens não lidas"
 
-#: src/gtk/quicksearch.c:471
+#: src/gtk/quicksearch.c:480
 msgid "messages which contain S in References header"
 msgstr "mensagens que contém S no cabeçalho 'References'"
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:481
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "mensagens que retornaram 0 quando foram passadas para o comando - %F é um "
 "arquivo de mensagem"
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:482
 msgid "messages which contain S in X-Label header"
 msgstr "mensagens que contém S no cabeçalho 'X-Label'"
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:484
 msgid "logical AND operator"
 msgstr "operador lógico 'E'"
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:485
 msgid "logical OR operator"
 msgstr "operador lógico 'OU'"
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:486
 msgid "logical NOT operator"
 msgstr "operador lógico 'NÃO'"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:487
 msgid "case sensitive search"
 msgstr "a pesquisa diferencia maiúsc./minúsc."
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:488
 msgid "match using regular expressions instead of substring search"
 msgstr ""
 "corresponder a uma expressão regular, ao invés de pesquisar por uma trecho"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:490
 msgid "all filtering expressions are allowed"
 msgstr "são permitidas todas as expressões de filtragem"
 
-#: src/gtk/quicksearch.c:490
-#: src/summary_search.c:457
+#: src/gtk/quicksearch.c:499 src/summary_search.c:483
 msgid "Extended Search"
 msgstr "Pesquisa Extendida"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:500
 msgid ""
-"Extended Search allows the user to define criteria that messages must have in "
-"order to match and be displayed in the message list.\n"
+"Extended Search allows the user to define criteria that messages must have "
+"in order to match and be displayed in the message list.\n"
 "The following symbols can be used:"
 msgstr ""
 "A Pesquisa Extendida permite que o usuário defina os critérios de "
@@ -5553,60 +5112,59 @@ msgstr ""
 "mensagens.\n"
 "Os seguintes símbolos podem ser usados:"
 
-#: src/gtk/quicksearch.c:591
+#: src/gtk/quicksearch.c:600
 msgid "Something went wrong during search. Please check your logs."
 msgstr ""
 "Ocorreu algum problema durante a pesquisa. Por favor, verifique seus "
 "relatórios."
 
-#: src/gtk/quicksearch.c:657
+#: src/gtk/quicksearch.c:666
 msgid "From/To/Subject/Tag"
 msgstr "De/Para/Assunto/Etiqueta"
 
-#: src/gtk/quicksearch.c:668
-#: src/plugins/archive/archiver_prefs.c:322
+#: src/gtk/quicksearch.c:677 src/plugins/archive/archiver_prefs.c:322
 msgid "Recursive"
 msgstr "Recursivo"
 
-#: src/gtk/quicksearch.c:677
+#: src/gtk/quicksearch.c:686
 msgid "Sticky"
 msgstr "Manter filtro"
 
-#: src/gtk/quicksearch.c:687
+#: src/gtk/quicksearch.c:696
 msgid "Type-ahead"
 msgstr "Pesquisar enquanto digita"
 
-#: src/gtk/quicksearch.c:699
+#: src/gtk/quicksearch.c:708
 msgid "Run on select"
 msgstr "Executar na seleção"
 
-#: src/gtk/quicksearch.c:741
+#: src/gtk/quicksearch.c:750
 msgid "Clear the current search"
 msgstr "Limpar a pesquisa atual"
 
-#: src/gtk/quicksearch.c:751
-#: src/summary_search.c:410
+#: src/gtk/quicksearch.c:760 src/summary_search.c:436
 msgid "Edit search criteria"
 msgstr "Editar os critérios da pesquisa"
 
-#: src/gtk/quicksearch.c:760
+#: src/gtk/quicksearch.c:769
 msgid "Information about extended symbols"
 msgstr "Informação sobre os símbolos extendidos"
 
-#: src/gtk/quicksearch.c:798
-#: src/gtk/quicksearch.c:813
+#: src/gtk/quicksearch.c:807 src/gtk/quicksearch.c:822
 msgid "_Information"
 msgstr "_Informação"
 
-#: src/gtk/quicksearch.c:800
-#: src/gtk/quicksearch.c:815
+#: src/gtk/quicksearch.c:808 src/gtk/quicksearch.c:823
+msgid "E_dit"
+msgstr "E_ditar"
+
+#: src/gtk/quicksearch.c:809 src/gtk/quicksearch.c:824 src/prefs_actions.c:347
+#: src/prefs_filtering.c:495 src/prefs_template.c:328
 msgid "C_lear"
 msgstr "_Limpar"
 
-#: src/gtk/sslcertwindow.c:157
-#: src/gtk/sslcertwindow.c:348
-#: src/gtk/sslcertwindow.c:398
-#: src/gtk/sslcertwindow.c:462
+#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:348
+#: src/gtk/sslcertwindow.c:398 src/gtk/sslcertwindow.c:462
 msgid "Correct"
 msgstr "Correto"
 
@@ -5618,19 +5176,16 @@ msgstr "Proprietário"
 msgid "Signer"
 msgstr "Assinante"
 
-#: src/gtk/sslcertwindow.c:170
-#: src/gtk/sslcertwindow.c:194
+#: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
 #: src/prefs_themes.c:860
 msgid "Name: "
 msgstr "Nome: "
 
-#: src/gtk/sslcertwindow.c:178
-#: src/gtk/sslcertwindow.c:202
+#: src/gtk/sslcertwindow.c:178 src/gtk/sslcertwindow.c:202
 msgid "Organization: "
 msgstr "Organização: "
 
-#: src/gtk/sslcertwindow.c:186
-#: src/gtk/sslcertwindow.c:210
+#: src/gtk/sslcertwindow.c:186 src/gtk/sslcertwindow.c:210
 msgid "Location: "
 msgstr "Localização: "
 
@@ -5671,15 +5226,13 @@ msgstr ""
 "O certificado de %s é desconhecido.\n"
 "%sDeseja aceitá-lo?"
 
-#: src/gtk/sslcertwindow.c:350
-#: src/gtk/sslcertwindow.c:400
+#: src/gtk/sslcertwindow.c:350 src/gtk/sslcertwindow.c:400
 #: src/gtk/sslcertwindow.c:464
 #, c-format
 msgid "Signature status: %s"
 msgstr "Status da assinatura: %s"
 
-#: src/gtk/sslcertwindow.c:358
-#: src/gtk/sslcertwindow.c:408
+#: src/gtk/sslcertwindow.c:358 src/gtk/sslcertwindow.c:408
 msgid "_View certificate"
 msgstr "_Ver certificado"
 
@@ -5691,14 +5244,12 @@ msgstr "O certificado SSL é inválido"
 msgid "SSL certificate is unknown"
 msgstr "O certificado SSL é desconhecido"
 
-#: src/gtk/sslcertwindow.c:369
-#: src/gtk/sslcertwindow.c:419
+#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:419
 #: src/gtk/sslcertwindow.c:481
 msgid "_Cancel connection"
 msgstr "_Cancelar a conexão"
 
-#: src/gtk/sslcertwindow.c:369
-#: src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:481
 msgid "_Accept and save"
 msgstr "_Aceitar e salvar"
 
@@ -5756,21 +5307,16 @@ msgstr "O certificado SSL mudou"
 msgid "Tags:"
 msgstr "Etiquetas:"
 
-#: src/headerview.c:216
-#: src/plugins/notification/notification_popup.c:316
+#: src/headerview.c:216 src/plugins/notification/notification_popup.c:316
 #: src/plugins/notification/notification_popup.c:621
-#: src/plugins/notification/notification_trayicon.c:854
-#: src/summaryview.c:3344
-#: src/summaryview.c:3361
-#: src/summaryview.c:3382
+#: src/plugins/notification/notification_trayicon.c:854 src/summaryview.c:3344
+#: src/summaryview.c:3361 src/summaryview.c:3382
 msgid "(No From)"
 msgstr "(Sem remetente)"
 
-#: src/headerview.c:231
-#: src/plugins/notification/notification_popup.c:318
+#: src/headerview.c:231 src/plugins/notification/notification_popup.c:318
 #: src/plugins/notification/notification_popup.c:625
-#: src/plugins/notification/notification_trayicon.c:857
-#: src/summaryview.c:3395
+#: src/plugins/notification/notification_trayicon.c:857 src/summaryview.c:3395
 #: src/summaryview.c:3399
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
@@ -5779,8 +5325,7 @@ msgstr "(Sem assunto)"
 msgid "Error:"
 msgstr "Erro:"
 
-#: src/image_viewer.c:299
-#: src/mimeview.c:2578
+#: src/image_viewer.c:299 src/mimeview.c:2546
 #: src/plugins/pdf_viewer/poppler_viewer.c:700
 msgid "Filename:"
 msgstr "Nome do arquivo:"
@@ -5823,8 +5368,8 @@ msgid ""
 "IMAP error on %s: parse error (very probably non-RFC compliance from the "
 "server)\n"
 msgstr ""
-"Erro no IMAP em %s: erro de análise (muito provavelmente uma submissão "
-"não-RFC do servidor)\n"
+"Erro no IMAP em %s: erro de análise (muito provavelmente uma submissão não-"
+"RFC do servidor)\n"
 
 #: src/imap.c:623
 #, c-format
@@ -5847,8 +5392,8 @@ msgid ""
 "IMAP error on %s: protocol error(very probably non-RFC compliance from the "
 "server)\n"
 msgstr ""
-"Erro no IMAP em %s: erro de protocolo (muito provavelmente uma submissão "
-"não-RFC do servidor)\n"
+"Erro no IMAP em %s: erro de protocolo (muito provavelmente uma submissão não-"
+"RFC do servidor)\n"
 
 #: src/imap.c:636
 #, c-format
@@ -6019,8 +5564,8 @@ msgstr "Erro no IMAP em %s: erro desconhecido [%d]\n"
 msgid ""
 "\n"
 "\n"
-"CRAM-MD5 logins only work if libetpan has been compiled with SASL support and "
-"the CRAM-MD5 SASL plugin is installed."
+"CRAM-MD5 logins only work if libetpan has been compiled with SASL support "
+"and the CRAM-MD5 SASL plugin is installed."
 msgstr ""
 "\n"
 "\n"
@@ -6054,33 +5599,22 @@ msgstr "Erro na conexão com %s: login recusado.%s\n"
 msgid "Connecting to %s failed"
 msgstr "Erro na conexão com %s"
 
-#: src/imap.c:959
-#: src/imap.c:962
+#: src/imap.c:959 src/imap.c:962
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "A conexão IMAP4 com %s foi interrompida. Reconectando...\n"
 
-#: src/imap.c:992
-#: src/imap.c:3539
-#: src/imap.c:4199
-#: src/imap.c:4296
-#: src/imap.c:4479
-#: src/imap.c:5276
+#: src/imap.c:992 src/imap.c:3546 src/imap.c:4206 src/imap.c:4303
+#: src/imap.c:4486 src/imap.c:5283
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "O Claws Mail necessita de acesso à rede para conectar-se ao servidor IMAP."
 
-#: src/imap.c:1086
-#: src/inc.c:816
-#: src/news.c:394
-#: src/send_message.c:308
+#: src/imap.c:1086 src/inc.c:802 src/news.c:388 src/send_message.c:269
 msgid "Insecure connection"
 msgstr "Conexão não-segura"
 
-#: src/imap.c:1087
-#: src/inc.c:817
-#: src/news.c:395
-#: src/send_message.c:309
+#: src/imap.c:1087 src/inc.c:803 src/news.c:389 src/send_message.c:270
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -6093,10 +5627,7 @@ msgstr ""
 "\n"
 "Você quer continuar a conexão ao servidor? A comunicação não será segura."
 
-#: src/imap.c:1093
-#: src/inc.c:823
-#: src/news.c:401
-#: src/send_message.c:315
+#: src/imap.c:1093 src/inc.c:809 src/news.c:395 src/send_message.c:276
 msgid "Con_tinue connecting"
 msgstr "Con_tinuar a conexão"
 
@@ -6115,92 +5646,89 @@ msgstr "Não foi possível conectar com o servidor IMAP4: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Não foi possível conectar com o servidor IMAP4: %s:%d\n"
 
-#: src/imap.c:1187
-#: src/imap.c:3961
+#: src/imap.c:1187 src/imap.c:3968
 msgid "Can't start TLS session.\n"
 msgstr "Não foi possível iniciar sessão TLS.\n"
 
-#: src/imap.c:1243
+#: src/imap.c:1250
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Não foi possível autenticar-se no servidor IMAP %s.\n"
 
-#: src/imap.c:1246
+#: src/imap.c:1253
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Não foi possível conectar-se ao servidor IMAP %s."
 
-#: src/imap.c:1640
+#: src/imap.c:1647
 msgid "Adding messages..."
 msgstr "Adicionando mensagens..."
 
-#: src/imap.c:1842
-#: src/mh.c:520
+#: src/imap.c:1849 src/mh.c:520
 msgid "Copying messages..."
 msgstr "Copiando mensagens..."
 
-#: src/imap.c:2421
+#: src/imap.c:2428
 msgid "can't set deleted flags\n"
 msgstr "não foi possível definir as marcas de exclusão\n"
 
-#: src/imap.c:2428
-#: src/imap.c:4906
+#: src/imap.c:2435 src/imap.c:4913
 msgid "can't expunge\n"
 msgstr "não foi possível expurgar\n"
 
-#: src/imap.c:2779
+#: src/imap.c:2786
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Procurando por pastas não assinadas em %s..."
 
-#: src/imap.c:2782
+#: src/imap.c:2789
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Procurando por sub-pastas de %s..."
 
-#: src/imap.c:3078
+#: src/imap.c:3085
 msgid "can't create mailbox: LIST failed\n"
 msgstr "não foi possível criar a caixa postal: falha no comando LIST\n"
 
-#: src/imap.c:3093
+#: src/imap.c:3100
 msgid "can't create mailbox\n"
 msgstr "não foi possível criar a caixa postal\n"
 
-#: src/imap.c:3184
+#: src/imap.c:3191
 msgid "New folder name must not contain the namespace path separator"
 msgstr "O nome da nova pasta não pode conter o caractere separador de caminho"
 
-#: src/imap.c:3221
+#: src/imap.c:3228
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "não foi possível renomear a caixa postal: %s para %s\n"
 
-#: src/imap.c:3333
+#: src/imap.c:3340
 msgid "can't delete mailbox\n"
 msgstr "não foi possível excluir a caixa postal\n"
 
-#: src/imap.c:3620
+#: src/imap.c:3627
 msgid "LIST failed\n"
 msgstr "Erro no comando LIST\n"
 
-#: src/imap.c:3705
+#: src/imap.c:3712
 msgid "Flagging messages..."
 msgstr "Marcando as mensagens..."
 
-#: src/imap.c:3806
+#: src/imap.c:3813
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "não foi possível selecionar a pasta: %s\n"
 
-#: src/imap.c:3958
+#: src/imap.c:3965
 msgid "Server requires TLS to log in.\n"
 msgstr "O servidor depende do TLS para efetutar a autenticação.\n"
 
-#: src/imap.c:3968
+#: src/imap.c:3975
 msgid "Can't refresh capabilities.\n"
 msgstr "Não foi possível atualizar as capacidades.\n"
 
-#: src/imap.c:3973
+#: src/imap.c:3980
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -6209,23 +5737,24 @@ msgstr ""
 "Ocorreu uma falha na conexão com %s: o servidor requer TLS, mas o Claws Mail "
 "foi compilado sem o suporte ao OpenSSL.\n"
 
-#: src/imap.c:3981
+#: src/imap.c:3988
 msgid "Server logins are disabled.\n"
 msgstr "As autenticações no servidor estão desabilitadas.\n"
 
-#: src/imap.c:4204
+#: src/imap.c:4211
 msgid "Fetching message..."
 msgstr "Buscando a mensagem..."
 
-#: src/imap.c:4899
+#: src/imap.c:4906
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "não foi possível definir marcas de exclusão: %d\n"
 
-#: src/imap.c:5932
+#: src/imap.c:5939
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
-"Mail has been built without IMAP support; your IMAP account(s) are disabled.\n"
+"Mail has been built without IMAP support; your IMAP account(s) are "
+"disabled.\n"
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
@@ -6235,45 +5764,33 @@ msgstr ""
 "\n"
 "Você provavelmente precisa instalar o libetpan e recompilar o Claws Mail."
 
-#: src/imap_gtk.c:63
-#: src/mh_gtk.c:55
-#: src/plugins/mailmbox/plugin_gtk.c:59
+#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/plugins/mailmbox/plugin_gtk.c:59
 msgid "Create _new folder..."
 msgstr "Criar _nova pasta..."
 
-#: src/imap_gtk.c:65
-#: src/mh_gtk.c:56
-#: src/news_gtk.c:61
+#: src/imap_gtk.c:65 src/mh_gtk.c:56 src/news_gtk.c:61
 #: src/plugins/mailmbox/plugin_gtk.c:60
 msgid "_Rename folder..."
 msgstr "_Renomear pasta..."
 
-#: src/imap_gtk.c:66
-#: src/mh_gtk.c:57
-#: src/plugins/mailmbox/plugin_gtk.c:61
+#: src/imap_gtk.c:66 src/mh_gtk.c:57 src/plugins/mailmbox/plugin_gtk.c:61
 msgid "M_ove folder..."
 msgstr "_Mover pasta..."
 
-#: src/imap_gtk.c:67
-#: src/mh_gtk.c:58
-#: src/plugins/mailmbox/plugin_gtk.c:62
+#: src/imap_gtk.c:67 src/mh_gtk.c:58 src/plugins/mailmbox/plugin_gtk.c:62
 msgid "Cop_y folder..."
 msgstr "_Copiar pasta..."
 
-#: src/imap_gtk.c:69
-#: src/mh_gtk.c:59
-#: src/plugins/mailmbox/plugin_gtk.c:63
+#: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:63
 #: src/plugins/rssyl/rssyl_gtk.c:61
 msgid "_Delete folder..."
 msgstr "E_xcluir pasta..."
 
-#: src/imap_gtk.c:71
-#: src/news_gtk.c:59
+#: src/imap_gtk.c:71 src/news_gtk.c:59
 msgid "Synchronise"
 msgstr "_Sincronizar"
 
-#: src/imap_gtk.c:72
-#: src/news_gtk.c:60
+#: src/imap_gtk.c:72 src/news_gtk.c:60
 msgid "Down_load messages"
 msgstr "_Obter mensagens"
 
@@ -6285,27 +5802,20 @@ msgstr "Ass_inaturas"
 msgid "_Subscribe..."
 msgstr "Assi_nar..."
 
-#: src/imap_gtk.c:78
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "Cance_lar assinatura..."
 
-#: src/imap_gtk.c:80
-#: src/mh_gtk.c:60
-#: src/news_gtk.c:63
+#: src/imap_gtk.c:80 src/mh_gtk.c:60 src/news_gtk.c:63
 #: src/plugins/mailmbox/plugin_gtk.c:64
 msgid "_Check for new messages"
 msgstr "_Verificar novas mensagens"
 
-#: src/imap_gtk.c:81
-#: src/mh_gtk.c:61
-#: src/plugins/mailmbox/plugin_gtk.c:65
+#: src/imap_gtk.c:81 src/mh_gtk.c:61 src/plugins/mailmbox/plugin_gtk.c:65
 msgid "C_heck for new folders"
 msgstr "Verificar novas _pastas"
 
-#: src/imap_gtk.c:82
-#: src/mh_gtk.c:62
-#: src/plugins/mailmbox/plugin_gtk.c:66
+#: src/imap_gtk.c:82 src/mh_gtk.c:62 src/plugins/mailmbox/plugin_gtk.c:66
 msgid "R_ebuild folder tree"
 msgstr "Recons_truir a árvore de pastas"
 
@@ -6323,35 +5833,26 @@ msgstr ""
 "(se deseja criar uma pasta apenas para armazenar\n"
 "sub-pastas e não mensagens, adicione '/' ao final do nome)"
 
-#: src/imap_gtk.c:200
-#: src/mh_gtk.c:148
+#: src/imap_gtk.c:200 src/mh_gtk.c:148
 msgid "Inherit properties from parent folder"
 msgstr "Propriedades herdadas da pasta superior"
 
-#: src/imap_gtk.c:261
-#: src/mh_gtk.c:249
-#: src/news_gtk.c:305
-#: src/plugins/mailmbox/plugin_gtk.c:408
-#: src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/vcalendar/vcal_folder.c:2020
+#: src/imap_gtk.c:261 src/mh_gtk.c:249 src/news_gtk.c:305
+#: src/plugins/mailmbox/plugin_gtk.c:405 src/plugins/rssyl/rssyl_cb_menu.c:333
+#: src/plugins/vcalendar/vcal_folder.c:2018
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Entre com o novo nome para '%s':"
 
-#: src/imap_gtk.c:263
-#: src/mh_gtk.c:251
-#: src/plugins/mailmbox/plugin_gtk.c:409
+#: src/imap_gtk.c:263 src/mh_gtk.c:251 src/plugins/mailmbox/plugin_gtk.c:406
 #: src/plugins/rssyl/rssyl_cb_menu.c:334
-#: src/plugins/vcalendar/vcal_folder.c:2021
+#: src/plugins/vcalendar/vcal_folder.c:2019
 msgid "Rename folder"
 msgstr "Renomear a pasta"
 
-#: src/imap_gtk.c:292
-#: src/mh_gtk.c:274
-#: src/news_gtk.c:327
-#: src/plugins/mailmbox/plugin_gtk.c:438
-#: src/plugins/rssyl/rssyl_cb_menu.c:354
-#: src/plugins/vcalendar/vcal_folder.c:2041
+#: src/imap_gtk.c:292 src/mh_gtk.c:274 src/news_gtk.c:327
+#: src/plugins/mailmbox/plugin_gtk.c:433 src/plugins/rssyl/rssyl_cb_menu.c:354
+#: src/plugins/vcalendar/vcal_folder.c:2039
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6359,9 +5860,7 @@ msgstr ""
 "Não foi possível renomear a pasta.\n"
 "O nome fornecido não é permitido."
 
-#: src/imap_gtk.c:360
-#: src/mh_gtk.c:199
-#: src/plugins/rssyl/rssyl_cb_menu.c:234
+#: src/imap_gtk.c:360 src/mh_gtk.c:199 src/plugins/rssyl/rssyl_cb_menu.c:234
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6369,17 +5868,14 @@ msgid ""
 "\n"
 "Do you really want to delete?"
 msgstr ""
-"Todas as pastas e mensagens dentro de '%s' serão excluídas. Não será possível "
-"recuperá-las.\n"
+"Todas as pastas e mensagens dentro de '%s' serão excluídas. Não será "
+"possível recuperá-las.\n"
 "\n"
 "Confirma a exclusão?"
 
-#: src/imap_gtk.c:381
-#: src/mh_gtk.c:220
-#: src/news_gtk.c:280
-#: src/plugins/mailmbox/plugin_gtk.c:343
-#: src/plugins/rssyl/rssyl_cb_menu.c:256
-#: src/plugins/vcalendar/vcal_folder.c:1974
+#: src/imap_gtk.c:381 src/mh_gtk.c:220 src/news_gtk.c:280
+#: src/plugins/mailmbox/plugin_gtk.c:341 src/plugins/rssyl/rssyl_cb_menu.c:256
+#: src/plugins/vcalendar/vcal_folder.c:1972
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Não foi possível remover a pasta '%s'."
@@ -6393,8 +5889,7 @@ msgstr "Deseja pesquisar por sub-pastas não assinadas de '%s'?"
 msgid "Search recursively"
 msgstr "Pesquisar recursivamente"
 
-#: src/imap_gtk.c:515
-#: src/imap_gtk.c:574
+#: src/imap_gtk.c:515 src/imap_gtk.c:574
 msgid "Subscriptions"
 msgstr "Assinaturas"
 
@@ -6407,13 +5902,11 @@ msgstr "+_Pesquisar"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Selecione uma sub-pasta de %s para assinar:"
 
-#: src/imap_gtk.c:537
-#: src/mainwindow.c:672
+#: src/imap_gtk.c:537 src/mainwindow.c:672
 msgid "Subscribe"
 msgstr "Assinar"
 
-#: src/imap_gtk.c:539
-#: src/imap_gtk.c:541
+#: src/imap_gtk.c:539 src/imap_gtk.c:541
 msgid "All of them"
 msgstr "Todas"
 
@@ -6442,10 +5935,8 @@ msgstr "assinar"
 msgid "unsubscribe"
 msgstr "cancelar assinatura"
 
-#: src/imap_gtk.c:569
-#: src/prefs_folder_item.c:1441
-#: src/prefs_folder_item.c:1469
-#: src/prefs_folder_item.c:1497
+#: src/imap_gtk.c:569 src/prefs_folder_item.c:1441
+#: src/prefs_folder_item.c:1469 src/prefs_folder_item.c:1497
 msgid "Apply to subfolders"
 msgstr "Aplicar às sub-pastas"
 
@@ -6457,8 +5948,7 @@ msgstr "+_Assinar"
 msgid "+_Unsubscribe"
 msgstr "+_Cancelar assinatura"
 
-#: src/import.c:113
-#: src/import.c:207
+#: src/import.c:113 src/import.c:207
 msgid "Import mbox file"
 msgstr "Importar arquivo mbox"
 
@@ -6503,15 +5993,11 @@ msgstr "Selecione e renomeie os campos LDIF a importar."
 msgid "File imported."
 msgstr "Arquivo importado."
 
-#: src/importldif.c:450
-#: src/importmutt.c:123
-#: src/importpine.c:122
+#: src/importldif.c:450 src/importmutt.c:123 src/importpine.c:122
 msgid "Please select a file."
 msgstr "Por favor, selecione um arquivo."
 
-#: src/importldif.c:456
-#: src/importmutt.c:128
-#: src/importpine.c:127
+#: src/importldif.c:456 src/importmutt.c:128 src/importpine.c:127
 msgid "Address book name must be supplied."
 msgstr "O nome do livro de endereços deve ser fornecido."
 
@@ -6525,8 +6011,8 @@ msgstr "Selecione o arquivo LDIF"
 
 #: src/importldif.c:667
 msgid ""
-"Specify the name for the address book that will be created from the LDIF file "
-"data."
+"Specify the name for the address book that will be created from the LDIF "
+"file data."
 msgstr ""
 "Especifique o nome para o livro de endereços que será criado a partir dos "
 "dados do arquivo LDIF."
@@ -6547,8 +6033,7 @@ msgstr "Selecione o arquivo LDIF a ser importado."
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:726
-#: src/summaryview.c:441
+#: src/importldif.c:726 src/summaryview.c:441
 msgid "S"
 msgstr "E"
 
@@ -6570,21 +6055,21 @@ msgstr "Atributo"
 
 #: src/importldif.c:807
 msgid ""
-"Choose the LDIF field that will be renamed or selected for import in the list "
-"above. Reserved fields (marked with a tick in the \"R\" column), are "
+"Choose the LDIF field that will be renamed or selected for import in the "
+"list above. Reserved fields (marked with a tick in the \"R\" column), are "
 "automatically imported and cannot be renamed. A single click in the Select "
 "(\"S\") column will select the field for import with a tick. A single click "
-"anywhere in the row will select that field for rename in the input area below "
-"the list. A double click anywhere in the row will also select the field for "
-"import."
+"anywhere in the row will select that field for rename in the input area "
+"below the list. A double click anywhere in the row will also select the "
+"field for import."
 msgstr ""
 "Escolha o campo LDIF que será renomeado ou selecionado para importação na "
 "lista acima. Os campos Reservados (que possuem uma marca na coluna \"R\"), "
 "são automaticamente importados e não podem ser renomeados. Um clique na "
 "coluna Selecionado (\"S\") irá selecionar o campo para importação. Um clique "
-"em qualquer lugar da linha irá selecionar aquele campo para ser renomeado, na "
-"área de entrada abaixo da lista. Um duplo clique em qualquer lugar da linha "
-"também irá selecionar o campo para ser importado."
+"em qualquer lugar da linha irá selecionar aquele campo para ser renomeado, "
+"na área de entrada abaixo da lista. Um duplo clique em qualquer lugar da "
+"linha também irá selecionar o campo para ser importado."
 
 #: src/importldif.c:822
 msgid "The LDIF field can be renamed to the User Attribute name."
@@ -6630,8 +6115,7 @@ msgstr "Selecione o arquivo do MUTT"
 msgid "Import MUTT file into Address Book"
 msgstr "Incorporar o arquivo do MUTT ao Livro de Endereços"
 
-#: src/importmutt.c:289
-#: src/importpine.c:289
+#: src/importmutt.c:289 src/importpine.c:289
 msgid "Please select a file to import."
 msgstr "Por favor, selecione um arquivo para importar."
 
@@ -6647,150 +6131,141 @@ msgstr "Selecione o arquivo do Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Incorporar o arquivo do Pine ao Livro de Endereços"
 
-#: src/inc.c:205
-#: src/inc.c:312
-#: src/inc.c:339
+#: src/inc.c:186 src/inc.c:293 src/inc.c:320
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "O Claws Mail necessita de acesso à rede para obter as mensagens."
 
-#: src/inc.c:361
+#: src/inc.c:342
 #, c-format
 msgid "%s failed\n"
 msgstr "%s falhou\n"
 
-#: src/inc.c:432
+#: src/inc.c:413
 msgid "Retrieving new messages"
 msgstr "Recebendo novas mensagens"
 
-#: src/inc.c:493
+#: src/inc.c:474
 msgid "Standby"
 msgstr "Aguardando"
 
-#: src/inc.c:618
-#: src/inc.c:672
+#: src/inc.c:604 src/inc.c:658
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:629
+#: src/inc.c:615
 msgid "Retrieving"
 msgstr "Recebendo"
 
-#: src/inc.c:638
+#: src/inc.c:624
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Pronto (%d mensagem, (%s) recebida)"
 msgstr[1] "Pronto (%d mensagens, (%s) recebidas)"
 
-#: src/inc.c:644
+#: src/inc.c:630
 msgid "Done (no new messages)"
 msgstr "Pronto (não há novas mensagens)"
 
-#: src/inc.c:649
+#: src/inc.c:635
 msgid "Connection failed"
 msgstr "Ocorreu uma falha na conexão"
 
-#: src/inc.c:652
+#: src/inc.c:638
 msgid "Auth failed"
 msgstr "Ocorreu um erro na autenticação"
 
-#: src/inc.c:659
-#: src/prefs_matcher.c:393
-#: src/prefs_summary_column.c:88
-#: src/summaryview.c:2782
-#: src/summaryview.c:6312
+#: src/inc.c:645 src/prefs_matcher.c:393 src/prefs_summary_column.c:88
+#: src/summaryview.c:2782 src/summaryview.c:6308
 msgid "Locked"
 msgstr "Travada"
 
-#: src/inc.c:669
-#: src/plugins/spamassassin/spamassassin_gtk.c:378
+#: src/inc.c:655 src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Timeout"
 msgstr "Tempo esgotado"
 
-#: src/inc.c:756
+#: src/inc.c:742
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Concluído (%d mensagem nova)"
 msgstr[1] "Concluído (%d mensagens novas)"
 
-#: src/inc.c:760
+#: src/inc.c:746
 msgid "Finished (no new messages)"
 msgstr "Concluído (não há novas mensagens)"
 
-#: src/inc.c:799
+#: src/inc.c:785
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensagens"
 
-#: src/inc.c:832
+#: src/inc.c:818
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Conta '%s': Conectando ao servidor POP3: %s:%d..."
 
-#: src/inc.c:850
+#: src/inc.c:836
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Não foi possível conectar ao servidor POP3: %s:%d"
 
-#: src/inc.c:854
+#: src/inc.c:840
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Não foi possível conectar ao servidor POP3: %s:%d\n"
 
-#: src/inc.c:934
-#: src/send_message.c:478
+#: src/inc.c:920 src/send_message.c:486
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:936
+#: src/inc.c:922
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Recuperando mensagens de %s (%s)..."
 
-#: src/inc.c:942
+#: src/inc.c:928
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensagens (STAT)..."
 
-#: src/inc.c:946
+#: src/inc.c:932
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensagens (LAST)..."
 
-#: src/inc.c:950
+#: src/inc.c:936
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensagens (UIDL)..."
 
-#: src/inc.c:954
+#: src/inc.c:940
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tamanho das mensagens (LIST)..."
 
-#: src/inc.c:961
-#: src/send_message.c:496
+#: src/inc.c:947 src/send_message.c:504
 msgid "Quitting"
 msgstr "Saindo"
 
-#: src/inc.c:986
+#: src/inc.c:972
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando a mensagem (%d / %d) (%s / %s)"
 
-#: src/inc.c:999
+#: src/inc.c:985
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Recebendo (%d mensagem), (%s) recebida)"
 msgstr[1] "Recebendo (%d mensagens, (%s) recebidas)"
 
-#: src/inc.c:1158
+#: src/inc.c:1144
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Ocorreu uma falha na conexão com %s:%d."
 
-#: src/inc.c:1163
+#: src/inc.c:1149
 msgid "Error occurred while processing mail."
 msgstr "Ocorreu um erro durante o processamento da mensagem."
 
-#: src/inc.c:1169
+#: src/inc.c:1155
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6799,39 +6274,37 @@ msgstr ""
 "Ocorreu um erro durante o processamento da mensagem:\n"
 "%s"
 
-#: src/inc.c:1175
+#: src/inc.c:1161
 msgid "No disk space left."
 msgstr "Não há espaço disponível no disco."
 
-#: src/inc.c:1180
+#: src/inc.c:1166
 msgid "Can't write file."
 msgstr "Não foi possível gravar o arquivo."
 
-#: src/inc.c:1185
+#: src/inc.c:1171
 msgid "Socket error."
 msgstr "Erro de socket."
 
-#: src/inc.c:1188
+#: src/inc.c:1174
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Erro de socket na conexão com %s:%d."
 
-#: src/inc.c:1193
-#: src/send_message.c:406
-#: src/send_message.c:670
+#: src/inc.c:1179 src/send_message.c:414 src/send_message.c:678
 msgid "Connection closed by the remote host."
 msgstr "A conexão foi fechada pelo computador remoto."
 
-#: src/inc.c:1196
+#: src/inc.c:1182
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "A conexão com %s:%d foi fechada pelo computador remoto."
 
-#: src/inc.c:1201
+#: src/inc.c:1187
 msgid "Mailbox is locked."
 msgstr "A caixa postal está travada."
 
-#: src/inc.c:1205
+#: src/inc.c:1191
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6840,13 +6313,11 @@ msgstr ""
 "A caixa postal está travada:\n"
 "%s"
 
-#: src/inc.c:1211
-#: src/send_message.c:655
+#: src/inc.c:1197 src/send_message.c:663
 msgid "Authentication failed."
 msgstr "Ocorreu uma falha na autenticação."
 
-#: src/inc.c:1217
-#: src/send_message.c:658
+#: src/inc.c:1203 src/send_message.c:666
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6855,47 +6326,35 @@ msgstr ""
 "Ocorreu uma falha na autenticação:\n"
 "%s"
 
-#: src/inc.c:1222
-#: src/send_message.c:674
+#: src/inc.c:1208 src/send_message.c:682
 msgid ""
-"Session timed out. You may be able to recover by increasing the timeout value "
-"in Preferences/Other/Miscellaneous."
+"Session timed out. You may be able to recover by increasing the timeout "
+"value in Preferences/Other/Miscellaneous."
 msgstr ""
 "O tempo da sessão está esgotado. Você pode recuperá-la aumentando o valor do "
 "tempo limite em Preferências/Outros/Miscelânea."
 
-#: src/inc.c:1227
+#: src/inc.c:1213
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Tempo esgotado na conexão com %s:%d."
 
-#: src/inc.c:1265
+#: src/inc.c:1251
 msgid "Incorporation cancelled\n"
 msgstr "A incorporação foi cancelada\n"
 
-#: src/inc.c:1457
-#, c-format
-msgid "Claws Mail: %d new message"
-msgid_plural "Claws Mail: %d new messages"
-msgstr[0] "Claws Mail: %d nova mensagem"
-msgstr[1] "Claws Mail: %d novas mensagens"
-
-#: src/inc.c:1584
-msgid "Unable to connect: you are offline."
-msgstr "Não foi possível conectar: você está desconectado."
-
-#: src/inc.c:1610
+#: src/inc.c:1518
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr ""
 "%s%sVocê está trabalhando em modo desconectado. Redefinir por %d minutos?"
 
-#: src/inc.c:1616
+#: src/inc.c:1524
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sVocê está trabalhando em modo desconectado. Redefinir?"
 
-#: src/inc.c:1623
+#: src/inc.c:1531
 msgid "On_ly once"
 msgstr "Apenas _uma vez"
 
@@ -6903,7 +6362,7 @@ msgstr "Apenas _uma vez"
 msgid "Nick Name"
 msgstr "Apelido"
 
-#: src/main.c:272
+#: src/main.c:241
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6912,12 +6371,7 @@ msgstr ""
 "O arquivo '%s' já existe.\n"
 "Não foi possível criar a pasta."
 
-#: src/main.c:294
-#: src/main.c:307
-msgid "Exiting..."
-msgstr "Saindo..."
-
-#: src/main.c:438
+#: src/main.c:362
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6926,7 +6380,7 @@ msgstr ""
 "Foi encontrada uma configuração para %s.\n"
 "Deseja migrar essa configuração?"
 
-#: src/main.c:440
+#: src/main.c:364
 #, c-format
 msgid ""
 "\n"
@@ -6939,11 +6393,11 @@ msgstr ""
 "As suas regras de filtragem do Sylpheed podem ser\n"
 "convertidas por um script disponível em %s."
 
-#: src/main.c:452
+#: src/main.c:376
 msgid "Keep old configuration"
 msgstr "Manter a configuração antiga"
 
-#: src/main.c:455
+#: src/main.c:379
 msgid ""
 "Keeping a backup will allow you to go back to an older version, but may take "
 "a while if you have cached IMAP or News data, and will take some extra room "
@@ -6953,51 +6407,51 @@ msgstr ""
 "consumir um tempo se você tem dados de IMAP ou News no cache, além de ocupar "
 "um espaço extra no seu disco."
 
-#: src/main.c:463
+#: src/main.c:387
 msgid "Migration of configuration"
 msgstr "Migração de configuração"
 
-#: src/main.c:474
+#: src/main.c:398
 msgid "Copying configuration... This may take a while..."
 msgstr "Copiando a configuração... Isso pode demorar um pouco..."
 
-#: src/main.c:483
+#: src/main.c:407
 msgid "Migration failed!"
 msgstr "Falha na migração!"
 
-#: src/main.c:492
+#: src/main.c:416
 msgid "Migrating configuration..."
 msgstr "Migrando a configuração..."
 
-#: src/main.c:1039
+#: src/main.c:934
 msgid "Failed to register folder item update hook"
 msgstr "Não foi possível registrar o gancho de atualização de itens da pasta"
 
-#: src/main.c:1046
+#: src/main.c:941
 msgid "Failed to register folder update hook"
 msgstr "Não foi possível registrar o gancho de atualização da pasta"
 
-#: src/main.c:1226
+#: src/main.c:1110
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread não é suportado pela glib.\n"
 
-#: src/main.c:1245
+#: src/main.c:1129
 msgid "Sylpheed-Claws 2.6.0 (or older)"
 msgstr "Sylpheed-Claws 2.6.0 (ou mais antigo)"
 
-#: src/main.c:1248
+#: src/main.c:1132
 msgid "Sylpheed-Claws 1.9.15 (or older)"
 msgstr "Sylpheed-Claws 1.9.15 (ou mais antigo)"
 
-#: src/main.c:1251
+#: src/main.c:1135
 msgid "Sylpheed-Claws 1.0.5 (or older)"
 msgstr "Sylpheed-Claws 1.0.5 (ou mais antigo)"
 
-#: src/main.c:1574
+#: src/main.c:1434
 #, c-format
 msgid ""
-"The following plugin failed to load. Check the Plugins configuration for more "
-"information:\n"
+"The following plugin failed to load. Check the Plugins configuration for "
+"more information:\n"
 "%s"
 msgid_plural ""
 "The following plugins failed to load. Check the Plugins configuration for "
@@ -7012,7 +6466,7 @@ msgstr[1] ""
 "plugins para maiores informações:\n"
 "%s"
 
-#: src/main.c:1602
+#: src/main.c:1462
 msgid ""
 "Claws Mail has detected a configured mailbox, but it is incomplete. It is "
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
@@ -7023,7 +6477,7 @@ msgstr ""
 "de pastas\" no menu de contexto da pasta raiz da pasta da caixa postal para "
 "tentar consertá-la."
 
-#: src/main.c:1608
+#: src/main.c:1468
 msgid ""
 "Claws Mail has detected a configured mailbox, but could not load it. It is "
 "probably provided by an out-of-date external plugin. Please reinstall the "
@@ -7033,45 +6487,41 @@ msgstr ""
 "carregá-la. Ela provavelmente foi fornecida por um plugin externo "
 "desatualizado. Por favor, reinstale o plugin e tente novamente."
 
-#: src/main.c:1637
-#, c-format
-msgid "Claws Mail can not start without its data volume (%s)."
-msgstr "O Claws Mail não pode iniciar sem o seu volume de dados (%s)."
-
-#: src/main.c:1884
+#: src/main.c:1711
 msgid "Missing filename\n"
 msgstr "Falta o nome do arquivo\n"
 
-#: src/main.c:1891
+#: src/main.c:1718
 msgid "Cannot open filename for reading\n"
 msgstr "Não foi possível abrir o arquivo para leitura\n"
 
-#: src/main.c:1902
+#: src/main.c:1729
 msgid "Malformed header\n"
 msgstr "Cabeçalho malformatado\n"
 
-#: src/main.c:1909
+#: src/main.c:1736
 msgid "Duplicated 'To:' header\n"
 msgstr "Cabeçalho 'To:' duplicado\n"
 
-#: src/main.c:1924
+#: src/main.c:1751
 msgid "Missing required 'To:' header\n"
 msgstr "Falta o cabeçalho 'To:' (e ele é necessário)\n"
 
-#: src/main.c:2071
+#: src/main.c:1898
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilização: %s [OPÇÕES]...\n"
 
-#: src/main.c:2073
+#: src/main.c:1900
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [endereço]   abre a janela de composição de mensagens"
 
-#: src/main.c:2074
+#: src/main.c:1901
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
-"                         use - as file name for reading from standard input;\n"
+"                         use - as file name for reading from standard "
+"input;\n"
 "                         content format: headers first (To: required) until "
 "an\n"
 "                         empty line, then mail body until end of file."
@@ -7082,70 +6532,71 @@ msgstr ""
 "                         use - no lugar do nome do arquivo para ler a partir "
 "da\n"
 "                         entrada padrão;\n"
-"                          formato do conteúdo: cabeçalhos (To: é obrigatório) "
-"até uma\n"
+"                          formato do conteúdo: cabeçalhos (To: é "
+"obrigatório) até uma\n"
 "                         linha em branco e o corpo do e-mail até o fim do "
 "arquivo"
 
-#: src/main.c:2079
+#: src/main.c:1906
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      assina a URI fornecida, caso seja possível"
 
-#: src/main.c:2080
+#: src/main.c:1907
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 "  --attach arquivo1 [arquivo2]...\n"
-"                         abre uma janela de composição, anexando os arquivos\n"
+"                         abre uma janela de composição, anexando os "
+"arquivos\n"
 "                         especificados"
 
-#: src/main.c:2083
+#: src/main.c:1910
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recebe novas mensagens"
 
-#: src/main.c:2084
+#: src/main.c:1911
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recebe novas mensagens de todas as contas"
 
-#: src/main.c:2085
+#: src/main.c:1912
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     cancela o recebimento de mensagens"
 
-#: src/main.c:2086
+#: src/main.c:1913
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       cancela o envio de mensagens"
 
-#: src/main.c:2087
+#: src/main.c:1914
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
 "                         folder ex.: \"#mh/Mailbox/inbox\" or \"Mail\"\n"
-"                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] or g: "
-"tag\n"
+"                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] or "
+"g: tag\n"
 "                         request: search string\n"
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr ""
 "--search pasta tipo solicitação [recursive]\n"
 "                         pesquisa mensagens\n"
 "                         pasta: ex.: \"#mh/Mailbox/inbox\" ou \"Mail\"\n"
-"                         tipo: s[ubject] (assunto), f[rom] (de), t[o] (para), "
-"e[xtended]\n"
+"                         tipo: s[ubject] (assunto), f[rom] (de), t[o] "
+"(para), e[xtended]\n"
 "                         (extendido), m[ixed] (misto) ou g: etiqueta\n"
 "                         solicitação: sequência a ser pesquisada\n"
-"                         recursive: falso se o argumento começar com 0, n, N, "
-"f ou F"
+"                         recursive: falso se o argumento começar com 0, n, "
+"N, f ou F"
 
-#: src/main.c:2094
+#: src/main.c:1921
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envia todas as mensagens da Fila de Saída"
 
-#: src/main.c:2095
+#: src/main.c:1922
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [pasta]...    mostra o número total de mensagens"
 
-#: src/main.c:2096
+#: src/main.c:1923
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -7153,15 +6604,15 @@ msgstr ""
 "  --status-full [pasta]...\n"
 "                         mostra o status de cada pasta"
 
-#: src/main.c:2098
+#: src/main.c:1925
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           exibe as estatísticas da sessão"
 
-#: src/main.c:2099
+#: src/main.c:1926
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     reinicia as estatísticas de sessão"
 
-#: src/main.c:2100
+#: src/main.c:1927
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -7169,47 +6620,47 @@ msgstr ""
 "  --select pasta[/msg]   vai para a pasta/mensagem especificada\n"
 "                         pasta é uma id de pasta, como 'pasta/sub_pasta'"
 
-#: src/main.c:2102
+#: src/main.c:1929
 msgid "  --online               switch to online mode"
 msgstr "  --online               alterna para o modo conectado"
 
-#: src/main.c:2103
+#: src/main.c:1930
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              alterna para o modo desconectado"
 
-#: src/main.c:2104
+#: src/main.c:1931
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       sai do Claws Mail"
 
-#: src/main.c:2105
+#: src/main.c:1932
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuração"
 
-#: src/main.c:2106
+#: src/main.c:1933
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         alterna o mode de debug"
 
-#: src/main.c:2107
+#: src/main.c:1934
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              exibe essa tela de ajuda e finaliza"
 
-#: src/main.c:2108
+#: src/main.c:1935
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           exibe a versão do programa e finaliza"
 
-#: src/main.c:2109
+#: src/main.c:1936
 msgid ""
-"  --version-full -V      output version and built-in features information and "
-"exit"
+"  --version-full -V      output version and built-in features information "
+"and exit"
 msgstr ""
 "  --version-full -V      exibe a versão do programa e informações sobre os\n"
 "                         recursos internos e finaliza"
 
-#: src/main.c:2110
+#: src/main.c:1937
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           exibe o diretório de configuração"
 
-#: src/main.c:2111
+#: src/main.c:1938
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -7217,45 +6668,42 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                         usa o diretório de configuração especificado"
 
-#: src/main.c:2161
+#: src/main.c:1988
 msgid "Unknown option\n"
 msgstr "Opção desconhecida\n"
 
-#: src/main.c:2179
+#: src/main.c:2006
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Processando (%s)..."
 
-#: src/main.c:2182
+#: src/main.c:2009
 msgid "top level folder"
 msgstr "pasta do nível mais acima"
 
-#: src/main.c:2265
+#: src/main.c:2092
 msgid "Queued messages"
 msgstr "Mensagens na Fila de Saída"
 
-#: src/main.c:2266
+#: src/main.c:2093
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Ainda existem mensagens da Fila de Saída que não foram enviadas. Finalizar "
 "agora?"
 
-#: src/main.c:2999
+#: src/main.c:2818
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: a rede está conectada.\n"
 
-#: src/main.c:3005
+#: src/main.c:2824
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: a rede está desconectada.\n"
 
-#: src/mainwindow.c:503
-#: src/messageview.c:210
+#: src/mainwindow.c:503 src/messageview.c:208
 msgid "_File"
 msgstr "_Arquivo"
 
-#: src/mainwindow.c:505
-#: src/messageview.c:212
-#: src/summaryview.c:436
+#: src/mainwindow.c:505 src/messageview.c:210 src/summaryview.c:436
 msgid "_View"
 msgstr "E_xibir"
 
@@ -7291,23 +6739,19 @@ msgstr "Exportar a seleção para um _arquivo mbox..."
 msgid "Empty all _Trash folders"
 msgstr "Esvaziar todas as _Lixeiras"
 
-#: src/mainwindow.c:526
-#: src/messageview.c:219
+#: src/mainwindow.c:526 src/messageview.c:217
 msgid "_Save email as..."
 msgstr "Salvar a _mensagem como..."
 
-#: src/mainwindow.c:527
-#: src/messageview.c:220
+#: src/mainwindow.c:527 src/messageview.c:218
 msgid "_Save part as..."
 msgstr "Salvar a _parte como..."
 
-#: src/mainwindow.c:530
-#: src/messageview.c:221
+#: src/mainwindow.c:530 src/messageview.c:219
 msgid "Page setup..."
 msgstr "Con_figuração da página..."
 
-#: src/mainwindow.c:531
-#: src/messageview.c:222
+#: src/mainwindow.c:531 src/messageview.c:220
 msgid "_Print..."
 msgstr "_Imprimir..."
 
@@ -7375,127 +6819,99 @@ msgstr "E_xpandir todas as discussões"
 msgid "Co_llapse all threads"
 msgstr "Recolher _todas as discussões"
 
-#: src/mainwindow.c:568
-#: src/messageview.c:233
+#: src/mainwindow.c:568 src/messageview.c:231
 msgid "_Go to"
 msgstr "_Ir para"
 
-#: src/mainwindow.c:569
-#: src/messageview.c:234
+#: src/mainwindow.c:569 src/messageview.c:232
 msgid "_Previous message"
 msgstr "Mensagem _anterior"
 
-#: src/mainwindow.c:570
-#: src/messageview.c:235
+#: src/mainwindow.c:570 src/messageview.c:233
 msgid "_Next message"
 msgstr "_Próxima mensagem"
 
-#: src/mainwindow.c:572
-#: src/messageview.c:237
+#: src/mainwindow.c:572 src/messageview.c:235
 msgid "P_revious unread message"
 msgstr "Mensagem não _lida anterior"
 
-#: src/mainwindow.c:573
-#: src/messageview.c:238
+#: src/mainwindow.c:573 src/messageview.c:236
 msgid "N_ext unread message"
 msgstr "Próxima mensagem _não lida"
 
-#: src/mainwindow.c:575
-#: src/messageview.c:240
+#: src/mainwindow.c:575 src/messageview.c:238
 msgid "Previous ne_w message"
 msgstr "_Mensagem nova anterior"
 
-#: src/mainwindow.c:576
-#: src/messageview.c:241
+#: src/mainwindow.c:576 src/messageview.c:239
 msgid "Ne_xt new message"
 msgstr "Próxima m_ensagem nova"
 
-#: src/mainwindow.c:578
-#: src/messageview.c:243
+#: src/mainwindow.c:578 src/messageview.c:241
 msgid "Previous _marked message"
 msgstr "Mensagem ma_rcada anterior"
 
-#: src/mainwindow.c:579
-#: src/messageview.c:244
+#: src/mainwindow.c:579 src/messageview.c:242
 msgid "Next m_arked message"
 msgstr "Próxima mensa_gem marcada"
 
-#: src/mainwindow.c:581
-#: src/messageview.c:246
+#: src/mainwindow.c:581 src/messageview.c:244
 msgid "Previous _labeled message"
 msgstr "Mensagem rot_ulada anterior"
 
-#: src/mainwindow.c:582
-#: src/messageview.c:247
+#: src/mainwindow.c:582 src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "Próxima mensagem ro_tulada"
 
-#: src/mainwindow.c:584
-#: src/messageview.c:249
+#: src/mainwindow.c:584 src/messageview.c:247
 msgid "Previous opened message"
 msgstr "Mensagem aberta anterior"
 
-#: src/mainwindow.c:585
-#: src/messageview.c:250
+#: src/mainwindow.c:585 src/messageview.c:248
 msgid "Next opened message"
 msgstr "Próxima mensagem aberta"
 
-#: src/mainwindow.c:587
-#: src/messageview.c:252
+#: src/mainwindow.c:587 src/messageview.c:250
 msgid "Parent message"
 msgstr "Mensagem pai"
 
-#: src/mainwindow.c:589
-#: src/messageview.c:254
+#: src/mainwindow.c:589 src/messageview.c:252
 msgid "Next unread _folder"
 msgstr "Próxima pa_sta não lida"
 
-#: src/mainwindow.c:590
-#: src/messageview.c:255
+#: src/mainwindow.c:590 src/messageview.c:253
 msgid "_Other folder..."
 msgstr "_Outra pasta..."
 
-#: src/mainwindow.c:592
-#: src/messageview.c:257
-#: src/mimeview.c:210
+#: src/mainwindow.c:592 src/messageview.c:255 src/mimeview.c:201
 msgid "Next part"
 msgstr "Próxima parte"
 
-#: src/mainwindow.c:593
-#: src/messageview.c:258
-#: src/mimeview.c:211
+#: src/mainwindow.c:593 src/messageview.c:256 src/mimeview.c:202
 msgid "Previous part"
 msgstr "Parte anterior"
 
-#: src/mainwindow.c:596
-#: src/messageview.c:259
+#: src/mainwindow.c:596 src/messageview.c:257
 msgid "Message scroll"
 msgstr "Rolagem da mensagem"
 
-#: src/mainwindow.c:597
-#: src/messageview.c:260
+#: src/mainwindow.c:597 src/messageview.c:258
 msgid "Previous line"
 msgstr "Linha anterior"
 
-#: src/mainwindow.c:598
-#: src/messageview.c:261
+#: src/mainwindow.c:598 src/messageview.c:259
 msgid "Next line"
 msgstr "Próxima linha"
 
-#: src/mainwindow.c:599
-#: src/messageview.c:262
-#: src/printing.c:487
+#: src/mainwindow.c:599 src/messageview.c:260 src/printing.c:487
 msgid "Previous page"
 msgstr "Página anterior"
 
-#: src/mainwindow.c:600
-#: src/messageview.c:263
-#: src/printing.c:494
+#: src/mainwindow.c:600 src/messageview.c:261 src/printing.c:494
 msgid "Next page"
 msgstr "Próxima página"
 
-#: src/mainwindow.c:618
-#: src/messageview.c:281
+#: src/mainwindow.c:618 src/messageview.c:279
 msgid "Decode"
 msgstr "_Decodificação"
 
@@ -7503,34 +6919,27 @@ msgstr "_Decodificação"
 msgid "Open in new _window"
 msgstr "Abrir em uma nova _janela"
 
-#: src/mainwindow.c:626
-#: src/messageview.c:288
+#: src/mainwindow.c:626 src/messageview.c:286
 msgid "Mess_age source"
 msgstr "Código-_fonte da mensagem"
 
-#: src/mainwindow.c:628
-#: src/messageview.c:289
+#: src/mainwindow.c:628 src/messageview.c:287
 msgid "Message part"
 msgstr "Parte da mensagem"
 
-#: src/mainwindow.c:629
-#: src/messageview.c:290
+#: src/mainwindow.c:629 src/messageview.c:288
 msgid "View as text"
 msgstr "Visualizar como texto"
 
-#: src/mainwindow.c:630
-#: src/messageview.c:291
-#: src/toolbar.c:401
+#: src/mainwindow.c:630 src/messageview.c:289 src/toolbar.c:402
 msgid "Open"
 msgstr "Abrir"
 
-#: src/mainwindow.c:632
-#: src/messageview.c:293
+#: src/mainwindow.c:632 src/messageview.c:291
 msgid "Open with..."
 msgstr "Abrir com..."
 
-#: src/mainwindow.c:636
-#: src/messageview.c:296
+#: src/mainwindow.c:636 src/messageview.c:294
 msgid "Quotes"
 msgstr "Ci_tações"
 
@@ -7566,20 +6975,16 @@ msgstr "Escrever uma mensa_gem de e-mail"
 msgid "Compose a news message"
 msgstr "Escrever artigo de _Newsgroup"
 
-#: src/mainwindow.c:655
-#: src/messageview.c:302
+#: src/mainwindow.c:655 src/messageview.c:300
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Responder"
 
-#: src/mainwindow.c:656
-#: src/messageview.c:303
-#: src/summaryview.c:428
+#: src/mainwindow.c:656 src/messageview.c:301 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "Responder _para"
 
-#: src/mainwindow.c:659
-#: src/messageview.c:306
+#: src/mainwindow.c:659 src/messageview.c:304
 msgid "Mailing _list"
 msgstr "_Lista de discussão"
 
@@ -7587,21 +6992,15 @@ msgstr "_Lista de discussão"
 msgid "Follow-up and reply to"
 msgstr "_Acompanhar o assunto e responder"
 
-#: src/mainwindow.c:663
-#: src/messageview.c:309
-#: src/toolbar.c:2087
+#: src/mainwindow.c:663 src/messageview.c:307 src/toolbar.c:2088
 msgid "_Forward"
 msgstr "_Encaminhar"
 
-#: src/mainwindow.c:664
-#: src/messageview.c:310
-#: src/toolbar.c:2088
+#: src/mainwindow.c:664 src/messageview.c:308 src/toolbar.c:2089
 msgid "For_ward as attachment"
 msgstr "Encaminhar como _anexo"
 
-#: src/mainwindow.c:665
-#: src/messageview.c:311
-#: src/toolbar.c:2089
+#: src/mainwindow.c:665 src/messageview.c:309 src/toolbar.c:2090
 msgid "Redirec_t"
 msgstr "Re_direcionar"
 
@@ -7649,9 +7048,7 @@ msgstr "E_xcluir..."
 msgid "Cancel a news message"
 msgstr "Cancelar uma mensagem de Ne_wsgroup"
 
-#: src/mainwindow.c:689
-#: src/mainwindow.c:690
-#: src/summaryview.c:429
+#: src/mainwindow.c:689 src/mainwindow.c:690 src/summaryview.c:429
 msgid "_Mark"
 msgstr "_Marcar"
 
@@ -7671,10 +7068,8 @@ msgstr "Marcar como _lida"
 msgid "Mark all read"
 msgstr "Marcar _todas como lidas"
 
-#: src/mainwindow.c:699
-#: src/prefs_filtering_action.c:199
-#: src/toolbar.c:207
-#: src/toolbar.c:417
+#: src/mainwindow.c:699 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/toolbar.c:418
 msgid "Ignore thread"
 msgstr "Ignorar _discussão"
 
@@ -7682,10 +7077,8 @@ msgstr "Ignorar _discussão"
 msgid "Unignore thread"
 msgstr "Não i_gnorar discussão"
 
-#: src/mainwindow.c:701
-#: src/prefs_filtering_action.c:200
-#: src/toolbar.c:208
-#: src/toolbar.c:418
+#: src/mainwindow.c:701 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/toolbar.c:419
 msgid "Watch thread"
 msgstr "O_bservar discussão"
 
@@ -7701,23 +7094,19 @@ msgstr "Marcar como _spam"
 msgid "Mark as _ham"
 msgstr "Marcar como _não-spam"
 
-#: src/mainwindow.c:709
-#: src/prefs_filtering_action.c:181
+#: src/mainwindow.c:709 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Bloquear"
 
-#: src/mainwindow.c:710
-#: src/prefs_filtering_action.c:182
+#: src/mainwindow.c:710 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: src/mainwindow.c:712
-#: src/summaryview.c:430
+#: src/mainwindow.c:712 src/summaryview.c:430
 msgid "Color la_bel"
 msgstr "Ró_tulo colorido"
 
-#: src/mainwindow.c:713
-#: src/summaryview.c:431
+#: src/mainwindow.c:713 src/summaryview.c:431
 msgid "Ta_gs"
 msgstr "E_tiquetas"
 
@@ -7725,14 +7114,11 @@ msgstr "E_tiquetas"
 msgid "Re-_edit"
 msgstr "Reedi_tar"
 
-#: src/mainwindow.c:719
-#: src/messageview.c:312
-#: src/mimeview.c:1039
+#: src/mainwindow.c:719 src/messageview.c:310 src/mimeview.c:1030
 msgid "Check signature"
 msgstr "Verificar assinatura"
 
-#: src/mainwindow.c:724
-#: src/messageview.c:316
+#: src/mainwindow.c:724 src/messageview.c:314
 msgid "Add sender to address boo_k"
 msgstr "Adicionar remetente ao Li_vro de Endereços"
 
@@ -7760,49 +7146,35 @@ msgstr "Filtrar as mensagens _selecionadas"
 msgid "Run folder pr_ocessing rules"
 msgstr "E_xecutar regras de processamento da pasta"
 
-#: src/mainwindow.c:735
-#: src/messageview.c:319
+#: src/mainwindow.c:735 src/messageview.c:317
 msgid "_Create filter rule"
 msgstr "Criar regra de _filtragem"
 
-#: src/mainwindow.c:736
-#: src/mainwindow.c:742
-#: src/messageview.c:320
-#: src/messageview.c:326
+#: src/mainwindow.c:736 src/mainwindow.c:742 src/messageview.c:318
+#: src/messageview.c:324
 msgid "_Automatically"
 msgstr "_Automaticamente"
 
-#: src/mainwindow.c:737
-#: src/mainwindow.c:743
-#: src/mainwindow.c:847
-#: src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:737 src/mainwindow.c:743 src/mainwindow.c:845
+#: src/messageview.c:319 src/messageview.c:325
 msgid "By _From"
 msgstr "Pelo _remetente (De:)"
 
-#: src/mainwindow.c:738
-#: src/mainwindow.c:744
-#: src/mainwindow.c:848
-#: src/messageview.c:322
-#: src/messageview.c:328
+#: src/mainwindow.c:738 src/mainwindow.c:744 src/mainwindow.c:846
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _To"
 msgstr "Pelo _destinatário (Para:)"
 
-#: src/mainwindow.c:739
-#: src/mainwindow.c:745
-#: src/messageview.c:323
-#: src/messageview.c:329
+#: src/mainwindow.c:739 src/mainwindow.c:745 src/messageview.c:321
+#: src/messageview.c:327
 msgid "By _Subject"
 msgstr "Pelo a_ssunto"
 
-#: src/mainwindow.c:741
-#: src/messageview.c:325
-#: src/summaryview.c:434
+#: src/mainwindow.c:741 src/messageview.c:323 src/summaryview.c:434
 msgid "Create processing rule"
 msgstr "Criar re_gra de processamento"
 
-#: src/mainwindow.c:748
-#: src/messageview.c:333
+#: src/mainwindow.c:748 src/messageview.c:331
 msgid "List _URLs..."
 msgstr "Listar _URLs..."
 
@@ -7942,202 +7314,186 @@ msgstr "Ocultar mensagens _lidas"
 msgid "Hide deleted messages"
 msgstr "Ocultar as mensagens excluídas"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:815
 msgid "_Fullscreen"
 msgstr "_Tela inteira"
 
-#: src/mainwindow.c:818
-#: src/messageview.c:345
+#: src/mainwindow.c:816 src/messageview.c:343
 msgid "Show all _headers"
 msgstr "Mostrar todos os cabeçal_hos"
 
-#: src/mainwindow.c:819
-#: src/messageview.c:346
+#: src/mainwindow.c:817 src/messageview.c:344
 msgid "_Collapse all"
 msgstr "Recolher _tudo"
 
-#: src/mainwindow.c:820
-#: src/messageview.c:347
+#: src/mainwindow.c:818 src/messageview.c:345
 msgid "Collapse from level _2"
 msgstr "Recolher a partir do nível _2"
 
-#: src/mainwindow.c:821
-#: src/messageview.c:348
+#: src/mainwindow.c:819 src/messageview.c:346
 msgid "Collapse from level _3"
 msgstr "Recolher a partir do nível _3"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:823
 msgid "Text _below icons"
 msgstr "Texto _abaixo do ícones"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:824
 msgid "Text be_side icons"
 msgstr "Texto ao _lado do ícones"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:825
 msgid "_Icons only"
 msgstr "Somente í_cones"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:826
 msgid "_Text only"
 msgstr "Somente _texto"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:833
 msgid "_Standard"
 msgstr "_Padrão"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:834
 msgid "_Three columns"
 msgstr "_Três colunas"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:835
 msgid "_Wide message"
 msgstr "Ampliar a área de _mensagens"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:836
 msgid "W_ide message list"
 msgstr "Amplicar a _lista de mensagens"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:837
 msgid "S_mall screen"
 msgstr "_Tela pequena"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:841
 msgid "By _number"
 msgstr "Pelo _número"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:842
 msgid "By s_ize"
 msgstr "Pelo _tamanho"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:843
 msgid "By _date"
 msgstr "Pela _data"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:844
 msgid "By thread date"
 msgstr "Pela data da disc_ussão"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:847
 msgid "By s_ubject"
 msgstr "Pelo a_ssunto"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:848
 msgid "By _color label"
 msgstr "Pela _cor do rótulo"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:849
 msgid "By tag"
 msgstr "Pela etiqueta"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:850
 msgid "By _mark"
 msgstr "Pela _marca"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:851
 msgid "By _status"
 msgstr "Pelo s_tatus"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:852
 msgid "By a_ttachment"
 msgstr "Pelo ane_xo"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:853
 msgid "By score"
 msgstr "Pela _pontuação"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:854
 msgid "By locked"
 msgstr "Pelo tra_vamento"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:855
 msgid "D_on't sort"
 msgstr "Não _ordenar"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:859
 msgid "Ascending"
 msgstr "_Crescente"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:860
 msgid "Descending"
 msgstr "_Decrescente"
 
-#: src/mainwindow.c:903
-#: src/messageview.c:389
+#: src/mainwindow.c:901 src/messageview.c:387
 msgid "_Auto detect"
 msgstr "_Autodetectar"
 
-#: src/mainwindow.c:1299
-#: src/summaryview.c:6238
+#: src/mainwindow.c:1297 src/summaryview.c:6234
 msgid "Apply tags..."
 msgstr "Aplicar etiquetas..."
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:1935
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Ocorreram alguns erros. Clique aqui para ver o relatório."
 
-#: src/mainwindow.c:2127
+#: src/mainwindow.c:1950
 msgid "You are online. Click the icon to go offline"
 msgstr "Você está conectado. Clique no ícone para desconectar."
 
-#: src/mainwindow.c:2130
+#: src/mainwindow.c:1953
 msgid "You are offline. Click the icon to go online"
 msgstr "Você está desconectado. Clique no ícone para conectar."
 
-#: src/mainwindow.c:2144
+#: src/mainwindow.c:1967
 msgid "Select account"
 msgstr "Selecione a conta"
 
-#: src/mainwindow.c:2171
-#: src/prefs_logging.c:140
+#: src/mainwindow.c:1994 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Relatório da rede"
 
-#: src/mainwindow.c:2175
+#: src/mainwindow.c:1998
 msgid "Filtering/Processing debug log"
 msgstr "Relatório de depuração da filtragem/processamento"
 
-#: src/mainwindow.c:2194
-#: src/prefs_logging.c:392
+#: src/mainwindow.c:2017 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "relatório de filtragem habilitado\n"
 
-#: src/mainwindow.c:2196
-#: src/prefs_logging.c:394
+#: src/mainwindow.c:2019 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "relatório de filtragem desabilitado\n"
 
-#: src/mainwindow.c:2642
-#: src/mainwindow.c:2649
-#: src/mainwindow.c:2692
-#: src/mainwindow.c:2725
-#: src/mainwindow.c:2757
-#: src/mainwindow.c:2802
+#: src/mainwindow.c:2460 src/mainwindow.c:2467 src/mainwindow.c:2510
+#: src/mainwindow.c:2543 src/mainwindow.c:2575 src/mainwindow.c:2620
 #: src/plugins/notification/notification_trayicon.c:363
 #: src/prefs_folder_item.c:1067
 msgid "Untitled"
 msgstr "Sem título"
 
-#: src/mainwindow.c:2803
-#: src/prefs_summary_open.c:114
+#: src/mainwindow.c:2621 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "nenhuma"
 
-#: src/mainwindow.c:3060
-#: src/mainwindow.c:3064
+#: src/mainwindow.c:2878 src/mainwindow.c:2882
 msgid "Delete all messages in trash folders?"
 msgstr "Excluir todas as mensagens da Lixeira?"
 
-#: src/mainwindow.c:3061
+#: src/mainwindow.c:2879
 msgid "Don't quit"
 msgstr "Não sair"
 
-#: src/mainwindow.c:3090
-#: src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2908 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Adicionar caixa postal"
 
-#: src/mainwindow.c:3091
+#: src/mainwindow.c:2909
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -8147,23 +7503,18 @@ msgstr ""
 "Se for especificada uma já existente, ela será\n"
 "verificada automaticamente."
 
-#: src/mainwindow.c:3097
-#: src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:158
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "A caixa postal '%s' já existe."
 
-#: src/mainwindow.c:3102
-#: src/plugins/mailmbox/plugin_gtk.c:202
-#: src/setup.c:52
-#: src/wizard.c:774
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:202 src/setup.c:52
+#: src/wizard.c:737
 msgid "Mailbox"
 msgstr "Caixa postal"
 
-#: src/mainwindow.c:3107
-#: src/plugins/mailmbox/plugin_gtk.c:209
-#: src/setup.c:55
+#: src/mainwindow.c:2925 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8173,97 +7524,87 @@ msgstr ""
 "Talvez já existam arquivos, ou você não possui permissão para escrita nesta "
 "pasta."
 
-#: src/mainwindow.c:3553
+#: src/mainwindow.c:3373
 msgid "No posting allowed"
 msgstr "Não é permitido o envio de mensagens"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "Não foi possível importar o mbox."
 
-#: src/mainwindow.c:4140
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:3960 src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "Não foi possível exportar para o mbox."
 
-#: src/mainwindow.c:4190
-#: src/plugins/notification/notification_trayicon.c:518
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:518
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:4190
-#: src/plugins/notification/notification_trayicon.c:518
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:518
 msgid "Exit Claws Mail?"
 msgstr "Sair do Claws Mail?"
 
-#: src/mainwindow.c:4379
+#: src/mainwindow.c:4199
 msgid "Folder synchronisation"
 msgstr "Sincronização das pastas"
 
-#: src/mainwindow.c:4380
+#: src/mainwindow.c:4200
 msgid "Do you want to synchronise your folders now?"
 msgstr "Deseja sincronizar suas pastas agora?"
 
-#: src/mainwindow.c:4381
+#: src/mainwindow.c:4201
 msgid "+_Synchronise"
 msgstr "+_Sincronizar"
 
-#: src/mainwindow.c:4810
+#: src/mainwindow.c:4630
 msgid "Deleting duplicated messages..."
 msgstr "Excluindo mensagens duplicadas..."
 
-#: src/mainwindow.c:4847
+#: src/mainwindow.c:4667
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Foi excluída %d mensagem duplicada em %d pastas.\n"
 msgstr[1] "Foram excluídas %d mensagens duplicadas em %d pastas.\n"
 
-#: src/mainwindow.c:5102
-#: src/summaryview.c:5727
+#: src/mainwindow.c:4922 src/summaryview.c:5723
 msgid "Processing rules to apply before folder rules"
 msgstr "Regras de processamento a serem aplicadas antes das regras das pastas"
 
-#: src/mainwindow.c:5110
+#: src/mainwindow.c:4930
 msgid "Processing rules to apply after folder rules"
 msgstr "Regras de processamento a serem aplicadas após as regras das pastas"
 
-#: src/mainwindow.c:5118
-#: src/summaryview.c:5738
+#: src/mainwindow.c:4938 src/summaryview.c:5734
 msgid "Filtering configuration"
 msgstr "Configuração da filtragem"
 
-#: src/mainwindow.c:5233
+#: src/mainwindow.c:5053
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
-"Não foi possível registrar como cliente padrão: impossível obter o caminho do "
-"executável."
+"Não foi possível registrar como cliente padrão: impossível obter o caminho "
+"do executável."
 
-#: src/mainwindow.c:5292
+#: src/mainwindow.c:5112
 msgid "Claws Mail has been registered as default client."
 msgstr "O Claws Mail foi registrado como o cliente padrão."
 
-#: src/mainwindow.c:5294
+#: src/mainwindow.c:5114
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Não foi possível registrar como cliente padrão: impossível escrever no "
 "registro."
 
-#: src/mainwindow.c:5452
+#: src/mainwindow.c:5272
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "%d senha esquecida em %d contas.\n"
 msgstr[1] "%d senhas esquecidas em %d contas.\n"
 
-#: src/matcher.c:209
-#: src/matcher.c:210
-#: src/matcher.c:211
-#: src/matcher.c:212
-#: src/matcher.c:213
-#: src/matcher.c:214
-#: src/matcher.c:215
+#: src/matcher.c:209 src/matcher.c:210 src/matcher.c:211 src/matcher.c:212
+#: src/matcher.c:213 src/matcher.c:214 src/matcher.c:215
 #, c-format
 msgid "%s header"
 msgstr "cabeçalho %s"
@@ -8284,48 +7625,30 @@ msgstr "linha do corpo"
 msgid "tag"
 msgstr "etiqueta"
 
-#: src/matcher.c:517
-#: src/matcher.c:522
-#: src/matcher.c:542
-#: src/matcher.c:547
-#: src/message_search.c:212
-#: src/prefs_matcher.c:737
-#: src/summary_search.c:452
+#: src/matcher.c:523 src/matcher.c:528 src/matcher.c:548 src/matcher.c:553
+#: src/message_search.c:217 src/prefs_matcher.c:739 src/summary_search.c:478
 msgid "Case sensitive"
 msgstr "Diferenciar maiúsc./minúsc."
 
-#: src/matcher.c:517
-#: src/matcher.c:522
-#: src/matcher.c:542
-#: src/matcher.c:547
+#: src/matcher.c:523 src/matcher.c:528 src/matcher.c:548 src/matcher.c:553
 msgid "Case insensitive"
 msgstr "Não diferenciar maiúsc./minúsc."
 
-#: src/matcher.c:1809
+#: src/matcher.c:1819
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "verificando se as mensagens correspondem [ %s ]\n"
 
-#: src/matcher.c:1878
-#: src/matcher.c:1897
-#: src/matcher.c:1910
+#: src/matcher.c:1888 src/matcher.c:1907 src/matcher.c:1920
 msgid "message matches\n"
 msgstr "a mensagem corresponde\n"
 
-#: src/matcher.c:1885
-#: src/matcher.c:1903
-#: src/matcher.c:1912
+#: src/matcher.c:1895 src/matcher.c:1913 src/matcher.c:1922
 msgid "message does not match\n"
 msgstr "a mensagem não corresponde\n"
 
-#: src/matcher.c:2175
-#: src/matcher.c:2176
-#: src/matcher.c:2177
-#: src/matcher.c:2178
-#: src/matcher.c:2179
-#: src/matcher.c:2180
-#: src/matcher.c:2181
-#: src/matcher.c:2182
+#: src/matcher.c:2185 src/matcher.c:2186 src/matcher.c:2187 src/matcher.c:2188
+#: src/matcher.c:2189 src/matcher.c:2190 src/matcher.c:2191 src/matcher.c:2192
 msgid "(none)"
 msgstr "(nenhuma)"
 
@@ -8353,11 +7676,8 @@ msgstr "Sobrescrever o arquivo mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "O arquivo já existe. Deseja sobrescrevê-lo?"
 
-#: src/mbox.c:555
-#: src/messageview.c:1868
-#: src/mimeview.c:1850
-#: src/prefs_themes.c:553
-#: src/textview.c:3120
+#: src/mbox.c:555 src/messageview.c:1843 src/mimeview.c:1844
+#: src/prefs_themes.c:553 src/textview.c:3120
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
@@ -8382,45 +7702,39 @@ msgstr "Localizar na mensagem atual"
 msgid "Find text:"
 msgstr "Localizar texto:"
 
-#: src/message_search.c:332
-#: src/summary_search.c:768
+#: src/message_search.c:346 src/summary_search.c:791
 msgid "Search failed"
 msgstr "Ocorreu um erro na pesquisa"
 
-#: src/message_search.c:333
-#: src/summary_search.c:769
+#: src/message_search.c:347 src/summary_search.c:792
 msgid "Search string not found."
 msgstr "A sequência pesquisada não foi localizada."
 
-#: src/message_search.c:342
+#: src/message_search.c:356
 msgid "Beginning of message reached; continue from end?"
 msgstr "Foi atingido o início da mensagem; continuar a partir do final?"
 
-#: src/message_search.c:345
+#: src/message_search.c:359
 msgid "End of message reached; continue from beginning?"
 msgstr "Foi atingido o fim da mensagem; continuar a partir do início?"
 
-#: src/message_search.c:348
-#: src/summary_search.c:780
+#: src/message_search.c:362 src/summary_search.c:803
 msgid "Search finished"
 msgstr "Pesquisa concluída"
 
-#: src/messageview.c:299
-#: src/textview.c:245
+#: src/messageview.c:297 src/textview.c:245
 msgid "Compose _new message"
 msgstr "Escrever _nova mensagem"
 
-#: src/messageview.c:729
-#: src/messageview.c:1413
-#: src/messageview.c:1610
+#: src/messageview.c:711 src/messageview.c:1388 src/messageview.c:1585
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Visualização das mensagens"
 
-#: src/messageview.c:860
+#: src/messageview.c:838
 msgid "<No Return-Path found>"
 msgstr "<Campo Return-Path não encontrado>"
 
-#: src/messageview.c:868
+#: src/messageview.c:846
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8435,12 +7749,11 @@ msgstr ""
 "Return-path: %s\n"
 "Não é aconselhável enviar a confirmação."
 
-#: src/messageview.c:875
-#: src/messageview.c:892
+#: src/messageview.c:853 src/messageview.c:870
 msgid "_Don't Send"
 msgstr "_Não enviar"
 
-#: src/messageview.c:888
+#: src/messageview.c:866
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -8452,56 +7765,48 @@ msgstr ""
 "oficialmente endereçada à você.\n"
 "Não é aconselhável enviar a confirmação de recebimento."
 
-#: src/messageview.c:1341
+#: src/messageview.c:1319
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Buscando a mensagem (%s)..."
 
-#: src/messageview.c:1377
-#: src/procmime.c:983
+#: src/messageview.c:1355 src/procmime.c:986
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Não foi possível descriptografar: %s"
 
-#: src/messageview.c:1460
-#: src/messageview.c:1468
+#: src/messageview.c:1435 src/messageview.c:1443
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "A mensagem não está de acordo com o padrão MIME. Ela pode ser renderizada "
 "incorretamente."
 
-#: src/messageview.c:1860
-#: src/messageview.c:1863
-#: src/mimeview.c:2003
-#: src/plugins/fancy/fancy_viewer.c:667
-#: src/summaryview.c:4814
-#: src/summaryview.c:4817
-#: src/textview.c:3108
+#: src/messageview.c:1835 src/messageview.c:1838 src/mimeview.c:1997
+#: src/plugins/fancy/fancy_viewer.c:668 src/summaryview.c:4810
+#: src/summaryview.c:4813 src/textview.c:3108
 msgid "Save as"
 msgstr "Salvar como"
 
-#: src/messageview.c:1869
+#: src/messageview.c:1844
 msgid "Overwrite existing file?"
 msgstr "Sobrescrever o arquivo existente?"
 
-#: src/messageview.c:1877
-#: src/summaryview.c:4834
-#: src/summaryview.c:4837
-#: src/summaryview.c:4852
+#: src/messageview.c:1852 src/summaryview.c:4830 src/summaryview.c:4833
+#: src/summaryview.c:4848
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Não foi possível salvar o arquivo '%s'."
 
-#: src/messageview.c:1931
+#: src/messageview.c:1905
 #, c-format
 msgid "Show all %s."
 msgstr "Exibir todos os %s."
 
-#: src/messageview.c:1933
+#: src/messageview.c:1907
 msgid "Only the first megabyte of text is shown."
 msgstr "É exibido somente o primeiro megabyte do texto."
 
-#: src/messageview.c:1964
+#: src/messageview.c:1938
 msgid ""
 "You got a return receipt for this message : it has been displayed by the "
 "recipient."
@@ -8509,19 +7814,19 @@ msgstr ""
 "Você recebeu uma confirmação de recebimento nessa mensagem: ela foi exibida "
 "pelo recebedor."
 
-#: src/messageview.c:1967
+#: src/messageview.c:1941
 msgid "You asked for a return receipt in this message."
 msgstr "Você solicitou uma confirmação de recebimento nessa mensagem."
 
-#: src/messageview.c:1973
+#: src/messageview.c:1947
 msgid "This message asks for a return receipt."
 msgstr "O remetente solicitou uma confirmação de recebimento."
 
-#: src/messageview.c:1974
+#: src/messageview.c:1948
 msgid "Send receipt"
 msgstr "Enviar a confirmação de recebimento"
 
-#: src/messageview.c:2017
+#: src/messageview.c:1991
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8529,7 +7834,7 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente,\n"
 "e foi excluída no servidor."
 
-#: src/messageview.c:2023
+#: src/messageview.c:1997
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8538,17 +7843,15 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente.;\n"
 "ela é %s."
 
-#: src/messageview.c:2027
-#: src/messageview.c:2049
+#: src/messageview.c:2001 src/messageview.c:2023
 msgid "Mark for download"
 msgstr "Marcar para receber"
 
-#: src/messageview.c:2028
-#: src/messageview.c:2040
+#: src/messageview.c:2002 src/messageview.c:2014
 msgid "Mark for deletion"
 msgstr "Marcar para exclusão"
 
-#: src/messageview.c:2033
+#: src/messageview.c:2007
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8557,13 +7860,12 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente;\n"
 "ela é %s e será baixada."
 
-#: src/messageview.c:2038
-#: src/messageview.c:2051
+#: src/messageview.c:2012 src/messageview.c:2025
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Desmarcar"
 
-#: src/messageview.c:2044
+#: src/messageview.c:2018
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8572,11 +7874,11 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente;\n"
 "ela é %s e será excluída."
 
-#: src/messageview.c:2117
+#: src/messageview.c:2091
 msgid "Return Receipt Notification"
 msgstr "Confirmação de recebimento"
 
-#: src/messageview.c:2118
+#: src/messageview.c:2092
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8588,20 +7890,19 @@ msgstr ""
 "Por favor, selecione qual a conta que você deseja utilizar para enviar a "
 "confirmação de recebimento:"
 
-#: src/messageview.c:2122
-#: src/plugins/rssyl/rssyl_gtk.c:480
+#: src/messageview.c:2096 src/plugins/rssyl/rssyl_gtk.c:480
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/messageview.c:2122
+#: src/messageview.c:2096
 msgid "_Send Notification"
 msgstr "_Enviar confirmação"
 
-#: src/messageview.c:2189
+#: src/messageview.c:2163
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Não foi possível imprimir: a mensagem não contém texto."
 
-#: src/messageview.c:2958
+#: src/messageview.c:2932
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8609,7 +7910,7 @@ msgstr ""
 "\n"
 "  Não existem mais mensagens nesta pasta"
 
-#: src/messageview.c:2966
+#: src/messageview.c:2940
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8617,7 +7918,7 @@ msgstr ""
 "\n"
 "  A mensagem foi excluída"
 
-#: src/messageview.c:2967
+#: src/messageview.c:2941
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8625,10 +7926,8 @@ msgstr ""
 "\n"
 "  A mensagem foi excluída ou movida para outra pasta"
 
-#: src/messageview.c:3000
-#: src/messageview.c:3006
-#: src/summaryview.c:4187
-#: src/summaryview.c:6975
+#: src/messageview.c:2974 src/messageview.c:2980 src/summaryview.c:4183
+#: src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "Ocorreu um erro durante a aprendizagem.\n"
 
@@ -8641,18 +7940,15 @@ msgstr "não foi possível copiar a mensagem %s para %s\n"
 msgid "Moving messages..."
 msgstr "Movendo as mensagens..."
 
-#: src/mh.c:662
-#: src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:662 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Excluindo mensagens..."
 
-#: src/mh_gtk.c:63
-#: src/plugins/mailmbox/plugin_gtk.c:67
+#: src/mh_gtk.c:63 src/plugins/mailmbox/plugin_gtk.c:67
 msgid "Remove _mailbox..."
 msgstr "Remover _caixa postal..."
 
-#: src/mh_gtk.c:358
-#: src/plugins/mailmbox/plugin_gtk.c:290
+#: src/mh_gtk.c:358 src/plugins/mailmbox/plugin_gtk.c:290
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
@@ -8661,123 +7957,106 @@ msgstr ""
 "Deseja realmente excluir a caixa postal '%s'?\n"
 "(As mensagens NÃO SERÃO excluídas do disco)"
 
-#: src/mh_gtk.c:360
-#: src/plugins/mailmbox/plugin_gtk.c:292
+#: src/mh_gtk.c:360 src/plugins/mailmbox/plugin_gtk.c:292
 msgid "Remove mailbox"
 msgstr "Remover a caixa postal"
 
-#: src/mimeview.c:202
+#: src/mimeview.c:193
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/mimeview.c:204
+#: src/mimeview.c:195
 msgid "Open _with..."
 msgstr "Abrir _com..."
 
-#: src/mimeview.c:206
+#: src/mimeview.c:197
 msgid "Send to..."
 msgstr "_Enviar para..."
 
-#: src/mimeview.c:207
+#: src/mimeview.c:198
 msgid "_Display as text"
 msgstr "Exibir como _texto"
 
-#: src/mimeview.c:208
+#: src/mimeview.c:199
 msgid "_Save as..."
 msgstr "_Salvar como..."
 
-#: src/mimeview.c:209
+#: src/mimeview.c:200
 msgid "Save _all..."
 msgstr "Salvar _todos..."
 
-#: src/mimeview.c:282
+#: src/mimeview.c:273
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: src/mimeview.c:1044
-#: src/mimeview.c:1049
-#: src/mimeview.c:1054
-#: src/mimeview.c:1059
+#: src/mimeview.c:1035 src/mimeview.c:1040 src/mimeview.c:1045
+#: src/mimeview.c:1050
 msgid "View full information"
 msgstr "Exibir informações completas"
 
-#: src/mimeview.c:1065
+#: src/mimeview.c:1056
 msgid "Check again"
 msgstr "Verificar novamente"
 
-#: src/mimeview.c:1077
+#: src/mimeview.c:1068
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Clique no ícone verificá-la."
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1070
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Clique no ícone ou pressione '%s' para verificá-la."
 
-#: src/mimeview.c:1089
+#: src/mimeview.c:1080
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Tempo esgotado durante a checagem da assinatura. Clique no ícone para tentar "
 "novamente."
 
-#: src/mimeview.c:1091
+#: src/mimeview.c:1082
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
-"Tempo esgotado durante a checagem da assinatura. Clique no ícone ou pressione "
-"'%s' para tentar novamente."
+"Tempo esgotado durante a checagem da assinatura. Clique no ícone ou "
+"pressione '%s' para tentar novamente."
 
-#: src/mimeview.c:1330
+#: src/mimeview.c:1322
 msgid "Checking signature..."
 msgstr "Verificando a assinatura..."
 
-#: src/mimeview.c:1373
+#: src/mimeview.c:1363
 msgid "Go back to email"
 msgstr "Voltar à mensagem"
 
-#: src/mimeview.c:1769
-#: src/mimeview.c:1858
-#: src/mimeview.c:2050
-#: src/mimeview.c:2093
-#: src/mimeview.c:2224
-#: src/plugins/fancy/fancy_viewer.c:420
+#: src/mimeview.c:1763 src/mimeview.c:1852 src/mimeview.c:2044
+#: src/mimeview.c:2080 src/mimeview.c:2192
+#: src/plugins/fancy/fancy_viewer.c:421
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
 "Não foi possível salvar uma das partes da mensagem com múltiplas partes: %s"
 
-#: src/mimeview.c:1847
-#: src/textview.c:3118
+#: src/mimeview.c:1841 src/textview.c:3118
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Sobrescrever o arquivo %s existente?"
 
-#: src/mimeview.c:1889
-#: src/plugins/archive/archiver_prefs.c:128
+#: src/mimeview.c:1883 src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
 msgstr "Selecione a pasta de destino"
 
-#: src/mimeview.c:1896
-#: src/plugins/archive/archiver_prefs.c:134
+#: src/mimeview.c:1890 src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' não é um diretório."
 
-#: src/mimeview.c:2125
-msgid "No registered viewer for this file type."
-msgstr "Não existem visualizadores registrados para esse tipo de arquivo."
-
-#: src/mimeview.c:2157
-#: src/mimeview.c:2164
-#: src/textview.c:3039
+#: src/mimeview.c:2127 src/mimeview.c:2134 src/textview.c:3039
 msgid "Open with"
 msgstr "Abrir com"
 
-#: src/mimeview.c:2158
-#: src/mimeview.c:2165
-#: src/textview.c:3040
+#: src/mimeview.c:2128 src/mimeview.c:2135 src/textview.c:3040
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8786,11 +8065,11 @@ msgstr ""
 "Digite o comando para abrir o arquivo:\n"
 "('%s' será substituído pelo nome do arquivo)"
 
-#: src/mimeview.c:2258
+#: src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "Executar binário não confiável?"
 
-#: src/mimeview.c:2259
+#: src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8802,111 +8081,108 @@ msgstr ""
 "\n"
 "Deseja executar esse arquivo?"
 
-#: src/mimeview.c:2263
+#: src/mimeview.c:2231
 msgid "Run binary"
 msgstr "Executar o binário"
 
-#: src/mimeview.c:2565
+#: src/mimeview.c:2533
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/mimeview.c:2566
-#: src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/mimeview.c:2534 src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: src/mimeview.c:2578
-#: src/plugins/vcalendar/vcalendar.c:1271
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1730
+#: src/mimeview.c:2546 src/plugins/vcalendar/vcalendar.c:1271
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1741
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1751
 msgid "Description:"
 msgstr "Descrição:"
 
-#: src/news.c:300
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "A conexão NNTP com %s:%d foi interrompida.\n"
 
-#: src/news.c:333
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Conta '%s': Conectando ao servidor NNTP: %s:%d...\n"
 
-#: src/news.c:354
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Erro na autenticação com %s:%d...\n"
 
-#: src/news.c:432
+#: src/news.c:438
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
-"Libetpan não suporta o código de retorno 480, por isso optamos por continuar\n"
+"Libetpan não suporta o código de retorno 480, por isso optamos por "
+"continuar\n"
 
-#: src/news.c:441
+#: src/news.c:447
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Falha no modo leitor, continuando mesmo assim\n"
 
-#: src/news.c:445
+#: src/news.c:451
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Erro na criação da sessão com %s:%d\n"
 
-#: src/news.c:459
+#: src/news.c:466
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Erro na autenticação com %s:%d...\n"
 
-#: src/news.c:484
+#: src/news.c:491
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "O Claws Mail necessita de acesso à rede para se conectar ao servidor de News."
 
-#: src/news.c:853
+#: src/news.c:862
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "não foi possível selecionar o grupo: %s\n"
 
-#: src/news.c:1042
-#: src/news.c:1212
+#: src/news.c:1051 src/news.c:1221
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "não foi possível definir o grupo: %s\n"
 
-#: src/news.c:1051
+#: src/news.c:1060
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "intervalo de artigos inválido: %d - %d\n"
 
-#: src/news.c:1121
-#: src/news.c:1145
-#: src/news.c:1169
+#: src/news.c:1130 src/news.c:1154 src/news.c:1178
 msgid "couldn't get xhdr\n"
 msgstr "não foi possível obter xhdr\n"
 
-#: src/news.c:1205
+#: src/news.c:1214
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obtendo xover %d - %d em %s...\n"
 
-#: src/news.c:1220
+#: src/news.c:1229
 msgid "couldn't get xover\n"
 msgstr "não foi possível obter xover\n"
 
-#: src/news.c:1235
+#: src/news.c:1244
 msgid "invalid xover line\n"
 msgstr "linha xover inválida\n"
 
-#: src/news.c:1450
+#: src/news.c:1459
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
-"Mail has been built without News support; your News account(s) are disabled.\n"
+"Mail has been built without News support; your News account(s) are "
+"disabled.\n"
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
 "Você possui uma ou mais contas de Newsgroup definidas. Entretanto, essa "
-"versão do Claws Mail foi compilada sem suporte ao Newsgroup; essa(s) conta(s) "
-"está(ão) desabilitada(s).\n"
+"versão do Claws Mail foi compilada sem suporte ao Newsgroup; essa(s) "
+"conta(s) está(ão) desabilitada(s).\n"
 "\n"
 "Você provavelmente precisa instalar o libetpan e recompilar o Claws Mail."
 
@@ -8927,8 +8203,7 @@ msgstr "Deseja realmente cancelar a assinatura do Newsgroup '%s'?"
 msgid "Unsubscribe newsgroup"
 msgstr "Cancelar a assinatura do Newsgroup"
 
-#: src/news_gtk.c:267
-#: src/plugins/rssyl/rssyl_gtk.c:678
+#: src/news_gtk.c:267 src/plugins/rssyl/rssyl_gtk.c:678
 msgid "_Unsubscribe"
 msgstr "_Cancelar a assinatura"
 
@@ -9046,8 +8321,7 @@ msgstr "Esse plugin manipula diversos LED's de mensagens ACPI."
 msgid "Laptop LED"
 msgstr "LED do laptop"
 
-#: src/plugins/archive/archiver.c:43
-#: src/plugins/archive/archiver_prefs.c:93
+#: src/plugins/archive/archiver.c:43 src/plugins/archive/archiver_prefs.c:93
 msgid "Mail Archiver"
 msgstr "Empacotador de mensagens"
 
@@ -9060,10 +8334,10 @@ msgstr "Criar pacote..."
 msgid ""
 "This plugin adds archiving features to Claws Mail.\n"
 "\n"
-"It enables you to select a mail folder that you want to be archived, and then "
-"choose a name, format and location for the archive. Subfolders can be "
-"included and MD5 checksums can be added for each file in the archive. Several "
-"archiving options are also available.\n"
+"It enables you to select a mail folder that you want to be archived, and "
+"then choose a name, format and location for the archive. Subfolders can be "
+"included and MD5 checksums can be added for each file in the archive. "
+"Several archiving options are also available.\n"
 "\n"
 "The archive can be stored as:\n"
 "\tTAR\n"
@@ -9080,14 +8354,15 @@ msgid ""
 "\n"
 "To activate the archiving feature go to /Tools/Create Archive\n"
 "\n"
-"Default options can be set in /Configuration/Preferences/Plugins/Mail Archiver"
+"Default options can be set in /Configuration/Preferences/Plugins/Mail "
+"Archiver"
 msgstr ""
 "Esse plugin adiciona recursos de empacotamento ao Claws Mail.\n"
 "\n"
-"Ele habilita a seleção de uma pasta de mensagens que você deseja empacotar, a "
-"seleção de um nome, formato e localização para o pacote. Subpastas podem ser "
-"incluídas e somas de checagem MD5 podem ser adicionadas para cada arquivo no "
-"pacote. Existem várias opções de empacotamento.\n"
+"Ele habilita a seleção de uma pasta de mensagens que você deseja empacotar, "
+"a seleção de um nome, formato e localização para o pacote. Subpastas podem "
+"ser incluídas e somas de checagem MD5 podem ser adicionadas para cada "
+"arquivo no pacote. Existem várias opções de empacotamento.\n"
 "\n"
 "Os pacotes podem ser armazenados como:\n"
 "\tTAR\n"
@@ -9104,8 +8379,8 @@ msgstr ""
 "\n"
 "Para ativar o recurso de empacotamento, vá até /Ferramentas/Criar pacote.\n"
 "\n"
-"As opções padrão podem ser definidas em /Configuração/Preferências/Plugins/Emp"
-"acotador de mensagens."
+"As opções padrão podem ser definidas em /Configuração/Preferências/Plugins/"
+"Empacotador de mensagens."
 
 #: src/plugins/archive/archiver.c:156
 msgid "Archiver"
@@ -9224,16 +8499,14 @@ msgstr "Nível de compressão"
 #: src/plugins/archive/archiver_gtk.c:800
 #: src/plugins/archive/archiver_gtk.c:808
 #: src/plugins/archive/archiver_gtk.c:816
-#: src/plugins/pdf_viewer/poppler_viewer.c:720
-#: src/prefs_folder_item.c:516
+#: src/plugins/pdf_viewer/poppler_viewer.c:720 src/prefs_folder_item.c:516
 msgid "Yes"
 msgstr "Sim"
 
 #: src/plugins/archive/archiver_gtk.c:800
 #: src/plugins/archive/archiver_gtk.c:808
 #: src/plugins/archive/archiver_gtk.c:816
-#: src/plugins/pdf_viewer/poppler_viewer.c:723
-#: src/prefs_folder_item.c:515
+#: src/plugins/pdf_viewer/poppler_viewer.c:723 src/prefs_folder_item.c:515
 #: src/prefs_summaries.c:369
 msgid "No"
 msgstr "Não"
@@ -9296,7 +8569,7 @@ msgstr "Localização e nome do pacote"
 
 #: src/plugins/archive/archiver_gtk.c:1045
 #: src/plugins/archive/archiver_prefs.c:198
-#: src/plugins/pgpcore/select-keys.c:424
+#: src/plugins/pgpcore/select-keys.c:420
 msgid "_Select"
 msgstr "_Selecionar"
 
@@ -9503,13 +8776,11 @@ msgid "Remove attachments"
 msgstr "Remover anexos"
 
 #: src/plugins/att_remover/att_remover.c:357
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:330
-#: src/prefs_themes.c:973
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:330 src/prefs_themes.c:973
 msgid "Remove"
 msgstr "Remover"
 
-#: src/plugins/att_remover/att_remover.c:365
-#: src/prefs_summary_column.c:80
+#: src/plugins/att_remover/att_remover.c:365 src/prefs_summary_column.c:80
 #: src/summaryview.c:2770
 msgid "Attachment"
 msgstr "Anexos"
@@ -9536,12 +8807,12 @@ msgstr "Essa mensagem não tem nenhum anexo."
 msgid "Remove attachments..."
 msgstr "Remover anexos..."
 
-#: src/plugins/att_remover/att_remover.c:507
-#: src/plugins/att_remover/att_remover.c:574
+#: src/plugins/att_remover/att_remover.c:506
+#: src/plugins/att_remover/att_remover.c:566
 msgid "AttRemover"
 msgstr "AttRemover"
 
-#: src/plugins/att_remover/att_remover.c:579
+#: src/plugins/att_remover/att_remover.c:571
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -9553,7 +8824,7 @@ msgstr ""
 "Atenção: esta operação não pode ser cancelada e os anexos excluídos estarão "
 "perdidos pra sempre (e pra sempre é realmente muito tempo)."
 
-#: src/plugins/att_remover/att_remover.c:603
+#: src/plugins/att_remover/att_remover.c:595
 msgid "Attachment handling"
 msgstr "Gerenciamento de anexos"
 
@@ -9561,14 +8832,14 @@ msgstr "Gerenciamento de anexos"
 #, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
-"attached. Mention appears on line %d, which begins with text: <span "
-"weight=\"bold\">%.20s</span>...\n"
+"attached. Mention appears on line %d, which begins with text: <span weight="
+"\"bold\">%.20s</span>...\n"
 "\n"
 "%s it anyway?"
 msgstr ""
 "Um anexo foi mencionado na mensagem que você está enviando, mas nenhum "
-"arquivo foi anexado. A menção aparece na linha %d, que começa com o texto: <"
-"span weight=\"bold\">%.20s</span>...\n"
+"arquivo foi anexado. A menção aparece na linha %d, que começa com o texto: "
+"<span weight=\"bold\">%.20s</span>...\n"
 "\n"
 "%s mesmo assim?"
 
@@ -9595,51 +8866,74 @@ msgstr ""
 "Avisa o usuário caso seja encontrada uma referência a anexos no texto da "
 "mensagem e não exista nenhum arquivo anexado"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:53
+#: src/plugins/attachwarner/attachwarner_prefs.c:54
 msgid "attach"
 msgstr "anexo"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:80
-msgid ""
-"Warn when matching the following regular expressions:\n"
-"(one per line)"
+#: src/plugins/attachwarner/attachwarner_prefs.c:85
+msgid "One of the following regular expressions is matched (one per line):"
 msgstr ""
-"Avisar ao atender às seguintes expressões regulares:\n"
-"(uma por linha)"
+"For encontrada correspondência para uma das seguintes expressões regulares "
+"(uma por linha):"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:99
-msgid "Skip quoted lines"
-msgstr "Ignorar linhas de citação"
+#: src/plugins/attachwarner/attachwarner_prefs.c:89
+msgid "Expressions are case sensitive"
+msgstr "Diferenciar maiúsculas de minúsculas nas expressões"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:106
-msgid "Exclude quoted lines from checking for the regular expressions above"
+#: src/plugins/attachwarner/attachwarner_prefs.c:96
+msgid "Case sensitive when matching for the regular expressions in the list"
 msgstr ""
-"Exclui as linhas de citação da checagem pelas expressões regulares acima"
+"Maiúsculas são diferenciadas de minúsculas na correspondência de expressões "
+"regulares "
+"da lista"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:109
-msgid "Skip forwards and redirections"
-msgstr "Ignorar encaminhamentos e redirecionamentos"
+#: src/plugins/attachwarner/attachwarner_prefs.c:114
+msgid "Lines starting with quotation marks"
+msgstr "Linhas iniciando com marcas de citação"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:116
+#: src/plugins/attachwarner/attachwarner_prefs.c:121
+msgid ""
+"Exclude quoted lines from checking for the regular expressions above. Note "
+"that handmade quotes cannot be distinguished from quotes generated by "
+"replying."
+msgstr ""
+"Exclui as linhas de citação da checagem pelas expressões regulares acima. "
+"Repare que marcas inseridas manualmente não podem ser distinguidas daquelas "
+"geradas automaticamente nas respostas."
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:124
+msgid "Forwarded or redirected messages"
+msgstr "Mensagens encaminhadas ou redirecionadas"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:131
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr ""
-"Não faz a verificação de anexos perdidos ao encaminhar ou redirecionar "
-"mensagens"
+"Não verifica a ausência de anexos ao encaminhar ou redirecionar mensagens"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:119
-msgid "Skip signature"
-msgstr "Ignorar a assinatura"
+#: src/plugins/attachwarner/attachwarner_prefs.c:134
+#: src/prefs_msg_colors.c:362
+msgid "Signatures"
+msgstr "Assinaturas"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:126
+#: src/plugins/attachwarner/attachwarner_prefs.c:141
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
 msgstr ""
-"Exclui as linhas a partir do primeiro caractere separador de assinaturasda "
-"checagem pelas expressões regulares acima"
+"Não verifica a ausência de anexos nas linhas a partir do primeiro caractere "
+"separador "
+"de assinatura"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:147
+msgid "Warn when"
+msgstr "Avisar quando"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:151
+msgid "Excluding"
+msgstr "Excluir"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:202
+#: src/plugins/attachwarner/attachwarner_prefs.c:229
 msgid "Attach Warner"
 msgstr "Alerta de anexo"
 
@@ -9667,8 +8961,7 @@ msgstr "Caminho no Livro de Endereços onde os endereços serão armazenados"
 #: src/plugins/bogofilter/bogofilter_gtk.c:234
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
 #: src/plugins/spamassassin/spamassassin_gtk.c:447
-#: src/prefs_filtering_action.c:573
-#: src/prefs_filtering_action.c:580
+#: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
 #: src/prefs_matcher.c:676
 msgid "Select..."
 msgstr "Selecione..."
@@ -9721,8 +9014,8 @@ msgstr "Bogofilter: filtrando as mensagens..."
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
-"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bogofilter with "
-"a few hundred spam and ham messages."
+"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bogofilter "
+"with a few hundred spam and ham messages."
 msgstr ""
 "O plugin Bogofilter não conseguiu filtrar uma mensagem. A causa provável "
 "desse erro é que ele ainda não aprendeu nenhuma mensagem.\n"
@@ -9743,8 +9036,7 @@ msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: aprendendo com a mensagem..."
 
 #: src/plugins/bogofilter/bogofilter.c:768
-#: src/plugins/bogofilter/bogofilter.c:817
-#: src/plugins/bsfilter/bsfilter.c:511
+#: src/plugins/bogofilter/bogofilter.c:817 src/plugins/bsfilter/bsfilter.c:511
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Erro no aprendizado; `%s` retornou o status %d."
@@ -9787,8 +9079,8 @@ msgstr ""
 "Quando uma mensagem é identificada como spam, ela pode ser excluída ou salva "
 "em uma determinada pasta.\n"
 "\n"
-"As opções podem ser encontradas em /Configurações/Preferências/Plugins/Bogofil"
-"ter."
+"As opções podem ser encontradas em /Configurações/Preferências/Plugins/"
+"Bogofilter."
 
 #: src/plugins/bogofilter/bogofilter.c:1035
 #: src/plugins/bsfilter/bsfilter.c:674
@@ -9822,8 +9114,7 @@ msgstr "Mensagens maiores que isso não serão verificadas"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:170
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:370
-#: src/prefs_account.c:1487
+#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1483
 msgid "KB"
 msgstr "Kb"
 
@@ -9895,7 +9186,8 @@ msgstr ""
 #: src/plugins/spamassassin/spamassassin_gtk.c:451
 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
-"Clique nesse botão para selecionar um livro ou uma pasta no Livro de Endereços"
+"Clique nesse botão para selecionar um livro ou uma pasta no Livro de "
+"Endereços"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:240
 #: src/plugins/bsfilter/bsfilter_gtk.c:207
@@ -9940,8 +9232,7 @@ msgstr "Comando do Bsfilter"
 msgid "Path to bsfilter executable"
 msgstr "Caminho parra o executável do Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:401
-#: src/plugins/bsfilter/bsfilter.c:82
+#: src/plugins/bsfilter/bsfilter_gtk.c:401 src/plugins/bsfilter/bsfilter.c:82
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
@@ -9957,8 +9248,8 @@ msgstr "Bsfilter: filtrando a mensagem..."
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
-"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bsfilter with a "
-"few hundred spam and ham messages."
+"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bsfilter with "
+"a few hundred spam and ham messages."
 msgstr ""
 "O plugin Bsfilter não conseguiu filtrar a mensagem. A causa provável do erro "
 "é que ele ainda não aprendeu com nenhuma mensagem.\n"
@@ -9993,9 +9284,9 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bsfilter"
 msgstr ""
-"Este plugin pode procurar por spams em todas as mensagens recebidas em contas "
-"IMAP, LOCAL ou POP, usando o Bsfilter. Você precisa ter o Bsfilter instalado "
-"na sua máquina.\n"
+"Este plugin pode procurar por spams em todas as mensagens recebidas em "
+"contas IMAP, LOCAL ou POP, usando o Bsfilter. Você precisa ter o Bsfilter "
+"instalado na sua máquina.\n"
 "\n"
 "Antes do Bsfilter ser capaz de reconhecer mensagens como spam, você deve "
 "treiná-lo, marcando algumas centenas de spams e mensagens legítimas, usando "
@@ -10004,8 +9295,8 @@ msgstr ""
 "Quando uma mensagem é identificada como spam, ela pode ser excluída ou salva "
 "em uma pasta especialmente designada.\n"
 "\n"
-"As opções podem ser encontradas em /Configuração/Preferências/Plugins/Bsfilter"
-"."
+"As opções podem ser encontradas em /Configuração/Preferências/Plugins/"
+"Bsfilter."
 
 #: src/plugins/clamd/clamav_plugin.c:47
 #: src/plugins/clamd/clamav_plugin_gtk.c:550
@@ -10269,8 +9560,7 @@ msgstr "Erro na escrita do socket"
 msgid "Socket read error"
 msgstr "Erro na leitura do socket"
 
-#: src/plugins/demo/demo.c:31
-#: src/plugins/demo/demo.c:100
+#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:100
 msgid "Demo"
 msgstr "Demonstração"
 
@@ -10291,103 +9581,103 @@ msgstr ""
 "\n"
 "Ele definitivamente não é muito útil."
 
-#: src/plugins/fancy/fancy_viewer.c:391
+#: src/plugins/fancy/fancy_viewer.c:392
 msgid "Remote content loading is disabled."
 msgstr "A recuperação de conteúdo remoto está desabilitada."
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:469
 msgid "Load images"
 msgstr "Carregar imagens"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:471
 msgid "Enable remote content"
 msgstr "Habilitar conteúdo remoto"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:473
 msgid "Enable Javascript"
 msgstr "Habilitar Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:475
 msgid "Enable Plugins"
 msgstr "Habilitar plugins"
 
-#: src/plugins/fancy/fancy_viewer.c:476
+#: src/plugins/fancy/fancy_viewer.c:477
 msgid "Enable Java"
 msgstr "Habilitar Java"
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:479
 msgid "Open links with external browser"
 msgstr "Abrir os links com um navegador externo"
 
-#: src/plugins/fancy/fancy_viewer.c:647
+#: src/plugins/fancy/fancy_viewer.c:648
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ocorreu um erro: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:698
+#: src/plugins/fancy/fancy_viewer.c:704
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s é uma fonte malformada ou não suportada"
 
-#: src/plugins/fancy/fancy_viewer.c:709
+#: src/plugins/fancy/fancy_viewer.c:715
 msgid "Search the Web"
 msgstr "Pesquisar a Web"
 
-#: src/plugins/fancy/fancy_viewer.c:721
+#: src/plugins/fancy/fancy_viewer.c:727
 msgid "Open in Viewer"
 msgstr "Abrir no visualizador"
 
-#: src/plugins/fancy/fancy_viewer.c:723
+#: src/plugins/fancy/fancy_viewer.c:729
 msgid "Open in Viewer (enable remote content)"
 msgstr "Abrir no visualizador (habilitar conteúdo remoto)"
 
-#: src/plugins/fancy/fancy_viewer.c:732
+#: src/plugins/fancy/fancy_viewer.c:738
 msgid "Open in Browser"
 msgstr "Abrir no navegador"
 
-#: src/plugins/fancy/fancy_viewer.c:742
+#: src/plugins/fancy/fancy_viewer.c:748
 msgid "Open Image"
 msgstr "Abrir a imagem"
 
-#: src/plugins/fancy/fancy_viewer.c:751
+#: src/plugins/fancy/fancy_viewer.c:757
 msgid "Copy Link"
 msgstr "Copiar o link"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:761
 msgid "Download Link"
 msgstr "Baixar o link"
 
-#: src/plugins/fancy/fancy_viewer.c:766
+#: src/plugins/fancy/fancy_viewer.c:772
 msgid "Save Image As"
 msgstr "Salvar imagem como"
 
-#: src/plugins/fancy/fancy_viewer.c:776
+#: src/plugins/fancy/fancy_viewer.c:782
 msgid "Copy Image"
 msgstr "Copiar a imagem"
 
-#: src/plugins/fancy/fancy_viewer.c:794
+#: src/plugins/fancy/fancy_viewer.c:800
 msgid "Import feed"
 msgstr "Importar a fonte"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1013
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1032
+#: src/plugins/fancy/fancy_viewer.c:1038
 msgid "Fancy HTML Viewer"
 msgstr "Visualizador HTML Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1037
+#: src/plugins/fancy/fancy_viewer.c:1043
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
-"By default all remote content is blocked. Options can be found in "
-"/Configuration/Preferences/Plugins/Fancy"
+"By default all remote content is blocked. Options can be found in /"
+"Configuration/Preferences/Plugins/Fancy"
 msgstr ""
-"Esse plugin renderiza mensagens em HTML usando a biblioteca WebKit %d.%d.%d.\n"
-"Todo o conteúdo remoto é bloquado por padrão. As opções podem ser encontradas "
-"em "
-"/Configurações/Preferências/Plugins/Fancy"
+"Esse plugin renderiza mensagens em HTML usando a biblioteca WebKit %d.%d."
+"%d.\n"
+"Todo o conteúdo remoto é bloquado por padrão. As opções podem ser "
+"encontradas em /Configurações/Preferências/Plugins/Fancy"
 
 #: src/plugins/fancy/fancy_prefs.c:141
 msgid "Display images"
@@ -10487,8 +9777,8 @@ msgstr "Não foi possível registrar o gancho de recebimento de mensagens"
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:209
 msgid ""
 "This plugin modifies the downloaded messages. It inserts headers containing "
-"some download information: UIDL, Claws Mail account name, POP server, user ID "
-"and retrieval time.\n"
+"some download information: UIDL, Claws Mail account name, POP server, user "
+"ID and retrieval time.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Fetchinfo"
 msgstr ""
@@ -10496,8 +9786,8 @@ msgstr ""
 "algumas informações da transferência: UIDL, nome da conta no Claws Mail, "
 "servidor POP, ID do usuário e hora da transferência.\n"
 "\n"
-"As opções podem ser encontradas em /Configurações/Preferências/Plugins/Fetchin"
-"fo."
+"As opções podem ser encontradas em /Configurações/Preferências/Plugins/"
+"Fetchinfo."
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:236
 msgid "Mail marking"
@@ -10578,8 +9868,7 @@ msgstr "Plugin GData: Autenticado\n"
 msgid "GData plugin: Starting async authentication\n"
 msgstr "Plugin GData: Iniciando autenticação assíncrona\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/prefs_account.c:1724
+#: src/plugins/gdata/cm_gdata_prefs.c:78 src/prefs_account.c:1720
 msgid "Authentication"
 msgstr "Autenticação"
 
@@ -10589,8 +9878,7 @@ msgid "Username:"
 msgstr "Nome de usuário:"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:91
-#: src/plugins/spam_report/spam_report_prefs.c:165
-#: src/wizard.c:1601
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1413
 msgid "Password:"
 msgstr "Senha:"
 
@@ -10602,8 +9890,7 @@ msgstr "Intervalo entre consultas (segundos):"
 msgid "Maximum number of results:"
 msgstr "Número máximo de resultados:"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:146
-#: src/plugins/gdata/gdata_plugin.c:101
+#: src/plugins/gdata/cm_gdata_prefs.c:146 src/plugins/gdata/gdata_plugin.c:101
 #: src/plugins/gdata/gdata_plugin.c:156
 msgid "GData"
 msgstr "GData"
@@ -10675,7 +9962,7 @@ msgstr ""
 "Se for especificada uma já existente, ela será\n"
 "verificada automaticamente."
 
-#: src/plugins/mailmbox/plugin_gtk.c:323
+#: src/plugins/mailmbox/plugin_gtk.c:322
 #, c-format
 msgid ""
 "All folder(s) and message(s) under '%s' will be deleted.\n"
@@ -10684,21 +9971,20 @@ msgstr ""
 "Todas as pastas e mensagens dentro de '%s' serão excluídas.\n"
 "Deseja realmente fazer isso?"
 
-#: src/plugins/newmail/newmail.c:110
-#: src/plugins/newmail/newmail.c:153
+#: src/plugins/newmail/newmail.c:111 src/plugins/newmail/newmail.c:162
 msgid "NewMail"
 msgstr "NewMail"
 
-#: src/plugins/newmail/newmail.c:115
+#: src/plugins/newmail/newmail.c:116
 msgid "Failed to register newmail hook"
 msgstr "Não foi possível registrar o gancho de newmail"
 
-#: src/plugins/newmail/newmail.c:132
+#: src/plugins/newmail/newmail.c:137 src/plugins/newmail/newmail.c:140
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "Não foi possível abrir o arquivo de relatório: %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:145
+#: src/plugins/newmail/newmail.c:154
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -10708,14 +9994,14 @@ msgid ""
 "\n"
 "Current log is %s"
 msgstr ""
-"Este plugin escreve um sumário do cabeçalho de cada e-mail recebido, "
-"após ordená-los, em um arquivo de relatório\n"
+"Este plugin escreve um sumário do cabeçalho de cada e-mail recebido, após "
+"ordená-los, em um arquivo de relatório\n"
 "\n"
 "O padrão é ~/Mail/NewLog\n"
 "\n"
 "O relatório atual é %s"
 
-#: src/plugins/newmail/newmail.c:179
+#: src/plugins/newmail/newmail.c:188
 msgid "Log file"
 msgstr "Arquivo de relatório"
 
@@ -10755,8 +10041,8 @@ msgstr "O plugin Notificação precisa suporte a agrupamento."
 #: src/plugins/notification/notification_plugin.c:225
 msgid "Failed to register folder item update hook in the Notification plugin"
 msgstr ""
-"Não foi possível registrar o gancho de atualização de item da pasta no plugin "
-"Notificação"
+"Não foi possível registrar o gancho de atualização de item da pasta no "
+"plugin Notificação"
 
 #: src/plugins/notification/notification_plugin.c:233
 msgid "Failed to register folder update hook in the Notification plugin"
@@ -10795,7 +10081,8 @@ msgstr ""
 #: src/plugins/notification/notification_plugin.c:303
 msgid "Failed to register theme change hook int the Notification plugin"
 msgstr ""
-"Não foi possível registrar o gancho de alteração do tema no plugin Notificação"
+"Não foi possível registrar o gancho de alteração do tema no plugin "
+"Notificação"
 
 #: src/plugins/notification/notification_plugin.c:419
 msgid ""
@@ -10855,6 +10142,11 @@ msgstr "Nova mensagem desconhecida"
 msgid "Unknown message type arrived"
 msgstr "Chegou uma mensagem de tipo desconhecido"
 
+#: src/plugins/notification/notification_popup.c:381
+#: src/plugins/notification/notification_trayicon.c:647
+msgid "Present main window"
+msgstr "Abrir a janela principal"
+
 #: src/plugins/notification/notification_popup.c:491
 msgid "Mail message"
 msgstr "Mensagem de e-mail"
@@ -10913,9 +10205,8 @@ msgstr "Letreiro"
 msgid "Popup"
 msgstr "Janela de notificação"
 
-#: src/plugins/notification/notification_prefs.c:464
-#: src/prefs_actions.c:263
-#: src/prefs_receive.c:147
+#: src/plugins/notification/notification_prefs.c:464 src/prefs_actions.c:263
+#: src/prefs_receive.c:133
 msgid "Command"
 msgstr "Comando"
 
@@ -10990,17 +10281,13 @@ msgid "Show banner"
 msgstr "Mostrar letreiro"
 
 #: src/plugins/notification/notification_prefs.c:746
-#: src/plugins/pgpcore/select-keys.c:242
-#: src/plugins/pgpcore/sgpgme.c:144
-#: src/prefs_receive.c:197
-#: src/prefs_summaries.c:462
+#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:144
+#: src/prefs_receive.c:183 src/prefs_summaries.c:462
 msgid "Never"
 msgstr "Nunca"
 
-#: src/plugins/notification/notification_prefs.c:748
-#: src/prefs_receive.c:195
-#: src/prefs_summaries.c:444
-#: src/prefs_summaries.c:463
+#: src/plugins/notification/notification_prefs.c:748 src/prefs_receive.c:181
+#: src/prefs_summaries.c:444 src/prefs_summaries.c:463
 msgid "Always"
 msgstr "Sempre"
 
@@ -11067,8 +10354,7 @@ msgstr "Cor da frente"
 
 #: src/plugins/notification/notification_prefs.c:882
 #: src/plugins/notification/notification_prefs.c:1102
-#: src/prefs_msg_colors.c:281
-#: src/prefs_msg_colors.c:302
+#: src/prefs_msg_colors.c:281 src/prefs_msg_colors.c:302
 #: src/prefs_msg_colors.c:323
 msgid "Background"
 msgstr "Fundo"
@@ -11090,8 +10376,7 @@ msgstr "Limite de tempo da janela de notificação:"
 #: src/plugins/notification/notification_prefs.c:1028
 #: src/plugins/notification/notification_prefs.c:1300
 #: src/plugins/notification/notification_prefs.c:1608
-#: src/plugins/spamassassin/spamassassin_gtk.c:391
-#: src/prefs_other.c:558
+#: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:558
 #: src/prefs_summaries.c:496
 msgid "seconds"
 msgstr "segundos"
@@ -11311,82 +10596,82 @@ msgstr "Formato:"
 msgid "Optimized:"
 msgstr "Otimizado:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1165
+#: src/plugins/pdf_viewer/poppler_viewer.c:1181
 msgid "PDF properties"
 msgstr "Propriedades do PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1263
+#: src/plugins/pdf_viewer/poppler_viewer.c:1279
 msgid "Loading..."
 msgstr "Abrindo..."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1322
+#: src/plugins/pdf_viewer/poppler_viewer.c:1338
 #, c-format
 msgid "%s Document"
 msgstr "Documento %s"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1328
+#: src/plugins/pdf_viewer/poppler_viewer.c:1344
 #, c-format
 msgid "of %d"
 msgstr "de %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1705
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1721
+#: src/plugins/pdf_viewer/poppler_viewer.c:1943
 msgid "Document Index"
 msgstr "Índice do documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1895
+#: src/plugins/pdf_viewer/poppler_viewer.c:1911
 msgid "First Page"
 msgstr "Primeira página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1898
+#: src/plugins/pdf_viewer/poppler_viewer.c:1914
 msgid "Previous Page"
 msgstr "Página anterior"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1901
+#: src/plugins/pdf_viewer/poppler_viewer.c:1917
 msgid "Next Page"
 msgstr "Próxima página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1904
+#: src/plugins/pdf_viewer/poppler_viewer.c:1920
 msgid "Last Page"
 msgstr "Última página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1907
+#: src/plugins/pdf_viewer/poppler_viewer.c:1923
 msgid "Zoom In"
 msgstr "Aumentar zoom"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1909
+#: src/plugins/pdf_viewer/poppler_viewer.c:1925
 msgid "Zoom Out"
 msgstr "Diminuir zoom"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1912
+#: src/plugins/pdf_viewer/poppler_viewer.c:1928
 msgid "Fit Page"
 msgstr "Ajustar a página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1915
+#: src/plugins/pdf_viewer/poppler_viewer.c:1931
 msgid "Fit Page Width"
 msgstr "Ajustar a largura da página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1918
+#: src/plugins/pdf_viewer/poppler_viewer.c:1934
 msgid "Rotate Left"
 msgstr "Girar para a esquerda"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1921
+#: src/plugins/pdf_viewer/poppler_viewer.c:1937
 msgid "Rotate Right"
 msgstr "Girar para a direita"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1940
 msgid "Document Info"
 msgstr "Informações do documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1929
+#: src/plugins/pdf_viewer/poppler_viewer.c:1945
 msgid "Page Number"
 msgstr "Número da página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1931
+#: src/plugins/pdf_viewer/poppler_viewer.c:1947
 msgid "Zoom Factor"
 msgstr "Fator de zoom"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2036
+#: src/plugins/pdf_viewer/poppler_viewer.c:2052
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11399,13 +10684,13 @@ msgstr ""
 "\n"
 "Qualquer retorno é bem-vindo: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2042
-#: src/plugins/pdf_viewer/poppler_viewer.c:2050
-#: src/plugins/pdf_viewer/poppler_viewer.c:2070
+#: src/plugins/pdf_viewer/poppler_viewer.c:2058
+#: src/plugins/pdf_viewer/poppler_viewer.c:2066
+#: src/plugins/pdf_viewer/poppler_viewer.c:2086
 msgid "PDF Viewer"
 msgstr "Visualizador PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2046
+#: src/plugins/pdf_viewer/poppler_viewer.c:2062
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11415,52 +10700,78 @@ msgid ""
 "%s"
 msgstr ""
 "Atenção; não foi possível encontrar o binário do ghostscript (gs) necessário "
-"para o plugin %s processar anexos PostScript. Assim, somente anexos PDf serão "
-"exibidos. Para habilitar o suporte ao PostScript, por favor instale o "
+"para o plugin %s processar anexos PostScript. Assim, somente anexos PDf "
+"serão exibidos. Para habilitar o suporte ao PostScript, por favor instale o "
 "programa gs.\n"
 "\n"
 "%s"
 
-#: src/plugins/python/python_plugin.c:338
-#: src/plugins/python/python_plugin.c:482
+#: src/plugins/python/python_plugin.c:358
+#: src/plugins/python/python_plugin.c:502
 msgid "Python scripts"
 msgstr "Scripts Python"
 
-#: src/plugins/python/python_plugin.c:477
+#: src/plugins/python/python_plugin.c:497
 msgid "Show Python console..."
 msgstr "Exibir o console Python..."
 
-#: src/plugins/python/python_plugin.c:483
+#: src/plugins/python/python_plugin.c:503
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: src/plugins/python/python_plugin.c:485
-#: src/prefs_account.c:2488
-#: src/prefs_account.c:2510
-#: src/prefs_account.c:2769
-#: src/wizard.c:1379
-#: src/wizard.c:1658
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2480
+#: src/prefs_account.c:2502 src/prefs_account.c:2761 src/wizard.c:1191
+#: src/wizard.c:1465
 msgid "Browse"
 msgstr "Navegar"
 
-#: src/plugins/python/python_plugin.c:548
-#: src/plugins/python/python_plugin.c:602
+#: src/plugins/python/python_plugin.c:646
+#: src/plugins/python/python_plugin.c:725
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:554
+#: src/plugins/python/python_plugin.c:652
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Não foi possível registrar \"compose create hook\" no plugin Python"
 
-#: src/plugins/python/python_plugin.c:607
+#: src/plugins/python/python_plugin.c:730
 msgid ""
 "This plugin provides Python integration features.\n"
+"Python code can be entered interactively into an embedded Python console, "
+"under Tools -> Show Python console, or stored in scripts.\n"
+"\n"
+"These scripts are then available via the menu. You can assign keyboard "
+"shortcuts to them just like it is done with other menu items. You can also "
+"put buttons for script invokation into the toolbars using Claws Mail's "
+"builtin toolbar editor.\n"
+"\n"
+"You can provide scripts working on the main window by placing files into ~/."
+"claws-mail/python-scripts/main.\n"
+"\n"
+"You can also provide scripts working on an open compose window by placing "
+"files into ~/.claws-mail/python-scripts/compose.\n"
+"\n"
+"The folder ~/.claws-mail/python-scripts/auto/ may contain some scripts that "
+"are automatically executed when certain events occur. Currently, the "
+"following files in this directory are recognised:\n"
+"\n"
+"compose_any\n"
+"Gets executed whenever a compose window is opened, no matterif that opening "
+"happened as a result of composing a new message,replying or forwarding a "
+"message.\n"
+"\n"
+"startup\n"
+"Executed at plugin load\n"
+"\n"
+"shutdown\n"
+"Executed at plugin unload\n"
+"\n"
 "\n"
 "For the most up-to-date API documentation, type\n"
 "\n"
 " help(clawsmail)\n"
 "\n"
-"in the interactive Python console under Tools -> Show Python console.\n"
+"in the interactive Python console.\n"
 "\n"
 "The source distribution of this plugin comes with various example scripts in "
 "the \"examples\" subdirectory. If you wrote a script that you would be "
@@ -11469,36 +10780,70 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"Este plugin fornece recursos de integração com o Python\n"
+"Esse plugin fornece recursos de integração com Python.\n"
+"O código Python pode ser digitado interativamente em um console Python "
+"embutido, acessível em Ferramentas -> Exibir console Python, ou armazenado "
+"em scripts.\n"
+"\n"
+"Esses scripts tornam-se, então, disponíveis no menu. Você pode associar "
+"atalhos de teclado a eles, da mesma forma como faz com outros itens do menu. "
+"Você também pode adicionar botões para chamar os scripts nas barras de "
+"ferramentas, "
+"usando o editor de barras de ferramentas do próprio Claws Mail.\n"
+"\n"
+"Você pode acrescentar scripts que atuem na janela principal adicionando os "
+"arquivos "
+"em ~/.claws-mail/python-scripts/main.\n"
+"\n"
+"Você pode acrescentar scripts que atuem na janela de composição aberta "
+"adicionando "
+"os arquivos em ~/.claws-mail/python-scripts/compose.\n"
+"\n"
+"A pasta ~/.claws-mail/python-scripts/auto/ pode conter scripts que são "
+"executados "
+"automaticamente na ocorrência de determinados eventos. Atualmente são "
+"reconhecidos "
+"os seguintes arquivos nesse diretório:\n"
+"\n"
+"compose_any\n"
+"Executado sempre que uma janela de composição é aberta, independente se "
+"isso ocorreu para a escrita de uma nova mensagem, para a resposta ou para o "
+"encaminhamento de uma mensagem já existente.\n"
+"\n"
+"startup\n"
+"Executado quando o plugin é aberto\n"
+"\n"
+"shutdown\n"
+"Executado quando o plugin é encerrado\n"
+"\n"
 "\n"
-"Para a documentação mais atualizada sobre a API, digite:\n"
+"Para informações mais atualizadas sobre a API, digite\n"
 "\n"
 " help(clawsmail)\n"
 "\n"
-"no console interativo do Python, acessível em Ferramentas -> Exibir console "
-"Python.\n"
+"no console interativo do Python."
 "\n"
-"As fontes desse plugin vêm com vários scripts de exemplo, no subdiretório "
-"\"examples\". Se você escrever algum script que achar interessante "
-"compartilhar, sinta-se à vontade para enviá-lo para mim, pra que possa "
-"considerá-lo para inclusão nos exempos.\n"
+"\n"
+"O código-fonte desse plugin vem com vários exemplos de script no "
+"diretório \"examples\". Caso você escreva um plugin e tenha interesse em "
+"compartilhá-lo, fique à vontade para enviá-lo para que eu possa avaliar a "
+"possibilidade de inclui-lo nos exemplos.\n"
 "\n"
 "Qualquer retorno para <berndth at gmx.de> é bem-vindo."
 
-#: src/plugins/python/python_plugin.c:636
+#: src/plugins/python/python_plugin.c:781
 msgid "Python integration"
 msgstr "Integração com o Python"
 
-#: src/plugins/pgpcore/passphrase.c:86
-#: src/plugins/pgpcore/prefs_gpg.c:108
+#: src/plugins/pgpcore/passphrase.c:86 src/plugins/pgpcore/prefs_gpg.c:108
 msgid "Passphrase"
 msgstr "Frase-senha"
 
-#: src/plugins/pgpcore/passphrase.c:253
+#: src/plugins/pgpcore/passphrase.c:249
 msgid "[no user id]"
 msgstr "[sem id do usuário]"
 
-#: src/plugins/pgpcore/passphrase.c:264
+#: src/plugins/pgpcore/passphrase.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the "
@@ -11506,16 +10851,16 @@ msgid ""
 "\n"
 "%.*s\n"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">%sPor favor, digite a senha para a nova "
-"chave:</span>\n"
+"<span weight=\"bold\" size=\"larger\">%sPor favor, digite a senha para a "
+"nova chave:</span>\n"
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:267
+#: src/plugins/pgpcore/passphrase.c:263
 msgid "Passphrases did not match.\n"
 msgstr "As senhas não conferem.\n"
 
-#: src/plugins/pgpcore/passphrase.c:270
+#: src/plugins/pgpcore/passphrase.c:266
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the "
@@ -11528,20 +10873,20 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:274
+#: src/plugins/pgpcore/passphrase.c:270
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:<"
-"/span>\n"
+"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
+"span>\n"
 "\n"
 "%.*s\n"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">%sPor favor, digite a senha para:</span>"
-"\n"
+"<span weight=\"bold\" size=\"larger\">%sPor favor, digite a senha para:</"
+"span>\n"
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:277
+#: src/plugins/pgpcore/passphrase.c:273
 msgid "Bad passphrase.\n"
 msgstr "Senha incorreta.\n"
 
@@ -11557,8 +10902,7 @@ msgstr ""
 "Essa chave não está no seu chaveiro. Deseja que o Claws Mail verifique-a e "
 "importe-a de um servidor de chaves?"
 
-#: src/plugins/pgpcore/pgp_viewer.c:129
-#: src/plugins/pgpcore/pgp_viewer.c:201
+#: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:201
 msgid ""
 "\n"
 "  Key ID "
@@ -11566,8 +10910,7 @@ msgstr ""
 "\n"
 "  ID da chave "
 
-#: src/plugins/pgpcore/pgp_viewer.c:132
-#: src/plugins/pgpcore/pgp_viewer.c:194
+#: src/plugins/pgpcore/pgp_viewer.c:132 src/plugins/pgpcore/pgp_viewer.c:194
 msgid "   This key is not in your keyring.\n"
 msgstr "   Essa chave não está no seu chaveiro.\n"
 
@@ -11640,8 +10983,8 @@ msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"
 "\n"
-"Options can be found in /Configuration/Preferences/Plugins/GPG and "
-"/Configuration/[Account Preferences]/Plugins/GPG\n"
+"Options can be found in /Configuration/Preferences/Plugins/GPG and /"
+"Configuration/[Account Preferences]/Plugins/GPG\n"
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
@@ -11650,8 +10993,8 @@ msgstr ""
 "Esse plugin gerencia as operações básicas do PGP e é usado por outros "
 "plugins, como o PGP/Mime.\n"
 "\n"
-"As opções podem ser encontradas em /Configurações/Preferências/Plugins/GPG e "
-"/Configurações/[Preferências da conta]/Plugins/GPG\n"
+"As opções podem ser encontradas em /Configurações/Preferências/Plugins/GPG "
+"e /Configurações/[Preferências da conta]/Plugins/GPG\n"
 "\n"
 "O plugin usa a biblioteca GPGME como invólucro para o GnuPG.\n"
 "\n"
@@ -11682,8 +11025,7 @@ msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr ""
 "Se for definida como '0', a senha será armazenada durante toda a sessão"
 
-#: src/plugins/pgpcore/prefs_gpg.c:145
-#: src/prefs_receive.c:173
+#: src/plugins/pgpcore/prefs_gpg.c:145 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -11739,55 +11081,52 @@ msgstr ""
 msgid "Collecting info for '%s' ... %c"
 msgstr "Coletando informações para '%s' ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:239
-#: src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:142
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: src/plugins/pgpcore/select-keys.c:245
-#: src/plugins/pgpcore/sgpgme.c:146
+#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:146
 msgid "Marginal"
 msgstr "Marginal"
 
-#: src/plugins/pgpcore/select-keys.c:251
-#: src/plugins/pgpcore/sgpgme.c:150
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:150
 msgid "Ultimate"
 msgstr "Máximo"
 
-#: src/plugins/pgpcore/select-keys.c:370
+#: src/plugins/pgpcore/select-keys.c:366
 msgid "Select Keys"
 msgstr "Selecione as chaves"
 
-#: src/plugins/pgpcore/select-keys.c:397
+#: src/plugins/pgpcore/select-keys.c:393
 msgid "Key ID"
 msgstr "ID da chave"
 
-#: src/plugins/pgpcore/select-keys.c:400
+#: src/plugins/pgpcore/select-keys.c:396
 msgid "Trust"
 msgstr "Confiar"
 
-#: src/plugins/pgpcore/select-keys.c:425
+#: src/plugins/pgpcore/select-keys.c:421
 msgid "_Other"
 msgstr "_Outro"
 
-#: src/plugins/pgpcore/select-keys.c:426
+#: src/plugins/pgpcore/select-keys.c:422
 msgid "Do_n't encrypt"
 msgstr "_Não criptografar"
 
-#: src/plugins/pgpcore/select-keys.c:585
+#: src/plugins/pgpcore/select-keys.c:581
 msgid "Add key"
 msgstr "Adicionar chave"
 
-#: src/plugins/pgpcore/select-keys.c:586
+#: src/plugins/pgpcore/select-keys.c:582
 msgid "Enter another user or key ID:"
 msgstr "Informe outro usuário ou ID da chave:"
 
-#: src/plugins/pgpcore/select-keys.c:608
+#: src/plugins/pgpcore/select-keys.c:604
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Criptografar como %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:609
+#: src/plugins/pgpcore/select-keys.c:605
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -11806,28 +11145,22 @@ msgstr ""
 "\n"
 "Você confia nesta chave o suficiente para utilizá-la mesmo assim?"
 
-#: src/plugins/pgpcore/sgpgme.c:80
-#: src/privacy.c:249
-#: src/privacy.c:253
-#: src/privacy.c:270
-#: src/privacy.c:274
+#: src/plugins/pgpcore/sgpgme.c:80 src/privacy.c:249 src/privacy.c:253
+#: src/privacy.c:270 src/privacy.c:274
 msgid "No signature found"
 msgstr "Não foi encontrada nenhuma assinatura"
 
-#: src/plugins/pgpcore/sgpgme.c:184
-#: src/plugins/pgpcore/sgpgme.c:203
+#: src/plugins/pgpcore/sgpgme.c:184 src/plugins/pgpcore/sgpgme.c:203
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Não foi possível chegar a assinatura - %s"
 
-#: src/plugins/pgpcore/sgpgme.c:188
-#: src/plugins/pgpcore/sgpgme.c:192
+#: src/plugins/pgpcore/sgpgme.c:188 src/plugins/pgpcore/sgpgme.c:192
 #: src/plugins/pgpcore/sgpgme.c:242
 msgid "The signature has not been checked."
 msgstr "A assinatura não foi checada."
 
-#: src/plugins/pgpcore/sgpgme.c:198
-#: src/plugins/pgpcore/sgpgme.c:200
+#: src/plugins/pgpcore/sgpgme.c:198 src/plugins/pgpcore/sgpgme.c:200
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 "Núcleo PGP: Não foi possível obter a chave - nenhum gpg-agent em execução."
@@ -11985,19 +11318,18 @@ msgstr ""
 "você não poderá assinar suas mensagens ou receber e-mails criptografados.\n"
 "Deseja criar um novo par de chaves agora?"
 
-#: src/plugins/pgpcore/sgpgme.c:817
-#: src/plugins/pgpcore/sgpgme.c:833
+#: src/plugins/pgpcore/sgpgme.c:817 src/plugins/pgpcore/sgpgme.c:833
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Não foi possível gerar o novo par de chaves: %s"
 
 #: src/plugins/pgpcore/sgpgme.c:824
 msgid ""
-"Generating your new key pair... Please move the mouse around to help generate "
-"entropy..."
+"Generating your new key pair... Please move the mouse around to help "
+"generate entropy..."
 msgstr ""
-"Gerando seu novo par de chaves... Por favor, movimente o mouse aleatoriamente "
-"para ajudar a gerar entropia..."
+"Gerando seu novo par de chaves... Por favor, movimente o mouse "
+"aleatoriamente para ajudar a gerar entropia..."
 
 #: src/plugins/pgpcore/sgpgme.c:839
 msgid "Couldn't generate a new key pair: unknown error"
@@ -12032,64 +11364,52 @@ msgstr "Não foi possível exportar as chaves."
 msgid "Key export isn't implemented in Windows."
 msgstr "A exportação de chaves não está implementada no Windows."
 
-#: src/plugins/pgpinline/pgpinline.c:258
+#: src/plugins/pgpinline/pgpinline.c:156
 msgid "Incorrect part"
 msgstr "Parte incorreta"
 
-#: src/plugins/pgpinline/pgpinline.c:262
+#: src/plugins/pgpinline/pgpinline.c:160
 msgid "Not a text part"
 msgstr "Não é uma parte de texto"
 
-#: src/plugins/pgpinline/pgpinline.c:273
-#: src/plugins/pgpinline/pgpinline.c:430
+#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
 msgid "Couldn't get text data."
 msgstr "Não foi possível obter os dados do texto."
 
-#: src/plugins/pgpinline/pgpinline.c:291
+#: src/plugins/pgpinline/pgpinline.c:189
 msgid "Couldn't convert text data to any sane charset."
 msgstr ""
 "Não foi possível converter os dados de texto para nenhuma codificação de "
 "caracteres apropriada."
 
-#: src/plugins/pgpinline/pgpinline.c:299
-#: src/plugins/pgpinline/pgpinline.c:624
-#: src/plugins/pgpinline/pgpinline.c:763
-#: src/plugins/pgpinline/pgpinline.c:819
-#: src/plugins/pgpmime/pgpmime.c:73
-#: src/plugins/pgpmime/pgpmime.c:182
-#: src/plugins/pgpmime/pgpmime.c:322
-#: src/plugins/pgpmime/pgpmime.c:500
-#: src/plugins/pgpmime/pgpmime.c:644
-#: src/plugins/smime/smime.c:406
+#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:517
+#: src/plugins/pgpinline/pgpinline.c:656 src/plugins/pgpinline/pgpinline.c:712
+#: src/plugins/pgpmime/pgpmime.c:74 src/plugins/pgpmime/pgpmime.c:183
+#: src/plugins/pgpmime/pgpmime.c:329 src/plugins/pgpmime/pgpmime.c:507
+#: src/plugins/pgpmime/pgpmime.c:651 src/plugins/smime/smime.c:395
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Não foi possível inicializar o contexto GPG, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:423
+#: src/plugins/pgpinline/pgpinline.c:316
 msgid "Couldn't parse mime part."
 msgstr "Não foi possível traduzir a parte mime."
 
-#: src/plugins/pgpinline/pgpinline.c:453
-#: src/plugins/pgpmime/pgpmime.c:345
+#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:352
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Não foi possível abrir o arquivo descriptografado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:470
-#: src/plugins/pgpinline/pgpinline.c:479
-#: src/plugins/pgpinline/pgpinline.c:488
-#: src/plugins/pgpinline/pgpinline.c:496
-#: src/plugins/pgpinline/pgpinline.c:506
-#: src/plugins/pgpinline/pgpinline.c:515
-#: src/plugins/pgpmime/pgpmime.c:356
-#: src/plugins/pgpmime/pgpmime.c:370
+#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
+#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
+#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
+#: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "Não foi possível escrever no arquivo descriptografado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:484
-#: src/plugins/pgpinline/pgpinline.c:485
-#: src/plugins/pgpinline/pgpinline.c:486
+#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:379
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -12097,58 +11417,51 @@ msgstr ""
 "\n"
 "--- Início dos dados criptografados via PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:502
-#: src/plugins/pgpinline/pgpinline.c:503
-#: src/plugins/pgpinline/pgpinline.c:504
+#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:397
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Fim dos dados criptografados via PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:523
-#: src/plugins/pgpmime/pgpmime.c:382
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:389
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "Não foi possível fechar o arquivo descriptografado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:535
+#: src/plugins/pgpinline/pgpinline.c:428
 msgid "Couldn't scan decrypted file."
 msgstr "Não foi possível examinar o arquivo descriptografado."
 
-#: src/plugins/pgpinline/pgpinline.c:543
+#: src/plugins/pgpinline/pgpinline.c:436
 msgid "Couldn't scan decrypted file parts."
 msgstr "Não foi possível examinar as partes do arquivo descriptografado."
 
-#: src/plugins/pgpinline/pgpinline.c:598
-#: src/plugins/pgpinline/pgpinline.c:790
+#: src/plugins/pgpinline/pgpinline.c:491 src/plugins/pgpinline/pgpinline.c:683
 msgid "Malformed message"
 msgstr "Mensagem malformatada"
 
-#: src/plugins/pgpinline/pgpinline.c:609
+#: src/plugins/pgpinline/pgpinline.c:502
 msgid "Couldn't create temporary file."
 msgstr "Não foi possível criar o arquivo temporário."
 
-#: src/plugins/pgpinline/pgpinline.c:648
-#: src/plugins/pgpmime/pgpmime.c:527
+#: src/plugins/pgpinline/pgpinline.c:541 src/plugins/pgpmime/pgpmime.c:534
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Erro na assinatura dos dados, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:666
-#: src/plugins/pgpmime/pgpmime.c:552
+#: src/plugins/pgpinline/pgpinline.c:559 src/plugins/pgpmime/pgpmime.c:559
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Erro na assinatura dos dados devido a um assinante ser inválido: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:675
-#: src/plugins/pgpmime/pgpmime.c:561
+#: src/plugins/pgpinline/pgpinline.c:568 src/plugins/pgpmime/pgpmime.c:568
 msgid "Data signing failed, no results."
 msgstr "Erro na assinatura dos dados, sem resultados."
 
-#: src/plugins/pgpinline/pgpinline.c:685
-#: src/plugins/pgpmime/pgpmime.c:572
+#: src/plugins/pgpinline/pgpinline.c:578 src/plugins/pgpmime/pgpmime.c:579
 msgid "Data signing failed, no contents."
 msgstr "Erro na assinatura dos dados, sem conteúdo."
 
-#: src/plugins/pgpinline/pgpinline.c:729
+#: src/plugins/pgpinline/pgpinline.c:622
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
@@ -12156,25 +11469,22 @@ msgstr ""
 "Por favor, perceba que os anexos e os cabeçalhos do e-mail (como o Assunto) "
 "não são criptografados pelo sistema PGP/Inline."
 
-#: src/plugins/pgpinline/pgpinline.c:773
-#: src/plugins/pgpmime/pgpmime.c:654
+#: src/plugins/pgpinline/pgpinline.c:666 src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Não foi possível adicionar a chave GPG %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:801
-#: src/plugins/pgpmime/pgpmime.c:683
+#: src/plugins/pgpinline/pgpinline.c:694 src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Não foi possível criar o arquivo temporário, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:832
-#: src/plugins/pgpmime/pgpmime.c:710
+#: src/plugins/pgpinline/pgpinline.c:725 src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Falha na criptografia, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:899
+#: src/plugins/pgpinline/pgpinline.c:793
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
@@ -12184,9 +11494,9 @@ msgstr "PGP/inline"
 
 #: src/plugins/pgpinline/plugin.c:60
 msgid ""
-"This plugin handles the deprecated Inline method of signing and/or encrypting "
-"mails. You can decrypt mails, verify signatures or sign and encrypt your own "
-"mails.\n"
+"This plugin handles the deprecated Inline method of signing and/or "
+"encrypting mails. You can decrypt mails, verify signatures or sign and "
+"encrypt your own mails.\n"
 "\n"
 "It can be selected as the Default Privacy System in /Configuration/[Account "
 "Preferences]/Privacy and when composing a message from /Options/Privacy "
@@ -12200,43 +11510,40 @@ msgstr ""
 "criptografia de mensagens. Você pode descriptografar mensagens, verificar "
 "assinaturas ou assinar e criptografar suas próprias mensagens.\n"
 "\n"
-"Ele pode ser selecionado como Sistema de Privacidade Padrão em "
-"/Configurações/[Preferências da conta]/Privacidade e ao escrever uma mensagem "
+"Ele pode ser selecionado como Sistema de Privacidade Padrão em /"
+"Configurações/[Preferências da conta]/Privacidade e ao escrever uma mensagem "
 "em /Opções/Privacidade/Sistema\n"
 "\n"
 "O plugin usa a biblioteca GPGME como invólucro para o GnuPG.\n"
 "\n"
 "GPGME possui copyright 2001 por Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:202
+#: src/plugins/pgpmime/pgpmime.c:203
 msgid "Signature boundary not found."
 msgstr "Não foi localizado o limite da assinatura."
 
-#: src/plugins/pgpmime/pgpmime.c:394
-#: src/plugins/smime/smime.c:487
+#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:476
 msgid "Couldn't parse decrypted file."
 msgstr "Não foi possível traduzir o arquivo descriptografado."
 
-#: src/plugins/pgpmime/pgpmime.c:400
-#: src/plugins/smime/smime.c:494
+#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:483
 msgid "Couldn't parse decrypted file parts."
 msgstr "Não foi possível traduzir as partes do arquivo descriptografado."
 
-#: src/plugins/pgpmime/pgpmime.c:446
-#: src/plugins/pgpmime/pgpmime.c:485
+#: src/plugins/pgpmime/pgpmime.c:453 src/plugins/pgpmime/pgpmime.c:492
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Não foi possível criar o arquivo temporário: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:610
+#: src/plugins/pgpmime/pgpmime.c:617
 msgid ""
-"Please note that email headers, like Subject, are not encrypted by the "
-"PGP/Mime system."
+"Please note that email headers, like Subject, are not encrypted by the PGP/"
+"Mime system."
 msgstr ""
 "Por favor, perceba que os cabeçalhos do e-mail (como o Assunto) não são "
 "criptografados pelo sistema PGP/Mime."
 
-#: src/plugins/pgpmime/pgpmime.c:780
+#: src/plugins/pgpmime/pgpmime.c:788
 msgid "PGP/Mime"
 msgstr "PGP/MIME"
 
@@ -12261,8 +11568,8 @@ msgstr ""
 "Você pode descriptografar mensagens, verificar assinaturas ou assinar e "
 "criptografar suas próprias mensagens.\n"
 "\n"
-"Ele pode ser selecionado como o Sistema de Privacidade Padrão em "
-"/Configurações/[Preferências da conta]/Privacidade e ao escrever uma mensagem "
+"Ele pode ser selecionado como o Sistema de Privacidade Padrão em /"
+"Configurações/[Preferências da conta]/Privacidade e ao escrever uma mensagem "
 "em /Opções/Privacidade/Sistema\n"
 "\n"
 "O plugin usa a biblioteca GPGME como invólucro para o GnuPG.\n"
@@ -12393,8 +11700,8 @@ msgid ""
 "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
 msgstr ""
 "<b>Intervalo de atualização em minutos:</b>\n"
-"<small>(Coloque 0 para desabilitar a atualização automática dessa fonte)<"
-"/small>"
+"<small>(Coloque 0 para desabilitar a atualização automática dessa fonte)</"
+"small>"
 
 #: src/plugins/rssyl/rssyl_gtk.c:407
 msgid ""
@@ -12428,8 +11735,7 @@ msgstr "_Ok"
 msgid "Set feed properties"
 msgstr "Definir as propriedades da fonte"
 
-#: src/plugins/rssyl/rssyl_gtk.c:634
-#: src/plugins/rssyl/rssyl_gtk.c:658
+#: src/plugins/rssyl/rssyl_gtk.c:634 src/plugins/rssyl/rssyl_gtk.c:658
 msgid "Unsubscribe feed"
 msgstr "Cancelar a assinatura da fonte"
 
@@ -12446,11 +11752,11 @@ msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
 "\n"
-"Each newsfeed will create a folder with appropriate entries, fetched from the "
-"web. You can read them, and delete or keep old entries."
+"Each newsfeed will create a folder with appropriate entries, fetched from "
+"the web. You can read them, and delete or keep old entries."
 msgstr ""
-"Esse plugin permite criar uma árvore na caixa postal onde você pode adicionar "
-"fontes de notícias nos formatos RSS 1.0, RSS 2.0 ou Atom.\n"
+"Esse plugin permite criar uma árvore na caixa postal onde você pode "
+"adicionar fontes de notícias nos formatos RSS 1.0, RSS 2.0 ou Atom.\n"
 "\n"
 "Cada fonte de notícia irá criar uma pasta com as entradas apropriadas, "
 "buscadas na Web. Você pode lê-las e excluir ou manter as entradas antigas."
@@ -12517,8 +11823,7 @@ msgstr "Remover a árvore da pasta"
 msgid "Can't remove feed '%s'."
 msgstr "Não foi possível remover a fonte '%s'."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:283
-#: src/plugins/rssyl/feed.c:1856
+#: src/plugins/rssyl/rssyl_cb_menu.c:283 src/plugins/rssyl/feed.c:1856
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update the feeds."
 msgstr[0] "O Claws Mail necessita de acesso à rede para atualizar a fonte."
@@ -12528,8 +11833,7 @@ msgstr[1] "O Claws Mail necessita de acesso à rede para atualizar as fontes."
 msgid "Select a .opml file"
 msgstr "Selecione um arquivo .opml"
 
-#: src/plugins/rssyl/rssyl.c:133
-#: src/plugins/rssyl/rssyl.c:145
+#: src/plugins/rssyl/rssyl.c:133 src/plugins/rssyl/rssyl.c:145
 msgid "Refresh all feeds"
 msgstr "Atualizar todas as fontes"
 
@@ -12541,23 +11845,19 @@ msgstr "Não foi possível abrir o arquivo temporário"
 msgid "Cannot init libCURL"
 msgstr "Não foi possível iniciar a libCURL"
 
-#: src/plugins/rssyl/feed.c:231
-#: src/plugins/vcalendar/vcal_folder.c:1593
+#: src/plugins/rssyl/feed.c:231 src/plugins/vcalendar/vcal_folder.c:1593
 msgid "401 (Authorisation required)"
 msgstr "401 (Requer autorização)"
 
-#: src/plugins/rssyl/feed.c:234
-#: src/plugins/vcalendar/vcal_folder.c:1596
+#: src/plugins/rssyl/feed.c:234 src/plugins/vcalendar/vcal_folder.c:1596
 msgid "403 (Unauthorised)"
 msgstr "403 (Não autorizado)"
 
-#: src/plugins/rssyl/feed.c:237
-#: src/plugins/vcalendar/vcal_folder.c:1599
+#: src/plugins/rssyl/feed.c:237 src/plugins/vcalendar/vcal_folder.c:1599
 msgid "404 (Not found)"
 msgstr "404 (Não encontrado)"
 
-#: src/plugins/rssyl/feed.c:240
-#: src/plugins/vcalendar/vcal_folder.c:1602
+#: src/plugins/rssyl/feed.c:240 src/plugins/vcalendar/vcal_folder.c:1602
 #, c-format
 msgid "Error %ld"
 msgstr "Erro %ld"
@@ -12640,9 +11940,8 @@ msgstr ""
 msgid "Can't subscribe feed '%s'."
 msgstr "Não foi possível assinar a fonte '%s'."
 
-#: src/plugins/smime/plugin.c:38
-#: src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:924
+#: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
+#: src/plugins/smime/smime.c:883
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -12665,12 +11964,12 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Esse plugin manipula mensagens assinadas e/ou criptografadas com S/MIME. Você "
-"pode descriptografar mensagens, verificar assinaturas ou assinar e "
+"Esse plugin manipula mensagens assinadas e/ou criptografadas com S/MIME. "
+"Você pode descriptografar mensagens, verificar assinaturas ou assinar e "
 "criptografar suas próprias mensagens.\n"
 "\n"
-"Ele pode ser selecionado como o Sistema de Privacidade Padrão em "
-"/Configurações/[Preferências da conta]/Privacidade e ao escrever uma mensagem "
+"Ele pode ser selecionado como o Sistema de Privacidade Padrão em /"
+"Configurações/[Preferências da conta]/Privacidade e ao escrever uma mensagem "
 "em /Opções/Privacidade/Sistema\n"
 "\n"
 "O plugin usa a biblioteca GPGME como invólucro para o GnuPG.\n"
@@ -12683,35 +11982,34 @@ msgstr ""
 "\n"
 "GPGME possui copyright 2001 por Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:414
+#: src/plugins/smime/smime.c:403
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "Não foi possível configurar o protocolo GPG, %s"
 
-#: src/plugins/smime/smime.c:442
+#: src/plugins/smime/smime.c:431
 msgid "Couldn't open temporary file"
 msgstr "Não foi possível abrir o arquivo temporário."
 
-#: src/plugins/smime/smime.c:453
-#: src/plugins/smime/smime.c:468
+#: src/plugins/smime/smime.c:442 src/plugins/smime/smime.c:457
 msgid "Couldn't write to temporary file"
 msgstr "Não foi possível escrever em um arquivo temporário."
 
-#: src/plugins/smime/smime.c:479
+#: src/plugins/smime/smime.c:468
 msgid "Couldn't close temporary file"
 msgstr "Não foi possível fechar o arquivo temporário."
 
-#: src/plugins/smime/smime.c:695
+#: src/plugins/smime/smime.c:684
 msgid ""
-"Please note that email headers, like Subject, are not encrypted by the S/MIME "
-"system."
+"Please note that email headers, like Subject, are not encrypted by the S/"
+"MIME system."
 msgstr ""
 "Por favor, perceba que os cabeçalhos do e-mail (como o Assunto) não são "
 "criptografados pelo sistema S/MIME."
 
 #: src/plugins/spam_report/spam_report_prefs.c:80
-#: src/plugins/spam_report/spam_report.c:340
-#: src/plugins/spam_report/spam_report.c:380
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
 msgid "SpamReport"
 msgstr "SpamReport"
 
@@ -12723,15 +12021,15 @@ msgstr "Habilitado"
 msgid "Forward to:"
 msgstr "Encaminhar para:"
 
-#: src/plugins/spam_report/spam_report.c:294
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Relatar o spam..."
 
-#: src/plugins/spam_report/spam_report.c:329
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Relatar o spam online..."
 
-#: src/plugins/spam_report/spam_report.c:385
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12747,7 +12045,7 @@ msgstr ""
 " * spamcop.net\n"
 " * sistema de notificação da lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:410
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Relatando o spam"
 
@@ -12814,16 +12112,16 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
 "Esse plugin procura por spams em todas as mensagens recebidas de uma conta "
-"IMAP, LOCAL ou POP, usando um servidor SpamAssassin. É necessário um servidor "
-"SpamAssassin (spamd) funcionando em algum lugar.\n"
+"IMAP, LOCAL ou POP, usando um servidor SpamAssassin. É necessário um "
+"servidor SpamAssassin (spamd) funcionando em algum lugar.\n"
 "\n"
 "Ele também pode ser usado para marcar as mensagens como spam ou não.\n"
 "\n"
 "Quando uma mensagem é identificada como spam, ela pode ser excluída ou salva "
 "em uma pasta especial.\n"
 "\n"
-"As opções podem ser encontradas em /Configurações/Preferências/Plugins/SpamAss"
-"assin"
+"As opções podem ser encontradas em /Configurações/Preferências/Plugins/"
+"SpamAssassin"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:91
 msgid "Localhost"
@@ -12976,12 +12274,9 @@ msgstr "Recusar"
 msgid "You have a Todo item."
 msgstr "Você tem uma tarefa."
 
-#: src/plugins/vcalendar/vcalendar.c:483
-#: src/plugins/vcalendar/vcalendar.c:490
-#: src/plugins/vcalendar/vcalendar.c:495
-#: src/plugins/vcalendar/vcalendar.c:503
-#: src/plugins/vcalendar/vcalendar.c:512
-#: src/plugins/vcalendar/vcalendar.c:750
+#: src/plugins/vcalendar/vcalendar.c:483 src/plugins/vcalendar/vcalendar.c:490
+#: src/plugins/vcalendar/vcalendar.c:495 src/plugins/vcalendar/vcalendar.c:503
+#: src/plugins/vcalendar/vcalendar.c:512 src/plugins/vcalendar/vcalendar.c:750
 msgid "Details follow:"
 msgstr "Detalhes a seguir:"
 
@@ -13087,25 +12382,25 @@ msgid "You are already busy at this time."
 msgstr "Você já está ocupado nesse horário."
 
 #: src/plugins/vcalendar/vcalendar.c:1265
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1759
 msgid "Event:"
 msgstr "Evento:"
 
 #: src/plugins/vcalendar/vcalendar.c:1266
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1727
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1737
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1748
 msgid "Organizer:"
 msgstr "Organizador:"
 
 #: src/plugins/vcalendar/vcalendar.c:1267
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1729
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1740
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1750
 msgid "Location:"
 msgstr "Localização:"
 
 #: src/plugins/vcalendar/vcalendar.c:1268
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1717
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1728
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1749
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -13118,8 +12413,8 @@ msgid "Ending:"
 msgstr "Término:"
 
 #: src/plugins/vcalendar/vcalendar.c:1272
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1752
 msgid "Attendees:"
 msgstr "Participantes:"
 
@@ -13127,105 +12422,98 @@ msgstr "Participantes:"
 msgid "Action:"
 msgstr "Ação:"
 
-#: src/plugins/vcalendar/vcal_prefs.c:256
+#: src/plugins/vcalendar/vcal_prefs.c:258
 msgid "Reminders"
 msgstr "Lembretes"
 
-#: src/plugins/vcalendar/vcal_prefs.c:265
+#: src/plugins/vcalendar/vcal_prefs.c:267
 msgid "Alert me"
 msgstr "Alerte-me"
 
-#: src/plugins/vcalendar/vcal_prefs.c:277
+#: src/plugins/vcalendar/vcal_prefs.c:279
 msgid "minutes before an event"
 msgstr "minutos antes do evento"
 
-#: src/plugins/vcalendar/vcal_prefs.c:289
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Calendar export"
 msgstr "Exportação da agenda"
 
-#: src/plugins/vcalendar/vcal_prefs.c:300
+#: src/plugins/vcalendar/vcal_prefs.c:302
 msgid "Automatically export calendar to"
 msgstr "Exportar a agenda automaticamente para"
 
-#: src/plugins/vcalendar/vcal_prefs.c:309
-#: src/plugins/vcalendar/vcal_prefs.c:415
+#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:417
 msgid "You can export to a local file or URL"
 msgstr "Você pode exportar para um arquivo local ou uma URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:313
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr ""
 "Especifique um arquivo local ou uma URL (http://servidor/caminho/arquivo.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:319
-#: src/plugins/vcalendar/vcal_prefs.c:425
-#: src/prefs_account.c:1263
-#: src/prefs_account.c:1770
+#: src/plugins/vcalendar/vcal_prefs.c:321
+#: src/plugins/vcalendar/vcal_prefs.c:427 src/prefs_account.c:1259
+#: src/prefs_account.c:1766
 msgid "User ID"
 msgstr "ID do usuário"
 
-#: src/plugins/vcalendar/vcal_prefs.c:327
-#: src/plugins/vcalendar/vcal_prefs.c:433
-#: src/prefs_account.c:1269
-#: src/prefs_account.c:1790
-#: src/prefs_account.c:2499
-#: src/prefs_account.c:2521
-#: src/wizard.c:1389
-#: src/wizard.c:1668
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1265
+#: src/prefs_account.c:1786 src/prefs_account.c:2491 src/prefs_account.c:2513
+#: src/wizard.c:1201 src/wizard.c:1475
 msgid "Password"
 msgstr "Senha"
 
-#: src/plugins/vcalendar/vcal_prefs.c:341
+#: src/plugins/vcalendar/vcal_prefs.c:343
 msgid "Include webcal subscriptions in export"
 msgstr "Incluir as subscrições de webcal na exportação"
 
-#: src/plugins/vcalendar/vcal_prefs.c:351
+#: src/plugins/vcalendar/vcal_prefs.c:353
 msgid "Command to run after calendar export"
 msgstr "Comando a ser executado após a exportação da agenda"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:382
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Registre a Agenda do Claws no relógio Orage do XFCE"
 
-#: src/plugins/vcalendar/vcal_prefs.c:382
+#: src/plugins/vcalendar/vcal_prefs.c:384
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
-"Permite ao Orage (versão superior a 4.4) visualizar a agenda do Claws "
-"Mail"
+"Permite ao Orage (versão superior a 4.4) visualizar a agenda do Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:394
+#: src/plugins/vcalendar/vcal_prefs.c:396
 msgid "Free/Busy information"
 msgstr "Informação de livre/ocupado"
 
-#: src/plugins/vcalendar/vcal_prefs.c:406
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Automatically export free/busy status to"
 msgstr "Exportar a informação de livre/ocupado automaticamente para"
 
-#: src/plugins/vcalendar/vcal_prefs.c:417
+#: src/plugins/vcalendar/vcal_prefs.c:419
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr ""
 "Especifique um arquivo local ou uma URL (http://servidor/caminho/arquivo.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:447
+#: src/plugins/vcalendar/vcal_prefs.c:449
 msgid "Command to run after free/busy status export"
 msgstr ""
 "Comando a ser executado após a exportação da informação de livre/ocupado"
 
-#: src/plugins/vcalendar/vcal_prefs.c:474
+#: src/plugins/vcalendar/vcal_prefs.c:476
 msgid "Get free/busy status of others from"
 msgstr "Obter as informações de livre/ocupado dos outros em"
 
-#: src/plugins/vcalendar/vcal_prefs.c:482
+#: src/plugins/vcalendar/vcal_prefs.c:484
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
 "left part of the email address, %d for the domain"
 msgstr ""
-"Especifique um arquivo local ou uma URL (http://servidor/caminho/arquivo.ifb)."
-" Use %u para a parte esquerda do endereço de e-mail, %d para o domínio"
+"Especifique um arquivo local ou uma URL (http://servidor/caminho/arquivo."
+"ifb). Use %u para a parte esquerda do endereço de e-mail, %d para o domínio"
 
-#: src/plugins/vcalendar/vcal_prefs.c:646
-#: src/plugins/vcalendar/plugin.c:43
+#: src/plugins/vcalendar/vcal_prefs.c:648 src/plugins/vcalendar/plugin.c:43
 #: src/plugins/vcalendar/plugin.c:64
 msgid "vCalendar"
 msgstr "vCalendar"
@@ -13262,6 +12550,10 @@ msgstr "Visão _semanal"
 msgid "_Month view"
 msgstr "Visão _mensal"
 
+#: src/plugins/vcalendar/vcal_folder.c:1091
+msgid "Meetings"
+msgstr "Reuniões"
+
 #: src/plugins/vcalendar/vcal_folder.c:1475
 msgid "in the past"
 msgstr "no passado"
@@ -13369,11 +12661,11 @@ msgstr "Inscrever-se no WebCal"
 msgid "Enter the WebCal URL:"
 msgstr "Digite a URL do WebCal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1923
+#: src/plugins/vcalendar/vcal_folder.c:1921
 msgid "Could not parse the URL."
 msgstr "Não foi possível analisar a URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1952
+#: src/plugins/vcalendar/vcal_folder.c:1950
 msgid "Do you really want to unsubscribe?"
 msgstr "Deseja realmente desinscrever-se?"
 
@@ -13526,7 +12818,7 @@ msgid "available"
 msgstr "disponível"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:899
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1150
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1151
 msgid "Free/busy retrieval failed"
 msgstr "Não foi possível recuperar a informação de livre/ocupado"
 
@@ -13542,30 +12834,30 @@ msgstr "Enviar mesmo assim"
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr "Nem todos estão disponíveis. Veja nas dicas para mais informações..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1132
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1133
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "Buscando o planejamento de %s ..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1159
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1160
 msgid "Available"
 msgstr "Disponível"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1172
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1179
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1187
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1180
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
 msgid "Everyone is available."
 msgstr "Todos estão disponíveis."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1189
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
 msgstr ""
-"Todos estão aparentemente disponíveis, mas nem todas as informações de "
-"livre/ocupado foram recebidas corretamente."
+"Todos estão aparentemente disponíveis, mas nem todas as informações de livre/"
+"ocupado foram recebidas corretamente."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1360
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1361
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -13573,61 +12865,61 @@ msgstr ""
 "Não foi possível enviar o convite para a reunião.\n"
 "Verifique os destinatários."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1476
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1493
 msgid "Save & Send"
 msgstr "Salvar & enviar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1494
 msgid "Check availability"
 msgstr "Verificar disponibilidade"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1600
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "<b>Starts at:</b> "
 msgstr "<b>Início:</b> "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1627
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1623
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1647
 msgid "<b> on:</b>"
 msgstr "<b> em:</b>"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1641
 msgid "<b>Ends at:</b> "
 msgstr "<b>Término:</b> "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1661
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1682
 msgid "New meeting"
 msgstr "Nova reunião"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1663
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1684
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Editar reunião"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1763
 msgid "Time:"
 msgstr "Hora:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1878
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1896
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1881
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1899
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1892
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Evento iminente: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1893
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1911
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -13644,39 +12936,39 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1928
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "Lembre-me em %d minuto"
 msgstr[1] "Lembre-me em %d minutos"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2036
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2054
 msgid "Empty calendar"
 msgstr "Agenda vazia"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2037
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2055
 msgid "There is nothing to export."
 msgstr "Não existe nada para exportar."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2077
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2095
 msgid "Could not export the calendar."
 msgstr "Não foi possível exportar a agenda."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2112
 msgid "Export calendar to ICS"
 msgstr "Exportar agenda para ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2135
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "Não foi possível exportar a agenda para '%s'\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2232
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2251
 msgid "Could not export the freebusy info."
 msgstr "Não foi possível exportar a informação de livre/ocupado."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2263
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2283
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Não foi possível exportar a informação de livre/ocupado para '%s'\n"
@@ -13745,20 +13037,16 @@ msgstr "Recusado: "
 msgid "Tentatively Accepted: "
 msgstr "Aceito provisoriamente: "
 
-#: src/plugins/vcalendar/day-view.c:601
-#: src/plugins/vcalendar/month-view.c:701
+#: src/plugins/vcalendar/day-view.c:601 src/plugins/vcalendar/month-view.c:701
 msgid "Start"
 msgstr "Início"
 
-#: src/plugins/vcalendar/day-view.c:614
-#: src/plugins/vcalendar/month-view.c:714
+#: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:714
 msgid "Show"
 msgstr "Exibir"
 
-#: src/plugins/vcalendar/day-view.c:622
-#: src/plugins/vcalendar/month-view.c:722
-#: src/prefs_account.c:1456
-#: src/prefs_folder_item.c:562
+#: src/plugins/vcalendar/day-view.c:622 src/plugins/vcalendar/month-view.c:722
+#: src/prefs_account.c:1452 src/prefs_folder_item.c:562
 #: src/prefs_matcher.c:334
 msgid "days"
 msgstr "dias"
@@ -13779,8 +13067,8 @@ msgid ""
 "meetings and calendars, publish your free/busy information and retrieve that "
 "information from others."
 msgstr ""
-"Esse plugin habilita a manipulação de mensagens do vCalendar, como é feito no "
-"Evolution ou no Outlook.\n"
+"Esse plugin habilita a manipulação de mensagens do vCalendar, como é feito "
+"no Evolution ou no Outlook.\n"
 "\n"
 "Quando carregado, ele irá criar uma caixa de correio para o vCalendar na sua "
 "lista de pastas, que será preenchida pelas reuniões que você aceitou ou "
@@ -13791,8 +13079,8 @@ msgstr ""
 "vCalendar ou Reuniões e escolha \"Nova reunião...\".\n"
 "\n"
 "Você também estará apto a inscrever-se em fontes webCal remotas, exportar "
-"suas reuniões e agendas, publicar sua informação de livre/ocupado e recuperar "
-"essa informação dos outros."
+"suas reuniões e agendas, publicar sua informação de livre/ocupado e "
+"recuperar essa informação dos outros."
 
 #: src/plugins/vcalendar/plugin.c:102
 msgid "Calendar"
@@ -13898,8 +13186,7 @@ msgstr "Erro de sintaxe na marca de hora durante a saudação\n"
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Erro de sintaxe na marca de hora durante a saudação (não é ASCII)\n"
 
-#: src/pop.c:190
-#: src/pop.c:217
+#: src/pop.c:190 src/pop.c:217
 msgid "POP3 protocol error\n"
 msgstr "Erro do protocolo POP3\n"
 
@@ -13938,16 +13225,12 @@ msgstr "ocorreu um erro na sessão POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "Comando TOP não suportado\n"
 
-#: src/prefs_account.c:332
-#: src/prefs_account.c:1430
-#: src/prefs_account.c:2416
-#: src/wizard.c:1549
+#: src/prefs_account.c:332 src/prefs_account.c:1426 src/prefs_account.c:2408
+#: src/wizard.c:1361
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:335
-#: src/prefs_account.c:1543
-#: src/prefs_account.c:2431
+#: src/prefs_account.c:335 src/prefs_account.c:1539 src/prefs_account.c:2423
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -13955,8 +13238,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:337
-#: src/wizard.c:1551
+#: src/prefs_account.c:337 src/wizard.c:1363
 msgid "Local mbox file"
 msgstr "Arquivo mbox local"
 
@@ -14004,179 +13286,165 @@ msgstr "Este servidor requer autenticação"
 msgid "Authenticate on connect"
 msgstr "Autenticar ao conectar"
 
-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1216
 msgid "News server"
 msgstr "Servidor de news"
 
-#: src/prefs_account.c:1226
+#: src/prefs_account.c:1222
 msgid "Server for receiving"
 msgstr "Servidor para recebimento"
 
-#: src/prefs_account.c:1232
+#: src/prefs_account.c:1228
 msgid "Local mailbox"
 msgstr "Caixa postal local"
 
-#: src/prefs_account.c:1239
+#: src/prefs_account.c:1235
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account.c:1247
+#: src/prefs_account.c:1243
 msgid "Use mail command rather than SMTP server"
 msgstr "Utilizar comando mail ao invés do servidor SMTP"
 
-#: src/prefs_account.c:1256
+#: src/prefs_account.c:1252
 msgid "command to send mails"
 msgstr "comando para enviar mensagens"
 
-#: src/prefs_account.c:1318
+#: src/prefs_account.c:1314
 #, c-format
 msgid "Account%d"
 msgstr "Conta%d"
 
-#: src/prefs_account.c:1404
+#: src/prefs_account.c:1400
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1410
-#: src/prefs_account.c:1499
+#: src/prefs_account.c:1406 src/prefs_account.c:1495
 msgid "Default Inbox"
 msgstr "Caixa de Entrada padrão"
 
-#: src/prefs_account.c:1417
-#: src/prefs_account.c:1424
-#: src/prefs_account.c:1506
-#: src/prefs_account.c:1513
+#: src/prefs_account.c:1413 src/prefs_account.c:1420 src/prefs_account.c:1502
+#: src/prefs_account.c:1509
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Mensagens não filtradas serão armazenadas nessa pasta"
 
-#: src/prefs_account.c:1421
-#: src/prefs_account.c:1510
-#: src/prefs_account.c:1974
+#: src/prefs_account.c:1417 src/prefs_account.c:1506 src/prefs_account.c:1966
 #: src/prefs_customheader.c:237
 msgid "Bro_wse"
 msgstr "E_xplorar"
 
-#: src/prefs_account.c:1432
+#: src/prefs_account.c:1428
 msgid "Use secure authentication (APOP)"
 msgstr "Usar autenticação de segurança (APOP)"
 
-#: src/prefs_account.c:1435
+#: src/prefs_account.c:1431
 msgid "Remove messages on server when received"
 msgstr "Eliminar as mensagens do servidor após recebê-las"
 
-#: src/prefs_account.c:1446
+#: src/prefs_account.c:1442
 msgid "Remove after"
 msgstr "Remover após"
 
-#: src/prefs_account.c:1453
-#: src/prefs_account.c:1463
+#: src/prefs_account.c:1449 src/prefs_account.c:1459
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dia e 0 hora: excluir imediatamente"
 
-#: src/prefs_account.c:1466
-#: src/prefs_matcher.c:333
+#: src/prefs_account.c:1462 src/prefs_matcher.c:333
 msgid "hours"
 msgstr "horas"
 
-#: src/prefs_account.c:1476
+#: src/prefs_account.c:1472
 msgid "Receive size limit"
 msgstr "Tamanho limite do recebimento"
 
-#: src/prefs_account.c:1479
+#: src/prefs_account.c:1475
 msgid ""
-"Messages over this limit will be partially retrieved. When selecting them you "
-"will be able to download them fully or delete them."
+"Messages over this limit will be partially retrieved. When selecting them "
+"you will be able to download them fully or delete them."
 msgstr ""
 "Mensagens acima desse limite serão recebidas parcialmente. Ao selecioná-las, "
 "você poderá obtê-las por inteiro ou exclui-las."
 
-#: src/prefs_account.c:1519
-#: src/prefs_account.c:2446
+#: src/prefs_account.c:1515 src/prefs_account.c:2438
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1526
+#: src/prefs_account.c:1522
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artigos a receber"
 
-#: src/prefs_account.c:1536
+#: src/prefs_account.c:1532
 msgid "unlimited if 0 is specified"
 msgstr "ilimitado se for especificado 0"
 
-#: src/prefs_account.c:1549
-#: src/prefs_account.c:1742
+#: src/prefs_account.c:1545 src/prefs_account.c:1738
 msgid "Authentication method"
 msgstr "Método de autenticação"
 
-#: src/prefs_account.c:1559
-#: src/prefs_account.c:1751
-#: src/prefs_send.c:286
+#: src/prefs_account.c:1555 src/prefs_account.c:1747 src/prefs_send.c:290
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/prefs_account.c:1571
+#: src/prefs_account.c:1567
 msgid "IMAP server directory"
 msgstr "Diretório do servidor IMAP"
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1571
 msgid "(usually empty)"
 msgstr "(geralmente vazio)"
 
-#: src/prefs_account.c:1589
+#: src/prefs_account.c:1585
 msgid "Show subscribed folders only"
 msgstr "Mostrar apenas pastas assinadas"
 
-#: src/prefs_account.c:1596
+#: src/prefs_account.c:1592
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 "Módulo de eficiência de banda (impede a recuperação de etiquetas remotas)"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1594
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Esse modo usa menos banda, mas pode ser mais lento com alguns servidores."
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1601
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensagens ao receber"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1608
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permite filtrar usando plugins, durante o recebimento"
 
-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1612
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Receber mensagem' procura por novas mensagens dessa conta"
 
-#: src/prefs_account.c:1697
-#: src/prefs_customheader.c:209
-#: src/prefs_matcher.c:620
-#: src/prefs_matcher.c:1952
-#: src/prefs_matcher.c:1974
+#: src/prefs_account.c:1693 src/prefs_customheader.c:209
+#: src/prefs_matcher.c:620 src/prefs_matcher.c:1958 src/prefs_matcher.c:1980
 msgid "Header"
 msgstr "Cabeçalho"
 
-#: src/prefs_account.c:1699
+#: src/prefs_account.c:1695
 msgid "Generate Message-ID"
 msgstr "Gerar Message-ID"
 
-#: src/prefs_account.c:1702
+#: src/prefs_account.c:1698
 msgid "Send account mail address in Message-ID"
 msgstr "Enviar o endereço de e-mail da conta na Message-ID"
 
-#: src/prefs_account.c:1705
+#: src/prefs_account.c:1701
 msgid "Generate X-Mailer header"
 msgstr "Gerar cabeçalho X-Mailer"
 
-#: src/prefs_account.c:1712
+#: src/prefs_account.c:1708
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho definido pelo usuário"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1723
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticação SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:1816
+#: src/prefs_account.c:1808
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14184,214 +13452,195 @@ msgstr ""
 "Deixe estes campos em branco, para utilizar os mesmos usuário e senha de "
 "recebimento."
 
-#: src/prefs_account.c:1827
+#: src/prefs_account.c:1819
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticar via POP3 antes de enviar"
 
-#: src/prefs_account.c:1842
+#: src/prefs_account.c:1834
 msgid "POP authentication timeout: "
 msgstr "Tempo de espera para autenticação POP: "
 
-#: src/prefs_account.c:1850
+#: src/prefs_account.c:1842
 msgid "minutes"
 msgstr "minutos"
 
-#: src/prefs_account.c:1920
-#: src/prefs_account.c:1966
+#: src/prefs_account.c:1912 src/prefs_account.c:1958
 msgid "Signature"
 msgstr "Assinatura"
 
-#: src/prefs_account.c:1923
+#: src/prefs_account.c:1915
 msgid "Automatically insert signature"
 msgstr "Inserir a assinatura automaticamente"
 
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1920
 msgid "Signature separator"
 msgstr "Separador de assinatura"
 
-#: src/prefs_account.c:1953
+#: src/prefs_account.c:1945
 msgid "Command output"
 msgstr "Saída do comando"
 
-#: src/prefs_account.c:1986
+#: src/prefs_account.c:1978
 msgid "Automatically set the following addresses"
 msgstr "Definir os seguintes endereços automaticamente"
 
-#: src/prefs_account.c:2038
+#: src/prefs_account.c:2030
 msgid "Spell check dictionaries"
 msgstr "Dicionários de checagem ortográfica"
 
-#: src/prefs_account.c:2048
-#: src/prefs_folder_item.c:1094
+#: src/prefs_account.c:2040 src/prefs_folder_item.c:1094
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Dicionário padrão"
 
-#: src/prefs_account.c:2061
-#: src/prefs_folder_item.c:1128
+#: src/prefs_account.c:2053 src/prefs_folder_item.c:1128
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Dicionário alternativo padrão"
 
-#: src/prefs_account.c:2147
-#: src/prefs_account.c:3263
-#: src/prefs_compose_writing.c:350
-#: src/prefs_folder_item.c:1443
-#: src/prefs_folder_item.c:1834
-#: src/prefs_quote.c:119
-#: src/prefs_quote.c:237
-#: src/prefs_spelling.c:336
-#: src/prefs_wrapping.c:153
+#: src/prefs_account.c:2139 src/prefs_account.c:3255
+#: src/prefs_compose_writing.c:350 src/prefs_folder_item.c:1443
+#: src/prefs_folder_item.c:1834 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Escrever"
 
-#: src/prefs_account.c:2162
-#: src/prefs_folder_item.c:1471
-#: src/prefs_quote.c:134
-#: src/toolbar.c:407
+#: src/prefs_account.c:2154 src/prefs_folder_item.c:1471 src/prefs_quote.c:134
+#: src/toolbar.c:408
 msgid "Reply"
 msgstr "Responder"
 
-#: src/prefs_account.c:2177
-#: src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1499
-#: src/prefs_quote.c:149
-#: src/toolbar.c:411
+#: src/prefs_account.c:2169 src/prefs_filtering_action.c:191
+#: src/prefs_folder_item.c:1499 src/prefs_quote.c:149 src/toolbar.c:412
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: src/prefs_account.c:2224
+#: src/prefs_account.c:2216
 msgid "Default privacy system"
 msgstr "Sistema de privacidade padrão"
 
-#: src/prefs_account.c:2253
+#: src/prefs_account.c:2245
 msgid "Always sign messages"
 msgstr "Sempre assinar as mensagens"
 
-#: src/prefs_account.c:2255
+#: src/prefs_account.c:2247
 msgid "Always encrypt messages"
 msgstr "Sempre criptografar as mensagens"
 
-#: src/prefs_account.c:2257
+#: src/prefs_account.c:2249
 msgid "Always sign messages when replying to a signed message"
 msgstr "Sempre assinar as mensagens em resposta a mensagens assinadas"
 
-#: src/prefs_account.c:2260
+#: src/prefs_account.c:2252
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 "Sempre criptografar as mensagens em resposta a mensagens criptografadas"
 
-#: src/prefs_account.c:2263
+#: src/prefs_account.c:2255
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Criptografar as mensagens enviadas com sua própria chave além da dos "
 "destinatários"
 
-#: src/prefs_account.c:2265
+#: src/prefs_account.c:2257
 msgid "Save sent encrypted messages as clear text"
 msgstr "Salvar mensagens criptografadas enviadas como texto simples"
 
-#: src/prefs_account.c:2420
-#: src/prefs_account.c:2435
-#: src/prefs_account.c:2449
+#: src/prefs_account.c:2412 src/prefs_account.c:2427 src/prefs_account.c:2441
 msgid "Don't use SSL"
 msgstr "Não utilizar SSL"
 
-#: src/prefs_account.c:2423
+#: src/prefs_account.c:2415
 msgid "Use SSL for POP3 connection"
 msgstr "Utilizar SSL para conexão POP3"
 
-#: src/prefs_account.c:2426
-#: src/prefs_account.c:2441
-#: src/prefs_account.c:2472
+#: src/prefs_account.c:2418 src/prefs_account.c:2433 src/prefs_account.c:2464
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utilizar comando STARTTLS para iniciar sessão SSL"
 
-#: src/prefs_account.c:2438
+#: src/prefs_account.c:2430
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utilizar SSL para conexão IMAP4"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2450
 msgid "Use SSL for NNTP connection"
 msgstr "Utilizar SSL para conexão NNTP"
 
-#: src/prefs_account.c:2462
+#: src/prefs_account.c:2454
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account.c:2466
+#: src/prefs_account.c:2458
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Não use SSL (mas, se necessario, use STARTTLS)"
 
-#: src/prefs_account.c:2469
+#: src/prefs_account.c:2461
 msgid "Use SSL for SMTP connection"
 msgstr "Utilizar SSL para conexão SMTP"
 
-#: src/prefs_account.c:2477
+#: src/prefs_account.c:2469
 msgid "Client certificates"
 msgstr "Certificados do cliente"
 
-#: src/prefs_account.c:2485
+#: src/prefs_account.c:2477
 msgid "Certificate for receiving"
 msgstr "Certificado para recebimento"
 
-#: src/prefs_account.c:2490
-#: src/prefs_account.c:2492
-#: src/prefs_account.c:2512
-#: src/prefs_account.c:2514
+#: src/prefs_account.c:2482 src/prefs_account.c:2484 src/prefs_account.c:2504
+#: src/prefs_account.c:2506
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Certificado do cliente como um arquivo PKCS12 ou PEM"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2499
 msgid "Certificate for sending"
 msgstr "Certificado para envio"
 
-#: src/prefs_account.c:2540
+#: src/prefs_account.c:2532
 msgid "Use non-blocking SSL"
 msgstr "Utilizar SSL não bloqueador"
 
-#: src/prefs_account.c:2552
+#: src/prefs_account.c:2544
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Desligue essa opção caso você tenha problemas de conexão via SSL"
 
-#: src/prefs_account.c:2668
+#: src/prefs_account.c:2660
 msgid "SMTP port"
 msgstr "Porta SMTP"
 
-#: src/prefs_account.c:2675
+#: src/prefs_account.c:2667
 msgid "POP3 port"
 msgstr "Porta POP3"
 
-#: src/prefs_account.c:2682
+#: src/prefs_account.c:2674
 msgid "IMAP4 port"
 msgstr "Porta IMAP4"
 
-#: src/prefs_account.c:2689
+#: src/prefs_account.c:2681
 msgid "NNTP port"
 msgstr "Porta NNTP"
 
-#: src/prefs_account.c:2695
+#: src/prefs_account.c:2687
 msgid "Domain name"
 msgstr "Nome do domínio"
 
-#: src/prefs_account.c:2698
+#: src/prefs_account.c:2690
 msgid ""
-"The domain name will be used in the generated Message-ID, and when connecting "
-"to SMTP servers."
+"The domain name will be used in the generated Message-ID, and when "
+"connecting to SMTP servers."
 msgstr ""
-"O nome do domínio será utilizado na Message-ID gerada e durante a conexão com "
-"os servidores SMTP."
+"O nome do domínio será utilizado na Message-ID gerada e durante a conexão "
+"com os servidores SMTP."
 
-#: src/prefs_account.c:2712
+#: src/prefs_account.c:2704
 msgid "Use command to communicate with server"
 msgstr "Utilizar comando para comunicar com o servidor"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2712
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr ""
 "Mover as mensagens excluídas para a lixeira e expurgá-las imediatamente"
 
-#: src/prefs_account.c:2722
+#: src/prefs_account.c:2714
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -14399,77 +13648,75 @@ msgstr ""
 "Move as mensagens excluídas para a lixeira, ao invés de usar a marca de "
 "exclusão (\\Deleted), sem expurgá-la."
 
-#: src/prefs_account.c:2726
+#: src/prefs_account.c:2718
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar mensagens de cross-posting como lidas e com a cor:"
 
-#: src/prefs_account.c:2782
+#: src/prefs_account.c:2774
 msgid "Put sent messages in"
 msgstr "Colocar as mensagens enviadas em"
 
-#: src/prefs_account.c:2784
+#: src/prefs_account.c:2776
 msgid "Put queued messages in"
 msgstr "Colocar as mensagens a serem enviadas em"
 
-#: src/prefs_account.c:2786
+#: src/prefs_account.c:2778
 msgid "Put draft messages in"
 msgstr "Colocar os rascunhos das mensagens em"
 
-#: src/prefs_account.c:2788
+#: src/prefs_account.c:2780
 msgid "Put deleted messages in"
 msgstr "Colocar as mensagens excluídas em"
 
-#: src/prefs_account.c:2846
+#: src/prefs_account.c:2838
 msgid "Account name is not entered."
 msgstr "O nome da conta não foi informado."
 
-#: src/prefs_account.c:2850
+#: src/prefs_account.c:2842
 msgid "Mail address is not entered."
 msgstr "O endereço de e-mail não foi informado."
 
-#: src/prefs_account.c:2857
+#: src/prefs_account.c:2849
 msgid "SMTP server is not entered."
 msgstr "O servidor SMTP não foi informado."
 
-#: src/prefs_account.c:2862
+#: src/prefs_account.c:2854
 msgid "User ID is not entered."
 msgstr "A ID do usuário não foi informada."
 
-#: src/prefs_account.c:2867
+#: src/prefs_account.c:2859
 msgid "POP3 server is not entered."
 msgstr "O servidor POP3 não foi informado."
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2879
 msgid "The default Inbox folder doesn't exist."
 msgstr "A pasta padrão da Caixa de Entrada não existe."
 
-#: src/prefs_account.c:2893
+#: src/prefs_account.c:2885
 msgid "IMAP4 server is not entered."
 msgstr "O servidor IMAP4 não foi informado."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2890
 msgid "NNTP server is not entered."
 msgstr "O servidor NNTP não foi informado."
 
-#: src/prefs_account.c:2904
+#: src/prefs_account.c:2896
 msgid "local mailbox filename is not entered."
 msgstr "o nome do arquivo da caixa postal local não informado."
 
-#: src/prefs_account.c:2910
+#: src/prefs_account.c:2902
 msgid "mail command is not entered."
 msgstr "o comando de e-mail não foi informado."
 
-#: src/prefs_account.c:3227
+#: src/prefs_account.c:3219
 msgid "Receive"
 msgstr "Receber"
 
-#: src/prefs_account.c:3281
-#: src/prefs_folder_item.c:1850
-#: src/prefs_quote.c:238
+#: src/prefs_account.c:3273 src/prefs_folder_item.c:1850 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Modelos"
 
-#: src/prefs_account.c:3299
+#: src/prefs_account.c:3291
 msgid "Privacy"
 msgstr "Privacidade"
 
@@ -14486,21 +13733,19 @@ msgstr "Preferências da nova conta"
 msgid "%s - Account preferences"
 msgstr "%s - Preferências da conta"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3794
 msgid "Select signature file"
 msgstr "Selecione o arquivo de assinatura"
 
-#: src/prefs_account.c:3813
-#: src/prefs_account.c:3830
-#: src/wizard.c:1237
+#: src/prefs_account.c:3812 src/prefs_account.c:3829 src/wizard.c:1053
 msgid "Select certificate file"
 msgstr "Selecione o arquivo do certificado"
 
-#: src/prefs_account.c:3926
+#: src/prefs_account.c:3925
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/prefs_account.c:4066
+#: src/prefs_account.c:4065
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin não carregado)"
@@ -14529,81 +13774,72 @@ msgstr "Editar ação de filtragem"
 msgid "Append the new action above to the list"
 msgstr "Adiciona a nova ação definida acima à lista"
 
-#: src/prefs_actions.c:329
-#: src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477
-#: src/prefs_matcher.c:768
-#: src/prefs_template.c:309
-#: src/prefs_toolbar.c:1043
-msgid "Replace"
-msgstr "Substituir"
-
 #: src/prefs_actions.c:335
 msgid "Replace the selected action in list with the action above"
 msgstr "Substitui a ação selecionada na lista pela definida acima"
 
-#: src/prefs_actions.c:343
+#: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:778 src/prefs_template.c:318
+#: src/prefs_toolbar.c:1056
+msgid "Re_move"
+msgstr "Re_mover"
+
+#: src/prefs_actions.c:345
 msgid "Delete the selected action from the list"
 msgstr "Exclui a ação selecionada da lista"
 
-#: src/prefs_actions.c:351
-#: src/prefs_filtering.c:500
-#: src/prefs_template.c:332
+#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:336
 msgid "Clear all the input fields in the dialog"
 msgstr "Limpa todos os campos da janela"
 
-#: src/prefs_actions.c:359
+#: src/prefs_actions.c:363
 msgid "Show information on configuring actions"
 msgstr "Mostra informações sobre a configuração de ações"
 
-#: src/prefs_actions.c:390
+#: src/prefs_actions.c:394
 msgid "Move the selected action up"
 msgstr "Move a ação selecionada para cima"
 
-#: src/prefs_actions.c:398
+#: src/prefs_actions.c:402
 msgid "Move selected action down"
 msgstr "Move a ação selecionada para baixo"
 
-#: src/prefs_actions.c:531
-#: src/prefs_filtering_action.c:702
-#: src/prefs_filtering.c:833
-#: src/prefs_filtering.c:835
-#: src/prefs_filtering.c:836
-#: src/prefs_filtering.c:946
-#: src/prefs_matcher.c:891
-#: src/prefs_template.c:465
+#: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
+#: src/prefs_filtering.c:836 src/prefs_filtering.c:838
+#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:897
+#: src/prefs_template.c:469
 msgid "(New)"
 msgstr "(Novo)"
 
-#: src/prefs_actions.c:596
+#: src/prefs_actions.c:600
 msgid "Menu name is not set."
 msgstr "O nome do menu não foi definido."
 
-#: src/prefs_actions.c:601
+#: src/prefs_actions.c:605
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "Não é permitida a barra '/' no nome do menu."
 
-#: src/prefs_actions.c:606
+#: src/prefs_actions.c:610
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Não é permitido o sinal dois pontos ':' no nome do menu."
 
-#: src/prefs_actions.c:612
+#: src/prefs_actions.c:616
 msgid "There is an action with this name already."
 msgstr "Já existe uma ação com este nome."
 
-#: src/prefs_actions.c:631
+#: src/prefs_actions.c:635
 msgid "Menu name is too long."
 msgstr "O nome do menu é muito longo."
 
-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:644
 msgid "Command-line not set."
 msgstr "O comando não foi definido."
 
-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:649
 msgid "Menu name and command are too long."
 msgstr "O nome do menu e o comando são muito longos."
 
-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:655
 #, c-format
 msgid ""
 "The command\n"
@@ -14614,154 +13850,140 @@ msgstr ""
 "%s\n"
 "possui um erro de sintaxe."
 
-#: src/prefs_actions.c:709
+#: src/prefs_actions.c:713
 msgid "Delete action"
 msgstr "Excluir ação"
 
-#: src/prefs_actions.c:710
+#: src/prefs_actions.c:714
 msgid "Do you really want to delete this action?"
 msgstr "Deseja realmente deseja excluir essa ação?"
 
-#: src/prefs_actions.c:730
+#: src/prefs_actions.c:734
 msgid "Delete all actions"
 msgstr "Excluir todas as ações"
 
-#: src/prefs_actions.c:731
+#: src/prefs_actions.c:735
 msgid "Do you really want to delete all the actions?"
 msgstr "Deseja realmente deseja excluir todas as ações?"
 
-#: src/prefs_actions.c:894
-#: src/prefs_actions.c:925
-#: src/prefs_filtering.c:1496
-#: src/prefs_filtering.c:1518
-#: src/prefs_matcher.c:2103
-#: src/prefs_template.c:565
-#: src/prefs_template.c:590
+#: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1499
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2109
+#: src/prefs_template.c:569 src/prefs_template.c:594
 msgid "Entry not saved"
 msgstr "A entrada não foi salva"
 
-#: src/prefs_actions.c:895
-#: src/prefs_actions.c:926
-#: src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519
-#: src/prefs_template.c:566
-#: src/prefs_template.c:591
+#: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1522 src/prefs_template.c:570
+#: src/prefs_template.c:595
 msgid "The entry was not saved. Close anyway?"
 msgstr "A entrada não foi salva. Fechar mesmo assim?"
 
-#: src/prefs_actions.c:896
-#: src/prefs_actions.c:901
-#: src/prefs_actions.c:927
-#: src/prefs_filtering.c:1476
-#: src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520
-#: src/prefs_matcher.c:2105
-#: src/prefs_template.c:567
-#: src/prefs_template.c:592
-#: src/prefs_template.c:597
+#: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
+#: src/prefs_filtering.c:1479 src/prefs_filtering.c:1501
+#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2111
+#: src/prefs_template.c:571 src/prefs_template.c:596 src/prefs_template.c:601
 msgid "+_Continue editing"
 msgstr "+Con_tinuar editando"
 
-#: src/prefs_actions.c:899
+#: src/prefs_actions.c:903
 msgid "Actions list not saved"
 msgstr "A lista de ações não foi salva"
 
-#: src/prefs_actions.c:900
+#: src/prefs_actions.c:904
 msgid "The actions list has been modified. Close anyway?"
 msgstr "A lista de ações foi modificada. Fechar mesmo assim?"
 
-#: src/prefs_actions.c:970
+#: src/prefs_actions.c:974
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Nome do menu:</span>"
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:975
 msgid "Use / in menu name to make submenus."
 msgstr "Use / no nome do menu para criar sub-menus."
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:977
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Comando:</span>"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:978
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Começar com:</span>"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:979
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "para enviar o corpo da mensagem ou a seleção para a entrada padrão do comando"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:980
 msgid "to send user provided text to command's standard input"
 msgstr ""
 "para enviar o texto fornecido pelo usuário para a entrada padrão do comando"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:981
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
-"para enviar o texto escondido fornecido pelo usuário para a entrada padrão do "
-"comando"
+"para enviar o texto escondido fornecido pelo usuário para a entrada padrão "
+"do comando"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:982
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Terminar com:</span>"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:983
 msgid "to replace message body or selection with command's standard output"
 msgstr "para substituir o corpo da mensagem ou a seleção pela saída do comando"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:984
 msgid "to insert command's standard output without replacing old text"
 msgstr "para inserir a saída do comando sem substituir o texto antigo"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:985
 msgid "to run command asynchronously"
 msgstr "para executar o comando em modo assíncrono"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:986
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Usar:</span>"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:987
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "para o arquivo da mensagem selecionada no formato RFC822/2822 "
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:988
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 "para a lista dos arquivos das mensagens selecionadas no formato RFC822/2822"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:989
 msgid "for the file of the selected decoded message MIME part"
 msgstr "para o arquivo da parte MIME da mensagem decodificada selecionada"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:990
 msgid "for a user provided argument"
 msgstr "para um argumento fornecido pelo usuário"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:991
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "para um argumento escondido fornecido pelo usuário (ex. senha)"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:992
 msgid "for the text selection"
 msgstr "para a seleção de texto"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:993
 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplica as ações de filtragem entre {} nas mensagens selecionadas"
 
-#: src/prefs_actions.c:990
+#: src/prefs_actions.c:994
 msgid "for a literal %"
 msgstr "para um % literal"
 
-#: src/prefs_actions.c:1000
-#: src/prefs_themes.c:959
+#: src/prefs_actions.c:1004 src/prefs_themes.c:959
 msgid "Actions"
 msgstr "Ações"
 
-#: src/prefs_actions.c:1001
+#: src/prefs_actions.c:1005
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
@@ -14769,73 +13991,38 @@ msgstr ""
 "O recurso Ações é uma forma do usuário executar comandos externos para "
 "processar um arquivo completo de mensagens ou somente uma de suas partes."
 
-#: src/prefs_actions.c:1088
-#: src/prefs_filtering.c:1694
-#: src/prefs_template.c:1097
+#: src/prefs_actions.c:1092 src/prefs_filtering.c:1697
+#: src/prefs_template.c:1101
 msgid "D_uplicate"
 msgstr "D_uplicar"
 
-#: src/prefs_actions.c:1215
+#: src/prefs_actions.c:1212
 msgid "Current actions"
 msgstr "Ações atuais"
 
-#: src/prefs_actions.c:1314
-#: src/prefs_filtering.c:1071
-#: src/prefs_filtering.c:1129
+#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074
+#: src/prefs_filtering.c:1132
 msgid "Action string is not valid."
 msgstr "A especificação da ação não é válida."
 
-#: src/prefs_common.c:230
-#: src/prefs_quote.c:69
+#: src/prefs_common.c:220 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Olá,\\n"
 
-#: src/prefs_common.c:304
-msgid ""
-"On %d\\n"
-"%f wrote:\\n"
-"\\n"
-"%q\\n"
-"%X"
-msgstr ""
-"Em %d\\n"
-"%f escreveu:\\n"
-"\\n"
-"%q\\n"
-"%X"
-
-#: src/prefs_common.c:310
-#: src/prefs_quote.c:85
-msgid ""
-"\\n"
-"\\n"
-"Begin forwarded message:\\n"
-"\\n"
-"?d{Date: %d\\n"
-"}?f{From: %f\\n"
-"}?t{To: %t\\n"
-"}?c{Cc: %c\\n"
-"}?n{Newsgroups: %n\\n"
-"}?s{Subject: %s\\n"
-"}\\n"
-"\\n"
-"%M"
+#: src/prefs_common.c:294
+msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
+msgstr "Em %d\\n%f escreveu:\\n\\n%q\\n%X"
+
+#: src/prefs_common.c:300 src/prefs_quote.c:85
+msgid ""
+"\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
+"\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
 msgstr ""
-"\\n"
-"\\n"
-"Iniciando encaminhamento de mensagem:\\n"
-"\\n"
-"?d{Data: %d\\n"
-"}?f{De: %f\\n"
-"}?t{Para: %t\\n"
-"}?c{Cc: %c\\n"
-"}?n{Newsgroups: %n\\n"
-"}?s{Assunto: %s\\n"
-"}\\n"
-"\\n"
+"\\n\\nIniciando encaminhamento de mensagem:\\n\\n?d{Data: %d\\n}?f{De: %f"
+"\\n}?t{Para: %t\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Assunto: %s\\n}\\n\\n"
 "%M"
 
-#: src/prefs_common.c:450
+#: src/prefs_common.c:440
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -14867,8 +14054,7 @@ msgstr "Iniciar automaticamente o editor externo"
 msgid "Automatically save message to Drafts folder every"
 msgstr "Salvar automaticamente a mensagem na pasta Rascunho a cada"
 
-#: src/prefs_compose_writing.c:158
-#: src/prefs_wrapping.c:101
+#: src/prefs_compose_writing.c:158 src/prefs_wrapping.c:101
 msgid "characters"
 msgstr "caracteres"
 
@@ -14900,8 +14086,7 @@ msgstr "O botão Responder deve enviar para a Lista de Discussão"
 msgid "Forwarding"
 msgstr "Encaminhamento"
 
-#: src/prefs_compose_writing.c:214
-#: src/prefs_filtering_action.c:192
+#: src/prefs_compose_writing.c:214 src/prefs_filtering_action.c:192
 msgid "Forward as attachment"
 msgstr "Encaminhar como anexo"
 
@@ -14917,13 +14102,11 @@ msgstr "Ao arrastar arquivos para a janela de composição"
 msgid "Ask"
 msgstr "Perguntar"
 
-#: src/prefs_compose_writing.c:230
-#: src/toolbar.c:425
+#: src/prefs_compose_writing.c:230 src/toolbar.c:426
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/prefs_compose_writing.c:231
-#: src/toolbar.c:426
+#: src/prefs_compose_writing.c:231 src/toolbar.c:427
 msgid "Attach"
 msgstr "Anexo"
 
@@ -14935,10 +14118,8 @@ msgstr "Escrita"
 msgid "Custom header configuration"
 msgstr "Configuração de cabeçalhos personalizados"
 
-#: src/prefs_customheader.c:507
-#: src/prefs_display_header.c:599
-#: src/prefs_matcher.c:1577
-#: src/prefs_matcher.c:1592
+#: src/prefs_customheader.c:507 src/prefs_display_header.c:599
+#: src/prefs_matcher.c:1583 src/prefs_matcher.c:1598
 msgid "Header name is not set."
 msgstr "O nome do cabeçalho não foi definido."
 
@@ -15038,19 +14219,19 @@ msgstr "%s será substituído pelo nome do arquivo/URL"
 msgid "Use system defaults when possible"
 msgstr "Usar padrões do sistema, quando possível"
 
-#: src/prefs_ext_prog.c:146
+#: src/prefs_ext_prog.c:141
 msgid "Web browser"
 msgstr "Navegador Web"
 
-#: src/prefs_ext_prog.c:180
+#: src/prefs_ext_prog.c:169
 msgid "Text editor"
 msgstr "Editor de texto"
 
-#: src/prefs_ext_prog.c:208
+#: src/prefs_ext_prog.c:197
 msgid "Command for 'Display as text'"
 msgstr "Comando para 'Mostrar como texto'"
 
-#: src/prefs_ext_prog.c:221
+#: src/prefs_ext_prog.c:210
 msgid ""
 "This option enables MIME parts to be displayed in the message view via a "
 "script when using the 'Display as text' contextual menu item"
@@ -15058,13 +14239,12 @@ msgstr ""
 "Essa opção habilita a exibição de partes MIME na visualização da mensagem "
 "através de um script, ao usar o item do menu de contexto 'Mostrar como texto'"
 
-#: src/prefs_ext_prog.c:280
-#: src/prefs_image_viewer.c:138
+#: src/prefs_ext_prog.c:269 src/prefs_image_viewer.c:138
 #: src/prefs_message.c:354
 msgid "Message View"
 msgstr "Visualização da mensagem"
 
-#: src/prefs_ext_prog.c:281
+#: src/prefs_ext_prog.c:270
 msgid "External Programs"
 msgstr "Programas externos"
 
@@ -15080,19 +14260,14 @@ msgstr "Copiar"
 msgid "Hide"
 msgstr "Esconder"
 
-#: src/prefs_filtering_action.c:179
-#: src/prefs_filtering_action.c:180
-#: src/prefs_filtering_action.c:181
-#: src/prefs_filtering_action.c:182
-#: src/prefs_filtering_action.c:183
-#: src/prefs_filtering_action.c:184
-#: src/prefs_filtering_action.c:185
-#: src/prefs_filtering_action.c:186
+#: src/prefs_filtering_action.c:179 src/prefs_filtering_action.c:180
+#: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:182
+#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:184
+#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
 msgid "Message flags"
 msgstr "Marcas da mensagem"
 
-#: src/prefs_filtering_action.c:179
-#: src/prefs_summary_column.c:78
+#: src/prefs_filtering_action.c:179 src/prefs_summary_column.c:78
 #: src/summaryview.c:2776
 msgid "Mark"
 msgstr "Marcar"
@@ -15113,11 +14288,8 @@ msgstr "Marcar como _spam"
 msgid "Mark as ham"
 msgstr "Marcar como _não-spam"
 
-#: src/prefs_filtering_action.c:187
-#: src/prefs_filtering_action.c:1436
-#: src/toolbar.c:204
-#: src/toolbar.c:435
-#: src/toolbar.c:2106
+#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1438
+#: src/toolbar.c:205 src/toolbar.c:436 src/toolbar.c:2107
 msgid "Execute"
 msgstr "Executar"
 
@@ -15125,8 +14297,7 @@ msgstr "Executar"
 msgid "Color label"
 msgstr "Rótulo colorido"
 
-#: src/prefs_filtering_action.c:191
-#: src/prefs_filtering_action.c:192
+#: src/prefs_filtering_action.c:191 src/prefs_filtering_action.c:192
 #: src/prefs_filtering_action.c:193
 msgid "Resend"
 msgstr "Re-enviar"
@@ -15135,12 +14306,9 @@ msgstr "Re-enviar"
 msgid "Redirect"
 msgstr "Redirecionar"
 
-#: src/prefs_filtering_action.c:194
-#: src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1440
-#: src/prefs_matcher.c:626
-#: src/prefs_summary_column.c:87
-#: src/summaryview.c:449
+#: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
+#: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:626
+#: src/prefs_summary_column.c:87 src/summaryview.c:449
 msgid "Score"
 msgstr "Pontuação"
 
@@ -15152,12 +14320,9 @@ msgstr "Mudar a pontuação"
 msgid "Set score"
 msgstr "Configurar a pontuação"
 
-#: src/prefs_filtering_action.c:196
-#: src/prefs_filtering_action.c:197
-#: src/prefs_filtering_action.c:198
-#: src/prefs_matcher.c:630
-#: src/prefs_summary_column.c:89
-#: src/summaryview.c:451
+#: src/prefs_filtering_action.c:196 src/prefs_filtering_action.c:197
+#: src/prefs_filtering_action.c:198 src/prefs_matcher.c:630
+#: src/prefs_summary_column.c:89 src/summaryview.c:451
 msgid "Tags"
 msgstr "Etiquetas"
 
@@ -15173,8 +14338,7 @@ msgstr "Remover etiqueta"
 msgid "Clear tags"
 msgstr "Limpar etiquetas"
 
-#: src/prefs_filtering_action.c:199
-#: src/prefs_filtering_action.c:200
+#: src/prefs_filtering_action.c:199 src/prefs_filtering_action.c:200
 msgid "Threads"
 msgstr "Discussões"
 
@@ -15186,81 +14350,74 @@ msgstr "Parar a filtragem"
 msgid "Action configuration"
 msgstr "Configuração da ação"
 
-#: src/prefs_filtering_action.c:427
-#: src/prefs_filtering.c:1892
+#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1888
 #: src/prefs_matcher.c:583
 msgid "Rule"
 msgstr "Regra"
 
-#: src/prefs_filtering_action.c:440
-#: src/prefs_filtering.c:433
+#: src/prefs_filtering_action.c:440 src/prefs_filtering.c:433
 msgid "Action"
 msgstr "Ação"
 
-#: src/prefs_filtering_action.c:933
+#: src/prefs_filtering_action.c:935
 msgid "Command-line not set"
 msgstr "O comando não foi definido"
 
-#: src/prefs_filtering_action.c:934
+#: src/prefs_filtering_action.c:936
 msgid "Destination is not set."
 msgstr "O destino não foi especificado."
 
-#: src/prefs_filtering_action.c:945
+#: src/prefs_filtering_action.c:947
 msgid "Recipient is not set."
 msgstr "O destinatário não foi especificado."
 
-#: src/prefs_filtering_action.c:963
+#: src/prefs_filtering_action.c:965
 msgid "Score is not set"
 msgstr "A pontuação não foi definida"
 
-#: src/prefs_filtering_action.c:971
+#: src/prefs_filtering_action.c:973
 msgid "Header is not set."
 msgstr "O cabeçalho não foi definido."
 
-#: src/prefs_filtering_action.c:978
+#: src/prefs_filtering_action.c:980
 msgid "Target addressbook/folder is not set."
 msgstr "O Livro de Endereços/pasta de destino não foi definido."
 
-#: src/prefs_filtering_action.c:992
+#: src/prefs_filtering_action.c:994
 msgid "Tag name is empty."
 msgstr "O nome da etiqueta não foi definido."
 
-#: src/prefs_filtering_action.c:1214
+#: src/prefs_filtering_action.c:1216
 msgid "No action was defined."
 msgstr "Não foi definida nenhuma ação."
 
-#: src/prefs_filtering_action.c:1252
-#: src/prefs_matcher.c:2147
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2153
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "% literal"
 
-#: src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2156
+#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2162
 msgid "filename (should not be modified)"
 msgstr "Nome do arquivo (não deve ser modificado)"
 
-#: src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2157
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2163
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "Nova linha"
 
-#: src/prefs_filtering_action.c:1263
-#: src/prefs_matcher.c:2158
+#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2164
 msgid "escape character for quotes"
 msgstr "Caractere de escape para as aspas"
 
-#: src/prefs_filtering_action.c:1264
-#: src/prefs_matcher.c:2159
+#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2165
 msgid "quote character"
 msgstr "Caractere para aspas"
 
-#: src/prefs_filtering_action.c:1273
+#: src/prefs_filtering_action.c:1275
 msgid "Filtering Action: 'Execute'"
 msgstr "Ação da filtragem: 'Executar'"
 
-#: src/prefs_filtering_action.c:1274
+#: src/prefs_filtering_action.c:1276
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
@@ -15270,34 +14427,32 @@ msgstr ""
 "para um programa ou script externo.\n"
 "Os seguinte símbolos podem ser utilizados:"
 
-#: src/prefs_filtering_action.c:1420
+#: src/prefs_filtering_action.c:1422
 msgid "Recipient"
 msgstr "Destinatário"
 
-#: src/prefs_filtering_action.c:1424
+#: src/prefs_filtering_action.c:1426
 msgid "Book/Folder"
 msgstr "Livro/Pasta"
 
-#: src/prefs_filtering_action.c:1428
+#: src/prefs_filtering_action.c:1430
 msgid "Destination"
 msgstr "Destino"
 
-#: src/prefs_filtering_action.c:1432
+#: src/prefs_filtering_action.c:1434
 msgid "Color"
 msgstr "Colorir"
 
-#: src/prefs_filtering_action.c:1518
+#: src/prefs_filtering_action.c:1520
 msgid "Current action list"
 msgstr "Lista das ações atuais"
 
-#: src/prefs_filtering.c:197
-#: src/prefs_filtering.c:359
+#: src/prefs_filtering.c:197 src/prefs_filtering.c:359
 msgid "Filtering/Processing configuration"
 msgstr "Configuração da filtragem/processamento"
 
-#: src/prefs_filtering.c:266
-#: src/prefs_filtering.c:864
-#: src/prefs_filtering.c:978
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
+#: src/prefs_filtering.c:981
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Todas"
@@ -15307,9 +14462,12 @@ msgid "Condition"
 msgstr "Condição"
 
 #: src/prefs_filtering.c:424
+msgid " D_efine... "
+msgstr " _Definir... "
+
 #: src/prefs_filtering.c:446
-msgid " Define... "
-msgstr " Definir... "
+msgid " De_fine... "
+msgstr " De_finir... "
 
 #: src/prefs_filtering.c:475
 msgid "Append the new rule above to the list"
@@ -15319,88 +14477,87 @@ msgstr "Adiciona a nova regra definida acima à lista"
 msgid "Replace the selected rule in list with the rule above"
 msgstr "Substitui a regra selecionada na lista pela definida acima"
 
-#: src/prefs_filtering.c:492
+#: src/prefs_filtering.c:493
 msgid "Delete the selected rule from the list"
 msgstr "Exclui a regra selecionada da lista"
 
-#: src/prefs_filtering.c:529
+#: src/prefs_filtering.c:532
 msgid "Move the selected rule to the top"
 msgstr "Move a regra selecionada para o início"
 
-#: src/prefs_filtering.c:532
-msgid "Page up"
-msgstr "Página acima"
+#: src/prefs_filtering.c:535
+msgid "Page u_p"
+msgstr "Página a_cima"
 
-#: src/prefs_filtering.c:540
+#: src/prefs_filtering.c:543
 msgid "Move the selected rule one page up"
 msgstr "Move a regra selecionada uma página acima"
 
-#: src/prefs_filtering.c:549
+#: src/prefs_filtering.c:552
 msgid "Move the selected rule up"
 msgstr "Move a regra selecionada para cima"
 
-#: src/prefs_filtering.c:557
+#: src/prefs_filtering.c:560
 msgid "Move the selected rule down"
 msgstr "Move a regra selecionada para baixo"
 
-#: src/prefs_filtering.c:560
-msgid "Page down"
-msgstr "Página abaixo"
+#: src/prefs_filtering.c:563
+msgid "Page dow_n"
+msgstr "Página a_baixo"
 
-#: src/prefs_filtering.c:568
+#: src/prefs_filtering.c:571
 msgid "Move the selected rule one page down"
 msgstr "Move a regra selecionada uma página abaixo"
 
-#: src/prefs_filtering.c:577
+#: src/prefs_filtering.c:580
 msgid "Move the selected rule to the bottom"
 msgstr "Move a regra selecionada para o final"
 
-#: src/prefs_filtering.c:1035
-#: src/prefs_filtering.c:1121
+#: src/prefs_filtering.c:1038 src/prefs_filtering.c:1124
 msgid "Condition string is not valid."
 msgstr "A especificação da condição não é válida."
 
-#: src/prefs_filtering.c:1108
+#: src/prefs_filtering.c:1111
 msgid "Condition string is empty."
 msgstr "A especificação da condição está em branco."
 
-#: src/prefs_filtering.c:1114
+#: src/prefs_filtering.c:1117
 msgid "Action string is empty."
 msgstr "A especificação da ação está em branco."
 
-#: src/prefs_filtering.c:1202
+#: src/prefs_filtering.c:1205
 msgid "Delete rule"
 msgstr "Excluir regra"
 
-#: src/prefs_filtering.c:1203
+#: src/prefs_filtering.c:1206
 msgid "Do you really want to delete this rule?"
 msgstr "Deseja realmente excluir essa regra?"
 
-#: src/prefs_filtering.c:1221
+#: src/prefs_filtering.c:1224
 msgid "Delete all rules"
 msgstr "Excluir todas as regras"
 
-#: src/prefs_filtering.c:1222
+#: src/prefs_filtering.c:1225
 msgid "Do you really want to delete all the rules?"
 msgstr "Deseja realmente excluir todas as regras?"
 
-#: src/prefs_filtering.c:1474
+#: src/prefs_filtering.c:1477
 msgid "Filtering rules not saved"
 msgstr "As regras de filtragem não foram salvas"
 
-#: src/prefs_filtering.c:1475
+#: src/prefs_filtering.c:1478
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "A lista de regras de filtros foram modificadas. Fechar mesmo assim?"
 
-#: src/prefs_filtering.c:1697
+#: src/prefs_filtering.c:1700
 msgid "Move one page up"
 msgstr "Move uma página acima"
 
-#: src/prefs_filtering.c:1698
+#: src/prefs_filtering.c:1701
 msgid "Move one page down"
 msgstr "Move uma página abaixo"
 
-#: src/prefs_filtering.c:1860
+#: src/prefs_filtering.c:1856
 msgid "Enable"
 msgstr "Habilitar"
 
@@ -15416,27 +14573,21 @@ msgstr ""
 "Selecione as colunas a serem exibidas na lista de pastas. Você pode\n"
 "modificar a ordem utilizando os botões acima/abaixo ou arrastando os itens."
 
-#: src/prefs_folder_column.c:258
-#: src/prefs_summary_column.c:272
+#: src/prefs_folder_column.c:258 src/prefs_summary_column.c:272
 msgid "Hidden columns"
 msgstr "Colunas ocultas"
 
-#: src/prefs_folder_column.c:290
-#: src/prefs_summaries.c:406
-#: src/prefs_summaries.c:548
-#: src/prefs_summary_column.c:304
+#: src/prefs_folder_column.c:290 src/prefs_summaries.c:406
+#: src/prefs_summaries.c:548 src/prefs_summary_column.c:304
 msgid "Displayed columns"
 msgstr "Colunas exibidas"
 
-#: src/prefs_folder_column.c:329
-#: src/prefs_msg_colors.c:494
-#: src/prefs_summary_column.c:343
-#: src/prefs_toolbar.c:1055
+#: src/prefs_folder_column.c:329 src/prefs_msg_colors.c:494
+#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1064
 msgid " Use default "
 msgstr " Utilizar o padrão "
 
-#: src/prefs_folder_item.c:270
-#: src/prefs_folder_item.c:878
+#: src/prefs_folder_item.c:270 src/prefs_folder_item.c:878
 #: src/prefs_folder_item.c:1403
 msgid ""
 "<i>These preferences will not be saved as this folder is a top-level folder. "
@@ -15444,11 +14595,10 @@ msgid ""
 "subfolders\".</i>"
 msgstr ""
 "<i>Estas preferências não serão salvas, uma vez que essa é a pasta de nível "
-"mais alto. Entretanto você pode defini-las para toda a árvore da caixa postal "
-"selecionando \"Aplicar às sub-pastas\".</i>"
+"mais alto. Entretanto você pode defini-las para toda a árvore da caixa "
+"postal selecionando \"Aplicar às sub-pastas\".</i>"
 
-#: src/prefs_folder_item.c:282
-#: src/prefs_folder_item.c:890
+#: src/prefs_folder_item.c:282 src/prefs_folder_item.c:890
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -15488,8 +14638,7 @@ msgstr "Alterar modo (chmod) da pasta"
 msgid "Folder color"
 msgstr "Cor da Pasta"
 
-#: src/prefs_folder_item.c:435
-#: src/prefs_folder_item.c:1672
+#: src/prefs_folder_item.c:435 src/prefs_folder_item.c:1672
 msgid "Pick color for folder"
 msgstr "Selecione a cor para a pasta"
 
@@ -15522,8 +14671,8 @@ msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
 msgstr ""
-"\"Padrão\" seguirá as preferências globais (encontradas em "
-"/Preferências/Visualização da mensagem/Opções do texto"
+"\"Padrão\" seguirá as preferências globais (encontradas em /Preferências/"
+"Visualização da mensagem/Opções do texto"
 
 #: src/prefs_folder_item.c:531
 msgid "Synchronise for offline use"
@@ -15554,10 +14703,8 @@ msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 "Salvar as cópias das mensagens enviadas nessa pasta ao invés da Enviadas"
 
-#: src/prefs_folder_item.c:927
-#: src/prefs_folder_item.c:950
-#: src/prefs_folder_item.c:974
-#: src/prefs_folder_item.c:997
+#: src/prefs_folder_item.c:927 src/prefs_folder_item.c:950
+#: src/prefs_folder_item.c:974 src/prefs_folder_item.c:997
 #: src/prefs_folder_item.c:1020
 msgid "Default "
 msgstr "Padrão "
@@ -15595,16 +14742,15 @@ msgstr "Propriedades da pasta %s"
 msgid "Folder and Message Lists"
 msgstr "Listas de pastas e mensagens"
 
-#: src/prefs_fonts.c:99
-#: src/prefs_matcher.c:2024
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2030
 msgid "Message"
 msgstr "Mensagem"
 
 #: src/prefs_fonts.c:126
 msgid "Derive small and bold fonts from Folder and Message Lists font"
 msgstr ""
-"Derivar fontes pequenas e em negrito a partir das fontes das listas de pastas "
-"e de mensagens"
+"Derivar fontes pequenas e em negrito a partir das fontes das listas de "
+"pastas e de mensagens"
 
 #: src/prefs_fonts.c:136
 msgid "Small"
@@ -15622,9 +14768,7 @@ msgstr "Usar uma fonte diferente para imprimir"
 msgid "Message Printing"
 msgstr "Impressão da mensagem"
 
-#: src/prefs_fonts.c:268
-#: src/prefs_msg_colors.c:839
-#: src/prefs_summaries.c:681
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:681
 #: src/prefs_themes.c:368
 msgid "Display"
 msgstr "Exibir"
@@ -15633,9 +14777,7 @@ msgstr "Exibir"
 msgid "Fonts"
 msgstr "Fontes"
 
-#: src/prefs_gtk.c:938
-#: src/toolbar.c:212
-#: src/toolbar.c:421
+#: src/prefs_gtk.c:938 src/toolbar.c:213 src/toolbar.c:422
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -15663,18 +14805,15 @@ msgstr "Imprimir imagens"
 msgid "Image Viewer"
 msgstr "Visualizador de imagens"
 
-#: src/prefs_logging.c:147
-#: src/prefs_logging.c:254
+#: src/prefs_logging.c:147 src/prefs_logging.c:254
 msgid "Restrict the log window to"
 msgstr "Restringir a janela de relatórios a"
 
-#: src/prefs_logging.c:159
-#: src/prefs_logging.c:266
+#: src/prefs_logging.c:159 src/prefs_logging.c:266
 msgid "0 to stop logging in the log window"
 msgstr "0 para parar a atualização do relatório"
 
-#: src/prefs_logging.c:161
-#: src/prefs_logging.c:268
+#: src/prefs_logging.c:161 src/prefs_logging.c:268
 msgid "lines"
 msgstr "linhas"
 
@@ -15755,8 +14894,8 @@ msgstr ""
 "correspondem ou não e quais ações são efetuadas.\n"
 "Escolha Médio para ver mais detalhes sobre a mensagem que está sendo "
 "processada e porque as regras foram ignoradas.\n"
-"Escolha Alto para explicitar as razões de porque as regras foram ignoradas ou "
-"não e porque as condições correspondem ou não.\n"
+"Escolha Alto para explicitar as razões de porque as regras foram ignoradas "
+"ou não e porque as condições correspondem ou não.\n"
 "Atenção: quanto mais alto o nível, maior o impacto na performance."
 
 #: src/prefs_logging.c:280
@@ -15783,9 +14922,7 @@ msgstr "Mensagens de erro"
 msgid "Status messages for filtering/processing log"
 msgstr "Mensagens de status para o relatório de filtragem/processamento"
 
-#: src/prefs_logging.c:427
-#: src/prefs_msg_colors.c:145
-#: src/prefs_other.c:689
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:689
 msgid "Other"
 msgstr "Outro"
 
@@ -15813,8 +14950,7 @@ msgstr "mais alta que"
 msgid "lower than"
 msgstr "mais baixa que"
 
-#: src/prefs_matcher.c:341
-#: src/prefs_matcher.c:347
+#: src/prefs_matcher.c:341 src/prefs_matcher.c:347
 msgid "exactly"
 msgstr "exatamente"
 
@@ -15858,13 +14994,11 @@ msgstr "trecho do corpo"
 msgid "whole message"
 msgstr "toda a mensagem"
 
-#: src/prefs_matcher.c:389
-#: src/summaryview.c:6302
+#: src/prefs_matcher.c:389 src/summaryview.c:6298
 msgid "Marked"
 msgstr "Marcada"
 
-#: src/prefs_matcher.c:390
-#: src/summaryview.c:6300
+#: src/prefs_matcher.c:390 src/summaryview.c:6296
 msgid "Deleted"
 msgstr "Excluída"
 
@@ -15872,16 +15006,12 @@ msgstr "Excluída"
 msgid "Replied"
 msgstr "Respondida"
 
-#: src/prefs_matcher.c:392
-#: src/summaryview.c:6294
+#: src/prefs_matcher.c:392 src/summaryview.c:6290
 msgid "Forwarded"
 msgstr "Encaminhada"
 
-#: src/prefs_matcher.c:394
-#: src/summaryview.c:6284
-#: src/toolbar.c:414
-#: src/toolbar.c:950
-#: src/toolbar.c:1996
+#: src/prefs_matcher.c:394 src/summaryview.c:6280 src/toolbar.c:415
+#: src/toolbar.c:951 src/toolbar.c:1997
 msgid "Spam"
 msgstr "Spam"
 
@@ -15889,8 +15019,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Possui anexo"
 
-#: src/prefs_matcher.c:396
-#: src/summaryview.c:6320
+#: src/prefs_matcher.c:396 src/summaryview.c:6316
 msgid "Signed"
 msgstr "Assinada"
 
@@ -15974,8 +15103,7 @@ msgstr "Frase"
 msgid "Flags"
 msgstr "Marcas"
 
-#: src/prefs_matcher.c:624
-#: src/prefs_msg_colors.c:410
+#: src/prefs_matcher.c:624 src/prefs_msg_colors.c:410
 msgid "Color labels"
 msgstr "Rótulos coloridos"
 
@@ -15991,144 +15119,139 @@ msgstr "Transferido parcialmente"
 msgid "External program test"
 msgstr "Teste por programa externo"
 
-#: src/prefs_matcher.c:707
-#: src/prefs_matcher.c:1598
-#: src/prefs_matcher.c:1613
-#: src/prefs_matcher.c:2495
+#: src/prefs_matcher.c:707 src/prefs_matcher.c:1604 src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:2501
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Todas"
 
-#: src/prefs_matcher.c:739
+#: src/prefs_matcher.c:741
 msgid "Use regexp"
 msgstr "Usar expressão regular"
 
-#: src/prefs_matcher.c:812
+#: src/prefs_matcher.c:818
 msgid "Message must match"
 msgstr "A mensagem deve corresponder a"
 
-#: src/prefs_matcher.c:816
+#: src/prefs_matcher.c:822
 msgid "at least one"
 msgstr "pelo menos uma das"
 
-#: src/prefs_matcher.c:817
+#: src/prefs_matcher.c:823
 msgid "all"
 msgstr "todas as"
 
-#: src/prefs_matcher.c:820
+#: src/prefs_matcher.c:826
 msgid "of above rules"
 msgstr "regras acima"
 
-#: src/prefs_matcher.c:1516
-#: src/prefs_matcher.c:1582
+#: src/prefs_matcher.c:1522 src/prefs_matcher.c:1588
 msgid "Search pattern is not set."
 msgstr "O padrão da pesquisa não foi definido."
 
-#: src/prefs_matcher.c:1525
+#: src/prefs_matcher.c:1531
 msgid "Test command is not set."
 msgstr "O comando de teste não foi definido."
 
-#: src/prefs_matcher.c:1599
+#: src/prefs_matcher.c:1605
 msgid "all addresses in all headers"
 msgstr "todos os endereços em todos os cabeçalhos"
 
-#: src/prefs_matcher.c:1602
+#: src/prefs_matcher.c:1608
 msgid "any address in any header"
 msgstr "qualquer endereço em qualquer cabeçalho"
 
-#: src/prefs_matcher.c:1604
+#: src/prefs_matcher.c:1610
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "o(s) endereço(s) no cabeçalho '%s'"
 
-#: src/prefs_matcher.c:1605
+#: src/prefs_matcher.c:1611
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
 "\n"
-"If you want to match %s against the whole address book, you have to select '%"
-"s' from the book/folder drop-down list."
+"If you want to match %s against the whole address book, you have to select "
+"'%s' from the book/folder drop-down list."
 msgstr ""
 "O caminho do livro/pasta não está definido.\n"
 "\n"
 "Se você deseja procurar a correspondência de %s por todo o livro de "
 "endereços, deve selecionar '%s' da caixa de seleção do livro/pasta."
 
-#: src/prefs_matcher.c:1824
+#: src/prefs_matcher.c:1830
 msgid "Headers part"
 msgstr "Trecho do cabeçalho"
 
-#: src/prefs_matcher.c:1828
+#: src/prefs_matcher.c:1834
 msgid "Body part"
 msgstr "Trecho do texto"
 
-#: src/prefs_matcher.c:1832
+#: src/prefs_matcher.c:1838
 msgid "Whole message"
 msgstr "Toda a mensagem"
 
-#: src/prefs_matcher.c:1951
-#: src/prefs_matcher.c:1995
+#: src/prefs_matcher.c:1957 src/prefs_matcher.c:2001
 msgid "in"
 msgstr "em"
 
-#: src/prefs_matcher.c:1953
+#: src/prefs_matcher.c:1959
 msgid "content is"
 msgstr "conteúdo é"
 
-#: src/prefs_matcher.c:1962
+#: src/prefs_matcher.c:1968
 msgid "Age is"
 msgstr "Idade é"
 
-#: src/prefs_matcher.c:1967
+#: src/prefs_matcher.c:1973
 msgid "Flag"
 msgstr "Marca"
 
-#: src/prefs_matcher.c:1968
-#: src/prefs_matcher.c:1985
+#: src/prefs_matcher.c:1974 src/prefs_matcher.c:1991
 msgid "is"
 msgstr "é"
 
-#: src/prefs_matcher.c:1973
+#: src/prefs_matcher.c:1979
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/prefs_matcher.c:1984
+#: src/prefs_matcher.c:1990
 msgid "Label"
 msgstr "Rótulo"
 
-#: src/prefs_matcher.c:1990
+#: src/prefs_matcher.c:1996
 msgid "Value:"
 msgstr "Valor:"
 
-#: src/prefs_matcher.c:2007
+#: src/prefs_matcher.c:2013
 msgid "Score is"
 msgstr "A pontuação é"
 
-#: src/prefs_matcher.c:2008
+#: src/prefs_matcher.c:2014
 msgid "points"
 msgstr "pontos"
 
-#: src/prefs_matcher.c:2018
+#: src/prefs_matcher.c:2024
 msgid "Size is"
 msgstr "O tamanho é"
 
-#: src/prefs_matcher.c:2023
+#: src/prefs_matcher.c:2029
 msgid "Scope:"
 msgstr "Alcance:"
 
-#: src/prefs_matcher.c:2025
+#: src/prefs_matcher.c:2031
 msgid "tags"
 msgstr "etiquetas"
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2036
 msgid "type is"
 msgstr "o tipo é"
 
-#: src/prefs_matcher.c:2034
+#: src/prefs_matcher.c:2040
 msgid "Program returns"
 msgstr "O programa retorna"
 
-#: src/prefs_matcher.c:2104
+#: src/prefs_matcher.c:2110
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -16136,11 +15259,11 @@ msgstr ""
 "A entrada não foi salva.\n"
 "Fechar mesmo assim?"
 
-#: src/prefs_matcher.c:2168
+#: src/prefs_matcher.c:2174
 msgid "Match Type: 'Test'"
 msgstr "Correspondência: 'Testar'"
 
-#: src/prefs_matcher.c:2169
+#: src/prefs_matcher.c:2175
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -16152,7 +15275,7 @@ msgstr ""
 "\n"
 "Os seguinte símbolos podem ser utilizados:"
 
-#: src/prefs_matcher.c:2268
+#: src/prefs_matcher.c:2274
 msgid "Current condition rules"
 msgstr "Regras de condição atuais"
 
@@ -16196,8 +15319,7 @@ msgstr "Seleciona a parte HTML das mensagens multipartes/alternativas"
 msgid "Line space"
 msgstr "Espaçamento entre linhas"
 
-#: src/prefs_message.c:189
-#: src/prefs_message.c:223
+#: src/prefs_message.c:189 src/prefs_message.c:223
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
@@ -16261,8 +15383,7 @@ msgstr "Se existirem mais de 3 níveis de citações, as cores serão reutilizad
 msgid "1st Level"
 msgstr "1º nível"
 
-#: src/prefs_msg_colors.c:190
-#: src/prefs_msg_colors.c:216
+#: src/prefs_msg_colors.c:190 src/prefs_msg_colors.c:216
 #: src/prefs_msg_colors.c:242
 msgid "Text"
 msgstr "Texto"
@@ -16323,12 +15444,7 @@ msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Selecione a cor para as assinaturas"
 
-#: src/prefs_msg_colors.c:362
-msgid "Signatures"
-msgstr "Assinaturas"
-
-#: src/prefs_msg_colors.c:367
-#: src/prefs_summaries.c:354
+#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:354
 msgid "Folder list"
 msgstr "Lista de pastas"
 
@@ -16355,8 +15471,7 @@ msgstr "Pasta contendo novas mensagens"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:428
-#: src/prefs_msg_colors.c:459
+#: src/prefs_msg_colors.c:428 src/prefs_msg_colors.c:459
 #, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
@@ -16364,8 +15479,7 @@ msgstr "Selecione a cor para a 'cor %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:432
-#: src/prefs_msg_colors.c:463
+#: src/prefs_msg_colors.c:432 src/prefs_msg_colors.c:463
 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "Defina o rótulo para a 'cor %d'"
@@ -16555,82 +15669,74 @@ msgid "Miscellaneous"
 msgstr "Miscelânea"
 
 #: src/prefs_quote.c:77
-msgid ""
-"On %d\\n"
-"%f wrote:\\n"
-"\\n"
-"%q"
-msgstr ""
-"Em %d\\n"
-"%f escreveu:\\n"
-"\\n"
-"%q"
+msgid "On %d\\n%f wrote:\\n\\n%q"
+msgstr "Em %d\\n%f escreveu:\\n\\n%q"
 
-#: src/prefs_receive.c:137
+#: src/prefs_receive.c:123
 msgid "External incorporation program"
 msgstr "Programa de incorporação externo"
 
-#: src/prefs_receive.c:140
+#: src/prefs_receive.c:126
 msgid "Use external program for receiving mail"
 msgstr "Usar um programa externo para receber as mensagens"
 
-#: src/prefs_receive.c:156
+#: src/prefs_receive.c:142
 msgid "Automatic checking"
 msgstr "Verificação automática"
 
-#: src/prefs_receive.c:163
+#: src/prefs_receive.c:149
 msgid "Check for new mail every"
 msgstr "Verificar por novas mensagens a cada"
 
-#: src/prefs_receive.c:181
+#: src/prefs_receive.c:167
 msgid "Check for new mail on start-up"
 msgstr "Verificar a existência de novas mensagens ao iniciar"
 
-#: src/prefs_receive.c:184
+#: src/prefs_receive.c:170
 msgid "Dialogs"
 msgstr "Janela de mensagens"
 
-#: src/prefs_receive.c:186
+#: src/prefs_receive.c:172
 msgid "Show receive dialog"
 msgstr "Exibir janela de mensagens do recebimento"
 
-#: src/prefs_receive.c:196
+#: src/prefs_receive.c:182
 msgid "Only on manual receiving"
 msgstr "Somente na recepção manual"
 
-#: src/prefs_receive.c:207
+#: src/prefs_receive.c:193
 msgid "Close receive dialog when finished"
 msgstr "Fechar janela de diálogo de recebimento ao finalizar"
 
-#: src/prefs_receive.c:210
+#: src/prefs_receive.c:196
 msgid "Don't popup error dialog on receive error"
 msgstr "Não exibir a janela aviso de erros ao recebê-los"
 
-#: src/prefs_receive.c:213
-msgid "After checking for new mail"
-msgstr "Após verificação por novas mensagens"
+#: src/prefs_receive.c:199
+msgid "After receiving new mail"
+msgstr "Após o recebimento de novas mensagens"
 
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:201
 msgid "Go to Inbox"
 msgstr "Ir para a Caixa de Entrada"
 
-#: src/prefs_receive.c:217
+#: src/prefs_receive.c:203
 msgid "Update all local folders"
 msgstr "Atualizar todas as pastas locais"
 
-#: src/prefs_receive.c:220
+#: src/prefs_receive.c:205
 msgid "Run command"
 msgstr "Executar comando"
 
-#: src/prefs_receive.c:225
+#: src/prefs_receive.c:210
 msgid "after automatic check"
 msgstr "após verificação automática"
 
-#: src/prefs_receive.c:227
+#: src/prefs_receive.c:212
 msgid "after manual check"
 msgstr "após verificação manual"
 
-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:220
 #, c-format
 msgid ""
 "Command to execute:\n"
@@ -16639,48 +15745,39 @@ msgstr ""
 "Comando a ser executado:\n"
 "(utilize %d para o número de novas mensagens)"
 
-#: src/prefs_receive.c:260
-msgid "Blink LED"
-msgstr "Piscar o LED"
-
-#: src/prefs_receive.c:261
-msgid "Play sound"
-msgstr "Reproduzir som"
-
-#: src/prefs_receive.c:263
-msgid "Show info banner"
-msgstr "Mostrar faixa de informações"
-
-#: src/prefs_receive.c:397
-#: src/prefs_send.c:348
+#: src/prefs_receive.c:343 src/prefs_send.c:357
 msgid "Mail Handling"
 msgstr "Manipulação das mensagens"
 
-#: src/prefs_receive.c:398
+#: src/prefs_receive.c:344
 msgid "Receiving"
 msgstr "Recebimento"
 
-#: src/prefs_send.c:159
+#: src/prefs_send.c:161
 msgid "Save sent messages to Sent folder"
 msgstr "Salvar mensagens enviadas na pasta Enviadas"
 
-#: src/prefs_send.c:162
+#: src/prefs_send.c:164
 msgid "Confirm before sending queued messages"
 msgstr "Confirmar antes de enviar mensagens da Fila de Saída"
 
-#: src/prefs_send.c:165
+#: src/prefs_send.c:167
 msgid "Never send Return Receipts"
 msgstr "Nunca enviar confirmação de recebimento"
 
-#: src/prefs_send.c:168
+#: src/prefs_send.c:170
 msgid "Show send dialog"
 msgstr "Exibir janela de diálogo de envio"
 
-#: src/prefs_send.c:176
+#: src/prefs_send.c:172
+msgid "Warn when Subject is empty"
+msgstr "Alertar quando a mensagem estiver sem assunto"
+
+#: src/prefs_send.c:180
 msgid "Outgoing encoding"
 msgstr "Codificação de saída"
 
-#: src/prefs_send.c:201
+#: src/prefs_send.c:205
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
@@ -16688,143 +15785,141 @@ msgstr ""
 "Se for selecionado 'Automático', será utilizada a melhor codificação para o "
 "locale atual"
 
-#: src/prefs_send.c:216
+#: src/prefs_send.c:220
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
-#: src/prefs_send.c:218
+#: src/prefs_send.c:222
 msgid "7bit ASCII (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASCII)"
 
-#: src/prefs_send.c:219
+#: src/prefs_send.c:223
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_send.c:221
+#: src/prefs_send.c:225
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeu Ocidental (ISO-8859-1)"
 
-#: src/prefs_send.c:222
+#: src/prefs_send.c:226
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeu Ocidental (ISO-8859-15)"
 
-#: src/prefs_send.c:224
+#: src/prefs_send.c:228
 msgid "Central European (ISO-8859-2)"
 msgstr "Europeu Central (ISO-8859-2)"
 
-#: src/prefs_send.c:226
+#: src/prefs_send.c:230
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: src/prefs_send.c:227
+#: src/prefs_send.c:231
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_send.c:229
+#: src/prefs_send.c:233
 msgid "Greek (ISO-8859-7)"
 msgstr "Grego (ISO-8859-7)"
 
-#: src/prefs_send.c:231
+#: src/prefs_send.c:235
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebráico (ISO-8859-8)"
 
-#: src/prefs_send.c:232
+#: src/prefs_send.c:236
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebráico (Windows-1255)"
 
-#: src/prefs_send.c:234
+#: src/prefs_send.c:238
 msgid "Arabic (ISO-8859-6)"
 msgstr "Árabe (ISO-8859-6)"
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:239
 msgid "Arabic (Windows-1256)"
 msgstr "Árabe (Windows-1256)"
 
-#: src/prefs_send.c:237
+#: src/prefs_send.c:241
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:243
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_send.c:240
+#: src/prefs_send.c:244
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:245
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_send.c:242
+#: src/prefs_send.c:246
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:248
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonês (ISO-2022-JP)"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:250
 msgid "Japanese (EUC-JP)"
 msgstr "Japonês (EUC-JP)"
 
-#: src/prefs_send.c:247
+#: src/prefs_send.c:251
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonês (Shift_JIS)"
 
-#: src/prefs_send.c:250
+#: src/prefs_send.c:254
 msgid "Simplified Chinese (GB18030)"
 msgstr "Chinês simplificado (GB18030)"
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:255
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinês simplificado (GB2312)"
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:256
 msgid "Simplified Chinese (GBK)"
 msgstr "Chinês simplificado (GBK)"
 
-#: src/prefs_send.c:253
+#: src/prefs_send.c:257
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinês tradicional (Big5)"
 
-#: src/prefs_send.c:255
+#: src/prefs_send.c:259
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinês tradicional (EUC-TW)"
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:260
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinês (ISO-2022-CN)"
 
-#: src/prefs_send.c:259
+#: src/prefs_send.c:263
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_send.c:261
+#: src/prefs_send.c:265
 msgid "Thai (TIS-620)"
 msgstr "Tailandês (TIS-620)"
 
-#: src/prefs_send.c:262
+#: src/prefs_send.c:266
 msgid "Thai (Windows-874)"
 msgstr "Tailandês (Windows-874)"
 
-#: src/prefs_send.c:266
+#: src/prefs_send.c:270
 msgid "Transfer encoding"
 msgstr "Codificação da transferência"
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:281
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgstr ""
-"Especifique a codificação de transferência de conteúdo "
-"(Content-Transfer-Encoding) a ser utilizada quando o corpo da mensagem "
-"possuir caracteres não-ASCII"
+"Especifique a codificação de transferência de conteúdo (Content-Transfer-"
+"Encoding) a ser utilizada quando o corpo da mensagem possuir caracteres não-"
+"ASCII"
 
-#: src/prefs_send.c:349
-#: src/send_message.c:483
-#: src/send_message.c:487
-#: src/send_message.c:492
+#: src/prefs_send.c:358 src/send_message.c:491 src/send_message.c:495
+#: src/send_message.c:500
 msgid "Sending"
 msgstr "Envio"
 
@@ -16953,8 +16048,7 @@ msgstr "o ano"
 msgid "the time zone or name or abbreviation"
 msgstr "o fuso horário, o nome ou a abreviação"
 
-#: src/prefs_summaries.c:191
-#: src/prefs_summaries.c:239
+#: src/prefs_summaries.c:191 src/prefs_summaries.c:239
 #: src/prefs_summaries.c:522
 msgid "Date format"
 msgstr "Formato da data"
@@ -17029,8 +16123,8 @@ msgstr "Executar imediatamente ao mover ou excluir mensagens"
 
 #: src/prefs_summaries.c:476
 msgid ""
-"Defers moving, copying and deleting of messages until you choose "
-"'Tools/Execute'"
+"Defers moving, copying and deleting of messages until you choose 'Tools/"
+"Execute'"
 msgstr ""
 "Adiar a movimentação, cópia ou exclusão as mensagens até que se selecione "
 "'Ferramentas/Executar'"
@@ -17151,92 +16245,91 @@ msgstr "Adiciona o novo modelo definido acima à lista"
 msgid "Replace the selected template in list with the template above"
 msgstr "Substitui o modelo selecionado na lista pelo definido acima"
 
-#: src/prefs_template.c:324
+#: src/prefs_template.c:326
 msgid "Delete the selected template from the list"
 msgstr "Exclui o modelo selecionado da lista"
 
-#: src/prefs_template.c:340
+#: src/prefs_template.c:344
 msgid "Show information on configuring templates"
 msgstr "Mostra informações sobre a configuração de modelos"
 
-#: src/prefs_template.c:364
+#: src/prefs_template.c:368
 msgid "Move the selected template to the top"
 msgstr "Move o modelo selecionado para o início"
 
-#: src/prefs_template.c:374
+#: src/prefs_template.c:378
 msgid "Move the selected template up"
 msgstr "Move o modelo selecionado para cima"
 
-#: src/prefs_template.c:382
+#: src/prefs_template.c:386
 msgid "Move the selected template down"
 msgstr "Move o modelo selecionado para baixo"
 
-#: src/prefs_template.c:392
+#: src/prefs_template.c:396
 msgid "Move the selected template to the bottom"
 msgstr "Move o modelo selecionado para o fim"
 
-#: src/prefs_template.c:408
+#: src/prefs_template.c:412
 msgid "Template configuration"
 msgstr "Configuração dos modelos"
 
-#: src/prefs_template.c:595
+#: src/prefs_template.c:599
 msgid "Templates list not saved"
 msgstr "A lista de modelos não foi salva"
 
-#: src/prefs_template.c:596
+#: src/prefs_template.c:600
 msgid "The templates list has been modified. Close anyway?"
 msgstr "A lista de modelos foi modificada. Fechar mesmo assim?"
 
-#: src/prefs_template.c:757
+#: src/prefs_template.c:761
 msgid "The template's name is not set."
 msgstr "O nome do modelo não foi definido."
 
-#: src/prefs_template.c:794
+#: src/prefs_template.c:798
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "O campo \"De\" do modelo possui um endereço de e-mail inválido."
 
-#: src/prefs_template.c:800
+#: src/prefs_template.c:804
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "O campo \"Para\" do modelo possui um endereço de e-mail inválido."
 
-#: src/prefs_template.c:806
+#: src/prefs_template.c:810
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "O campo \"Cc\" do modelo possui um endereço de e-mail inválido."
 
-#: src/prefs_template.c:812
+#: src/prefs_template.c:816
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "O campo \"Cco\" do modelo possui um endereço de e-mail inválido."
 
-#: src/prefs_template.c:818
+#: src/prefs_template.c:822
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "O campo \"Assunto\" do modelo é inválido."
 
-#: src/prefs_template.c:888
+#: src/prefs_template.c:892
 msgid "Delete template"
 msgstr "Excluir modelo"
 
-#: src/prefs_template.c:889
+#: src/prefs_template.c:893
 msgid "Do you really want to delete this template?"
 msgstr "Deseja realmente excluir esse modelo?"
 
-#: src/prefs_template.c:901
+#: src/prefs_template.c:905
 msgid "Delete all templates"
 msgstr "Excluir todos os modelos"
 
-#: src/prefs_template.c:902
+#: src/prefs_template.c:906
 msgid "Do you really want to delete all the templates?"
 msgstr "Deseja realmente excluir todos os modelos?"
 
-#: src/prefs_template.c:1224
+#: src/prefs_template.c:1221
 msgid "Current templates"
 msgstr "Modelos atuais"
 
-#: src/prefs_template.c:1252
+#: src/prefs_template.c:1249
 msgid "Template"
 msgstr "Modelo"
 
-#: src/prefs_themes.c:347
-#: src/prefs_themes.c:727
+#: src/prefs_themes.c:347 src/prefs_themes.c:727
 msgid "Default internal theme"
 msgstr "Tema interno padrão"
 
@@ -17374,6 +16467,10 @@ msgstr "Seletor"
 msgid "Install new..."
 msgstr "Instalar novo..."
 
+#: src/prefs_themes.c:843
+msgid "Get more..."
+msgstr "Obter mais..."
+
 #: src/prefs_themes.c:854
 msgid "Information"
 msgstr "Informação"
@@ -17410,67 +16507,67 @@ msgstr "O item não tem ícone definido."
 msgid "Item has no text defined."
 msgstr "O item não tem texto definido."
 
-#: src/prefs_toolbar.c:911
+#: src/prefs_toolbar.c:916
 msgid "Toolbar item"
 msgstr "Item da barra de ferramentas"
 
-#: src/prefs_toolbar.c:927
+#: src/prefs_toolbar.c:932
 msgid "Item type"
 msgstr "Tipo do item"
 
-#: src/prefs_toolbar.c:937
+#: src/prefs_toolbar.c:942
 msgid "Internal Function"
 msgstr "Função interna"
 
-#: src/prefs_toolbar.c:938
+#: src/prefs_toolbar.c:943
 msgid "User Action"
 msgstr "Ação do usuário"
 
-#: src/prefs_toolbar.c:940
-#: src/toolbar.c:232
+#: src/prefs_toolbar.c:945 src/toolbar.c:233
 msgid "Separator"
 msgstr "Separador"
 
-#: src/prefs_toolbar.c:947
+#: src/prefs_toolbar.c:952
 msgid "Event executed on click"
 msgstr "Evento executado ao clicar"
 
-#: src/prefs_toolbar.c:986
+#: src/prefs_toolbar.c:991
 msgid "Toolbar text"
 msgstr "Texto da barra de ferramentas"
 
-#: src/prefs_toolbar.c:1001
-#: src/prefs_toolbar.c:1372
+#: src/prefs_toolbar.c:1006 src/prefs_toolbar.c:1381
 msgid "Icon"
 msgstr "Ícone"
 
-#: src/prefs_toolbar.c:1252
-#: src/prefs_toolbar.c:1266
-#: src/prefs_toolbar.c:1280
+#: src/prefs_toolbar.c:1042
+msgid "A_dd"
+msgstr "_Adicionar"
+
+#: src/prefs_toolbar.c:1261 src/prefs_toolbar.c:1275 src/prefs_toolbar.c:1289
 msgid "Toolbars"
 msgstr "Barra de ferramentas"
 
-#: src/prefs_toolbar.c:1253
+#: src/prefs_toolbar.c:1262
 msgid "Main Window"
 msgstr "Janela principal"
 
-#: src/prefs_toolbar.c:1267
+#: src/prefs_toolbar.c:1276
 msgid "Message Window"
 msgstr "Janela da mensagem"
 
-#: src/prefs_toolbar.c:1281
+#: src/prefs_toolbar.c:1290
 msgid "Compose Window"
 msgstr "Janela de composição"
 
-#: src/prefs_toolbar.c:1395
+#: src/prefs_toolbar.c:1404
 msgid "Icon text"
 msgstr "Texto do ícone"
 
-#: src/prefs_toolbar.c:1404
+#: src/prefs_toolbar.c:1413
 msgid "Mapped event"
 msgstr "Evento mapeado"
 
-#: src/prefs_toolbar.c:1701
+#: src/prefs_toolbar.c:1710
 msgid "Toolbar item icon"
 msgstr "Ícone do item da barra de ferramentas"
 
@@ -17531,8 +16628,7 @@ msgstr "Reduzir o zoom"
 msgid "Page %d"
 msgstr "Página %d"
 
-#: src/privacy.c:255
-#: src/privacy.c:276
+#: src/privacy.c:255 src/privacy.c:276
 msgid "No information available"
 msgstr "Não existe informação disponível"
 
@@ -17540,14 +16636,11 @@ msgstr "Não existe informação disponível"
 msgid "No recipient keys defined."
 msgstr "Não foi definida nenhuma chave de destinatário."
 
-#: src/procmime.c:419
-#: src/procmime.c:421
-#: src/procmime.c:422
+#: src/procmime.c:422 src/procmime.c:424 src/procmime.c:425
 msgid "[Error decoding BASE64]\n"
 msgstr "[Erro ao decodificar BASE64]\n"
 
-#: src/procmsg.c:915
-#: src/procmsg.c:918
+#: src/procmsg.c:915 src/procmsg.c:918
 msgid "Already trying to send."
 msgstr "Ainda tentando envia."
 
@@ -17571,19 +16664,19 @@ msgstr "Ocorreu um erro durante a seção SMTP."
 
 #: src/procmsg.c:1724
 msgid ""
-"No specific account has been found to send, and an error happened during SMTP "
-"session."
+"No specific account has been found to send, and an error happened during "
+"SMTP session."
 msgstr ""
 "Não foi encontrada nenhuma conta específica para o envio e ocorreu um erro "
 "durante a seção SMTP."
 
 #: src/procmsg.c:1732
 msgid ""
-"Couldn't determine sending informations. Maybe the email hasn't been "
+"Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
-"Não foi possível determinar as informações de envio. Talvez essa mensagem não "
-"tenha sido gerada pelo Claws Mail."
+"Não foi possível determinar as informações de envio. Talvez essa mensagem "
+"não tenha sido gerada pelo Claws Mail."
 
 #: src/procmsg.c:1750
 msgid "Couldn't create temporary file for news sending."
@@ -17759,8 +16852,8 @@ msgid ""
 "to insert"
 msgstr ""
 "inserir o arquivo:\n"
-"<span style=\"oblique\">sub_expr</span> é entendido como o caminho do arquivo "
-"a ser inserido"
+"<span style=\"oblique\">sub_expr</span> é entendido como o caminho do "
+"arquivo a ser inserido"
 
 #: src/quote_fmt.c:93
 msgid ""
@@ -17781,8 +16874,8 @@ msgid ""
 "user-entered text"
 msgstr ""
 "inserir a entrada do usuário:\n"
-"<span style=\"oblique\">sub_expr</span> é uma variável a ser substituída pelo "
-"texto digitado\n"
+"<span style=\"oblique\">sub_expr</span> é uma variável a ser substituída "
+"pelo texto digitado\n"
 "pelo usuário"
 
 #: src/quote_fmt.c:95
@@ -17792,8 +16885,8 @@ msgid ""
 "to attach"
 msgstr ""
 "anexar arquivo:\n"
-"<span style=\"oblique\">sub_expr</span> é entendido como o caminho do arquivo "
-"a ser anexado"
+"<span style=\"oblique\">sub_expr</span> é entendido como o caminho do "
+"arquivo a ser anexado"
 
 #: src/quote_fmt.c:97
 msgid "<span weight=\"bold\">definition of terms:</span>"
@@ -17841,11 +16934,11 @@ msgstr "Usar modelo ao escrever novas mensagens"
 
 #: src/quote_fmt.c:197
 msgid ""
-"Override From header. This doesn't change the account used to compose the new "
-"message."
+"Override From header. This doesn't change the account used to compose the "
+"new message."
 msgstr ""
-"Sobrepor o cabeçalho De. Isso não muda a conta utilizada para escrever a nova "
-"mensagem."
+"Sobrepor o cabeçalho De. Isso não muda a conta utilizada para escrever a "
+"nova mensagem."
 
 #: src/quote_fmt.c:297
 msgid "Use template when replying to messages"
@@ -17856,8 +16949,7 @@ msgid "Override From header. This doesn't change the account used to reply."
 msgstr ""
 "Sobrepor o cabeçalho De. Isso não muda a conta utilizada para responder."
 
-#: src/quote_fmt.c:332
-#: src/quote_fmt.c:460
+#: src/quote_fmt.c:332 src/quote_fmt.c:460
 msgid "Quotation mark"
 msgstr "Marca de citação"
 
@@ -17918,77 +17010,73 @@ msgstr "Não foi possível executar o comando: %s"
 msgid "Error occurred while executing command: %s"
 msgstr "Ocorreu um erro na execução do comando: %s"
 
-#: src/send_message.c:331
+#: src/send_message.c:339
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/send_message.c:336
+#: src/send_message.c:344
 msgid "Doing POP before SMTP..."
 msgstr "Executando verificação POP antes do SMTP..."
 
-#: src/send_message.c:339
+#: src/send_message.c:347
 msgid "POP before SMTP"
 msgstr "POP antes do SMTP"
 
-#: src/send_message.c:344
+#: src/send_message.c:352
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Conta '%s': Conectando ao servidor SMTP: %s:%d..."
 
-#: src/send_message.c:401
+#: src/send_message.c:409
 msgid "Mail sent successfully."
 msgstr "A mensagem foi enviada com sucesso."
 
-#: src/send_message.c:468
+#: src/send_message.c:476
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:469
-#: src/send_message.c:474
-#: src/send_message.c:479
+#: src/send_message.c:477 src/send_message.c:482 src/send_message.c:487
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/send_message.c:470
-#: src/send_message.c:475
+#: src/send_message.c:478 src/send_message.c:483
 msgid "Sending message..."
 msgstr "Enviando a mensagem..."
 
-#: src/send_message.c:473
+#: src/send_message.c:481
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:482
+#: src/send_message.c:490
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:486
+#: src/send_message.c:494
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:491
+#: src/send_message.c:499
 msgid "Sending DATA..."
 msgstr "Enviando MENSAGEM..."
 
-#: src/send_message.c:495
+#: src/send_message.c:503
 msgid "Quitting..."
 msgstr "Saindo..."
 
-#: src/send_message.c:524
+#: src/send_message.c:532
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando a mensagem (%d / %d bytes)"
 
-#: src/send_message.c:577
+#: src/send_message.c:585
 msgid "Sending message"
 msgstr "Enviando a mensagem"
 
-#: src/send_message.c:646
-#: src/send_message.c:666
+#: src/send_message.c:654 src/send_message.c:674
 msgid "Error occurred while sending the message."
 msgstr "Ocorreu um erro durante o envio da mensagem."
 
-#: src/send_message.c:649
+#: src/send_message.c:657
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18034,42 +17122,40 @@ msgstr "Excluir certificado"
 msgid "Do you really want to delete this certificate?"
 msgstr "Deseja realmente excluir esse certificado?"
 
-#: src/summary_search.c:266
+#: src/summary_search.c:271
 msgid "Search messages"
 msgstr "Pesquisar mensagens"
 
-#: src/summary_search.c:292
+#: src/summary_search.c:293
 msgid "Match any of the following"
 msgstr "Correspondente a qualquer um dos seguintes"
 
-#: src/summary_search.c:294
+#: src/summary_search.c:295
 msgid "Match all of the following"
 msgstr "Corresponder a todos os seguintes"
 
-#: src/summary_search.c:433
+#: src/summary_search.c:459
 msgid "Body:"
 msgstr "Corpo:"
 
-#: src/summary_search.c:440
+#: src/summary_search.c:466
 msgid "Condition:"
 msgstr "Condição:"
 
-#: src/summary_search.c:470
+#: src/summary_search.c:496
 msgid "Find _all"
 msgstr "Localizar _todas"
 
-#: src/summary_search.c:679
-#: src/summaryview.c:1105
-#: src/summaryview.c:1366
+#: src/summary_search.c:702 src/summaryview.c:1105 src/summaryview.c:1366
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Pesquisando em %s... \n"
 
-#: src/summary_search.c:776
+#: src/summary_search.c:799
 msgid "Beginning of list reached; continue from end?"
 msgstr "O início da lista foi atingido; continuar a partir do final?"
 
-#: src/summary_search.c:778
+#: src/summary_search.c:801
 msgid "End of list reached; continue from beginning?"
 msgstr "O final da lista foi atingido; continuar a partir do início?"
 
@@ -18098,8 +17184,7 @@ msgstr "Foram deixadas algumas marcas. Processá-las?"
 msgid "Scanning folder (%s)..."
 msgstr "Revisando pasta (%s)..."
 
-#: src/summaryview.c:1829
-#: src/summaryview.c:1881
+#: src/summaryview.c:1829 src/summaryview.c:1881
 msgid "No more unread messages"
 msgstr "Não há mais mensagens não-lidas"
 
@@ -18107,11 +17192,8 @@ msgstr "Não há mais mensagens não-lidas"
 msgid "No unread message found. Search from the end?"
 msgstr "Não foram encontradas mensagens não lidas. Pesquisar a partir do fim?"
 
-#: src/summaryview.c:1842
-#: src/summaryview.c:1894
-#: src/summaryview.c:1941
-#: src/summaryview.c:1993
-#: src/summaryview.c:2072
+#: src/summaryview.c:1842 src/summaryview.c:1894 src/summaryview.c:1941
+#: src/summaryview.c:1993 src/summaryview.c:2072
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
@@ -18125,8 +17207,7 @@ msgstr "Não há mensagens não lidas."
 msgid "No unread message found. Go to next folder?"
 msgstr "Não há mensagens não lidas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1928
-#: src/summaryview.c:1980
+#: src/summaryview.c:1928 src/summaryview.c:1980
 msgid "No more new messages"
 msgstr "Não há mais mensagens novas"
 
@@ -18142,8 +17223,7 @@ msgstr "Não há mensagens novas."
 msgid "No new message found. Go to next folder?"
 msgstr "Não foram encontradas mensagens novas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:2018
-#: src/summaryview.c:2059
+#: src/summaryview.c:2018 src/summaryview.c:2059
 msgid "No more marked messages"
 msgstr "Não há mais mensagens marcadas"
 
@@ -18159,8 +17239,7 @@ msgstr "Não há mensagens marcadas."
 msgid "No marked message found. Go to next folder?"
 msgstr "Não foram encontradas mensagens marcadas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:2097
-#: src/summaryview.c:2122
+#: src/summaryview.c:2097 src/summaryview.c:2122
 msgid "No more labeled messages"
 msgstr "Não há mais mensagens rotuladas"
 
@@ -18168,8 +17247,7 @@ msgstr "Não há mais mensagens rotuladas"
 msgid "No labeled message found. Search from the end?"
 msgstr "Não foram encontradas mensagens rotuladas. Pesquisar desde o fim?"
 
-#: src/summaryview.c:2107
-#: src/summaryview.c:2132
+#: src/summaryview.c:2107 src/summaryview.c:2132
 msgid "No labeled messages."
 msgstr "Não há mensagens rotuladas."
 
@@ -18191,8 +17269,7 @@ msgstr "%d excluída"
 msgid "%s%d moved"
 msgstr "%s%d movida"
 
-#: src/summaryview.c:2624
-#: src/summaryview.c:2631
+#: src/summaryview.c:2624 src/summaryview.c:2631
 msgid ", "
 msgstr ", "
 
@@ -18207,8 +17284,7 @@ msgid_plural " items selected"
 msgstr[0] " item selecionado"
 msgstr[1] " itens selecionados"
 
-#: src/summaryview.c:2661
-#: src/summaryview.c:2697
+#: src/summaryview.c:2661 src/summaryview.c:2697
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nova(s), %d não lida(s), %d no total (%s)"
@@ -18281,46 +17357,46 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Para: %s, em %s</span>"
 
-#: src/summaryview.c:4290
+#: src/summaryview.c:4286
 msgid "You're not the author of the article.\n"
 msgstr "Você não é o autor do artigo.\n"
 
-#: src/summaryview.c:4383
+#: src/summaryview.c:4379
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "Deseja realmente excluir a mensagem selecionada?"
 msgstr[1] "Deseja realmente excluir as %d mensagens selecionadas?"
 
-#: src/summaryview.c:4386
+#: src/summaryview.c:4382
 msgid "Delete message(s)"
 msgstr "Excluir a(s) mensagem(ns)"
 
-#: src/summaryview.c:4549
+#: src/summaryview.c:4545
 msgid "Destination is same as current folder."
 msgstr "As pastas de destino e a atual são a mesma."
 
-#: src/summaryview.c:4648
+#: src/summaryview.c:4644
 msgid "Destination to copy is same as current folder."
 msgstr "Você está tentando copiar para a mesma pasta."
 
-#: src/summaryview.c:4821
+#: src/summaryview.c:4817
 msgid "Append or Overwrite"
 msgstr "Acrescentar ou sobrescrever"
 
-#: src/summaryview.c:4822
+#: src/summaryview.c:4818
 msgid "Append or overwrite existing file?"
 msgstr "Acrescentar ao arquivo ou sobrescrevê-lo?"
 
-#: src/summaryview.c:4823
+#: src/summaryview.c:4819
 msgid "_Append"
 msgstr "_Acrescentar"
 
-#: src/summaryview.c:4823
+#: src/summaryview.c:4819
 msgid "_Overwrite"
 msgstr "_Sobrescrever"
 
-#: src/summaryview.c:4864
+#: src/summaryview.c:4860
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
@@ -18328,27 +17404,27 @@ msgstr ""
 "Você esta prestes a imprimir %d mensagens, uma a uma. Deseja realmente "
 "continuar?"
 
-#: src/summaryview.c:5341
+#: src/summaryview.c:5337
 msgid "Building threads..."
 msgstr "Agrupando discussões..."
 
-#: src/summaryview.c:5587
+#: src/summaryview.c:5583
 msgid "Skip these rules"
 msgstr "Ignorar estas regras"
 
-#: src/summaryview.c:5590
+#: src/summaryview.c:5586
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Aplicar estas regras independente da conta à qual elas pertençam"
 
-#: src/summaryview.c:5593
+#: src/summaryview.c:5589
 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplicar estas regras caso elas refiram-se à conta atual"
 
-#: src/summaryview.c:5622
+#: src/summaryview.c:5618
 msgid "Filtering"
 msgstr "Filtragem"
 
-#: src/summaryview.c:5623
+#: src/summaryview.c:5619
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18356,59 +17432,59 @@ msgstr ""
 "Existem algumas regras de filtragem que pertencem a uma conta.\n"
 "Por favor, escolha o que fazer com estas regras:"
 
-#: src/summaryview.c:5625
+#: src/summaryview.c:5621
 msgid "_Filter"
 msgstr "_Filtrar"
 
-#: src/summaryview.c:5653
+#: src/summaryview.c:5649
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:5732
+#: src/summaryview.c:5728
 msgid "Processing configuration"
 msgstr "Configuração do processamento"
 
-#: src/summaryview.c:6280
+#: src/summaryview.c:6276
 msgid "Ignored thread"
 msgstr "Discussão ignorada"
 
-#: src/summaryview.c:6282
+#: src/summaryview.c:6278
 msgid "Watched thread"
 msgstr "Discussão observada"
 
-#: src/summaryview.c:6290
+#: src/summaryview.c:6286
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Respondida, mas também encaminhada - clique para ver a resposta"
 
-#: src/summaryview.c:6292
+#: src/summaryview.c:6288
 msgid "Replied - click to see reply"
 msgstr "Respondida - clique para ver a resposta"
 
-#: src/summaryview.c:6304
+#: src/summaryview.c:6300
 msgid "To be moved"
 msgstr "A ser movida"
 
-#: src/summaryview.c:6306
+#: src/summaryview.c:6302
 msgid "To be copied"
 msgstr "A ser copiada"
 
-#: src/summaryview.c:6318
+#: src/summaryview.c:6314
 msgid "Signed, has attachment(s)"
 msgstr "Assinada, possui anexo(s)"
 
-#: src/summaryview.c:6322
+#: src/summaryview.c:6318
 msgid "Encrypted, has attachment(s)"
 msgstr "Criptografada, possui anexo(s)"
 
-#: src/summaryview.c:6324
+#: src/summaryview.c:6320
 msgid "Encrypted"
 msgstr "Criptografada"
 
-#: src/summaryview.c:6326
+#: src/summaryview.c:6322
 msgid "Has attachment(s)"
 msgstr "Possui anexo(s)"
 
-#: src/summaryview.c:7963
+#: src/summaryview.c:7952
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18417,11 +17493,11 @@ msgstr ""
 "Erro na expressão regular (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8071
+#: src/summaryview.c:8060
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Voltar à lista de pastas (se você tiver mensagens não lidas)"
 
-#: src/summaryview.c:8076
+#: src/summaryview.c:8065
 msgid "Go back to the folder list"
 msgstr "Voltar à lista de pastas"
 
@@ -18501,9 +17577,7 @@ msgstr "     - Para salvar, selecione  "
 msgid "'Save as...'"
 msgstr "'Salvar como...'"
 
-#: src/textview.c:992
-#: src/textview.c:1004
-#: src/textview.c:1016
+#: src/textview.c:992 src/textview.c:1004 src/textview.c:1016
 #: src/textview.c:1026
 msgid " (Shortcut key: '"
 msgstr " (Tecla de atalho: '"
@@ -18582,323 +17656,278 @@ msgstr "Aviso de tentativa de fraude por phishing"
 msgid "_Open URL"
 msgstr "_Abrir URL"
 
-#: src/toolbar.c:191
-#: src/toolbar.c:1948
+#: src/toolbar.c:192 src/toolbar.c:1949
 msgid "Receive Mail from all Accounts"
 msgstr "Receber mensagens de todas as contas"
 
-#: src/toolbar.c:192
-#: src/toolbar.c:1953
+#: src/toolbar.c:193 src/toolbar.c:1954
 msgid "Receive Mail from current Account"
 msgstr "Receber mensagens da conta atual"
 
-#: src/toolbar.c:193
-#: src/toolbar.c:1957
+#: src/toolbar.c:194 src/toolbar.c:1958
 msgid "Send Queued Messages"
 msgstr "Enviar mensagens da Fila de Saída"
 
-#: src/toolbar.c:194
-#: src/toolbar.c:918
-#: src/toolbar.c:1975
-#: src/toolbar.c:1986
+#: src/toolbar.c:195 src/toolbar.c:919 src/toolbar.c:1976 src/toolbar.c:1987
 msgid "Compose Email"
 msgstr "Escrever e-mail"
 
-#: src/toolbar.c:195
+#: src/toolbar.c:196
 msgid "Compose News"
 msgstr "Escrever artigo"
 
-#: src/toolbar.c:196
-#: src/toolbar.c:2014
-#: src/toolbar.c:2024
+#: src/toolbar.c:197 src/toolbar.c:2015 src/toolbar.c:2025
 msgid "Reply to Message"
 msgstr "Responder à mensagem"
 
-#: src/toolbar.c:197
-#: src/toolbar.c:2031
-#: src/toolbar.c:2041
+#: src/toolbar.c:198 src/toolbar.c:2032 src/toolbar.c:2042
 msgid "Reply to Sender"
 msgstr "Responder ao remetente"
 
-#: src/toolbar.c:198
-#: src/toolbar.c:2048
-#: src/toolbar.c:2058
+#: src/toolbar.c:199 src/toolbar.c:2049 src/toolbar.c:2059
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: src/toolbar.c:199
-#: src/toolbar.c:2065
-#: src/toolbar.c:2075
+#: src/toolbar.c:200 src/toolbar.c:2066 src/toolbar.c:2076
 msgid "Reply to Mailing-list"
 msgstr "Responder à lista de discussão"
 
-#: src/toolbar.c:200
-#: src/toolbar.c:1969
+#: src/toolbar.c:201 src/toolbar.c:1970
 msgid "Open email"
 msgstr "Abrir e-mail"
 
-#: src/toolbar.c:201
-#: src/toolbar.c:2082
-#: src/toolbar.c:2093
+#: src/toolbar.c:202 src/toolbar.c:2083 src/toolbar.c:2094
 msgid "Forward Message"
 msgstr "Encaminhar a mensagem"
 
-#: src/toolbar.c:202
-#: src/toolbar.c:2098
+#: src/toolbar.c:203 src/toolbar.c:2099
 msgid "Trash Message"
 msgstr "Enviar a mensagem para a Lixeira"
 
-#: src/toolbar.c:203
-#: src/toolbar.c:2102
+#: src/toolbar.c:204 src/toolbar.c:2103
 msgid "Delete Message"
 msgstr "Excluir a mensagem"
 
-#: src/toolbar.c:205
-#: src/toolbar.c:2110
+#: src/toolbar.c:206 src/toolbar.c:2111
 msgid "Go to Previous Unread Message"
 msgstr "Ir para a mensagem não lida anterior"
 
-#: src/toolbar.c:206
-#: src/toolbar.c:2114
+#: src/toolbar.c:207 src/toolbar.c:2115
 msgid "Go to Next Unread Message"
 msgstr "Ir para a próxima mensagem não lida"
 
-#: src/toolbar.c:209
-#: src/toolbar.c:419
+#: src/toolbar.c:210 src/toolbar.c:420
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/toolbar.c:210
+#: src/toolbar.c:211
 msgid "Learn Spam or Ham"
 msgstr "Aprender spam ou não-spam"
 
-#: src/toolbar.c:211
+#: src/toolbar.c:212
 msgid "Open folder/Go to folder list"
 msgstr "Abrir a pasta/Ir para a lista de pastas"
 
-#: src/toolbar.c:214
-#: src/toolbar.c:2120
+#: src/toolbar.c:215 src/toolbar.c:2121
 msgid "Send Message"
 msgstr "Enviar a mensagem"
 
-#: src/toolbar.c:215
-#: src/toolbar.c:2124
+#: src/toolbar.c:216 src/toolbar.c:2125
 msgid "Put into queue folder and send later"
 msgstr "Armazenar na Fila de Saída e enviar mais tarde"
 
-#: src/toolbar.c:216
-#: src/toolbar.c:2128
+#: src/toolbar.c:217 src/toolbar.c:2129
 msgid "Save to draft folder"
 msgstr "Salvar na pasta Rascunho"
 
-#: src/toolbar.c:217
-#: src/toolbar.c:2132
+#: src/toolbar.c:218 src/toolbar.c:2133
 msgid "Insert file"
 msgstr "Inserir arquivo"
 
-#: src/toolbar.c:218
-#: src/toolbar.c:2136
+#: src/toolbar.c:219 src/toolbar.c:2137
 msgid "Attach file"
 msgstr "Anexar arquivo"
 
-#: src/toolbar.c:219
-#: src/toolbar.c:2140
+#: src/toolbar.c:220 src/toolbar.c:2141
 msgid "Insert signature"
 msgstr "Inserir assinatura"
 
-#: src/toolbar.c:220
-#: src/toolbar.c:2144
+#: src/toolbar.c:221 src/toolbar.c:2145
 msgid "Edit with external editor"
 msgstr "Editar com um programa externo"
 
-#: src/toolbar.c:221
-#: src/toolbar.c:2148
+#: src/toolbar.c:222 src/toolbar.c:2149
 msgid "Wrap long lines of current paragraph"
 msgstr "Quebrar as linhas longas do parágrafo atual"
 
-#: src/toolbar.c:222
-#: src/toolbar.c:2152
+#: src/toolbar.c:223 src/toolbar.c:2153
 msgid "Wrap all long lines"
 msgstr "Quebrar todas as linhas longas"
 
-#: src/toolbar.c:225
-#: src/toolbar.c:437
-#: src/toolbar.c:2161
+#: src/toolbar.c:226 src/toolbar.c:438 src/toolbar.c:2162
 msgid "Check spelling"
 msgstr "Verificar ortografia"
 
-#: src/toolbar.c:227
+#: src/toolbar.c:228
 msgid "Claws Mail Actions Feature"
 msgstr "Ações do Claws Mail"
 
-#: src/toolbar.c:228
-#: src/toolbar.c:2177
+#: src/toolbar.c:229 src/toolbar.c:2178
 msgid "Cancel receiving"
 msgstr "Cancelar a recepção"
 
-#: src/toolbar.c:230
-#: src/toolbar.c:2185
+#: src/toolbar.c:231 src/toolbar.c:2186
 msgid "Cancel receiving/sending"
 msgstr "Cancelar recepção/envio"
 
-#: src/toolbar.c:231
-#: src/toolbar.c:1961
+#: src/toolbar.c:232 src/toolbar.c:1962
 msgid "Close window"
 msgstr "Fechar a janela"
 
-#: src/toolbar.c:233
+#: src/toolbar.c:234
 msgid "Claws Mail Plugins"
 msgstr "Plugins do Claws Mail"
 
-#: src/toolbar.c:377
-#: src/toolbar.c:412
+#: src/toolbar.c:378 src/toolbar.c:413
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/toolbar.c:400
+#: src/toolbar.c:401
 msgid "Folders"
 msgstr "Pastas"
 
-#: src/toolbar.c:402
+#: src/toolbar.c:403
 msgid "Get Mail"
 msgstr "Receber mensagens"
 
-#: src/toolbar.c:403
+#: src/toolbar.c:404
 msgid "Get"
 msgstr "Obter"
 
-#: src/toolbar.c:405
-#: src/toolbar.c:406
+#: src/toolbar.c:406 src/toolbar.c:407
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Escrever"
 
-#: src/toolbar.c:408
+#: src/toolbar.c:409
 msgid "All"
 msgstr "Todos"
 
-#: src/toolbar.c:409
+#: src/toolbar.c:410
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "Remetente"
 
-#: src/toolbar.c:410
+#: src/toolbar.c:411
 msgid "List"
 msgstr "Lista"
 
-#: src/toolbar.c:415
+#: src/toolbar.c:416
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/toolbar.c:416
+#: src/toolbar.c:417
 msgid "Next"
 msgstr "Próxima"
 
-#: src/toolbar.c:424
+#: src/toolbar.c:425
 msgid "Draft"
 msgstr "Rascunho"
 
-#: src/toolbar.c:427
+#: src/toolbar.c:428
 msgid "Insert sig."
 msgstr "Inserir assin."
 
-#: src/toolbar.c:428
+#: src/toolbar.c:429
 msgid "Edit"
 msgstr "Editar"
 
-#: src/toolbar.c:429
+#: src/toolbar.c:430
 msgid "Wrap para."
 msgstr "Quebrar parág."
 
-#: src/toolbar.c:430
+#: src/toolbar.c:431
 msgid "Wrap all"
 msgstr "Quebrar tudo"
 
-#: src/toolbar.c:432
-#: src/toolbar.c:433
+#: src/toolbar.c:433 src/toolbar.c:434
 msgid "Stop"
 msgstr "Parar"
 
-#: src/toolbar.c:434
+#: src/toolbar.c:435
 msgid "Stop all"
 msgstr "Parar tudo"
 
-#: src/toolbar.c:910
+#: src/toolbar.c:911
 msgid "Compose News message"
 msgstr "Escrever artigo de Newsgroup"
 
-#: src/toolbar.c:952
+#: src/toolbar.c:953
 msgid "Learn spam"
 msgstr "Aprender spam"
 
-#: src/toolbar.c:961
+#: src/toolbar.c:962
 msgid "Ham"
 msgstr "Não-spam"
 
-#: src/toolbar.c:963
+#: src/toolbar.c:964
 msgid "Learn ham"
 msgstr "Aprender não-spam"
 
-#: src/toolbar.c:1943
+#: src/toolbar.c:1944
 msgid "Go to folder list"
 msgstr "Ir para a lista de pastas"
 
-#: src/toolbar.c:1949
+#: src/toolbar.c:1950
 msgid "Receive Mail from selected Account"
 msgstr "Receber as mensagens da conta selecionada"
 
-#: src/toolbar.c:1965
+#: src/toolbar.c:1966
 msgid "Open preferences"
 msgstr "Abrir as preferências"
 
-#: src/toolbar.c:1976
+#: src/toolbar.c:1977
 msgid "Compose with selected Account"
 msgstr "Escrever usando a conta selecionada"
 
-#: src/toolbar.c:1997
+#: src/toolbar.c:1998
 msgid "Learn as..."
 msgstr "Aprender como..."
 
-#: src/toolbar.c:2007
+#: src/toolbar.c:2008
 msgid "Learn as _Spam"
 msgstr "Aprender como _spam"
 
-#: src/toolbar.c:2008
+#: src/toolbar.c:2009
 msgid "Learn as _Ham"
 msgstr "Aprender como _não-spam"
 
-#: src/toolbar.c:2015
+#: src/toolbar.c:2016
 msgid "Reply to Message options"
 msgstr "Opções de Responder à Mensagem"
 
-#: src/toolbar.c:2019
-#: src/toolbar.c:2036
-#: src/toolbar.c:2053
-#: src/toolbar.c:2070
+#: src/toolbar.c:2020 src/toolbar.c:2037 src/toolbar.c:2054 src/toolbar.c:2071
 msgid "_Reply with quote"
 msgstr "Responder _com citação"
 
-#: src/toolbar.c:2020
-#: src/toolbar.c:2037
-#: src/toolbar.c:2054
-#: src/toolbar.c:2071
+#: src/toolbar.c:2021 src/toolbar.c:2038 src/toolbar.c:2055 src/toolbar.c:2072
 msgid "Reply without _quote"
 msgstr "Responder _sem citação"
 
-#: src/toolbar.c:2032
+#: src/toolbar.c:2033
 msgid "Reply to Sender options"
 msgstr "Opções de Responder ao Remetente"
 
-#: src/toolbar.c:2049
+#: src/toolbar.c:2050
 msgid "Reply to All options"
 msgstr "Opções de Responder a Todos"
 
-#: src/toolbar.c:2066
+#: src/toolbar.c:2067
 msgid "Reply to Mailing-list options"
 msgstr "Opções de Responder à Lista de Discussão"
 
-#: src/toolbar.c:2083
+#: src/toolbar.c:2084
 msgid "Forward Message options"
 msgstr "Opções de Encaminhar a Mensagem"
 
@@ -18923,12 +17952,12 @@ msgstr "Por favor, selecione a URL a ser aberta."
 msgid "Select All"
 msgstr "Selecionar tudo"
 
-#: src/wizard.c:539
+#: src/wizard.c:517
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Bem-vindo(a) ao Claws Mail"
 
-#: src/wizard.c:562
+#: src/wizard.c:540
 #, c-format
 msgid ""
 "\n"
@@ -19021,158 +18050,138 @@ msgstr ""
 "pode fazê-lo em <%s>.\n"
 "\n"
 
-#: src/wizard.c:638
+#: src/wizard.c:616
 msgid "Please enter the mailbox name."
 msgstr "Por favor, digite o nome da caixa postal."
 
-#: src/wizard.c:681
+#: src/wizard.c:644
 msgid "Please enter your name and email address."
 msgstr "Por favor, digite o seu nome e endereço de e-mail."
 
-#: src/wizard.c:692
+#: src/wizard.c:655
 msgid "Please enter your receiving server and username."
 msgstr ""
 "Por favor, digite o endereço e o nome de usuário do seu servidor de "
 "recebimento."
 
-#: src/wizard.c:702
+#: src/wizard.c:665
 msgid "Please enter your username."
 msgstr "Por favor, digite o seu nome de usuário."
 
-#: src/wizard.c:712
+#: src/wizard.c:675
 msgid "Please enter your SMTP server."
 msgstr "Por favor, digite o endereço do seu servidor SMTP."
 
-#: src/wizard.c:723
+#: src/wizard.c:686
 msgid "Please enter your SMTP username."
 msgstr "Por favor, digite o nome de usuário para o SMTP."
 
-#: src/wizard.c:1013
+#: src/wizard.c:965
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Seu nome:</span>"
 
-#: src/wizard.c:1023
+#: src/wizard.c:975
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Seu endereço de e-mail:</span>"
 
-#: src/wizard.c:1033
+#: src/wizard.c:985
 msgid "Your organization:"
 msgstr "Sua organização:"
 
-#: src/wizard.c:1141
+#: src/wizard.c:1018
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Nome da caixa postal:</span>"
 
-#: src/wizard.c:1149
+#: src/wizard.c:1026
 msgid ""
-"You can also specify an absolute path, for example: "
-"\"/home/john/Documents/Mail\""
+"You can also specify an absolute path, for example: \"/home/john/Documents/"
+"Mail\""
 msgstr ""
-"Você também pode especificar um caminho absoluto, por exemplo "
-"\"/home/fulano/Documentos/Mail\""
-
-#: src/wizard.c:1157
-msgid "on internal memory"
-msgstr "na memória interna"
+"Você também pode especificar um caminho absoluto, por exemplo \"/home/fulano/"
+"Documentos/Mail\""
 
-#: src/wizard.c:1160
-msgid "on external memory card"
-msgstr "no cartão de memória externo"
-
-#: src/wizard.c:1163
-msgid "on internal memory card"
-msgstr "no cartão de memória interno"
-
-#: src/wizard.c:1213
-msgid "<span weight=\"bold\">Store data</span>"
-msgstr "<span weight=\"bold\">Armazenar dados</span>"
-
-#: src/wizard.c:1281
+#: src/wizard.c:1097
 msgid ""
-"You can specify the port number by appending it at the end: "
-"\"mail.example.com:25\""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:25\""
 msgstr ""
-"Você pode especificar o número da porta adicionando-o ao final: "
-"\"mail.exemplo.com:25\""
+"Você pode especificar o número da porta adicionando-o ao final: \"mail."
+"exemplo.com:25\""
 
-#: src/wizard.c:1284
+#: src/wizard.c:1100
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Endereço do servidor SMTP:</span>"
 
-#: src/wizard.c:1290
+#: src/wizard.c:1106
 msgid "Use authentication"
 msgstr "Efetuar autenticação"
 
-#: src/wizard.c:1298
+#: src/wizard.c:1114
 msgid "<span size=\"small\">(empty to use the same as receive)</span>"
 msgstr ""
 "<span size=\"small\">(em branco para utilizar o mesmo da recepção)</span>"
 
-#: src/wizard.c:1312
+#: src/wizard.c:1128
 msgid "SMTP username:"
 msgstr "Nome de usuário do SMTP:"
 
-#: src/wizard.c:1323
+#: src/wizard.c:1139
 msgid "SMTP password:"
 msgstr "Senha do SMTP:"
 
-#: src/wizard.c:1340
+#: src/wizard.c:1152
 msgid "Use SSL to connect to SMTP server"
 msgstr "Usar SSL para conectar-se ao servidor SMTP"
 
-#: src/wizard.c:1351
-#: src/wizard.c:1630
+#: src/wizard.c:1163 src/wizard.c:1437
 msgid "Use SSL via STARTTLS"
 msgstr "Usar SSL via STARTTLS"
 
-#: src/wizard.c:1363
-#: src/wizard.c:1642
+#: src/wizard.c:1175 src/wizard.c:1449
 msgid "Client SSL certificate (optional)"
 msgstr "Certificado SSL do cliente (opcional)"
 
-#: src/wizard.c:1425
-#: src/wizard.c:1450
-#: src/wizard.c:1573
+#: src/wizard.c:1237 src/wizard.c:1262 src/wizard.c:1385
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Endereço do servidor:</span>"
 
-#: src/wizard.c:1480
+#: src/wizard.c:1292
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Caixa postal local:</span>"
 
-#: src/wizard.c:1540
+#: src/wizard.c:1352
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Tipo do servidor:</span>"
 
-#: src/wizard.c:1550
+#: src/wizard.c:1362
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1584
+#: src/wizard.c:1396
 msgid ""
-"You can specify the port number by appending it at the end: "
-"\"mail.example.com:110\""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:110\""
 msgstr ""
-"Você pode especificar o número da porta adicionando-o ao final: "
-"\"mail.exemplo.com:110\""
+"Você pode especificar o número da porta adicionando-o ao final: \"mail."
+"exemplo.com:110\""
 
-#: src/wizard.c:1589
+#: src/wizard.c:1401
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Nome de usuário:</span>"
 
-#: src/wizard.c:1619
+#: src/wizard.c:1426
 msgid "Use SSL to connect to receiving server"
 msgstr "Usar SSL para conectar-se ao servidor de recebimento"
 
-#: src/wizard.c:1684
+#: src/wizard.c:1491
 msgid "IMAP server directory:"
 msgstr "Diretório do servidor IMAP:"
 
-#: src/wizard.c:1695
+#: src/wizard.c:1502
 msgid "Show only subscribed folders"
 msgstr "Mostrar apenas pastas assinadas"
 
-#: src/wizard.c:1703
+#: src/wizard.c:1510
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"
@@ -19180,21 +18189,21 @@ msgstr ""
 "<span weight=\"bold\">Aviso: essa versão do Claws Mail\n"
 "foi compilada sem suporte ao IMAP.</span>"
 
-#: src/wizard.c:1823
+#: src/wizard.c:1628
 msgid "Claws Mail Setup Wizard"
 msgstr "Assistente de configuração do Claws Mail"
 
-#: src/wizard.c:1857
+#: src/wizard.c:1662
 msgid "Welcome to Claws Mail"
 msgstr "Bem-vindo(a) ao Claws Mail"
 
-#: src/wizard.c:1865
+#: src/wizard.c:1670
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
 "We will begin by defining some basic information about you and your most "
-"common mail options so that you can start to use Claws Mail in less than five "
-"minutes."
+"common mail options so that you can start to use Claws Mail in less than "
+"five minutes."
 msgstr ""
 "Bem-vindo(a) ao assistente de configuração do Claws Mail.\n"
 "\n"
@@ -19202,318 +18211,34 @@ msgstr ""
 "opções mais comuns de e-mail. Assim, você poderá iniciar a utilização do "
 "Claws Mail em menos de cinco minutos."
 
-#: src/wizard.c:1888
+#: src/wizard.c:1683
 msgid "About You"
 msgstr "Sobre você"
 
-#: src/wizard.c:1896
-#: src/wizard.c:1911
-#: src/wizard.c:1926
-#: src/wizard.c:1942
+#: src/wizard.c:1691 src/wizard.c:1706 src/wizard.c:1721 src/wizard.c:1737
 msgid "Bold fields must be completed"
 msgstr "Os campos em negrito DEVEM ser preenchidos"
 
-#: src/wizard.c:1903
+#: src/wizard.c:1698
 msgid "Receiving mail"
 msgstr "Recebimento de mensagens"
 
-#: src/wizard.c:1918
+#: src/wizard.c:1713
 msgid "Sending mail"
 msgstr "Envio de mensagem"
 
-#: src/wizard.c:1934
+#: src/wizard.c:1729
 msgid "Saving mail on disk"
 msgstr "Salvamento da mensagem no disco"
 
-#: src/wizard.c:1950
+#: src/wizard.c:1745
 msgid "Configuration finished"
 msgstr "Configuração encerrada"
 
-#: src/wizard.c:1958
+#: src/wizard.c:1753
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
 "O Claws Mail está pronto.\n"
 "Clique em Salvar para iniciar."
-
-#~ msgid "`%c' can't be included in folder name."
-#~ msgstr "`%c' não pode ser incluído no nome da pasta."
-
-#~ msgid "Select ..."
-#~ msgstr "Selecionar ..."
-
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Não foi possível imprimir:\n"
-#~ " %s"
-
-#~ msgid ""
-#~ "Printing HTML is only possible if the program 'html2ps' is installed."
-#~ msgstr ""
-#~ "A impressão do HTML só é possível se o programa 'html2ps' estiver "
-#~ "instalado."
-
-#~ msgid "Filename is null."
-#~ msgstr "O nome do arquivo está em branco."
-
-#~ msgid "Conversion to postscript failed."
-#~ msgstr "Não foi possível converter para postscript."
-
-#~ msgid "Printer %s doesn't accept PostScript files."
-#~ msgstr "A impressora %s não aceita arquivos PostScript."
-
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Não foi possível imprimir:\n"
-#~ " %s"
-
-#~ msgid "Navigation to %s blocked"
-#~ msgstr "A navegação para %s está bloqueada"
-
-#~ msgid "Proxy Setting"
-#~ msgstr "Configurações de proxy"
-
-#~ msgid "Auto-Load images"
-#~ msgstr "Carregar as imagens automaticamente"
-
-#~ msgid "Block external content"
-#~ msgstr "Bloquear conteúdo externo"
-
-#, fuzzy
-#~ msgid "The mailbox `%s' already exists."
-#~ msgstr "A caixa postal '%s' já existe."
-
-#, fuzzy
-#~ msgid "The folder `%s' already exists."
-#~ msgstr "A pasta '%s' já existe."
-
-#, fuzzy
-#~ msgid "Can't create the folder `%s'."
-#~ msgstr "Não foi possível criar a pasta '%s'."
-
-#, fuzzy
-#~ msgid ""
-#~ "Really remove the mailbox `%s' ?\n"
-#~ "(The messages are NOT deleted from the disk)"
-#~ msgstr ""
-#~ "Deseja realmente excluir a caixa postal '%s'?\n"
-#~ "(As mensagens NÃO SERÃO apagadas do disco)"
-
-#, fuzzy
-#~ msgid "Can't remove the folder `%s'."
-#~ msgstr "Não foi possível remover a pasta '%s'."
-
-#, fuzzy
-#~ msgid "Input new name for `%s':"
-#~ msgstr "Entre com o novo nome para '%s':"
-
-#, fuzzy
-#~ msgid "Newmail plugin unloaded\n"
-#~ msgstr "%s (plugin não carregado)"
-
-#~ msgid "PDF Viewer Plugin"
-#~ msgstr "Plugin Visualizador de PDF"
-
-#~ msgid "Dillo Browser"
-#~ msgstr "Navegador Dillo"
-
-#~ msgid "Load remote links in mails"
-#~ msgstr "Carregar links remotos nas mensagens"
-
-#~ msgid "Equivalent to Dillo's '--local' option"
-#~ msgstr "Equivalente à opção '--local' do Dillo"
-
-#~ msgid "You can still load remote links by reloading the page"
-#~ msgstr "Você ainda pode carregar os links remotos atualizando a página"
-
-#~ msgid "Only for senders found in address book/folder"
-#~ msgstr "Apenas para remetentes presentes no Livro de Endereços"
-
-#~ msgid "Full window mode (hide controls)"
-#~ msgstr "Modo de tela inteira (esconde os controles)"
-
-#~ msgid "Equivalent to Dillo's '--fullwindow' option"
-#~ msgstr "Equivalente à opção '--fullwindow' do Dillo"
-
-#~ msgid "Dillo HTML Viewer"
-#~ msgstr "Visualizador HTML Dillo"
-
-#~ msgid "Can't find the dillo executable in PATH. Is it installed?"
-#~ msgstr ""
-#~ "Não foi possível encontrar o executável dillo no PATH. Ele está instalado?"
-
-#~ msgid ""
-#~ "This plugin renders HTML mail using the Dillo web browser.\n"
-#~ "\n"
-#~ "Options can be found in /Configuration/Preferences/Plugins/Dillo Browser"
-#~ msgstr ""
-#~ "Esse plugin renderiza mensagens em HTML usando o navegador web Dillo.\n"
-#~ "\n"
-#~ "As opções podem ser encontradas em /Configurações/Preferências/Plugins/"
-#~ "Navegador Dillo"
-
-#~ msgid "Trayicon"
-#~ msgstr "Trayicon"
-
-#~ msgid "Claws Mail"
-#~ msgstr "Claws Mail"
-
-#~ msgid "Failed to register offline switch hook"
-#~ msgstr "Não foi possível registrar o gancho de desconexão"
-
-#~ msgid "Failed to register account list changed hook"
-#~ msgstr "Não foi possível registrar o gancho modificação da lista de contas"
-
-#~ msgid "Failed to register close hook"
-#~ msgstr "Não foi possível registrar o gancho de encerramento"
-
-#~ msgid "Failed to register got iconified hook"
-#~ msgstr "Não foi possível registrar o gancho de iconificação"
-
-#~ msgid "Failed to register theme change hook"
-#~ msgstr "Não foi possível registrar o gancho de modificação do tema"
-
-#~ msgid ""
-#~ "This plugin places a mailbox icon in the system tray that indicates if "
-#~ "you have new or unread mail.\n"
-#~ "\n"
-#~ "The mailbox is empty if you have no unread mail, otherwise it contains a "
-#~ "letter. A tooltip shows new, unread and total number of messages."
-#~ msgstr ""
-#~ "Esse plugin mostra um ícone de caixa postal na barra de ícones do "
-#~ "sistema, que indica se você tem mensagens novas ou não lidas.\n"
-#~ "\n"
-#~ "A caixa fica vazia quando não existem mensagens não lidas, caso contrário "
-#~ "ela contém uma carta. Ao passar o mouse sobre o ícone aparece uma "
-#~ "indicação do número de mensagens lidas, não lidas e do total."
-
-#~ msgid "Hide Claws Mail at start-up"
-#~ msgstr "Esconder o Claws Mail ao iniciar"
-
-#~ msgid ""
-#~ "Hide Claws Mail using the tray icon instead of closing it\n"
-#~ "when the window close button is clicked"
-#~ msgstr ""
-#~ "Esconde (ao invés de fechar) o Claws Mail na barra de\n"
-#~ "ícones do sistema ao, quando se clica no botão de fechar"
-
-#~ msgid "Minimize to tray"
-#~ msgstr "Minimizar para a barra de ícones do sistema"
-
-#~ msgid "Hide Claws Mail using the tray icon instead of minimizing it"
-#~ msgstr ""
-#~ "Esconde o Claws Mail na barra de ícones do sistema ao invés de minimizá-lo"
-
-#~ msgid ""
-#~ "An attachment is mentioned in the mail you're sending, but no file was "
-#~ "attached. Mention appears on line %d, which begins with text: <span "
-#~ "weight=\"bold\">%.20s</span>…\n"
-#~ "\n"
-#~ "%s it anyway?"
-#~ msgstr ""
-#~ "Um anexo é mencionado na mensagem que você está enviando, mas nenhum "
-#~ "arquivo foi anexado. A menção aparece na linha %d, que começa com o "
-#~ "seguinte texto: <span weight=\"bold\">%.20s</span>…\n"
-#~ "\n"
-#~ " %s mesmo assim?"
-
-#~ msgid ""
-#~ "Command could not be started. Pipe creation failed.\n"
-#~ "%s"
-#~ msgstr ""
-#~ "O comando não pode ser iniciado. Ocorreu uma falha na criação da "
-#~ "conexão.\n"
-#~ "%s"
-
-#~ msgid "Charset"
-#~ msgstr "Codificação dos caracteres"
-
-#~ msgid "Change dictionary"
-#~ msgstr "Alterar dicionário"
-
-#~ msgid "Unknown SSL Certificate"
-#~ msgstr "Certificado SSL desconhecido"
-
-#~ msgid "Expired SSL Certificate"
-#~ msgstr "Certificado SSL expirado"
-
-#~ msgid "Changed SSL Certificate"
-#~ msgstr "O certificado SSL foi alterado"
-
-#~ msgid "Connecting to IMAP4 server %s...\n"
-#~ msgstr "Conectando com o servidor IMAP4: %s...\n"
-
-#~ msgid "_Open (l)"
-#~ msgstr "_Abrir (l)"
-
-#~ msgid "Open _with (o)..."
-#~ msgstr "Abrir _com (o)..."
-
-#~ msgid "_Display as text (t)"
-#~ msgstr "_Exibir como texto (t)"
-
-#~ msgid "_Save as (y)..."
-#~ msgstr "_Salvar como (y)..."
-
-#~ msgid "Trust key"
-#~ msgstr "Chave confiável"
-
-#~ msgid "Main toolbar configuration"
-#~ msgstr "Configuração da barra de ferramentas principal"
-
-#~ msgid "Compose toolbar configuration"
-#~ msgstr "Configuração da barra de ferramentas de composição"
-
-#~ msgid "Message view toolbar configuration"
-#~ msgstr "Configuração da barra de ferramentas da janela de mensagem"
-
-#~ msgid " (Shortcut key: 't')"
-#~ msgstr " (Tecla de atalho: 't')"
-
-#~ msgid " (Shortcut key: 'l')\n"
-#~ msgstr " (Tecla de atalho: 'l'),\n"
-
-#~ msgid " (Shortcut key: 'o')"
-#~ msgstr " (Tecla de atalho: 'o')"
-
-#~ msgid "Last read message"
-#~ msgstr "Últ_ima mensagem lida"
-
-#~ msgid "_all"
-#~ msgstr "_todos"
-
-#~ msgid "_sender"
-#~ msgstr "_remetente"
-
-#~ msgid "by _From"
-#~ msgstr "pelo _remetente"
-
-#~ msgid "by _To"
-#~ msgstr "pelo d_estinatário"
-
-#~ msgid "by S_ubject"
-#~ msgstr "pelo _assunto"
-
-#~ msgid "by Tag"
-#~ msgstr "pela eti_queta"
-
-#~ msgid " blocked"
-#~ msgstr " está bloqueada"
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for Atom feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr ""
-#~ "RSSyl: A obtenção de comentários não é suportada para fontes Atom. Não "
-#~ "foi possível obter os comentários de '%s'"
-
-#~ msgid "%d page"
-
-#~ msgid_plural "%d pages"
-#~ msgstr[0] "%d página"
-#~ msgstr[1] "%d páginas"
diff --git a/po/sk.po b/po/sk.po
index deab49c..cf5a436 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,104 +1,20 @@
-# #-#-#-#-#  sk.po (claws-mail)  #-#-#-#-#
 # Slovak language file for claws-mail
 # This file is distributed under the same license as the PACKAGE package.
-#
-# #-#-#-#-#  sk.po (geolocation_plugin)  #-#-#-#-#
-# Slovak language file for geolocation_plugin
-# This file is distributed under the same license as the PACKAGE package.
-#
-# #-#-#-#-#  sk.po (notification_plugin)  #-#-#-#-#
-# Slovak language file for notification_plugin
-# This file is distributed under the same license as the PACKAGE package.
-#
-# #-#-#-#-#  sk.po (spam_report_plugin)  #-#-#-#-#
-# Slovak language file for spam_report_plugin
-# This file is distributed under the same license as the PACKAGE package.
-#
-# #-#-#-#-#  sk.po (clamd_plugin)  #-#-#-#-#
-# Slovak translations for clamd_plugin package
-# Slovenské preklady pre balík clamd_plugin.
-# Copyright (C) 2010 the Claws Mail team
-# This file is distributed under the same license as the PACKAGE package.
-#
-# #-#-#-#-#  sk.po (vcalendar_plugin)  #-#-#-#-#
-# Slovak language file for vcalendar_plugin
-# This file is distributed under the same license as the PACKAGE package.
-#
-# #-#-#-#-#  sk.po (fancy_plugin)  #-#-#-#-#
-# Slovak language file for fancy_plugin
-# This file is distributed under the same license as the PACKAGE package.
-#
-# #-#-#-#-#  sk.po (gdata_plugin)  #-#-#-#-#
-# Slovak translations for gdata_plugin package
-# Slovenské preklady pre balík gdata_plugin.
-# Copyright (C) 2011 Holger Berndt
-# This file is distributed under the same license as the gdata_plugin package.
-#
-# #-#-#-#-#  sk.po (rssyl_plugin)  #-#-#-#-#
-# Slovak language file for rssyl_plugin
-# This file is distributed under the same license as the PACKAGE package.
-#
-# #-#-#-#-#  sk.po (acpi_notifier_plugin)  #-#-#-#-#
-# Slovak language file for acpi_notifier_plugin
-# This file is distributed under the same license as the PACKAGE package.
-#
-# #-#-#-#-#  sk.po (bsfilter_plugin)  #-#-#-#-#
-# Slovak language file for bsfilter_plugin
-# This file is distributed under the same license as the PACKAGE package.
-#
-# #-#-#-#-#  sk.po (address_keeper_plugin)  #-#-#-#-#
-# Slovak translations for address_keeper_plugin package
-# Slovenské preklady pre balík address_keeper_plugin.
-# Copyright (C) 2010 Ricardo Mones
-# This file is distributed under the same license as the PACKAGE package.
-#
-# #-#-#-#-#  sk.po (python_plugin)  #-#-#-#-#
-# Slovak language file for python_plugin
-# This file is distributed under the same license as the PACKAGE package.
-#
-# #-#-#-#-#  sk.po (tnef_parse_plugin)  #-#-#-#-#
-# Slovak language file for tnef_parse_plugin
-# This file is distributed under the same license as the PACKAGE package.
-# #-#-#-#-#  sk.po (archive_plugin)  #-#-#-#-#
-# Slovak language file for archive_plugin
-# This file is distributed under the same license as the PACKAGE package.
-#
-# #-#-#-#-#  sk.po (fetchinfo-plugin 0.4.24cvs7)  #-#-#-#-#
-# Slovak translations for fetchinfo-plugin package
-# Slovenské preklady pre balík fetchinfo-plugin.
-# Copyright (C) 2012 Thorsten Maerz
-# This file is distributed under the same license as the fetchinfo-plugin package.
-# Automatically generated, 2012.
-#
-# #-#-#-#-#  sk.po (pdf_viewer_plugin)  #-#-#-#-#
-# Slovak translations for pdf_viewer_plugin package
-# Slovenské preklady pre balík pdf_viewer_plugin.
-# Copyright (C) 2011 Salvatore De Paolis 
-# This file is distributed under the same license as the pdf_viewer_plugin package.
-#
-# #-#-#-#-#  sk.po (gtkhtlml2_plugin)  #-#-#-#-#
-# Slovak language file for gtkhtlml2_plugin
-# This file is distributed under the same license as the PACKAGE package.
-#
-# #-#-#-#-#  sk.po (attachwarner_plugin)  #-#-#-#-#
-# Slovak language file for attachwarner_plugin
-# This file is distributed under the same license as the PACKAGE package.
 # Slavko <linux at slavino.sk>, 2009, 2010, 2011, 2012, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: attachwarner_plugin\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2013-04-29 10:32+0100\n"
-"PO-Revision-Date: 2013-05-01 10:31+0200\n"
+"POT-Creation-Date: 2013-12-07 08:54+0000\n"
+"PO-Revision-Date: 2013-12-11 19:01+0100\n"
 "Last-Translator: Slavko <linux at slavino.sk>\n"
-"Language-Team: slovenčina <debian-l10n-slovak at lists.debian.org>\n"
-"Language: \n"
+"Language-Team: slovenčina <linux at slavino.sk>\n"
+"Language: slovenčina\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  sk.po (claws-mail)  #-#-#-#-#\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Gtranslator 2.91.6\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-POFile-SpellExtra: Distguished DIGEST-MD5 Foundation iconv compose Okt\n"
 "X-POFile-SpellExtra: EUC-JP send podzložiek X-Mailer faq List-Help XBM\n"
@@ -160,76 +76,11 @@ msgstr ""
 "X-POFile-SpellExtra: Po-spracovanie 389 100 Face Janko Software AND 10\n"
 "X-POFile-SpellExtra: Windows-1255 OK TIS-620 Windows-874 1999-2012 51 mh\n"
 "X-POFile-SpellExtra: 2001 DoS podreťazca 725 OS OR ad ov\n"
-"#-#-#-#-#  sk.po (geolocation_plugin)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: IP messageviewshow 2f clutter\n"
-"#-#-#-#-#  sk.po (notification_plugin)  #-#-#-#-#\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: pixeloch Claws hint podzložky apletu folder update\n"
-"X-POFile-SpellExtra: msginfo F11 offline account iconified changed\n"
-"X-POFile-SpellExtra: threading switch urgency RSS theme item window close\n"
-"X-POFile-SpellExtra: change News LCDd Menostroja SysTrayicon\n"
-"#-#-#-#-#  sk.po (spam_report_plugin)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: fr spamcop lists spam-signal org net debian\n"
-"#-#-#-#-#  sk.po (clamd_plugin)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: filtering AntiVirus clamd conf ClamAV TCP claws-mail\n"
-"X-POFile-SpellExtra: Clam IP clamav clamav-daemon IMAP execute Clamd ping\n"
-"X-POFile-SpellExtra: soket AntiVírus Antivírus soketu sokete\n"
-"#-#-#-#-#  sk.po (vcalendar_plugin)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: webCal vCalendar XFCE MIME WebCal Claws ld ics\n"
-"X-POFile-SpellExtra: Evolution ICS ID Outlook Orage ifb Webcal webcal ToDo\n"
-"#-#-#-#-#  sk.po (fancy_plugin)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: PostScript html2ps JavaScript\n"
-"#-#-#-#-#  sk.po (gdata_plugin)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: completion Claws GData Google switch address services\n"
-"X-POFile-SpellExtra: offline\n"
-"#-#-#-#-#  sk.po (rssyl_plugin)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: ld opml libCURL cookies RSSyl RDF Atom txt Netscape\n"
-"X-POFile-SpellExtra: RSS\n"
-"#-#-#-#-#  sk.po (acpi_notifier_plugin)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: google cakey apanel acerhk code net sourceforge com\n"
-"X-POFile-SpellExtra: ACPI apanelc aceracpi asuslaptop ibmacpi asusacpi\n"
-"#-#-#-#-#  sk.po (bsfilter_plugin)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: kB bsfilter Bsfilter IMAP whitelisted whitelist\n"
-"#-#-#-#-#  sk.po (address_keeper_plugin)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: check send before\n"
-"#-#-#-#-#  sk.po (python_plugin)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: compose Python create hook API examples clawsmail\n"
-"X-POFile-SpellExtra: help\n"
-"#-#-#-#-#  sk.po (tnef_parse_plugin)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: VTask Claws VCalendar Hand ms-tnef application Ytnef\n"
-"X-POFile-SpellExtra: Randall TNEF VCard\n"
-"#-#-#-#-#  sk.po (archive_plugin)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: vCalendar tgz COMPRESS RSSyl SHAR Claws BZIP2\n"
-"X-POFile-SpellExtra: Compress ZIP CPIO ISO-8601 IMAP RRRR-MM-DD MD5 POP3\n"
-"X-POFile-SpellExtra: GZIP mbox MD5sum IMAP4 dátumod ld podzložiek\n"
-"X-POFile-SpellExtra: podzložky\n"
-"#-#-#-#-#  sk.po (fetchinfo-plugin 0.4.24cvs7)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"#-#-#-#-#  sk.po (pdf_viewer_plugin)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: gs Poppler PostScript org PDF iwkse claws-mail\n"
-"#-#-#-#-#  sk.po (gtkhtlml2_plugin)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: gtkhtml2rendering PostScript html2ps GtkHtml2\n"
-"#-#-#-#-#  sk.po (attachwarner_plugin)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: 20s check send before\n"
+"X-POFile-SpellExtra: 20s check send before code gs vCalendar ClamAV\n"
+"X-POFile-SpellExtra: whitelist Bsfilter COMPRESS XFCE kanály\n"
+"X-POFile-SpellExtra: clamav-daemon hint AttRemover Filtering\n"
 
-#: src/account.c:393
+#: src/account.c:392
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -238,15 +89,15 @@ msgstr ""
 "Prosím zatvorte všetky tieto okná predtým, ako začnete meniť nastavenia "
 "účtov."
 
-#: src/account.c:438
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Nemožno vytvoriť zložku."
 
-#: src/account.c:719
+#: src/account.c:717
 msgid "Edit accounts"
 msgstr "Upraviť účty"
 
-#: src/account.c:740
+#: src/account.c:734
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -256,57 +107,57 @@ msgstr ""
 "zaškrtnutie poľa v stĺpci „G” určuje ktoré účty budú zahrnuté. Predvolený "
 "účet je označený tučným písmom."
 
-#: src/account.c:811
+#: src/account.c:805
 msgid " _Set as default account "
 msgstr " _Nastaviť ako predvolený účet "
 
-#: src/account.c:906
+#: src/account.c:897
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Účty so vzdialenými zložkami nemožno kopírovať."
 
-#: src/account.c:913
+#: src/account.c:904
 #, c-format
 msgid "Copy of %s"
 msgstr "Kópia %s"
 
-#: src/account.c:1073
+#: src/account.c:1064
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Naozaj chcete odstrániť účet „%s”?"
 
-#: src/account.c:1075
+#: src/account.c:1066
 msgid "(Untitled)"
 msgstr "(Bez názvu)"
 
-#: src/account.c:1076
+#: src/account.c:1067
 msgid "Delete account"
 msgstr "Zmazať účet"
 
-#: src/account.c:1546
+#: src/account.c:1536
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr " "
 
-#: src/account.c:1552
+#: src/account.c:1542
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "Tlačidlo „Prijať poštu” prijme poštu z označených účtov"
 
-#: src/account.c:1559 src/addressadd.c:215 src/addressbook.c:125
-#: src/addrduplicates.c:481 src/compose.c:6984 src/editaddress.c:1270
-#: src/editaddress.c:1327 src/editaddress.c:1347 src/editbook.c:170
+#: src/account.c:1549 src/addressadd.c:215 src/addressbook.c:125
+#: src/addrduplicates.c:481 src/compose.c:7073 src/editaddress.c:1263
+#: src/editaddress.c:1320 src/editaddress.c:1340 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:284 src/plugins/pdf_viewer/poppler_viewer.c:1784
-#: src/plugins/pgpcore/select-keys.c:398 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1872 src/prefs_template.c:78
+#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1800
+#: src/plugins/pgpcore/select-keys.c:394 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1868 src/prefs_template.c:78
 msgid "Name"
 msgstr "Meno"
 
-#: src/account.c:1567 src/prefs_account.c:1097 src/prefs_account.c:3922
+#: src/account.c:1557 src/prefs_account.c:1097 src/prefs_account.c:3921
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:1575 src/ssl_manager.c:102
+#: src/account.c:1565 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Server"
 
@@ -346,7 +197,7 @@ msgstr ""
 "Neplatné akcie filtra:\n"
 "%s"
 
-#: src/action.c:978
+#: src/action.c:988
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -357,7 +208,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:980 src/plugins/bogofilter/bogofilter.c:875
+#: src/action.c:990 src/plugins/bogofilter/bogofilter.c:875
 #: src/plugins/rssyl/feed.c:1734 src/plugins/rssyl/feed.c:1738
 #: src/plugins/tnef_parse/tnef_parse.c:67
 #: src/plugins/vcalendar/vcal_folder.c:1800
@@ -367,25 +218,25 @@ msgstr ""
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
-#: src/action.c:1198 src/action.c:1368
+#: src/action.c:1208 src/action.c:1373
 msgid "Completed"
 msgstr "Dokončené"
 
-#: src/action.c:1234
+#: src/action.c:1244
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Bežiace: %s\n"
 
-#: src/action.c:1238
+#: src/action.c:1248
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Ukončené: %s\n"
 
-#: src/action.c:1271
+#: src/action.c:1281
 msgid "Action's input/output"
 msgstr "Akcie vstupu/výstupu"
 
-#: src/action.c:1604
+#: src/action.c:1609
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -396,11 +247,11 @@ msgstr ""
 "(„%%h” bude nahradené parametrom)\n"
 "  %s"
 
-#: src/action.c:1609
+#: src/action.c:1614
 msgid "Action's hidden user argument"
 msgstr "Skrytý používateľský parameter akcie"
 
-#: src/action.c:1613
+#: src/action.c:1618
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -411,11 +262,11 @@ msgstr ""
 "(„%%u” bude nahradené parametrom)\n"
 "  %s"
 
-#: src/action.c:1618
+#: src/action.c:1623
 msgid "Action's user argument"
 msgstr "Používateľský parameter"
 
-#: src/addr_compl.c:600 src/addressbook.c:4881
+#: src/addr_compl.c:600 src/addressbook.c:4870
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:314
 msgid "Group"
 msgstr "Skupina"
@@ -490,13 +341,13 @@ msgstr ""
 
 #: src/addrcustomattr.c:212 src/addressbook.c:435 src/addressbook.c:463
 #: src/addressbook.c:480 src/edittags.c:271
-#: src/plugins/archive/archiver_gtk.c:1193 src/prefs_actions.c:1086
-#: src/prefs_filtering.c:1692 src/prefs_template.c:1095
+#: src/plugins/archive/archiver_gtk.c:1193 src/prefs_actions.c:1090
+#: src/prefs_filtering.c:1695 src/prefs_template.c:1099
 msgid "_Delete"
 msgstr "O_dstrániť"
 
-#: src/addrcustomattr.c:213 src/edittags.c:272 src/prefs_actions.c:1087
-#: src/prefs_filtering.c:1693 src/prefs_template.c:1096
+#: src/addrcustomattr.c:213 src/edittags.c:272 src/prefs_actions.c:1091
+#: src/prefs_filtering.c:1696 src/prefs_template.c:1100
 msgid "Delete _all"
 msgstr "Zm_azať všetko"
 
@@ -504,20 +355,20 @@ msgstr "Zm_azať všetko"
 msgid "_Reset to default"
 msgstr "Nastaviť na p_redvolené"
 
-#: src/addrcustomattr.c:410
+#: src/addrcustomattr.c:403
 msgid "Attribute name is not set."
 msgstr "Nie je nastavené meno atribútu."
 
-#: src/addrcustomattr.c:469
+#: src/addrcustomattr.c:462
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Upraviť meno atribútu"
 
-#: src/addrcustomattr.c:483
+#: src/addrcustomattr.c:476
 msgid "New attribute name:"
 msgstr "Nové meno atribútu:"
 
-#: src/addrcustomattr.c:520
+#: src/addrcustomattr.c:513
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -534,12 +385,12 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #: src/addressadd.c:227 src/addrduplicates.c:452
-#: src/plugins/pgpcore/select-keys.c:399 src/toolbar.c:431
+#: src/plugins/pgpcore/select-keys.c:395 src/toolbar.c:432
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1062
-#: src/editaddress.c:1137 src/editgroup.c:290
+#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1055
+#: src/editaddress.c:1130 src/editgroup.c:290
 msgid "Remarks"
 msgstr "Poznámky"
 
@@ -547,7 +398,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte zložku adresára"
 
-#: src/addressadd.c:483 src/editaddress.c:1585 src/headerview.c:348
+#: src/addressadd.c:483 src/editaddress.c:1582 src/headerview.c:348
 #: src/textview.c:2110
 #, c-format
 msgid ""
@@ -557,7 +408,7 @@ msgstr ""
 "Zlyhalo uloženie obrázka: \n"
 "%s"
 
-#: src/addressadd.c:532 src/addressbook.c:3221 src/addressbook.c:3272
+#: src/addressadd.c:532 src/addressbook.c:3210 src/addressbook.c:3261
 msgid "Add address(es)"
 msgstr "Pridať adresu(y)"
 
@@ -565,8 +416,8 @@ msgstr "Pridať adresu(y)"
 msgid "Can't add the specified address"
 msgstr "Nemožno pridať zadanú adresu"
 
-#: src/addressbook.c:126 src/addressbook.c:4869 src/editaddress.c:1059
-#: src/editaddress.c:1120 src/editgroup.c:289 src/expldifdlg.c:517
+#: src/addressbook.c:126 src/addressbook.c:4858 src/editaddress.c:1052
+#: src/editaddress.c:1113 src/editgroup.c:289 src/expldifdlg.c:517
 #: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:782
 msgid "Email Address"
 msgstr "Emailová adresa"
@@ -576,18 +427,18 @@ msgid "_Book"
 msgstr "_Adresár"
 
 #: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
-#: src/addressbook.c:479 src/compose.c:576 src/gtk/quicksearch.c:799
-#: src/gtk/quicksearch.c:814 src/mainwindow.c:504 src/messageview.c:211
+#: src/addressbook.c:479 src/compose.c:578 src/mainwindow.c:504
+#: src/messageview.c:209
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: src/addressbook.c:404 src/compose.c:581 src/mainwindow.c:507
-#: src/messageview.c:214
+#: src/addressbook.c:404 src/compose.c:583 src/mainwindow.c:507
+#: src/messageview.c:212
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: src/addressbook.c:405 src/compose.c:582 src/mainwindow.c:509
-#: src/messageview.c:215
+#: src/addressbook.c:405 src/compose.c:584 src/mainwindow.c:509
+#: src/messageview.c:213
 msgid "_Help"
 msgstr "_Pomocník"
 
@@ -619,15 +470,15 @@ msgstr "_Upraviť adresár"
 msgid "_Delete book"
 msgstr "Z_mazať adresár"
 
-#: src/addressbook.c:424 src/compose.c:592
+#: src/addressbook.c:424 src/compose.c:595
 msgid "_Save"
 msgstr "_Uložiť"
 
-#: src/addressbook.c:425 src/compose.c:596 src/messageview.c:224
+#: src/addressbook.c:425 src/compose.c:599 src/messageview.c:222
 msgid "_Close"
 msgstr "_Zavrieť"
 
-#: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:228
+#: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:226
 msgid "_Select all"
 msgstr "Vy_brať všetko"
 
@@ -636,12 +487,12 @@ msgid "C_ut"
 msgstr "_Vystrihnúť"
 
 #: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:604 src/mainwindow.c:538 src/messageview.c:227
+#: src/compose.c:607 src/mainwindow.c:538 src/messageview.c:225
 msgid "_Copy"
 msgstr "_Kopírovať"
 
 #: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:605
+#: src/compose.c:608
 msgid "_Paste"
 msgstr "V_ložiť"
 
@@ -685,8 +536,8 @@ msgstr "Nájsť duplikáty…"
 msgid "Edit custom attributes..."
 msgstr "Upraviť vlastné atribúty…"
 
-#: src/addressbook.c:455 src/compose.c:684 src/mainwindow.c:801
-#: src/messageview.c:340
+#: src/addressbook.c:455 src/compose.c:687 src/mainwindow.c:801
+#: src/messageview.c:338
 msgid "_About"
 msgstr "_O programe"
 
@@ -695,7 +546,7 @@ msgid "_Browse Entry"
 msgstr "P_rechádzať  položky"
 
 #: src/addressbook.c:504 src/crash.c:451 src/crash.c:470 src/importldif.c:115
-#: src/plugins/pgpcore/select-keys.c:255 src/plugins/pgpcore/sgpgme.c:140
+#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:140
 #: src/plugins/vcalendar/day-view.c:410 src/plugins/vcalendar/month-view.c:431
 #: src/prefs_themes.c:705 src/prefs_themes.c:737 src/prefs_themes.c:738
 msgid "Unknown"
@@ -797,32 +648,32 @@ msgstr "Kontakt s takýmto kľúčom už existuje"
 msgid "Strong(er) authentication required"
 msgstr "Je vyžadovaná silnejšia autentifikácia"
 
-#: src/addressbook.c:913
+#: src/addressbook.c:910
 msgid "Sources"
 msgstr "Zdroje"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:629 src/prefs_other.c:475
-#: src/toolbar.c:223 src/toolbar.c:2156
+#: src/addressbook.c:914 src/prefs_matcher.c:629 src/prefs_other.c:475
+#: src/toolbar.c:224 src/toolbar.c:2157
 msgid "Address book"
 msgstr "Adresár"
 
-#: src/addressbook.c:1120
+#: src/addressbook.c:1109
 msgid "Lookup name:"
 msgstr "Vyhľadať meno:"
 
-#: src/addressbook.c:1444 src/addressbook.c:1497 src/addrduplicates.c:803
+#: src/addressbook.c:1433 src/addressbook.c:1486 src/addrduplicates.c:803
 msgid "Delete address(es)"
 msgstr "Zmazať adresu(y)"
 
-#: src/addressbook.c:1445 src/addrduplicates.c:853
+#: src/addressbook.c:1434 src/addrduplicates.c:853
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Tieto údaje adresy sú len na čítanie a nemožno ich odstrániť."
 
-#: src/addressbook.c:1489
+#: src/addressbook.c:1478
 msgid "Delete group"
 msgstr "Odstrániť skupinu"
 
-#: src/addressbook.c:1490
+#: src/addressbook.c:1479
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -830,30 +681,30 @@ msgstr ""
 "Naozaj chcete odstrániť skupinu(y)?\n"
 "Adresy, ktoré obsahuje, budú stratené."
 
-#: src/addressbook.c:1498 src/addrduplicates.c:804
+#: src/addressbook.c:1487 src/addrduplicates.c:804
 msgid "Really delete the address(es)?"
 msgstr "Naozaj odstrániť adresu(y)?"
 
-#: src/addressbook.c:2201
+#: src/addressbook.c:2190
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Nemožno vkladať. Cieľový adresár je len na čítanie."
 
-#: src/addressbook.c:2211
+#: src/addressbook.c:2200
 msgid "Cannot paste into an address group."
 msgstr "Nemožno vkladať do skupiny adries."
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2906
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Chcete zmazať výsledky požiadavku a adresy v „%s”?"
 
-#: src/addressbook.c:2920 src/addressbook.c:2946 src/addressbook.c:2953
+#: src/addressbook.c:2909 src/addressbook.c:2935 src/addressbook.c:2942
 #: src/plugins/archive/archiver_prefs.c:337 src/prefs_filtering_action.c:177
-#: src/toolbar.c:413
+#: src/toolbar.c:414
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2918
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -862,21 +713,21 @@ msgstr ""
 "Chcete odstrániť „%s”? Ak odstránite len zložku, adresy, ktoré obsahuje, "
 "budú presunuté do rodičovskej zložky."
 
-#: src/addressbook.c:2932 src/imap_gtk.c:363 src/mh_gtk.c:202
-#: src/plugins/mailmbox/plugin_gtk.c:325 src/plugins/rssyl/rssyl_cb_menu.c:237
-#: src/plugins/vcalendar/vcal_folder.c:1953
+#: src/addressbook.c:2921 src/imap_gtk.c:363 src/mh_gtk.c:202
+#: src/plugins/mailmbox/plugin_gtk.c:324 src/plugins/rssyl/rssyl_cb_menu.c:237
+#: src/plugins/vcalendar/vcal_folder.c:1951
 msgid "Delete folder"
 msgstr "Odstrániť zložku"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "+Delete _folder only"
 msgstr "+Odstrániť _len zložku"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "Delete folder and _addresses"
 msgstr "Odstrániť zložku i _adresy"
 
-#: src/addressbook.c:2944
+#: src/addressbook.c:2933
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -885,7 +736,7 @@ msgstr ""
 "Chcete odstrániť „%s”?\n"
 "Adresy, ktoré obsahuje, nebudú stratené."
 
-#: src/addressbook.c:2951
+#: src/addressbook.c:2940
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -894,28 +745,28 @@ msgstr ""
 "Chcete odstrániť „%s”?\n"
 "Adresy, ktoré obsahuje, budú stratené."
 
-#: src/addressbook.c:3065
+#: src/addressbook.c:3054
 #, c-format
 msgid "Search '%s'"
 msgstr "Hľadať „%s”"
 
-#: src/addressbook.c:3203 src/addressbook.c:3253
+#: src/addressbook.c:3192 src/addressbook.c:3242
 msgid "New Contacts"
 msgstr "Nové kontakty"
 
-#: src/addressbook.c:4035
+#: src/addressbook.c:4024
 msgid "New user, could not save index file."
 msgstr "Nový používateľ, nemožno uložiť indexový súbor."
 
-#: src/addressbook.c:4039
+#: src/addressbook.c:4028
 msgid "New user, could not save address book files."
 msgstr "Nový používateľ, nemožno uložiť súbory adresára."
 
-#: src/addressbook.c:4049
+#: src/addressbook.c:4038
 msgid "Old address book converted successfully."
 msgstr "Konverzia starého adresára prebehla úspešne."
 
-#: src/addressbook.c:4054
+#: src/addressbook.c:4043
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -923,7 +774,7 @@ msgstr ""
 "Konverzia starého adresára je dokončená,\n"
 "nemožno uložiť indexový súbor nového adresára."
 
-#: src/addressbook.c:4067
+#: src/addressbook.c:4056
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -931,7 +782,7 @@ msgstr ""
 "Nemožno konvertovať starý adresár,\n"
 "ale boli vytvorené prázdne súbory nového adresára."
 
-#: src/addressbook.c:4073
+#: src/addressbook.c:4062
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -939,7 +790,7 @@ msgstr ""
 "Nemožno konvertovať starý adresár,\n"
 "nemožno an vytvoriť indexový súbor nového adresára."
 
-#: src/addressbook.c:4078
+#: src/addressbook.c:4067
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -947,53 +798,53 @@ msgstr ""
 "Nemožno konvertovať starý adresár\n"
 "a nemožno ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:4085 src/addressbook.c:4091
+#: src/addressbook.c:4074 src/addressbook.c:4080
 msgid "Addressbook conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:4198
+#: src/addressbook.c:4187
 msgid "Addressbook Error"
 msgstr "Chyba v adresári"
 
-#: src/addressbook.c:4199
+#: src/addressbook.c:4188
 msgid "Could not read address index"
 msgstr "Nemožno načítať zoznam adries"
 
-#: src/addressbook.c:4530
+#: src/addressbook.c:4519
 msgid "Busy searching..."
 msgstr "Prehľadávam…"
 
-#: src/addressbook.c:4833
+#: src/addressbook.c:4822
 msgid "Interface"
 msgstr "Ovládanie"
 
-#: src/addressbook.c:4845 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
+#: src/addressbook.c:4834 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
 #: src/expldifdlg.c:388 src/exporthtml.c:984 src/importldif.c:657
 msgid "Address Book"
 msgstr "Adresár"
 
-#: src/addressbook.c:4857
+#: src/addressbook.c:4846
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:4893 src/exporthtml.c:884 src/folderview.c:338
-#: src/folderview.c:426 src/prefs_account.c:2746 src/prefs_folder_column.c:78
+#: src/addressbook.c:4882 src/exporthtml.c:884 src/folderview.c:338
+#: src/folderview.c:426 src/prefs_account.c:2738 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Zložka"
 
-#: src/addressbook.c:4905
+#: src/addressbook.c:4894
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4917 src/addressbook.c:4929
+#: src/addressbook.c:4906 src/addressbook.c:4918
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4941
+#: src/addressbook.c:4930
 msgid "LDAP servers"
 msgstr "LDAP servery"
 
-#: src/addressbook.c:4953
+#: src/addressbook.c:4942
 msgid "LDAP Query"
 msgstr "LDAP požiadavka"
 
@@ -1008,9 +859,9 @@ msgstr "LDAP požiadavka"
 #: src/plugins/spamassassin/spamassassin_gtk.c:443
 #: src/plugins/spamassassin/spamassassin_gtk.c:490
 #: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:672
-#: src/prefs_matcher.c:707 src/prefs_matcher.c:1601 src/prefs_matcher.c:1608
-#: src/prefs_matcher.c:1616 src/prefs_matcher.c:1618 src/prefs_matcher.c:2498
-#: src/prefs_matcher.c:2502
+#: src/prefs_matcher.c:707 src/prefs_matcher.c:1607 src/prefs_matcher.c:1614
+#: src/prefs_matcher.c:1622 src/prefs_matcher.c:1624 src/prefs_matcher.c:2504
+#: src/prefs_matcher.c:2508
 msgid "Any"
 msgstr "Všetky"
 
@@ -1063,7 +914,7 @@ msgstr "Spracovať tieto poštové hlavičky"
 msgid "Include subfolders"
 msgstr "Zahrnúť podzložky"
 
-#: src/addrgather.c:456 src/prefs_filtering_action.c:1423
+#: src/addrgather.c:456 src/prefs_filtering_action.c:1425
 msgid "Header Name"
 msgstr "Názov hlavičky"
 
@@ -1145,18 +996,19 @@ msgstr "Cesta k adresáru"
 msgid "Delete address"
 msgstr "Zmazať adresu"
 
-#: src/alertpanel.c:146 src/compose.c:9160
+#: src/alertpanel.c:146 src/compose.c:9217
 msgid "Notice"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:159 src/compose.c:5556 src/compose.c:6022
-#: src/compose.c:11468 src/messageview.c:874 src/messageview.c:887
+#: src/alertpanel.c:159 src/compose.c:5597 src/compose.c:6063
+#: src/compose.c:11533 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:852 src/messageview.c:865
 #: src/plugins/pgpcore/sgpgme.c:706 src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4869
+#: src/summaryview.c:4865
 msgid "Warning"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5497 src/inc.c:666
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5538 src/inc.c:652
 #: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:246
 msgid "Error"
 msgstr "Chyba"
@@ -1429,660 +1281,664 @@ msgstr "<chýba v certifikáte>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Predmet vymazaný regulárnym výrazom)"
 
-#: src/common/utils.c:371
+#: src/common/utils.c:362
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
-#: src/common/utils.c:372
+#: src/common/utils.c:363
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dKB"
 
-#: src/common/utils.c:373
+#: src/common/utils.c:364
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMB"
 
-#: src/common/utils.c:374
+#: src/common/utils.c:365
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4974
+#: src/common/utils.c:4946
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: src/common/utils.c:4975
+#: src/common/utils.c:4947
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Pondelok"
 
-#: src/common/utils.c:4976
+#: src/common/utils.c:4948
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: src/common/utils.c:4977
+#: src/common/utils.c:4949
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Streda"
 
-#: src/common/utils.c:4978
+#: src/common/utils.c:4950
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: src/common/utils.c:4979
+#: src/common/utils.c:4951
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Piatok"
 
-#: src/common/utils.c:4980
+#: src/common/utils.c:4952
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/common/utils.c:4982
+#: src/common/utils.c:4954
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Január"
 
-#: src/common/utils.c:4983
+#: src/common/utils.c:4955
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Február"
 
-#: src/common/utils.c:4984
+#: src/common/utils.c:4956
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marec"
 
-#: src/common/utils.c:4985
+#: src/common/utils.c:4957
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Apríl"
 
-#: src/common/utils.c:4986
+#: src/common/utils.c:4958
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Máj"
 
-#: src/common/utils.c:4987
+#: src/common/utils.c:4959
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Jún"
 
-#: src/common/utils.c:4988
+#: src/common/utils.c:4960
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Júl"
 
-#: src/common/utils.c:4989
+#: src/common/utils.c:4961
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "August"
 
-#: src/common/utils.c:4990
+#: src/common/utils.c:4962
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "September"
 
-#: src/common/utils.c:4991
+#: src/common/utils.c:4963
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Október"
 
-#: src/common/utils.c:4992
+#: src/common/utils.c:4964
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "November"
 
-#: src/common/utils.c:4993
+#: src/common/utils.c:4965
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "December"
 
-#: src/common/utils.c:4995
+#: src/common/utils.c:4967
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Ne"
 
-#: src/common/utils.c:4996
+#: src/common/utils.c:4968
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Po"
 
-#: src/common/utils.c:4997
+#: src/common/utils.c:4969
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Ut"
 
-#: src/common/utils.c:4998
+#: src/common/utils.c:4970
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "St"
 
-#: src/common/utils.c:4999
+#: src/common/utils.c:4971
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Št"
 
-#: src/common/utils.c:5000
+#: src/common/utils.c:4972
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Pi"
 
-#: src/common/utils.c:5001
+#: src/common/utils.c:4973
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "So"
 
-#: src/common/utils.c:5003
+#: src/common/utils.c:4975
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:5004
+#: src/common/utils.c:4976
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:5005
+#: src/common/utils.c:4977
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:5006
+#: src/common/utils.c:4978
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Apr"
 
-#: src/common/utils.c:5007
+#: src/common/utils.c:4979
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Máj"
 
-#: src/common/utils.c:5008
+#: src/common/utils.c:4980
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jún"
 
-#: src/common/utils.c:5009
+#: src/common/utils.c:4981
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Júl"
 
-#: src/common/utils.c:5010
+#: src/common/utils.c:4982
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aug"
 
-#: src/common/utils.c:5011
+#: src/common/utils.c:4983
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:5012
+#: src/common/utils.c:4984
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Okt"
 
-#: src/common/utils.c:5013
+#: src/common/utils.c:4985
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:5014
+#: src/common/utils.c:4986
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dec"
 
-#: src/common/utils.c:5025
+#: src/common/utils.c:4997
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "DOP"
 
-#: src/common/utils.c:5026
+#: src/common/utils.c:4998
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "ODP"
 
-#: src/common/utils.c:5027
+#: src/common/utils.c:4999
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "dop."
 
-#: src/common/utils.c:5028
+#: src/common/utils.c:5000
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "odp."
 
-#: src/common/utils.c:5035
+#: src/common/utils.c:5007
 msgctxt "For use by strftime (default date+time format)"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %e. %b %H:%M:%S %Y"
 
-#: src/common/utils.c:5036
+#: src/common/utils.c:5008
 msgctxt "For use by strftime (default date format)"
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: src/common/utils.c:5037
+#: src/common/utils.c:5009
 msgctxt "For use by strftime (default time format)"
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
-#: src/common/utils.c:5039
+#: src/common/utils.c:5011
 msgctxt "For use by strftime (default 12-hour time format)"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
-#: src/compose.c:565
+#: src/compose.c:567
 msgid "_Add..."
 msgstr "_Pridať…"
 
-#: src/compose.c:566 src/mh_gtk.c:361 src/plugins/mailmbox/plugin_gtk.c:293
+#: src/compose.c:568 src/mh_gtk.c:361 src/plugins/mailmbox/plugin_gtk.c:293
 #: src/plugins/rssyl/rssyl_cb_menu.c:140
 msgid "_Remove"
 msgstr "_Odstrániť"
 
-#: src/compose.c:568 src/folderview.c:234
+#: src/compose.c:570 src/folderview.c:234
 msgid "_Properties..."
 msgstr "_Vlastnosti…"
 
-#: src/compose.c:575 src/mainwindow.c:506 src/messageview.c:213
+#: src/compose.c:577 src/mainwindow.c:506 src/messageview.c:211
 msgid "_Message"
 msgstr "Sp_ráva"
 
-#: src/compose.c:578
+#: src/compose.c:580
 msgid "_Spelling"
 msgstr "P_ravopis"
 
-#: src/compose.c:580 src/compose.c:646
+#: src/compose.c:582 src/compose.c:649
 msgid "_Options"
 msgstr "_Možnosti"
 
-#: src/compose.c:584
+#: src/compose.c:586
 msgid "S_end"
 msgstr "Odos_lať"
 
-#: src/compose.c:585
+#: src/compose.c:587
 msgid "Send _later"
 msgstr "Odoslať _neskôr"
 
-#: src/compose.c:588
+#: src/compose.c:590
 msgid "_Attach file"
 msgstr "Pripojiť sú_bor"
 
-#: src/compose.c:589
+#: src/compose.c:591
 msgid "_Insert file"
 msgstr "Vlož_iť súbor"
 
-#: src/compose.c:590
+#: src/compose.c:592
 msgid "Insert si_gnature"
 msgstr "Vložiť _podpis"
 
-#: src/compose.c:594
+#: src/compose.c:593
+msgid "_Replace signature"
+msgstr "Nah_radiť podpis"
+
+#: src/compose.c:597
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: src/compose.c:599
+#: src/compose.c:602
 msgid "_Undo"
 msgstr "_Späť"
 
-#: src/compose.c:600
+#: src/compose.c:603
 msgid "_Redo"
 msgstr "_Znova"
 
-#: src/compose.c:603
+#: src/compose.c:606
 msgid "Cu_t"
 msgstr "_Vystrihnúť"
 
-#: src/compose.c:607
+#: src/compose.c:610
 msgid "_Special paste"
 msgstr "Prilepiť _špeciálne"
 
-#: src/compose.c:608
+#: src/compose.c:611
 msgid "As _quotation"
 msgstr "Ako _citácia"
 
-#: src/compose.c:609
+#: src/compose.c:612
 msgid "_Wrapped"
 msgstr "_Zalomené"
 
-#: src/compose.c:610
+#: src/compose.c:613
 msgid "_Unwrapped"
 msgstr "_Nezalomené"
 
-#: src/compose.c:612 src/mainwindow.c:539
+#: src/compose.c:615 src/mainwindow.c:539
 msgid "Select _all"
 msgstr "Vy_brať všetko"
 
-#: src/compose.c:614
+#: src/compose.c:617
 msgid "A_dvanced"
 msgstr "_Rozšírené"
 
-#: src/compose.c:615
+#: src/compose.c:618
 msgid "Move a character backward"
 msgstr "Presunúť o znak dozadu"
 
-#: src/compose.c:616
+#: src/compose.c:619
 msgid "Move a character forward"
 msgstr "Presunúť o znak dopredu"
 
-#: src/compose.c:617
+#: src/compose.c:620
 msgid "Move a word backward"
 msgstr "Presunúť o slovo dozadu"
 
-#: src/compose.c:618
+#: src/compose.c:621
 msgid "Move a word forward"
 msgstr "Presunúť o slovo dopredu"
 
-#: src/compose.c:619
+#: src/compose.c:622
 msgid "Move to beginning of line"
 msgstr "Presunúť na začiatok riadku"
 
-#: src/compose.c:620
+#: src/compose.c:623
 msgid "Move to end of line"
 msgstr "Presunúť na koniec riadku"
 
-#: src/compose.c:621
+#: src/compose.c:624
 msgid "Move to previous line"
 msgstr "Presunúť na predchádzajúci riadok"
 
-#: src/compose.c:622
+#: src/compose.c:625
 msgid "Move to next line"
 msgstr "Presunúť na ďalší riadok"
 
-#: src/compose.c:623
+#: src/compose.c:626
 msgid "Delete a character backward"
 msgstr "Zmazať znak naľavo od kurzora"
 
-#: src/compose.c:624
+#: src/compose.c:627
 msgid "Delete a character forward"
 msgstr "Zmazať znak napravo od kurzora"
 
-#: src/compose.c:625
+#: src/compose.c:628
 msgid "Delete a word backward"
 msgstr "Zmazať slovo naľavo od kurzora"
 
-#: src/compose.c:626
+#: src/compose.c:629
 msgid "Delete a word forward"
 msgstr "Zmazať slovo napravo od kurzora"
 
-#: src/compose.c:627
+#: src/compose.c:630
 msgid "Delete line"
 msgstr "Zmazať riadok"
 
-#: src/compose.c:628
+#: src/compose.c:631
 msgid "Delete to end of line"
 msgstr "Zmazať do konca riadku"
 
-#: src/compose.c:631 src/messageview.c:230
+#: src/compose.c:634 src/messageview.c:228
 msgid "_Find"
 msgstr "_Hľadať"
 
-#: src/compose.c:634
+#: src/compose.c:637
 msgid "_Wrap current paragraph"
 msgstr "_Zalomiť aktuálny odsek"
 
-#: src/compose.c:635
+#: src/compose.c:638
 msgid "Wrap all long _lines"
 msgstr "Zalomiť všetky d_lhé riadky"
 
-#: src/compose.c:637
+#: src/compose.c:640
 msgid "Edit with e_xternal editor"
 msgstr "Upraviť pomocou e_xterného editora"
 
-#: src/compose.c:640
+#: src/compose.c:643
 msgid "_Check all or check selection"
 msgstr "_Skontrolovať všetko alebo výber"
 
-#: src/compose.c:641
+#: src/compose.c:644
 msgid "_Highlight all misspelled words"
 msgstr "_Zvýrazniť všetky nesprávne slová"
 
-#: src/compose.c:642
+#: src/compose.c:645
 msgid "Check _backwards misspelled word"
 msgstr "S_pätne skontrolovať nesprávne slovo"
 
-#: src/compose.c:643
+#: src/compose.c:646
 msgid "_Forward to next misspelled word"
 msgstr "_Dopredu na ďalšie nesprávne slovo"
 
-#: src/compose.c:651
+#: src/compose.c:654
 msgid "Reply _mode"
 msgstr "Reži_m odpovede"
 
-#: src/compose.c:653
+#: src/compose.c:656
 msgid "Privacy _System"
 msgstr "_Súkromie"
 
-#: src/compose.c:658
+#: src/compose.c:661
 msgid "_Priority"
 msgstr "Pri_orita"
 
-#: src/compose.c:660 src/mainwindow.c:603 src/messageview.c:266
+#: src/compose.c:663 src/mainwindow.c:603 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "_Kódovanie znakov"
 
-#: src/compose.c:665 src/mainwindow.c:608 src/messageview.c:271
+#: src/compose.c:668 src/mainwindow.c:608 src/messageview.c:269
 msgid "Western European"
 msgstr "Západná Európa (ISO-8859-1)"
 
-#: src/compose.c:666 src/mainwindow.c:609 src/messageview.c:272
+#: src/compose.c:669 src/mainwindow.c:609 src/messageview.c:270
 msgid "Baltic"
 msgstr "Pobaltské"
 
-#: src/compose.c:667 src/mainwindow.c:610 src/messageview.c:273
+#: src/compose.c:670 src/mainwindow.c:610 src/messageview.c:271
 msgid "Hebrew"
 msgstr "Hebrejské"
 
-#: src/compose.c:668 src/mainwindow.c:611 src/messageview.c:274
+#: src/compose.c:671 src/mainwindow.c:611 src/messageview.c:272
 msgid "Arabic"
 msgstr "Arabské"
 
-#: src/compose.c:669 src/mainwindow.c:612 src/messageview.c:275
+#: src/compose.c:672 src/mainwindow.c:612 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "Cyrilika"
 
-#: src/compose.c:670 src/mainwindow.c:613 src/messageview.c:276
+#: src/compose.c:673 src/mainwindow.c:613 src/messageview.c:274
 msgid "Japanese"
 msgstr "Japonské"
 
-#: src/compose.c:671 src/mainwindow.c:614 src/messageview.c:277
+#: src/compose.c:674 src/mainwindow.c:614 src/messageview.c:275
 msgid "Chinese"
 msgstr "Čínske"
 
-#: src/compose.c:672 src/mainwindow.c:615 src/messageview.c:278
+#: src/compose.c:675 src/mainwindow.c:615 src/messageview.c:276
 msgid "Korean"
 msgstr "Kórejské"
 
-#: src/compose.c:673 src/mainwindow.c:616 src/messageview.c:279
+#: src/compose.c:676 src/mainwindow.c:616 src/messageview.c:277
 msgid "Thai"
 msgstr "Thajské"
 
-#: src/compose.c:676 src/mainwindow.c:723 src/messageview.c:315
+#: src/compose.c:679 src/mainwindow.c:723 src/messageview.c:313
 msgid "_Address book"
 msgstr "_Adresár"
 
-#: src/compose.c:678
+#: src/compose.c:681
 msgid "_Template"
 msgstr "Šabló_na"
 
-#: src/compose.c:680 src/mainwindow.c:751 src/messageview.c:336
+#: src/compose.c:683 src/mainwindow.c:751 src/messageview.c:334
 msgid "Actio_ns"
 msgstr "A_kcie"
 
-#: src/compose.c:689
+#: src/compose.c:692
 msgid "Aut_o wrapping"
 msgstr "Aut_omatické zalamovanie"
 
-#: src/compose.c:690
+#: src/compose.c:693
 msgid "Auto _indent"
 msgstr "Automatické odsaden_ie"
 
-#: src/compose.c:691
+#: src/compose.c:694
 msgid "Si_gn"
 msgstr "Podpí_sať"
 
-#: src/compose.c:692
+#: src/compose.c:695
 msgid "_Encrypt"
 msgstr "_Šifrovať"
 
-#: src/compose.c:693
+#: src/compose.c:696
 msgid "_Request Return Receipt"
 msgstr "Vyžiadať potv_rdenie o prijatí"
 
-#: src/compose.c:694
+#: src/compose.c:697
 msgid "Remo_ve references"
 msgstr "_Odstrániť odkazy"
 
-#: src/compose.c:695
+#: src/compose.c:698
 msgid "Show _ruler"
 msgstr "Zobraziť p_ravítko"
 
-#: src/compose.c:700 src/compose.c:710
+#: src/compose.c:703 src/compose.c:713
 msgid "_Normal"
 msgstr "_Normálny"
 
-#: src/compose.c:701 src/mainwindow.c:657 src/messageview.c:304
+#: src/compose.c:704 src/mainwindow.c:657 src/messageview.c:302
 msgid "_All"
 msgstr "_Všetkým"
 
-#: src/compose.c:702 src/mainwindow.c:658 src/messageview.c:305
+#: src/compose.c:705 src/mainwindow.c:658 src/messageview.c:303
 msgid "_Sender"
 msgstr "Odo_sielateľ"
 
-#: src/compose.c:703
+#: src/compose.c:706
 msgid "_Mailing-list"
 msgstr "E_mailová konferencia"
 
-#: src/compose.c:708
+#: src/compose.c:711
 msgid "_Highest"
 msgstr "_Najvyššia"
 
-#: src/compose.c:709
+#: src/compose.c:712
 msgid "Hi_gh"
 msgstr "_Vysoká"
 
-#: src/compose.c:711
+#: src/compose.c:714
 msgid "Lo_w"
 msgstr "_Nízka"
 
-#: src/compose.c:712
+#: src/compose.c:715
 msgid "_Lowest"
 msgstr "Na_jnižšia"
 
-#: src/compose.c:717 src/mainwindow.c:867 src/messageview.c:353
+#: src/compose.c:720 src/mainwindow.c:865 src/messageview.c:351
 msgid "_Automatic"
 msgstr "_Automaticky"
 
-#: src/compose.c:718 src/mainwindow.c:868 src/messageview.c:354
+#: src/compose.c:721 src/mainwindow.c:866 src/messageview.c:352
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:719 src/mainwindow.c:869 src/messageview.c:355
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:353
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:723 src/mainwindow.c:873 src/messageview.c:359
+#: src/compose.c:726 src/mainwindow.c:871 src/messageview.c:357
 msgid "Central European (ISO-8859-_2)"
 msgstr "Stredná Európa (ISO-8859-_2)"
 
-#: src/compose.c:726 src/mainwindow.c:876 src/messageview.c:362
+#: src/compose.c:729 src/mainwindow.c:874 src/messageview.c:360
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grécke (ISO-8859-_7)"
 
-#: src/compose.c:731 src/mainwindow.c:881 src/messageview.c:367
+#: src/compose.c:734 src/mainwindow.c:879 src/messageview.c:365
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turecké (ISO-8859-_9)"
 
-#: src/compose.c:1034
+#: src/compose.c:1062
 msgid "New message From format error."
 msgstr "Chyba v tvare odosielateľa novej správy."
 
-#: src/compose.c:1126
+#: src/compose.c:1154
 msgid "New message subject format error."
 msgstr "Chyba v tvare predmetu novej správy."
 
-#: src/compose.c:1157 src/quote_fmt.c:563
+#: src/compose.c:1185 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "V tele šablóny „Nová správa” je chyba na riadku %d."
 
-#: src/compose.c:1413
+#: src/compose.c:1439
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Nemožno odpovedať. Pôvodná správa už asi neexistuje."
 
-#: src/compose.c:1596 src/quote_fmt.c:580
+#: src/compose.c:1622 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr "Pole „Od” šablóny „Odpovedať” obsahuje neplatnú emailovú adresu."
 
-#: src/compose.c:1644 src/quote_fmt.c:583
+#: src/compose.c:1670 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "V tele šablóny „Odpovedať” je chyba na riadku %d."
 
-#: src/compose.c:1780 src/compose.c:1972 src/quote_fmt.c:600
+#: src/compose.c:1806 src/compose.c:1998 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "Pole „Od” šablóny „Poslať ďalej” obsahuje neplatnú emailovú adresu."
 
-#: src/compose.c:1840 src/quote_fmt.c:603
+#: src/compose.c:1866 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "V tele šablóny „Poslať ďalej” je chyba na riadku %d."
 
-#: src/compose.c:2014
+#: src/compose.c:2040
 msgid "Fw: multiple emails"
 msgstr "Fw: viacero správ"
 
-#: src/compose.c:2456
+#: src/compose.c:2482
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "V tele šablóny „Presmerovať” je chyba na riadku %d."
 
-#: src/compose.c:2522 src/gtk/headers.h:13
+#: src/compose.c:2549 src/gtk/headers.h:13
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/compose.c:2525 src/gtk/headers.h:14
+#: src/compose.c:2552 src/gtk/headers.h:14
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
-#: src/compose.c:2528 src/gtk/headers.h:11
+#: src/compose.c:2555 src/gtk/headers.h:11
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
-#: src/compose.c:2531 src/compose.c:4818 src/compose.c:4820
+#: src/compose.c:2558 src/compose.c:4854 src/compose.c:4856
 #: src/gtk/headers.h:32
 msgid "Newsgroups:"
 msgstr "Diskusné skupiny:"
 
-#: src/compose.c:2534 src/gtk/headers.h:33
+#: src/compose.c:2561 src/gtk/headers.h:33
 msgid "Followup-To:"
 msgstr "Pokračovanie:"
 
-#: src/compose.c:2537 src/gtk/headers.h:16
+#: src/compose.c:2564 src/gtk/headers.h:16
 msgid "In-Reply-To:"
 msgstr "V odpovedi komu:"
 
-#: src/compose.c:2541 src/compose.c:4815 src/compose.c:4823
-#: src/gtk/headers.h:12 src/summary_search.c:419
+#: src/compose.c:2568 src/compose.c:4851 src/compose.c:4859
+#: src/gtk/headers.h:12 src/summary_search.c:445
 msgid "To:"
 msgstr "Komu:"
 
-#: src/compose.c:2747
+#: src/compose.c:2774
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Nemožno priložiť súbor (zlyhala konverzia kódovania)."
 
-#: src/compose.c:2753
+#: src/compose.c:2780
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2100,64 +1956,64 @@ msgstr[2] ""
 "Nasledujúce súbory budú priložené:\n"
 "%s"
 
-#: src/compose.c:3026
+#: src/compose.c:3053
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "„Značka citácie” šablóny nie je platná."
 
-#: src/compose.c:3514
+#: src/compose.c:3542
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Nemožno zistiť veľkosť súboru „%s”."
 
-#: src/compose.c:3525
+#: src/compose.c:3553
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr "Do tela správy vkladáte súbor %s. Ste si istý, že to chcete urobiť?"
 
-#: src/compose.c:3528
+#: src/compose.c:3556
 msgid "Are you sure?"
 msgstr "Ste si istý?"
 
-#: src/compose.c:3529 src/compose.c:10962
+#: src/compose.c:3557 src/compose.c:11027
 msgid "+_Insert"
 msgstr "+_Vložiť"
 
-#: src/compose.c:3639
+#: src/compose.c:3672
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:3643
+#: src/compose.c:3676
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemožno čítať %s."
 
-#: src/compose.c:3670
+#: src/compose.c:3703
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:4658 src/plugins/python/composewindowtype.c:428
+#: src/compose.c:4691 src/plugins/python/composewindowtype.c:432
 msgid " [Edited]"
 msgstr "[Upravené]"
 
-#: src/compose.c:4665 src/plugins/python/composewindowtype.c:431
+#: src/compose.c:4698 src/plugins/python/composewindowtype.c:435
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:4668 src/plugins/python/composewindowtype.c:434
+#: src/compose.c:4701 src/plugins/python/composewindowtype.c:438
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[bez názvu] - Písanie správy%s"
 
-#: src/compose.c:4670 src/plugins/python/composewindowtype.c:422
+#: src/compose.c:4703 src/plugins/python/composewindowtype.c:426
 msgid "Compose message"
 msgstr "Napísať správu"
 
-#: src/compose.c:4697 src/messageview.c:909
+#: src/compose.c:4730 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2165,51 +2021,51 @@ msgstr ""
 "Nie je zadaný účet na odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštový účet."
 
-#: src/compose.c:4914 src/compose.c:4946 src/compose.c:4988
-#: src/plugins/attachwarner/attachwarner.c:219 src/prefs_account.c:3245
-#: src/toolbar.c:404 src/toolbar.c:422
+#: src/compose.c:4950 src/compose.c:4982 src/compose.c:5024
+#: src/plugins/attachwarner/attachwarner.c:219 src/prefs_account.c:3237
+#: src/toolbar.c:405 src/toolbar.c:423
 msgid "Send"
 msgstr "Odoslať"
 
-#: src/compose.c:4915
+#: src/compose.c:4951
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Jediný príjemca je prednastavená adresa Kópie. Odoslať i tak?"
 
-#: src/compose.c:4916 src/compose.c:4948 src/compose.c:4981 src/compose.c:5497
+#: src/compose.c:4952 src/compose.c:4984 src/compose.c:5017 src/compose.c:5538
 #: src/plugins/attachwarner/attachwarner.c:211
 msgid "+_Send"
 msgstr "+_Odoslať"
 
-#: src/compose.c:4947
+#: src/compose.c:4983
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Jediný príjemca je prednastavená adresa Skrytej kópie. Odoslať i tak?"
 
-#: src/compose.c:4964
+#: src/compose.c:5000
 msgid "Recipient is not specified."
 msgstr "Nie je zadaný príjemca."
 
-#: src/compose.c:4983 src/plugins/attachwarner/attachwarner.c:213
+#: src/compose.c:5019 src/plugins/attachwarner/attachwarner.c:213
 msgid "+_Queue"
 msgstr "+Do _fronty"
 
-#: src/compose.c:4984
+#: src/compose.c:5020
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Prázdny predmet. %s"
 
-#: src/compose.c:4985
+#: src/compose.c:5021
 msgid "Send it anyway?"
 msgstr "Poslať i tak?"
 
-#: src/compose.c:4986
+#: src/compose.c:5022
 msgid "Queue it anyway?"
 msgstr "Zaradiť do fronty i tak?"
 
-#: src/compose.c:4988 src/toolbar.c:423
+#: src/compose.c:5024 src/toolbar.c:424
 msgid "Send later"
 msgstr "Odoslať ho neskôr"
 
-#: src/compose.c:5036 src/compose.c:9585
+#: src/compose.c:5077 src/compose.c:9643
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2219,7 +2075,7 @@ msgstr ""
 "\n"
 "Zlyhala konverzia kódovania."
 
-#: src/compose.c:5039 src/compose.c:9588
+#: src/compose.c:5080 src/compose.c:9646
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2229,7 +2085,7 @@ msgstr ""
 "\n"
 "Nie je dostupný šifrovací kľúč príjemcu."
 
-#: src/compose.c:5045 src/compose.c:9582
+#: src/compose.c:5086 src/compose.c:9640
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2240,7 +2096,7 @@ msgstr ""
 "\n"
 "Podpísanie zlyhalo: %s"
 
-#: src/compose.c:5048
+#: src/compose.c:5089
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2251,11 +2107,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5050
+#: src/compose.c:5091
 msgid "Could not queue message for sending."
 msgstr "Nemožno zaradiť správu do fronty na odoslanie."
 
-#: src/compose.c:5065 src/compose.c:5125
+#: src/compose.c:5106 src/compose.c:5166
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2263,7 +2119,7 @@ msgstr ""
 "Správa bola zaradená do fronty, ale nebolo ju možné odoslať.\n"
 "Použite „Odoslať správy vo fronte” z hlavného okna na opakovanie."
 
-#: src/compose.c:5121
+#: src/compose.c:5162
 #, c-format
 msgid ""
 "%s\n"
@@ -2272,7 +2128,7 @@ msgstr ""
 "%s\n"
 "Použite „Odoslať správy vo fronte” z hlavného okna na opakovanie."
 
-#: src/compose.c:5494
+#: src/compose.c:5535
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2283,7 +2139,7 @@ msgstr ""
 "kódovania na %s.\n"
 "Odoslať správu v kódovaní %s?"
 
-#: src/compose.c:5552
+#: src/compose.c:5593
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2296,67 +2152,67 @@ msgstr ""
 "\n"
 "Odoslať aj tak?"
 
-#: src/compose.c:5733
+#: src/compose.c:5774
 msgid "Encryption warning"
 msgstr "Upozornenie šifrovania"
 
-#: src/compose.c:5734
+#: src/compose.c:5775
 msgid "+C_ontinue"
 msgstr "+_Pokračovať"
 
-#: src/compose.c:5783
+#: src/compose.c:5824
 msgid "No account for sending mails available!"
 msgstr "Nie je dostupné žiadny účet na odosielanie správ!"
 
-#: src/compose.c:5792
+#: src/compose.c:5833
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Zvolený účet nie je NNTP: Posielanie nie je možné."
 
-#: src/compose.c:6021
+#: src/compose.c:6062
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Príloha %s už neexistuje. Ignorovať?"
 
-#: src/compose.c:6022 src/mainwindow.c:648 src/toolbar.c:229
-#: src/toolbar.c:2181
+#: src/compose.c:6063 src/mainwindow.c:648 src/toolbar.c:230
+#: src/toolbar.c:2182
 msgid "Cancel sending"
 msgstr "Zrušiť posielanie"
 
-#: src/compose.c:6022
+#: src/compose.c:6063
 msgid "Ignore attachment"
 msgstr "Ignorovať prílohu"
 
-#: src/compose.c:6061
+#: src/compose.c:6102
 #, c-format
 msgid "Original %s part"
 msgstr "Pôvodná časť %s"
 
-#: src/compose.c:6592
+#: src/compose.c:6681
 msgid "Add to address _book"
 msgstr "Pridať do _adresára"
 
-#: src/compose.c:6748
+#: src/compose.c:6837
 msgid "Delete entry contents"
 msgstr "Zmazať obsah položiek"
 
-#: src/compose.c:6752 src/plugins/vcalendar/vcal_meeting_gtk.c:295
+#: src/compose.c:6841 src/plugins/vcalendar/vcal_meeting_gtk.c:295
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Na automatické doplnenie z adresára použite <TAB>"
 
-#: src/compose.c:6972
+#: src/compose.c:7061
 msgid "Mime type"
 msgstr "Typ MIME"
 
-#: src/compose.c:6978 src/mimeview.c:283 src/plugins/pgpcore/select-keys.c:396
+#: src/compose.c:7067 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:392
 #: src/prefs_matcher.c:627 src/prefs_summary_column.c:85 src/summaryview.c:447
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:7048
+#: src/compose.c:7130
 msgid "Save Message to "
 msgstr "Uložiť správu do "
 
-#: src/compose.c:7081 src/editjpilot.c:276 src/editldap.c:520
+#: src/compose.c:7167 src/editjpilot.c:276 src/editldap.c:520
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1028
 #: src/plugins/bogofilter/bogofilter_gtk.c:188
@@ -2367,24 +2223,24 @@ msgstr "Uložiť správu do "
 msgid "_Browse"
 msgstr "_Prechádzať"
 
-#: src/compose.c:7569
+#: src/compose.c:7643
 msgid "Hea_der"
 msgstr "H_lavička"
 
-#: src/compose.c:7574
+#: src/compose.c:7648
 msgid "_Attachments"
 msgstr "_Prílohy"
 
-#: src/compose.c:7588
+#: src/compose.c:7662
 msgid "Othe_rs"
 msgstr "_Ostatné"
 
-#: src/compose.c:7603 src/gtk/headers.h:18
-#: src/plugins/pdf_viewer/poppler_viewer.c:704 src/summary_search.c:426
+#: src/compose.c:7677 src/gtk/headers.h:18
+#: src/plugins/pdf_viewer/poppler_viewer.c:704 src/summary_search.c:452
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: src/compose.c:7830
+#: src/compose.c:7891
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2393,20 +2249,20 @@ msgstr ""
 "Nemožno spustiť kontrolu preklepov.\n"
 "%s"
 
-#: src/compose.c:7943
+#: src/compose.c:8000
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Od: <i>%s</i>"
 
-#: src/compose.c:7977
+#: src/compose.c:8034
 msgid "Account to use for this email"
 msgstr "Účet, použitý pre tento email"
 
-#: src/compose.c:7979
+#: src/compose.c:8036
 msgid "Sender address to be used"
 msgstr "Adresa odosielateľa"
 
-#: src/compose.c:8143
+#: src/compose.c:8200
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2415,64 +2271,64 @@ msgstr ""
 "Nemožno načítať systém súkromia „%s”. Nebude možné podpísať ani zašifrovať "
 "túto správu."
 
-#: src/compose.c:8243 src/plugins/archive/archiver_gtk.c:1082
+#: src/compose.c:8300 src/plugins/archive/archiver_gtk.c:1082
 msgid "_None"
 msgstr "Žiad_na"
 
-#: src/compose.c:8344 src/prefs_template.c:749
+#: src/compose.c:8401 src/prefs_template.c:753
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Telo šablóny má chybu v riadku %d."
 
-#: src/compose.c:8460
+#: src/compose.c:8517
 msgid "Template From format error."
 msgstr "Chyba v tvare hlavičky odosielateľa v šablóne."
 
-#: src/compose.c:8478
+#: src/compose.c:8535
 msgid "Template To format error."
 msgstr "Chyba v tvare hlavičky príjemcu v šablóne."
 
-#: src/compose.c:8496
+#: src/compose.c:8553
 msgid "Template Cc format error."
 msgstr "Chyba v tvare hlavičky kópie v šablóne."
 
-#: src/compose.c:8514
+#: src/compose.c:8571
 msgid "Template Bcc format error."
 msgstr "Chyba v tvare hlavičky slepej kópie v šablóne."
 
-#: src/compose.c:8533
+#: src/compose.c:8590
 msgid "Template subject format error."
 msgstr "Chyba v tvare hlavičky predmetu v šablóne."
 
-#: src/compose.c:8797
+#: src/compose.c:8854
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:8812
+#: src/compose.c:8869
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:8886
+#: src/compose.c:8943
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:8903
+#: src/compose.c:8960
 msgid "MIME type"
 msgstr "Typ MIME"
 
-#: src/compose.c:8944
+#: src/compose.c:9001
 msgid "Encoding"
 msgstr "Kódovanie"
 
-#: src/compose.c:8964
+#: src/compose.c:9021
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:8965
+#: src/compose.c:9022
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:9157
+#: src/compose.c:9214
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2483,15 +2339,15 @@ msgstr ""
 "Vynútiť ukončenie procesu?\n"
 "ID skupiny procesu: %d"
 
-#: src/compose.c:9551 src/messageview.c:1116
+#: src/compose.c:9609 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail potrebuje na odoslanie tejto správy pripojenie k sieti."
 
-#: src/compose.c:9577
+#: src/compose.c:9635
 msgid "Could not queue message."
 msgstr "Nemožno zaradiť správu do fronty na odoslanie."
 
-#: src/compose.c:9579
+#: src/compose.c:9637
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2502,15 +2358,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/compose.c:9747
+#: src/compose.c:9805
 msgid "Could not save draft."
 msgstr "Koncept nemožno uložiť."
 
-#: src/compose.c:9751
+#: src/compose.c:9809
 msgid "Could not save draft"
 msgstr "Koncept nemožno uložiť"
 
-#: src/compose.c:9752
+#: src/compose.c:9810
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2518,24 +2374,24 @@ msgstr ""
 "Koncept nemožno uložiť.\n"
 "Chcete pokračovať v písaní, alebo zahodiť rozpísanú správu?"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Cancel exit"
 msgstr "+_Zrušiť skončenie"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Discard email"
 msgstr "_Zahodiť správu"
 
-#: src/compose.c:9914 src/compose.c:9928
+#: src/compose.c:9972 src/compose.c:9986
 msgid "Select file"
 msgstr "Zvoľte súbor"
 
-#: src/compose.c:9942
+#: src/compose.c:10000
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Súbor „%s” nemožno čítať."
 
-#: src/compose.c:9944
+#: src/compose.c:10002
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2544,60 +2400,62 @@ msgstr ""
 "Súbor „%s” obsahuje neplatné znaky pre\n"
 "súčasné kódovanie, vloženie môže byť nepresné."
 
-#: src/compose.c:10016
+#: src/compose.c:10081
 msgid "Discard message"
 msgstr "Zahodiť správu"
 
-#: src/compose.c:10017
+#: src/compose.c:10082
 msgid "This message has been modified. Discard it?"
 msgstr "Táto správa bola zmenená. Zahodiť zmeny?"
 
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Discard"
 msgstr "_Zahodiť"
 
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Save to Drafts"
 msgstr "Uložiť medzi _koncepty"
 
-#: src/compose.c:10020
+#: src/compose.c:10085
 msgid "Save changes"
 msgstr "Uložiť zmeny"
 
-#: src/compose.c:10021
+#: src/compose.c:10086
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Táto správa bola zmenená. Uložiť posledné zmeny?"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "_Don't save"
 msgstr "_Neukladať"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "+_Save to Drafts"
 msgstr "+Uložiť medzi _koncepty"
 
-#: src/compose.c:10092
+#: src/compose.c:10157
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použiť šablónu „%s”?"
 
-#: src/compose.c:10094
+#: src/compose.c:10159
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:10095
+#: src/compose.c:10160 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:772 src/prefs_template.c:309 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Nahradiť"
 
-#: src/compose.c:10095
+#: src/compose.c:10160
 msgid "_Insert"
 msgstr "_Vložiť"
 
-#: src/compose.c:10959
+#: src/compose.c:11024
 msgid "Insert or attach?"
 msgstr "Vložiť, alebo pripojiť ako prílohu?"
 
-#: src/compose.c:10960
+#: src/compose.c:11025
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2605,16 +2463,16 @@ msgstr ""
 "Chcete vložiť obsah súboru do tela správy, alebo ho chcete pripojiť k správe "
 "ako prílohu?"
 
-#: src/compose.c:10962
+#: src/compose.c:11027
 msgid "_Attach"
 msgstr "_Pripojiť"
 
-#: src/compose.c:11178
+#: src/compose.c:11243
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba v tvare citácie na riadku %d."
 
-#: src/compose.c:11462
+#: src/compose.c:11527
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2645,7 +2503,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Ladiaci záznam"
 
-#: src/crash.c:252 src/toolbar.c:420
+#: src/crash.c:252 src/toolbar.c:421
 msgid "Close"
 msgstr "Zavrieť"
 
@@ -2762,41 +2620,41 @@ msgstr "_Zrušiť obrázok"
 msgid "Photo"
 msgstr "Fotografia"
 
-#: src/editaddress.c:959 src/editaddress.c:961 src/expldifdlg.c:516
+#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:516
 #: src/exporthtml.c:761 src/ldif.c:766
 msgid "Display Name"
 msgstr "Zobrazené meno"
 
-#: src/editaddress.c:968 src/editaddress.c:972 src/ldif.c:774
+#: src/editaddress.c:961 src/editaddress.c:965 src/ldif.c:774
 msgid "Last Name"
 msgstr "Priezvisko"
 
-#: src/editaddress.c:969 src/editaddress.c:971 src/ldif.c:770
+#: src/editaddress.c:962 src/editaddress.c:964 src/ldif.c:770
 msgid "First Name"
 msgstr "Krstné meno"
 
-#: src/editaddress.c:975 src/editaddress.c:977
+#: src/editaddress.c:968 src/editaddress.c:970
 msgid "Nickname"
 msgstr "Prezývka"
 
-#: src/editaddress.c:1061 src/editaddress.c:1129
+#: src/editaddress.c:1054 src/editaddress.c:1122
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1271 src/editaddress.c:1340 src/editaddress.c:1360
+#: src/editaddress.c:1264 src/editaddress.c:1333 src/editaddress.c:1353
 #: src/prefs_customheader.c:223
 msgid "Value"
 msgstr "Hodnota"
 
-#: src/editaddress.c:1427
+#: src/editaddress.c:1424
 msgid "_User Data"
 msgstr "Údaje o _používateľovi"
 
-#: src/editaddress.c:1428
+#: src/editaddress.c:1425
 msgid "_Email Addresses"
 msgstr "_Emailové adresy"
 
-#: src/editaddress.c:1431 src/editaddress.c:1434
+#: src/editaddress.c:1428 src/editaddress.c:1431
 msgid "O_ther Attributes"
 msgstr "Ďalšie _atribúty"
 
@@ -2821,8 +2679,8 @@ msgid " Check File "
 msgstr "Skontrolovať súbor"
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1942
-#: src/wizard.c:1371 src/wizard.c:1650
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1934
+#: src/wizard.c:1183 src/wizard.c:1457
 msgid "File"
 msgstr "Súbor"
 
@@ -2947,7 +2805,7 @@ msgstr "Musíte zadať aspoň jeden vyhľadávací atribút LDAP."
 msgid "Connected successfully to server"
 msgstr "Úspešne pripojený k serveru"
 
-#: src/editldap.c:336 src/editldap.c:980
+#: src/editldap.c:336 src/editldap.c:976
 msgid "Edit LDAP Server"
 msgstr "Upraviť LDAP server"
 
@@ -2971,7 +2829,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3318
+#: src/editldap.c:471 src/prefs_account.c:3310
 msgid "SSL"
 msgstr "SSL"
 
@@ -3127,44 +2985,44 @@ msgstr ""
 msgid "Bind Password"
 msgstr "Heslo bind"
 
-#: src/editldap.c:733
+#: src/editldap.c:729
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "Heslo, ktoré bude použité pri pripájaní sa ako používateľ „Bind DN”."
 
-#: src/editldap.c:738
+#: src/editldap.c:734
 msgid "Timeout (secs)"
 msgstr "Časový limit (v sekundách)"
 
-#: src/editldap.c:752
+#: src/editldap.c:748
 msgid "The timeout period in seconds."
 msgstr "Časový limit v sekundách."
 
-#: src/editldap.c:756
+#: src/editldap.c:752
 msgid "Maximum Entries"
 msgstr "Maximum záznamov"
 
-#: src/editldap.c:770
+#: src/editldap.c:766
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Najväčší počet vrátených výsledkov vyhľadávania."
 
-#: src/editldap.c:785 src/prefs_account.c:3209
+#: src/editldap.c:781 src/prefs_account.c:3201
 msgid "Basic"
 msgstr "Základné"
 
-#: src/editldap.c:786
+#: src/editldap.c:782
 msgid "Search"
 msgstr "Hľadať"
 
-#: src/editldap.c:787 src/gtk/quicksearch.c:661
+#: src/editldap.c:783 src/gtk/quicksearch.c:670
 msgid "Extended"
 msgstr "Rozšírené"
 
-#: src/editldap.c:985
+#: src/editldap.c:981
 msgid "Add New LDAP Server"
 msgstr "Pridať nový LDAP server"
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1444
+#: src/edittags.c:187 src/prefs_filtering_action.c:1446
 msgid "Tag"
 msgstr "Značka"
 
@@ -3184,24 +3042,24 @@ msgstr "Odstrániť všetky značky"
 msgid "Do you really want to delete all tags?"
 msgstr "Naozaj chcete odstrániť všetky značky?"
 
-#: src/edittags.c:422
+#: src/edittags.c:415
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr "Zadali ste rezervované meno značky, prosím, vyberte iné."
 
-#: src/edittags.c:464
+#: src/edittags.c:457
 msgid "Tag is not set."
 msgstr "Značka nie je nastavená."
 
-#: src/edittags.c:529
+#: src/edittags.c:522
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "Použiť značky"
 
-#: src/edittags.c:543
+#: src/edittags.c:536
 msgid "New tag:"
 msgstr "Nová značka:"
 
-#: src/edittags.c:576
+#: src/edittags.c:569
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr "Prosím zvoľte značky na použitie alebo odstránenie. Zmeny sú okamžité."
 
@@ -3285,9 +3143,9 @@ msgid "Stylesheet"
 msgstr "Štýlopis"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:133 src/mainwindow.c:1175
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1173
 #: src/plugins/archive/archiver_prefs.c:241 src/prefs_account.c:946
-#: src/prefs_toolbar.c:775 src/prefs_toolbar.c:1456 src/summaryview.c:6010
+#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1465 src/summaryview.c:6006
 msgid "None"
 msgstr "Žiadna"
 
@@ -3296,7 +3154,7 @@ msgstr "Žiadna"
 msgid "Default"
 msgstr "Štandardné"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:248
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
 #: src/plugins/pgpcore/sgpgme.c:148
 msgid "Full"
 msgstr "Plné"
@@ -3520,7 +3378,7 @@ msgstr "Exportovať adresár do súboru LDIF"
 msgid "Distinguished Name"
 msgstr "Distguished Name"
 
-#: src/export.c:113 src/summaryview.c:8154
+#: src/export.c:113 src/summaryview.c:8143
 msgid "Export to mbox file"
 msgstr "Exportovať do súboru mbox"
 
@@ -3581,52 +3439,69 @@ msgstr "Názov je príliš dlhý."
 msgid "Not specified."
 msgstr "Nie je určený."
 
-#: src/folder.c:1571 src/foldersel.c:374 src/prefs_folder_item.c:308
+#: src/file_checker.c:76
+#, c-format
+msgid "The file %s is missing! Do you want to use the backup file from %s?"
+msgstr "Súbor %s chýba! Chcete použiť záložný súbor z %s?"
+
+#: src/file_checker.c:84 src/file_checker.c:106
+#, c-format
+msgid "Could not copy %s to %s"
+msgstr "Nemožno kopírovať %s do %s"
+
+#: src/file_checker.c:98
+#, c-format
+msgid ""
+"The file %s is empty or corrupted! Do you want to use the backup file from "
+"%s?"
+msgstr "Súbor %s je prázdny alebo poškodený! Chcete použiť záložný súbor z %s?"
+
+#: src/folder.c:1577 src/foldersel.c:374 src/prefs_folder_item.c:308
 msgid "Inbox"
 msgstr "Prijaté"
 
-#: src/folder.c:1575 src/foldersel.c:378
+#: src/folder.c:1581 src/foldersel.c:378
 msgid "Sent"
 msgstr "Odoslané"
 
-#: src/folder.c:1579 src/foldersel.c:382
+#: src/folder.c:1585 src/foldersel.c:382
 #: src/plugins/attachwarner/attachwarner.c:219 src/prefs_folder_item.c:311
 msgid "Queue"
 msgstr "Front"
 
-#: src/folder.c:1583 src/foldersel.c:386 src/prefs_folder_item.c:312
+#: src/folder.c:1589 src/foldersel.c:386 src/prefs_folder_item.c:312
 msgid "Trash"
 msgstr "Kôš"
 
-#: src/folder.c:1587 src/foldersel.c:390 src/prefs_folder_item.c:310
+#: src/folder.c:1593 src/foldersel.c:390 src/prefs_folder_item.c:310
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/folder.c:2017
+#: src/folder.c:2023
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Spracúvam (%s)…\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopírujem %s do %s…\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Presúvam %s do %s…\n"
 
-#: src/folder.c:3563
+#: src/folder.c:3569
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Aktualizujem vyrovnávaciu pamäť zložky %s…"
 
-#: src/folder.c:4435
+#: src/folder.c:4443
 msgid "Processing messages..."
 msgstr "Spracúvam správy…"
 
-#: src/folder.c:4571
+#: src/folder.c:4579
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronizujem %s na použitie pri odpojení…\n"
@@ -3643,18 +3518,18 @@ msgstr "Nová zložka"
 #: src/foldersel.c:562 src/imap_gtk.c:210 src/imap_gtk.c:216
 #: src/imap_gtk.c:272 src/imap_gtk.c:277 src/mh_gtk.c:155 src/mh_gtk.c:259
 #: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:249
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:97
+#: src/plugins/mailmbox/plugin_gtk.c:416 src/plugins/rssyl/rssyl_cb_menu.c:97
 #: src/plugins/rssyl/rssyl_cb_menu.c:341
-#: src/plugins/vcalendar/vcal_folder.c:2028
+#: src/plugins/vcalendar/vcal_folder.c:2026
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "Názov zložky nemôže obsahovať „%c”."
 
 #: src/foldersel.c:572 src/imap_gtk.c:226 src/imap_gtk.c:284 src/mh_gtk.c:165
 #: src/mh_gtk.c:266 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:261
-#: src/plugins/mailmbox/plugin_gtk.c:428 src/plugins/rssyl/rssyl_cb_menu.c:107
+#: src/plugins/mailmbox/plugin_gtk.c:425 src/plugins/rssyl/rssyl_cb_menu.c:107
 #: src/plugins/rssyl/rssyl_cb_menu.c:348
-#: src/plugins/vcalendar/vcal_folder.c:2035
+#: src/plugins/vcalendar/vcal_folder.c:2033
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Zložka „%s” už existuje."
@@ -3691,13 +3566,13 @@ msgstr "Odoslať _front…"
 
 #: src/folderview.c:380 src/folderview.c:427
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:388 src/summaryview.c:6286
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:388 src/summaryview.c:6282
 msgid "New"
 msgstr "Nový"
 
 #: src/folderview.c:381 src/folderview.c:428
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:387 src/summaryview.c:6288
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:387 src/summaryview.c:6284
 msgid "Unread"
 msgstr "Neprečítané"
 
@@ -3711,108 +3586,108 @@ msgstr "Celkom"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:734
+#: src/folderview.c:727
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie zložky…"
 
-#: src/folderview.c:797 src/summaryview.c:4113 src/summaryview.c:4115
+#: src/folderview.c:790 src/summaryview.c:4109 src/summaryview.c:4111
 msgid "Mark all as read"
 msgstr "Označiť všetky ako prečítané"
 
-#: src/folderview.c:798 src/summaryview.c:4114
+#: src/folderview.c:791 src/summaryview.c:4110
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Naozaj chcete označiť všetky správy tejto zložky ako prečítané?"
 
-#: src/folderview.c:1021 src/imap.c:4490 src/mainwindow.c:5308 src/setup.c:91
+#: src/folderview.c:1014 src/imap.c:4497 src/mainwindow.c:5128 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Prehľadávanie zložky %s%c%s…"
 
-#: src/folderview.c:1025 src/imap.c:4495 src/mainwindow.c:5313 src/setup.c:96
+#: src/folderview.c:1018 src/imap.c:4502 src/mainwindow.c:5133 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Prehľadávanie zložky %s…"
 
-#: src/folderview.c:1056
+#: src/folderview.c:1049
 msgid "Rebuild folder tree"
 msgstr "Obnoviť strom zložiek"
 
-#: src/folderview.c:1057
+#: src/folderview.c:1050
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Obnovenie stromu zložiek spôsobí vymazanie lokálnych vyrovnávacích pamätí. "
 "Chcete pokračovať?"
 
-#: src/folderview.c:1067
+#: src/folderview.c:1060
 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom zložiek…"
 
-#: src/folderview.c:1069 src/folderview.c:1110
+#: src/folderview.c:1062 src/folderview.c:1103
 msgid "Scanning folder tree..."
 msgstr "Skenujem strom zložiek…"
 
-#: src/folderview.c:1201
+#: src/folderview.c:1194
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Nemožno skenovať obsah zložky %s\n"
 
-#: src/folderview.c:1255
+#: src/folderview.c:1248
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové správy vo všetkých zložkách…"
 
-#: src/folderview.c:2083
+#: src/folderview.c:2076
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Zatváram zložku %s…"
 
-#: src/folderview.c:2178
+#: src/folderview.c:2171
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Otváram zložku %s…"
 
-#: src/folderview.c:2196
+#: src/folderview.c:2189
 msgid "Folder could not be opened."
 msgstr "Zložku nemožno otvoriť."
 
-#: src/folderview.c:2337 src/mainwindow.c:3059 src/mainwindow.c:3063
+#: src/folderview.c:2330 src/mainwindow.c:2877 src/mainwindow.c:2881
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2331
 msgid "Delete all messages in trash?"
 msgstr "Vymazať všetky správy z koša?"
 
-#: src/folderview.c:2339
+#: src/folderview.c:2332
 msgid "+_Empty trash"
 msgstr "+_Vyprázdniť kôš"
 
-#: src/folderview.c:2383 src/inc.c:1620 src/toolbar.c:2689
+#: src/folderview.c:2376 src/inc.c:1528 src/toolbar.c:2678
 msgid "Offline warning"
 msgstr "Varovanie odpojenia"
 
-#: src/folderview.c:2384 src/toolbar.c:2690
+#: src/folderview.c:2377 src/toolbar.c:2679
 msgid "You're working offline. Override?"
 msgstr "Pracujete odpojený. Pripojiť?"
 
-#: src/folderview.c:2395 src/toolbar.c:2709
+#: src/folderview.c:2388 src/toolbar.c:2698
 msgid "Send queued messages"
 msgstr "Odoslať správy vo fronte"
 
-#: src/folderview.c:2396 src/toolbar.c:2710
+#: src/folderview.c:2389 src/toolbar.c:2699
 msgid "Send all queued messages?"
 msgstr "Odoslať všetky správy vo fronte?"
 
-#: src/folderview.c:2397 src/messageview.c:875 src/messageview.c:892
-#: src/toolbar.c:2711
+#: src/folderview.c:2390 src/messageview.c:853 src/messageview.c:870
+#: src/toolbar.c:2700
 msgid "_Send"
 msgstr "_Odoslať"
 
-#: src/folderview.c:2405 src/toolbar.c:2729
+#: src/folderview.c:2398 src/toolbar.c:2718
 msgid "Some errors occurred while sending queued messages."
 msgstr "Pri odosielaní správ vo fronte nastali chyby."
 
-#: src/folderview.c:2408 src/main.c:2862 src/toolbar.c:2732
+#: src/folderview.c:2401 src/main.c:2689 src/toolbar.c:2721
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3821,64 +3696,64 @@ msgstr ""
 "Pri odosielaní správ vo fronte nastali chyby:\n"
 "%s"
 
-#: src/folderview.c:2485
+#: src/folderview.c:2478
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Naozaj chcete kopírovať zložku „%s” do „%s”?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2479
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Naozaj chcete presunúť zložku „%s” ako podzložku „%s”?"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Copy folder"
 msgstr "Kopírovať zložku"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Move folder"
 msgstr "Presunúť zložku"
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopírujem %s do %s…"
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Presúvam %s do %s…"
 
-#: src/folderview.c:2530
+#: src/folderview.c:2523
 msgid "Source and destination are the same."
 msgstr "Zdroj je identický s cieľom."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2526
 msgid "Can't copy a folder to one of its children."
 msgstr "Nie je možné skopírovať zložku do jeho potomka."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2527
 msgid "Can't move a folder to one of its children."
 msgstr "Nie je možné presunúť zložku do jeho potomka."
 
-#: src/folderview.c:2537
+#: src/folderview.c:2530
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Zložky nemožno presúvať medzi rôznymi schránkami."
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Copy failed!"
 msgstr "Kopírovanie zlyhalo!"
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Move failed!"
 msgstr "Presun zlyhal!"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2584
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Nastavenie spracovania zložky %s"
 
-#: src/folderview.c:3018 src/summaryview.c:4554 src/summaryview.c:4653
+#: src/folderview.c:3011 src/summaryview.c:4550 src/summaryview.c:4649
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Zvolená cieľová zložka môže obsahovať len podzložky."
 
@@ -4027,7 +3902,7 @@ msgstr ""
 "Jazyk: %s (kódovanie: %s)\n"
 "Operačný systém: neznámy"
 
-#: src/gtk/about.c:243 src/prefs_themes.c:728 src/wizard.c:545
+#: src/gtk/about.c:243 src/prefs_themes.c:728 src/wizard.c:523
 msgid "The Claws Mail Team"
 msgstr "Tím Claws Mail"
 
@@ -4151,44 +4026,44 @@ msgstr ""
 ">. \n"
 "\n"
 
-#: src/gtk/about.c:699 src/main.c:2689
+#: src/gtk/about.c:699 src/main.c:2516
 msgid "Session statistics\n"
 msgstr "Štatistiky relácie\n"
 
-#: src/gtk/about.c:709 src/gtk/about.c:712 src/main.c:2699 src/main.c:2702
+#: src/gtk/about.c:709 src/gtk/about.c:712 src/main.c:2526 src/main.c:2529
 #, c-format
 msgid "Started: %s\n"
 msgstr "Začatá: %s\n"
 
-#: src/gtk/about.c:719 src/main.c:2708
+#: src/gtk/about.c:719 src/main.c:2535
 msgid "Incoming traffic\n"
 msgstr "Došlá komunikácia\n"
 
-#: src/gtk/about.c:722 src/main.c:2711
+#: src/gtk/about.c:722 src/main.c:2538
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Prijaté správy: %d\n"
 
-#: src/gtk/about.c:729 src/main.c:2717
+#: src/gtk/about.c:729 src/main.c:2544
 msgid "Outgoing traffic\n"
 msgstr "Odoslaná komunikácia\n"
 
-#: src/gtk/about.c:732 src/main.c:2720
+#: src/gtk/about.c:732 src/main.c:2547
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nové/presmerované správy: %d\n"
 
-#: src/gtk/about.c:737 src/main.c:2724
+#: src/gtk/about.c:737 src/main.c:2551
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Odpovede na správy: %d\n"
 
-#: src/gtk/about.c:742 src/main.c:2728
+#: src/gtk/about.c:742 src/main.c:2555
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Presmerované správy: %d\n"
 
-#: src/gtk/about.c:747 src/main.c:2732
+#: src/gtk/about.c:747 src/main.c:2559
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Odoslané správy celkom: %d\n"
@@ -4231,63 +4106,63 @@ msgstr "_Poznámky k verzii"
 msgid "_Statistics"
 msgstr "Štati_stiky"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:358
 msgid "Orange"
 msgstr "Oranžová"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:362
 msgid "Red"
 msgstr "Červená"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:366
 msgid "Pink"
 msgstr "Ružová"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:370
 msgid "Sky blue"
 msgstr "Svetlomodrá"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:374
 msgid "Blue"
 msgstr "Modrá"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:378
 msgid "Green"
 msgstr "Zelená"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:382
 msgid "Brown"
 msgstr "Hnedá"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:386
 msgid "Grey"
 msgstr "Sivá"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:390
 msgid "Light brown"
 msgstr "Svetlohnedá"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:394
 msgid "Dark red"
 msgstr "Tmavočervená"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:398
 msgid "Dark pink"
 msgstr "Tmavoružová"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:402
 msgid "Steel blue"
 msgstr "Oceľovomodrá"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:406
 msgid "Gold"
 msgstr "Zlatá"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:410
 msgid "Bright green"
 msgstr "Svetlozelená"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:424
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:414
 msgid "Magenta"
 msgstr "Fialová"
 
@@ -4412,8 +4287,8 @@ msgstr ""
 "Kontrola preklepov nemohla zmeniť alternatívny slovník.\n"
 "%s"
 
-#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1257
-#: src/prefs_matcher.c:2152 src/prefs_summary_column.c:84 src/quote_fmt.c:49
+#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1259
+#: src/prefs_matcher.c:2158 src/prefs_summary_column.c:84 src/quote_fmt.c:49
 #: src/summaryview.c:446
 msgid "Date"
 msgstr "Dátum"
@@ -4422,13 +4297,13 @@ msgstr "Dátum"
 msgid "Date:"
 msgstr "Dátum:"
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1254
-#: src/prefs_matcher.c:2149 src/prefs_summary_column.c:82 src/quote_fmt.c:50
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1256
+#: src/prefs_matcher.c:2155 src/prefs_summary_column.c:82 src/quote_fmt.c:50
 #: src/summaryview.c:444
 msgid "From"
 msgstr "Od"
 
-#: src/gtk/headers.h:9 src/summary_search.c:412
+#: src/gtk/headers.h:9 src/summary_search.c:438
 msgid "From:"
 msgstr "Od:"
 
@@ -4444,14 +4319,14 @@ msgstr "Odosielateľ:"
 msgid "Reply-To"
 msgstr "Odpovedať komu"
 
-#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2150 src/prefs_summary_column.c:83 src/quote_fmt.c:57
+#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1257
+#: src/prefs_matcher.c:2156 src/prefs_summary_column.c:83 src/quote_fmt.c:57
 #: src/summaryview.c:445
 msgid "To"
 msgstr "Komu"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2151 src/quote_fmt.c:58
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1258
+#: src/prefs_matcher.c:2157 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Kópia"
 
@@ -4459,8 +4334,8 @@ msgstr "Kópia"
 msgid "Bcc"
 msgstr "Slepá kópia"
 
-#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1258
-#: src/prefs_matcher.c:2153 src/quote_fmt.c:61
+#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1260
+#: src/prefs_matcher.c:2159 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Message-ID"
 
@@ -4472,8 +4347,8 @@ msgstr "Message-ID:"
 msgid "In-Reply-To"
 msgstr "In-Reply-To"
 
-#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2155 src/quote_fmt.c:60
+#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1262
+#: src/prefs_matcher.c:2161 src/quote_fmt.c:60
 msgid "References"
 msgstr "Odkazy"
 
@@ -4481,8 +4356,8 @@ msgstr "Odkazy"
 msgid "References:"
 msgstr "Odkazy:"
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1253
-#: src/prefs_matcher.c:2148 src/prefs_summary_column.c:81 src/quote_fmt.c:56
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1255
+#: src/prefs_matcher.c:2154 src/prefs_summary_column.c:81 src/quote_fmt.c:56
 #: src/summaryview.c:443
 msgid "Subject"
 msgstr "Predmet"
@@ -4575,8 +4450,8 @@ msgstr "Received"
 msgid "Received:"
 msgstr "Received:"
 
-#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2154 src/quote_fmt.c:59
+#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1261
+#: src/prefs_matcher.c:2160 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Diskusné skupiny"
 
@@ -4898,39 +4773,39 @@ msgstr ""
 "<span weight=\"bold\">Nasledujúce ikony sú použité na zobrazenie stavu správ "
 "alebo zložiek:</span>"
 
-#: src/gtk/inputdialog.c:246 src/gtk/inputdialog.c:268
+#: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Zadajte heslo pre %s na %s:"
 
-#: src/gtk/inputdialog.c:249 src/gtk/inputdialog.c:252
-#: src/gtk/inputdialog.c:271 src/gtk/inputdialog.c:274
+#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
+#: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
 #, c-format
 msgid "Input password for %s:"
 msgstr "Zadajte heslo pre %s:"
 
-#: src/gtk/inputdialog.c:255 src/gtk/inputdialog.c:277
+#: src/gtk/inputdialog.c:242 src/gtk/inputdialog.c:264
 msgid "Input password:"
 msgstr "Zadajte heslo:"
 
-#: src/gtk/inputdialog.c:256 src/gtk/inputdialog.c:284
-#: src/gtk/inputdialog.c:296
+#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
+#: src/gtk/inputdialog.c:283
 msgid "Input password"
 msgstr "Zadajte heslo"
 
-#: src/gtk/inputdialog.c:286
+#: src/gtk/inputdialog.c:273
 msgid "Remember password for this session"
 msgstr "Zapamätať heslo počas tejto relácie"
 
-#: src/gtk/inputdialog.c:385 src/gtk/inputdialog.c:434
+#: src/gtk/inputdialog.c:372 src/gtk/inputdialog.c:421
 msgid "Remember this"
 msgstr "Zapamätať si"
 
-#: src/gtk/logwindow.c:451
+#: src/gtk/logwindow.c:447
 msgid "Clear _Log"
 msgstr "Vyčistiť okno _záznamu"
 
-#: src/gtk/menu.c:145
+#: src/gtk/menu.c:137
 msgid ""
 "<span><b>Warning:</b> This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -4975,8 +4850,7 @@ msgstr ""
 
 #: src/gtk/pluginwindow.c:304 src/plugins/acpi_notifier/acpi_notifier.c:790
 #: src/plugins/archive/archiver_prefs.c:92
-#: src/plugins/att_remover/att_remover.c:519
-#: src/plugins/attachwarner/attachwarner_prefs.c:201
+#: src/plugins/attachwarner/attachwarner_prefs.c:228
 #: src/plugins/address_keeper/address_keeper_prefs.c:248
 #: src/plugins/bogofilter/bogofilter_gtk.c:457
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
@@ -4995,7 +4869,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:557 src/plugins/rssyl/rssyl_prefs.c:63
 #: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:648
-#: src/plugins/vcalendar/vcal_prefs.c:645 src/prefs_toolbar.c:939
+#: src/plugins/vcalendar/vcal_prefs.c:647 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
@@ -5011,236 +4885,237 @@ msgstr "Odobrať"
 msgid "Description"
 msgstr "Popis"
 
-#: src/gtk/pluginwindow.c:373
-msgid "More plugins are available from the Claws Mail website."
-msgstr "Ďalšie zásuvné moduly možno získať na stránke Claws Mail."
-
-#: src/gtk/pluginwindow.c:379 src/prefs_themes.c:843
-msgid "Get more..."
-msgstr "Získať ďalšie…"
+#: src/gtk/pluginwindow.c:374
+#, c-format
+msgid ""
+"For more information about plugins see the <a href=\"%s\"><span underline="
+"\"none\">Claws Mail website</span></a>."
+msgstr ""
+"Ďalšie informácie o zásuvnom module môžete nájsť na <a href=\"%s\"><span "
+"underline=\"none\">webovej stránke Claws Mail</span></a>."
 
-#: src/gtk/pluginwindow.c:415
+#: src/gtk/pluginwindow.c:414
 msgid "Click here to load one or more plugins"
 msgstr "Toto tlačidlo načíta jeden alebo viac zásuvných modulov"
 
-#: src/gtk/pluginwindow.c:418
+#: src/gtk/pluginwindow.c:417
 msgid "Unload the selected plugin"
 msgstr "Odobrať zvolený zásuvný modul"
 
-#: src/gtk/pluginwindow.c:483
+#: src/gtk/pluginwindow.c:482
 msgid "Loaded plugins"
 msgstr "Načítané zásuvné moduly"
 
-#: src/gtk/prefswindow.c:679
+#: src/gtk/prefswindow.c:671
 msgid "Page Index"
 msgstr "Obsah Stránky"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:830
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:828
 msgid "_Hide"
 msgstr "_Skryť"
 
-#: src/gtk/progressdialog.c:141 src/prefs_account.c:3208
-#: src/prefs_account.c:3226 src/prefs_account.c:3244 src/prefs_account.c:3262
-#: src/prefs_account.c:3280 src/prefs_account.c:3298 src/prefs_account.c:3317
-#: src/prefs_account.c:3399 src/prefs_filtering_action.c:1419
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1881
+#: src/gtk/progressdialog.c:141 src/prefs_account.c:3200
+#: src/prefs_account.c:3218 src/prefs_account.c:3236 src/prefs_account.c:3254
+#: src/prefs_account.c:3272 src/prefs_account.c:3290 src/prefs_account.c:3309
+#: src/prefs_account.c:3399 src/prefs_filtering_action.c:1421
+#: src/prefs_filtering.c:397 src/prefs_filtering.c:1877
 msgid "Account"
 msgstr "Účet"
 
-#: src/gtk/quicksearch.c:433
+#: src/gtk/quicksearch.c:442
 msgid "all messages"
 msgstr "všetky správy"
 
-#: src/gtk/quicksearch.c:434
+#: src/gtk/quicksearch.c:443
 msgid "messages whose age is greater than # days"
 msgstr "správy, ktoré sú staršie ako # dní"
 
-#: src/gtk/quicksearch.c:435
+#: src/gtk/quicksearch.c:444
 msgid "messages whose age is less than # days"
 msgstr "správy, ktoré sú novšie ako # dní"
 
-#: src/gtk/quicksearch.c:436
+#: src/gtk/quicksearch.c:445
 msgid "messages whose age is greater than # hours"
 msgstr "správy, ktoré sú staršie ako # hodín"
 
-#: src/gtk/quicksearch.c:437
+#: src/gtk/quicksearch.c:446
 msgid "messages whose age is less than # hours"
 msgstr "správy, ktoré sú novšie ako # hodín"
 
-#: src/gtk/quicksearch.c:438
+#: src/gtk/quicksearch.c:447
 msgid "messages which contain S in the message body"
 msgstr "správy, ktorých telo obsahuje S"
 
-#: src/gtk/quicksearch.c:439
+#: src/gtk/quicksearch.c:448
 msgid "messages which contain S in the whole message"
 msgstr "správy, ktoré obsahujú S kdekoľvek"
 
-#: src/gtk/quicksearch.c:440
+#: src/gtk/quicksearch.c:449
 msgid "messages carbon-copied to S"
 msgstr "správy s kópiou v S"
 
-#: src/gtk/quicksearch.c:441
+#: src/gtk/quicksearch.c:450
 msgid "message is either to: or cc: to S"
 msgstr "správa je buď to: alebo cc: S"
 
-#: src/gtk/quicksearch.c:442
+#: src/gtk/quicksearch.c:451
 msgid "deleted messages"
 msgstr "vymazané správy"
 
-#: src/gtk/quicksearch.c:443
+#: src/gtk/quicksearch.c:452
 msgid "messages which contain S in the Sender field"
 msgstr "správy, ktoré obsahujú S v hlavičke Sender"
 
-#: src/gtk/quicksearch.c:444
+#: src/gtk/quicksearch.c:453
 msgid "true if execute \"S\" succeeds"
 msgstr "pravda, ak je „S” vykonané úspešne"
 
-#: src/gtk/quicksearch.c:445
+#: src/gtk/quicksearch.c:454
 msgid "messages originating from user S"
 msgstr "správy pochádzajúce od používateľa S"
 
-#: src/gtk/quicksearch.c:446
+#: src/gtk/quicksearch.c:455
 msgid "forwarded messages"
 msgstr "správy poslané ďalej"
 
-#: src/gtk/quicksearch.c:447
+#: src/gtk/quicksearch.c:456
 msgid "messages which have attachments"
 msgstr "správy s prílohami"
 
-#: src/gtk/quicksearch.c:448
+#: src/gtk/quicksearch.c:457
 msgid "messages which contain header S"
 msgstr "správy, ktoré obsahujú hlavičku S"
 
-#: src/gtk/quicksearch.c:449
+#: src/gtk/quicksearch.c:458
 msgid "messages which contain S in Message-ID header"
 msgstr "správy, ktoré obsahujú S v hlavičke Message-ID"
 
-#: src/gtk/quicksearch.c:450
+#: src/gtk/quicksearch.c:459
 msgid "messages which contain S in In-Reply-To header"
 msgstr "správy, ktoré obsahujú S v hlavičke In-Reply-To"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:460
 msgid "messages which are marked with color #"
 msgstr "správy, ktoré sú označené farbou #"
 
-#: src/gtk/quicksearch.c:452
+#: src/gtk/quicksearch.c:461
 msgid "locked messages"
 msgstr "zamknuté správy"
 
-#: src/gtk/quicksearch.c:453
+#: src/gtk/quicksearch.c:462
 msgid "messages which are in newsgroup S"
 msgstr "správy, ktoré sú v diskusnej skupine S"
 
-#: src/gtk/quicksearch.c:454
+#: src/gtk/quicksearch.c:463
 msgid "new messages"
 msgstr "nové správy"
 
-#: src/gtk/quicksearch.c:455
+#: src/gtk/quicksearch.c:464
 msgid "old messages"
 msgstr "staré správy"
 
-#: src/gtk/quicksearch.c:456
+#: src/gtk/quicksearch.c:465
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "neúplné správy (nestiahnuté úplne)"
 
-#: src/gtk/quicksearch.c:457
+#: src/gtk/quicksearch.c:466
 msgid "messages which have been replied to"
 msgstr "správy, ktoré boli zodpovedané"
 
-#: src/gtk/quicksearch.c:458
+#: src/gtk/quicksearch.c:467
 msgid "read messages"
 msgstr "prečítané správy"
 
-#: src/gtk/quicksearch.c:459
+#: src/gtk/quicksearch.c:468
 msgid "messages which contain S in subject"
 msgstr "správy, ktoré obsahujú S v názve"
 
-#: src/gtk/quicksearch.c:460
+#: src/gtk/quicksearch.c:469
 msgid "messages whose score is equal to # points"
 msgstr "správy, ktorých ohodnotenie je rovné # bodov"
 
-#: src/gtk/quicksearch.c:461
+#: src/gtk/quicksearch.c:470
 msgid "messages whose score is greater than # points"
 msgstr "správy, ktorých ohodnotenie je väčšie ako # bodov"
 
-#: src/gtk/quicksearch.c:462
+#: src/gtk/quicksearch.c:471
 msgid "messages whose score is lower than # points"
 msgstr "správy, ktorých ohodnotenie je menšie ako # bodov"
 
-#: src/gtk/quicksearch.c:463
+#: src/gtk/quicksearch.c:472
 msgid "messages whose size is equal to # bytes"
 msgstr "správy, ktorých veľkosť je rovná # bajtov"
 
-#: src/gtk/quicksearch.c:464
+#: src/gtk/quicksearch.c:473
 msgid "messages whose size is greater than # bytes"
 msgstr "správy, ktorých veľkosť je väčšia ako # bajtov"
 
-#: src/gtk/quicksearch.c:465
+#: src/gtk/quicksearch.c:474
 msgid "messages whose size is smaller than # bytes"
 msgstr "správy, ktorých veľkosť je menšia ako # bajtov"
 
-#: src/gtk/quicksearch.c:466
+#: src/gtk/quicksearch.c:475
 msgid "messages which have been sent to S"
 msgstr "správy, odoslané S"
 
-#: src/gtk/quicksearch.c:467
+#: src/gtk/quicksearch.c:476
 msgid "messages which tags contain S"
 msgstr "správy, ktorých značky obsahujú S"
 
-#: src/gtk/quicksearch.c:468
+#: src/gtk/quicksearch.c:477
 msgid "messages which have tag(s)"
 msgstr "správy so značkami S"
 
-#: src/gtk/quicksearch.c:469
+#: src/gtk/quicksearch.c:478
 msgid "marked messages"
 msgstr "označené správy"
 
-#: src/gtk/quicksearch.c:470
+#: src/gtk/quicksearch.c:479
 msgid "unread messages"
 msgstr "neprečítané správy"
 
-#: src/gtk/quicksearch.c:471
+#: src/gtk/quicksearch.c:480
 msgid "messages which contain S in References header"
 msgstr "správy, ktoré obsahujú S v hlavičke References"
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:481
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "správy, ktoré vracajú 0 po odovzdaní do príkazu – %F je súbor správy"
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:482
 msgid "messages which contain S in X-Label header"
 msgstr "správy, ktoré obsahujú S v hlavičke X-Label"
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:484
 msgid "logical AND operator"
 msgstr "logický operátor AND"
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:485
 msgid "logical OR operator"
 msgstr "logický operátor OR"
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:486
 msgid "logical NOT operator"
 msgstr "logický operátor NOT"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:487
 msgid "case sensitive search"
 msgstr "záleží na veľkosti písmen"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:488
 msgid "match using regular expressions instead of substring search"
 msgstr "zhoda pomocou regulárnych výrazov namiesto hľadania podreťazca"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:490
 msgid "all filtering expressions are allowed"
 msgstr "všetky filtrovacie výrazy sú povolené"
 
-#: src/gtk/quicksearch.c:490 src/summary_search.c:457
+#: src/gtk/quicksearch.c:499 src/summary_search.c:483
 msgid "Extended Search"
 msgstr "Rozšírené vyhľadávanie"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:500
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
@@ -5250,48 +5125,53 @@ msgstr ""
 "musia správy spĺňať, aby boli zobrazené v zozname správ.\n"
 "Môžu byť použité tieto symboly:"
 
-#: src/gtk/quicksearch.c:591
+#: src/gtk/quicksearch.c:600
 msgid "Something went wrong during search. Please check your logs."
 msgstr ""
 "Počas hľadania sa prihodilo niečo zlé. Prosím, skontrolujte svoje záznamy."
 
-#: src/gtk/quicksearch.c:657
+#: src/gtk/quicksearch.c:666
 msgid "From/To/Subject/Tag"
 msgstr "Od/Komu/Predmet/Značka"
 
-#: src/gtk/quicksearch.c:668 src/plugins/archive/archiver_prefs.c:322
+#: src/gtk/quicksearch.c:677 src/plugins/archive/archiver_prefs.c:322
 msgid "Recursive"
 msgstr "Rekurzívne"
 
-#: src/gtk/quicksearch.c:677
+#: src/gtk/quicksearch.c:686
 msgid "Sticky"
 msgstr "Trvalé"
 
-#: src/gtk/quicksearch.c:687
+#: src/gtk/quicksearch.c:696
 msgid "Type-ahead"
 msgstr "Dynamické"
 
-#: src/gtk/quicksearch.c:699
+#: src/gtk/quicksearch.c:708
 msgid "Run on select"
 msgstr "Spustiť pri zvolení"
 
-#: src/gtk/quicksearch.c:741
+#: src/gtk/quicksearch.c:750
 msgid "Clear the current search"
 msgstr "Zrušiť súčasné vyhľadávanie"
 
-#: src/gtk/quicksearch.c:751 src/summary_search.c:410
+#: src/gtk/quicksearch.c:760 src/summary_search.c:436
 msgid "Edit search criteria"
 msgstr "Upraviť vyhľadávacie kritériá"
 
-#: src/gtk/quicksearch.c:760
+#: src/gtk/quicksearch.c:769
 msgid "Information about extended symbols"
 msgstr "Informácie o rozšírených symboloch"
 
-#: src/gtk/quicksearch.c:798 src/gtk/quicksearch.c:813
+#: src/gtk/quicksearch.c:807 src/gtk/quicksearch.c:822
 msgid "_Information"
 msgstr "_Informácia"
 
-#: src/gtk/quicksearch.c:800 src/gtk/quicksearch.c:815
+#: src/gtk/quicksearch.c:808 src/gtk/quicksearch.c:823
+msgid "E_dit"
+msgstr "_Upraviť"
+
+#: src/gtk/quicksearch.c:809 src/gtk/quicksearch.c:824 src/prefs_actions.c:347
+#: src/prefs_filtering.c:495 src/prefs_template.c:328
 msgid "C_lear"
 msgstr "Vy_mazať"
 
@@ -5457,7 +5337,7 @@ msgstr "(bez Predmetu)"
 msgid "Error:"
 msgstr "Chyba:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2578
+#: src/image_viewer.c:299 src/mimeview.c:2546
 #: src/plugins/pdf_viewer/poppler_viewer.c:700
 msgid "Filename:"
 msgstr "Názov súboru:"
@@ -5736,16 +5616,16 @@ msgstr "Spojenie k %s zlyhalo"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojenie k %s bolo prerušené. Obnovujem…\n"
 
-#: src/imap.c:992 src/imap.c:3539 src/imap.c:4199 src/imap.c:4296
-#: src/imap.c:4479 src/imap.c:5276
+#: src/imap.c:992 src/imap.c:3546 src/imap.c:4206 src/imap.c:4303
+#: src/imap.c:4486 src/imap.c:5283
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Na prístup k serveru IMAP potrebuje Claws Mail pripojenie k sieti."
 
-#: src/imap.c:1086 src/inc.c:816 src/news.c:394 src/send_message.c:308
+#: src/imap.c:1086 src/inc.c:802 src/news.c:388 src/send_message.c:269
 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 
-#: src/imap.c:1087 src/inc.c:817 src/news.c:395 src/send_message.c:309
+#: src/imap.c:1087 src/inc.c:803 src/news.c:389 src/send_message.c:270
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5759,7 +5639,7 @@ msgstr ""
 "Chcete pokračovať v pripájaní na tento server? Komunikácia nebude "
 "zabezpečená."
 
-#: src/imap.c:1093 src/inc.c:823 src/news.c:401 src/send_message.c:315
+#: src/imap.c:1093 src/inc.c:809 src/news.c:395 src/send_message.c:276
 msgid "Con_tinue connecting"
 msgstr "Po_kračovať v pripájaní"
 
@@ -5778,89 +5658,89 @@ msgstr "Nepodarilo sa pripojiť k serveru IMAP4: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru IMAP4: %s:%d\n"
 
-#: src/imap.c:1187 src/imap.c:3961
+#: src/imap.c:1187 src/imap.c:3968
 msgid "Can't start TLS session.\n"
 msgstr "Nemožno vytvoriť TLS spojenie.\n"
 
-#: src/imap.c:1243
+#: src/imap.c:1250
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s.\n"
 
-#: src/imap.c:1246
+#: src/imap.c:1253
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s."
 
-#: src/imap.c:1640
+#: src/imap.c:1647
 msgid "Adding messages..."
 msgstr "Pridávam správy…"
 
-#: src/imap.c:1842 src/mh.c:520
+#: src/imap.c:1849 src/mh.c:520
 msgid "Copying messages..."
 msgstr "Kopírujem správy…"
 
-#: src/imap.c:2421
+#: src/imap.c:2428
 msgid "can't set deleted flags\n"
 msgstr "nemožno nastaviť príznak zmazania\n"
 
-#: src/imap.c:2428 src/imap.c:4906
+#: src/imap.c:2435 src/imap.c:4913
 msgid "can't expunge\n"
 msgstr "nemožno odstrániť\n"
 
-#: src/imap.c:2779
+#: src/imap.c:2786
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Hľadám neodoberané zložky v %s…"
 
-#: src/imap.c:2782
+#: src/imap.c:2789
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Hľadám podzložky %s…"
 
-#: src/imap.c:3078
+#: src/imap.c:3085
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nemožno vytvoriť schránku: príkaz LIST zlyhal\n"
 
-#: src/imap.c:3093
+#: src/imap.c:3100
 msgid "can't create mailbox\n"
 msgstr "nemožno vytvoriť schránku\n"
 
-#: src/imap.c:3184
+#: src/imap.c:3191
 msgid "New folder name must not contain the namespace path separator"
 msgstr "Názov novej zložky nesmie obsahovať oddeľovač mena cesty"
 
-#: src/imap.c:3221
+#: src/imap.c:3228
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nemožno premenovať schránku: %s na %s\n"
 
-#: src/imap.c:3333
+#: src/imap.c:3340
 msgid "can't delete mailbox\n"
 msgstr "nemožno odstrániť schránku \n"
 
-#: src/imap.c:3620
+#: src/imap.c:3627
 msgid "LIST failed\n"
 msgstr "LIST zlyhal\n"
 
-#: src/imap.c:3705
+#: src/imap.c:3712
 msgid "Flagging messages..."
 msgstr "Označujem správy…"
 
-#: src/imap.c:3806
+#: src/imap.c:3813
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nemožno vybrať zložku: %s\n"
 
-#: src/imap.c:3958
+#: src/imap.c:3965
 msgid "Server requires TLS to log in.\n"
 msgstr "Server na prihlásenie vyžaduje TLS.\n"
 
-#: src/imap.c:3968
+#: src/imap.c:3975
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodarilo  sa obnoviť možnosti servera.\n"
 
-#: src/imap.c:3973
+#: src/imap.c:3980
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5869,20 +5749,20 @@ msgstr ""
 "Pripojenie k %s zlyhalo: server vyžaduje TLS, ale Claws Mail bol zostavený "
 "bez podpory OpensSSL.\n"
 
-#: src/imap.c:3981
+#: src/imap.c:3988
 msgid "Server logins are disabled.\n"
 msgstr "Tento server neumožňuje prihlásenie.\n"
 
-#: src/imap.c:4204
+#: src/imap.c:4211
 msgid "Fetching message..."
 msgstr "Sťahujem správu…"
 
-#: src/imap.c:4899
+#: src/imap.c:4906
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nemožno nastaviť príznaky zmazania: %d\n"
 
-#: src/imap.c:5932
+#: src/imap.c:5939
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -5970,21 +5850,21 @@ msgid "Inherit properties from parent folder"
 msgstr "Zdediť vlastnosti z rodičovskej zložky"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:249 src/news_gtk.c:305
-#: src/plugins/mailmbox/plugin_gtk.c:408 src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/vcalendar/vcal_folder.c:2020
+#: src/plugins/mailmbox/plugin_gtk.c:405 src/plugins/rssyl/rssyl_cb_menu.c:333
+#: src/plugins/vcalendar/vcal_folder.c:2018
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Zadajte nový názov pre „%s”:"
 
-#: src/imap_gtk.c:263 src/mh_gtk.c:251 src/plugins/mailmbox/plugin_gtk.c:409
+#: src/imap_gtk.c:263 src/mh_gtk.c:251 src/plugins/mailmbox/plugin_gtk.c:406
 #: src/plugins/rssyl/rssyl_cb_menu.c:334
-#: src/plugins/vcalendar/vcal_folder.c:2021
+#: src/plugins/vcalendar/vcal_folder.c:2019
 msgid "Rename folder"
 msgstr "Premenovať zložku"
 
 #: src/imap_gtk.c:292 src/mh_gtk.c:274 src/news_gtk.c:327
-#: src/plugins/mailmbox/plugin_gtk.c:438 src/plugins/rssyl/rssyl_cb_menu.c:354
-#: src/plugins/vcalendar/vcal_folder.c:2041
+#: src/plugins/mailmbox/plugin_gtk.c:433 src/plugins/rssyl/rssyl_cb_menu.c:354
+#: src/plugins/vcalendar/vcal_folder.c:2039
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6006,8 +5886,8 @@ msgstr ""
 "Naozaj chcete pokračovať?"
 
 #: src/imap_gtk.c:381 src/mh_gtk.c:220 src/news_gtk.c:280
-#: src/plugins/mailmbox/plugin_gtk.c:343 src/plugins/rssyl/rssyl_cb_menu.c:256
-#: src/plugins/vcalendar/vcal_folder.c:1974
+#: src/plugins/mailmbox/plugin_gtk.c:341 src/plugins/rssyl/rssyl_cb_menu.c:256
+#: src/plugins/vcalendar/vcal_folder.c:1972
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemožno odstrániť zložku „%s”."
@@ -6260,32 +6140,32 @@ msgstr "Vyberte súbor Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Importovať súbor Pine do adresára"
 
-#: src/inc.c:205 src/inc.c:312 src/inc.c:339
+#: src/inc.c:186 src/inc.c:293 src/inc.c:320
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail  potrebuje na prijatie pošty pripojenie k sieti."
 
-#: src/inc.c:361
+#: src/inc.c:342
 #, c-format
 msgid "%s failed\n"
 msgstr "%s zlyhal\n"
 
-#: src/inc.c:432
+#: src/inc.c:413
 msgid "Retrieving new messages"
 msgstr "Prijímam nové správy"
 
-#: src/inc.c:493
+#: src/inc.c:474
 msgid "Standby"
 msgstr "Čakajte"
 
-#: src/inc.c:618 src/inc.c:672
+#: src/inc.c:604 src/inc.c:658
 msgid "Cancelled"
 msgstr "Zrušené"
 
-#: src/inc.c:629
+#: src/inc.c:615
 msgid "Retrieving"
 msgstr "Prijímam"
 
-#: src/inc.c:638
+#: src/inc.c:624
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
@@ -6293,28 +6173,28 @@ msgstr[0] "Hotovo (%d správa (%s) prijatá)"
 msgstr[1] "Hotovo (%d správy (%s) prijaté)"
 msgstr[2] "Hotovo (%d správ (%s) prijatých)"
 
-#: src/inc.c:644
+#: src/inc.c:630
 msgid "Done (no new messages)"
 msgstr "Hotovo (žiadne nové správy)"
 
-#: src/inc.c:649
+#: src/inc.c:635
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: src/inc.c:652
+#: src/inc.c:638
 msgid "Auth failed"
 msgstr "Autentifikácia zlyhala"
 
-#: src/inc.c:659 src/prefs_matcher.c:393 src/prefs_summary_column.c:88
-#: src/summaryview.c:2782 src/summaryview.c:6312
+#: src/inc.c:645 src/prefs_matcher.c:393 src/prefs_summary_column.c:88
+#: src/summaryview.c:2782 src/summaryview.c:6308
 msgid "Locked"
 msgstr "Správa je zamknutá"
 
-#: src/inc.c:669 src/plugins/spamassassin/spamassassin_gtk.c:378
+#: src/inc.c:655 src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Timeout"
 msgstr "Časový limit"
 
-#: src/inc.c:756
+#: src/inc.c:742
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
@@ -6322,65 +6202,65 @@ msgstr[0] "Dokončené (%d nová správa)"
 msgstr[1] "Dokončené (%d nové správy)"
 msgstr[2] "Dokončené (%d nových správ)"
 
-#: src/inc.c:760
+#: src/inc.c:746
 msgid "Finished (no new messages)"
 msgstr "Dokončené (žiadne nové správy)"
 
-#: src/inc.c:799
+#: src/inc.c:785
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prijímam nové správy"
 
-#: src/inc.c:832
+#: src/inc.c:818
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Účet „%s”: Pripájanie k serveru POP3: %s:%d…"
 
-#: src/inc.c:850
+#: src/inc.c:836
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d"
 
-#: src/inc.c:854
+#: src/inc.c:840
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d\n"
 
-#: src/inc.c:934 src/send_message.c:478
+#: src/inc.c:920 src/send_message.c:486
 msgid "Authenticating..."
 msgstr "Autentifikácia…"
 
-#: src/inc.c:936
+#: src/inc.c:922
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Prijímanie správ z %s (%s)…"
 
-#: src/inc.c:942
+#: src/inc.c:928
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Získavam počet nových správ (STAT)…"
 
-#: src/inc.c:946
+#: src/inc.c:932
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Získavam počet nových správ (LAST)…"
 
-#: src/inc.c:950
+#: src/inc.c:936
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Získavam počet nových správ (UIDL)…"
 
-#: src/inc.c:954
+#: src/inc.c:940
 msgid "Getting the size of messages (LIST)..."
 msgstr "Získavam veľkosť správ (LIST)…"
 
-#: src/inc.c:961 src/send_message.c:496
+#: src/inc.c:947 src/send_message.c:504
 msgid "Quitting"
 msgstr "Odpájam sa"
 
-#: src/inc.c:986
+#: src/inc.c:972
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prijímam správu (%d / %d) (%s / %s)"
 
-#: src/inc.c:999
+#: src/inc.c:985
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
@@ -6388,16 +6268,16 @@ msgstr[0] "Prijímam (%d správa (%s) prijatá)"
 msgstr[1] "Prijímam (%d správy (%s) prijaté)"
 msgstr[2] "Prijímam (%d správ (%s) prijatých)"
 
-#: src/inc.c:1158
+#: src/inc.c:1144
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Spojenie k %s:%d zlyhalo."
 
-#: src/inc.c:1163
+#: src/inc.c:1149
 msgid "Error occurred while processing mail."
 msgstr "Pri spracovávaní pošty nastala chyba."
 
-#: src/inc.c:1169
+#: src/inc.c:1155
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6406,37 +6286,37 @@ msgstr ""
 "Pri spracovávaní pošty nastala chyba:\n"
 "%s"
 
-#: src/inc.c:1175
+#: src/inc.c:1161
 msgid "No disk space left."
 msgstr "Na disku už nie je miesto."
 
-#: src/inc.c:1180
+#: src/inc.c:1166
 msgid "Can't write file."
 msgstr "Nemožno zapisovať do súboru."
 
-#: src/inc.c:1185
+#: src/inc.c:1171
 msgid "Socket error."
 msgstr "Chyba soketu."
 
-#: src/inc.c:1188
+#: src/inc.c:1174
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Chyba soketu pri pripojení k %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:406 src/send_message.c:670
+#: src/inc.c:1179 src/send_message.c:414 src/send_message.c:678
 msgid "Connection closed by the remote host."
 msgstr "Vzdialený hostiteľ ukončil spojenie."
 
-#: src/inc.c:1196
+#: src/inc.c:1182
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Vzdialený hostiteľ %s:%d ukončil spojenie."
 
-#: src/inc.c:1201
+#: src/inc.c:1187
 msgid "Mailbox is locked."
 msgstr "Poštová schránka je zamknutá."
 
-#: src/inc.c:1205
+#: src/inc.c:1191
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6445,11 +6325,11 @@ msgstr ""
 "Poštová schránka je zamknutá:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:655
+#: src/inc.c:1197 src/send_message.c:663
 msgid "Authentication failed."
 msgstr "Autentifikácia zlyhala."
 
-#: src/inc.c:1217 src/send_message.c:658
+#: src/inc.c:1203 src/send_message.c:666
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6458,7 +6338,7 @@ msgstr ""
 "Autentifikácia zlyhala:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:674
+#: src/inc.c:1208 src/send_message.c:682
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6466,38 +6346,26 @@ msgstr ""
 "Vypršal limit relácie. Môže pomôcť úprava (zvýšenie) hodnoty časového limitu "
 "spojení v Nastavenia/Ostatné/Rôzne."
 
-#: src/inc.c:1227
+#: src/inc.c:1213
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Spojenie k %s:%d zlyhalo."
 
-#: src/inc.c:1265
+#: src/inc.c:1251
 msgid "Incorporation cancelled\n"
 msgstr "Začleňovanie zrušené\n"
 
-#: src/inc.c:1457
-#, c-format
-msgid "Claws Mail: %d new message"
-msgid_plural "Claws Mail: %d new messages"
-msgstr[0] "Claws Mail %d nová správa"
-msgstr[1] "Claws Mail %d nové správy"
-msgstr[2] "Claws Mail: %d nových správ"
-
-#: src/inc.c:1584
-msgid "Unable to connect: you are offline."
-msgstr "Nemožno sa pripojiť: pracujete odpojený."
-
-#: src/inc.c:1610
+#: src/inc.c:1518
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sPracujete odpojený. Pripojiť na nasledujúcich %d minút?"
 
-#: src/inc.c:1616
+#: src/inc.c:1524
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sPracujete odpojený. Pripojiť?"
 
-#: src/inc.c:1623
+#: src/inc.c:1531
 msgid "On_ly once"
 msgstr "_Len raz"
 
@@ -6505,7 +6373,7 @@ msgstr "_Len raz"
 msgid "Nick Name"
 msgstr "Prezývka"
 
-#: src/main.c:272
+#: src/main.c:241
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6514,11 +6382,7 @@ msgstr ""
 "Súbor „%s” už existuje.\n"
 "Zložku nemožno vytvoriť."
 
-#: src/main.c:294 src/main.c:307
-msgid "Exiting..."
-msgstr "Ukončujem program…"
-
-#: src/main.c:438
+#: src/main.c:362
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6527,7 +6391,7 @@ msgstr ""
 "Bolo nájdené nastavenie pre %s.\n"
 "Chcete konvertovať toto nastavenie?"
 
-#: src/main.c:440
+#: src/main.c:364
 #, c-format
 msgid ""
 "\n"
@@ -6541,11 +6405,11 @@ msgstr ""
 "previesť do Claws Mail pomocou skriptu dostupného na\n"
 "%s."
 
-#: src/main.c:452
+#: src/main.c:376
 msgid "Keep old configuration"
 msgstr "Zachovať pôvodné nastavenie"
 
-#: src/main.c:455
+#: src/main.c:379
 msgid ""
 "Keeping a backup will allow you to go back to an older version, but may take "
 "a while if you have cached IMAP or News data, and will take some extra room "
@@ -6555,47 +6419,47 @@ msgstr ""
 "môže chvíľu trvať, najmä ak máte viacero dočasných súborov pre údaje IMAP "
 "alebo NNTP, a zaberie viac miesta na disku."
 
-#: src/main.c:463
+#: src/main.c:387
 msgid "Migration of configuration"
 msgstr "Migrácia konfigurácie"
 
-#: src/main.c:474
+#: src/main.c:398
 msgid "Copying configuration... This may take a while..."
 msgstr "Kopírujem konfiguráciu… Môže to nejakú dobu trvať…"
 
-#: src/main.c:483
+#: src/main.c:407
 msgid "Migration failed!"
 msgstr "Migrácia zlyhala!"
 
-#: src/main.c:492
+#: src/main.c:416
 msgid "Migrating configuration..."
 msgstr "Migrujem konfiguráciu…"
 
-#: src/main.c:1039
+#: src/main.c:934
 msgid "Failed to register folder item update hook"
 msgstr "Zlyhala registrácia obsluhy udalosti „folder item update”"
 
-#: src/main.c:1046
+#: src/main.c:941
 msgid "Failed to register folder update hook"
 msgstr "Zlyhala registrácia obsluhy udalosti „folder update”"
 
-#: src/main.c:1226
+#: src/main.c:1110
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib nepodporuje g_thread.\n"
 
-#: src/main.c:1245
+#: src/main.c:1129
 msgid "Sylpheed-Claws 2.6.0 (or older)"
 msgstr "Sylpheed-Claws 2.6.0 (alebo starší)"
 
-#: src/main.c:1248
+#: src/main.c:1132
 msgid "Sylpheed-Claws 1.9.15 (or older)"
 msgstr "Sylpheed-Claws 1.9.15 (alebo starší)"
 
-#: src/main.c:1251
+#: src/main.c:1135
 msgid "Sylpheed-Claws 1.0.5 (or older)"
 msgstr "Sylpheed-Claws 1.0.5 (alebo starší)"
 
-#: src/main.c:1574
+#: src/main.c:1434
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6618,7 +6482,7 @@ msgstr[2] ""
 "nastavení zásuvných modulov.\n"
 "%s"
 
-#: src/main.c:1602
+#: src/main.c:1462
 msgid ""
 "Claws Mail has detected a configured mailbox, but it is incomplete. It is "
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
@@ -6628,7 +6492,7 @@ msgstr ""
 "pravdepodobne spôsobené zlyhávajúcim účtom IMAP. Na pokus o jej opravu "
 "použite voľbu „Obnoviť strom zložiek” z kontextového menu koreňovej zložky."
 
-#: src/main.c:1608
+#: src/main.c:1468
 msgid ""
 "Claws Mail has detected a configured mailbox, but could not load it. It is "
 "probably provided by an out-of-date external plugin. Please reinstall the "
@@ -6638,42 +6502,36 @@ msgstr ""
 "Pravdepodobne je vytvorená zastaralým zásuvným modulom. Prosím, znova "
 "nainštalujte zásuvný modul a skúste znova."
 
-#: src/main.c:1637
-#, c-format
-msgid "Claws Mail can not start without its data volume (%s)."
-msgstr ""
-"Claws Mail nemôže pracovať bez diskovej partície so svojimi dátami (%s)."
-
-#: src/main.c:1884
+#: src/main.c:1711
 msgid "Missing filename\n"
 msgstr "Chýba meno súboru\n"
 
-#: src/main.c:1891
+#: src/main.c:1718
 msgid "Cannot open filename for reading\n"
 msgstr "Súbor nemožno otvoriť na čítanie\n"
 
-#: src/main.c:1902
+#: src/main.c:1729
 msgid "Malformed header\n"
 msgstr "Nesprávny formát hlavičky\n"
 
-#: src/main.c:1909
+#: src/main.c:1736
 msgid "Duplicated 'To:' header\n"
 msgstr "Duplikovaná hlavička „To:”\n"
 
-#: src/main.c:1924
+#: src/main.c:1751
 msgid "Missing required 'To:' header\n"
 msgstr "Chýba vyžadovaná hlavička „To:”\n"
 
-#: src/main.c:2071
+#: src/main.c:1898
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použitie: %s [VOĽBY]…\n"
 
-#: src/main.c:2073
+#: src/main.c:1900
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otvorí okno na písanie novej správy"
 
-#: src/main.c:2074
+#: src/main.c:1901
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6692,11 +6550,11 @@ msgstr ""
 "po prázdny\n"
 "                         riadok, potom telo správy – až do konca súboru."
 
-#: src/main.c:2079
+#: src/main.c:1906
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      prihlási k odberu zadanej URI, ak je to možné"
 
-#: src/main.c:2080
+#: src/main.c:1907
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6706,23 +6564,23 @@ msgstr ""
 "                         otvorí okno na písanie novej správy s pripojenými\n"
 "                         zadanými súbormi"
 
-#: src/main.c:2083
+#: src/main.c:1910
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prijme nové správy"
 
-#: src/main.c:2084
+#: src/main.c:1911
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prijme nové správy zo všetkých účtov"
 
-#: src/main.c:2085
+#: src/main.c:1912
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     zruší prijímanie nových správ"
 
-#: src/main.c:2086
+#: src/main.c:1913
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       zruší odosielanie správ"
 
-#: src/main.c:2087
+#: src/main.c:1914
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6741,15 +6599,15 @@ msgstr ""
 "                         rekurzívne: nepravda, ak arg. začína 0, n, N, f "
 "alebo F"
 
-#: src/main.c:2094
+#: src/main.c:1921
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošle všetky správy vo výstupnej fronte"
 
-#: src/main.c:2095
+#: src/main.c:1922
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [zložka]…   zobrazí celkový počet správ"
 
-#: src/main.c:2096
+#: src/main.c:1923
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6757,15 +6615,15 @@ msgstr ""
 "  --status-full [zložka]…\n"
 "                         zobrazí stav každej zložky"
 
-#: src/main.c:2098
+#: src/main.c:1925
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           zobrazí štatistiky relácie"
 
-#: src/main.c:2099
+#: src/main.c:1926
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     vymaže štatistiky relácie"
 
-#: src/main.c:2100
+#: src/main.c:1927
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6773,37 +6631,37 @@ msgstr ""
 "  --select zložka[/správa]\n"
 "                         otvorí zadanú zložku alebo správu\n"
 "                         zložka je identifikátor zložky, napr. „zložka/"
-"podzložka”"
+"pod_zložka”"
 
-#: src/main.c:2102
+#: src/main.c:1929
 msgid "  --online               switch to online mode"
 msgstr "  --online               prepne do online režimu"
 
-#: src/main.c:2103
+#: src/main.c:1930
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              prepne do odpojeného režimu"
 
-#: src/main.c:2104
+#: src/main.c:1931
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       ukončí Claws Mail"
 
-#: src/main.c:2105
+#: src/main.c:1932
 msgid "  --debug                debug mode"
 msgstr "  --debug                ladiaci mód"
 
-#: src/main.c:2106
+#: src/main.c:1933
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         prepne ladiaci mód"
 
-#: src/main.c:2107
+#: src/main.c:1934
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              zobrazí tohoto pomocníka a ukončí program"
 
-#: src/main.c:2108
+#: src/main.c:1935
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           zobrazí informácie o verzii a ukončí program"
 
-#: src/main.c:2109
+#: src/main.c:1936
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6811,11 +6669,11 @@ msgstr ""
 "  --version-full -V      zobrazí informácie o verzii, zabudovaných "
 "vlastnostiach a ukončí program"
 
-#: src/main.c:2110
+#: src/main.c:1937
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           výstupný konfiguračný adresár"
 
-#: src/main.c:2111
+#: src/main.c:1938
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6823,40 +6681,40 @@ msgstr ""
 "  --alternate-config-dir [adresár]\n"
 "                         použiť iný konfiguračný adresár"
 
-#: src/main.c:2161
+#: src/main.c:1988
 msgid "Unknown option\n"
 msgstr "Neznáma voľba\n"
 
-#: src/main.c:2179
+#: src/main.c:2006
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Spracovanie (%s)…"
 
-#: src/main.c:2182
+#: src/main.c:2009
 msgid "top level folder"
 msgstr "zložka najvyššej úrovne"
 
-#: src/main.c:2265
+#: src/main.c:2092
 msgid "Queued messages"
 msgstr "Správy vo fronte"
 
-#: src/main.c:2266
+#: src/main.c:2093
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vo fronte sú neodoslané správy. Ukončiť program?"
 
-#: src/main.c:2999
+#: src/main.c:2818
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: sieť je pripojená.\n"
 
-#: src/main.c:3005
+#: src/main.c:2824
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: sieť nie je pripojená.\n"
 
-#: src/mainwindow.c:503 src/messageview.c:210
+#: src/mainwindow.c:503 src/messageview.c:208
 msgid "_File"
 msgstr "_Súbor"
 
-#: src/mainwindow.c:505 src/messageview.c:212 src/summaryview.c:436
+#: src/mainwindow.c:505 src/messageview.c:210 src/summaryview.c:436
 msgid "_View"
 msgstr "Zo_braziť"
 
@@ -6892,19 +6750,19 @@ msgstr "Exportovať _výber do súboru mbox…"
 msgid "Empty all _Trash folders"
 msgstr "Vyčistiť všetky _koše"
 
-#: src/mainwindow.c:526 src/messageview.c:219
+#: src/mainwindow.c:526 src/messageview.c:217
 msgid "_Save email as..."
 msgstr "_Uložiť email ako…"
 
-#: src/mainwindow.c:527 src/messageview.c:220
+#: src/mainwindow.c:527 src/messageview.c:218
 msgid "_Save part as..."
 msgstr "_Uložiť časť ako…"
 
-#: src/mainwindow.c:530 src/messageview.c:221
+#: src/mainwindow.c:530 src/messageview.c:219
 msgid "Page setup..."
 msgstr "Nastavenie strany…"
 
-#: src/mainwindow.c:531 src/messageview.c:222
+#: src/mainwindow.c:531 src/messageview.c:220
 msgid "_Print..."
 msgstr "_Tlačiť…"
 
@@ -6972,99 +6830,99 @@ msgstr "_Rozbaliť všetky vlákna"
 msgid "Co_llapse all threads"
 msgstr "Zba_liť všetky vlákna"
 
-#: src/mainwindow.c:568 src/messageview.c:233
+#: src/mainwindow.c:568 src/messageview.c:231
 msgid "_Go to"
 msgstr "Pre_jsť na"
 
-#: src/mainwindow.c:569 src/messageview.c:234
+#: src/mainwindow.c:569 src/messageview.c:232
 msgid "_Previous message"
 msgstr "_Predošlá správa"
 
-#: src/mainwindow.c:570 src/messageview.c:235
+#: src/mainwindow.c:570 src/messageview.c:233
 msgid "_Next message"
 msgstr "Ďa_lšia správa"
 
-#: src/mainwindow.c:572 src/messageview.c:237
+#: src/mainwindow.c:572 src/messageview.c:235
 msgid "P_revious unread message"
 msgstr "P_redchádzajúca neprečítaná správa"
 
-#: src/mainwindow.c:573 src/messageview.c:238
+#: src/mainwindow.c:573 src/messageview.c:236
 msgid "N_ext unread message"
 msgstr "Ďalšia _neprečítaná správa."
 
-#: src/mainwindow.c:575 src/messageview.c:240
+#: src/mainwindow.c:575 src/messageview.c:238
 msgid "Previous ne_w message"
 msgstr "Predchádzajúca no_vá správa"
 
-#: src/mainwindow.c:576 src/messageview.c:241
+#: src/mainwindow.c:576 src/messageview.c:239
 msgid "Ne_xt new message"
 msgstr "Ďalšia no_vá správa"
 
-#: src/mainwindow.c:578 src/messageview.c:243
+#: src/mainwindow.c:578 src/messageview.c:241
 msgid "Previous _marked message"
 msgstr "Predchádzajúca _označená správa"
 
-#: src/mainwindow.c:579 src/messageview.c:244
+#: src/mainwindow.c:579 src/messageview.c:242
 msgid "Next m_arked message"
 msgstr "Ďalšia _označená správa"
 
-#: src/mainwindow.c:581 src/messageview.c:246
+#: src/mainwindow.c:581 src/messageview.c:244
 msgid "Previous _labeled message"
 msgstr "Predchádzajúca správa s návestí_m"
 
-#: src/mainwindow.c:582 src/messageview.c:247
+#: src/mainwindow.c:582 src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "Ďalšia správa s návestí_m"
 
-#: src/mainwindow.c:584 src/messageview.c:249
+#: src/mainwindow.c:584 src/messageview.c:247
 msgid "Previous opened message"
 msgstr "Naposledy ot_vorená správa"
 
-#: src/mainwindow.c:585 src/messageview.c:250
+#: src/mainwindow.c:585 src/messageview.c:248
 msgid "Next opened message"
 msgstr "Ďalšia o_tvorená správa"
 
-#: src/mainwindow.c:587 src/messageview.c:252
+#: src/mainwindow.c:587 src/messageview.c:250
 msgid "Parent message"
 msgstr "Rodičovská správa"
 
-#: src/mainwindow.c:589 src/messageview.c:254
+#: src/mainwindow.c:589 src/messageview.c:252
 msgid "Next unread _folder"
 msgstr "Ďalšia nepr_ečítaná zložka"
 
-#: src/mainwindow.c:590 src/messageview.c:255
+#: src/mainwindow.c:590 src/messageview.c:253
 msgid "_Other folder..."
 msgstr "_Iná zložka…"
 
-#: src/mainwindow.c:592 src/messageview.c:257 src/mimeview.c:210
+#: src/mainwindow.c:592 src/messageview.c:255 src/mimeview.c:201
 msgid "Next part"
 msgstr "Ďalšia časť"
 
-#: src/mainwindow.c:593 src/messageview.c:258 src/mimeview.c:211
+#: src/mainwindow.c:593 src/messageview.c:256 src/mimeview.c:202
 msgid "Previous part"
 msgstr "Predošlá časť"
 
-#: src/mainwindow.c:596 src/messageview.c:259
+#: src/mainwindow.c:596 src/messageview.c:257
 msgid "Message scroll"
 msgstr "Posúvanie správy"
 
-#: src/mainwindow.c:597 src/messageview.c:260
+#: src/mainwindow.c:597 src/messageview.c:258
 msgid "Previous line"
 msgstr "Predošlý riadok"
 
-#: src/mainwindow.c:598 src/messageview.c:261
+#: src/mainwindow.c:598 src/messageview.c:259
 msgid "Next line"
 msgstr "Ďalší riadok"
 
-#: src/mainwindow.c:599 src/messageview.c:262 src/printing.c:487
+#: src/mainwindow.c:599 src/messageview.c:260 src/printing.c:487
 msgid "Previous page"
 msgstr "Predošlá strana"
 
-#: src/mainwindow.c:600 src/messageview.c:263 src/printing.c:494
+#: src/mainwindow.c:600 src/messageview.c:261 src/printing.c:494
 msgid "Next page"
 msgstr "Ďalšia strana"
 
-#: src/mainwindow.c:618 src/messageview.c:281
+#: src/mainwindow.c:618 src/messageview.c:279
 msgid "Decode"
 msgstr "Dekódovať"
 
@@ -7072,27 +6930,27 @@ msgstr "Dekódovať"
 msgid "Open in new _window"
 msgstr "Otvoriť v _novom okne"
 
-#: src/mainwindow.c:626 src/messageview.c:288
+#: src/mainwindow.c:626 src/messageview.c:286
 msgid "Mess_age source"
 msgstr "Zdrojový kód správ_y"
 
-#: src/mainwindow.c:628 src/messageview.c:289
+#: src/mainwindow.c:628 src/messageview.c:287
 msgid "Message part"
 msgstr "Správová časť"
 
-#: src/mainwindow.c:629 src/messageview.c:290
+#: src/mainwindow.c:629 src/messageview.c:288
 msgid "View as text"
 msgstr "Zobraziť ako text"
 
-#: src/mainwindow.c:630 src/messageview.c:291 src/toolbar.c:401
+#: src/mainwindow.c:630 src/messageview.c:289 src/toolbar.c:402
 msgid "Open"
 msgstr "Otvoriť"
 
-#: src/mainwindow.c:632 src/messageview.c:293
+#: src/mainwindow.c:632 src/messageview.c:291
 msgid "Open with..."
 msgstr "Otvoriť pomocou…"
 
-#: src/mainwindow.c:636 src/messageview.c:296
+#: src/mainwindow.c:636 src/messageview.c:294
 msgid "Quotes"
 msgstr "Citácia"
 
@@ -7128,16 +6986,16 @@ msgstr "_Napísať novú správu"
 msgid "Compose a news message"
 msgstr "Napísať nový príspevok"
 
-#: src/mainwindow.c:655 src/messageview.c:302
+#: src/mainwindow.c:655 src/messageview.c:300
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Odpovedať"
 
-#: src/mainwindow.c:656 src/messageview.c:303 src/summaryview.c:428
+#: src/mainwindow.c:656 src/messageview.c:301 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "O_dpovedať komu"
 
-#: src/mainwindow.c:659 src/messageview.c:306
+#: src/mainwindow.c:659 src/messageview.c:304
 msgid "Mailing _list"
 msgstr "Emai_lová konferencia"
 
@@ -7145,15 +7003,15 @@ msgstr "Emai_lová konferencia"
 msgid "Follow-up and reply to"
 msgstr "Sledovať a odpovedať na"
 
-#: src/mainwindow.c:663 src/messageview.c:309 src/toolbar.c:2087
+#: src/mainwindow.c:663 src/messageview.c:307 src/toolbar.c:2088
 msgid "_Forward"
 msgstr "_Poslať ďalej"
 
-#: src/mainwindow.c:664 src/messageview.c:310 src/toolbar.c:2088
+#: src/mainwindow.c:664 src/messageview.c:308 src/toolbar.c:2089
 msgid "For_ward as attachment"
 msgstr "Poslať ďale_j ako prílohu"
 
-#: src/mainwindow.c:665 src/messageview.c:311 src/toolbar.c:2089
+#: src/mainwindow.c:665 src/messageview.c:309 src/toolbar.c:2090
 msgid "Redirec_t"
 msgstr "P_resmerovať"
 
@@ -7221,8 +7079,8 @@ msgstr "Označiť ako _prečítané"
 msgid "Mark all read"
 msgstr "Označiť _všetky ako prečítané"
 
-#: src/mainwindow.c:699 src/prefs_filtering_action.c:199 src/toolbar.c:207
-#: src/toolbar.c:417
+#: src/mainwindow.c:699 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/toolbar.c:418
 msgid "Ignore thread"
 msgstr "Ignorovať vlákno"
 
@@ -7230,8 +7088,8 @@ msgstr "Ignorovať vlákno"
 msgid "Unignore thread"
 msgstr "Zrušiť ignorovanie vlákna"
 
-#: src/mainwindow.c:701 src/prefs_filtering_action.c:200 src/toolbar.c:208
-#: src/toolbar.c:418
+#: src/mainwindow.c:701 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/toolbar.c:419
 msgid "Watch thread"
 msgstr "Sledovať vlákno"
 
@@ -7267,11 +7125,11 @@ msgstr "Z_načky"
 msgid "Re-_edit"
 msgstr "Znova _upraviť"
 
-#: src/mainwindow.c:719 src/messageview.c:312 src/mimeview.c:1039
+#: src/mainwindow.c:719 src/messageview.c:310 src/mimeview.c:1030
 msgid "Check signature"
 msgstr "Overiť podpis"
 
-#: src/mainwindow.c:724 src/messageview.c:316
+#: src/mainwindow.c:724 src/messageview.c:314
 msgid "Add sender to address boo_k"
 msgstr "Pridať odosielateľa _do adresára"
 
@@ -7299,35 +7157,35 @@ msgstr "Filtrovať _zvolené správy"
 msgid "Run folder pr_ocessing rules"
 msgstr "Spustiť sprac_ovanie pravidiel"
 
-#: src/mainwindow.c:735 src/messageview.c:319
+#: src/mainwindow.c:735 src/messageview.c:317
 msgid "_Create filter rule"
 msgstr "Vytvor_iť pravidlo filtra"
 
-#: src/mainwindow.c:736 src/mainwindow.c:742 src/messageview.c:320
-#: src/messageview.c:326
+#: src/mainwindow.c:736 src/mainwindow.c:742 src/messageview.c:318
+#: src/messageview.c:324
 msgid "_Automatically"
 msgstr "_Automaticky"
 
-#: src/mainwindow.c:737 src/mainwindow.c:743 src/mainwindow.c:847
-#: src/messageview.c:321 src/messageview.c:327
+#: src/mainwindow.c:737 src/mainwindow.c:743 src/mainwindow.c:845
+#: src/messageview.c:319 src/messageview.c:325
 msgid "By _From"
 msgstr "Podľa _odosielateľa"
 
-#: src/mainwindow.c:738 src/mainwindow.c:744 src/mainwindow.c:848
-#: src/messageview.c:322 src/messageview.c:328
+#: src/mainwindow.c:738 src/mainwindow.c:744 src/mainwindow.c:846
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _To"
 msgstr "Podľa _adresáta"
 
-#: src/mainwindow.c:739 src/mainwindow.c:745 src/messageview.c:323
-#: src/messageview.c:329
+#: src/mainwindow.c:739 src/mainwindow.c:745 src/messageview.c:321
+#: src/messageview.c:327
 msgid "By _Subject"
 msgstr "Podľa _predmetu"
 
-#: src/mainwindow.c:741 src/messageview.c:325 src/summaryview.c:434
+#: src/mainwindow.c:741 src/messageview.c:323 src/summaryview.c:434
 msgid "Create processing rule"
 msgstr "Vytvoriť pravidlo spracovania"
 
-#: src/mainwindow.c:748 src/messageview.c:333
+#: src/mainwindow.c:748 src/messageview.c:331
 msgid "List _URLs..."
 msgstr "Zobraziť všetky _URL…"
 
@@ -7467,186 +7325,186 @@ msgstr "S_kryť prečítané správy"
 msgid "Hide deleted messages"
 msgstr "Skryť vymazané správy"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:815
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
-#: src/mainwindow.c:818 src/messageview.c:345
+#: src/mainwindow.c:816 src/messageview.c:343
 msgid "Show all _headers"
 msgstr "Zobraziť všetky _hlavičky"
 
-#: src/mainwindow.c:819 src/messageview.c:346
+#: src/mainwindow.c:817 src/messageview.c:344
 msgid "_Collapse all"
 msgstr "Zba_liť všetky"
 
-#: src/mainwindow.c:820 src/messageview.c:347
+#: src/mainwindow.c:818 src/messageview.c:345
 msgid "Collapse from level _2"
 msgstr "Zbaliť od úrovne _2"
 
-#: src/mainwindow.c:821 src/messageview.c:348
+#: src/mainwindow.c:819 src/messageview.c:346
 msgid "Collapse from level _3"
 msgstr "Zbaliť od úrovne _3"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:823
 msgid "Text _below icons"
 msgstr "Text _pod ikonami"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:824
 msgid "Text be_side icons"
 msgstr "Text _vedľa ikon"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:825
 msgid "_Icons only"
 msgstr "Len _ikony"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:826
 msgid "_Text only"
 msgstr "Len _text"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:833
 msgid "_Standard"
 msgstr "Šta_ndardný"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:834
 msgid "_Three columns"
 msgstr "_Tri stĺpce"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:835
 msgid "_Wide message"
 msgstr "Š_iroká správa"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:836
 msgid "W_ide message list"
 msgstr "Široký _zoznam správ"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:837
 msgid "S_mall screen"
 msgstr "_Malá obrazovka"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:841
 msgid "By _number"
 msgstr "Podľa _čísla"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:842
 msgid "By s_ize"
 msgstr "Podľa _veľkosti"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:843
 msgid "By _date"
 msgstr "Podľa _dátumu"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:844
 msgid "By thread date"
 msgstr "Podľa dátumu v_lákna"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:847
 msgid "By s_ubject"
 msgstr "Podľa _predmetu"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:848
 msgid "By _color label"
 msgstr "Podľa _farebnej menovky"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:849
 msgid "By tag"
 msgstr "Podľa _značky"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:850
 msgid "By _mark"
 msgstr "Podľa _označenia"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:851
 msgid "By _status"
 msgstr "Podľa _stavu"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:852
 msgid "By a_ttachment"
 msgstr "Podľa _prílohy"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:853
 msgid "By score"
 msgstr "Podľa s_kóre"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:854
 msgid "By locked"
 msgstr "Podľa _zamknutia"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:855
 msgid "D_on't sort"
 msgstr "_Neradiť"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:859
 msgid "Ascending"
 msgstr "Vzostupne"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:860
 msgid "Descending"
 msgstr "Zostupne"
 
-#: src/mainwindow.c:903 src/messageview.c:389
+#: src/mainwindow.c:901 src/messageview.c:387
 msgid "_Auto detect"
 msgstr "_Automaticky zistiť"
 
-#: src/mainwindow.c:1299 src/summaryview.c:6238
+#: src/mainwindow.c:1297 src/summaryview.c:6234
 msgid "Apply tags..."
 msgstr "Použiť značky…"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:1935
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Nastala chyba(y). Kliknite tu na zobrazenie okna so záznamom."
 
-#: src/mainwindow.c:2127
+#: src/mainwindow.c:1950
 msgid "You are online. Click the icon to go offline"
 msgstr "Ste pripojený. Kliknite na ikonu ak sa chcete odpojiť"
 
-#: src/mainwindow.c:2130
+#: src/mainwindow.c:1953
 msgid "You are offline. Click the icon to go online"
 msgstr "Ste odpojený. Kliknite na ikonu ak sa chcete pripojiť"
 
-#: src/mainwindow.c:2144
+#: src/mainwindow.c:1967
 msgid "Select account"
 msgstr "Zvoliť účet"
 
-#: src/mainwindow.c:2171 src/prefs_logging.c:140
+#: src/mainwindow.c:1994 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Záznam komunikácie"
 
-#: src/mainwindow.c:2175
+#: src/mainwindow.c:1998
 msgid "Filtering/Processing debug log"
 msgstr "Záznam ladenia filtrovania/spracovania"
 
-#: src/mainwindow.c:2194 src/prefs_logging.c:392
+#: src/mainwindow.c:2017 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "záznam filtrovania zapnutý\n"
 
-#: src/mainwindow.c:2196 src/prefs_logging.c:394
+#: src/mainwindow.c:2019 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "záznam filtrovania vypnutý\n"
 
-#: src/mainwindow.c:2642 src/mainwindow.c:2649 src/mainwindow.c:2692
-#: src/mainwindow.c:2725 src/mainwindow.c:2757 src/mainwindow.c:2802
+#: src/mainwindow.c:2460 src/mainwindow.c:2467 src/mainwindow.c:2510
+#: src/mainwindow.c:2543 src/mainwindow.c:2575 src/mainwindow.c:2620
 #: src/plugins/notification/notification_trayicon.c:363
 #: src/prefs_folder_item.c:1067
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: src/mainwindow.c:2803 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2621 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:3060 src/mainwindow.c:3064
+#: src/mainwindow.c:2878 src/mainwindow.c:2882
 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v košoch?"
 
-#: src/mainwindow.c:3061
+#: src/mainwindow.c:2879
 msgid "Don't quit"
 msgstr "Neskončiť"
 
-#: src/mainwindow.c:3090 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2908 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Pridať poštovú schránku"
 
-#: src/mainwindow.c:3091
+#: src/mainwindow.c:2909
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7656,18 +7514,18 @@ msgstr ""
 "Ak zadáte názov existujúcej schránky, bude\n"
 "táto automaticky prehľadaná."
 
-#: src/mainwindow.c:3097 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:158
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Schránka „%s” už existuje."
 
-#: src/mainwindow.c:3102 src/plugins/mailmbox/plugin_gtk.c:202 src/setup.c:52
-#: src/wizard.c:774
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:202 src/setup.c:52
+#: src/wizard.c:737
 msgid "Mailbox"
 msgstr "Schránka"
 
-#: src/mainwindow.c:3107 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:55
+#: src/mainwindow.c:2925 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7676,43 +7534,43 @@ msgstr ""
 "Nemožno vytvoriť schránku.\n"
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte právo zápisu."
 
-#: src/mainwindow.c:3553
+#: src/mainwindow.c:3373
 msgid "No posting allowed"
 msgstr "Prispievanie nie je povolené"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "Zlyhal import súboru mbox."
 
-#: src/mainwindow.c:4140 src/mainwindow.c:4149
+#: src/mainwindow.c:3960 src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "Zlyhal export do mbox."
 
-#: src/mainwindow.c:4190 src/plugins/notification/notification_trayicon.c:518
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:518
 msgid "Exit"
 msgstr "Skončiť"
 
-#: src/mainwindow.c:4190 src/plugins/notification/notification_trayicon.c:518
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:518
 msgid "Exit Claws Mail?"
 msgstr "Skončiť Claws Mail?"
 
-#: src/mainwindow.c:4379
+#: src/mainwindow.c:4199
 msgid "Folder synchronisation"
 msgstr "Synchronizácia zložiek"
 
-#: src/mainwindow.c:4380
+#: src/mainwindow.c:4200
 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete teraz synchronizovať svoje zložky?"
 
-#: src/mainwindow.c:4381
+#: src/mainwindow.c:4201
 msgid "+_Synchronise"
 msgstr "+_Synchronizovať"
 
-#: src/mainwindow.c:4810
+#: src/mainwindow.c:4630
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplicitné správy…"
 
-#: src/mainwindow.c:4847
+#: src/mainwindow.c:4667
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -7720,34 +7578,34 @@ msgstr[0] "Zmazaná %d duplicitná správa v %d zložkách.\n"
 msgstr[1] "Zmazané %d duplicitné správy v %d zložkách.\n"
 msgstr[2] "Zmazaných %d duplicitných správ v %d zložkách.\n"
 
-#: src/mainwindow.c:5102 src/summaryview.c:5727
+#: src/mainwindow.c:4922 src/summaryview.c:5723
 msgid "Processing rules to apply before folder rules"
 msgstr "Pravidlá spracovania použité pred pravidlami zložky"
 
-#: src/mainwindow.c:5110
+#: src/mainwindow.c:4930
 msgid "Processing rules to apply after folder rules"
 msgstr "Pravidlá spracovania použité po pravidlách zložky"
 
-#: src/mainwindow.c:5118 src/summaryview.c:5738
+#: src/mainwindow.c:4938 src/summaryview.c:5734
 msgid "Filtering configuration"
 msgstr "Nastavenie filtrovania"
 
-#: src/mainwindow.c:5233
+#: src/mainwindow.c:5053
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Nemožno registrovať ako predvoleného klienta: nemožné nájsť cestu programu."
 
-#: src/mainwindow.c:5292
+#: src/mainwindow.c:5112
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail bol zaregistrovaný ako predvolený klient."
 
-#: src/mainwindow.c:5294
+#: src/mainwindow.c:5114
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Nemožno registrovať ako predvolený klient: nemožné zapisovať do registra."
 
-#: src/mainwindow.c:5452
+#: src/mainwindow.c:5272
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7777,30 +7635,30 @@ msgstr "riadok tela správy"
 msgid "tag"
 msgstr "značka"
 
-#: src/matcher.c:517 src/matcher.c:522 src/matcher.c:542 src/matcher.c:547
-#: src/message_search.c:212 src/prefs_matcher.c:737 src/summary_search.c:452
+#: src/matcher.c:523 src/matcher.c:528 src/matcher.c:548 src/matcher.c:553
+#: src/message_search.c:217 src/prefs_matcher.c:739 src/summary_search.c:478
 msgid "Case sensitive"
 msgstr "Záleží na veľkosti písmen"
 
-#: src/matcher.c:517 src/matcher.c:522 src/matcher.c:542 src/matcher.c:547
+#: src/matcher.c:523 src/matcher.c:528 src/matcher.c:548 src/matcher.c:553
 msgid "Case insensitive"
 msgstr "Nezáleží na veľkosti"
 
-#: src/matcher.c:1809
+#: src/matcher.c:1819
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "zisťujem či správa vyhovuje [ %s ]\n"
 
-#: src/matcher.c:1878 src/matcher.c:1897 src/matcher.c:1910
+#: src/matcher.c:1888 src/matcher.c:1907 src/matcher.c:1920
 msgid "message matches\n"
 msgstr "správa vyhovuje\n"
 
-#: src/matcher.c:1885 src/matcher.c:1903 src/matcher.c:1912
+#: src/matcher.c:1895 src/matcher.c:1913 src/matcher.c:1922
 msgid "message does not match\n"
 msgstr "správa nevyhovuje\n"
 
-#: src/matcher.c:2175 src/matcher.c:2176 src/matcher.c:2177 src/matcher.c:2178
-#: src/matcher.c:2179 src/matcher.c:2180 src/matcher.c:2181 src/matcher.c:2182
+#: src/matcher.c:2185 src/matcher.c:2186 src/matcher.c:2187 src/matcher.c:2188
+#: src/matcher.c:2189 src/matcher.c:2190 src/matcher.c:2191 src/matcher.c:2192
 msgid "(none)"
 msgstr "(žiadna)"
 
@@ -7829,7 +7687,7 @@ msgstr "Prepísať súbor mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tento súbor už existuje. Chcete ho prepísať?"
 
-#: src/mbox.c:555 src/messageview.c:1868 src/mimeview.c:1850
+#: src/mbox.c:555 src/messageview.c:1843 src/mimeview.c:1844
 #: src/prefs_themes.c:553 src/textview.c:3120
 msgid "Overwrite"
 msgstr "Prepísať"
@@ -7855,39 +7713,39 @@ msgstr "Nájsť v aktuálnej správe"
 msgid "Find text:"
 msgstr "Hľadaný text:"
 
-#: src/message_search.c:332 src/summary_search.c:768
+#: src/message_search.c:346 src/summary_search.c:791
 msgid "Search failed"
 msgstr "Hľadanie zlyhalo"
 
-#: src/message_search.c:333 src/summary_search.c:769
+#: src/message_search.c:347 src/summary_search.c:792
 msgid "Search string not found."
 msgstr "Hľadaný reťazec nenájdený."
 
-#: src/message_search.c:342
+#: src/message_search.c:356
 msgid "Beginning of message reached; continue from end?"
 msgstr "Dosiahnutý začiatok správy; pokračovať od konca?"
 
-#: src/message_search.c:345
+#: src/message_search.c:359
 msgid "End of message reached; continue from beginning?"
 msgstr "Dosiahnutý koniec správy; pokračovať od začiatku?"
 
-#: src/message_search.c:348 src/summary_search.c:780
+#: src/message_search.c:362 src/summary_search.c:803
 msgid "Search finished"
 msgstr "Hľadanie dokončené"
 
-#: src/messageview.c:299 src/textview.c:245
+#: src/messageview.c:297 src/textview.c:245
 msgid "Compose _new message"
 msgstr "Napísať _novú správu"
 
-#: src/messageview.c:729 src/messageview.c:1413 src/messageview.c:1610
+#: src/messageview.c:711 src/messageview.c:1388 src/messageview.c:1585
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Zobrazenie správy"
 
-#: src/messageview.c:860
+#: src/messageview.c:838
 msgid "<No Return-Path found>"
 msgstr "<Nenájdená adresa pre odpoveď>"
 
-#: src/messageview.c:868
+#: src/messageview.c:846
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7902,11 +7760,11 @@ msgstr ""
 "Návratová cesta: %s\n"
 "Odporúčame toto potvrdenie neodoslať."
 
-#: src/messageview.c:875 src/messageview.c:892
+#: src/messageview.c:853 src/messageview.c:870
 msgid "_Don't Send"
 msgstr "_Neodoslať"
 
-#: src/messageview.c:888
+#: src/messageview.c:866
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7918,64 +7776,64 @@ msgstr ""
 "oficiálne adresovaná vám.\n"
 "Neodporúčame toto potvrdenie odoslať."
 
-#: src/messageview.c:1341
+#: src/messageview.c:1319
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Sťahovanie správy (%s)…"
 
-#: src/messageview.c:1377 src/procmime.c:983
+#: src/messageview.c:1355 src/procmime.c:986
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Nemožno dešifrovať: %s"
 
-#: src/messageview.c:1460 src/messageview.c:1468
+#: src/messageview.c:1435 src/messageview.c:1443
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Správa nezodpovedá štandardu MIME. Môže byť zle zobrazená."
 
-#: src/messageview.c:1860 src/messageview.c:1863 src/mimeview.c:2003
-#: src/plugins/fancy/fancy_viewer.c:667 src/summaryview.c:4814
-#: src/summaryview.c:4817 src/textview.c:3108
+#: src/messageview.c:1835 src/messageview.c:1838 src/mimeview.c:1997
+#: src/plugins/fancy/fancy_viewer.c:668 src/summaryview.c:4810
+#: src/summaryview.c:4813 src/textview.c:3108
 msgid "Save as"
 msgstr "Uložiť ako"
 
-#: src/messageview.c:1869
+#: src/messageview.c:1844
 msgid "Overwrite existing file?"
 msgstr "Prepísať existujúci súbor?"
 
-#: src/messageview.c:1877 src/summaryview.c:4834 src/summaryview.c:4837
-#: src/summaryview.c:4852
+#: src/messageview.c:1852 src/summaryview.c:4830 src/summaryview.c:4833
+#: src/summaryview.c:4848
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Nemožno uložiť súbor „%s”."
 
-#: src/messageview.c:1931
+#: src/messageview.c:1905
 #, c-format
 msgid "Show all %s."
 msgstr "Zobraziť všetky %s."
 
-#: src/messageview.c:1933
+#: src/messageview.c:1907
 msgid "Only the first megabyte of text is shown."
 msgstr "Zobrazený je len prvý megabajt textu."
 
-#: src/messageview.c:1964
+#: src/messageview.c:1938
 msgid ""
 "You got a return receipt for this message : it has been displayed by the "
 "recipient."
 msgstr "Dostali ste potvrdenie tejto správy: bola zobrazená príjemcom."
 
-#: src/messageview.c:1967
+#: src/messageview.c:1941
 msgid "You asked for a return receipt in this message."
 msgstr "Vyžiadali ste si potvrdenie o prijatí tejto správy."
 
-#: src/messageview.c:1973
+#: src/messageview.c:1947
 msgid "This message asks for a return receipt."
 msgstr "Táto správa chce aby ste odoslali potvrdenie o prijatí."
 
-#: src/messageview.c:1974
+#: src/messageview.c:1948
 msgid "Send receipt"
 msgstr "Odoslať potvrdenie"
 
-#: src/messageview.c:2017
+#: src/messageview.c:1991
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -7983,7 +7841,7 @@ msgstr ""
 "Táto správa bola čiastočne prijatá,\n"
 "a bola zmazaná zo servera."
 
-#: src/messageview.c:2023
+#: src/messageview.c:1997
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7992,15 +7850,15 @@ msgstr ""
 "Táto správa vola čiastočne prijatá;\n"
 "je %s."
 
-#: src/messageview.c:2027 src/messageview.c:2049
+#: src/messageview.c:2001 src/messageview.c:2023
 msgid "Mark for download"
 msgstr "Označiť na stiahnutie"
 
-#: src/messageview.c:2028 src/messageview.c:2040
+#: src/messageview.c:2002 src/messageview.c:2014
 msgid "Mark for deletion"
 msgstr "Označiť na odstránenie"
 
-#: src/messageview.c:2033
+#: src/messageview.c:2007
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8009,12 +7867,12 @@ msgstr ""
 "Táto správa vola čiastočne prijatá;\n"
 "je %s a bude stiahnutá."
 
-#: src/messageview.c:2038 src/messageview.c:2051
+#: src/messageview.c:2012 src/messageview.c:2025
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Odznačiť"
 
-#: src/messageview.c:2044
+#: src/messageview.c:2018
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8023,11 +7881,11 @@ msgstr ""
 "Táto správa vola čiastočne prijatá;\n"
 "je %s a bude zmazaná."
 
-#: src/messageview.c:2117
+#: src/messageview.c:2091
 msgid "Return Receipt Notification"
 msgstr "Potvrdenie o príjme"
 
-#: src/messageview.c:2118
+#: src/messageview.c:2092
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8037,19 +7895,19 @@ msgstr ""
 "Viac ako jeden účet používa adresu, na ktorú bola táto správa odoslaná.\n"
 "Prosím vyberte účet, ktorý chcete použiť na odoslanie potvrdenia o príjme:"
 
-#: src/messageview.c:2122 src/plugins/rssyl/rssyl_gtk.c:480
+#: src/messageview.c:2096 src/plugins/rssyl/rssyl_gtk.c:480
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: src/messageview.c:2122
+#: src/messageview.c:2096
 msgid "_Send Notification"
 msgstr "Odo_slať potvrdenie"
 
-#: src/messageview.c:2189
+#: src/messageview.c:2163
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Nemožno tlačiť: správa neobsahuje text."
 
-#: src/messageview.c:2958
+#: src/messageview.c:2932
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8057,7 +7915,7 @@ msgstr ""
 "\n"
 "  V tejto zložke nie sú správy"
 
-#: src/messageview.c:2966
+#: src/messageview.c:2940
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8065,7 +7923,7 @@ msgstr ""
 "\n"
 "  Správa bola odstránená"
 
-#: src/messageview.c:2967
+#: src/messageview.c:2941
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8073,8 +7931,8 @@ msgstr ""
 "\n"
 "  Správa bola odstránená alebo presunutá do inej zložky"
 
-#: src/messageview.c:3000 src/messageview.c:3006 src/summaryview.c:4187
-#: src/summaryview.c:6975
+#: src/messageview.c:2974 src/messageview.c:2980 src/summaryview.c:4183
+#: src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "Nastala chyba pri učení.\n"
 
@@ -8108,58 +7966,58 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/mimeview.c:202
+#: src/mimeview.c:193
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#: src/mimeview.c:204
+#: src/mimeview.c:195
 msgid "Open _with..."
 msgstr "Otvoriť _pomocou…"
 
-#: src/mimeview.c:206
+#: src/mimeview.c:197
 msgid "Send to..."
 msgstr "Odoslať do…"
 
-#: src/mimeview.c:207
+#: src/mimeview.c:198
 msgid "_Display as text"
-msgstr "Zobraziť ako text"
+msgstr "_Zobraziť ako text"
 
-#: src/mimeview.c:208
+#: src/mimeview.c:199
 msgid "_Save as..."
 msgstr "_Uložiť ako…"
 
-#: src/mimeview.c:209
+#: src/mimeview.c:200
 msgid "Save _all..."
 msgstr "Uložiť _všetky…"
 
-#: src/mimeview.c:282
+#: src/mimeview.c:273
 msgid "MIME Type"
 msgstr "MIME typ"
 
-#: src/mimeview.c:1044 src/mimeview.c:1049 src/mimeview.c:1054
-#: src/mimeview.c:1059
+#: src/mimeview.c:1035 src/mimeview.c:1040 src/mimeview.c:1045
+#: src/mimeview.c:1050
 msgid "View full information"
 msgstr "Zobraziť úplné informácie"
 
-#: src/mimeview.c:1065
+#: src/mimeview.c:1056
 msgid "Check again"
 msgstr "Znova overiť"
 
-#: src/mimeview.c:1077
+#: src/mimeview.c:1068
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Na overenie kliknite na ikonu."
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1070
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Na overenie kliknite na ikonu alebo stlačte „%s”."
 
-#: src/mimeview.c:1089
+#: src/mimeview.c:1080
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr "Čas na overenie podpisu vypršal. Na zopakovanie kliknite na ikonu."
 
-#: src/mimeview.c:1091
+#: src/mimeview.c:1082
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8167,44 +8025,40 @@ msgstr ""
 "Čas na overenie podpisu vypršal. Na zopakovanie kliknite na ikonu alebo "
 "stlačte „%s”."
 
-#: src/mimeview.c:1330
+#: src/mimeview.c:1322
 msgid "Checking signature..."
 msgstr "Overovanie podpisu…"
 
-#: src/mimeview.c:1373
+#: src/mimeview.c:1363
 msgid "Go back to email"
 msgstr "Naspäť na správu"
 
-#: src/mimeview.c:1769 src/mimeview.c:1858 src/mimeview.c:2050
-#: src/mimeview.c:2093 src/mimeview.c:2224
-#: src/plugins/fancy/fancy_viewer.c:420
+#: src/mimeview.c:1763 src/mimeview.c:1852 src/mimeview.c:2044
+#: src/mimeview.c:2080 src/mimeview.c:2192
+#: src/plugins/fancy/fancy_viewer.c:421
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nemožno uložiť časť viacdielnej správy: %s"
 
-#: src/mimeview.c:1847 src/textview.c:3118
+#: src/mimeview.c:1841 src/textview.c:3118
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Prepísať existujúci súbor „%s”?"
 
-#: src/mimeview.c:1889 src/plugins/archive/archiver_prefs.c:128
+#: src/mimeview.c:1883 src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
 msgstr "Zvoľte cieľovú zložku"
 
-#: src/mimeview.c:1896 src/plugins/archive/archiver_prefs.c:134
+#: src/mimeview.c:1890 src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "„%s” nie je zložka."
 
-#: src/mimeview.c:2125
-msgid "No registered viewer for this file type."
-msgstr "Pre tento typ súboru nie je registrovaný prehliadač."
-
-#: src/mimeview.c:2157 src/mimeview.c:2164 src/textview.c:3039
+#: src/mimeview.c:2127 src/mimeview.c:2134 src/textview.c:3039
 msgid "Open with"
 msgstr "Otvoriť čím"
 
-#: src/mimeview.c:2158 src/mimeview.c:2165 src/textview.c:3040
+#: src/mimeview.c:2128 src/mimeview.c:2135 src/textview.c:3040
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8213,11 +8067,11 @@ msgstr ""
 "Zadajte príkazový na otvorenie súboru:\n"
 "(„%s” bude nahradené názvom súboru)"
 
-#: src/mimeview.c:2258
+#: src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "Spustiť neznámy binárny súbor?"
 
-#: src/mimeview.c:2259
+#: src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8229,96 +8083,96 @@ msgstr ""
 "\n"
 "Naozaj chcete spustiť tento súbor?"
 
-#: src/mimeview.c:2263
+#: src/mimeview.c:2231
 msgid "Run binary"
 msgstr "Spustiť binárny súbor"
 
-#: src/mimeview.c:2565
+#: src/mimeview.c:2533
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/mimeview.c:2566 src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/mimeview.c:2534 src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Size:"
 msgstr "Veľkosť:"
 
-#: src/mimeview.c:2578 src/plugins/vcalendar/vcalendar.c:1271
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1730
+#: src/mimeview.c:2546 src/plugins/vcalendar/vcalendar.c:1271
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1741
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1751
 msgid "Description:"
 msgstr "Popis:"
 
-#: src/news.c:300
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "Spojenie NNTP k %s:%d bolo prerušené.\n"
 
-#: src/news.c:333
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Účet „%s”: Pripájanie k serveru NNTP: %s:%d…\n"
 
-#: src/news.c:354
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Chyba pri prihlasovaní k %s:%d …\n"
 
-#: src/news.c:432
+#: src/news.c:438
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan nepodporuje návratový kód 480, takže teraz zvoľte pokračovať\n"
 
-#: src/news.c:441
+#: src/news.c:447
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Mode reader zlyhalo, napriek tomu pokračujem\n"
 
-#: src/news.c:445
+#: src/news.c:451
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Chyba pri vytváraní relácie s %s:%d\n"
 
-#: src/news.c:459
+#: src/news.c:466
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Chyba pri autentifikácii na %s:%d…\n"
 
-#: src/news.c:484
+#: src/news.c:491
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr "Claws Mail potrebuje na prístup k serveru News pripojenie k sieti."
 
-#: src/news.c:853
+#: src/news.c:862
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "nemožno zvoliť skupinu: %s\n"
 
-#: src/news.c:1042 src/news.c:1212
+#: src/news.c:1051 src/news.c:1221
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "nemožno nastaviť skupinu: %s\n"
 
-#: src/news.c:1051
+#: src/news.c:1060
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatný rozsah článkov: %d - %d\n"
 
-#: src/news.c:1121 src/news.c:1145 src/news.c:1169
+#: src/news.c:1130 src/news.c:1154 src/news.c:1178
 msgid "couldn't get xhdr\n"
 msgstr "nemožno získať xhdr\n"
 
-#: src/news.c:1205
+#: src/news.c:1214
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "prijímam xover %d - %d v %s…\n"
 
-#: src/news.c:1220
+#: src/news.c:1229
 msgid "couldn't get xover\n"
 msgstr "nemožno získať xover\n"
 
-#: src/news.c:1235
+#: src/news.c:1244
 msgid "invalid xover line\n"
 msgstr "neplatný xover riadok\n"
 
-#: src/news.c:1450
+#: src/news.c:1459
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -8713,7 +8567,7 @@ msgstr "Umiestnenie a meno archívu"
 
 #: src/plugins/archive/archiver_gtk.c:1045
 #: src/plugins/archive/archiver_prefs.c:198
-#: src/plugins/pgpcore/select-keys.c:424
+#: src/plugins/pgpcore/select-keys.c:420
 msgid "_Select"
 msgstr "_Zvoliť"
 
@@ -8951,12 +8805,12 @@ msgstr "Táto správa nemá žiadne prílohy."
 msgid "Remove attachments..."
 msgstr "Odstrániť prílohy…"
 
-#: src/plugins/att_remover/att_remover.c:507
-#: src/plugins/att_remover/att_remover.c:574
+#: src/plugins/att_remover/att_remover.c:506
+#: src/plugins/att_remover/att_remover.c:566
 msgid "AttRemover"
 msgstr "AttRemover"
 
-#: src/plugins/att_remover/att_remover.c:579
+#: src/plugins/att_remover/att_remover.c:571
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -8968,7 +8822,7 @@ msgstr ""
 "Varovanie: táto operácia je úplne nevratná a odstránené prílohy budú navždy "
 "stratené a úplne a úplne."
 
-#: src/plugins/att_remover/att_remover.c:603
+#: src/plugins/att_remover/att_remover.c:595
 msgid "Attachment handling"
 msgstr "Spracovanie prílohy"
 
@@ -9010,42 +8864,53 @@ msgstr ""
 "Upozorňuje používateľa, ak bola v tele správy spomenutá príloha a nebol "
 "pripojený žiadny súbor."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:53
+#: src/plugins/attachwarner/attachwarner_prefs.c:54
 msgid "attach"
 msgstr "pripojiť"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:80
-msgid ""
-"Warn when matching the following regular expressions:\n"
-"(one per line)"
-msgstr ""
-"Upozorniť pri nájdení týchto regulárnych výrazov:\n"
-"(jeden v riadku)"
+#: src/plugins/attachwarner/attachwarner_prefs.c:85
+msgid "One of the following regular expressions is matched (one per line):"
+msgstr "Jeden z nasledujúcich regulárnych výrazov zodpovedá (jeden v riadku):"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:99
-msgid "Skip quoted lines"
-msgstr "Preskočiť citácie"
+#: src/plugins/attachwarner/attachwarner_prefs.c:89
+msgid "Expressions are case sensitive"
+msgstr "Výrazy sú citlivé na veľkosť písmen"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:106
-msgid "Exclude quoted lines from checking for the regular expressions above"
-msgstr "Z hľadania regulárnych výrazov vynechá citácie"
+#: src/plugins/attachwarner/attachwarner_prefs.c:96
+msgid "Case sensitive when matching for the regular expressions in the list"
+msgstr "Citlivé na veľkosť pri hľadaní zhody pre regulárne výrazy v zozname"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:109
-msgid "Skip forwards and redirections"
-msgstr "Preskočiť Posielanie ďalej a Predávanie"
+#: src/plugins/attachwarner/attachwarner_prefs.c:114
+msgid "Lines starting with quotation marks"
+msgstr "Riadky, ktoré začínajú značkami citácie"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:116
+#: src/plugins/attachwarner/attachwarner_prefs.c:121
+msgid ""
+"Exclude quoted lines from checking for the regular expressions above. Note "
+"that handmade quotes cannot be distinguished from quotes generated by "
+"replying."
+msgstr ""
+"Pri hľadaní zhody vyššie uvedených regulárnych výrazov vynechať riadky "
+"citácie. Pamätajte, že ručne zadané citácie nemožno odlíšiť od citácií "
+"generovaných pri odpovedi."
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:124
+msgid "Forwarded or redirected messages"
+msgstr "Správy poslané ďalej alebo presmerované"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:131
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr ""
 "Nekontroluje chýbajúce prílohy pri správach Posielaných ďalej a "
 "Presmerovaných správach"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:119
-msgid "Skip signature"
-msgstr "Preskočiť podpis"
+#: src/plugins/attachwarner/attachwarner_prefs.c:134
+#: src/prefs_msg_colors.c:362
+msgid "Signatures"
+msgstr "Podpisy"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:126
+#: src/plugins/attachwarner/attachwarner_prefs.c:141
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
@@ -9053,7 +8918,15 @@ msgstr ""
 "Vynechať riadky od riadku prvého oddeľovača podpisu dopredu, pri hľadaní "
 "vyššie zadaného regulárneho výrazu"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:202
+#: src/plugins/attachwarner/attachwarner_prefs.c:147
+msgid "Warn when"
+msgstr "Upozorniť pri"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:151
+msgid "Excluding"
+msgstr "Vylúčenie"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:229
 msgid "Attach Warner"
 msgstr "Upozornenie na prílohu"
 
@@ -9233,7 +9106,7 @@ msgstr "Správy väčšie ako táto hodnota nebudú kontrolované"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:170
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1487
+#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1483
 msgid "KB"
 msgstr "kB"
 
@@ -9585,7 +9458,7 @@ msgstr ""
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:333
 msgid "Br_owse"
-msgstr "Prechádzať"
+msgstr "Pr_echádzať"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:337
 msgid "Click this button to select full path to clamd.conf"
@@ -9698,93 +9571,93 @@ msgstr ""
 "\n"
 "Nie je veľmi užitočný"
 
-#: src/plugins/fancy/fancy_viewer.c:391
+#: src/plugins/fancy/fancy_viewer.c:392
 msgid "Remote content loading is disabled."
 msgstr "Načítavanie vzdialeného obsahu je vypnuté."
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:469
 msgid "Load images"
 msgstr "Načítať obrázky"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:471
 msgid "Enable remote content"
 msgstr "Zapnúť vzdialený obsah"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:473
 msgid "Enable Javascript"
 msgstr "Povoliť JavaScript"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:475
 msgid "Enable Plugins"
 msgstr "Povoliť zásuvné moduly"
 
-#: src/plugins/fancy/fancy_viewer.c:476
+#: src/plugins/fancy/fancy_viewer.c:477
 msgid "Enable Java"
 msgstr "Povoliť Java"
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:479
 msgid "Open links with external browser"
 msgstr "Otvoriť odkazy v externom prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:647
+#: src/plugins/fancy/fancy_viewer.c:648
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Nastala chyba: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:698
+#: src/plugins/fancy/fancy_viewer.c:704
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s je poškodený alebo nepodporovaný kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:709
+#: src/plugins/fancy/fancy_viewer.c:715
 msgid "Search the Web"
 msgstr "Hľadať na webe"
 
-#: src/plugins/fancy/fancy_viewer.c:721
+#: src/plugins/fancy/fancy_viewer.c:727
 msgid "Open in Viewer"
 msgstr "Otvoriť v prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:723
+#: src/plugins/fancy/fancy_viewer.c:729
 msgid "Open in Viewer (enable remote content)"
 msgstr "Otvoriť v prehliadači (zapnúť vzdialený obsah)"
 
-#: src/plugins/fancy/fancy_viewer.c:732
+#: src/plugins/fancy/fancy_viewer.c:738
 msgid "Open in Browser"
 msgstr "Otvoriť v prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:742
+#: src/plugins/fancy/fancy_viewer.c:748
 msgid "Open Image"
 msgstr "Otvoriť obrázok"
 
-#: src/plugins/fancy/fancy_viewer.c:751
+#: src/plugins/fancy/fancy_viewer.c:757
 msgid "Copy Link"
 msgstr "Kopírovať odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:761
 msgid "Download Link"
 msgstr "Stiahnuť odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:766
+#: src/plugins/fancy/fancy_viewer.c:772
 msgid "Save Image As"
 msgstr "Uložiť obrázok ako"
 
-#: src/plugins/fancy/fancy_viewer.c:776
+#: src/plugins/fancy/fancy_viewer.c:782
 msgid "Copy Image"
 msgstr "Kopírovať obrázok"
 
-#: src/plugins/fancy/fancy_viewer.c:794
+#: src/plugins/fancy/fancy_viewer.c:800
 msgid "Import feed"
 msgstr "Importovať kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1013
 msgid "Fancy"
 msgstr "Vkusný"
 
-#: src/plugins/fancy/fancy_viewer.c:1032
+#: src/plugins/fancy/fancy_viewer.c:1038
 msgid "Fancy HTML Viewer"
 msgstr "Vkusný zobrazovač HTML"
 
-#: src/plugins/fancy/fancy_viewer.c:1037
+#: src/plugins/fancy/fancy_viewer.c:1043
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -9987,7 +9860,7 @@ msgstr "Zásuvný modul GData: Autentifikované\n"
 msgid "GData plugin: Starting async authentication\n"
 msgstr "Zásuvný modul GData: Štart asynchrónnej autentifikácie\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:78 src/prefs_account.c:1724
+#: src/plugins/gdata/cm_gdata_prefs.c:78 src/prefs_account.c:1720
 msgid "Authentication"
 msgstr "Autentifikácia"
 
@@ -9997,7 +9870,7 @@ msgid "Username:"
 msgstr "Používateľské meno:"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:91
-#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1601
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1413
 msgid "Password:"
 msgstr "Heslo:"
 
@@ -10081,7 +9954,7 @@ msgstr ""
 "Ak zadáte názov existujúcej schránky, bude\n"
 "táto automaticky prehľadaná."
 
-#: src/plugins/mailmbox/plugin_gtk.c:323
+#: src/plugins/mailmbox/plugin_gtk.c:322
 #, c-format
 msgid ""
 "All folder(s) and message(s) under '%s' will be deleted.\n"
@@ -10090,20 +9963,20 @@ msgstr ""
 "Všetky zložky a správy v „%s” budú odstránené.\n"
 "Naozaj chcete pokračovať?"
 
-#: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
+#: src/plugins/newmail/newmail.c:111 src/plugins/newmail/newmail.c:162
 msgid "NewMail"
 msgstr "NewMail"
 
-#: src/plugins/newmail/newmail.c:115
+#: src/plugins/newmail/newmail.c:116
 msgid "Failed to register newmail hook"
 msgstr "Zlyhala registrácia obsluhy udalosti „newmail”"
 
-#: src/plugins/newmail/newmail.c:132
+#: src/plugins/newmail/newmail.c:137 src/plugins/newmail/newmail.c:140
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "Nemožno otvoriť súbor záznamu: %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:145
+#: src/plugins/newmail/newmail.c:154
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -10120,7 +9993,7 @@ msgstr ""
 "\n"
 "Aktuálny záznam je %s"
 
-#: src/plugins/newmail/newmail.c:179
+#: src/plugins/newmail/newmail.c:188
 msgid "Log file"
 msgstr "Súbor záznamu"
 
@@ -10263,6 +10136,11 @@ msgstr "Nová neznáma správa"
 msgid "Unknown message type arrived"
 msgstr "Prišla nová neznáma správa"
 
+#: src/plugins/notification/notification_popup.c:381
+#: src/plugins/notification/notification_trayicon.c:647
+msgid "Present main window"
+msgstr "Zobraziť hlavné okno"
+
 #: src/plugins/notification/notification_popup.c:491
 msgid "Mail message"
 msgstr "Správa"
@@ -10326,7 +10204,7 @@ msgid "Popup"
 msgstr "Vyskakovacie okno"
 
 #: src/plugins/notification/notification_prefs.c:464 src/prefs_actions.c:263
-#: src/prefs_receive.c:147
+#: src/prefs_receive.c:133
 msgid "Command"
 msgstr "Príkaz"
 
@@ -10399,12 +10277,12 @@ msgid "Show banner"
 msgstr "Zobraziť titulkový pruh"
 
 #: src/plugins/notification/notification_prefs.c:746
-#: src/plugins/pgpcore/select-keys.c:242 src/plugins/pgpcore/sgpgme.c:144
-#: src/prefs_receive.c:197 src/prefs_summaries.c:462
+#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:144
+#: src/prefs_receive.c:183 src/prefs_summaries.c:462
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/plugins/notification/notification_prefs.c:748 src/prefs_receive.c:195
+#: src/plugins/notification/notification_prefs.c:748 src/prefs_receive.c:181
 #: src/prefs_summaries.c:444 src/prefs_summaries.c:463
 msgid "Always"
 msgstr "Vždy"
@@ -10717,82 +10595,82 @@ msgstr "Formát:"
 msgid "Optimized:"
 msgstr "Optimalizované:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1165
+#: src/plugins/pdf_viewer/poppler_viewer.c:1181
 msgid "PDF properties"
 msgstr "Vlastnosti PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1263
+#: src/plugins/pdf_viewer/poppler_viewer.c:1279
 msgid "Loading..."
 msgstr "Načítanie..."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1322
+#: src/plugins/pdf_viewer/poppler_viewer.c:1338
 #, c-format
 msgid "%s Document"
 msgstr "Dokument %s"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1328
+#: src/plugins/pdf_viewer/poppler_viewer.c:1344
 #, c-format
 msgid "of %d"
 msgstr "z %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1705
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1721
+#: src/plugins/pdf_viewer/poppler_viewer.c:1943
 msgid "Document Index"
 msgstr "Obsah dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1895
+#: src/plugins/pdf_viewer/poppler_viewer.c:1911
 msgid "First Page"
 msgstr "Prvá strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1898
+#: src/plugins/pdf_viewer/poppler_viewer.c:1914
 msgid "Previous Page"
 msgstr "Predošlá strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1901
+#: src/plugins/pdf_viewer/poppler_viewer.c:1917
 msgid "Next Page"
 msgstr "Ďalšia strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1904
+#: src/plugins/pdf_viewer/poppler_viewer.c:1920
 msgid "Last Page"
 msgstr "Posledná strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1907
+#: src/plugins/pdf_viewer/poppler_viewer.c:1923
 msgid "Zoom In"
 msgstr "Zväčšiť"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1909
+#: src/plugins/pdf_viewer/poppler_viewer.c:1925
 msgid "Zoom Out"
 msgstr "Zmenšiť"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1912
+#: src/plugins/pdf_viewer/poppler_viewer.c:1928
 msgid "Fit Page"
 msgstr "Celá strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1915
+#: src/plugins/pdf_viewer/poppler_viewer.c:1931
 msgid "Fit Page Width"
 msgstr "Celá šírka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1918
+#: src/plugins/pdf_viewer/poppler_viewer.c:1934
 msgid "Rotate Left"
 msgstr "Otočiť vľavo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1921
+#: src/plugins/pdf_viewer/poppler_viewer.c:1937
 msgid "Rotate Right"
 msgstr "Otočiť vpravo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1940
 msgid "Document Info"
 msgstr "Informácie o dokumente"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1929
+#: src/plugins/pdf_viewer/poppler_viewer.c:1945
 msgid "Page Number"
 msgstr "Číslo strany"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1931
+#: src/plugins/pdf_viewer/poppler_viewer.c:1947
 msgid "Zoom Factor"
 msgstr "Mierka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2036
+#: src/plugins/pdf_viewer/poppler_viewer.c:2052
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -10805,13 +10683,13 @@ msgstr ""
 "\n"
 "Akákoľvek spätná väzba je vítaná: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2042
-#: src/plugins/pdf_viewer/poppler_viewer.c:2050
-#: src/plugins/pdf_viewer/poppler_viewer.c:2070
+#: src/plugins/pdf_viewer/poppler_viewer.c:2058
+#: src/plugins/pdf_viewer/poppler_viewer.c:2066
+#: src/plugins/pdf_viewer/poppler_viewer.c:2086
 msgid "PDF Viewer"
 msgstr "Zobrazovať PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2046
+#: src/plugins/pdf_viewer/poppler_viewer.c:2062
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -10827,45 +10705,74 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/python/python_plugin.c:338
-#: src/plugins/python/python_plugin.c:482
+#: src/plugins/python/python_plugin.c:358
+#: src/plugins/python/python_plugin.c:502
 msgid "Python scripts"
 msgstr "Skripty Python"
 
-#: src/plugins/python/python_plugin.c:477
+#: src/plugins/python/python_plugin.c:497
 msgid "Show Python console..."
 msgstr "Zobraziť konzolu Python..."
 
-#: src/plugins/python/python_plugin.c:483
+#: src/plugins/python/python_plugin.c:503
 msgid "Refresh"
 msgstr "Obnoviť"
 
-#: src/plugins/python/python_plugin.c:485 src/prefs_account.c:2488
-#: src/prefs_account.c:2510 src/prefs_account.c:2769 src/wizard.c:1379
-#: src/wizard.c:1658
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2480
+#: src/prefs_account.c:2502 src/prefs_account.c:2761 src/wizard.c:1191
+#: src/wizard.c:1465
 msgid "Browse"
 msgstr "Prechádzať"
 
-#: src/plugins/python/python_plugin.c:548
-#: src/plugins/python/python_plugin.c:602
+#: src/plugins/python/python_plugin.c:646
+#: src/plugins/python/python_plugin.c:725
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:554
+#: src/plugins/python/python_plugin.c:652
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr ""
 "V zásuvnom module Python zlyhala registrácia obsluhy udalosti „compose "
 "create hook”"
 
-#: src/plugins/python/python_plugin.c:607
+#: src/plugins/python/python_plugin.c:730
 msgid ""
 "This plugin provides Python integration features.\n"
+"Python code can be entered interactively into an embedded Python console, "
+"under Tools -> Show Python console, or stored in scripts.\n"
+"\n"
+"These scripts are then available via the menu. You can assign keyboard "
+"shortcuts to them just like it is done with other menu items. You can also "
+"put buttons for script invokation into the toolbars using Claws Mail's "
+"builtin toolbar editor.\n"
+"\n"
+"You can provide scripts working on the main window by placing files into ~/."
+"claws-mail/python-scripts/main.\n"
+"\n"
+"You can also provide scripts working on an open compose window by placing "
+"files into ~/.claws-mail/python-scripts/compose.\n"
+"\n"
+"The folder ~/.claws-mail/python-scripts/auto/ may contain some scripts that "
+"are automatically executed when certain events occur. Currently, the "
+"following files in this directory are recognised:\n"
+"\n"
+"compose_any\n"
+"Gets executed whenever a compose window is opened, no matterif that opening "
+"happened as a result of composing a new message,replying or forwarding a "
+"message.\n"
+"\n"
+"startup\n"
+"Executed at plugin load\n"
+"\n"
+"shutdown\n"
+"Executed at plugin unload\n"
+"\n"
 "\n"
 "For the most up-to-date API documentation, type\n"
 "\n"
 " help(clawsmail)\n"
 "\n"
-"in the interactive Python console under Tools -> Show Python console.\n"
+"in the interactive Python console.\n"
 "\n"
 "The source distribution of this plugin comes with various example scripts in "
 "the \"examples\" subdirectory. If you wrote a script that you would be "
@@ -10874,22 +10781,50 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"Tento zásuvný modul poskytuje možnosť integrácie Python.\n"
+"Tento zásuvný modul poskytuje integráciu vlastností Python.\n"
+"Kód Python možno zadať interaktívne do zabudovanej konzoly Python, v "
+"Nástroje -> Zobraziť konzolu Python, alebo ich možno uložiť do skriptov.\n"
 "\n"
-"K aktuálnej dokumentácii API sa môžete dostať zadaním\n"
+"Tieto skripty sú potom dostupné prostredníctvom menu a môžete im priradiť "
+"klávesové skratky presne tak, ako iným položkám menu. Pomocou zabudované "
+"editora panela nsátrojov Clavs Mail môžete do panela nástrojov umiestniť aj "
+"tlačidlá, ktoré skripty spúšťajú.\n"
+"\n"
+"Môžete vytvoriť skripty, ktoré pracujú v hlavnom okne, ich umiestnením do ~/."
+"claws-mail/python-scripts/main.\n"
+"\n"
+"Môžete tiež vytvoriť skripty, ktoré pracujú pri otvorení okna na napísanie "
+"novej správy, ich umiestnením do ~/.claws-mail/python-scripts/compose.\n"
+"\n"
+"Zložka ~/.claws-mail/python-scripts/auto/ môže obsahovať skripty, ktoré sú "
+"automaticky vykonávané pri výskyte určitých udalostí. V súčasnosti sú "
+"rozpoznávané tieto súbory:\n"
+"\n"
+"compose_any\n"
+"Vykonávaný pri každom otvorení okna na napísanie novej správy, bez ohľadu či "
+"otvorenie nastalo ako výsledok písania novej správy, odpovede alebo "
+"posielania správy ďalej.\n"
+"\n"
+"startup\n"
+"Vykonávaný pri načítaní zásuvného modulu\n"
+"\n"
+"shutdown\n"
+"Vykonávaný pri uvoľnení zásuvného modulu\n"
+"\n"
+"\n"
+"Na získanie aktuálnej dokumentácie API, napíšte\n"
 "\n"
 " help(clawsmail)\n"
 "\n"
-"v interaktívnej konzole Python v Nástroje -> Zobraziť konzolu Python.\n"
+"v interaktívnej konzole Python.\n"
 "\n"
-"Zdrojová distribúcia tohoto zásuvného modulu obsahuje rôzny príklady "
-"skriptov v adresári „examples”. Ak napíšete skript, ktorý by mohol byť "
-"užitočný aj ostatným, pokojne mi ho pošlite a ja zvážim jeho zahrnutie do "
-"príkladov.\n"
+"Zdrojová distribúcia tohoto zásuvného modulu obsahuje, v zložke „examples” "
+"rôzne ukážkové skripty. Ak napíšete skript, ktorý by ste chceli zdieľať, "
+"pokojne mi ho pošlite a ja zvážim jeho pridanie k príkladom.\n"
 "\n"
 "Spätná väzba na <berndth at gmx.de> je vítaná."
 
-#: src/plugins/python/python_plugin.c:636
+#: src/plugins/python/python_plugin.c:781
 msgid "Python integration"
 msgstr "Integrácia Python"
 
@@ -10897,11 +10832,11 @@ msgstr "Integrácia Python"
 msgid "Passphrase"
 msgstr "Heslo"
 
-#: src/plugins/pgpcore/passphrase.c:253
+#: src/plugins/pgpcore/passphrase.c:249
 msgid "[no user id]"
 msgstr "[žiadne id používateľa]"
 
-#: src/plugins/pgpcore/passphrase.c:264
+#: src/plugins/pgpcore/passphrase.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the "
@@ -10914,11 +10849,11 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:267
+#: src/plugins/pgpcore/passphrase.c:263
 msgid "Passphrases did not match.\n"
 msgstr "Heslá nesúhlasia.\n"
 
-#: src/plugins/pgpcore/passphrase.c:270
+#: src/plugins/pgpcore/passphrase.c:266
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the "
@@ -10931,7 +10866,7 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:274
+#: src/plugins/pgpcore/passphrase.c:270
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
@@ -10943,7 +10878,7 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:277
+#: src/plugins/pgpcore/passphrase.c:273
 msgid "Bad passphrase.\n"
 msgstr "Neplatné heslo.\n"
 
@@ -11081,7 +11016,7 @@ msgstr "Vymazať z pamäte po"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Nastavenie na „0” (nula) bude uchovávať heslo počas celej relácie"
 
-#: src/plugins/pgpcore/prefs_gpg.c:145 src/prefs_receive.c:173
+#: src/plugins/pgpcore/prefs_gpg.c:145 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "minút"
 
@@ -11135,52 +11070,52 @@ msgstr "nenájdená presná zhoda s/so „%s”, prosím zvoľte kľúč."
 msgid "Collecting info for '%s' ... %c"
 msgstr "Zhromažďujem informácie pre „%s” … %c"
 
-#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:142
 msgid "Undefined"
 msgstr "Nezadaná"
 
-#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:146
+#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:146
 msgid "Marginal"
 msgstr "Čiastočná"
 
-#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:150
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:150
 msgid "Ultimate"
 msgstr "Úplná"
 
-#: src/plugins/pgpcore/select-keys.c:370
+#: src/plugins/pgpcore/select-keys.c:366
 msgid "Select Keys"
 msgstr "Zvoľte kľúče"
 
-#: src/plugins/pgpcore/select-keys.c:397
+#: src/plugins/pgpcore/select-keys.c:393
 msgid "Key ID"
 msgstr "ID kľúča"
 
-#: src/plugins/pgpcore/select-keys.c:400
+#: src/plugins/pgpcore/select-keys.c:396
 msgid "Trust"
 msgstr "Dôveryhodný"
 
-#: src/plugins/pgpcore/select-keys.c:425
+#: src/plugins/pgpcore/select-keys.c:421
 msgid "_Other"
 msgstr "_Ostatné"
 
-#: src/plugins/pgpcore/select-keys.c:426
+#: src/plugins/pgpcore/select-keys.c:422
 msgid "Do_n't encrypt"
 msgstr "_Nešifrovať"
 
-#: src/plugins/pgpcore/select-keys.c:585
+#: src/plugins/pgpcore/select-keys.c:581
 msgid "Add key"
 msgstr "Pridať kľúč"
 
-#: src/plugins/pgpcore/select-keys.c:586
+#: src/plugins/pgpcore/select-keys.c:582
 msgid "Enter another user or key ID:"
 msgstr "Zadajte iného používateľa alebo ID kľúča:"
 
-#: src/plugins/pgpcore/select-keys.c:608
+#: src/plugins/pgpcore/select-keys.c:604
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Šifrovanie pre %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:609
+#: src/plugins/pgpcore/select-keys.c:605
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -11416,50 +11351,50 @@ msgstr "Nemožno exportovať kľúč."
 msgid "Key export isn't implemented in Windows."
 msgstr "Export kľúčov nie je v systéme Windows implementovaný."
 
-#: src/plugins/pgpinline/pgpinline.c:258
+#: src/plugins/pgpinline/pgpinline.c:156
 msgid "Incorrect part"
 msgstr "Nesprávna časť"
 
-#: src/plugins/pgpinline/pgpinline.c:262
+#: src/plugins/pgpinline/pgpinline.c:160
 msgid "Not a text part"
 msgstr "Iná ako textová časť"
 
-#: src/plugins/pgpinline/pgpinline.c:273 src/plugins/pgpinline/pgpinline.c:430
+#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
 msgid "Couldn't get text data."
 msgstr "Nemožno získať textové dáta."
 
-#: src/plugins/pgpinline/pgpinline.c:291
+#: src/plugins/pgpinline/pgpinline.c:189
 msgid "Couldn't convert text data to any sane charset."
 msgstr "Nemožno konvertovať textové dáta do žiadneho známeho kódovania."
 
-#: src/plugins/pgpinline/pgpinline.c:299 src/plugins/pgpinline/pgpinline.c:624
-#: src/plugins/pgpinline/pgpinline.c:763 src/plugins/pgpinline/pgpinline.c:819
-#: src/plugins/pgpmime/pgpmime.c:73 src/plugins/pgpmime/pgpmime.c:182
-#: src/plugins/pgpmime/pgpmime.c:322 src/plugins/pgpmime/pgpmime.c:500
-#: src/plugins/pgpmime/pgpmime.c:644 src/plugins/smime/smime.c:406
+#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:517
+#: src/plugins/pgpinline/pgpinline.c:656 src/plugins/pgpinline/pgpinline.c:712
+#: src/plugins/pgpmime/pgpmime.c:74 src/plugins/pgpmime/pgpmime.c:183
+#: src/plugins/pgpmime/pgpmime.c:329 src/plugins/pgpmime/pgpmime.c:507
+#: src/plugins/pgpmime/pgpmime.c:651 src/plugins/smime/smime.c:395
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Nemožno inicializovať kontext GPG, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:423
+#: src/plugins/pgpinline/pgpinline.c:316
 msgid "Couldn't parse mime part."
 msgstr "Nemožno spracovať časť MIME."
 
-#: src/plugins/pgpinline/pgpinline.c:453 src/plugins/pgpmime/pgpmime.c:345
+#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:352
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Nemožno otvoriť dešifrovaný súbor %s"
 
-#: src/plugins/pgpinline/pgpinline.c:470 src/plugins/pgpinline/pgpinline.c:479
-#: src/plugins/pgpinline/pgpinline.c:488 src/plugins/pgpinline/pgpinline.c:496
-#: src/plugins/pgpinline/pgpinline.c:506 src/plugins/pgpinline/pgpinline.c:515
-#: src/plugins/pgpmime/pgpmime.c:356 src/plugins/pgpmime/pgpmime.c:370
+#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
+#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
+#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
+#: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "Nemožno zapísať do dešifrovaného súboru %s"
 
-#: src/plugins/pgpinline/pgpinline.c:484 src/plugins/pgpinline/pgpinline.c:485
-#: src/plugins/pgpinline/pgpinline.c:486
+#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:379
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -11467,51 +11402,51 @@ msgstr ""
 "\n"
 "--- Začiatok dát šifrovaných PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:502 src/plugins/pgpinline/pgpinline.c:503
-#: src/plugins/pgpinline/pgpinline.c:504
+#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:397
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Koniec dát šifrovaných PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:523 src/plugins/pgpmime/pgpmime.c:382
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:389
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "Nemožno zatvoriť dešifrovaný súbor %s"
 
-#: src/plugins/pgpinline/pgpinline.c:535
+#: src/plugins/pgpinline/pgpinline.c:428
 msgid "Couldn't scan decrypted file."
 msgstr "Nemožno prečítať dešifrovaný súbor."
 
-#: src/plugins/pgpinline/pgpinline.c:543
+#: src/plugins/pgpinline/pgpinline.c:436
 msgid "Couldn't scan decrypted file parts."
 msgstr "Nemožno prečítať dešifrované časti súboru."
 
-#: src/plugins/pgpinline/pgpinline.c:598 src/plugins/pgpinline/pgpinline.c:790
+#: src/plugins/pgpinline/pgpinline.c:491 src/plugins/pgpinline/pgpinline.c:683
 msgid "Malformed message"
 msgstr "Nesprávny formát správy"
 
-#: src/plugins/pgpinline/pgpinline.c:609
+#: src/plugins/pgpinline/pgpinline.c:502
 msgid "Couldn't create temporary file."
 msgstr "Nemožno vytvoriť dočasný súbor."
 
-#: src/plugins/pgpinline/pgpinline.c:648 src/plugins/pgpmime/pgpmime.c:527
+#: src/plugins/pgpinline/pgpinline.c:541 src/plugins/pgpmime/pgpmime.c:534
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Podpísanie dát zlyhalo, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:666 src/plugins/pgpmime/pgpmime.c:552
+#: src/plugins/pgpinline/pgpinline.c:559 src/plugins/pgpmime/pgpmime.c:559
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Podpísanie dát zlyhalo kvôli neplatnému podpisu: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:675 src/plugins/pgpmime/pgpmime.c:561
+#: src/plugins/pgpinline/pgpinline.c:568 src/plugins/pgpmime/pgpmime.c:568
 msgid "Data signing failed, no results."
 msgstr "Podpísanie dát zlyhalo, žiadne výsledky."
 
-#: src/plugins/pgpinline/pgpinline.c:685 src/plugins/pgpmime/pgpmime.c:572
+#: src/plugins/pgpinline/pgpinline.c:578 src/plugins/pgpmime/pgpmime.c:579
 msgid "Data signing failed, no contents."
 msgstr "Podpísanie dát zlyhalo, žiadny obsah."
 
-#: src/plugins/pgpinline/pgpinline.c:729
+#: src/plugins/pgpinline/pgpinline.c:622
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
@@ -11519,22 +11454,22 @@ msgstr ""
 "Prosím, pamätajte, že pri použití systému PGP/Inline nebudú šifrované "
 "prílohy ani hlavičky správy (napr. Predmet)."
 
-#: src/plugins/pgpinline/pgpinline.c:773 src/plugins/pgpmime/pgpmime.c:654
+#: src/plugins/pgpinline/pgpinline.c:666 src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Nemožno pridať GPG kľúč %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:801 src/plugins/pgpmime/pgpmime.c:683
+#: src/plugins/pgpinline/pgpinline.c:694 src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Nemožno vytvoriť dočasný súbor, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:832 src/plugins/pgpmime/pgpmime.c:710
+#: src/plugins/pgpinline/pgpinline.c:725 src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Šifrovanie zlyhalo, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:899
+#: src/plugins/pgpinline/pgpinline.c:793
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
@@ -11568,30 +11503,30 @@ msgstr ""
 "\n"
 "Na GPGME sa vzťahuje copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:202
+#: src/plugins/pgpmime/pgpmime.c:203
 msgid "Signature boundary not found."
 msgstr "Hranica podpisu nebola nájdená."
 
-#: src/plugins/pgpmime/pgpmime.c:394 src/plugins/smime/smime.c:487
+#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:476
 msgid "Couldn't parse decrypted file."
 msgstr "Nemožno spracovať dešifrovaný súbor."
 
-#: src/plugins/pgpmime/pgpmime.c:400 src/plugins/smime/smime.c:494
+#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:483
 msgid "Couldn't parse decrypted file parts."
 msgstr "Nemožno spracovať dešifrované časti súboru."
 
-#: src/plugins/pgpmime/pgpmime.c:446 src/plugins/pgpmime/pgpmime.c:485
+#: src/plugins/pgpmime/pgpmime.c:453 src/plugins/pgpmime/pgpmime.c:492
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Nemožno vytvoriť dočasný súbor: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:610
+#: src/plugins/pgpmime/pgpmime.c:617
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
 msgstr "Pozor, pri použití PGP/Mime systému nebudú šifrované hlavičky správy."
 
-#: src/plugins/pgpmime/pgpmime.c:780
+#: src/plugins/pgpmime/pgpmime.c:788
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -11989,7 +11924,7 @@ msgid "Can't subscribe feed '%s'."
 msgstr "Nemožno sa prihlásiť k odberu kanála „%s”."
 
 #: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:924
+#: src/plugins/smime/smime.c:883
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -12028,24 +11963,24 @@ msgstr ""
 "\n"
 "GPGME je copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:414
+#: src/plugins/smime/smime.c:403
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "Nemožno nastaviť protokol GPG, %s"
 
-#: src/plugins/smime/smime.c:442
+#: src/plugins/smime/smime.c:431
 msgid "Couldn't open temporary file"
 msgstr "Nemožno otvoriť dočasný súbor."
 
-#: src/plugins/smime/smime.c:453 src/plugins/smime/smime.c:468
+#: src/plugins/smime/smime.c:442 src/plugins/smime/smime.c:457
 msgid "Couldn't write to temporary file"
 msgstr "Nemožno zapisovať do dočasného súboru."
 
-#: src/plugins/smime/smime.c:479
+#: src/plugins/smime/smime.c:468
 msgid "Couldn't close temporary file"
 msgstr "nemožno zatvoriť dočasný súbor."
 
-#: src/plugins/smime/smime.c:695
+#: src/plugins/smime/smime.c:684
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
@@ -12054,8 +11989,8 @@ msgstr ""
 "MIME šifrované."
 
 #: src/plugins/spam_report/spam_report_prefs.c:80
-#: src/plugins/spam_report/spam_report.c:340
-#: src/plugins/spam_report/spam_report.c:380
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
 msgid "SpamReport"
 msgstr "Hlásenie SPAM"
 
@@ -12067,15 +12002,15 @@ msgstr "Zapnuté"
 msgid "Forward to:"
 msgstr "Poslať ďalej na:"
 
-#: src/plugins/spam_report/spam_report.c:294
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Ohlasovanie SPAM..."
 
-#: src/plugins/spam_report/spam_report.c:329
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Ohlásiť SPAM online..."
 
-#: src/plugins/spam_report/spam_report.c:385
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12091,7 +12026,7 @@ msgstr ""
 " * spamcop.net\n"
 " * nominačný systém lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:410
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Hlásenie SPAM"
 
@@ -12269,15 +12204,15 @@ msgstr ""
 
 #: src/plugins/vcalendar/common-views.c:62
 msgid "_Edit this meeting..."
-msgstr "Upraviť stretnutie..."
+msgstr "Upraviť toto str_etnutie..."
 
 #: src/plugins/vcalendar/common-views.c:63
 msgid "_Cancel this meeting..."
-msgstr "Zrušiť stretnutie..."
+msgstr "_Zrušiť toto stretnutie..."
 
 #: src/plugins/vcalendar/common-views.c:65
 msgid "_Create new meeting..."
-msgstr "Vytvoriť nové stretnutie…"
+msgstr "_Vytvoriť nové stretnutie…"
 
 #: src/plugins/vcalendar/common-views.c:67
 msgid "_Go to today"
@@ -12425,25 +12360,25 @@ msgid "You are already busy at this time."
 msgstr "V tej dobe ste obsadený."
 
 #: src/plugins/vcalendar/vcalendar.c:1265
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1759
 msgid "Event:"
 msgstr "Udalosť:"
 
 #: src/plugins/vcalendar/vcalendar.c:1266
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1727
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1737
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1748
 msgid "Organizer:"
 msgstr "Organizátor:"
 
 #: src/plugins/vcalendar/vcalendar.c:1267
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1729
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1740
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1750
 msgid "Location:"
 msgstr "Miesto:"
 
 #: src/plugins/vcalendar/vcalendar.c:1268
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1717
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1728
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1749
 msgid "Summary:"
 msgstr "Zhrnutie:"
 
@@ -12456,8 +12391,8 @@ msgid "Ending:"
 msgstr "Koniec:"
 
 #: src/plugins/vcalendar/vcalendar.c:1272
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1752
 msgid "Attendees:"
 msgstr "Účastníci:"
 
@@ -12465,85 +12400,85 @@ msgstr "Účastníci:"
 msgid "Action:"
 msgstr "Akcia:"
 
-#: src/plugins/vcalendar/vcal_prefs.c:256
+#: src/plugins/vcalendar/vcal_prefs.c:258
 msgid "Reminders"
 msgstr "Pripomienky"
 
-#: src/plugins/vcalendar/vcal_prefs.c:265
+#: src/plugins/vcalendar/vcal_prefs.c:267
 msgid "Alert me"
 msgstr "Upozorni ma"
 
-#: src/plugins/vcalendar/vcal_prefs.c:277
+#: src/plugins/vcalendar/vcal_prefs.c:279
 msgid "minutes before an event"
 msgstr "minút pred udalosťou"
 
-#: src/plugins/vcalendar/vcal_prefs.c:289
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Calendar export"
 msgstr "Export kalendára"
 
-#: src/plugins/vcalendar/vcal_prefs.c:300
+#: src/plugins/vcalendar/vcal_prefs.c:302
 msgid "Automatically export calendar to"
 msgstr "Automaticky exportovať kalendár do"
 
-#: src/plugins/vcalendar/vcal_prefs.c:309
-#: src/plugins/vcalendar/vcal_prefs.c:415
+#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:417
 msgid "You can export to a local file or URL"
 msgstr "Kalendár môžete exportovať do lokálneho súboru alebo URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:313
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Zadajte umiestnenie súboru alebo URL (http://server/cesta/súbor.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:319
-#: src/plugins/vcalendar/vcal_prefs.c:425 src/prefs_account.c:1263
-#: src/prefs_account.c:1770
+#: src/plugins/vcalendar/vcal_prefs.c:321
+#: src/plugins/vcalendar/vcal_prefs.c:427 src/prefs_account.c:1259
+#: src/prefs_account.c:1766
 msgid "User ID"
 msgstr "Prihlasovacie meno"
 
-#: src/plugins/vcalendar/vcal_prefs.c:327
-#: src/plugins/vcalendar/vcal_prefs.c:433 src/prefs_account.c:1269
-#: src/prefs_account.c:1790 src/prefs_account.c:2499 src/prefs_account.c:2521
-#: src/wizard.c:1389 src/wizard.c:1668
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1265
+#: src/prefs_account.c:1786 src/prefs_account.c:2491 src/prefs_account.c:2513
+#: src/wizard.c:1201 src/wizard.c:1475
 msgid "Password"
 msgstr "Heslo"
 
-#: src/plugins/vcalendar/vcal_prefs.c:341
+#: src/plugins/vcalendar/vcal_prefs.c:343
 msgid "Include webcal subscriptions in export"
 msgstr "V exporte zahrnúť webcal prihlásenia"
 
-#: src/plugins/vcalendar/vcal_prefs.c:351
+#: src/plugins/vcalendar/vcal_prefs.c:353
 msgid "Command to run after calendar export"
 msgstr "Príkaz na spustenie po exporte kalendára"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:382
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Zaregistrovať Claws kalendár v Orage prostredia XFCE"
 
-#: src/plugins/vcalendar/vcal_prefs.c:382
+#: src/plugins/vcalendar/vcal_prefs.c:384
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr "Umožniť Orage (verzia vyššia ako 4.4) prístup ku kalendáru Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:394
+#: src/plugins/vcalendar/vcal_prefs.c:396
 msgid "Free/Busy information"
 msgstr "Informácie voľný/obsadený"
 
-#: src/plugins/vcalendar/vcal_prefs.c:406
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Automatically export free/busy status to"
 msgstr "Automaticky exportovať stav voľný/obsadený do"
 
-#: src/plugins/vcalendar/vcal_prefs.c:417
+#: src/plugins/vcalendar/vcal_prefs.c:419
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Zadajte lokálny súbor alebo URL (http://server/cesta/súbor.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:447
+#: src/plugins/vcalendar/vcal_prefs.c:449
 msgid "Command to run after free/busy status export"
 msgstr "Príkaz, spustený po exporte voľný/obsadený"
 
-#: src/plugins/vcalendar/vcal_prefs.c:474
+#: src/plugins/vcalendar/vcal_prefs.c:476
 msgid "Get free/busy status of others from"
 msgstr "Získať stav voľný/obsadený ostatných z "
 
-#: src/plugins/vcalendar/vcal_prefs.c:482
+#: src/plugins/vcalendar/vcal_prefs.c:484
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -12552,7 +12487,7 @@ msgstr ""
 "Zadajte lokálny súbor alebo URL (http://server/cesta/súbor.ifb). Použite %u "
 "pre ľavú časť emailovej adresy, %d pre doménu"
 
-#: src/plugins/vcalendar/vcal_prefs.c:646 src/plugins/vcalendar/plugin.c:43
+#: src/plugins/vcalendar/vcal_prefs.c:648 src/plugins/vcalendar/plugin.c:43
 #: src/plugins/vcalendar/plugin.c:64
 msgid "vCalendar"
 msgstr "vCalendar"
@@ -12589,6 +12524,10 @@ msgstr "_Týždenný pohľad"
 msgid "_Month view"
 msgstr "_Mesačný pohľad"
 
+#: src/plugins/vcalendar/vcal_folder.c:1091
+msgid "Meetings"
+msgstr "Stretnutia"
+
 #: src/plugins/vcalendar/vcal_folder.c:1475
 msgid "in the past"
 msgstr "v minulosti"
@@ -12696,11 +12635,11 @@ msgstr "Prihlásiť sa do WebCal"
 msgid "Enter the WebCal URL:"
 msgstr "Zadajte WebCal URL:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1923
+#: src/plugins/vcalendar/vcal_folder.c:1921
 msgid "Could not parse the URL."
 msgstr "Nemožno spracovať URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1952
+#: src/plugins/vcalendar/vcal_folder.c:1950
 msgid "Do you really want to unsubscribe?"
 msgstr "Naozaj sa chcete odhlásiť?"
 
@@ -12852,7 +12791,7 @@ msgid "available"
 msgstr "dostupný"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:899
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1150
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1151
 msgid "Free/busy retrieval failed"
 msgstr "Zlyhalo získanie voľný/obsadený"
 
@@ -12869,22 +12808,22 @@ msgid "Not everyone is available. See tooltips for more info..."
 msgstr ""
 "Nikto nie je dostupný. Pozrite si nástrojové tipy s ďalšími informáciami..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1132
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1133
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "Prijímanie plánovania pre %s…"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1159
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1160
 msgid "Available"
 msgstr "Dostupný"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1172
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1179
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1187
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1180
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
 msgid "Everyone is available."
 msgstr "Všetci sú dostupní."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1189
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
@@ -12892,7 +12831,7 @@ msgstr ""
 "Všetci vyzerajú byť dostupní, ale niektoré informácie o dostupnosti sa "
 "nepodarilo získať."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1360
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1361
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -12900,42 +12839,42 @@ msgstr ""
 "Nemožno poslať pozvánku na stretnutie.\n"
 "Skontrolujte adresárov."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1476
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1493
 msgid "Save & Send"
 msgstr "Uložiť a Poslať"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1494
 msgid "Check availability"
 msgstr "Overiť dostupnosť"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1600
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "<b>Starts at:</b> "
 msgstr "<b>Začína o:</b> "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1627
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1623
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1647
 msgid "<b> on:</b>"
 msgstr "<b> dňa:</b>"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1641
 msgid "<b>Ends at:</b> "
 msgstr "<b>Končí o:</b> "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1661
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1682
 msgid "New meeting"
 msgstr "Nové stretnutie"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1663
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1684
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Upravuje stretnutie"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1763
 msgid "Time:"
 msgstr "Čas:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1878
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1896
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -12943,7 +12882,7 @@ msgstr[0] "%d hodina"
 msgstr[1] "%d hodiny"
 msgstr[2] "%d hodín"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1881
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1899
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -12951,12 +12890,12 @@ msgstr[0] "%d minúta"
 msgstr[1] "%d minúty"
 msgstr[2] "%d minút"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1892
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Nadchádzajúca udalosť: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1893
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1911
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -12973,7 +12912,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1928
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
@@ -12981,32 +12920,32 @@ msgstr[0] "Pripomeň mi za %d minútu"
 msgstr[1] "Pripomeň mi za %d minúty"
 msgstr[2] "Pripomeň mi za %d minút"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2036
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2054
 msgid "Empty calendar"
 msgstr "Prázdny kalendár"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2037
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2055
 msgid "There is nothing to export."
 msgstr "Nie je čo exportovať."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2077
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2095
 msgid "Could not export the calendar."
 msgstr "Nemožno exportovať kalendár."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2112
 msgid "Export calendar to ICS"
 msgstr "Export kalendára do ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2135
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "Nemožno exportovať kalendár do „%s”\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2232
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2251
 msgid "Could not export the freebusy info."
 msgstr "Nemožno exportovať informácie o voľný/obsadený."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2263
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2283
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Nemožno exportovať voľný/obsadený do „%s”\n"
@@ -13084,7 +13023,7 @@ msgid "Show"
 msgstr "Zobraziť"
 
 #: src/plugins/vcalendar/day-view.c:622 src/plugins/vcalendar/month-view.c:722
-#: src/prefs_account.c:1456 src/prefs_folder_item.c:562
+#: src/prefs_account.c:1452 src/prefs_folder_item.c:562
 #: src/prefs_matcher.c:334
 msgid "days"
 msgstr "dní"
@@ -13262,12 +13201,12 @@ msgstr "nastala chyba relácie POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "príkaz TOP nie je podporovaný\n"
 
-#: src/prefs_account.c:332 src/prefs_account.c:1430 src/prefs_account.c:2416
-#: src/wizard.c:1549
+#: src/prefs_account.c:332 src/prefs_account.c:1426 src/prefs_account.c:2408
+#: src/wizard.c:1361
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1543 src/prefs_account.c:2431
+#: src/prefs_account.c:335 src/prefs_account.c:1539 src/prefs_account.c:2423
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -13275,7 +13214,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:337 src/wizard.c:1551
+#: src/prefs_account.c:337 src/wizard.c:1363
 msgid "Local mbox file"
 msgstr "Lokálna schránka mbox"
 
@@ -13323,78 +13262,78 @@ msgstr "Tento server vyžaduje autentifikáciu"
 msgid "Authenticate on connect"
 msgstr "Autentifikovať pri pripojení"
 
-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1216
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account.c:1226
+#: src/prefs_account.c:1222
 msgid "Server for receiving"
 msgstr "Server pre prijímanie"
 
-#: src/prefs_account.c:1232
+#: src/prefs_account.c:1228
 msgid "Local mailbox"
 msgstr "Lokálna poštová schránka"
 
-#: src/prefs_account.c:1239
+#: src/prefs_account.c:1235
 msgid "SMTP server (send)"
 msgstr "SMTP server (odosielanie)"
 
-#: src/prefs_account.c:1247
+#: src/prefs_account.c:1243
 msgid "Use mail command rather than SMTP server"
 msgstr "Použiť príkaz miesto SMTP serveru"
 
-#: src/prefs_account.c:1256
+#: src/prefs_account.c:1252
 msgid "command to send mails"
 msgstr "príkaz na odosielanie pošty"
 
-#: src/prefs_account.c:1318
+#: src/prefs_account.c:1314
 #, c-format
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account.c:1404
+#: src/prefs_account.c:1400
 msgid "Local"
 msgstr "Lokálne"
 
-#: src/prefs_account.c:1410 src/prefs_account.c:1499
+#: src/prefs_account.c:1406 src/prefs_account.c:1495
 msgid "Default Inbox"
 msgstr "Predvolený inbox"
 
-#: src/prefs_account.c:1417 src/prefs_account.c:1424 src/prefs_account.c:1506
-#: src/prefs_account.c:1513
+#: src/prefs_account.c:1413 src/prefs_account.c:1420 src/prefs_account.c:1502
+#: src/prefs_account.c:1509
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Nefiltrované správy budú umiestnené v tejto zložke"
 
-#: src/prefs_account.c:1421 src/prefs_account.c:1510 src/prefs_account.c:1974
+#: src/prefs_account.c:1417 src/prefs_account.c:1506 src/prefs_account.c:1966
 #: src/prefs_customheader.c:237
 msgid "Bro_wse"
 msgstr "P_rehliadať"
 
-#: src/prefs_account.c:1432
+#: src/prefs_account.c:1428
 msgid "Use secure authentication (APOP)"
 msgstr "Použiť bezpečnú autentifikáciu (APOP)"
 
-#: src/prefs_account.c:1435
+#: src/prefs_account.c:1431
 msgid "Remove messages on server when received"
 msgstr "Vymazať správy na servere po ich prijatí"
 
-#: src/prefs_account.c:1446
+#: src/prefs_account.c:1442
 msgid "Remove after"
 msgstr "Vymazať po"
 
-#: src/prefs_account.c:1453 src/prefs_account.c:1463
+#: src/prefs_account.c:1449 src/prefs_account.c:1459
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dní a 0 hodín: mazať ihneď"
 
-#: src/prefs_account.c:1466 src/prefs_matcher.c:333
+#: src/prefs_account.c:1462 src/prefs_matcher.c:333
 msgid "hours"
 msgstr "hodín"
 
-#: src/prefs_account.c:1476
+#: src/prefs_account.c:1472
 msgid "Receive size limit"
 msgstr "Prijať správu veľkú najviac"
 
-#: src/prefs_account.c:1479
+#: src/prefs_account.c:1475
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -13402,86 +13341,86 @@ msgstr ""
 "Správy väčšie ako táto hodnota budú stiahnuté čiastočne. Po ich zvolení ich "
 "bude možné buď stiahnuť úplne, alebo ich odstrániť."
 
-#: src/prefs_account.c:1519 src/prefs_account.c:2446
+#: src/prefs_account.c:1515 src/prefs_account.c:2438
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1526
+#: src/prefs_account.c:1522
 msgid "Maximum number of articles to download"
 msgstr "Maximálny počet príspevkov na stiahnutie"
 
-#: src/prefs_account.c:1536
+#: src/prefs_account.c:1532
 msgid "unlimited if 0 is specified"
 msgstr "neobmedzené, ak je zadané 0"
 
-#: src/prefs_account.c:1549 src/prefs_account.c:1742
+#: src/prefs_account.c:1545 src/prefs_account.c:1738
 msgid "Authentication method"
 msgstr "Metóda autentifikácie"
 
-#: src/prefs_account.c:1559 src/prefs_account.c:1751 src/prefs_send.c:286
+#: src/prefs_account.c:1555 src/prefs_account.c:1747 src/prefs_send.c:290
 msgid "Automatic"
 msgstr "Automatické"
 
-#: src/prefs_account.c:1571
+#: src/prefs_account.c:1567
 msgid "IMAP server directory"
 msgstr "Zložka servera IMAP"
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1571
 msgid "(usually empty)"
 msgstr "(zväčša prázdne)"
 
-#: src/prefs_account.c:1589
+#: src/prefs_account.c:1585
 msgid "Show subscribed folders only"
 msgstr "Zobraziť len odoberané zložky"
 
-#: src/prefs_account.c:1596
+#: src/prefs_account.c:1592
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Na šírku pásma efektívny režim (bráni prijímaniu vzdialených značiek)"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1594
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "V tomto režime je prenášaných menej dát, ale komunikácia s niektorými "
 "servermi môže byť pomalšia."
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1601
 msgid "Filter messages on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1608
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filtrovať správy pri prijatí aj pomocou zásuvných modulov"
 
-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1612
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "„Prijať poštu” kontroluje nové správy v tomto účte"
 
-#: src/prefs_account.c:1697 src/prefs_customheader.c:209
-#: src/prefs_matcher.c:620 src/prefs_matcher.c:1952 src/prefs_matcher.c:1974
+#: src/prefs_account.c:1693 src/prefs_customheader.c:209
+#: src/prefs_matcher.c:620 src/prefs_matcher.c:1958 src/prefs_matcher.c:1980
 msgid "Header"
 msgstr "Hlavička"
 
-#: src/prefs_account.c:1699
+#: src/prefs_account.c:1695
 msgid "Generate Message-ID"
 msgstr "Generovať hlavičku Message-ID"
 
-#: src/prefs_account.c:1702
+#: src/prefs_account.c:1698
 msgid "Send account mail address in Message-ID"
 msgstr "Poslať emailovú adresu účtu v Message-ID"
 
-#: src/prefs_account.c:1705
+#: src/prefs_account.c:1701
 msgid "Generate X-Mailer header"
 msgstr "Generovať hlavičku X-Mailer"
 
-#: src/prefs_account.c:1712
+#: src/prefs_account.c:1708
 msgid "Add user-defined header"
 msgstr "Pridať používateľom definované hlavičky"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1723
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentifikácia SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:1816
+#: src/prefs_account.c:1808
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -13489,175 +13428,175 @@ msgstr ""
 "Ak necháte tieto polia prázdne, bude použité to isté prihlasovacie meno a "
 "heslo ako pri prijímaní."
 
-#: src/prefs_account.c:1827
+#: src/prefs_account.c:1819
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentifikovať cez POP3 pred odosielaním"
 
-#: src/prefs_account.c:1842
+#: src/prefs_account.c:1834
 msgid "POP authentication timeout: "
 msgstr "Časový limit autentifikácie POP: "
 
-#: src/prefs_account.c:1850
+#: src/prefs_account.c:1842
 msgid "minutes"
 msgstr "minút"
 
-#: src/prefs_account.c:1920 src/prefs_account.c:1966
+#: src/prefs_account.c:1912 src/prefs_account.c:1958
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:1923
+#: src/prefs_account.c:1915
 msgid "Automatically insert signature"
 msgstr "Automaticky vložiť podpis"
 
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1920
 msgid "Signature separator"
 msgstr "Oddeľovač podpisu"
 
-#: src/prefs_account.c:1953
+#: src/prefs_account.c:1945
 msgid "Command output"
 msgstr "Výstup príkazu"
 
-#: src/prefs_account.c:1986
+#: src/prefs_account.c:1978
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/prefs_account.c:2038
+#: src/prefs_account.c:2030
 msgid "Spell check dictionaries"
 msgstr "Slovníky kontroly preklepov"
 
-#: src/prefs_account.c:2048 src/prefs_folder_item.c:1094
+#: src/prefs_account.c:2040 src/prefs_folder_item.c:1094
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Predvolený slovník"
 
-#: src/prefs_account.c:2061 src/prefs_folder_item.c:1128
+#: src/prefs_account.c:2053 src/prefs_folder_item.c:1128
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Prednastavený alternatívny slovník"
 
-#: src/prefs_account.c:2147 src/prefs_account.c:3263
+#: src/prefs_account.c:2139 src/prefs_account.c:3255
 #: src/prefs_compose_writing.c:350 src/prefs_folder_item.c:1443
 #: src/prefs_folder_item.c:1834 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Nová"
 
-#: src/prefs_account.c:2162 src/prefs_folder_item.c:1471 src/prefs_quote.c:134
-#: src/toolbar.c:407
+#: src/prefs_account.c:2154 src/prefs_folder_item.c:1471 src/prefs_quote.c:134
+#: src/toolbar.c:408
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: src/prefs_account.c:2177 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1499 src/prefs_quote.c:149 src/toolbar.c:411
+#: src/prefs_account.c:2169 src/prefs_filtering_action.c:191
+#: src/prefs_folder_item.c:1499 src/prefs_quote.c:149 src/toolbar.c:412
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: src/prefs_account.c:2224
+#: src/prefs_account.c:2216
 msgid "Default privacy system"
 msgstr "Predvolený systém súkromia"
 
-#: src/prefs_account.c:2253
+#: src/prefs_account.c:2245
 msgid "Always sign messages"
 msgstr "Vždy podpisovať správy"
 
-#: src/prefs_account.c:2255
+#: src/prefs_account.c:2247
 msgid "Always encrypt messages"
 msgstr "Vždy šifrovať správy"
 
-#: src/prefs_account.c:2257
+#: src/prefs_account.c:2249
 msgid "Always sign messages when replying to a signed message"
 msgstr "Vždy podpísať správy pri odpovedi na podpísanú správu"
 
-#: src/prefs_account.c:2260
+#: src/prefs_account.c:2252
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Vždy šifrovať odpoveď na šifrovanú správu"
 
-#: src/prefs_account.c:2263
+#: src/prefs_account.c:2255
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Zašifrovať odoslané správy aj vlastným kľúčom"
 
-#: src/prefs_account.c:2265
+#: src/prefs_account.c:2257
 msgid "Save sent encrypted messages as clear text"
 msgstr "Uložiť odoslané zašifrované správy ako prostý text"
 
-#: src/prefs_account.c:2420 src/prefs_account.c:2435 src/prefs_account.c:2449
+#: src/prefs_account.c:2412 src/prefs_account.c:2427 src/prefs_account.c:2441
 msgid "Don't use SSL"
 msgstr "Nepoužívať SSL"
 
-#: src/prefs_account.c:2423
+#: src/prefs_account.c:2415
 msgid "Use SSL for POP3 connection"
 msgstr "Použiť SSL pre spojenie POP3"
 
-#: src/prefs_account.c:2426 src/prefs_account.c:2441 src/prefs_account.c:2472
+#: src/prefs_account.c:2418 src/prefs_account.c:2433 src/prefs_account.c:2464
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Použiť príkaz STARTTLS na nadviazanie relácie SSL"
 
-#: src/prefs_account.c:2438
+#: src/prefs_account.c:2430
 msgid "Use SSL for IMAP4 connection"
 msgstr "Použiť SSL pre IMAP4 spojenie"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2450
 msgid "Use SSL for NNTP connection"
 msgstr "Použiť SSL pre NNTP spojenie"
 
-#: src/prefs_account.c:2462
+#: src/prefs_account.c:2454
 msgid "Send (SMTP)"
 msgstr "Odoslať (SMTP)"
 
-#: src/prefs_account.c:2466
+#: src/prefs_account.c:2458
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Nepoužívať SSL (v prípade potreby použiť STARTTLS)"
 
-#: src/prefs_account.c:2469
+#: src/prefs_account.c:2461
 msgid "Use SSL for SMTP connection"
 msgstr "Použiť SSL pre SMTP spojenie"
 
-#: src/prefs_account.c:2477
+#: src/prefs_account.c:2469
 msgid "Client certificates"
 msgstr "Certifikáty klienta"
 
-#: src/prefs_account.c:2485
+#: src/prefs_account.c:2477
 msgid "Certificate for receiving"
 msgstr "Certifikát na prijímanie"
 
-#: src/prefs_account.c:2490 src/prefs_account.c:2492 src/prefs_account.c:2512
-#: src/prefs_account.c:2514
+#: src/prefs_account.c:2482 src/prefs_account.c:2484 src/prefs_account.c:2504
+#: src/prefs_account.c:2506
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Súbor klientského certifikátu ako súbor PKCS12 alebo PEM"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2499
 msgid "Certificate for sending"
 msgstr "Certifikát na odosielanie"
 
-#: src/prefs_account.c:2540
+#: src/prefs_account.c:2532
 msgid "Use non-blocking SSL"
 msgstr "Použiť neblokujúce SSL"
 
-#: src/prefs_account.c:2552
+#: src/prefs_account.c:2544
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Vypnite túto voľbu ak máte problémy pri SSL spojeniach"
 
-#: src/prefs_account.c:2668
+#: src/prefs_account.c:2660
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: src/prefs_account.c:2675
+#: src/prefs_account.c:2667
 msgid "POP3 port"
 msgstr "POP3 port"
 
-#: src/prefs_account.c:2682
+#: src/prefs_account.c:2674
 msgid "IMAP4 port"
 msgstr "IMAP4 port"
 
-#: src/prefs_account.c:2689
+#: src/prefs_account.c:2681
 msgid "NNTP port"
 msgstr "NNTP port"
 
-#: src/prefs_account.c:2695
+#: src/prefs_account.c:2687
 msgid "Domain name"
 msgstr "Názov domény"
 
-#: src/prefs_account.c:2698
+#: src/prefs_account.c:2690
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -13665,15 +13604,15 @@ msgstr ""
 "Názov domény bude použitý na generovanie Message-ID, a pri pripájaní k "
 "serverom SMTP."
 
-#: src/prefs_account.c:2712
+#: src/prefs_account.c:2704
 msgid "Use command to communicate with server"
 msgstr "Použiť príkaz na komunikáciu so serverom"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2712
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Presunúť zmazané správy do koša a ihneď vymazať"
 
-#: src/prefs_account.c:2722
+#: src/prefs_account.c:2714
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -13681,75 +13620,75 @@ msgstr ""
 "Presúva zmazané emaily do koša, namiesto použitia príznaku Zmazané bez ich "
 "zmazania."
 
-#: src/prefs_account.c:2726
+#: src/prefs_account.c:2718
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Označiť správy posielané ďalej ako prečítané a zafarbiť:"
 
-#: src/prefs_account.c:2782
+#: src/prefs_account.c:2774
 msgid "Put sent messages in"
 msgstr "Uložiť odoslané správy do"
 
-#: src/prefs_account.c:2784
+#: src/prefs_account.c:2776
 msgid "Put queued messages in"
 msgstr "Uložiť správy do fronty"
 
-#: src/prefs_account.c:2786
+#: src/prefs_account.c:2778
 msgid "Put draft messages in"
 msgstr "Uložiť koncepty do"
 
-#: src/prefs_account.c:2788
+#: src/prefs_account.c:2780
 msgid "Put deleted messages in"
 msgstr "Uložiť vymazané správy do"
 
-#: src/prefs_account.c:2846
+#: src/prefs_account.c:2838
 msgid "Account name is not entered."
 msgstr "Nebol zadaný názov účtu."
 
-#: src/prefs_account.c:2850
+#: src/prefs_account.c:2842
 msgid "Mail address is not entered."
 msgstr "Nebola zadaná emailová adresa."
 
-#: src/prefs_account.c:2857
+#: src/prefs_account.c:2849
 msgid "SMTP server is not entered."
 msgstr "Nebol zadaný SMTP server."
 
-#: src/prefs_account.c:2862
+#: src/prefs_account.c:2854
 msgid "User ID is not entered."
 msgstr "Nebolo zadané ID používateľa."
 
-#: src/prefs_account.c:2867
+#: src/prefs_account.c:2859
 msgid "POP3 server is not entered."
 msgstr "Nebol zadaný POP3 server."
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2879
 msgid "The default Inbox folder doesn't exist."
 msgstr "Predvolená zložka doručených správ neexistuje."
 
-#: src/prefs_account.c:2893
+#: src/prefs_account.c:2885
 msgid "IMAP4 server is not entered."
 msgstr "Nebol zadaný IMAP4 server."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2890
 msgid "NNTP server is not entered."
 msgstr "Nebol zadaný NNTP server."
 
-#: src/prefs_account.c:2904
+#: src/prefs_account.c:2896
 msgid "local mailbox filename is not entered."
 msgstr "Nebol zadaný názov lokálnej schránky."
 
-#: src/prefs_account.c:2910
+#: src/prefs_account.c:2902
 msgid "mail command is not entered."
 msgstr "Nebol zadaný príkaz na odosielanie pošty."
 
-#: src/prefs_account.c:3227
+#: src/prefs_account.c:3219
 msgid "Receive"
 msgstr "Prijať"
 
-#: src/prefs_account.c:3281 src/prefs_folder_item.c:1850 src/prefs_quote.c:238
+#: src/prefs_account.c:3273 src/prefs_folder_item.c:1850 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Šablóny"
 
-#: src/prefs_account.c:3299
+#: src/prefs_account.c:3291
 msgid "Privacy"
 msgstr "Súkromie"
 
@@ -13766,19 +13705,19 @@ msgstr "Nastavenie nového účtu"
 msgid "%s - Account preferences"
 msgstr "%s – Nastavenie účtu"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3794
 msgid "Select signature file"
 msgstr "Vyberte súbor so podpisom"
 
-#: src/prefs_account.c:3813 src/prefs_account.c:3830 src/wizard.c:1237
+#: src/prefs_account.c:3812 src/prefs_account.c:3829 src/wizard.c:1053
 msgid "Select certificate file"
 msgstr "Zvoľte súbor certifikátu"
 
-#: src/prefs_account.c:3926
+#: src/prefs_account.c:3925
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:4066
+#: src/prefs_account.c:4065
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (zásuvný modul nie je načítaný)"
@@ -13807,72 +13746,72 @@ msgstr "Upraviť filtrovacie akcie"
 msgid "Append the new action above to the list"
 msgstr "Pridať novú akciu na začiatok zoznamu"
 
-#: src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:768 src/prefs_template.c:309
-#: src/prefs_toolbar.c:1043
-msgid "Replace"
-msgstr "Nahradiť"
-
 #: src/prefs_actions.c:335
 msgid "Replace the selected action in list with the action above"
 msgstr "Nahradiť zvolenú akciu v zozname akciou vyššie"
 
-#: src/prefs_actions.c:343
+#: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:778 src/prefs_template.c:318
+#: src/prefs_toolbar.c:1056
+msgid "Re_move"
+msgstr "O_dstrániť"
+
+#: src/prefs_actions.c:345
 msgid "Delete the selected action from the list"
 msgstr "Zmazať zvolenú akciu zo zoznamu"
 
-#: src/prefs_actions.c:351 src/prefs_filtering.c:500 src/prefs_template.c:332
+#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:336
 msgid "Clear all the input fields in the dialog"
 msgstr "Vymazať všetky vstupné polia dialógu"
 
-#: src/prefs_actions.c:359
+#: src/prefs_actions.c:363
 msgid "Show information on configuring actions"
 msgstr "Zobraziť informácie o konfigurácii akcií"
 
-#: src/prefs_actions.c:390
+#: src/prefs_actions.c:394
 msgid "Move the selected action up"
 msgstr "Posunúť zvolenú akciu vyššie"
 
-#: src/prefs_actions.c:398
+#: src/prefs_actions.c:402
 msgid "Move selected action down"
 msgstr "Posunúť zvolenú akciu nižšie"
 
-#: src/prefs_actions.c:531 src/prefs_filtering_action.c:702
-#: src/prefs_filtering.c:833 src/prefs_filtering.c:835
-#: src/prefs_filtering.c:836 src/prefs_filtering.c:946 src/prefs_matcher.c:891
-#: src/prefs_template.c:465
+#: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
+#: src/prefs_filtering.c:836 src/prefs_filtering.c:838
+#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:897
+#: src/prefs_template.c:469
 msgid "(New)"
 msgstr "(Nová)"
 
-#: src/prefs_actions.c:596
+#: src/prefs_actions.c:600
 msgid "Menu name is not set."
 msgstr "Nebol zadaný názov menu."
 
-#: src/prefs_actions.c:601
+#: src/prefs_actions.c:605
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "Lomka „/” nie je na začiatku názvu položky menu povolená."
 
-#: src/prefs_actions.c:606
+#: src/prefs_actions.c:610
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Dvojbodka „:” nie je v názve menu povolená."
 
-#: src/prefs_actions.c:612
+#: src/prefs_actions.c:616
 msgid "There is an action with this name already."
 msgstr "Akcia s rovnakým menom už existuje."
 
-#: src/prefs_actions.c:631
+#: src/prefs_actions.c:635
 msgid "Menu name is too long."
 msgstr "Názov menu je príliš dlhý."
 
-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:644
 msgid "Command-line not set."
 msgstr "Nebol zadaný príkazový riadok."
 
-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:649
 msgid "Menu name and command are too long."
 msgstr "Názov menu a príkazový riadok sú príliš dlhé."
 
-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:655
 #, c-format
 msgid ""
 "The command\n"
@@ -13883,137 +13822,137 @@ msgstr ""
 "%s\n"
 "má syntaktickú chybu."
 
-#: src/prefs_actions.c:709
+#: src/prefs_actions.c:713
 msgid "Delete action"
 msgstr "Zmazať akciu"
 
-#: src/prefs_actions.c:710
+#: src/prefs_actions.c:714
 msgid "Do you really want to delete this action?"
 msgstr "Naozaj chcete zmazať túto akciu?"
 
-#: src/prefs_actions.c:730
+#: src/prefs_actions.c:734
 msgid "Delete all actions"
 msgstr "Zmazať všetky akcie"
 
-#: src/prefs_actions.c:731
+#: src/prefs_actions.c:735
 msgid "Do you really want to delete all the actions?"
 msgstr "Naozaj chcete zmazať všetky akcie?"
 
-#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1496
-#: src/prefs_filtering.c:1518 src/prefs_matcher.c:2103
-#: src/prefs_template.c:565 src/prefs_template.c:590
+#: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1499
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2109
+#: src/prefs_template.c:569 src/prefs_template.c:594
 msgid "Entry not saved"
 msgstr "Záznam nebol uložený"
 
-#: src/prefs_actions.c:895 src/prefs_actions.c:926 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_template.c:566
-#: src/prefs_template.c:591
+#: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1522 src/prefs_template.c:570
+#: src/prefs_template.c:595
 msgid "The entry was not saved. Close anyway?"
 msgstr "Záznam nebol uložený. Zavrieť napriek tomu?"
 
-#: src/prefs_actions.c:896 src/prefs_actions.c:901 src/prefs_actions.c:927
-#: src/prefs_filtering.c:1476 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_matcher.c:2105
-#: src/prefs_template.c:567 src/prefs_template.c:592 src/prefs_template.c:597
+#: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
+#: src/prefs_filtering.c:1479 src/prefs_filtering.c:1501
+#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2111
+#: src/prefs_template.c:571 src/prefs_template.c:596 src/prefs_template.c:601
 msgid "+_Continue editing"
 msgstr "+_Pokračovať v úprave"
 
-#: src/prefs_actions.c:899
+#: src/prefs_actions.c:903
 msgid "Actions list not saved"
 msgstr "Zoznam akcií nebol uložený"
 
-#: src/prefs_actions.c:900
+#: src/prefs_actions.c:904
 msgid "The actions list has been modified. Close anyway?"
 msgstr "Zoznam akcií bol zmenený. Zavrieť napriek tomu?"
 
-#: src/prefs_actions.c:970
+#: src/prefs_actions.c:974
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Názov menu:</span>"
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:975
 msgid "Use / in menu name to make submenus."
 msgstr "Použite „/” v názve menu na tvorbu podmenu."
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:977
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Príkazový riadok:</span>"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:978
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Začať s:</span>"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:979
 msgid "to send message body or selection to command's standard input"
 msgstr "na odoslanie tela správy alebo výberu na štandardný vstup príkazu"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:980
 msgid "to send user provided text to command's standard input"
 msgstr "na odoslanie textu zadaného používateľom na štandardný vstup príkazu"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:981
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "na odoslanie skrytého textu zadaného používateľom na štandardný vstup príkazu"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:982
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Skončiť s:</span>"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:983
 msgid "to replace message body or selection with command's standard output"
 msgstr "na nahradenie tela správy alebo výberu štandardným výstupom príkazu"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:984
 msgid "to insert command's standard output without replacing old text"
 msgstr ""
 "na vloženie štandardného výstupu príkazu bez odstránenia pôvodného textu"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:985
 msgid "to run command asynchronously"
 msgstr "na asynchrónne vykonanie príkazu"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:986
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Použiť:</span>"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:987
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "pre súbor zvolenej správy vo formáte RFC822/2822 "
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:988
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "pre zoznam súborov zvolených správ vo formáte RFC822/2822"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:989
 msgid "for the file of the selected decoded message MIME part"
 msgstr "pre súbor dekódovanej zvolenej časti MIME správy"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:990
 msgid "for a user provided argument"
 msgstr "pre parameter zadaný používateľom"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:991
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "pre skrytý parameter zadaný používateľom (napr. heslo)"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:992
 msgid "for the text selection"
 msgstr "pre textový výber"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:993
 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplikuje akcie medzi {} na zvolené správy"
 
-#: src/prefs_actions.c:990
+#: src/prefs_actions.c:994
 msgid "for a literal %"
 msgstr "pre znak %"
 
-#: src/prefs_actions.c:1000 src/prefs_themes.c:959
+#: src/prefs_actions.c:1004 src/prefs_themes.c:959
 msgid "Actions"
 msgstr "Akcie"
 
-#: src/prefs_actions.c:1001
+#: src/prefs_actions.c:1005
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
@@ -14021,38 +13960,38 @@ msgstr ""
 "Akcie umožňujú používateľovi spúšťať, na prácu so súborom správy alebo s jej "
 "časťou, externé programy."
 
-#: src/prefs_actions.c:1088 src/prefs_filtering.c:1694
-#: src/prefs_template.c:1097
+#: src/prefs_actions.c:1092 src/prefs_filtering.c:1697
+#: src/prefs_template.c:1101
 msgid "D_uplicate"
 msgstr "D_uplikovať"
 
-#: src/prefs_actions.c:1215
+#: src/prefs_actions.c:1212
 msgid "Current actions"
 msgstr "Aktuálne akcie"
 
-#: src/prefs_actions.c:1314 src/prefs_filtering.c:1071
-#: src/prefs_filtering.c:1129
+#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074
+#: src/prefs_filtering.c:1132
 msgid "Action string is not valid."
 msgstr "Reťazec akcie je neplatný."
 
-#: src/prefs_common.c:230 src/prefs_quote.c:69
+#: src/prefs_common.c:220 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Dobrý deň,\\n"
 
-#: src/prefs_common.c:304
+#: src/prefs_common.c:294
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "Dňa %d\\n%f napísal:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:310 src/prefs_quote.c:85
+#: src/prefs_common.c:300 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
 msgstr ""
-"\\n\\nZačiatok správy poslanej ďalej:\\n\\n?d{Dátum: %d\\n}?f{Od: %f\\n}?t"
-"{Komu: %t\\n}?c{Cc: %c\\n}?n{Diskusné skupiny: %n\\n}?s{Predmet: %s\\n}\\n\\n"
-"%M"
+"\\n\\nZačiatok správy poslanej ďalej:\\n\\n?d{Dátum: %d\\n}?f{Od: %f\\n}?"
+"t{Komu: %t\\n}?c{Cc: %c\\n}?n{Diskusné skupiny: %n\\n}?s{Predmet: %s\\n}\\n"
+"\\n%M"
 
-#: src/prefs_common.c:450
+#: src/prefs_common.c:440
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -14132,11 +14071,11 @@ msgstr "Pri presune súborov do okna s novou správou"
 msgid "Ask"
 msgstr "Spýtať sa"
 
-#: src/prefs_compose_writing.c:230 src/toolbar.c:425
+#: src/prefs_compose_writing.c:230 src/toolbar.c:426
 msgid "Insert"
 msgstr "Vložiť"
 
-#: src/prefs_compose_writing.c:231 src/toolbar.c:426
+#: src/prefs_compose_writing.c:231 src/toolbar.c:427
 msgid "Attach"
 msgstr "Pripojiť"
 
@@ -14149,7 +14088,7 @@ msgid "Custom header configuration"
 msgstr "Nastavenie dodatočných hlavičiek"
 
 #: src/prefs_customheader.c:507 src/prefs_display_header.c:599
-#: src/prefs_matcher.c:1577 src/prefs_matcher.c:1592
+#: src/prefs_matcher.c:1583 src/prefs_matcher.c:1598
 msgid "Header name is not set."
 msgstr "Nebol zadaný názov hlavičky."
 
@@ -14247,19 +14186,19 @@ msgstr "%s bude nahradené názvom súboru / URI"
 msgid "Use system defaults when possible"
 msgstr "Použiť systémom predvolené, ak je to možné"
 
-#: src/prefs_ext_prog.c:146
+#: src/prefs_ext_prog.c:141
 msgid "Web browser"
 msgstr "Webový prehliadač"
 
-#: src/prefs_ext_prog.c:180
+#: src/prefs_ext_prog.c:169
 msgid "Text editor"
 msgstr "Textový editor"
 
-#: src/prefs_ext_prog.c:208
+#: src/prefs_ext_prog.c:197
 msgid "Command for 'Display as text'"
 msgstr "Príkaz na „Zobraziť ako text”"
 
-#: src/prefs_ext_prog.c:221
+#: src/prefs_ext_prog.c:210
 msgid ""
 "This option enables MIME parts to be displayed in the message view via a "
 "script when using the 'Display as text' contextual menu item"
@@ -14267,12 +14206,12 @@ msgstr ""
 "Toto nastavenie umožňuje zobraziť MIME časti v zobrazení správy pomocou "
 "skriptu, pri použití voľby „Zobraziť ako text” z kontextového menu."
 
-#: src/prefs_ext_prog.c:280 src/prefs_image_viewer.c:138
+#: src/prefs_ext_prog.c:269 src/prefs_image_viewer.c:138
 #: src/prefs_message.c:354
 msgid "Message View"
 msgstr "Zobrazenie správy"
 
-#: src/prefs_ext_prog.c:281
+#: src/prefs_ext_prog.c:270
 msgid "External Programs"
 msgstr "Externé programy"
 
@@ -14316,8 +14255,8 @@ msgstr "Označiť ako spam"
 msgid "Mark as ham"
 msgstr "Označiť ako nie spam"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1436
-#: src/toolbar.c:204 src/toolbar.c:435 src/toolbar.c:2106
+#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1438
+#: src/toolbar.c:205 src/toolbar.c:436 src/toolbar.c:2107
 msgid "Execute"
 msgstr "Vykonať"
 
@@ -14335,7 +14274,7 @@ msgid "Redirect"
 msgstr "Presmerovať"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1440 src/prefs_matcher.c:626
+#: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:626
 #: src/prefs_summary_column.c:87 src/summaryview.c:449
 msgid "Score"
 msgstr "Ohodnotenie"
@@ -14378,7 +14317,7 @@ msgstr "Zastaviť filtrovanie"
 msgid "Action configuration"
 msgstr "Nastavenie akcie"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1892
+#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1888
 #: src/prefs_matcher.c:583
 msgid "Rule"
 msgstr "Pravidlo"
@@ -14387,65 +14326,65 @@ msgstr "Pravidlo"
 msgid "Action"
 msgstr "Akcia"
 
-#: src/prefs_filtering_action.c:933
+#: src/prefs_filtering_action.c:935
 msgid "Command-line not set"
 msgstr "Nebol zadaný príkazový riadok"
 
-#: src/prefs_filtering_action.c:934
+#: src/prefs_filtering_action.c:936
 msgid "Destination is not set."
 msgstr "Nebol zadaný cieľ."
 
-#: src/prefs_filtering_action.c:945
+#: src/prefs_filtering_action.c:947
 msgid "Recipient is not set."
 msgstr "Nebol zadaný príjemca."
 
-#: src/prefs_filtering_action.c:963
+#: src/prefs_filtering_action.c:965
 msgid "Score is not set"
 msgstr "Nebolo zadané ohodnotenie"
 
-#: src/prefs_filtering_action.c:971
+#: src/prefs_filtering_action.c:973
 msgid "Header is not set."
 msgstr "Nebol zadaný názov hlavičky."
 
-#: src/prefs_filtering_action.c:978
+#: src/prefs_filtering_action.c:980
 msgid "Target addressbook/folder is not set."
 msgstr "Nie je nastavený cieľový adresár/zložka."
 
-#: src/prefs_filtering_action.c:992
+#: src/prefs_filtering_action.c:994
 msgid "Tag name is empty."
 msgstr "Meno značky je prázdne."
 
-#: src/prefs_filtering_action.c:1214
+#: src/prefs_filtering_action.c:1216
 msgid "No action was defined."
 msgstr "Nebola definovaná žiadna akcia."
 
-#: src/prefs_filtering_action.c:1252 src/prefs_matcher.c:2147
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2153
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "Znak %"
 
-#: src/prefs_filtering_action.c:1261 src/prefs_matcher.c:2156
+#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2162
 msgid "filename (should not be modified)"
 msgstr "názov súboru (nemal by byť menený)"
 
-#: src/prefs_filtering_action.c:1262 src/prefs_matcher.c:2157
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2163
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "nový riadok"
 
-#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2158
+#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2164
 msgid "escape character for quotes"
 msgstr "únikový znak citácie"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2159
+#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2165
 msgid "quote character"
 msgstr "znak úvodzoviek"
 
-#: src/prefs_filtering_action.c:1273
+#: src/prefs_filtering_action.c:1275
 msgid "Filtering Action: 'Execute'"
 msgstr "Filtrovacia akcia: „Vykonať”"
 
-#: src/prefs_filtering_action.c:1274
+#: src/prefs_filtering_action.c:1276
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
@@ -14455,23 +14394,23 @@ msgstr ""
 "programu, alebo skriptu.\n"
 "Môžete použiť tieto symboly:"
 
-#: src/prefs_filtering_action.c:1420
+#: src/prefs_filtering_action.c:1422
 msgid "Recipient"
 msgstr "Príjemca"
 
-#: src/prefs_filtering_action.c:1424
+#: src/prefs_filtering_action.c:1426
 msgid "Book/Folder"
 msgstr "_Adresár/Zložka"
 
-#: src/prefs_filtering_action.c:1428
+#: src/prefs_filtering_action.c:1430
 msgid "Destination"
 msgstr "Cieľ"
 
-#: src/prefs_filtering_action.c:1432
+#: src/prefs_filtering_action.c:1434
 msgid "Color"
 msgstr "Zafarbiť"
 
-#: src/prefs_filtering_action.c:1518
+#: src/prefs_filtering_action.c:1520
 msgid "Current action list"
 msgstr "Zoznam aktuálnych akcií"
 
@@ -14479,8 +14418,8 @@ msgstr "Zoznam aktuálnych akcií"
 msgid "Filtering/Processing configuration"
 msgstr "Nastavenie filtrovania"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:864
-#: src/prefs_filtering.c:978
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
+#: src/prefs_filtering.c:981
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Všetky"
@@ -14489,9 +14428,13 @@ msgstr "Všetky"
 msgid "Condition"
 msgstr "Podmienka"
 
-#: src/prefs_filtering.c:424 src/prefs_filtering.c:446
-msgid " Define... "
-msgstr " Definovať… "
+#: src/prefs_filtering.c:424
+msgid " D_efine... "
+msgstr " D_efinovať… "
+
+#: src/prefs_filtering.c:446
+msgid " De_fine... "
+msgstr " D_efinovať… "
 
 #: src/prefs_filtering.c:475
 msgid "Append the new rule above to the list"
@@ -14501,87 +14444,87 @@ msgstr "Priať nové pravidlo na začiatok zoznamu"
 msgid "Replace the selected rule in list with the rule above"
 msgstr "Nahradiť zvolené pravidlo v zozname pravidlom vyššie"
 
-#: src/prefs_filtering.c:492
+#: src/prefs_filtering.c:493
 msgid "Delete the selected rule from the list"
 msgstr "Zmazať zvolené pravidlo zo zoznamu"
 
-#: src/prefs_filtering.c:529
+#: src/prefs_filtering.c:532
 msgid "Move the selected rule to the top"
 msgstr "Presunúť zvolené pravidlo na začiatok"
 
-#: src/prefs_filtering.c:532
-msgid "Page up"
-msgstr "O stranu vyššie"
+#: src/prefs_filtering.c:535
+msgid "Page u_p"
+msgstr "O stranu _vyššie"
 
-#: src/prefs_filtering.c:540
+#: src/prefs_filtering.c:543
 msgid "Move the selected rule one page up"
 msgstr "Presunúť zvolené pravidlo na začiatok strany"
 
-#: src/prefs_filtering.c:549
+#: src/prefs_filtering.c:552
 msgid "Move the selected rule up"
 msgstr "Posunúť zvolené pravidlo vyššie"
 
-#: src/prefs_filtering.c:557
+#: src/prefs_filtering.c:560
 msgid "Move the selected rule down"
 msgstr "Posunúť zvolené pravidlo nižšie"
 
-#: src/prefs_filtering.c:560
-msgid "Page down"
-msgstr "O stranu nižšie"
+#: src/prefs_filtering.c:563
+msgid "Page dow_n"
+msgstr "O stranu _nižšie"
 
-#: src/prefs_filtering.c:568
+#: src/prefs_filtering.c:571
 msgid "Move the selected rule one page down"
 msgstr "Presunúť zvolené pravidlo na koniec strany"
 
-#: src/prefs_filtering.c:577
+#: src/prefs_filtering.c:580
 msgid "Move the selected rule to the bottom"
 msgstr "Presunúť zvolené pravidlo na koniec"
 
-#: src/prefs_filtering.c:1035 src/prefs_filtering.c:1121
+#: src/prefs_filtering.c:1038 src/prefs_filtering.c:1124
 msgid "Condition string is not valid."
 msgstr "Reťazec podmienky je neplatný."
 
-#: src/prefs_filtering.c:1108
+#: src/prefs_filtering.c:1111
 msgid "Condition string is empty."
 msgstr "Reťazec podmienky je prázdny."
 
-#: src/prefs_filtering.c:1114
+#: src/prefs_filtering.c:1117
 msgid "Action string is empty."
 msgstr "Reťazec akcie je prázdny."
 
-#: src/prefs_filtering.c:1202
+#: src/prefs_filtering.c:1205
 msgid "Delete rule"
 msgstr "Odstrániť pravidlo"
 
-#: src/prefs_filtering.c:1203
+#: src/prefs_filtering.c:1206
 msgid "Do you really want to delete this rule?"
 msgstr "Naozaj chcete odstrániť toto pravidlo?"
 
-#: src/prefs_filtering.c:1221
+#: src/prefs_filtering.c:1224
 msgid "Delete all rules"
 msgstr "Zmazať všetky pravidlá"
 
-#: src/prefs_filtering.c:1222
+#: src/prefs_filtering.c:1225
 msgid "Do you really want to delete all the rules?"
 msgstr "Naozaj chcete odstrániť všetky pravidlá?"
 
-#: src/prefs_filtering.c:1474
+#: src/prefs_filtering.c:1477
 msgid "Filtering rules not saved"
 msgstr "Pravidlá filtrovania neboli uložené"
 
-#: src/prefs_filtering.c:1475
+#: src/prefs_filtering.c:1478
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "Zoznam filtrovacích pravidiel bol zmenený. Zavrieť aj napriek tomu?"
 
-#: src/prefs_filtering.c:1697
+#: src/prefs_filtering.c:1700
 msgid "Move one page up"
 msgstr "Posunúť o stranu vyššie"
 
-#: src/prefs_filtering.c:1698
+#: src/prefs_filtering.c:1701
 msgid "Move one page down"
 msgstr "Posunúť o stranu nižšie"
 
-#: src/prefs_filtering.c:1860
+#: src/prefs_filtering.c:1856
 msgid "Enable"
 msgstr "Povoliť"
 
@@ -14607,7 +14550,7 @@ msgid "Displayed columns"
 msgstr "Zobrazené položky"
 
 #: src/prefs_folder_column.c:329 src/prefs_msg_colors.c:494
-#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1055
+#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1064
 msgid " Use default "
 msgstr " Použiť predvolené "
 
@@ -14765,7 +14708,7 @@ msgstr "Vlastnosti zložky %s"
 msgid "Folder and Message Lists"
 msgstr "Zoznamy zložiek a správ"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2024
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2030
 msgid "Message"
 msgstr "Správa"
 
@@ -14798,7 +14741,7 @@ msgstr "Zobrazenie"
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/prefs_gtk.c:938 src/toolbar.c:212 src/toolbar.c:421
+#: src/prefs_gtk.c:938 src/toolbar.c:213 src/toolbar.c:422
 msgid "Preferences"
 msgstr "Nastavenia"
 
@@ -15014,11 +14957,11 @@ msgstr "Telo správy"
 msgid "whole message"
 msgstr "Celá správa"
 
-#: src/prefs_matcher.c:389 src/summaryview.c:6302
+#: src/prefs_matcher.c:389 src/summaryview.c:6298
 msgid "Marked"
 msgstr "Označená"
 
-#: src/prefs_matcher.c:390 src/summaryview.c:6300
+#: src/prefs_matcher.c:390 src/summaryview.c:6296
 msgid "Deleted"
 msgstr "Zmazaná"
 
@@ -15026,12 +14969,12 @@ msgstr "Zmazaná"
 msgid "Replied"
 msgstr "Odpovedaná"
 
-#: src/prefs_matcher.c:392 src/summaryview.c:6294
+#: src/prefs_matcher.c:392 src/summaryview.c:6290
 msgid "Forwarded"
 msgstr "Poslané ďalej"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6284 src/toolbar.c:414
-#: src/toolbar.c:950 src/toolbar.c:1996
+#: src/prefs_matcher.c:394 src/summaryview.c:6280 src/toolbar.c:415
+#: src/toolbar.c:951 src/toolbar.c:1997
 msgid "Spam"
 msgstr "Spam"
 
@@ -15039,7 +14982,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Má prílohu"
 
-#: src/prefs_matcher.c:396 src/summaryview.c:6320
+#: src/prefs_matcher.c:396 src/summaryview.c:6316
 msgid "Signed"
 msgstr "Podpísané"
 
@@ -15139,54 +15082,54 @@ msgstr "Čiastočne stiahnutá"
 msgid "External program test"
 msgstr "Kontrola externým programom"
 
-#: src/prefs_matcher.c:707 src/prefs_matcher.c:1598 src/prefs_matcher.c:1613
-#: src/prefs_matcher.c:2495
+#: src/prefs_matcher.c:707 src/prefs_matcher.c:1604 src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:2501
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Všetky"
 
-#: src/prefs_matcher.c:739
+#: src/prefs_matcher.c:741
 msgid "Use regexp"
 msgstr "Použiť regulárny výraz"
 
-#: src/prefs_matcher.c:812
+#: src/prefs_matcher.c:818
 msgid "Message must match"
 msgstr "Správa musí vyhovovať"
 
-#: src/prefs_matcher.c:816
+#: src/prefs_matcher.c:822
 msgid "at least one"
 msgstr "aspoň jedno"
 
-#: src/prefs_matcher.c:817
+#: src/prefs_matcher.c:823
 msgid "all"
 msgstr "všetky"
 
-#: src/prefs_matcher.c:820
+#: src/prefs_matcher.c:826
 msgid "of above rules"
 msgstr "predošlých pravidiel"
 
-#: src/prefs_matcher.c:1516 src/prefs_matcher.c:1582
+#: src/prefs_matcher.c:1522 src/prefs_matcher.c:1588
 msgid "Search pattern is not set."
 msgstr "Nebol zadaný vyhľadávací vzor."
 
-#: src/prefs_matcher.c:1525
+#: src/prefs_matcher.c:1531
 msgid "Test command is not set."
 msgstr "Nie je nastavený testovací príkaz."
 
-#: src/prefs_matcher.c:1599
+#: src/prefs_matcher.c:1605
 msgid "all addresses in all headers"
 msgstr "všetky adresy vo všetkých hlavičkách"
 
-#: src/prefs_matcher.c:1602
+#: src/prefs_matcher.c:1608
 msgid "any address in any header"
 msgstr "akákoľvek adresa v akejkoľvek hlavičke"
 
-#: src/prefs_matcher.c:1604
+#: src/prefs_matcher.c:1610
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "adresy v hlavičke „%s”"
 
-#: src/prefs_matcher.c:1605
+#: src/prefs_matcher.c:1611
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -15199,79 +15142,79 @@ msgstr ""
 "Ak chcete overiť či %s existuje v rámci celého adresára, vyberte „%s” z "
 "rozbaľovacieho zoznamu adresára/zložky."
 
-#: src/prefs_matcher.c:1824
+#: src/prefs_matcher.c:1830
 msgid "Headers part"
 msgstr "Záhlavie správy"
 
-#: src/prefs_matcher.c:1828
+#: src/prefs_matcher.c:1834
 msgid "Body part"
 msgstr "Telo správy"
 
-#: src/prefs_matcher.c:1832
+#: src/prefs_matcher.c:1838
 msgid "Whole message"
 msgstr "Celá správa"
 
-#: src/prefs_matcher.c:1951 src/prefs_matcher.c:1995
+#: src/prefs_matcher.c:1957 src/prefs_matcher.c:2001
 msgid "in"
 msgstr "v"
 
-#: src/prefs_matcher.c:1953
+#: src/prefs_matcher.c:1959
 msgid "content is"
 msgstr "obsahuje"
 
-#: src/prefs_matcher.c:1962
+#: src/prefs_matcher.c:1968
 msgid "Age is"
 msgstr "Vek je"
 
-#: src/prefs_matcher.c:1967
+#: src/prefs_matcher.c:1973
 msgid "Flag"
 msgstr "Príznak"
 
-#: src/prefs_matcher.c:1968 src/prefs_matcher.c:1985
+#: src/prefs_matcher.c:1974 src/prefs_matcher.c:1991
 msgid "is"
 msgstr "je"
 
-#: src/prefs_matcher.c:1973
+#: src/prefs_matcher.c:1979
 msgid "Name:"
 msgstr "Meno: "
 
-#: src/prefs_matcher.c:1984
+#: src/prefs_matcher.c:1990
 msgid "Label"
 msgstr "Menovka"
 
-#: src/prefs_matcher.c:1990
+#: src/prefs_matcher.c:1996
 msgid "Value:"
 msgstr "Hodnota:"
 
-#: src/prefs_matcher.c:2007
+#: src/prefs_matcher.c:2013
 msgid "Score is"
 msgstr "Skóre je"
 
-#: src/prefs_matcher.c:2008
+#: src/prefs_matcher.c:2014
 msgid "points"
 msgstr "bodov"
 
-#: src/prefs_matcher.c:2018
+#: src/prefs_matcher.c:2024
 msgid "Size is"
 msgstr "Veľkosť je"
 
-#: src/prefs_matcher.c:2023
+#: src/prefs_matcher.c:2029
 msgid "Scope:"
 msgstr "Rozsah:"
 
-#: src/prefs_matcher.c:2025
+#: src/prefs_matcher.c:2031
 msgid "tags"
 msgstr "Značky"
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2036
 msgid "type is"
 msgstr "typ je"
 
-#: src/prefs_matcher.c:2034
+#: src/prefs_matcher.c:2040
 msgid "Program returns"
 msgstr "Návratová hodnota programu"
 
-#: src/prefs_matcher.c:2104
+#: src/prefs_matcher.c:2110
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -15279,11 +15222,11 @@ msgstr ""
 "Pravidlo nebolo uložené.\n"
 "Zavrieť napriek tomu?"
 
-#: src/prefs_matcher.c:2168
+#: src/prefs_matcher.c:2174
 msgid "Match Type: 'Test'"
 msgstr "Typ zhody: „Test”"
 
-#: src/prefs_matcher.c:2169
+#: src/prefs_matcher.c:2175
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -15295,7 +15238,7 @@ msgstr ""
 "\n"
 "Môžete použiť tieto symboly:"
 
-#: src/prefs_matcher.c:2268
+#: src/prefs_matcher.c:2274
 msgid "Current condition rules"
 msgstr "Aktuálne pravidlá"
 
@@ -15464,10 +15407,6 @@ msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Vyberte farbu podpisov"
 
-#: src/prefs_msg_colors.c:362
-msgid "Signatures"
-msgstr "Podpisy"
-
 #: src/prefs_msg_colors.c:367 src/prefs_summaries.c:354
 msgid "Folder list"
 msgstr "Zoznam správ"
@@ -15694,71 +15633,71 @@ msgstr "Rôzne"
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Dňa %d\\n%f napísal:\\n\\n%q"
 
-#: src/prefs_receive.c:137
+#: src/prefs_receive.c:123
 msgid "External incorporation program"
 msgstr "Externý program na príjem"
 
-#: src/prefs_receive.c:140
+#: src/prefs_receive.c:126
 msgid "Use external program for receiving mail"
 msgstr "Na príjem pošty použiť externý program"
 
-#: src/prefs_receive.c:156
+#: src/prefs_receive.c:142
 msgid "Automatic checking"
 msgstr "Automatická kontrola"
 
-#: src/prefs_receive.c:163
+#: src/prefs_receive.c:149
 msgid "Check for new mail every"
 msgstr "Automaticky kontrolovať novú poštu každých"
 
-#: src/prefs_receive.c:181
+#: src/prefs_receive.c:167
 msgid "Check for new mail on start-up"
 msgstr "Skontrolovať novú poštu pri spustení"
 
-#: src/prefs_receive.c:184
+#: src/prefs_receive.c:170
 msgid "Dialogs"
 msgstr "Dialógy"
 
-#: src/prefs_receive.c:186
+#: src/prefs_receive.c:172
 msgid "Show receive dialog"
 msgstr "Zobraziť okno prijímania"
 
-#: src/prefs_receive.c:196
+#: src/prefs_receive.c:182
 msgid "Only on manual receiving"
 msgstr "Len pri manuálnom prijímaní"
 
-#: src/prefs_receive.c:207
+#: src/prefs_receive.c:193
 msgid "Close receive dialog when finished"
 msgstr "Po skončení zavrieť okno prijímania"
 
-#: src/prefs_receive.c:210
+#: src/prefs_receive.c:196
 msgid "Don't popup error dialog on receive error"
 msgstr "Nezobrazovať upozornenie pri chybe pri prijímaní"
 
-#: src/prefs_receive.c:213
-msgid "After checking for new mail"
-msgstr "Po kontrole novej pošty"
+#: src/prefs_receive.c:199
+msgid "After receiving new mail"
+msgstr "Po prijatí novej správy"
 
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:201
 msgid "Go to Inbox"
 msgstr "Prejsť do zložky doručenej pošty"
 
-#: src/prefs_receive.c:217
+#: src/prefs_receive.c:203
 msgid "Update all local folders"
 msgstr "Aktualizovať všetky miestne zložky"
 
-#: src/prefs_receive.c:220
+#: src/prefs_receive.c:205
 msgid "Run command"
 msgstr "Spustiť príkaz"
 
-#: src/prefs_receive.c:225
+#: src/prefs_receive.c:210
 msgid "after automatic check"
 msgstr "po automatickej kontrole"
 
-#: src/prefs_receive.c:227
+#: src/prefs_receive.c:212
 msgid "after manual check"
 msgstr "po ručnej kontrole"
 
-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:220
 #, c-format
 msgid ""
 "Command to execute:\n"
@@ -15767,47 +15706,39 @@ msgstr ""
 "Vykonať príkaz:\n"
 "(použite %d ako počet nových správ)"
 
-#: src/prefs_receive.c:260
-msgid "Blink LED"
-msgstr "Blikať LED"
-
-#: src/prefs_receive.c:261
-msgid "Play sound"
-msgstr "Prehrať zvuk"
-
-#: src/prefs_receive.c:263
-msgid "Show info banner"
-msgstr "Zobraziť panel s informáciou"
-
-#: src/prefs_receive.c:397 src/prefs_send.c:348
+#: src/prefs_receive.c:343 src/prefs_send.c:357
 msgid "Mail Handling"
 msgstr "Správa pošty"
 
-#: src/prefs_receive.c:398
+#: src/prefs_receive.c:344
 msgid "Receiving"
 msgstr "Príjem pošty"
 
-#: src/prefs_send.c:159
+#: src/prefs_send.c:161
 msgid "Save sent messages to Sent folder"
 msgstr "Uložiť odoslané správy do zložky Odoslané"
 
-#: src/prefs_send.c:162
+#: src/prefs_send.c:164
 msgid "Confirm before sending queued messages"
 msgstr "Potvrdiť odoslanie správ vo fronte"
 
-#: src/prefs_send.c:165
+#: src/prefs_send.c:167
 msgid "Never send Return Receipts"
 msgstr "Neposielať potvrdenia o doručení"
 
-#: src/prefs_send.c:168
+#: src/prefs_send.c:170
 msgid "Show send dialog"
 msgstr "Zobraziť okno odosielania"
 
-#: src/prefs_send.c:176
+#: src/prefs_send.c:172
+msgid "Warn when Subject is empty"
+msgstr "Upozorniť na prázdny predmet"
+
+#: src/prefs_send.c:180
 msgid "Outgoing encoding"
 msgstr "Výstupné kódovanie"
 
-#: src/prefs_send.c:201
+#: src/prefs_send.c:205
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
@@ -15815,131 +15746,131 @@ msgstr ""
 "Po zvolení „Automatické” bude zvolené optimálne kódovanie pre súčasnú "
 "lokalizáciu"
 
-#: src/prefs_send.c:216
+#: src/prefs_send.c:220
 msgid "Automatic (Recommended)"
 msgstr "Automatické (odporúčané)"
 
-#: src/prefs_send.c:218
+#: src/prefs_send.c:222
 msgid "7bit ASCII (US-ASCII)"
 msgstr "7bit ASCII (US-ASCII)"
 
-#: src/prefs_send.c:219
+#: src/prefs_send.c:223
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_send.c:221
+#: src/prefs_send.c:225
 msgid "Western European (ISO-8859-1)"
 msgstr "Západná Európa (ISO-8859-1)"
 
-#: src/prefs_send.c:222
+#: src/prefs_send.c:226
 msgid "Western European (ISO-8859-15)"
 msgstr "Západná Európa (ISO-8859-15)"
 
-#: src/prefs_send.c:224
+#: src/prefs_send.c:228
 msgid "Central European (ISO-8859-2)"
 msgstr "Stredná Európa (ISO-8859-2)"
 
-#: src/prefs_send.c:226
+#: src/prefs_send.c:230
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltie (ISO-8859-13)"
 
-#: src/prefs_send.c:227
+#: src/prefs_send.c:231
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltie (ISO-8859-4)"
 
-#: src/prefs_send.c:229
+#: src/prefs_send.c:233
 msgid "Greek (ISO-8859-7)"
 msgstr "Grécko (ISO-8859-7)"
 
-#: src/prefs_send.c:231
+#: src/prefs_send.c:235
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrejské (ISO-8859-8)"
 
-#: src/prefs_send.c:232
+#: src/prefs_send.c:236
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrejské (Windows-1255)"
 
-#: src/prefs_send.c:234
+#: src/prefs_send.c:238
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabské (ISO-8859-6)"
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:239
 msgid "Arabic (Windows-1256)"
 msgstr "Arabské (Windows-1256)"
 
-#: src/prefs_send.c:237
+#: src/prefs_send.c:241
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turecko (ISO-8859-9)"
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:243
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrilika (ISO-8859-5)"
 
-#: src/prefs_send.c:240
+#: src/prefs_send.c:244
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrilika (KOI8-R)"
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:245
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrilika (KOI8-U)"
 
-#: src/prefs_send.c:242
+#: src/prefs_send.c:246
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrilika (Windows-1251)"
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:248
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonsko (ISO-2022-JP)"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:250
 msgid "Japanese (EUC-JP)"
 msgstr "Japonsko (EUC-JP)"
 
-#: src/prefs_send.c:247
+#: src/prefs_send.c:251
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonsko (Shift_JIS)"
 
-#: src/prefs_send.c:250
+#: src/prefs_send.c:254
 msgid "Simplified Chinese (GB18030)"
 msgstr "Zjednodušená čínština (GB18030)"
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:255
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínština (GB2312)"
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:256
 msgid "Simplified Chinese (GBK)"
 msgstr "Zjednodušená čínština (GBK)"
 
-#: src/prefs_send.c:253
+#: src/prefs_send.c:257
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradičná čínština (Big5)"
 
-#: src/prefs_send.c:255
+#: src/prefs_send.c:259
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradičná čínština (EUC-TW)"
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:260
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínština (ISO-2022-CN)"
 
-#: src/prefs_send.c:259
+#: src/prefs_send.c:263
 msgid "Korean (EUC-KR)"
 msgstr "Kórea (EUC-KR)"
 
-#: src/prefs_send.c:261
+#: src/prefs_send.c:265
 msgid "Thai (TIS-620)"
 msgstr "Thajsko (TIS-620)"
 
-#: src/prefs_send.c:262
+#: src/prefs_send.c:266
 msgid "Thai (Windows-874)"
 msgstr "Thajsko (Windows-874)"
 
-#: src/prefs_send.c:266
+#: src/prefs_send.c:270
 msgid "Transfer encoding"
 msgstr "Kódovanie pri prenose"
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:281
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
@@ -15947,8 +15878,8 @@ msgstr ""
 "Zadajte hodnotu Content-Transfer-Encoding, ktorá bude použitá, keď bude "
 "správa obsahovať iné znaky ako ASCII"
 
-#: src/prefs_send.c:349 src/send_message.c:483 src/send_message.c:487
-#: src/send_message.c:492
+#: src/prefs_send.c:358 src/send_message.c:491 src/send_message.c:495
+#: src/send_message.c:500
 msgid "Sending"
 msgstr "Odosielanie"
 
@@ -16270,87 +16201,87 @@ msgstr "Priať novú šablónu na začiatok zoznamu"
 msgid "Replace the selected template in list with the template above"
 msgstr "Nahradiť zvolenú šablónu v zozname šablónou vyššie"
 
-#: src/prefs_template.c:324
+#: src/prefs_template.c:326
 msgid "Delete the selected template from the list"
 msgstr "Zmazať zvolenú šablónu zo zoznamu"
 
-#: src/prefs_template.c:340
+#: src/prefs_template.c:344
 msgid "Show information on configuring templates"
 msgstr "Zobraziť informácie o nastavovaní šablón"
 
-#: src/prefs_template.c:364
+#: src/prefs_template.c:368
 msgid "Move the selected template to the top"
 msgstr "Presunúť zvolenú šablónu na začiatok"
 
-#: src/prefs_template.c:374
+#: src/prefs_template.c:378
 msgid "Move the selected template up"
 msgstr "Posunúť zvolenú šablónu vyššie"
 
-#: src/prefs_template.c:382
+#: src/prefs_template.c:386
 msgid "Move the selected template down"
 msgstr "Posunúť zvolenú šablónu nižšie"
 
-#: src/prefs_template.c:392
+#: src/prefs_template.c:396
 msgid "Move the selected template to the bottom"
 msgstr "Presunúť zvolenú šablónu na koniec"
 
-#: src/prefs_template.c:408
+#: src/prefs_template.c:412
 msgid "Template configuration"
 msgstr "Nastavenie šablón"
 
-#: src/prefs_template.c:595
+#: src/prefs_template.c:599
 msgid "Templates list not saved"
 msgstr "Zoznam šablón nebol uložený"
 
-#: src/prefs_template.c:596
+#: src/prefs_template.c:600
 msgid "The templates list has been modified. Close anyway?"
 msgstr "Zoznam šablón nebol uložený. Zavrieť napriek tomu?"
 
-#: src/prefs_template.c:757
+#: src/prefs_template.c:761
 msgid "The template's name is not set."
 msgstr "Nebol zadaný názov šablóny."
 
-#: src/prefs_template.c:794
+#: src/prefs_template.c:798
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "Pole „Od” šablóny obsahuje neplatnú emailovú adresu."
 
-#: src/prefs_template.c:800
+#: src/prefs_template.c:804
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "Pole „Komu” šablóny obsahuje neplatnú emailovú adresu."
 
-#: src/prefs_template.c:806
+#: src/prefs_template.c:810
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "Pole „Kópia” šablóny obsahuje neplatnú emailovú adresu."
 
-#: src/prefs_template.c:812
+#: src/prefs_template.c:816
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "Pole „Skrytá kópia” šablóny obsahuje neplatnú emailovú adresu."
 
-#: src/prefs_template.c:818
+#: src/prefs_template.c:822
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "Pole „Predmet” šablóny nie je platné."
 
-#: src/prefs_template.c:888
+#: src/prefs_template.c:892
 msgid "Delete template"
 msgstr "Zmazať šablónu"
 
-#: src/prefs_template.c:889
+#: src/prefs_template.c:893
 msgid "Do you really want to delete this template?"
 msgstr "Naozaj chcete zmazať túto šablónu?"
 
-#: src/prefs_template.c:901
+#: src/prefs_template.c:905
 msgid "Delete all templates"
 msgstr "Zmazať všetky šablóny"
 
-#: src/prefs_template.c:902
+#: src/prefs_template.c:906
 msgid "Do you really want to delete all the templates?"
 msgstr "Naozaj chcete zmazať všetky šablóny?"
 
-#: src/prefs_template.c:1224
+#: src/prefs_template.c:1221
 msgid "Current templates"
 msgstr "Aktuálne šablóny"
 
-#: src/prefs_template.c:1252
+#: src/prefs_template.c:1249
 msgid "Template"
 msgstr "Šablóna"
 
@@ -16492,6 +16423,10 @@ msgstr "Výber"
 msgid "Install new..."
 msgstr "Inštalovať novú…"
 
+#: src/prefs_themes.c:843
+msgid "Get more..."
+msgstr "Získať ďalšie…"
+
 #: src/prefs_themes.c:854
 msgid "Information"
 msgstr "Informácie"
@@ -16528,63 +16463,67 @@ msgstr "Položka nemá určenú ikonu."
 msgid "Item has no text defined."
 msgstr "Položka nemá určený text."
 
-#: src/prefs_toolbar.c:911
+#: src/prefs_toolbar.c:916
 msgid "Toolbar item"
 msgstr "Položka panela nástrojov"
 
-#: src/prefs_toolbar.c:927
+#: src/prefs_toolbar.c:932
 msgid "Item type"
 msgstr "Typ položky"
 
-#: src/prefs_toolbar.c:937
+#: src/prefs_toolbar.c:942
 msgid "Internal Function"
 msgstr "Interná funkcia"
 
-#: src/prefs_toolbar.c:938
+#: src/prefs_toolbar.c:943
 msgid "User Action"
 msgstr "Akcia"
 
-#: src/prefs_toolbar.c:940 src/toolbar.c:232
+#: src/prefs_toolbar.c:945 src/toolbar.c:233
 msgid "Separator"
 msgstr "Oddeľovač"
 
-#: src/prefs_toolbar.c:947
+#: src/prefs_toolbar.c:952
 msgid "Event executed on click"
 msgstr "Vykonať pri kliknutí"
 
-#: src/prefs_toolbar.c:986
+#: src/prefs_toolbar.c:991
 msgid "Toolbar text"
 msgstr "Text panela nástrojov"
 
-#: src/prefs_toolbar.c:1001 src/prefs_toolbar.c:1372
+#: src/prefs_toolbar.c:1006 src/prefs_toolbar.c:1381
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/prefs_toolbar.c:1252 src/prefs_toolbar.c:1266 src/prefs_toolbar.c:1280
+#: src/prefs_toolbar.c:1042
+msgid "A_dd"
+msgstr "Pri_dať"
+
+#: src/prefs_toolbar.c:1261 src/prefs_toolbar.c:1275 src/prefs_toolbar.c:1289
 msgid "Toolbars"
 msgstr "Panely nástrojov"
 
-#: src/prefs_toolbar.c:1253
+#: src/prefs_toolbar.c:1262
 msgid "Main Window"
 msgstr "Hlavné okno"
 
-#: src/prefs_toolbar.c:1267
+#: src/prefs_toolbar.c:1276
 msgid "Message Window"
 msgstr "Okno správy"
 
-#: src/prefs_toolbar.c:1281
+#: src/prefs_toolbar.c:1290
 msgid "Compose Window"
 msgstr "Okno písania správy"
 
-#: src/prefs_toolbar.c:1395
+#: src/prefs_toolbar.c:1404
 msgid "Icon text"
 msgstr "Text ikony"
 
-#: src/prefs_toolbar.c:1404
+#: src/prefs_toolbar.c:1413
 msgid "Mapped event"
 msgstr "Priradená udalosť"
 
-#: src/prefs_toolbar.c:1701
+#: src/prefs_toolbar.c:1710
 msgid "Toolbar item icon"
 msgstr "Ikona panela nástrojov"
 
@@ -16653,7 +16592,7 @@ msgstr "Nie sú dostupné žiadne informácie"
 msgid "No recipient keys defined."
 msgstr "Neboli definované žiadne kľúče príjemcov."
 
-#: src/procmime.c:419 src/procmime.c:421 src/procmime.c:422
+#: src/procmime.c:422 src/procmime.c:424 src/procmime.c:425
 msgid "[Error decoding BASE64]\n"
 msgstr "[Chyba pri dekódovaní BASE64]\n"
 
@@ -16688,7 +16627,7 @@ msgstr ""
 
 #: src/procmsg.c:1732
 msgid ""
-"Couldn't determine sending informations. Maybe the email hasn't been "
+"Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
 "Nemožno zistiť informácie na odoslanie. Správa asi nebola vygenerovaná "
@@ -16868,8 +16807,8 @@ msgid ""
 "to insert"
 msgstr ""
 "vložiť súbor:\n"
-"<span style=\"oblique\">podvýraz</span> je vyhodnotené ako cesta k súboru na "
-"vloženie"
+"<span style=\"oblique\">pod_výraz</span> je vyhodnotené ako cesta k súboru "
+"na vloženie"
 
 #: src/quote_fmt.c:93
 msgid ""
@@ -16879,7 +16818,7 @@ msgid ""
 "the output from"
 msgstr ""
 "vložiť výstup z programu:\n"
-"<span style=\"oblique\">podvýraz</span> je vyhodnotené ako príkazový "
+"<span style=\"oblique\">pod_výraz</span> je vyhodnotené ako príkazový "
 "riadok, \n"
 "ktorého výstup bude vložený"
 
@@ -16890,7 +16829,7 @@ msgid ""
 "user-entered text"
 msgstr ""
 "vložiť používateľský vstup:\n"
-"<span style=\"oblique\">podvýraz</span> je premenná, ktorá bude nahradená "
+"<span style=\"oblique\">pod_výraz</span> je premenná, ktorá bude nahradená "
 "textom,\n"
 "zadaným používateľom"
 
@@ -16901,8 +16840,8 @@ msgid ""
 "to attach"
 msgstr ""
 "pripojiť súbor:\n"
-"<span style=\"oblique\">podvýraz</span> je vyhodnotené ako cesta k súboru na "
-"pripojenie"
+"<span style=\"oblique\">pod_výraz</span> je vyhodnotené ako cesta k súboru "
+"na pripojenie"
 
 #: src/quote_fmt.c:97
 msgid "<span weight=\"bold\">definition of terms:</span>"
@@ -17020,73 +16959,73 @@ msgstr "Nemožno vykonať príkaz: %s"
 msgid "Error occurred while executing command: %s"
 msgstr "Pri odosielaní správy nastala chyba: %s"
 
-#: src/send_message.c:331
+#: src/send_message.c:339
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: src/send_message.c:336
+#: src/send_message.c:344
 msgid "Doing POP before SMTP..."
 msgstr "Robím POP pred SMTP…"
 
-#: src/send_message.c:339
+#: src/send_message.c:347
 msgid "POP before SMTP"
 msgstr "POP pred SMTP"
 
-#: src/send_message.c:344
+#: src/send_message.c:352
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Účet „%s”: Pripájanie k serveru SMTP: %s:%d…"
 
-#: src/send_message.c:401
+#: src/send_message.c:409
 msgid "Mail sent successfully."
 msgstr "Správa bola odoslaná úspešne."
 
-#: src/send_message.c:468
+#: src/send_message.c:476
 msgid "Sending HELO..."
 msgstr "Posielam HELO…"
 
-#: src/send_message.c:469 src/send_message.c:474 src/send_message.c:479
+#: src/send_message.c:477 src/send_message.c:482 src/send_message.c:487
 msgid "Authenticating"
 msgstr "Autentifikácia"
 
-#: src/send_message.c:470 src/send_message.c:475
+#: src/send_message.c:478 src/send_message.c:483
 msgid "Sending message..."
 msgstr "Odosielam správu…"
 
-#: src/send_message.c:473
+#: src/send_message.c:481
 msgid "Sending EHLO..."
 msgstr "Odosielam EHLO…"
 
-#: src/send_message.c:482
+#: src/send_message.c:490
 msgid "Sending MAIL FROM..."
 msgstr "Odosielam MAIL FROM…"
 
-#: src/send_message.c:486
+#: src/send_message.c:494
 msgid "Sending RCPT TO..."
 msgstr "Odosielam RCPT TO…"
 
-#: src/send_message.c:491
+#: src/send_message.c:499
 msgid "Sending DATA..."
 msgstr "Odosielam DATA…"
 
-#: src/send_message.c:495
+#: src/send_message.c:503
 msgid "Quitting..."
 msgstr "Odpájam sa…"
 
-#: src/send_message.c:524
+#: src/send_message.c:532
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: src/send_message.c:577
+#: src/send_message.c:585
 msgid "Sending message"
 msgstr "Odosielam správu"
 
-#: src/send_message.c:646 src/send_message.c:666
+#: src/send_message.c:654 src/send_message.c:674
 msgid "Error occurred while sending the message."
 msgstr "Pri odosielaní správy nastala chyba."
 
-#: src/send_message.c:649
+#: src/send_message.c:657
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -17132,40 +17071,40 @@ msgstr "Vymazať certifikát"
 msgid "Do you really want to delete this certificate?"
 msgstr "Naozaj chcete vymazať tento certifikát?"
 
-#: src/summary_search.c:266
+#: src/summary_search.c:271
 msgid "Search messages"
 msgstr "Vyhľadať v správach"
 
-#: src/summary_search.c:292
+#: src/summary_search.c:293
 msgid "Match any of the following"
 msgstr "Spĺňa aspoň jednu z nasledujúcich podmienok"
 
-#: src/summary_search.c:294
+#: src/summary_search.c:295
 msgid "Match all of the following"
 msgstr "Spĺňa všetky z nasledujúcich podmienok"
 
-#: src/summary_search.c:433
+#: src/summary_search.c:459
 msgid "Body:"
 msgstr "Telo:"
 
-#: src/summary_search.c:440
+#: src/summary_search.c:466
 msgid "Condition:"
 msgstr "Podmienka:"
 
-#: src/summary_search.c:470
+#: src/summary_search.c:496
 msgid "Find _all"
 msgstr "Nájsť _všetky"
 
-#: src/summary_search.c:679 src/summaryview.c:1105 src/summaryview.c:1366
+#: src/summary_search.c:702 src/summaryview.c:1105 src/summaryview.c:1366
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Hľadám v %s… \n"
 
-#: src/summary_search.c:776
+#: src/summary_search.c:799
 msgid "Beginning of list reached; continue from end?"
 msgstr "Bol dosiahnutý začiatok zoznamu; pokračovať od konca?"
 
-#: src/summary_search.c:778
+#: src/summary_search.c:801
 msgid "End of list reached; continue from beginning?"
 msgstr "Bol dosiahnutý koniec zoznamu; pokračovať od začiatku?"
 
@@ -17368,11 +17307,11 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Pre: %s, na %s</span>"
 
-#: src/summaryview.c:4290
+#: src/summaryview.c:4286
 msgid "You're not the author of the article.\n"
 msgstr "Nie ste autorom tohoto príspevku.\n"
 
-#: src/summaryview.c:4383
+#: src/summaryview.c:4379
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
@@ -17380,61 +17319,61 @@ msgstr[0] "Naozaj chcete zmazať zvolenú správu?"
 msgstr[1] "Naozaj chcete zmazať %d zvolené správy?"
 msgstr[2] "Naozaj chcete zmazať %d zvolených správ?"
 
-#: src/summaryview.c:4386
+#: src/summaryview.c:4382
 msgid "Delete message(s)"
 msgstr "Zmazať správy"
 
-#: src/summaryview.c:4549
+#: src/summaryview.c:4545
 msgid "Destination is same as current folder."
 msgstr "Cieľ je rovnaký ako aktuálna zložka."
 
-#: src/summaryview.c:4648
+#: src/summaryview.c:4644
 msgid "Destination to copy is same as current folder."
 msgstr "Cieľ kopírovania je rovnaký ako aktuálna zložka."
 
-#: src/summaryview.c:4821
+#: src/summaryview.c:4817
 msgid "Append or Overwrite"
 msgstr "Pripojiť alebo prepísať"
 
-#: src/summaryview.c:4822
+#: src/summaryview.c:4818
 msgid "Append or overwrite existing file?"
 msgstr "Pripojiť alebo prepísať existujúci súbor?"
 
-#: src/summaryview.c:4823
+#: src/summaryview.c:4819
 msgid "_Append"
 msgstr "Pri_pojiť"
 
-#: src/summaryview.c:4823
+#: src/summaryview.c:4819
 msgid "_Overwrite"
 msgstr "_Prepísať"
 
-#: src/summaryview.c:4864
+#: src/summaryview.c:4860
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "Chystáte sa vytlačiť %d správ, jednu po druhej. Prajete si pokračovať?"
 
-#: src/summaryview.c:5341
+#: src/summaryview.c:5337
 msgid "Building threads..."
 msgstr "Vytváram vlákna…"
 
-#: src/summaryview.c:5587
+#: src/summaryview.c:5583
 msgid "Skip these rules"
 msgstr "Preskočiť tieto pravidlá"
 
-#: src/summaryview.c:5590
+#: src/summaryview.c:5586
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Použiť tieto pravidlá bez ohľadu na to, ku ktorému účtu patria"
 
-#: src/summaryview.c:5593
+#: src/summaryview.c:5589
 msgid "Apply these rules if they apply to the current account"
 msgstr "Použiť tieto pravidlá bez ohľadu na to, či patria k aktívnemu účtu"
 
-#: src/summaryview.c:5622
+#: src/summaryview.c:5618
 msgid "Filtering"
 msgstr "Filtrovanie"
 
-#: src/summaryview.c:5623
+#: src/summaryview.c:5619
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -17442,59 +17381,59 @@ msgstr ""
 "Niektoré pravidlá patria konkrétnemu účtu.\n"
 "Prosím vyberte si, ako pristupovať k týmto pravidlám:"
 
-#: src/summaryview.c:5625
+#: src/summaryview.c:5621
 msgid "_Filter"
 msgstr "_Filtrovať"
 
-#: src/summaryview.c:5653
+#: src/summaryview.c:5649
 msgid "Filtering..."
 msgstr "Filtrujem…"
 
-#: src/summaryview.c:5732
+#: src/summaryview.c:5728
 msgid "Processing configuration"
 msgstr "Nastavenie spracovania"
 
-#: src/summaryview.c:6280
+#: src/summaryview.c:6276
 msgid "Ignored thread"
 msgstr "Ignorované vlákno"
 
-#: src/summaryview.c:6282
+#: src/summaryview.c:6278
 msgid "Watched thread"
 msgstr "Sledované vlákno"
 
-#: src/summaryview.c:6290
+#: src/summaryview.c:6286
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Odpovedané, ale aj presmerované – kliknite na zobrazenie odpovede"
 
-#: src/summaryview.c:6292
+#: src/summaryview.c:6288
 msgid "Replied - click to see reply"
 msgstr "Odpovedané – kliknite na zobrazenie odpovede"
 
-#: src/summaryview.c:6304
+#: src/summaryview.c:6300
 msgid "To be moved"
 msgstr "Presunuté"
 
-#: src/summaryview.c:6306
+#: src/summaryview.c:6302
 msgid "To be copied"
 msgstr "Skopírované"
 
-#: src/summaryview.c:6318
+#: src/summaryview.c:6314
 msgid "Signed, has attachment(s)"
 msgstr "Podpísané, má prílohu(y)"
 
-#: src/summaryview.c:6322
+#: src/summaryview.c:6318
 msgid "Encrypted, has attachment(s)"
 msgstr "Zašifrované, má prílohu(y)"
 
-#: src/summaryview.c:6324
+#: src/summaryview.c:6320
 msgid "Encrypted"
 msgstr "Zašifrované"
 
-#: src/summaryview.c:6326
+#: src/summaryview.c:6322
 msgid "Has attachment(s)"
 msgstr "Má prílohu(y)"
 
-#: src/summaryview.c:7963
+#: src/summaryview.c:7952
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -17503,11 +17442,11 @@ msgstr ""
 "Chyba v regulárnom výraze:\n"
 "%s"
 
-#: src/summaryview.c:8071
+#: src/summaryview.c:8060
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Prejsť naspäť na zoznam zložiek (Máte neprečítané správy)"
 
-#: src/summaryview.c:8076
+#: src/summaryview.c:8065
 msgid "Go back to the folder list"
 msgstr "Prejsť naspäť na zoznam zložiek"
 
@@ -17666,278 +17605,278 @@ msgstr "Varovanie pred phishingovým podvodom"
 msgid "_Open URL"
 msgstr "_Otvoriť URL"
 
-#: src/toolbar.c:191 src/toolbar.c:1948
+#: src/toolbar.c:192 src/toolbar.c:1949
 msgid "Receive Mail from all Accounts"
 msgstr "Prijať správy zo všetkých účtov"
 
-#: src/toolbar.c:192 src/toolbar.c:1953
+#: src/toolbar.c:193 src/toolbar.c:1954
 msgid "Receive Mail from current Account"
 msgstr "Prijať poštu z aktuálneho účtu"
 
-#: src/toolbar.c:193 src/toolbar.c:1957
+#: src/toolbar.c:194 src/toolbar.c:1958
 msgid "Send Queued Messages"
 msgstr "Odoslať správy vo fronte"
 
-#: src/toolbar.c:194 src/toolbar.c:918 src/toolbar.c:1975 src/toolbar.c:1986
+#: src/toolbar.c:195 src/toolbar.c:919 src/toolbar.c:1976 src/toolbar.c:1987
 msgid "Compose Email"
 msgstr "Nová správa"
 
-#: src/toolbar.c:195
+#: src/toolbar.c:196
 msgid "Compose News"
 msgstr "Nový príspevok News"
 
-#: src/toolbar.c:196 src/toolbar.c:2014 src/toolbar.c:2024
+#: src/toolbar.c:197 src/toolbar.c:2015 src/toolbar.c:2025
 msgid "Reply to Message"
 msgstr "Odpovedať na správu"
 
-#: src/toolbar.c:197 src/toolbar.c:2031 src/toolbar.c:2041
+#: src/toolbar.c:198 src/toolbar.c:2032 src/toolbar.c:2042
 msgid "Reply to Sender"
 msgstr "Odpovedať odosielateľovi"
 
-#: src/toolbar.c:198 src/toolbar.c:2048 src/toolbar.c:2058
+#: src/toolbar.c:199 src/toolbar.c:2049 src/toolbar.c:2059
 msgid "Reply to All"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/toolbar.c:199 src/toolbar.c:2065 src/toolbar.c:2075
+#: src/toolbar.c:200 src/toolbar.c:2066 src/toolbar.c:2076
 msgid "Reply to Mailing-list"
 msgstr "Odpovedať do diskusnej skupiny"
 
-#: src/toolbar.c:200 src/toolbar.c:1969
+#: src/toolbar.c:201 src/toolbar.c:1970
 msgid "Open email"
 msgstr "Otvoriť správu"
 
-#: src/toolbar.c:201 src/toolbar.c:2082 src/toolbar.c:2093
+#: src/toolbar.c:202 src/toolbar.c:2083 src/toolbar.c:2094
 msgid "Forward Message"
 msgstr "Poslať správu ďalej"
 
-#: src/toolbar.c:202 src/toolbar.c:2098
+#: src/toolbar.c:203 src/toolbar.c:2099
 msgid "Trash Message"
 msgstr "Presunúť správu do koša"
 
-#: src/toolbar.c:203 src/toolbar.c:2102
+#: src/toolbar.c:204 src/toolbar.c:2103
 msgid "Delete Message"
 msgstr "Zmazať správu"
 
-#: src/toolbar.c:205 src/toolbar.c:2110
+#: src/toolbar.c:206 src/toolbar.c:2111
 msgid "Go to Previous Unread Message"
 msgstr "Prejsť na predošlú neprečítanú správu"
 
-#: src/toolbar.c:206 src/toolbar.c:2114
+#: src/toolbar.c:207 src/toolbar.c:2115
 msgid "Go to Next Unread Message"
 msgstr "Prejsť na ďalšiu neprečítanú správu"
 
-#: src/toolbar.c:209 src/toolbar.c:419
+#: src/toolbar.c:210 src/toolbar.c:420
 msgid "Print"
 msgstr "Tlačiť"
 
-#: src/toolbar.c:210
+#: src/toolbar.c:211
 msgid "Learn Spam or Ham"
 msgstr "Učiť sa ako SPAM alebo nie SPAM"
 
-#: src/toolbar.c:211
+#: src/toolbar.c:212
 msgid "Open folder/Go to folder list"
 msgstr "Otvoriť zložku/Prejsť na zoznam zložiek"
 
-#: src/toolbar.c:214 src/toolbar.c:2120
+#: src/toolbar.c:215 src/toolbar.c:2121
 msgid "Send Message"
 msgstr "Odoslať správu"
 
-#: src/toolbar.c:215 src/toolbar.c:2124
+#: src/toolbar.c:216 src/toolbar.c:2125
 msgid "Put into queue folder and send later"
 msgstr "Zaradiť správu do fronty a odoslať neskôr"
 
-#: src/toolbar.c:216 src/toolbar.c:2128
+#: src/toolbar.c:217 src/toolbar.c:2129
 msgid "Save to draft folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/toolbar.c:217 src/toolbar.c:2132
+#: src/toolbar.c:218 src/toolbar.c:2133
 msgid "Insert file"
 msgstr "Vložiť súbor"
 
-#: src/toolbar.c:218 src/toolbar.c:2136
+#: src/toolbar.c:219 src/toolbar.c:2137
 msgid "Attach file"
 msgstr "Pripojiť súbor"
 
-#: src/toolbar.c:219 src/toolbar.c:2140
+#: src/toolbar.c:220 src/toolbar.c:2141
 msgid "Insert signature"
 msgstr "Vložiť podpis"
 
-#: src/toolbar.c:220 src/toolbar.c:2144
+#: src/toolbar.c:221 src/toolbar.c:2145
 msgid "Edit with external editor"
 msgstr "Upraviť pomocou externého editoru"
 
-#: src/toolbar.c:221 src/toolbar.c:2148
+#: src/toolbar.c:222 src/toolbar.c:2149
 msgid "Wrap long lines of current paragraph"
 msgstr "Zalomiť dlhé riadky aktuálneho odstavca"
 
-#: src/toolbar.c:222 src/toolbar.c:2152
+#: src/toolbar.c:223 src/toolbar.c:2153
 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 
-#: src/toolbar.c:225 src/toolbar.c:437 src/toolbar.c:2161
+#: src/toolbar.c:226 src/toolbar.c:438 src/toolbar.c:2162
 msgid "Check spelling"
 msgstr "Skontrolovať preklepy"
 
-#: src/toolbar.c:227
+#: src/toolbar.c:228
 msgid "Claws Mail Actions Feature"
 msgstr "Akcie Claws Mail"
 
-#: src/toolbar.c:228 src/toolbar.c:2177
+#: src/toolbar.c:229 src/toolbar.c:2178
 msgid "Cancel receiving"
 msgstr "Prerušiť príjem"
 
-#: src/toolbar.c:230 src/toolbar.c:2185
+#: src/toolbar.c:231 src/toolbar.c:2186
 msgid "Cancel receiving/sending"
 msgstr "Zrušiť prijímanie/odosielanie"
 
-#: src/toolbar.c:231 src/toolbar.c:1961
+#: src/toolbar.c:232 src/toolbar.c:1962
 msgid "Close window"
 msgstr "Zatvoriť okno"
 
-#: src/toolbar.c:233
+#: src/toolbar.c:234
 msgid "Claws Mail Plugins"
 msgstr "Zásuvné moduly Claws Mail"
 
-#: src/toolbar.c:377 src/toolbar.c:412
+#: src/toolbar.c:378 src/toolbar.c:413
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Kôš"
 
-#: src/toolbar.c:400
+#: src/toolbar.c:401
 msgid "Folders"
 msgstr "Zložky"
 
-#: src/toolbar.c:402
+#: src/toolbar.c:403
 msgid "Get Mail"
 msgstr "Prijať poštu"
 
-#: src/toolbar.c:403
+#: src/toolbar.c:404
 msgid "Get"
 msgstr "Získať"
 
-#: src/toolbar.c:405 src/toolbar.c:406
+#: src/toolbar.c:406 src/toolbar.c:407
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Napísať"
 
-#: src/toolbar.c:408
+#: src/toolbar.c:409
 msgid "All"
 msgstr "Všetkým"
 
-#: src/toolbar.c:409
+#: src/toolbar.c:410
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "Odosielateľ"
 
-#: src/toolbar.c:410
+#: src/toolbar.c:411
 msgid "List"
 msgstr "Do diskusie"
 
-#: src/toolbar.c:415
+#: src/toolbar.c:416
 msgid "Prev"
 msgstr "Predošlá"
 
-#: src/toolbar.c:416
+#: src/toolbar.c:417
 msgid "Next"
 msgstr "Ďalšia"
 
-#: src/toolbar.c:424
+#: src/toolbar.c:425
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/toolbar.c:427
+#: src/toolbar.c:428
 msgid "Insert sig."
 msgstr "Vložiť podpis"
 
-#: src/toolbar.c:428
+#: src/toolbar.c:429
 msgid "Edit"
 msgstr "Upraviť"
 
-#: src/toolbar.c:429
+#: src/toolbar.c:430
 msgid "Wrap para."
 msgstr "Zalomiť odstavec"
 
-#: src/toolbar.c:430
+#: src/toolbar.c:431
 msgid "Wrap all"
 msgstr "Zalomiť"
 
-#: src/toolbar.c:432 src/toolbar.c:433
+#: src/toolbar.c:433 src/toolbar.c:434
 msgid "Stop"
 msgstr "Zastaviť"
 
-#: src/toolbar.c:434
+#: src/toolbar.c:435
 msgid "Stop all"
 msgstr "Zastaviť všetko"
 
-#: src/toolbar.c:910
+#: src/toolbar.c:911
 msgid "Compose News message"
 msgstr "Napísať príspevok"
 
-#: src/toolbar.c:952
+#: src/toolbar.c:953
 msgid "Learn spam"
 msgstr "Naučiť ako spam"
 
-#: src/toolbar.c:961
+#: src/toolbar.c:962
 msgid "Ham"
 msgstr "Nie spam"
 
-#: src/toolbar.c:963
+#: src/toolbar.c:964
 msgid "Learn ham"
 msgstr "Naučiť ako nie spam"
 
-#: src/toolbar.c:1943
+#: src/toolbar.c:1944
 msgid "Go to folder list"
 msgstr "Prejsť na zoznam zložiek"
 
-#: src/toolbar.c:1949
+#: src/toolbar.c:1950
 msgid "Receive Mail from selected Account"
 msgstr "Prijať poštu zo zvoleného účtu"
 
-#: src/toolbar.c:1965
+#: src/toolbar.c:1966
 msgid "Open preferences"
 msgstr "Otvoriť nastavenia"
 
-#: src/toolbar.c:1976
+#: src/toolbar.c:1977
 msgid "Compose with selected Account"
 msgstr "Napísať správu zo zvoleného účtu"
 
-#: src/toolbar.c:1997
+#: src/toolbar.c:1998
 msgid "Learn as..."
 msgstr "Naučiť ako…"
 
-#: src/toolbar.c:2007
+#: src/toolbar.c:2008
 msgid "Learn as _Spam"
 msgstr "Naučiť ako _spam"
 
-#: src/toolbar.c:2008
+#: src/toolbar.c:2009
 msgid "Learn as _Ham"
 msgstr "Naučiť ako _nie spam"
 
-#: src/toolbar.c:2015
+#: src/toolbar.c:2016
 msgid "Reply to Message options"
 msgstr "Voľby Odpovede na správu"
 
-#: src/toolbar.c:2019 src/toolbar.c:2036 src/toolbar.c:2053 src/toolbar.c:2070
+#: src/toolbar.c:2020 src/toolbar.c:2037 src/toolbar.c:2054 src/toolbar.c:2071
 msgid "_Reply with quote"
 msgstr "Odpovedať s _citáciou"
 
-#: src/toolbar.c:2020 src/toolbar.c:2037 src/toolbar.c:2054 src/toolbar.c:2071
+#: src/toolbar.c:2021 src/toolbar.c:2038 src/toolbar.c:2055 src/toolbar.c:2072
 msgid "Reply without _quote"
 msgstr "_Odpovedať bez citácie"
 
-#: src/toolbar.c:2032
+#: src/toolbar.c:2033
 msgid "Reply to Sender options"
 msgstr "Voľby Odpoveď odosielateľovi"
 
-#: src/toolbar.c:2049
+#: src/toolbar.c:2050
 msgid "Reply to All options"
 msgstr "Voľby Odpovedať všetkým"
 
-#: src/toolbar.c:2066
+#: src/toolbar.c:2067
 msgid "Reply to Mailing-list options"
 msgstr "Voľby Odpovede do emailovej konferencie"
 
-#: src/toolbar.c:2083
+#: src/toolbar.c:2084
 msgid "Forward Message options"
 msgstr "Voľby Poslania správy ďalej"
 
@@ -17962,12 +17901,12 @@ msgstr "Prosím zvoľte linku."
 msgid "Select All"
 msgstr "Vybrať všetko"
 
-#: src/wizard.c:539
+#: src/wizard.c:517
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Víta vás Claws Mail"
 
-#: src/wizard.c:562
+#: src/wizard.c:540
 #, c-format
 msgid ""
 "\n"
@@ -18060,149 +17999,133 @@ msgstr ""
 " učiniť na adrese <%s>.\n"
 "\n"
 
-#: src/wizard.c:638
+#: src/wizard.c:616
 msgid "Please enter the mailbox name."
 msgstr "Prosím, zadajte názov schránky."
 
-#: src/wizard.c:681
+#: src/wizard.c:644
 msgid "Please enter your name and email address."
 msgstr "Prosím, zadajte svoje meno a emailovú adresu."
 
-#: src/wizard.c:692
+#: src/wizard.c:655
 msgid "Please enter your receiving server and username."
 msgstr "Prosím, zadajte váš server príchodzej pošty, a používateľské meno."
 
-#: src/wizard.c:702
+#: src/wizard.c:665
 msgid "Please enter your username."
 msgstr "Prosím, zadajte svoje používateľské meno."
 
-#: src/wizard.c:712
+#: src/wizard.c:675
 msgid "Please enter your SMTP server."
 msgstr "Prosím, zadajte svoj SMTP server."
 
-#: src/wizard.c:723
+#: src/wizard.c:686
 msgid "Please enter your SMTP username."
 msgstr "Prosím, zadajte svoje používateľské meno SMTP."
 
-#: src/wizard.c:1013
+#: src/wizard.c:965
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Vaše meno:</span>"
 
-#: src/wizard.c:1023
+#: src/wizard.c:975
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Vaša emailová adresa:</span>"
 
-#: src/wizard.c:1033
+#: src/wizard.c:985
 msgid "Your organization:"
 msgstr "Vaša organizácia:"
 
-#: src/wizard.c:1141
+#: src/wizard.c:1018
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Názov schránky:</span>"
 
-#: src/wizard.c:1149
+#: src/wizard.c:1026
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 "Môžete zadať aj absolútnu cestu k zložke, napr.: „/home/jozef/Dokumenty/Mail”"
 
-#: src/wizard.c:1157
-msgid "on internal memory"
-msgstr "v internej pamäti"
-
-#: src/wizard.c:1160
-msgid "on external memory card"
-msgstr "na externej pamäťovej karte"
-
-#: src/wizard.c:1163
-msgid "on internal memory card"
-msgstr "na internej pamäťovej karte"
-
-#: src/wizard.c:1213
-msgid "<span weight=\"bold\">Store data</span>"
-msgstr "<span weight=\"bold\">Uložiť dáta:</span>"
-
-#: src/wizard.c:1281
+#: src/wizard.c:1097
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr ""
 "Číslo portu môžete zadať tak, že ho pridáte na koniec: „mail.firma.sk:25”"
 
-#: src/wizard.c:1284
+#: src/wizard.c:1100
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Adresa SMTP servera:</span>"
 
-#: src/wizard.c:1290
+#: src/wizard.c:1106
 msgid "Use authentication"
 msgstr "Použiť autentifikáciu"
 
-#: src/wizard.c:1298
+#: src/wizard.c:1114
 msgid "<span size=\"small\">(empty to use the same as receive)</span>"
 msgstr ""
 "<span size=\"small\">(nechajte prázdne, ak je rovnaké ako na príjem)</span>"
 
-#: src/wizard.c:1312
+#: src/wizard.c:1128
 msgid "SMTP username:"
 msgstr "Meno SMTP:"
 
-#: src/wizard.c:1323
+#: src/wizard.c:1139
 msgid "SMTP password:"
 msgstr "Heslo SMTP:"
 
-#: src/wizard.c:1340
+#: src/wizard.c:1152
 msgid "Use SSL to connect to SMTP server"
 msgstr "Použiť SSL na pripojenie k serveru SMTP"
 
-#: src/wizard.c:1351 src/wizard.c:1630
+#: src/wizard.c:1163 src/wizard.c:1437
 msgid "Use SSL via STARTTLS"
 msgstr "Použiť SSL pomocou STARTTLS"
 
-#: src/wizard.c:1363 src/wizard.c:1642
+#: src/wizard.c:1175 src/wizard.c:1449
 msgid "Client SSL certificate (optional)"
 msgstr "Klientský SSL certifikát (voliteľné)"
 
-#: src/wizard.c:1425 src/wizard.c:1450 src/wizard.c:1573
+#: src/wizard.c:1237 src/wizard.c:1262 src/wizard.c:1385
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Adresa servera:</span>"
 
-#: src/wizard.c:1480
+#: src/wizard.c:1292
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Lokálna schránka:</span>"
 
-#: src/wizard.c:1540
+#: src/wizard.c:1352
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Typ servera:</span>"
 
-#: src/wizard.c:1550
+#: src/wizard.c:1362
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1584
+#: src/wizard.c:1396
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr ""
 "Číslo portu môžete zadať tak, že ho pridáte na koniec: „mail.priklad.sk:110”"
 
-#: src/wizard.c:1589
+#: src/wizard.c:1401
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Používateľské meno:</span>"
 
-#: src/wizard.c:1619
+#: src/wizard.c:1426
 msgid "Use SSL to connect to receiving server"
 msgstr "Použiť SSL na pripojenie k serveru prijímania"
 
-#: src/wizard.c:1684
+#: src/wizard.c:1491
 msgid "IMAP server directory:"
 msgstr "Zložka servera IMAP:"
 
-#: src/wizard.c:1695
+#: src/wizard.c:1502
 msgid "Show only subscribed folders"
 msgstr "Zobraziť len odoberané zložky"
 
-#: src/wizard.c:1703
+#: src/wizard.c:1510
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"
@@ -18210,15 +18133,15 @@ msgstr ""
 "<span weight=\"bold\">Varovanie: táto verzia Claws Mail\n"
 "bola zostavená bez podpory protokolu IMAP.</span>"
 
-#: src/wizard.c:1823
+#: src/wizard.c:1628
 msgid "Claws Mail Setup Wizard"
 msgstr "Sprievodca nastavením Claws Mail"
 
-#: src/wizard.c:1857
+#: src/wizard.c:1662
 msgid "Welcome to Claws Mail"
 msgstr "Claws Mail vás víta"
 
-#: src/wizard.c:1865
+#: src/wizard.c:1670
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -18231,2147 +18154,34 @@ msgstr ""
 "Začneme získaním základných údajov o vás, a vašich poštových nastaveniach, "
 "aby ste mohli začať Claws Mail používať za menej ako päť minút."
 
-#: src/wizard.c:1888
+#: src/wizard.c:1683
 msgid "About You"
 msgstr "O vás"
 
-#: src/wizard.c:1896 src/wizard.c:1911 src/wizard.c:1926 src/wizard.c:1942
+#: src/wizard.c:1691 src/wizard.c:1706 src/wizard.c:1721 src/wizard.c:1737
 msgid "Bold fields must be completed"
 msgstr "Polia, označené tučným písmom, musia byť vyplnené"
 
-#: src/wizard.c:1903
+#: src/wizard.c:1698
 msgid "Receiving mail"
 msgstr "Príjímanie pošty"
 
-#: src/wizard.c:1918
+#: src/wizard.c:1713
 msgid "Sending mail"
 msgstr "Odosielanie pošty"
 
-#: src/wizard.c:1934
+#: src/wizard.c:1729
 msgid "Saving mail on disk"
 msgstr "Ukladanie správy na disk"
 
-#: src/wizard.c:1950
+#: src/wizard.c:1745
 msgid "Configuration finished"
 msgstr "Konfigurácia dokončená"
 
-#: src/wizard.c:1958
+#: src/wizard.c:1753
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
 "Program Claws Mail je pripravený.\n"
 "Kliknite na Uložiť."
-
-#~ msgid "Accounts List Get Column Name|G"
-#~ msgstr "G"
-
-#~ msgid ""
-#~ "Command could not be started. Pipe creation failed.\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Príkaz nemohol byť spustený, zlyhalo vytvorenie rúry.\n"
-#~ "%s"
-
-#~ msgid "Dialog title|Edit attribute names"
-#~ msgstr "Upraviť názvy atribútov"
-
-#~ msgid "Complete day name for use by strftime|Sunday"
-#~ msgstr "Nedeľa"
-
-#~ msgid "Complete day name for use by strftime|Monday"
-#~ msgstr "Pondelok"
-
-#~ msgid "Complete day name for use by strftime|Tuesday"
-#~ msgstr "Utorok"
-
-#~ msgid "Complete day name for use by strftime|Wednesday"
-#~ msgstr "Streda"
-
-#~ msgid "Complete day name for use by strftime|Thursday"
-#~ msgstr "Štvrtok"
-
-#~ msgid "Complete day name for use by strftime|Friday"
-#~ msgstr "Piatok"
-
-#~ msgid "Complete day name for use by strftime|Saturday"
-#~ msgstr "Sobota"
-
-#~ msgid "Complete month name for use by strftime|January"
-#~ msgstr "Január"
-
-#~ msgid "Complete month name for use by strftime|February"
-#~ msgstr "Február"
-
-#~ msgid "Complete month name for use by strftime|March"
-#~ msgstr "Marec"
-
-#~ msgid "Complete month name for use by strftime|April"
-#~ msgstr "Apríl"
-
-#~ msgid "Complete month name for use by strftime|May"
-#~ msgstr "Máj"
-
-#~ msgid "Complete month name for use by strftime|June"
-#~ msgstr "Jún"
-
-#~ msgid "Complete month name for use by strftime|July"
-#~ msgstr "Júl"
-
-#~ msgid "Complete month name for use by strftime|August"
-#~ msgstr "August"
-
-#~ msgid "Complete month name for use by strftime|September"
-#~ msgstr "September"
-
-#~ msgid "Complete month name for use by strftime|October"
-#~ msgstr "Október"
-
-#~ msgid "Complete month name for use by strftime|November"
-#~ msgstr "November"
-
-#~ msgid "Complete month name for use by strftime|December"
-#~ msgstr "December"
-
-#~ msgid "Abbr. day name for use by strftime|Sun"
-#~ msgstr "Ne"
-
-#~ msgid "Abbr. day name for use by strftime|Mon"
-#~ msgstr "Po"
-
-#~ msgid "Abbr. day name for use by strftime|Tue"
-#~ msgstr "Ut"
-
-#~ msgid "Abbr. day name for use by strftime|Wed"
-#~ msgstr "St"
-
-#~ msgid "Abbr. day name for use by strftime|Thu"
-#~ msgstr "Št"
-
-#~ msgid "Abbr. day name for use by strftime|Fri"
-#~ msgstr "Pi"
-
-#~ msgid "Abbr. day name for use by strftime|Sat"
-#~ msgstr "So"
-
-#~ msgid "Abbr. month name for use by strftime|Jan"
-#~ msgstr "Jan"
-
-#~ msgid "Abbr. month name for use by strftime|Feb"
-#~ msgstr "Feb"
-
-#~ msgid "Abbr. month name for use by strftime|Mar"
-#~ msgstr "Mar"
-
-#~ msgid "Abbr. month name for use by strftime|Apr"
-#~ msgstr "Apr"
-
-#~ msgid "Abbr. month name for use by strftime|May"
-#~ msgstr "Máj"
-
-#~ msgid "Abbr. month name for use by strftime|Jun"
-#~ msgstr "Jún"
-
-#~ msgid "Abbr. month name for use by strftime|Jul"
-#~ msgstr "Júl"
-
-#~ msgid "Abbr. month name for use by strftime|Aug"
-#~ msgstr "Aug"
-
-#~ msgid "Abbr. month name for use by strftime|Sep"
-#~ msgstr "Sep"
-
-#~ msgid "Abbr. month name for use by strftime|Oct"
-#~ msgstr "Okt"
-
-#~ msgid "Abbr. month name for use by strftime|Nov"
-#~ msgstr "Nov"
-
-#~ msgid "Abbr. month name for use by strftime|Dec"
-#~ msgstr "Dec"
-
-#~ msgid "For use by strftime (morning)|AM"
-#~ msgstr "AM"
-
-#~ msgid "For use by strftime (afternoon)|PM"
-#~ msgstr "PM"
-
-#~ msgid "For use by strftime (morning, lowercase)|am"
-#~ msgstr "am"
-
-#~ msgid "For use by strftime (afternoon, lowercase)|pm"
-#~ msgstr "pm"
-
-#~ msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
-#~ msgstr "%a %b %e %H:%M:%S %Y"
-
-#~ msgid "For use by strftime (default date format)|%m/%d/%y"
-#~ msgstr "%d. %m. %y"
-
-#~ msgid "For use by strftime (default time format)|%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
-#~ msgstr "%I:%M:%S %p"
-
-#~ msgid "Dialog title|Apply tags"
-#~ msgstr "Použiť značky"
-
-#~ msgid "`%c' can't be included in folder name."
-#~ msgstr "Názov zložky nemôže obsahovať „%c”."
-
-#~ msgid "Select ..."
-#~ msgstr "Vybrať..."
-
-#~ msgid "Dillo Browser"
-#~ msgstr "Prehliadač Dillo"
-
-#~ msgid "Load remote links in mails"
-#~ msgstr "Nasledovať vzdialené linky v správach"
-
-#~ msgid "Equivalent to Dillo's '--local' option"
-#~ msgstr "Ekvivalent voľby „--local” pre Dillo"
-
-#~ msgid "You can still load remote links by reloading the page"
-#~ msgstr "Vzdialené linky môžete nasledovať opätovným načítaním stránky"
-
-#~ msgid "Only for senders found in address book/folder"
-#~ msgstr "Len pre odosielateľov nájdených v adresári/zložke"
-
-#~ msgid "Full window mode (hide controls)"
-#~ msgstr "Režim celej obrazovky (skryť ovládacie prvky)"
-
-#~ msgid "Equivalent to Dillo's '--fullwindow' option"
-#~ msgstr "Ekvivalent voľby „--fullwindow” pre Dillo"
-
-#~ msgid "Dillo HTML Viewer"
-#~ msgstr "Prehliadač HTML Dillo"
-
-#~ msgid "Can't find the dillo executable in PATH. Is it installed?"
-#~ msgstr "Nemožno nájsť spustiteľný súbor dillo v v PATH. Je nainštalovaný?"
-
-#~ msgid "Trayicon"
-#~ msgstr "Ikona oznamovacej oblasti"
-
-#~ msgid "Claws Mail"
-#~ msgstr "Claws Mail"
-
-#~ msgid "Failed to register offline switch hook"
-#~ msgstr "Zlyhala registrácia obsluhy udalosti „offline switch”"
-
-#~ msgid "Failed to register account list changed hook"
-#~ msgstr "Zlyhala registrácia obsluhy udalosti „account list changed”"
-
-#~ msgid "Failed to register close hook"
-#~ msgstr "Zlyhala registrácia obsluhy udalosti „close”"
-
-#~ msgid "Failed to register got iconified hook"
-#~ msgstr "Zlyhala registrácia obsluhy udalosti „got iconified”"
-
-#~ msgid "Failed to register theme change hook"
-#~ msgstr "Zlyhala registrácia obsluhy udalosti „theme change”"
-
-#~ msgid ""
-#~ "This plugin places a mailbox icon in the system tray that indicates if "
-#~ "you have new or unread mail.\n"
-#~ "\n"
-#~ "The mailbox is empty if you have no unread mail, otherwise it contains a "
-#~ "letter. A tooltip shows new, unread and total number of messages."
-#~ msgstr ""
-#~ "Tento zásuvný modul umiestni do systémovej lišty ikonu ktorá ukazuje, či "
-#~ "máte novú alebo neprečítanú poštu.\n"
-#~ "\n"
-#~ "Ak nemáte neprečítanú poštu, je schránka ikony prázdna, inak je v nej "
-#~ "vykreslený list. Podržanie kurzora myši nad ikonou ukáže počet nových a "
-#~ "neprečítaných správ, ako aj celkový počet správ."
-
-#~ msgid "Hide Claws Mail at start-up"
-#~ msgstr "Skryje okno Claws Mail pri štarte"
-
-#~ msgid ""
-#~ "Hide Claws Mail using the tray icon instead of closing it\n"
-#~ "when the window close button is clicked"
-#~ msgstr ""
-#~ "Skryje Claws Mail do systémovej lišty, namiesto jeho zatvorenia\n"
-#~ "pri zatvorení zatváracím tlačidlom okna"
-
-#~ msgid "Minimize to tray"
-#~ msgstr "Minimalizovať do systémovej lišty"
-
-#~ msgid "Hide Claws Mail using the tray icon instead of minimizing it"
-#~ msgstr "Pri zavretí okna aplikáciu minimalizovať do systémovej lišty"
-
-#~ msgid "Filtering Account Menu|All"
-#~ msgstr "Všetky"
-
-#~ msgid "Filtering Matcher Menu|All"
-#~ msgstr "Všetky"
-
-#~ msgid "Dialog title|Pick color for 'color %d'"
-#~ msgstr "Vyberte farbu pre „color %d”"
-
-#~ msgid "Dialog title|Pick color for 1st level text"
-#~ msgstr "Výber farby prvej úrovne textu"
-
-#~ msgid "Dialog title|Pick color for 2nd level text"
-#~ msgstr "Výber farby druhej úrovne textu"
-
-#~ msgid "Dialog title|Pick color for 3rd level text"
-#~ msgstr "Výber farby tretej úrovne textu"
-
-#~ msgid "Dialog title|Pick color for 1st level text background"
-#~ msgstr "Výber farby pozadia prvej úrovne textu"
-
-#~ msgid "Dialog title|Pick color for 2nd level text background"
-#~ msgstr "Výber farby pozadia druhej úrovne textu"
-
-#~ msgid "Dialog title|Pick color for 3rd level text background"
-#~ msgstr "Výber farby pozadia tretej úrovne textu"
-
-#~ msgid "Dialog title|Pick color for links"
-#~ msgstr "Výber farby odkazov"
-
-#~ msgid "Dialog title|Pick color for target folder"
-#~ msgstr "Výber farby cieľovej zložky"
-
-#~ msgid "Dialog title|Pick color for signatures"
-#~ msgstr "Výber farby podpisov"
-
-#~ msgid "Dialog title|Pick color for folder"
-#~ msgstr "Výber farby zložky"
-
-#~ msgid "Toolbar|Trash"
-#~ msgstr "Kôš"
-
-#~ msgid "Toolbar|Compose"
-#~ msgstr "Nová správa"
-
-#~ msgid "Toolbar|Sender"
-#~ msgstr "Odosielateľ"
-
-#~ msgid "Dialog title|Open URLs"
-#~ msgstr "Otvoriť linku"
-
-#~ msgid "Welcome Mail Subject|Welcome to Claws Mail"
-#~ msgstr "Claws Mail vás víta"
-
-#~ msgid "Found location: (%.2f,%.2f)"
-#~ msgstr "Nájdené umiestnenie: (%.2f,%.2f)"
-
-#~ msgid "Alleged country of origin: "
-#~ msgstr "Údajná krajina pôvodu: "
-
-#~ msgid "Could not resolve location of IP address "
-#~ msgstr "Nemožno určiť umiestnenie IP adresy "
-
-#~ msgid "Try to locate sender"
-#~ msgstr "Skúsiť lokalizovať odosielateľa"
-
-#~ msgid "Andorra"
-#~ msgstr "Andorra"
-
-#~ msgid "United Arab Emirates"
-#~ msgstr "Spojené arabské emiráty"
-
-#~ msgid "Afghanistan"
-#~ msgstr "Afganistan"
-
-#~ msgid "Antigua And Barbuda"
-#~ msgstr "Antigua a Barbuda"
-
-#~ msgid "Anguilla"
-#~ msgstr "Anguilla"
-
-#~ msgid "Albania"
-#~ msgstr "Albánsko"
-
-#~ msgid "Armenia"
-#~ msgstr "Arménsko"
-
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Holandské Antily"
-
-#~ msgid "Angola"
-#~ msgstr "Angola"
-
-#~ msgid "Antarctica"
-#~ msgstr "Antarktída"
-
-#~ msgid "Argentina"
-#~ msgstr "Argentína"
-
-#~ msgid "American Samoa"
-#~ msgstr "Americká Samoa"
-
-#~ msgid "Austria"
-#~ msgstr "Rakúsko"
-
-#~ msgid "Australia"
-#~ msgstr "Austrália"
-
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
-
-#~ msgid "Azerbaijan"
-#~ msgstr "Azerbajdžan"
-
-#~ msgid "Bosnia And Herzegovina"
-#~ msgstr "Bosna a Hercegovina"
-
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
-
-#~ msgid "Bangladesh"
-#~ msgstr "Bangladéš"
-
-#~ msgid "Belgium"
-#~ msgstr "Belgicko"
-
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
-
-#~ msgid "Bulgaria"
-#~ msgstr "Bulharsko"
-
-#~ msgid "Bahrain"
-#~ msgstr "Bahrajn"
-
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
-
-#~ msgid "Benin"
-#~ msgstr "Benin"
-
-#~ msgid "Bermuda"
-#~ msgstr "Bermudy"
-
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brunejsko-darussalamský štát"
-
-#~ msgid "Bolivia"
-#~ msgstr "Bolívia"
-
-#~ msgid "Brazil"
-#~ msgstr "Brazília"
-
-#~ msgid "Bahamas"
-#~ msgstr "Bahamy"
-
-#~ msgid "Bhutan"
-#~ msgstr "Bhután"
-
-#~ msgid "Bouvet Island"
-#~ msgstr "Bouvetov ostrov"
-
-#~ msgid "Botswana"
-#~ msgstr "Botswana"
-
-#~ msgid "Belarus"
-#~ msgstr "Bielorusko"
-
-#~ msgid "Belize"
-#~ msgstr "Belize"
-
-#~ msgid "Canada"
-#~ msgstr "Kanada"
-
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Kokosové ostrovy"
-
-#~ msgid "Central African Republic"
-#~ msgstr "Stredoafrická republika"
-
-#~ msgid "Congo"
-#~ msgstr "Kongo"
-
-#~ msgid "Switzerland"
-#~ msgstr "Švajčiarsko"
-
-#~ msgid "Cote D'Ivoire"
-#~ msgstr "Pobrežie Slonoviny"
-
-#~ msgid "Cook Islands"
-#~ msgstr "Cookove ostrovy"
-
-#~ msgid "Chile"
-#~ msgstr "Čile"
-
-#~ msgid "Cameroon"
-#~ msgstr "Kamerun"
-
-#~ msgid "China"
-#~ msgstr "Čína"
-
-#~ msgid "Colombia"
-#~ msgstr "Kolumbia"
-
-#~ msgid "Costa Rica"
-#~ msgstr "Kostarika"
-
-#~ msgid "Cuba"
-#~ msgstr "Kuba"
-
-#~ msgid "Cape Verde"
-#~ msgstr "Kapverdy"
-
-#~ msgid "Christmas Island"
-#~ msgstr "Vianočný ostrov"
-
-#~ msgid "Cyprus"
-#~ msgstr "Cyprus"
-
-#~ msgid "Czech Republic"
-#~ msgstr "Česká republika"
-
-#~ msgid "Germany"
-#~ msgstr "Nemecko"
-
-#~ msgid "Djibouti"
-#~ msgstr "Džibutsko"
-
-#~ msgid "Denmark"
-#~ msgstr "Dánsko"
-
-#~ msgid "Dominica"
-#~ msgstr "Dominika"
-
-#~ msgid "Dominican Republic"
-#~ msgstr "Dominikánska republika"
-
-#~ msgid "Algeria"
-#~ msgstr "Alžírsko"
-
-#~ msgid "Ecuador"
-#~ msgstr "Ekvádor"
-
-#~ msgid "Estonia"
-#~ msgstr "Estónsko"
-
-#~ msgid "Egypt"
-#~ msgstr "Egypt"
-
-#~ msgid "Western Sahara"
-#~ msgstr "Západná Sahara"
-
-#~ msgid "Eritrea"
-#~ msgstr "Eritrea"
-
-#~ msgid "Spain"
-#~ msgstr "Španielsko"
-
-#~ msgid "Ethiopia"
-#~ msgstr "Etiópia"
-
-#~ msgid "Finland"
-#~ msgstr "Fínsko"
-
-#~ msgid "Fiji"
-#~ msgstr "Fidži"
-
-#~ msgid "Falkland Islands (Malvinas)"
-#~ msgstr "Falklandy (Malvíny)"
-
-#~ msgid "Micronesia, Federated States Of"
-#~ msgstr "Mikronézia, federatívne štáty"
-
-#~ msgid "Faroe Islands"
-#~ msgstr "Faerské ostrovy"
-
-#~ msgid "France"
-#~ msgstr "Francúzsko"
-
-#~ msgid "France, Metropolitan"
-#~ msgstr "Metropolitné Francúzsko"
-
-#~ msgid "Gabon"
-#~ msgstr "Gabon"
-
-#~ msgid "United Kingdom"
-#~ msgstr "Spojené kráľovstvo"
-
-#~ msgid "Grenada"
-#~ msgstr "Grenada"
-
-#~ msgid "Georgia"
-#~ msgstr "Gruzínsko"
-
-#~ msgid "French Guiana"
-#~ msgstr "Francúzska Guyana"
-
-#~ msgid "Ghana"
-#~ msgstr "Ghana"
-
-#~ msgid "Gibraltar"
-#~ msgstr "Gibraltár"
-
-#~ msgid "Greenland"
-#~ msgstr "Grónsko"
-
-#~ msgid "Gambia"
-#~ msgstr "Gambia"
-
-#~ msgid "Guinea"
-#~ msgstr "Guinea"
-
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadeloupe"
-
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Rovníková Guinea"
-
-#~ msgid "Greece"
-#~ msgstr "Grécko"
-
-#~ msgid "South Georgia And The South Sandwich Islands"
-#~ msgstr "Južná Georgia a Južné Sandwichove ostrovy"
-
-#~ msgid "Guatemala"
-#~ msgstr "Guatemala"
-
-#~ msgid "Guam"
-#~ msgstr "Guam"
-
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Guinea-Bissau"
-
-#~ msgid "Guyana"
-#~ msgstr "Guyana"
-
-#~ msgid "Hong Kong"
-#~ msgstr "Hongkong"
-
-#~ msgid "Heard Island And Mcdonald Islands"
-#~ msgstr "Heardov ostrov a Macdonaldove ostrovy"
-
-#~ msgid "Honduras"
-#~ msgstr "Honduras"
-
-#~ msgid "Croatia"
-#~ msgstr "Chorvátsko"
-
-#~ msgid "Haiti"
-#~ msgstr "Haiti"
-
-#~ msgid "Hungary"
-#~ msgstr "Maďarsko"
-
-#~ msgid "Indonesia"
-#~ msgstr "Indonézia"
-
-#~ msgid "Ireland"
-#~ msgstr "Írsko"
-
-#~ msgid "Israel"
-#~ msgstr "Izrael"
-
-#~ msgid "India"
-#~ msgstr "India"
-
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Britské indickooceánske územie"
-
-#~ msgid "Iraq"
-#~ msgstr "Irak"
-
-#~ msgid "Iran, Islamic Republic Of"
-#~ msgstr "Iránska islamská republika"
-
-#~ msgid "Iceland"
-#~ msgstr "Island"
-
-#~ msgid "Italy"
-#~ msgstr "Taliansko"
-
-#~ msgid "Jamaica"
-#~ msgstr "Jamajka"
-
-#~ msgid "Jordan"
-#~ msgstr "Jordánsko"
-
-#~ msgid "Kenya"
-#~ msgstr "Keňa"
-
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kirgizsko"
-
-#~ msgid "Cambodia"
-#~ msgstr "Kambodža"
-
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
-
-#~ msgid "Comoros"
-#~ msgstr "Komory"
-
-#~ msgid "Saint Kitts And Nevis"
-#~ msgstr "Svätý Krištof a Nevis"
-
-#~ msgid "Korea, Democratic People'S Republic Of"
-#~ msgstr "Kórejská ľudovodemokratická republika"
-
-#~ msgid "Korea, Republic Of"
-#~ msgstr "Kórejská republika"
-
-#~ msgid "Kuwait"
-#~ msgstr "Kuvajt"
-
-#~ msgid "Cayman Islands"
-#~ msgstr "Kajmanie ostrovy"
-
-#~ msgid "Kazakhstan"
-#~ msgstr "Kazachstan"
-
-#~ msgid "Lao People'S Democratic Republic"
-#~ msgstr "Laoská ľudovodemokratická republika"
-
-#~ msgid "Lebanon"
-#~ msgstr "Libanon"
-
-#~ msgid "Saint Lucia"
-#~ msgstr "Svätá Lucia"
-
-#~ msgid "Liechtenstein"
-#~ msgstr "Lichtenštajnsko"
-
-#~ msgid "Sri Lanka"
-#~ msgstr "Srí Lanka"
-
-#~ msgid "Liberia"
-#~ msgstr "Libéria"
-
-#~ msgid "Lesotho"
-#~ msgstr "Lesotho"
-
-#~ msgid "Lithuania"
-#~ msgstr "Litva"
-
-#~ msgid "Luxembourg"
-#~ msgstr "Luxembursko"
-
-#~ msgid "Latvia"
-#~ msgstr "Lotyšsko"
-
-#~ msgid "Libyan Arab Jamahiriya"
-#~ msgstr "Líbya"
-
-#~ msgid "Morocco"
-#~ msgstr "Maroko"
-
-#~ msgid "Monaco"
-#~ msgstr "Monako"
-
-#~ msgid "Moldova, Republic Of"
-#~ msgstr "Moldavská republika"
-
-#~ msgid "Madagascar"
-#~ msgstr "Madagaskar"
-
-#~ msgid "Marshall Islands"
-#~ msgstr "Marshallove ostrovy"
-
-#~ msgid "Macedonia, The Former Yugoslav Republic Of"
-#~ msgstr "Bývalá juhoslovanská republika Macedónsko"
-
-#~ msgid "Mali"
-#~ msgstr "Mali"
-
-#~ msgid "Myanmar"
-#~ msgstr "Mjanmarsko"
-
-#~ msgid "Mongolia"
-#~ msgstr "Mongolsko"
-
-#~ msgid "Macao"
-#~ msgstr "Macao"
-
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Severné Mariány"
-
-#~ msgid "Martinique"
-#~ msgstr "Martinik"
-
-#~ msgid "Mauritania"
-#~ msgstr "Mauritánia"
-
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
-
-#~ msgid "Malta"
-#~ msgstr "Malta"
-
-#~ msgid "Mauritius"
-#~ msgstr "Maurícius"
-
-#~ msgid "Maldives"
-#~ msgstr "Maldivy"
-
-#~ msgid "Malawi"
-#~ msgstr "Malawi"
-
-#~ msgid "Mexico"
-#~ msgstr "Mexiko"
-
-#~ msgid "Malaysia"
-#~ msgstr "Malajzia"
-
-#~ msgid "Mozambique"
-#~ msgstr "Mozambik"
-
-#~ msgid "Namibia"
-#~ msgstr "Namíbia"
-
-#~ msgid "New Caledonia"
-#~ msgstr "Nová Kaledónia"
-
-#~ msgid "Niger"
-#~ msgstr "Niger"
-
-#~ msgid "Norfolk Island"
-#~ msgstr "Norfolk"
-
-#~ msgid "Nigeria"
-#~ msgstr "Nigéria"
-
-#~ msgid "Nicaragua"
-#~ msgstr "Nikaragua"
-
-#~ msgid "Netherlands"
-#~ msgstr "Holandsko"
-
-#~ msgid "Norway"
-#~ msgstr "Nórsko"
-
-#~ msgid "Nepal"
-#~ msgstr "Nepál"
-
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
-
-#~ msgid "Niue"
-#~ msgstr "Niue"
-
-#~ msgid "New Zealand"
-#~ msgstr "Nový Zéland"
-
-#~ msgid "Oman"
-#~ msgstr "Omán"
-
-#~ msgid "Panama"
-#~ msgstr "Panama"
-
-#~ msgid "Peru"
-#~ msgstr "Peru"
-
-#~ msgid "French Polynesia"
-#~ msgstr "Francúzska Polynézia"
-
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua - Nová Guinea"
-
-#~ msgid "Philippines"
-#~ msgstr "Filipíny"
-
-#~ msgid "Pakistan"
-#~ msgstr "Pakistan"
-
-#~ msgid "Poland"
-#~ msgstr "Poľsko"
-
-#~ msgid "Saint Pierre And Miquelon"
-#~ msgstr "Ostrovy Saint Pierre a Miquelon"
-
-#~ msgid "Pitcairn"
-#~ msgstr "Pitcairnove ostrovy"
-
-#~ msgid "Puerto Rico"
-#~ msgstr "Portoriko"
-
-#~ msgid "Portugal"
-#~ msgstr "Portugalsko"
-
-#~ msgid "Palau"
-#~ msgstr "Palau"
-
-#~ msgid "Paraguay"
-#~ msgstr "Paraguaj"
-
-#~ msgid "Qatar"
-#~ msgstr "Katar"
-
-#~ msgid "Reunion"
-#~ msgstr "Réunion"
-
-#~ msgid "Romania"
-#~ msgstr "Rumunsko"
-
-#~ msgid "Russian Federation"
-#~ msgstr "Ruská federácia"
-
-#~ msgid "Rwanda"
-#~ msgstr "Rwanda"
-
-#~ msgid "Saudi Arabia"
-#~ msgstr "Saudská Arábia"
-
-#~ msgid "Solomon Islands"
-#~ msgstr "Šalamúnove ostrovy"
-
-#~ msgid "Seychelles"
-#~ msgstr "Seychely"
-
-#~ msgid "Sweden"
-#~ msgstr "Švédsko"
-
-#~ msgid "Singapore"
-#~ msgstr "Singapur"
-
-#~ msgid "Saint Helena"
-#~ msgstr "Svätá Helena"
-
-#~ msgid "Slovenia"
-#~ msgstr "Slovinsko"
-
-#~ msgid "Svalbard And Jan Mayen"
-#~ msgstr "Svalbard a Jan Mayen"
-
-#~ msgid "Slovakia"
-#~ msgstr "Slovensko"
-
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
-
-#~ msgid "San Marino"
-#~ msgstr "San Maríno"
-
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
-
-#~ msgid "Somalia"
-#~ msgstr "Somálsko"
-
-#~ msgid "Suriname"
-#~ msgstr "Surinam"
-
-#~ msgid "Sao Tome And Principe"
-#~ msgstr "Svätý Tomáša a Princov ostrov"
-
-#~ msgid "El Salvador"
-#~ msgstr "Salvádor"
-
-#~ msgid "Syrian Arab Republic"
-#~ msgstr "Sýrska arabská republika"
-
-#~ msgid "Swaziland"
-#~ msgstr "Svazijsko"
-
-#~ msgid "Turks And Caicos Islands"
-#~ msgstr "Ostrovy Turks a Caicos"
-
-#~ msgid "Chad"
-#~ msgstr "Čad"
-
-#~ msgid "French Southern Territories"
-#~ msgstr "Francúzske južné a antarktické územia"
-
-#~ msgid "Togo"
-#~ msgstr "Togo"
-
-#~ msgid "Thailand"
-#~ msgstr "Thajsko"
-
-#~ msgid "Tajikistan"
-#~ msgstr "Tadžikistan"
-
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
-
-#~ msgid "Turkmenistan"
-#~ msgstr "Turkménsko"
-
-#~ msgid "Tunisia"
-#~ msgstr "Tunisko"
-
-#~ msgid "Tonga"
-#~ msgstr "Tonga"
-
-#~ msgid "East Timor"
-#~ msgstr "Východný Timor"
-
-#~ msgid "Trinidad And Tobago"
-#~ msgstr "Trinidad a Tobago"
-
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
-
-#~ msgid "Taiwan, Province Of China"
-#~ msgstr "Čínska republika"
-
-#~ msgid "Tanzania, United Republic Of"
-#~ msgstr "Tanzánijská zjednotená republika"
-
-#~ msgid "Ukraine"
-#~ msgstr "Ukrajina"
-
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
-
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "Menšie odľahlé ostrovy Spojených štátov"
-
-#~ msgid "United States"
-#~ msgstr "Spojené štáty"
-
-#~ msgid "Uruguay"
-#~ msgstr "Uruguaj"
-
-#~ msgid "Uzbekistan"
-#~ msgstr "Uzbekistan"
-
-#~ msgid "Holy See (Vatican City State)"
-#~ msgstr "Svätá stolica (Vatikánsky mestský štát)"
-
-#~ msgid "Saint Vincent And The Grenadines"
-#~ msgstr "Svätý Vincent a Grenadíny"
-
-#~ msgid "Venezuela"
-#~ msgstr "Venezuela"
-
-#~ msgid "Virgin Islands, British"
-#~ msgstr "Panenské ostrovy, Britské"
-
-#~ msgid "Virgin Islands, U.S."
-#~ msgstr "Panenské ostrovy, Americké"
-
-#~ msgid "Viet Nam"
-#~ msgstr "Vietnam"
-
-#~ msgid "Vanuatu"
-#~ msgstr "Vanuatu"
-
-#~ msgid "Wallis And Futuna"
-#~ msgstr "Wallis a Futuna"
-
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
-
-#~ msgid "Yemen"
-#~ msgstr "Jemen"
-
-#~ msgid "Mayotte"
-#~ msgstr "Mayotte"
-
-#~ msgid "Serbia And Montenegro"
-#~ msgstr "Srbsko a Čierna Hora"
-
-#~ msgid "South Africa"
-#~ msgstr "Južná Afrika"
-
-#~ msgid "Zambia"
-#~ msgstr "Zambia"
-
-#~ msgid "Democratic Republic Of The Congo"
-#~ msgstr "Konžská demokratická republika"
-
-#~ msgid "Zimbabwe"
-#~ msgstr "Zimbabwe"
-
-#~ msgid "GeoLocation"
-#~ msgstr "GeoLocation"
-
-#~ msgid "Could not initialize clutter"
-#~ msgstr "Nemožno inicializovať clutter"
-
-#~ msgid "Could not create regular expression: %s\n"
-#~ msgstr "Nemožno vytvoriť regulárny výraz: %s\n"
-
-#~ msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-#~ msgstr ""
-#~ "V zásuvnom module GeoLocation zlyhala registrácia obsluhy udalosti "
-#~ "messageview_show"
-
-#~ msgid ""
-#~ "This plugin provides GeoLocation functionality for Claws Mail.\n"
-#~ "\n"
-#~ "Warning: It is technically impossible to derive the geographic location "
-#~ "of senders from their E-Mails with any amount of certainty. The results "
-#~ "presented by this plugin are only rough estimates. In particular, mailing "
-#~ "list managers often strip sender information from the mails, so mails "
-#~ "from mailing lists may be assigned to the location of the mailing list "
-#~ "server instead of the mail sender.\n"
-#~ "When in doubt, don't trust the results of this plugin, and don't rely on "
-#~ "this information to divorce your spouse.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome (but only if it's not about "
-#~ "marital quarrels)."
-#~ msgstr ""
-#~ "Tento zásuvný modul poskytuje pre Claws Mail funkciu GeoLocation.\n"
-#~ "\n"
-#~ "Upozornenie: Je nemožné s istotou určiť geografické umiestnenie "
-#~ "odosielateľa z jeho emailov. Výsledok prezentovaný týmto zásuvným modulom "
-#~ "je len hrubý odhad. Napríklad, správcovia emailových konferencií často z "
-#~ "emailov odstraňujú informácie o odosielateľovi, preto emailom z takýchto "
-#~ "emailových konferencií môže byť priradené umiestnenie servera emailovej "
-#~ "konferencie, namiesto umiestnenia odosielateľa emailu.\n"
-#~ "V prípade pochybností, nedôverujte výsledkom tohoto zásuvného modulu a "
-#~ "nespoliehajte sa na tieto informácie pri rozvode so svojim partnerom.\n"
-#~ "\n"
-#~ "Spätná väzba na <berndth at gmx.de> je vítaná (ale len ak nie je o "
-#~ "manželských hádkach)."
-
-#~ msgid "GeoLocation integration"
-#~ msgstr "Integrácia GeoLocation"
-
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Tlačenie zlyhalo:\n"
-#~ " %s"
-
-#~ msgid ""
-#~ "Printing HTML is only possible if the program 'html2ps' is installed."
-#~ msgstr "Tlačenie HTML je možné, len ak je nainštalovaný program „html2ps”."
-
-#~ msgid "Filename is null."
-#~ msgstr "Meno súboru je prázdne."
-
-#~ msgid "Conversion to postscript failed."
-#~ msgstr "Zlyhala konverzia do postscript"
-
-#~ msgid "Printer %s doesn't accept PostScript files."
-#~ msgstr "Tlačiareň %s neprijíma súbory PostScript."
-
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Tlačenie zlyhalo:\n"
-#~ "%s"
-
-#~ msgid "Navigation to %s blocked"
-#~ msgstr "Navigácia na %s blokovaná"
-
-#~ msgid "Proxy Setting"
-#~ msgstr "Nastavenia proxy"
-
-#~ msgid "Auto-Load images"
-#~ msgstr "Automaticky načítať obrázky"
-
-#~ msgid "Block external content"
-#~ msgstr "Blokovať externý obsah"
-
-#~ msgid "PDF Viewer Plugin"
-#~ msgstr "Zásuvný modul Zobrazovač PDF"
-
-#~ msgid "GtkHtml2 Viewer"
-#~ msgstr "Zobrazovač GtkHtml2"
-
-#~ msgid "Cache cleared."
-#~ msgstr "Vyrovnávacia pamäť vymazaná."
-
-#~ msgid "Automatically load remote images"
-#~ msgstr "Automaticky načítať vzdialené obrázky"
-
-#~ msgid "Only for senders found in address book"
-#~ msgstr "Len pre odosielateľov z Adresára"
-
-#~ msgid "Cache remote images locally"
-#~ msgstr "Vzdialené obrázky do vyrovnávacej pamäte"
-
-#~ msgid "Clear image cache on exit"
-#~ msgstr "Pri skončení vymazať vyrovnávaciu pamäť obrázkov"
-
-#~ msgid "Clear image cache now"
-#~ msgstr "Vymazať vyrovnávaciu pamäť obrázkov teraz"
-
-#~ msgid "_Open with Web browser"
-#~ msgstr "_Otvoriť vo webovom prehliadači"
-
-#~ msgid "Zoom _in"
-#~ msgstr "Pr_iblížiť"
-
-#~ msgid "Zoom _out"
-#~ msgstr "_Oddialiť"
-
-#~ msgid "Timeout connecting to %s\n"
-#~ msgstr "Vypršal časový limit pripojenia k %s\n"
-
-#~ msgid ""
-#~ "Remote images exist, but weren't loaded\n"
-#~ "according to your preferences."
-#~ msgstr ""
-#~ "Vzdialené obrázky existujú, ale podľa vašich nastavení \n"
-#~ "neboli načítané."
-
-#~ msgid ""
-#~ "Remote images exist, but weren't loaded\n"
-#~ "because you are offline."
-#~ msgstr ""
-#~ "Vzdialené obrázky existujú, ale neboli načítané\n"
-#~ "pretože ste odpojený."
-
-#~ msgid "GtkHtml2 HTML Viewer"
-#~ msgstr "GtkHtml2 HTML Zobrazovač"
-
-#~ msgid "This plugin renders HTML mail using the gtkhtml2rendering widget."
-#~ msgstr ""
-#~ "Tento zásuvný modul zobrazuje HTML správy pomocou komponenta "
-#~ "gtkhtml2rendering."
-
-#~ msgid "Charset"
-#~ msgstr "Znaková sada"
-
-#~ msgid "Change dictionary"
-#~ msgstr "Zmeniť slovník"
-
-#~ msgid "Unknown SSL Certificate"
-#~ msgstr "Neznámy SSL certifikát"
-
-#~ msgid "Expired SSL Certificate"
-#~ msgstr "SSL certifikát s vypršanou dobou platnosti"
-
-#~ msgid "Changed SSL Certificate"
-#~ msgstr "Zmena SSL certifikátu"
-
-#~ msgid "Connecting to IMAP4 server %s...\n"
-#~ msgstr "Pripájanie k serveru IMAP4: %s ...\n"
-
-#~ msgid "_Open (l)"
-#~ msgstr "_Otvoriť (l)"
-
-#~ msgid "Open _with (o)..."
-#~ msgstr "O_tvoriť čím (o)..."
-
-#~ msgid "_Display as text (t)"
-#~ msgstr "_Zobraziť ako text (t)"
-
-#~ msgid "_Save as (y)..."
-#~ msgstr "_Uložiť ako (y)..."
-
-#~ msgid "Trust key"
-#~ msgstr "Dôveryhodnosť kľúča"
-
-#~ msgid "Main toolbar configuration"
-#~ msgstr "Nastavenie panela nástrojov hlavného okna"
-
-#~ msgid "Compose toolbar configuration"
-#~ msgstr "Nastavenie panela nástrojov okna písania správy"
-
-#~ msgid "Message view toolbar configuration"
-#~ msgstr "Nastavenie panela nástrojov okna prezerania správy"
-
-#~ msgid " (Shortcut key: 't')"
-#~ msgstr " (Skratka: „t”)"
-
-#~ msgid " (Shortcut key: 'l')\n"
-#~ msgstr " (Skratka: „l”)\n"
-
-#~ msgid " (Shortcut key: 'o')"
-#~ msgstr " (Skratka: „o”)"
-
-#~ msgid "Last read message"
-#~ msgstr "Posledná prečítaná správa"
-
-#~ msgid "_all"
-#~ msgstr "_všetky"
-
-#~ msgid "_sender"
-#~ msgstr "odo_sielateľ"
-
-#~ msgid "by _Date"
-#~ msgstr "Podľa _dátumu"
-
-#~ msgid "by _From"
-#~ msgstr "Podľa _odosielateľa"
-
-#~ msgid "by _To"
-#~ msgstr "Podľa _Adresáta"
-
-#~ msgid "by S_ubject"
-#~ msgstr "Podľa _predmetu"
-
-#~ msgid "by Tag"
-#~ msgstr "Podľa _značky"
-
-#~ msgid "by _Mark"
-#~ msgstr "Podľa _označenia"
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with a more recent GTK+ library than is "
-#~ "currently available. This will cause crashes. You need to upgrade GTK+ or "
-#~ "recompile Claws Mail."
-#~ msgstr ""
-#~ "Claws Mail bol zostavený s novšou verziou knižnice GTK+, než aká je "
-#~ "momentálne dostupná. Toto môže spôsobiť pád aplikácie. Odporúčame buď "
-#~ "nainštalovať novšiu verziu GTK+ alebo znova zostaviť Claws Mail."
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with an older GTK+ library than is currently "
-#~ "available. This will cause crashes. You need to recompile Claws Mail."
-#~ msgstr ""
-#~ "Claws Mail bol zostavený so staršou verziou knižnice GTK+, než aká je "
-#~ "momentálne dostupná. Toto môže spôsobiť pád aplikácie. Odporúčame znova "
-#~ "zostaviť Claws Mail."
-
-#~ msgid "  --search folder type request [recursive]"
-#~ msgstr "  --search zložka typ hľadať [rekurzívne]"
-
-#~ msgid "                         searches mail"
-#~ msgstr "                         hľadá emaily"
-
-#~ msgid ""
-#~ "                         folder ex.: \"#mh/Mailbox/inbox\" or \"Mail\""
-#~ msgstr ""
-#~ "                         zložka napr.: „#mh/Mailbox/inbox” alebo „Mail”"
-
-#~ msgid ""
-#~ "                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] "
-#~ "or g: tag"
-#~ msgstr ""
-#~ "                         typ: s[ubject],f[rom],t[o],e[xtended],m[ixed] "
-#~ "alebo g: značka"
-
-#~ msgid "                         request: search string"
-#~ msgstr "                         hľadať: hľadaný reťazec"
-
-#~ msgid ""
-#~ "                         recursive: false if arg. starts with 0, n, N, f "
-#~ "or F"
-#~ msgstr ""
-#~ "                         rekurzívne: nepravda, ak argument začína 0, n, "
-#~ "N, f alebo F"
-
-#~ msgid "Compose: input from monitoring process\n"
-#~ msgstr "Písanie správy: vstup z monitorovacieho procesu\n"
-
-#~ msgid "_Fold all"
-#~ msgstr "Z_baliť všetky"
-
-#~ msgid "creating NNTP connection to %s:%d ...\n"
-#~ msgstr "nadväzujem NNTP spojenie k %s:%d ...\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1999-2010\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1999-2010\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "a Claws Mail tím"
-
-#~ msgid ""
-#~ "Copyright (C) 1999-2010\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-#~ msgstr ""
-#~ "Copyright (C) 1999-2010\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "a Claws Mail tím"
-
-#~ msgid "headers line"
-#~ msgstr "riadok hlavičiek"
-
-#~ msgid "message line"
-#~ msgstr "riadok správy"
-
-#~ msgid "Test RegExp"
-#~ msgstr "Test regulérneho výrazu"
-
-#~ msgid " items selected"
-#~ msgstr " položiek zvolených"
-
-#~ msgid "'View Log'"
-#~ msgstr "'Zobraziť záznam'"
-
-#~ msgid ""
-#~ "SMTP password:\n"
-#~ "<span size=\"small\">(empty to use the same as receive)</span>"
-#~ msgstr ""
-#~ "Heslo SMTP:\n"
-#~ "<span size=\"small\">(nechajte prázdne, ak je rovnaké ako pre príjem)</"
-#~ "span>"
-
-#~ msgid "Orientation"
-#~ msgstr "Orientácia"
-
-#~ msgid "Quotation characters"
-#~ msgstr "Znak citácie"
-
-#~ msgid "Islamic Republic of Afghanistan"
-#~ msgstr "Afghanistanská islamská republika"
-
-#~ msgid "Åland Islands"
-#~ msgstr "Ålandy"
-
-#~ msgid "Republic of Albania"
-#~ msgstr "Albánska republika"
-
-#~ msgid "People's Democratic Republic of Algeria"
-#~ msgstr "Alžírska demokratická ľudová republika"
-
-#~ msgid "Principality of Andorra"
-#~ msgstr "Andorrské kniežatstvo"
-
-#~ msgid "Republic of Angola"
-#~ msgstr "Angolská republika"
-
-#~ msgid "Antigua and Barbuda"
-#~ msgstr "Antigua a Barbuda"
-
-#~ msgid "Argentine Republic"
-#~ msgstr "Argentínska republika"
-
-#~ msgid "Republic of Armenia"
-#~ msgstr "Arménska republika"
-
-#~ msgid "Republic of Austria"
-#~ msgstr "Rakúska republika"
-
-#~ msgid "Republic of Azerbaijan"
-#~ msgstr "Azerbajdžanská republika"
-
-#~ msgid "Commonwealth of the Bahamas"
-#~ msgstr "Bahamské spoločenstvo"
-
-#~ msgid "Kingdom of Bahrain"
-#~ msgstr "Bahrajnské kráľovstvo"
-
-#~ msgid "People's Republic of Bangladesh"
-#~ msgstr "Bangladéšska ľudová republika"
-
-#~ msgid "Republic of Belarus"
-#~ msgstr "Bieloruská republika"
-
-#~ msgid "Kingdom of Belgium"
-#~ msgstr "Belgické kráľovstvo"
-
-#~ msgid "Republic of Benin"
-#~ msgstr "Beninská republika"
-
-#~ msgid "Kingdom of Bhutan"
-#~ msgstr "Bhutánske kráľovstvo"
-
-# for now unchanged at geodesy.gov.sk
-#~ msgid "Bolivia, Plurinational State of"
-#~ msgstr "Bolívijská republika"
-
-# for now unchanged at geodesy.gov.sk
-#~ msgid "Plurinational State of Bolivia"
-#~ msgstr "Bolívijská republika"
-
-#~ msgid "Bonaire, Sint Eustatius and Saba"
-#~ msgstr "Bonaire, Svätý Eustach a Saba"
-
-#~ msgid "Bosnia and Herzegovina"
-#~ msgstr "Bosna a Hercegovina"
-
-#~ msgid "Republic of Bosnia and Herzegovina"
-#~ msgstr "Republika Bosny a Hercegoviny"
-
-#~ msgid "Republic of Botswana"
-#~ msgstr "Botswanská republika"
-
-#~ msgid "Federative Republic of Brazil"
-#~ msgstr "Brazílska federatívna republika"
-
-#~ msgid "Republic of Bulgaria"
-#~ msgstr "Bulharská republika"
-
-#~ msgid "Republic of Burundi"
-#~ msgstr "Burundská republika"
-
-#~ msgid "Kingdom of Cambodia"
-#~ msgstr "Kambodžské kráľovstvo"
-
-#~ msgid "Republic of Cameroon"
-#~ msgstr "Kamerunská republika"
-
-#~ msgid "Republic of Cape Verde"
-#~ msgstr "Kapverdská republika"
-
-#~ msgid "Republic of Chad"
-#~ msgstr "Čadská republika"
-
-#~ msgid "Republic of Chile"
-#~ msgstr "Čilská republika"
-
-#~ msgid "People's Republic of China"
-#~ msgstr "Čínska ľudová republika"
-
-#~ msgid "Republic of Colombia"
-#~ msgstr "Kolumbijská republika"
-
-#~ msgid "Union of the Comoros"
-#~ msgstr "Komorský zväz"
-
-#~ msgid "Republic of the Congo"
-#~ msgstr "Konžská republika"
-
-#~ msgid "Congo, The Democratic Republic of the"
-#~ msgstr "Konžská demokratická republika"
-
-#~ msgid "Republic of Costa Rica"
-#~ msgstr "Kostarická republika"
-
-#~ msgid "Côte d'Ivoire"
-#~ msgstr "Pobrežie Slonoviny"
-
-#~ msgid "Republic of Côte d'Ivoire"
-#~ msgstr "Republika Pobrežia Slonoviny"
-
-#~ msgid "Republic of Croatia"
-#~ msgstr "Chorvátska republika"
-
-#~ msgid "Republic of Cuba"
-#~ msgstr "Kubánska republika"
-
-#~ msgid "Curaçao"
-#~ msgstr "Curaçao"
-
-#~ msgid "Republic of Cyprus"
-#~ msgstr "Cyperská republika"
-
-#~ msgid "Kingdom of Denmark"
-#~ msgstr "Dánske kráľovstvo"
-
-#~ msgid "Republic of Djibouti"
-#~ msgstr "Džibutská republika"
-
-#~ msgid "Commonwealth of Dominica"
-#~ msgstr "Dominické spoločenstvo"
-
-#~ msgid "Republic of Ecuador"
-#~ msgstr "Ekvádorská republika"
-
-#~ msgid "Arab Republic of Egypt"
-#~ msgstr "Egyptská arabská republika"
-
-#~ msgid "Republic of El Salvador"
-#~ msgstr "Salvádorská republika"
-
-#~ msgid "Republic of Equatorial Guinea"
-#~ msgstr "Republika Rovníkovej Guiney"
-
-#~ msgid "Republic of Estonia"
-#~ msgstr "Estónska republika"
-
-#~ msgid "Federal Democratic Republic of Ethiopia"
-#~ msgstr "Etiópska federatívna demokratická republika"
-
-#~| msgid "Republic of Haiti"
-#~ msgid "Republic of Fiji"
-#~ msgstr "Fidžijská republika"
-
-#~ msgid "Republic of Finland"
-#~ msgstr "Fínska republika"
-
-#~ msgid "French Republic"
-#~ msgstr "Francúzska republika"
-
-#~ msgid "Gabonese Republic"
-#~ msgstr "Gabonská republika"
-
-#~ msgid "Republic of the Gambia"
-#~ msgstr "Gambijská republika"
-
-#~ msgid "Federal Republic of Germany"
-#~ msgstr "Nemecká spolková republika"
-
-#~ msgid "Republic of Ghana"
-#~ msgstr "Ghanská republika"
-
-# pozn.: Na výslovnú žiadosť gréckej strany sa v medzinárodných dohodách, zmluvách a podobných dokumentoch medzi Gréckou republikou a Slovenskou republikou používa podoba Helénska republika, v ostatných prípadoch podoba Grécka republika.
-#~ msgid "Hellenic Republic"
-#~ msgstr "Grécka republika"
-
-#~ msgid "Republic of Guatemala"
-#~ msgstr "Guatemalská republika"
-
-#~ msgid "Guernsey"
-#~ msgstr "Guernsey"
-
-#~ msgid "Republic of Guinea"
-#~ msgstr "Guinejská republika"
-
-#~ msgid "Republic of Guinea-Bissau"
-#~ msgstr "Guinejsko-bissauská republika"
-
-#~ msgid "Republic of Guyana"
-#~ msgstr "Guyanská kooperatívna republika"
-
-#~ msgid "Republic of Haiti"
-#~ msgstr "Haitská republika"
-
-#~ msgid "Heard Island and McDonald Islands"
-#~ msgstr "Heardov ostrov"
-
-#~ msgid "Republic of Honduras"
-#~ msgstr "Honduraská republika"
-
-#~ msgid "Hong Kong Special Administrative Region of China"
-#~ msgstr "Osobitná administratívna oblasť Číny Hongkong"
-
-#~ msgid "Republic of Hungary"
-#~ msgstr "Maďarská republika"
-
-#~ msgid "Republic of Iceland"
-#~ msgstr "Islandská republika"
-
-#~ msgid "Republic of India"
-#~ msgstr "Indická republika"
-
-#~ msgid "Republic of Indonesia"
-#~ msgstr "Indonézska republika"
-
-#~ msgid "Iran, Islamic Republic of"
-#~ msgstr "Iránska islamská republika"
-
-#~ msgid "Islamic Republic of Iran"
-#~ msgstr "Iránska islamská republika"
-
-#~ msgid "Republic of Iraq"
-#~ msgstr "Iracká republika"
-
-#~ msgid "Isle of Man"
-#~ msgstr "Man"
-
-#~ msgid "State of Israel"
-#~ msgstr "Izraelský štát"
-
-#~ msgid "Italian Republic"
-#~ msgstr "Talianska republika"
-
-#~ msgid "Jersey"
-#~ msgstr "Jersey"
-
-#~ msgid "Hashemite Kingdom of Jordan"
-#~ msgstr "Jordánske hášimovské kráľovstvo"
-
-#~ msgid "Republic of Kazakhstan"
-#~ msgstr "Kazašská republika"
-
-#~ msgid "Republic of Kenya"
-#~ msgstr "Kenská republika"
-
-#~ msgid "Republic of Kiribati"
-#~ msgstr "Kiribatská republika"
-
-#~ msgid "Korea, Democratic People's Republic of"
-#~ msgstr "Kórejská ľudovodemokratická republika"
-
-#~ msgid "Democratic People's Republic of Korea"
-#~ msgstr "Kórejská ľudovodemokratická republika"
-
-#~ msgid "Korea, Republic of"
-#~ msgstr "Kórejská republika"
-
-#~ msgid "State of Kuwait"
-#~ msgstr "Kuvajtský štát"
-
-#~ msgid "Kyrgyz Republic"
-#~ msgstr "Kirgizská republika"
-
-#~ msgid "Lao People's Democratic Republic"
-#~ msgstr "Laoská ľudovodemokratická republika"
-
-#~ msgid "Republic of Latvia"
-#~ msgstr "Lotyšská republika"
-
-#~ msgid "Lebanese Republic"
-#~ msgstr "Libanonská republika"
-
-#~ msgid "Kingdom of Lesotho"
-#~ msgstr "Lesothské kráľovstvo"
-
-#~ msgid "Republic of Liberia"
-#~ msgstr "Libérijská republika"
-
-#~ msgid "Libya"
-#~ msgstr "Líbya"
-
-#~ msgid "Principality of Liechtenstein"
-#~ msgstr "Lichtenštajnské kniežatstvo"
-
-#~ msgid "Republic of Lithuania"
-#~ msgstr "Litovská republika"
-
-#~ msgid "Grand Duchy of Luxembourg"
-#~ msgstr "Luxemburské veľkovojvodstvo"
-
-#~ msgid "Macao Special Administrative Region of China"
-#~ msgstr "Osobitná administratívna oblasť Číny Macao"
-
-#~ msgid "Macedonia, Republic of"
-#~ msgstr "Macedónska republika"
-
-#~ msgid "The Former Yugoslav Republic of Macedonia"
-#~ msgstr "Bývalá juhoslovanská republika Macedónsko"
-
-#~ msgid "Republic of Madagascar"
-#~ msgstr "Madagaskarská republika"
-
-#~ msgid "Republic of Malawi"
-#~ msgstr "Malawijská republika"
-
-#~ msgid "Republic of Maldives"
-#~ msgstr "Maldivská republika"
-
-#~ msgid "Republic of Mali"
-#~ msgstr "Malijská republika"
-
-#~ msgid "Republic of Malta"
-#~ msgstr "Maltská republika"
-
-#~ msgid "Republic of the Marshall Islands"
-#~ msgstr "Republika Marshallových ostrovov"
-
-#~ msgid "Islamic Republic of Mauritania"
-#~ msgstr "Mauritánska islamská republika"
-
-#~ msgid "Republic of Mauritius"
-#~ msgstr "Maurícijská republika"
-
-#~ msgid "United Mexican States"
-#~ msgstr "Spojené štáty mexické"
-
-#~ msgid "Micronesia, Federated States of"
-#~ msgstr "Mikronézske federatívne štáty"
-
-#~ msgid "Federated States of Micronesia"
-#~ msgstr "Mikronézske federatívne štáty"
-
-#~ msgid "Moldova, Republic of"
-#~ msgstr "Moldavská republika"
-
-#~ msgid "Republic of Moldova"
-#~ msgstr "Moldavská republika"
-
-#~ msgid "Moldova"
-#~ msgstr "Moldavsko"
-
-#~ msgid "Principality of Monaco"
-#~ msgstr "Monacké kniežatstvo"
-
-#~ msgid "Montenegro"
-#~ msgstr "Čierna Hora"
-
-#~ msgid "Kingdom of Morocco"
-#~ msgstr "Marocké kráľovstvo"
-
-#~ msgid "Republic of Mozambique"
-#~ msgstr "Mozambická republika"
-
-#~| msgid "Republic of Guyana"
-#~ msgid "Republic of Myanmar"
-#~ msgstr "Mjanmarská republika"
-
-#~ msgid "Republic of Namibia"
-#~ msgstr "Namíbijská republika"
-
-#~ msgid "Republic of Nauru"
-#~ msgstr "Nauruská republika"
-
-#~ msgid "Federal Democratic Republic of Nepal"
-#~ msgstr "Nepálska federatívna demokratická republika"
-
-#~ msgid "Kingdom of the Netherlands"
-#~ msgstr "Holandské kráľovstvo"
-
-#~ msgid "Republic of Nicaragua"
-#~ msgstr "Nikaragujská republika"
-
-#~ msgid "Republic of the Niger"
-#~ msgstr "Nigerská republika"
-
-#~ msgid "Federal Republic of Nigeria"
-#~ msgstr "Nigérijská federatívna republika"
-
-#~ msgid "Commonwealth of the Northern Mariana Islands"
-#~ msgstr "Spoločenstvo Severných Marián"
-
-#~ msgid "Kingdom of Norway"
-#~ msgstr "Nórske kráľovstvo"
-
-#~ msgid "Sultanate of Oman"
-#~ msgstr "Ománsky sultanát"
-
-#~ msgid "Islamic Republic of Pakistan"
-#~ msgstr "Pakistanská islamská republika"
-
-#~ msgid "Republic of Palau"
-#~ msgstr "Palauská republika"
-
-#~ msgid "Palestinian Territory, Occupied"
-#~ msgstr "palestínske územie, Okupované"
-
-#~ msgid "Occupied Palestinian Territory"
-#~ msgstr "Okupované palestínske územie"
-
-#~ msgid "Republic of Panama"
-#~ msgstr "Panamská republika"
-
-#~ msgid "Republic of Paraguay"
-#~ msgstr "Paraguajská republika"
-
-#~ msgid "Republic of Peru"
-#~ msgstr "Peruánska republika"
-
-#~ msgid "Republic of the Philippines"
-#~ msgstr "Filipínska republika"
-
-#~ msgid "Republic of Poland"
-#~ msgstr "Poľská republika"
-
-#~ msgid "Portuguese Republic"
-#~ msgstr "Portugalská republika"
-
-#~ msgid "State of Qatar"
-#~ msgstr "Katarský štát"
-
-#~ msgid "Rwandese Republic"
-#~ msgstr "Rwandská republika"
-
-#~ msgid "Saint Barthélemy"
-#~ msgstr "Svätý Bartolomej"
-
-#~ msgid "Saint Helena, Ascension and Tristan da Cunha"
-#~ msgstr "Svätá Helena, Ascension a Tristan da Cunha"
-
-#~ msgid "Saint Kitts and Nevis"
-#~ msgstr "Svätý Krištof a Nevis"
-
-#~ msgid "Saint Martin (French part)"
-#~ msgstr "Saint Martin"
-
-#~ msgid "Saint Pierre and Miquelon"
-#~ msgstr "Saint Pierre a Miquelon"
-
-#~ msgid "Saint Vincent and the Grenadines"
-#~ msgstr "Svätý Vincent a Grenadíny"
-
-#~ msgid "Independent State of Samoa"
-#~ msgstr "Samojský nezávislý štát"
-
-#~ msgid "Republic of San Marino"
-#~ msgstr "Sanmarínska republika"
-
-#~ msgid "Sao Tome and Principe"
-#~ msgstr "Svätý Tomáš a Princov ostrov"
-
-#~ msgid "Democratic Republic of Sao Tome and Principe"
-#~ msgstr "Demokratická republika Svätého Tomáša a Princovho ostrova"
-
-#~ msgid "Kingdom of Saudi Arabia"
-#~ msgstr "Saudskoarabské kráľovstvo"
-
-#~ msgid "Republic of Senegal"
-#~ msgstr "Senegalská republika"
-
-#~ msgid "Serbia"
-#~ msgstr "Srbsko"
-
-#~ msgid "Republic of Serbia"
-#~ msgstr "Srbská republika"
-
-#~ msgid "Republic of Seychelles"
-#~ msgstr "Seychelská republika"
-
-#~ msgid "Republic of Sierra Leone"
-#~ msgstr "Sierraleonská republika"
-
-#~ msgid "Republic of Singapore"
-#~ msgstr "Singapurská republika"
-
-#~| msgid "Saint Martin (French part)"
-#~ msgid "Sint Maarten (Dutch part)"
-#~ msgstr "Svätý Martin (holandská časť)"
-
-#~ msgid "Slovak Republic"
-#~ msgstr "Slovenská republika"
-
-#~ msgid "Republic of Slovenia"
-#~ msgstr "Slovinská republika"
-
-#~ msgid "Somali Republic"
-#~ msgstr "Somálska republika"
-
-#~ msgid "Republic of South Africa"
-#~ msgstr "Juhoafrická republika"
-
-#~ msgid "South Georgia and the South Sandwich Islands"
-#~ msgstr "Južná Georgia a Južné Sandwichove ostrovy"
-
-#~ msgid "Kingdom of Spain"
-#~ msgstr "Španielske kráľovstvo"
-
-#~ msgid "Democratic Socialist Republic of Sri Lanka"
-#~ msgstr "Srílanská demokratická socialistická republika"
-
-#~ msgid "Republic of the Sudan"
-#~ msgstr "Sudánska republika"
-
-#~ msgid "Republic of Suriname"
-#~ msgstr "Surinamská republika"
-
-#~| msgid "Sudan"
-#~ msgid "South Sudan"
-#~ msgstr "Južný Sudán"
-
-#~| msgid "Republic of the Sudan"
-#~ msgid "Republic of South Sudan"
-#~ msgstr "Juhosudánska republika"
-
-#~ msgid "Svalbard and Jan Mayen"
-#~ msgstr "Svalbard a Jan Mayen"
-
-#~ msgid "Kingdom of Swaziland"
-#~ msgstr "Svazijské kráľovstvo"
-
-#~ msgid "Kingdom of Sweden"
-#~ msgstr "Švédske kráľovstvo"
-
-#~ msgid "Swiss Confederation"
-#~ msgstr "Švajčiarska konfederácia"
-
-#~ msgid "Taiwan, Province of China"
-#~ msgstr "Taiwan, provincia Číny"
-
-#~ msgid "Taiwan"
-#~ msgstr "Taiwan"
-
-#~ msgid "Republic of Tajikistan"
-#~ msgstr "Tadžická republika"
-
-#~ msgid "Tanzania, United Republic of"
-#~ msgstr "Tanzánijská zjednotená republika"
-
-#~ msgid "United Republic of Tanzania"
-#~ msgstr "Tanzánijská zjednotená republika"
-
-#~ msgid "Kingdom of Thailand"
-#~ msgstr "Thajské kráľovstvo"
-
-#~ msgid "Timor-Leste"
-#~ msgstr "Východný Timor"
-
-#~ msgid "Democratic Republic of Timor-Leste"
-#~ msgstr "Východotimorská demokratická republika"
-
-#~ msgid "Togolese Republic"
-#~ msgstr "Togská republika"
-
-#~ msgid "Kingdom of Tonga"
-#~ msgstr "Tongské kráľovstvo"
-
-#~ msgid "Trinidad and Tobago"
-#~ msgstr "Trinidad a Tobago"
-
-#~ msgid "Republic of Trinidad and Tobago"
-#~ msgstr "Republika Trinidadu a Tobaga"
-
-#~ msgid "Republic of Tunisia"
-#~ msgstr "Tuniská republika"
-
-#~ msgid "Republic of Turkey"
-#~ msgstr "Turecká republika"
-
-#~ msgid "Turks and Caicos Islands"
-#~ msgstr "Ostrovy Turks a Caicos"
-
-#~ msgid "Republic of Uganda"
-#~ msgstr "Ugandská republika"
-
-#~ msgid "United Kingdom of Great Britain and Northern Ireland"
-#~ msgstr "Spojené kráľovstvo Veľkej Británie a Severného Írska"
-
-#~ msgid "United States of America"
-#~ msgstr "Spojené štáty americké"
-
-#~ msgid "Eastern Republic of Uruguay"
-#~ msgstr "Uruguajská východná republika"
-
-#~ msgid "Republic of Uzbekistan"
-#~ msgstr "Uzbecká republika"
-
-#~ msgid "Republic of Vanuatu"
-#~ msgstr "Vanuatská republika"
-
-#~| msgid "Venezuela, Bolivarian republic of"
-#~ msgid "Venezuela, Bolivarian Republic of"
-#~ msgstr "Venezuela, bolívarovská republika"
-
-#~ msgid "Bolivarian Republic of Venezuela"
-#~ msgstr "Venezuelská bolívarovská republika"
-
-#~ msgid "Socialist Republic of Viet Nam"
-#~ msgstr "Vietnamská socialistická republika"
-
-#~ msgid "British Virgin Islands"
-#~ msgstr "Britské Panenské ostrovy"
-
-#~ msgid "Virgin Islands of the United States"
-#~ msgstr "Panenské ostrovy Spojených štátov"
-
-#~ msgid "Wallis and Futuna"
-#~ msgstr "Wallis a Futuna"
-
-#~ msgid "Republic of Yemen"
-#~ msgstr "Jemenská republika"
-
-#~ msgid "Republic of Zambia"
-#~ msgstr "Zambijská republika"
-
-#~ msgid "Republic of Zimbabwe"
-#~ msgstr "Zimbabwianska republika"
-
-#~ msgid "British Antarctic Territory"
-#~ msgstr "Britské antarktické územie"
-
-#~ msgid "Burma, Socialist Republic of the Union of"
-#~ msgstr "Socialistická republika Barmský zväz"
-
-#~ msgid "Byelorussian SSR Soviet Socialist Republic"
-#~ msgstr "Bieloruská sovietska socialistická republika"
-
-#~ msgid "Canton and Enderbury Islands"
-#~ msgstr "ostrovy Canton a Enderbury"
-
-#~ msgid "Czechoslovakia, Czechoslovak Socialist Republic"
-#~ msgstr "Československo, Československá socialistická republika"
-
-#~ msgid "Dahomey"
-#~ msgstr "Dahome"
-
-#~ msgid "Dronning Maud Land"
-#~ msgstr "Zem kráľovnej Maud"
-
-#~ msgid "French Afars and Issas"
-#~ msgstr "Francúzske pobrežie Afarov a Isasov"
-
-#~ msgid "French Southern and Antarctic Territories"
-#~ msgstr "Francúzske južné a antarktické územia"
-
-#~ msgid "German Democratic Republic"
-#~ msgstr "Nemecká demokratická republika"
-
-#~ msgid "Germany, Federal Republic of"
-#~ msgstr "Nemecká spolková republika"
-
-#~ msgid "Gilbert and Ellice Islands"
-#~ msgstr "Gilbertove a lagúnové ostrovy"
-
-#~ msgid "Johnston Island"
-#~ msgstr "Johnston"
-
-#~ msgid "Midway Islands"
-#~ msgstr "Midwajské ostrovy"
-
-#~ msgid "Neutral Zone"
-#~ msgstr "neutrálne pôdy"
-
-#~ msgid "New Hebrides"
-#~ msgstr "Nové Hebridy"
-
-#~ msgid "Pacific Islands (trust territory)"
-#~ msgstr "Poručnícke územie tichomorských ostrovov"
-
-#~ msgid "Panama, Republic of"
-#~ msgstr "Panamská republika"
-
-#~ msgid "Panama Canal Zone"
-#~ msgstr "Panamské prieplavové pásmo"
-
-#~ msgid "Romania, Socialist Republic of"
-#~ msgstr "Rumunská socialistická republika"
-
-# sk.wikipedia: Svätý Krištof a Nevis (do roku 2006 bol slovenský krátky tvar Svätý Krištof)
-#~ msgid "St. Kitts-Nevis-Anguilla"
-#~ msgstr "Svätý Krištof"
-
-#~ msgid "Serbia and Montenegro"
-#~ msgstr "Srbsko a Čierna Hora"
-
-#~ msgid "Sikkim"
-#~ msgstr "Sikkim"
-
-# sk.wikipedia: Zimbabwe, dlhý tvar Zimbabwianska republika (1964 - 1979 a december 1979-1980 Rodézia, 1898/1901 - 1964 Južná Rodézia, jún - december 1979 Zimbabwe-Rodézia)
-#~ msgid "Southern Rhodesia"
-#~ msgstr "Rodézia"
-
-#~ msgid "Spanish Sahara"
-#~ msgstr "Španielska Sahara"
-
-#~ msgid "US Miscellaneous Pacific Islands"
-#~ msgstr "Tichomorské ostrovy pod správou USA"
-
-#~ msgid "USSR, Union of Soviet Socialist Republics"
-#~ msgstr "ZSSR, Zväz sovietskych socialistických republík"
-
-#~ msgid "Upper Volta, Republic of"
-#~ msgstr "Republika Horná Volta"
-
-#~ msgid "Vatican City State (Holy See)"
-#~ msgstr "Vatikánsky mestský štát (Svätá stolica)"
-
-#~ msgid "Viet-Nam, Democratic Republic of"
-#~ msgstr "Vietnamská demokratická republika"
-
-#~ msgid "Wake Island"
-#~ msgstr "Wake"
-
-#~ msgid "Yemen, Democratic, People's Democratic Republic of"
-#~ msgstr "Jemenská ľudovodemokratická republika"
-
-#~ msgid "Yemen, Yemen Arab Republic"
-#~ msgstr "Jemenská arabská republika"
-
-#~ msgid "Yugoslavia, Socialist Federal Republic of"
-#~ msgstr "Socialistická federatívna republika Juhoslávia"
-
-#~ msgid "Zaire, Republic of"
-#~ msgstr "Zairská republika"
-
-#~ msgid "Republic of the Fiji Islands"
-#~ msgstr "Republika Fidžijských ostrovov"
-
-#~ msgid "Socialist People's Libyan Arab Jamahiriya"
-#~ msgstr "Líbyjská arabská ľudová socialistická džamahírija"
-
-#~ msgid "Union of Myanmar"
-#~ msgstr "Mjanmarský zväz"
-
-#~ msgid "Republic of Niue"
-#~ msgstr "Republika Niue"
-
-#, fuzzy
-#~ msgid "The Transitional Islamic State of Afghanistan"
-#~ msgstr "Afghanistanská islamská republika"
-
-#, fuzzy
-#~ msgid "State of Bahrain"
-#~ msgstr "Katarský štát"
-
-#, fuzzy
-#~ msgid "Republic of Bolivia"
-#~ msgstr "Moldavská republika"
-
-#, fuzzy
-#~ msgid "Kingdom of Nepal"
-#~ msgstr "Španielske kráľovstvo"
-
-#~ msgid " blocked"
-#~ msgstr " blokované"
-
-#~ msgid "GData plugin: Added %d of %d contacts to the cache\n"
-#~ msgstr ""
-#~ "Zásuvný modul GData: Do vyrovnávacej pamäte pridaných %d z %d kontaktov\n"
-
-#~ msgid "%d page"
-#~ msgid_plural "%d pages"
-#~ msgstr[0] "%d strana"
-#~ msgstr[1] "%d strany"
-#~ msgstr[2] "%d strán"
diff --git a/po/sv.po b/po/sv.po
index 4484b5c..b5fa21f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,103 +8,93 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2013-04-29 10:32+0100\n"
-"PO-Revision-Date: 2013-05-01 15:13+0100\n"
+"POT-Creation-Date: 2013-12-07 08:54+0000\n"
+"PO-Revision-Date: 2013-12-07 11:12+0100\n"
 "Last-Translator: Andreas Rönnquist <gusnan at gusnan.se>\n"
 "Language-Team: Swedish\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.5\n"
 
-#: src/account.c:393
+#: src/account.c:392
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
 msgstr ""
-"Det finns något nytt meddelande-fönster öppet.\n"
-"Stäng alla fönster innan du redigerar konton."
+"Det finns något Skriv meddelande-fönster öppet.\n"
+"Stäng alla Skriv meddelande-fönster innan du redigerar konton."
 
-#: src/account.c:438
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Kan inte skapa mapp."
 
-#: src/account.c:719
+#: src/account.c:717
 msgid "Edit accounts"
 msgstr "Redigera konton"
 
-#: src/account.c:740
-msgid "Using 'Get Mail' will retrieve messages from your Accounts in the order given, the checkbox indicates which accounts will be included. Bold text indicates the default account."
-msgstr "'Hämta e-post' hämtar meddelanden från dina konton i samma ordning som i listan, kryssrutan indikerar vilka konton som kommer att inkluderas. Fet stil anger standardkontot."
+#: src/account.c:734
+msgid ""
+"Using 'Get Mail' will retrieve messages from your Accounts in the order "
+"given, the checkbox indicates which accounts will be included. Bold text "
+"indicates the default account."
+msgstr ""
+"'Hämta e-post' hämtar meddelanden från dina konton i samma ordning som i "
+"listan, kryssrutan indikerar vilka konton som kommer att inkluderas. Fet "
+"stil anger standardkontot."
 
-#: src/account.c:811
+#: src/account.c:805
 msgid " _Set as default account "
 msgstr " _Sätt som standardkonto "
 
-#: src/account.c:906
+#: src/account.c:897
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Konton med fjärrmappar kan inte kopieras."
 
-#: src/account.c:913
+#: src/account.c:904
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopia av %s"
 
-#: src/account.c:1073
+#: src/account.c:1064
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Vill du verkligen ta bort konto '%s'?"
 
-#: src/account.c:1075
+#: src/account.c:1066
 msgid "(Untitled)"
 msgstr "(Ingen titel)"
 
-#: src/account.c:1076
+#: src/account.c:1067
 msgid "Delete account"
 msgstr "Ta bort konto"
 
-#: src/account.c:1546
+#: src/account.c:1536
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "H"
 
-#: src/account.c:1552
+#: src/account.c:1542
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Hämta e-post' hämtar e-post från valda e-postkonton"
 
-#: src/account.c:1559
-#: src/addressadd.c:215
-#: src/addressbook.c:125
-#: src/addrduplicates.c:481
-#: src/compose.c:6984
-#: src/editaddress.c:1270
-#: src/editaddress.c:1327
-#: src/editaddress.c:1347
-#: src/editbook.c:170
-#: src/editgroup.c:288
-#: src/editjpilot.c:257
-#: src/editldap.c:428
-#: src/editvcard.c:173
-#: src/importmutt.c:223
-#: src/importpine.c:222
-#: src/mimeview.c:284
-#: src/plugins/pdf_viewer/poppler_viewer.c:1784
-#: src/plugins/pgpcore/select-keys.c:398
-#: src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1872
-#: src/prefs_template.c:78
+#: src/account.c:1549 src/addressadd.c:215 src/addressbook.c:125
+#: src/addrduplicates.c:481 src/compose.c:7073 src/editaddress.c:1263
+#: src/editaddress.c:1320 src/editaddress.c:1340 src/editbook.c:170
+#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
+#: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
+#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1800
+#: src/plugins/pgpcore/select-keys.c:394 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1868 src/prefs_template.c:78
 msgid "Name"
 msgstr "Namn"
 
-#: src/account.c:1567
-#: src/prefs_account.c:1097
-#: src/prefs_account.c:3922
+#: src/account.c:1557 src/prefs_account.c:1097 src/prefs_account.c:3921
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/account.c:1575
-#: src/ssl_manager.c:102
+#: src/account.c:1565 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Server"
 
@@ -128,7 +118,7 @@ msgid ""
 "The selected action cannot be used in the compose window\n"
 "because it contains %%f, %%F, %%as or %%p."
 msgstr ""
-"Den valda aktiviteten kan inte användas i Nytt meddelande fönster\n"
+"Den valda aktiviteten kan inte användas i Skriv meddelande fönstret\n"
 "på grund av att det innehåller %%f, %%F, %%as eller %%p."
 
 #: src/action.c:721
@@ -144,7 +134,7 @@ msgstr ""
 "Ogiltig filteraktivitet(er):\n"
 "%s"
 
-#: src/action.c:978
+#: src/action.c:988
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -155,39 +145,35 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:980
-#: src/plugins/bogofilter/bogofilter.c:875
-#: src/plugins/rssyl/feed.c:1734
-#: src/plugins/rssyl/feed.c:1738
+#: src/action.c:990 src/plugins/bogofilter/bogofilter.c:875
+#: src/plugins/rssyl/feed.c:1734 src/plugins/rssyl/feed.c:1738
 #: src/plugins/tnef_parse/tnef_parse.c:67
 #: src/plugins/vcalendar/vcal_folder.c:1800
 #: src/plugins/vcalendar/vcal_folder.c:1804
 #: src/plugins/vcalendar/vcal_folder.c:1815
-#: src/plugins/vcalendar/vcal_folder.c:1818
-#: src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1818 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: src/action.c:1198
-#: src/action.c:1368
+#: src/action.c:1208 src/action.c:1373
 msgid "Completed"
 msgstr "Färdigt"
 
-#: src/action.c:1234
+#: src/action.c:1244
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Kör: %s\n"
 
-#: src/action.c:1238
+#: src/action.c:1248
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Avslutades: %s\n"
 
-#: src/action.c:1271
+#: src/action.c:1281
 msgid "Action's input/output"
 msgstr "Aktivitets in/ut data"
 
-#: src/action.c:1604
+#: src/action.c:1609
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -198,11 +184,11 @@ msgstr ""
 "('%%h' kommer att ersättas av argumentet)\n"
 "  %s"
 
-#: src/action.c:1609
+#: src/action.c:1614
 msgid "Action's hidden user argument"
 msgstr "Aktivitets gömda användarargument"
 
-#: src/action.c:1613
+#: src/action.c:1618
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -213,12 +199,11 @@ msgstr ""
 "('%%u' kommer att ersättas av argumentet)\n"
 "  %s"
 
-#: src/action.c:1618
+#: src/action.c:1623
 msgid "Action's user argument"
 msgstr "Aktivitets användarargument"
 
-#: src/addr_compl.c:600
-#: src/addressbook.c:4881
+#: src/addr_compl.c:600 src/addressbook.c:4870
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:314
 msgid "Group"
 msgstr "Grupp"
@@ -291,23 +276,15 @@ msgstr ""
 "Vill du verkligen ersätta alla attributnamn\n"
 "med standarduppsättningen?"
 
-#: src/addrcustomattr.c:212
-#: src/addressbook.c:435
-#: src/addressbook.c:463
-#: src/addressbook.c:480
-#: src/edittags.c:271
-#: src/plugins/archive/archiver_gtk.c:1193
-#: src/prefs_actions.c:1086
-#: src/prefs_filtering.c:1692
-#: src/prefs_template.c:1095
+#: src/addrcustomattr.c:212 src/addressbook.c:435 src/addressbook.c:463
+#: src/addressbook.c:480 src/edittags.c:271
+#: src/plugins/archive/archiver_gtk.c:1193 src/prefs_actions.c:1090
+#: src/prefs_filtering.c:1695 src/prefs_template.c:1099
 msgid "_Delete"
 msgstr "_Ta bort"
 
-#: src/addrcustomattr.c:213
-#: src/edittags.c:272
-#: src/prefs_actions.c:1087
-#: src/prefs_filtering.c:1693
-#: src/prefs_template.c:1096
+#: src/addrcustomattr.c:213 src/edittags.c:272 src/prefs_actions.c:1091
+#: src/prefs_filtering.c:1696 src/prefs_template.c:1100
 msgid "Delete _all"
 msgstr "Ta bort _alla"
 
@@ -315,25 +292,28 @@ msgstr "Ta bort _alla"
 msgid "_Reset to default"
 msgstr "_Återställ till standardval"
 
-#: src/addrcustomattr.c:410
+#: src/addrcustomattr.c:403
 msgid "Attribute name is not set."
 msgstr "Attributnamn är inte angivet."
 
-#: src/addrcustomattr.c:469
+#: src/addrcustomattr.c:462
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Ändra attributnamn"
 
-#: src/addrcustomattr.c:483
+#: src/addrcustomattr.c:476
 msgid "New attribute name:"
 msgstr "Nytt attributnamn"
 
-#: src/addrcustomattr.c:520
-msgid "Adding or removing attribute names won't affect attributes already set for contacts."
-msgstr "Tillägg eller borttagning av attributnamn påverkar inte attribut som redan är satta för kontakter."
+#: src/addrcustomattr.c:513
+msgid ""
+"Adding or removing attribute names won't affect attributes already set for "
+"contacts."
+msgstr ""
+"Tillägg eller borttagning av attributnamn påverkar inte attribut som redan "
+"är satta för kontakter."
 
-#: src/addressadd.c:185
-#: src/prefs_filtering_action.c:201
+#: src/addressadd.c:185 src/prefs_filtering_action.c:201
 msgid "Add to address book"
 msgstr "Lägg till i adressboken"
 
@@ -341,29 +321,21 @@ msgstr "Lägg till i adressboken"
 msgid "Contact"
 msgstr "Kontakt"
 
-#: src/addressadd.c:227
-#: src/addrduplicates.c:452
-#: src/plugins/pgpcore/select-keys.c:399
-#: src/toolbar.c:431
+#: src/addressadd.c:227 src/addrduplicates.c:452
+#: src/plugins/pgpcore/select-keys.c:395 src/toolbar.c:432
 msgid "Address"
 msgstr "Adress"
 
-#: src/addressadd.c:238
-#: src/addressbook.c:127
-#: src/editaddress.c:1062
-#: src/editaddress.c:1137
-#: src/editgroup.c:290
+#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1055
+#: src/editaddress.c:1130 src/editgroup.c:290
 msgid "Remarks"
 msgstr "Kommentarer"
 
-#: src/addressadd.c:257
-#: src/addressbook_foldersel.c:158
+#: src/addressadd.c:257 src/addressbook_foldersel.c:158
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressadd.c:483
-#: src/editaddress.c:1585
-#: src/headerview.c:348
+#: src/addressadd.c:483 src/editaddress.c:1582 src/headerview.c:348
 #: src/textview.c:2110
 #, c-format
 msgid ""
@@ -373,9 +345,7 @@ msgstr ""
 "Misslyckades spara bild: \n"
 "%s"
 
-#: src/addressadd.c:532
-#: src/addressbook.c:3221
-#: src/addressbook.c:3272
+#: src/addressadd.c:532 src/addressbook.c:3210 src/addressbook.c:3261
 msgid "Add address(es)"
 msgstr "Lägg till adress(er)"
 
@@ -383,15 +353,9 @@ msgstr "Lägg till adress(er)"
 msgid "Can't add the specified address"
 msgstr "Kan inte lägga till adressen"
 
-#: src/addressbook.c:126
-#: src/addressbook.c:4869
-#: src/editaddress.c:1059
-#: src/editaddress.c:1120
-#: src/editgroup.c:289
-#: src/expldifdlg.c:517
-#: src/exporthtml.c:600
-#: src/exporthtml.c:764
-#: src/ldif.c:782
+#: src/addressbook.c:126 src/addressbook.c:4858 src/editaddress.c:1052
+#: src/editaddress.c:1113 src/editgroup.c:289 src/expldifdlg.c:517
+#: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:782
 msgid "Email Address"
 msgstr "E-postadress"
 
@@ -399,39 +363,27 @@ msgstr "E-postadress"
 msgid "_Book"
 msgstr "Adress_bok"
 
-#: src/addressbook.c:403
-#: src/addressbook.c:434
-#: src/addressbook.c:462
-#: src/addressbook.c:479
-#: src/compose.c:576
-#: src/gtk/quicksearch.c:799
-#: src/gtk/quicksearch.c:814
-#: src/mainwindow.c:504
-#: src/messageview.c:211
+#: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
+#: src/addressbook.c:479 src/compose.c:578 src/mainwindow.c:504
+#: src/messageview.c:209
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: src/addressbook.c:404
-#: src/compose.c:581
-#: src/mainwindow.c:507
-#: src/messageview.c:214
+#: src/addressbook.c:404 src/compose.c:583 src/mainwindow.c:507
+#: src/messageview.c:212
 msgid "_Tools"
 msgstr "V_erktyg"
 
-#: src/addressbook.c:405
-#: src/compose.c:582
-#: src/mainwindow.c:509
-#: src/messageview.c:215
+#: src/addressbook.c:405 src/compose.c:584 src/mainwindow.c:509
+#: src/messageview.c:213
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: src/addressbook.c:408
-#: src/addressbook.c:465
+#: src/addressbook.c:408 src/addressbook.c:465
 msgid "New _Book"
 msgstr "Ny adress_bok"
 
-#: src/addressbook.c:409
-#: src/addressbook.c:466
+#: src/addressbook.c:409 src/addressbook.c:466
 msgid "New _Folder"
 msgstr "Ny _katalog"
 
@@ -455,58 +407,41 @@ msgstr "_Redigera adressbok"
 msgid "_Delete book"
 msgstr "_Ta bort adressbok"
 
-#: src/addressbook.c:424
-#: src/compose.c:592
+#: src/addressbook.c:424 src/compose.c:595
 msgid "_Save"
 msgstr "_Spara"
 
-#: src/addressbook.c:425
-#: src/compose.c:596
-#: src/messageview.c:224
+#: src/addressbook.c:425 src/compose.c:599 src/messageview.c:222
 msgid "_Close"
 msgstr "St_äng"
 
-#: src/addressbook.c:428
-#: src/addressbook.c:477
-#: src/messageview.c:228
+#: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:226
 msgid "_Select all"
 msgstr "Markera _allt"
 
-#: src/addressbook.c:430
-#: src/addressbook.c:469
-#: src/addressbook.c:485
+#: src/addressbook.c:430 src/addressbook.c:469 src/addressbook.c:485
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: src/addressbook.c:431
-#: src/addressbook.c:470
-#: src/addressbook.c:486
-#: src/compose.c:604
-#: src/mainwindow.c:538
-#: src/messageview.c:227
+#: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
+#: src/compose.c:607 src/mainwindow.c:538 src/messageview.c:225
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: src/addressbook.c:432
-#: src/addressbook.c:471
-#: src/addressbook.c:487
-#: src/compose.c:605
+#: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
+#: src/compose.c:608
 msgid "_Paste"
 msgstr "Kli_stra in"
 
-#: src/addressbook.c:437
-#: src/addressbook.c:482
+#: src/addressbook.c:437 src/addressbook.c:482
 msgid "New _Address"
 msgstr "Ny _adress"
 
-#: src/addressbook.c:438
-#: src/addressbook.c:467
-#: src/addressbook.c:483
+#: src/addressbook.c:438 src/addressbook.c:467 src/addressbook.c:483
 msgid "New _Group"
 msgstr "Ny _grupp"
 
-#: src/addressbook.c:440
-#: src/addressbook.c:489
+#: src/addressbook.c:440 src/addressbook.c:489
 msgid "_Mail To"
 msgstr "_Meddelande till"
 
@@ -538,10 +473,8 @@ msgstr "Hitta dubbletter..."
 msgid "Edit custom attributes..."
 msgstr "Ändra anpassade attribut..."
 
-#: src/addressbook.c:455
-#: src/compose.c:684
-#: src/mainwindow.c:801
-#: src/messageview.c:340
+#: src/addressbook.c:455 src/compose.c:687 src/mainwindow.c:801
+#: src/messageview.c:338
 msgid "_About"
 msgstr "_Om"
 
@@ -549,73 +482,54 @@ msgstr "_Om"
 msgid "_Browse Entry"
 msgstr "_Bläddra Post"
 
-#: src/addressbook.c:504
-#: src/crash.c:451
-#: src/crash.c:470
-#: src/importldif.c:115
-#: src/plugins/pgpcore/select-keys.c:255
-#: src/plugins/pgpcore/sgpgme.c:140
-#: src/plugins/vcalendar/day-view.c:410
-#: src/plugins/vcalendar/month-view.c:431
-#: src/prefs_themes.c:705
-#: src/prefs_themes.c:737
-#: src/prefs_themes.c:738
+#: src/addressbook.c:504 src/crash.c:451 src/crash.c:470 src/importldif.c:115
+#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:140
+#: src/plugins/vcalendar/day-view.c:410 src/plugins/vcalendar/month-view.c:431
+#: src/prefs_themes.c:705 src/prefs_themes.c:737 src/prefs_themes.c:738
 msgid "Unknown"
 msgstr "Okänd"
 
-#: src/addressbook.c:511
-#: src/addressbook.c:530
-#: src/importldif.c:122
+#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:122
 msgid "Success"
 msgstr "Klar"
 
-#: src/addressbook.c:512
-#: src/importldif.c:123
+#: src/addressbook.c:512 src/importldif.c:123
 msgid "Bad arguments"
 msgstr "Felaktiga argument"
 
-#: src/addressbook.c:513
-#: src/importldif.c:124
+#: src/addressbook.c:513 src/importldif.c:124
 msgid "File not specified"
 msgstr "Fil har inte specificerats."
 
-#: src/addressbook.c:514
-#: src/importldif.c:125
+#: src/addressbook.c:514 src/importldif.c:125
 msgid "Error opening file"
 msgstr "Fel vid öppnande av fil"
 
-#: src/addressbook.c:515
-#: src/importldif.c:126
+#: src/addressbook.c:515 src/importldif.c:126
 msgid "Error reading file"
 msgstr "Fel vid läsande av fil"
 
-#: src/addressbook.c:516
-#: src/importldif.c:127
+#: src/addressbook.c:516 src/importldif.c:127
 msgid "End of file encountered"
 msgstr "Nådde slutet på filen"
 
-#: src/addressbook.c:517
-#: src/importldif.c:128
+#: src/addressbook.c:517 src/importldif.c:128
 msgid "Error allocating memory"
 msgstr "Kunde inte allokera minne"
 
-#: src/addressbook.c:518
-#: src/importldif.c:129
+#: src/addressbook.c:518 src/importldif.c:129
 msgid "Bad file format"
 msgstr "Fel filformat"
 
-#: src/addressbook.c:519
-#: src/importldif.c:130
+#: src/addressbook.c:519 src/importldif.c:130
 msgid "Error writing to file"
 msgstr "Fel vid skrivning till fil"
 
-#: src/addressbook.c:520
-#: src/importldif.c:131
+#: src/addressbook.c:520 src/importldif.c:131
 msgid "Error opening directory"
 msgstr "Fel vid öppnande av katalog"
 
-#: src/addressbook.c:521
-#: src/importldif.c:132
+#: src/addressbook.c:521 src/importldif.c:132
 msgid "No path specified"
 msgstr "Sökväg har inte specificerats."
 
@@ -671,38 +585,32 @@ msgstr "En annan kontakt finns med samma nyckel"
 msgid "Strong(er) authentication required"
 msgstr "Stark(are) autentisering krävs"
 
-#: src/addressbook.c:913
+#: src/addressbook.c:910
 msgid "Sources"
 msgstr "Källor"
 
-#: src/addressbook.c:917
-#: src/prefs_matcher.c:629
-#: src/prefs_other.c:475
-#: src/toolbar.c:223
-#: src/toolbar.c:2156
+#: src/addressbook.c:914 src/prefs_matcher.c:629 src/prefs_other.c:475
+#: src/toolbar.c:224 src/toolbar.c:2157
 msgid "Address book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:1120
+#: src/addressbook.c:1109
 msgid "Lookup name:"
 msgstr "Uppslagsnamn:"
 
-#: src/addressbook.c:1444
-#: src/addressbook.c:1497
-#: src/addrduplicates.c:803
+#: src/addressbook.c:1433 src/addressbook.c:1486 src/addrduplicates.c:803
 msgid "Delete address(es)"
 msgstr "Ta bort adress(er)"
 
-#: src/addressbook.c:1445
-#: src/addrduplicates.c:853
+#: src/addressbook.c:1434 src/addrduplicates.c:853
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Adressdatan är skrivskyddad och kan därför inte tas bort."
 
-#: src/addressbook.c:1489
+#: src/addressbook.c:1478
 msgid "Delete group"
 msgstr "Ta bort grupp"
 
-#: src/addressbook.c:1490
+#: src/addressbook.c:1479
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -710,56 +618,53 @@ msgstr ""
 "Vill du verkligen ta bort grupp(er)?\n"
 "Adresserna som den innehåller kommer inte gå förlorade."
 
-#: src/addressbook.c:1498
-#: src/addrduplicates.c:804
+#: src/addressbook.c:1487 src/addrduplicates.c:804
 msgid "Really delete the address(es)?"
 msgstr "Vill du verkligen ta bort adress(er)?"
 
-#: src/addressbook.c:2201
+#: src/addressbook.c:2190
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Kan inte klistra in. Destinations adressboken är skrivskyddad."
 
-#: src/addressbook.c:2211
+#: src/addressbook.c:2200
 msgid "Cannot paste into an address group."
 msgstr "Kan inte klistra in i en adressgrupp."
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2906
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Vill du ta bort resultatet av förfrågan samt adresserna i '%s' ?"
 
-#: src/addressbook.c:2920
-#: src/addressbook.c:2946
-#: src/addressbook.c:2953
-#: src/plugins/archive/archiver_prefs.c:337
-#: src/prefs_filtering_action.c:177
-#: src/toolbar.c:413
+#: src/addressbook.c:2909 src/addressbook.c:2935 src/addressbook.c:2942
+#: src/plugins/archive/archiver_prefs.c:337 src/prefs_filtering_action.c:177
+#: src/toolbar.c:414
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2918
 #, c-format
-msgid "Do you want to delete '%s'? If you delete the folder only, the addresses it contains will be moved into the parent folder."
-msgstr "Vill du ta bort '%s' ? Om du bara tar bort mappen, så flyttas alla adresser till överliggande mapp."
+msgid ""
+"Do you want to delete '%s'? If you delete the folder only, the addresses it "
+"contains will be moved into the parent folder."
+msgstr ""
+"Vill du ta bort '%s' ? Om du bara tar bort mappen, så flyttas alla adresser "
+"till överliggande mapp."
 
-#: src/addressbook.c:2932
-#: src/imap_gtk.c:363
-#: src/mh_gtk.c:202
-#: src/plugins/mailmbox/plugin_gtk.c:325
-#: src/plugins/rssyl/rssyl_cb_menu.c:237
-#: src/plugins/vcalendar/vcal_folder.c:1953
+#: src/addressbook.c:2921 src/imap_gtk.c:363 src/mh_gtk.c:202
+#: src/plugins/mailmbox/plugin_gtk.c:324 src/plugins/rssyl/rssyl_cb_menu.c:237
+#: src/plugins/vcalendar/vcal_folder.c:1951
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "+Delete _folder only"
 msgstr "+Ta endast bort _mapp"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2922
 msgid "Delete folder and _addresses"
 msgstr "Ta bort mapp och _adresser"
 
-#: src/addressbook.c:2944
+#: src/addressbook.c:2933
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -768,7 +673,7 @@ msgstr ""
 "Vill du ta bort '%s'?\n"
 "Adresserna som den innehåller kommer inte gå förlorade."
 
-#: src/addressbook.c:2951
+#: src/addressbook.c:2940
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -777,29 +682,28 @@ msgstr ""
 "Vill du ta bort '%s'?\n"
 "Adresserna som den innehåller kommer att gå förlorade."
 
-#: src/addressbook.c:3065
+#: src/addressbook.c:3054
 #, c-format
 msgid "Search '%s'"
 msgstr "Sök '%s'"
 
-#: src/addressbook.c:3203
-#: src/addressbook.c:3253
+#: src/addressbook.c:3192 src/addressbook.c:3242
 msgid "New Contacts"
 msgstr "Ny Kontakt"
 
-#: src/addressbook.c:4035
+#: src/addressbook.c:4024
 msgid "New user, could not save index file."
 msgstr "Ny användare, kunde inte spara innehållsfil."
 
-#: src/addressbook.c:4039
+#: src/addressbook.c:4028
 msgid "New user, could not save address book files."
 msgstr "Ny användare, kunde inte spara adressboksfiler."
 
-#: src/addressbook.c:4049
+#: src/addressbook.c:4038
 msgid "Old address book converted successfully."
 msgstr "Gammal adressbok framgångsrikt konverterad."
 
-#: src/addressbook.c:4054
+#: src/addressbook.c:4043
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -807,7 +711,7 @@ msgstr ""
 "Gammal adressbok konverterad,\n"
 "kunde inte spara ny adressindexfil."
 
-#: src/addressbook.c:4067
+#: src/addressbook.c:4056
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -815,7 +719,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:4073
+#: src/addressbook.c:4062
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -823,7 +727,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "kunde inte skapa ny adressindexfil."
 
-#: src/addressbook.c:4078
+#: src/addressbook.c:4067
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -831,87 +735,70 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:4085
-#: src/addressbook.c:4091
+#: src/addressbook.c:4074 src/addressbook.c:4080
 msgid "Addressbook conversion error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:4198
+#: src/addressbook.c:4187
 msgid "Addressbook Error"
 msgstr "Adressboksfel"
 
-#: src/addressbook.c:4199
+#: src/addressbook.c:4188
 msgid "Could not read address index"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:4530
+#: src/addressbook.c:4519
 msgid "Busy searching..."
 msgstr "Upptagen med att söka..."
 
-#: src/addressbook.c:4833
+#: src/addressbook.c:4822
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/addressbook.c:4845
-#: src/addressbook_foldersel.c:182
-#: src/exphtmldlg.c:371
-#: src/expldifdlg.c:388
-#: src/exporthtml.c:984
-#: src/importldif.c:657
+#: src/addressbook.c:4834 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
+#: src/expldifdlg.c:388 src/exporthtml.c:984 src/importldif.c:657
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:4857
+#: src/addressbook.c:4846
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:4893
-#: src/exporthtml.c:884
-#: src/folderview.c:338
-#: src/folderview.c:426
-#: src/prefs_account.c:2746
-#: src/prefs_folder_column.c:78
+#: src/addressbook.c:4882 src/exporthtml.c:884 src/folderview.c:338
+#: src/folderview.c:426 src/prefs_account.c:2738 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Mapp"
 
-#: src/addressbook.c:4905
+#: src/addressbook.c:4894
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4917
-#: src/addressbook.c:4929
+#: src/addressbook.c:4906 src/addressbook.c:4918
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4941
+#: src/addressbook.c:4930
 msgid "LDAP servers"
 msgstr "LDAP-servrar"
 
-#: src/addressbook.c:4953
+#: src/addressbook.c:4942
 msgid "LDAP Query"
 msgstr "LDAP Fråga"
 
-#: src/addressbook_foldersel.c:388
-#: src/plugins/bogofilter/bogofilter.c:107
+#: src/addressbook_foldersel.c:388 src/plugins/bogofilter/bogofilter.c:107
 #: src/plugins/bogofilter/bogofilter_gtk.c:230
 #: src/plugins/bogofilter/bogofilter_gtk.c:306
 #: src/plugins/bogofilter/bogofilter_gtk.c:383
 #: src/plugins/bsfilter/bsfilter_gtk.c:197
 #: src/plugins/bsfilter/bsfilter_gtk.c:266
-#: src/plugins/bsfilter/bsfilter_gtk.c:326
-#: src/plugins/bsfilter/bsfilter.c:107
+#: src/plugins/bsfilter/bsfilter_gtk.c:326 src/plugins/bsfilter/bsfilter.c:107
 #: src/plugins/spamassassin/spamassassin.c:117
 #: src/plugins/spamassassin/spamassassin_gtk.c:443
 #: src/plugins/spamassassin/spamassassin_gtk.c:490
-#: src/plugins/spamassassin/spamassassin_gtk.c:613
-#: src/prefs_matcher.c:672
-#: src/prefs_matcher.c:707
-#: src/prefs_matcher.c:1601
-#: src/prefs_matcher.c:1608
-#: src/prefs_matcher.c:1616
-#: src/prefs_matcher.c:1618
-#: src/prefs_matcher.c:2498
-#: src/prefs_matcher.c:2502
+#: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:672
+#: src/prefs_matcher.c:707 src/prefs_matcher.c:1607 src/prefs_matcher.c:1614
+#: src/prefs_matcher.c:1622 src/prefs_matcher.c:1624 src/prefs_matcher.c:2504
+#: src/prefs_matcher.c:2508
 msgid "Any"
 msgstr "Någon"
 
@@ -951,9 +838,9 @@ msgstr "Adressboknamn :"
 msgid "Address book folder size:"
 msgstr "Adressbok mappstorlek:"
 
-#: src/addrgather.c:399
-#: src/addrgather.c:409
-msgid "Maximum amount of entries per folder within the newly created address book"
+#: src/addrgather.c:399 src/addrgather.c:409
+msgid ""
+"Maximum amount of entries per folder within the newly created address book"
 msgstr "Maximalt antal poster per mapp i den nyss skapade adressboken"
 
 #: src/addrgather.c:413
@@ -964,8 +851,7 @@ msgstr "Bearbeta dessa brevhuvudfält"
 msgid "Include subfolders"
 msgstr "Inkludera undermappar"
 
-#: src/addrgather.c:456
-#: src/prefs_filtering_action.c:1423
+#: src/addrgather.c:456 src/prefs_filtering_action.c:1425
 msgid "Header Name"
 msgstr "Brevhuvudsnamn"
 
@@ -977,9 +863,7 @@ msgstr "Adressantal"
 msgid "Header Fields"
 msgstr "Brevhuvudsfält"
 
-#: src/addrgather.c:568
-#: src/exphtmldlg.c:658
-#: src/expldifdlg.c:722
+#: src/addrgather.c:568 src/exphtmldlg.c:658 src/expldifdlg.c:722
 #: src/importldif.c:1022
 msgid "Finish"
 msgstr "Avsluta"
@@ -1029,7 +913,8 @@ msgid "Find address book email duplicates"
 msgstr "Sök efter dubbletter av e-postadresser i adressbok"
 
 #: src/addrduplicates.c:145
-msgid "Claws Mail will now search for duplicate email addresses in the address book."
+msgid ""
+"Claws Mail will now search for duplicate email addresses in the address book."
 msgstr "Claws-Mail kommer nu söka efter kopior av e-postadresser i adressboken"
 
 #: src/addrduplicates.c:325
@@ -1048,34 +933,24 @@ msgstr "Sökväg till adressbok"
 msgid "Delete address"
 msgstr "Ta bort adress(er)"
 
-#: src/alertpanel.c:146
-#: src/compose.c:9160
+#: src/alertpanel.c:146 src/compose.c:9217
 msgid "Notice"
 msgstr "Meddelande"
 
-#: src/alertpanel.c:159
-#: src/compose.c:5556
-#: src/compose.c:6022
-#: src/compose.c:11468
-#: src/messageview.c:874
-#: src/messageview.c:887
-#: src/plugins/pgpcore/sgpgme.c:706
-#: src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4869
+#: src/alertpanel.c:159 src/compose.c:5597 src/compose.c:6063
+#: src/compose.c:11533 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:852 src/messageview.c:865
+#: src/plugins/pgpcore/sgpgme.c:706 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4865
 msgid "Warning"
 msgstr "Varning"
 
-#: src/alertpanel.c:172
-#: src/alertpanel.c:195
-#: src/compose.c:5497
-#: src/inc.c:666
-#: src/plugins/pgpcore/sgpgme.c:152
-#: src/plugins/pgpcore/sgpgme.c:246
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5538 src/inc.c:652
+#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:246
 msgid "Error"
 msgstr "Fel"
 
-#: src/alertpanel.c:196
-#: src/gtk/progressdialog.c:94
+#: src/alertpanel.c:196 src/gtk/progressdialog.c:94
 msgid "_View log"
 msgstr "_Visa logg"
 
@@ -1141,8 +1016,11 @@ msgstr "Gör ingenting"
 
 #: src/common/plugin.c:334
 #, c-format
-msgid "This plugin provides %s (%s), which is already provided by the %s plugin."
-msgstr "Denna insticksmodul tillhandahåller %s (%s), som redan tillhandahålls av insticksmodulen %s."
+msgid ""
+"This plugin provides %s (%s), which is already provided by the %s plugin."
+msgstr ""
+"Denna insticksmodul tillhandahåller %s (%s), som redan tillhandahålls av "
+"insticksmodulen %s."
 
 #: src/common/plugin.c:436
 msgid "Plugin already loaded"
@@ -1154,7 +1032,9 @@ msgstr "Kunde inte allokera minne till insticksmodul"
 
 #: src/common/plugin.c:481
 msgid "This module is not licensed under a GPL v3 or later compatible license."
-msgstr "Denna modul är inte licensierad under en licens som är kompatibel med GPL v3 eller senare."
+msgstr ""
+"Denna modul är inte licensierad under en licens som är kompatibel med GPL v3 "
+"eller senare."
 
 #: src/common/plugin.c:490
 msgid "This module is for Claws Mail GTK1."
@@ -1162,12 +1042,20 @@ msgstr "Denna modul är för Claws-Mail GTK1."
 
 #: src/common/plugin.c:772
 #, c-format
-msgid "Your version of Claws Mail is newer than the version the '%s' plugin was built with."
-msgstr "Din version av Claws Mail är nyare än den version som '%s' insticksmodulen byggdes med. "
+msgid ""
+"Your version of Claws Mail is newer than the version the '%s' plugin was "
+"built with."
+msgstr ""
+"Din version av Claws Mail är nyare än den version som '%s' insticksmodulen "
+"byggdes med. "
 
 #: src/common/plugin.c:775
-msgid "Your version of Claws Mail is newer than the version the plugin was built with."
-msgstr "Din version av Claws Mail är nyare än den version som insticksmodulen byggdes med."
+msgid ""
+"Your version of Claws Mail is newer than the version the plugin was built "
+"with."
+msgstr ""
+"Din version av Claws Mail är nyare än den version som insticksmodulen "
+"byggdes med."
 
 #: src/common/plugin.c:784
 #, c-format
@@ -1178,8 +1066,7 @@ msgstr "Din version av Claws Mail är för gammal för '%s' insticksmodulen."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Din version av Claws Mail är för gammal för insticksmodulen."
 
-#: src/common/session.c:175
-#: src/imap.c:1145
+#: src/common/session.c:175 src/imap.c:1145
 msgid "SSL handshake failed\n"
 msgstr "SSL-handskakning misslyckades\n"
 
@@ -1191,19 +1078,15 @@ msgstr "Ingen SMTP AUTH-metod tillgänglig\n"
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Vald SMTP AUTH-metod ej tillgänglig\n"
 
-#: src/common/smtp.c:525
-#: src/common/smtp.c:575
+#: src/common/smtp.c:525 src/common/smtp.c:575
 msgid "bad SMTP response\n"
 msgstr "Felaktigt SMTP svar\n"
 
-#: src/common/smtp.c:546
-#: src/common/smtp.c:564
-#: src/common/smtp.c:683
+#: src/common/smtp.c:546 src/common/smtp.c:564 src/common/smtp.c:683
 msgid "error occurred on SMTP session\n"
 msgstr "fel uppstod I SMTP session\n"
 
-#: src/common/smtp.c:555
-#: src/pop.c:895
+#: src/common/smtp.c:555 src/pop.c:895
 msgid "error occurred on authentication\n"
 msgstr "fel uppstod vid autentisering\n"
 
@@ -1212,8 +1095,7 @@ msgstr "fel uppstod vid autentisering\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Meddelandet är för stort (Maximal storlek är %s)\n"
 
-#: src/common/smtp.c:642
-#: src/pop.c:888
+#: src/common/smtp.c:642 src/pop.c:888
 msgid "couldn't start TLS session\n"
 msgstr "kunde inte starta TLS session\n"
 
@@ -1325,12 +1207,9 @@ msgstr "Kunde inte öppna certifikatfil %s (%s)\n"
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "P12 Certifikatfil %s saknas (%s)\n"
 
-#: src/common/ssl_certificate.c:870
-#: src/gtk/sslcertwindow.c:85
-#: src/gtk/sslcertwindow.c:92
-#: src/gtk/sslcertwindow.c:107
-#: src/gtk/sslcertwindow.c:112
-#: src/gtk/sslcertwindow.c:119
+#: src/common/ssl_certificate.c:870 src/gtk/sslcertwindow.c:85
+#: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
+#: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
 #: src/gtk/sslcertwindow.c:134
 msgid "<not in certificate>"
 msgstr "<inte i certifikat>"
@@ -1339,721 +1218,667 @@ msgstr "<inte i certifikat>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Ämne tömt av RegExp)"
 
-#: src/common/utils.c:371
+#: src/common/utils.c:362
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
-#: src/common/utils.c:372
+#: src/common/utils.c:363
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d,%02dKB"
 
-#: src/common/utils.c:373
+#: src/common/utils.c:364
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d,%02dMB"
 
-#: src/common/utils.c:374
+#: src/common/utils.c:365
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4974
+#: src/common/utils.c:4946
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "söndag"
 
-#: src/common/utils.c:4975
+#: src/common/utils.c:4947
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "måndag"
 
-#: src/common/utils.c:4976
+#: src/common/utils.c:4948
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "tisdag"
 
-#: src/common/utils.c:4977
+#: src/common/utils.c:4949
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: src/common/utils.c:4978
+#: src/common/utils.c:4950
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "torsdag"
 
-#: src/common/utils.c:4979
+#: src/common/utils.c:4951
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "fredag"
 
-#: src/common/utils.c:4980
+#: src/common/utils.c:4952
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "lördag"
 
-#: src/common/utils.c:4982
+#: src/common/utils.c:4954
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "januari"
 
-#: src/common/utils.c:4983
+#: src/common/utils.c:4955
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "februari"
 
-#: src/common/utils.c:4984
+#: src/common/utils.c:4956
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "mars"
 
-#: src/common/utils.c:4985
+#: src/common/utils.c:4957
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "april"
 
-#: src/common/utils.c:4986
+#: src/common/utils.c:4958
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "maj"
 
-#: src/common/utils.c:4987
+#: src/common/utils.c:4959
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "juni"
 
-#: src/common/utils.c:4988
+#: src/common/utils.c:4960
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "juli"
 
-#: src/common/utils.c:4989
+#: src/common/utils.c:4961
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "augusti"
 
-#: src/common/utils.c:4990
+#: src/common/utils.c:4962
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "september"
 
-#: src/common/utils.c:4991
+#: src/common/utils.c:4963
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "oktober"
 
-#: src/common/utils.c:4992
+#: src/common/utils.c:4964
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "november"
 
-#: src/common/utils.c:4993
+#: src/common/utils.c:4965
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "december"
 
-#: src/common/utils.c:4995
+#: src/common/utils.c:4967
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "sön"
 
-#: src/common/utils.c:4996
+#: src/common/utils.c:4968
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "mån"
 
-#: src/common/utils.c:4997
+#: src/common/utils.c:4969
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "tis"
 
-#: src/common/utils.c:4998
+#: src/common/utils.c:4970
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "ons"
 
-#: src/common/utils.c:4999
+#: src/common/utils.c:4971
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "tor"
 
-#: src/common/utils.c:5000
+#: src/common/utils.c:4972
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "fre"
 
-#: src/common/utils.c:5001
+#: src/common/utils.c:4973
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "lör"
 
-#: src/common/utils.c:5003
+#: src/common/utils.c:4975
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "jan"
 
-#: src/common/utils.c:5004
+#: src/common/utils.c:4976
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "feb"
 
-#: src/common/utils.c:5005
+#: src/common/utils.c:4977
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "mar"
 
-#: src/common/utils.c:5006
+#: src/common/utils.c:4978
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "apr"
 
-#: src/common/utils.c:5007
+#: src/common/utils.c:4979
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "maj"
 
-#: src/common/utils.c:5008
+#: src/common/utils.c:4980
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "jun"
 
-#: src/common/utils.c:5009
+#: src/common/utils.c:4981
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "jul"
 
-#: src/common/utils.c:5010
+#: src/common/utils.c:4982
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "aug"
 
-#: src/common/utils.c:5011
+#: src/common/utils.c:4983
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "sep"
 
-#: src/common/utils.c:5012
+#: src/common/utils.c:4984
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "okt"
 
-#: src/common/utils.c:5013
+#: src/common/utils.c:4985
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "nov"
 
-#: src/common/utils.c:5014
+#: src/common/utils.c:4986
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "dec"
 
-#: src/common/utils.c:5025
+#: src/common/utils.c:4997
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "FM"
 
-#: src/common/utils.c:5026
+#: src/common/utils.c:4998
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "EM"
 
-#: src/common/utils.c:5027
+#: src/common/utils.c:4999
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "fm"
 
-#: src/common/utils.c:5028
+#: src/common/utils.c:5000
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "em"
 
-#: src/common/utils.c:5035
+#: src/common/utils.c:5007
 msgctxt "For use by strftime (default date+time format)"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %e %b %Y %H:%M:%S"
 
-#: src/common/utils.c:5036
+#: src/common/utils.c:5008
 msgctxt "For use by strftime (default date format)"
 msgid "%m/%d/%y"
 msgstr "%Y-%m-%d"
 
-#: src/common/utils.c:5037
+#: src/common/utils.c:5009
 msgctxt "For use by strftime (default time format)"
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
-#: src/common/utils.c:5039
+#: src/common/utils.c:5011
 msgctxt "For use by strftime (default 12-hour time format)"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S"
 
-#: src/compose.c:565
+#: src/compose.c:567
 msgid "_Add..."
 msgstr "_Lägg till..."
 
-#: src/compose.c:566
-#: src/mh_gtk.c:361
-#: src/plugins/mailmbox/plugin_gtk.c:293
+#: src/compose.c:568 src/mh_gtk.c:361 src/plugins/mailmbox/plugin_gtk.c:293
 #: src/plugins/rssyl/rssyl_cb_menu.c:140
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: src/compose.c:568
-#: src/folderview.c:234
+#: src/compose.c:570 src/folderview.c:234
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
-#: src/compose.c:575
-#: src/mainwindow.c:506
-#: src/messageview.c:213
+#: src/compose.c:577 src/mainwindow.c:506 src/messageview.c:211
 msgid "_Message"
 msgstr "_Meddelande"
 
-#: src/compose.c:578
+#: src/compose.c:580
 msgid "_Spelling"
 msgstr "_Stavning"
 
-#: src/compose.c:580
-#: src/compose.c:646
+#: src/compose.c:582 src/compose.c:649
 msgid "_Options"
 msgstr "_Alternativ"
 
-#: src/compose.c:584
+#: src/compose.c:586
 msgid "S_end"
 msgstr "Skicka"
 
-#: src/compose.c:585
+#: src/compose.c:587
 msgid "Send _later"
 msgstr "Skicka senare"
 
-#: src/compose.c:588
+#: src/compose.c:590
 msgid "_Attach file"
 msgstr "_Bifoga fil"
 
-#: src/compose.c:589
+#: src/compose.c:591
 msgid "_Insert file"
 msgstr "_Infoga fil"
 
-#: src/compose.c:590
+#: src/compose.c:592
 msgid "Insert si_gnature"
 msgstr "Infoga si_gnatur"
 
-#: src/compose.c:594
+#: src/compose.c:593
+msgid "_Replace signature"
+msgstr "E_rsätt signatur"
+
+#: src/compose.c:597
 msgid "_Print"
 msgstr "Skriv ut"
 
-#: src/compose.c:599
+#: src/compose.c:602
 msgid "_Undo"
 msgstr "_Ångra"
 
-#: src/compose.c:600
+#: src/compose.c:603
 msgid "_Redo"
 msgstr "Gö_r om"
 
-#: src/compose.c:603
+#: src/compose.c:606
 msgid "Cu_t"
 msgstr "Klipp _ut"
 
-#: src/compose.c:607
+#: src/compose.c:610
 msgid "_Special paste"
 msgstr "Klistra in _special"
 
-#: src/compose.c:608
+#: src/compose.c:611
 msgid "As _quotation"
 msgstr "Som _citat"
 
-#: src/compose.c:609
+#: src/compose.c:612
 msgid "_Wrapped"
 msgstr "_Radbruten"
 
-#: src/compose.c:610
+#: src/compose.c:613
 msgid "_Unwrapped"
 msgstr "Ej radbr_uten"
 
-#: src/compose.c:612
-#: src/mainwindow.c:539
+#: src/compose.c:615 src/mainwindow.c:539
 msgid "Select _all"
 msgstr "Markera _alla"
 
-#: src/compose.c:614
+#: src/compose.c:617
 msgid "A_dvanced"
 msgstr "Avancerat"
 
-#: src/compose.c:615
+#: src/compose.c:618
 msgid "Move a character backward"
 msgstr "Flytta ett tecken bakåt"
 
-#: src/compose.c:616
+#: src/compose.c:619
 msgid "Move a character forward"
 msgstr "Flytta ett tecken framåt"
 
-#: src/compose.c:617
+#: src/compose.c:620
 msgid "Move a word backward"
 msgstr "Flytta ett ord bakåt"
 
-#: src/compose.c:618
+#: src/compose.c:621
 msgid "Move a word forward"
 msgstr "Flytta ett ord framåt"
 
-#: src/compose.c:619
+#: src/compose.c:622
 msgid "Move to beginning of line"
 msgstr "Flytta till början av rad"
 
-#: src/compose.c:620
+#: src/compose.c:623
 msgid "Move to end of line"
 msgstr "Flytta till slutet på rad"
 
-#: src/compose.c:621
+#: src/compose.c:624
 msgid "Move to previous line"
 msgstr "Flytta till föregående rad"
 
-#: src/compose.c:622
+#: src/compose.c:625
 msgid "Move to next line"
 msgstr "Flytta till nästa rad"
 
-#: src/compose.c:623
+#: src/compose.c:626
 msgid "Delete a character backward"
 msgstr "Ta bort ett tecken bakåt"
 
-#: src/compose.c:624
+#: src/compose.c:627
 msgid "Delete a character forward"
 msgstr "Ta bort ett tecken framåt"
 
-#: src/compose.c:625
+#: src/compose.c:628
 msgid "Delete a word backward"
 msgstr "Ta bort ett ord bakåt"
 
-#: src/compose.c:626
+#: src/compose.c:629
 msgid "Delete a word forward"
 msgstr "Ta bort ett ord framåt"
 
-#: src/compose.c:627
+#: src/compose.c:630
 msgid "Delete line"
 msgstr "Ta bort rad"
 
-#: src/compose.c:628
+#: src/compose.c:631
 msgid "Delete to end of line"
 msgstr "Ta bort till slutet av raden"
 
-#: src/compose.c:631
-#: src/messageview.c:230
+#: src/compose.c:634 src/messageview.c:228
 msgid "_Find"
 msgstr "_Sök"
 
-#: src/compose.c:634
+#: src/compose.c:637
 msgid "_Wrap current paragraph"
 msgstr "Radbryt _stycke"
 
-#: src/compose.c:635
+#: src/compose.c:638
 msgid "Wrap all long _lines"
 msgstr "Radbryt alla _långa rader"
 
-#: src/compose.c:637
+#: src/compose.c:640
 msgid "Edit with e_xternal editor"
 msgstr "Redigera med e_xtern redigerare"
 
-#: src/compose.c:640
+#: src/compose.c:643
 msgid "_Check all or check selection"
 msgstr "_Kontrollera alla eller kontrollera markering"
 
-#: src/compose.c:641
+#: src/compose.c:644
 msgid "_Highlight all misspelled words"
 msgstr "_Markera alla felstavade ord"
 
-#: src/compose.c:642
+#: src/compose.c:645
 msgid "Check _backwards misspelled word"
 msgstr "Kontrollera felstavade ord _bakåt"
 
-#: src/compose.c:643
+#: src/compose.c:646
 msgid "_Forward to next misspelled word"
 msgstr "_Hoppa till nästa felstavade ord"
 
-#: src/compose.c:651
+#: src/compose.c:654
 msgid "Reply _mode"
 msgstr "_Svarsläge"
 
-#: src/compose.c:653
+#: src/compose.c:656
 msgid "Privacy _System"
 msgstr "Sekretess_system"
 
-#: src/compose.c:658
+#: src/compose.c:661
 msgid "_Priority"
 msgstr "_Prioritet"
 
-#: src/compose.c:660
-#: src/mainwindow.c:603
-#: src/messageview.c:266
+#: src/compose.c:663 src/mainwindow.c:603 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "_Teckenkodning"
 
-#: src/compose.c:665
-#: src/mainwindow.c:608
-#: src/messageview.c:271
+#: src/compose.c:668 src/mainwindow.c:608 src/messageview.c:269
 msgid "Western European"
 msgstr "Västeuropeisk (ISO-8859-1)"
 
-#: src/compose.c:666
-#: src/mainwindow.c:609
-#: src/messageview.c:272
+#: src/compose.c:669 src/mainwindow.c:609 src/messageview.c:270
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: src/compose.c:667
-#: src/mainwindow.c:610
-#: src/messageview.c:273
+#: src/compose.c:670 src/mainwindow.c:610 src/messageview.c:271
 msgid "Hebrew"
 msgstr "Hebreiska"
 
-#: src/compose.c:668
-#: src/mainwindow.c:611
-#: src/messageview.c:274
+#: src/compose.c:671 src/mainwindow.c:611 src/messageview.c:272
 msgid "Arabic"
 msgstr "Arabiska"
 
-#: src/compose.c:669
-#: src/mainwindow.c:612
-#: src/messageview.c:275
+#: src/compose.c:672 src/mainwindow.c:612 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "Kyrillisk (KOI8-R)"
 
-#: src/compose.c:670
-#: src/mainwindow.c:613
-#: src/messageview.c:276
+#: src/compose.c:673 src/mainwindow.c:613 src/messageview.c:274
 msgid "Japanese"
 msgstr "Japansk (EUC-JP)"
 
-#: src/compose.c:671
-#: src/mainwindow.c:614
-#: src/messageview.c:277
+#: src/compose.c:674 src/mainwindow.c:614 src/messageview.c:275
 msgid "Chinese"
 msgstr "Kinesiska"
 
-#: src/compose.c:672
-#: src/mainwindow.c:615
-#: src/messageview.c:278
+#: src/compose.c:675 src/mainwindow.c:615 src/messageview.c:276
 msgid "Korean"
 msgstr "Koreanska"
 
-#: src/compose.c:673
-#: src/mainwindow.c:616
-#: src/messageview.c:279
+#: src/compose.c:676 src/mainwindow.c:616 src/messageview.c:277
 msgid "Thai"
 msgstr "Thai"
 
-#: src/compose.c:676
-#: src/mainwindow.c:723
-#: src/messageview.c:315
+#: src/compose.c:679 src/mainwindow.c:723 src/messageview.c:313
 msgid "_Address book"
 msgstr "_Adressbok"
 
-#: src/compose.c:678
+#: src/compose.c:681
 msgid "_Template"
 msgstr "_Mall"
 
-#: src/compose.c:680
-#: src/mainwindow.c:751
-#: src/messageview.c:336
+#: src/compose.c:683 src/mainwindow.c:751 src/messageview.c:334
 msgid "Actio_ns"
 msgstr "Aktiviteter"
 
-#: src/compose.c:689
+#: src/compose.c:692
 msgid "Aut_o wrapping"
 msgstr "Automatiskt radbrytning"
 
-#: src/compose.c:690
+#: src/compose.c:693
 msgid "Auto _indent"
 msgstr "Automatiskt _indrag"
 
-#: src/compose.c:691
+#: src/compose.c:694
 msgid "Si_gn"
 msgstr "Signera"
 
-#: src/compose.c:692
+#: src/compose.c:695
 msgid "_Encrypt"
 msgstr "Kryptera"
 
-#: src/compose.c:693
+#: src/compose.c:696
 msgid "_Request Return Receipt"
 msgstr "Begär läskvitto"
 
-#: src/compose.c:694
+#: src/compose.c:697
 msgid "Remo_ve references"
 msgstr "Ta b_ort referenser"
 
-#: src/compose.c:695
+#: src/compose.c:698
 msgid "Show _ruler"
 msgstr "Visa linjal"
 
-#: src/compose.c:700
-#: src/compose.c:710
+#: src/compose.c:703 src/compose.c:713
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:701
-#: src/mainwindow.c:657
-#: src/messageview.c:304
+#: src/compose.c:704 src/mainwindow.c:657 src/messageview.c:302
 msgid "_All"
 msgstr "_Alla"
 
-#: src/compose.c:702
-#: src/mainwindow.c:658
-#: src/messageview.c:305
+#: src/compose.c:705 src/mainwindow.c:658 src/messageview.c:303
 msgid "_Sender"
 msgstr "Av_sändare"
 
-#: src/compose.c:703
+#: src/compose.c:706
 msgid "_Mailing-list"
 msgstr "_Sändlista"
 
-#: src/compose.c:708
+#: src/compose.c:711
 msgid "_Highest"
 msgstr "_Högsta"
 
-#: src/compose.c:709
+#: src/compose.c:712
 msgid "Hi_gh"
 msgstr "Hö_g"
 
-#: src/compose.c:711
+#: src/compose.c:714
 msgid "Lo_w"
 msgstr "L_åg"
 
-#: src/compose.c:712
+#: src/compose.c:715
 msgid "_Lowest"
 msgstr "_Lägsta"
 
-#: src/compose.c:717
-#: src/mainwindow.c:867
-#: src/messageview.c:353
+#: src/compose.c:720 src/mainwindow.c:865 src/messageview.c:351
 msgid "_Automatic"
 msgstr "_Automatiskt"
 
-#: src/compose.c:718
-#: src/mainwindow.c:868
-#: src/messageview.c:354
+#: src/compose.c:721 src/mainwindow.c:866 src/messageview.c:352
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7 bitars ASCII (US-ASC_II)"
 
-#: src/compose.c:719
-#: src/mainwindow.c:869
-#: src/messageview.c:355
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:353
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:723
-#: src/mainwindow.c:873
-#: src/messageview.c:359
+#: src/compose.c:726 src/mainwindow.c:871 src/messageview.c:357
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centraleuropeisk (ISO-8859-_2)"
 
-#: src/compose.c:726
-#: src/mainwindow.c:876
-#: src/messageview.c:362
+#: src/compose.c:729 src/mainwindow.c:874 src/messageview.c:360
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grekisk (ISO-8859-_7)"
 
-#: src/compose.c:731
-#: src/mainwindow.c:881
-#: src/messageview.c:367
+#: src/compose.c:734 src/mainwindow.c:879 src/messageview.c:365
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turkisk (ISO-8859-_9)"
 
-#: src/compose.c:1034
+#: src/compose.c:1062
 msgid "New message From format error."
 msgstr "Nytt meddelande Från-formatfel."
 
-#: src/compose.c:1126
+#: src/compose.c:1154
 msgid "New message subject format error."
 msgstr "Nytt meddelande ärende-formatfel."
 
-#: src/compose.c:1157
-#: src/quote_fmt.c:563
+#: src/compose.c:1185 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "\"Nytt meddelande\"-mallen har ett fel i meddelandetexten på rad %d."
 
-#: src/compose.c:1413
+#: src/compose.c:1439
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Kan inte svara. Ursprungsmeddelandet finns troligen inte."
 
-#: src/compose.c:1596
-#: src/quote_fmt.c:580
-msgid "The \"From\" field of the \"Reply\" template contains an invalid email address."
+#: src/compose.c:1622 src/quote_fmt.c:580
+msgid ""
+"The \"From\" field of the \"Reply\" template contains an invalid email "
+"address."
 msgstr "\"Från\"-fältet av \"Svar\"-mallen innehåller en ogiltig email-adress."
 
-#: src/compose.c:1644
-#: src/quote_fmt.c:583
+#: src/compose.c:1670 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Meddelandetexten av \"Svara\"-mallen har ett fel på rad %d."
 
-#: src/compose.c:1780
-#: src/compose.c:1972
-#: src/quote_fmt.c:600
-msgid "The \"From\" field of the \"Forward\" template contains an invalid email address."
-msgstr "\"Från\"-fältet av \"Vidarebefordra\"-mallen innehåller en ogiltig email-adress."
+#: src/compose.c:1806 src/compose.c:1998 src/quote_fmt.c:600
+msgid ""
+"The \"From\" field of the \"Forward\" template contains an invalid email "
+"address."
+msgstr ""
+"\"Från\"-fältet av \"Vidarebefordra\"-mallen innehåller en ogiltig email-"
+"adress."
 
-#: src/compose.c:1840
-#: src/quote_fmt.c:603
+#: src/compose.c:1866 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Meddelandetexten av \"Vidarebefordra\"-mallen har ett fel på rad %d."
 
-#: src/compose.c:2014
+#: src/compose.c:2040
 msgid "Fw: multiple emails"
 msgstr "Vb: många meddelande"
 
-#: src/compose.c:2456
+#: src/compose.c:2482
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "\"Omdirigera\"-mallen har ett fel i meddelandetexten på rad %d."
 
-#: src/compose.c:2522
-#: src/gtk/headers.h:13
+#: src/compose.c:2549 src/gtk/headers.h:13
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/compose.c:2525
-#: src/gtk/headers.h:14
+#: src/compose.c:2552 src/gtk/headers.h:14
 msgid "Bcc:"
 msgstr "Blindkopia:"
 
-#: src/compose.c:2528
-#: src/gtk/headers.h:11
+#: src/compose.c:2555 src/gtk/headers.h:11
 msgid "Reply-To:"
 msgstr "Svara till:"
 
-#: src/compose.c:2531
-#: src/compose.c:4818
-#: src/compose.c:4820
+#: src/compose.c:2558 src/compose.c:4854 src/compose.c:4856
 #: src/gtk/headers.h:32
 msgid "Newsgroups:"
 msgstr "Diskussionsgrupper:"
 
-#: src/compose.c:2534
-#: src/gtk/headers.h:33
+#: src/compose.c:2561 src/gtk/headers.h:33
 msgid "Followup-To:"
 msgstr "Uppföljning Till:"
 
-#: src/compose.c:2537
-#: src/gtk/headers.h:16
+#: src/compose.c:2564 src/gtk/headers.h:16
 msgid "In-Reply-To:"
 msgstr "Svar-På:"
 
-#: src/compose.c:2541
-#: src/compose.c:4815
-#: src/compose.c:4823
-#: src/gtk/headers.h:12
-#: src/summary_search.c:419
+#: src/compose.c:2568 src/compose.c:4851 src/compose.c:4859
+#: src/gtk/headers.h:12 src/summary_search.c:445
 msgid "To:"
 msgstr "Till:"
 
-#: src/compose.c:2747
+#: src/compose.c:2774
 msgid "Couldn't attach a file (charset conversion failed)."
-msgstr "Kunde inte bifoga en fil (omvandling av teckenuppsättning misslyckades)."
+msgstr ""
+"Kunde inte bifoga en fil (omvandling av teckenuppsättning misslyckades)."
 
-#: src/compose.c:2753
+#: src/compose.c:2780
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2068,68 +1893,65 @@ msgstr[1] ""
 "Följande filer har bifogats: \n"
 "%s"
 
-#: src/compose.c:3026
+#: src/compose.c:3053
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"Citattecknen\" av mallen är ogiltiga."
 
-#: src/compose.c:3514
+#: src/compose.c:3542
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Kunde inte ta storleken på filen '%s'."
 
-#: src/compose.c:3525
+#: src/compose.c:3553
 #, c-format
-msgid "You are about to insert a file of %s in the message body. Are you sure you want to do that?"
-msgstr "Du är på väg att infoga en fil på %s i meddelandetexten. Vill du fortsätta?"
+msgid ""
+"You are about to insert a file of %s in the message body. Are you sure you "
+"want to do that?"
+msgstr ""
+"Du är på väg att infoga en fil på %s i meddelandetexten. Vill du fortsätta?"
 
-#: src/compose.c:3528
+#: src/compose.c:3556
 msgid "Are you sure?"
 msgstr "Är du säker?"
 
-#: src/compose.c:3529
-#: src/compose.c:10962
+#: src/compose.c:3557 src/compose.c:11027
 msgid "+_Insert"
 msgstr "+_Infoga"
 
-#: src/compose.c:3639
+#: src/compose.c:3672
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:3643
+#: src/compose.c:3676
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan inte läsa %s."
 
-#: src/compose.c:3670
+#: src/compose.c:3703
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:4658
-#: src/plugins/python/composewindowtype.c:428
+#: src/compose.c:4691 src/plugins/python/composewindowtype.c:432
 msgid " [Edited]"
 msgstr " [Redigerat]"
 
-#: src/compose.c:4665
-#: src/plugins/python/composewindowtype.c:431
+#: src/compose.c:4698 src/plugins/python/composewindowtype.c:435
 #, c-format
 msgid "%s - Compose message%s"
-msgstr "%s - Nytt meddelande%s"
+msgstr "%s - Skriv meddelande%s"
 
-#: src/compose.c:4668
-#: src/plugins/python/composewindowtype.c:434
+#: src/compose.c:4701 src/plugins/python/composewindowtype.c:438
 #, c-format
 msgid "[no subject] - Compose message%s"
-msgstr "[inget ämne] - Nytt meddelande%s"
+msgstr "[inget ämne] - Skriv meddelande%s"
 
-#: src/compose.c:4670
-#: src/plugins/python/composewindowtype.c:422
+#: src/compose.c:4703 src/plugins/python/composewindowtype.c:426
 msgid "Compose message"
-msgstr "Nytt meddelande"
+msgstr "Skriv meddelande"
 
-#: src/compose.c:4697
-#: src/messageview.c:909
+#: src/compose.c:4730 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2137,61 +1959,51 @@ msgstr ""
 "Konto för att skicka e-post är inte specificerat.\n"
 "Var god välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:4914
-#: src/compose.c:4946
-#: src/compose.c:4988
-#: src/plugins/attachwarner/attachwarner.c:219
-#: src/prefs_account.c:3245
-#: src/toolbar.c:404
-#: src/toolbar.c:422
+#: src/compose.c:4950 src/compose.c:4982 src/compose.c:5024
+#: src/plugins/attachwarner/attachwarner.c:219 src/prefs_account.c:3237
+#: src/toolbar.c:405 src/toolbar.c:423
 msgid "Send"
 msgstr "Skicka"
 
-#: src/compose.c:4915
+#: src/compose.c:4951
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Den enda mottagaren är standard kopie-adressen. Skicka ändå?"
 
-#: src/compose.c:4916
-#: src/compose.c:4948
-#: src/compose.c:4981
-#: src/compose.c:5497
+#: src/compose.c:4952 src/compose.c:4984 src/compose.c:5017 src/compose.c:5538
 #: src/plugins/attachwarner/attachwarner.c:211
 msgid "+_Send"
 msgstr "+_Skicka"
 
-#: src/compose.c:4947
+#: src/compose.c:4983
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Den enda mottagaren är standard blindkopie-adressen. Skicka ändå?"
 
-#: src/compose.c:4964
+#: src/compose.c:5000
 msgid "Recipient is not specified."
 msgstr "Mottagare har inte specificerats."
 
-#: src/compose.c:4983
-#: src/plugins/attachwarner/attachwarner.c:213
+#: src/compose.c:5019 src/plugins/attachwarner/attachwarner.c:213
 msgid "+_Queue"
 msgstr "+_Kö"
 
-#: src/compose.c:4984
+#: src/compose.c:5020
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Ämnesraden är tom. %s"
 
-#: src/compose.c:4985
+#: src/compose.c:5021
 msgid "Send it anyway?"
 msgstr "Skicka ändå?"
 
-#: src/compose.c:4986
+#: src/compose.c:5022
 msgid "Queue it anyway?"
 msgstr "Köa det ändå?"
 
-#: src/compose.c:4988
-#: src/toolbar.c:423
+#: src/compose.c:5024 src/toolbar.c:424
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: src/compose.c:5036
-#: src/compose.c:9585
+#: src/compose.c:5077 src/compose.c:9643
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2201,8 +2013,7 @@ msgstr ""
 "\n"
 "Fel vid omvandling av teckenuppsättning."
 
-#: src/compose.c:5039
-#: src/compose.c:9588
+#: src/compose.c:5080 src/compose.c:9646
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2212,8 +2023,7 @@ msgstr ""
 "\n"
 "Kunde inte få tag i mottagarens krypteringsnyckel."
 
-#: src/compose.c:5045
-#: src/compose.c:9582
+#: src/compose.c:5086 src/compose.c:9640
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2224,7 +2034,7 @@ msgstr ""
 "\n"
 "Signeringsfel: %s"
 
-#: src/compose.c:5048
+#: src/compose.c:5089
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2235,12 +2045,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5050
+#: src/compose.c:5091
 msgid "Could not queue message for sending."
 msgstr "Kunde inte lägga meddelandet i kön för att skickas."
 
-#: src/compose.c:5065
-#: src/compose.c:5125
+#: src/compose.c:5106 src/compose.c:5166
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2248,7 +2057,7 @@ msgstr ""
 "Meddelandet var lagt i kö men kunde inte skickas.\n"
 "Använd \"Sänd köade meddelande\" från huvudfönstret för att försöka igen."
 
-#: src/compose.c:5121
+#: src/compose.c:5162
 #, c-format
 msgid ""
 "%s\n"
@@ -2257,7 +2066,7 @@ msgstr ""
 "%s\n"
 "Använd \"Sänd köade meddelande\" från huvudfönstret för att försöka igen."
 
-#: src/compose.c:5494
+#: src/compose.c:5535
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2268,7 +2077,7 @@ msgstr ""
 "till den specificerade %s kodningen.\n"
 "Skicka som det %s?"
 
-#: src/compose.c:5552
+#: src/compose.c:5593
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2281,82 +2090,69 @@ msgstr ""
 "\n"
 "Skicka ändå?"
 
-#: src/compose.c:5733
+#: src/compose.c:5774
 msgid "Encryption warning"
 msgstr "Varning om kryptering"
 
-#: src/compose.c:5734
+#: src/compose.c:5775
 msgid "+C_ontinue"
 msgstr "+F_ortsätt"
 
-#: src/compose.c:5783
+#: src/compose.c:5824
 msgid "No account for sending mails available!"
 msgstr "Det finns inget konto för att skicka e-post tillgängligt!"
 
-#: src/compose.c:5792
+#: src/compose.c:5833
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Valt konto är inte NNTP: Omöjligt att skicka."
 
-#: src/compose.c:6021
+#: src/compose.c:6062
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Bilagan %s existerar inte längre. Ignorera?"
 
-#: src/compose.c:6022
-#: src/mainwindow.c:648
-#: src/toolbar.c:229
-#: src/toolbar.c:2181
+#: src/compose.c:6063 src/mainwindow.c:648 src/toolbar.c:230
+#: src/toolbar.c:2182
 msgid "Cancel sending"
 msgstr "Avbryt sändning"
 
-#: src/compose.c:6022
+#: src/compose.c:6063
 msgid "Ignore attachment"
 msgstr "Ignorera bilaga"
 
-#: src/compose.c:6061
+#: src/compose.c:6102
 #, c-format
 msgid "Original %s part"
 msgstr "Ursprunglig %s del"
 
-#: src/compose.c:6592
+#: src/compose.c:6681
 msgid "Add to address _book"
 msgstr "Lägg till i adress_boken"
 
-#: src/compose.c:6748
+#: src/compose.c:6837
 msgid "Delete entry contents"
 msgstr "Ta bort innehållet i inmatningsfältet"
 
-#: src/compose.c:6752
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:295
+#: src/compose.c:6841 src/plugins/vcalendar/vcal_meeting_gtk.c:295
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Använd <tabb> för automatisk ifyllning från adressbok"
 
-#: src/compose.c:6972
+#: src/compose.c:7061
 msgid "Mime type"
 msgstr "Mime typ"
 
-#: src/compose.c:6978
-#: src/mimeview.c:283
-#: src/plugins/pgpcore/select-keys.c:396
-#: src/prefs_matcher.c:627
-#: src/prefs_summary_column.c:85
-#: src/summaryview.c:447
+#: src/compose.c:7067 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:392
+#: src/prefs_matcher.c:627 src/prefs_summary_column.c:85 src/summaryview.c:447
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:7048
+#: src/compose.c:7130
 msgid "Save Message to "
 msgstr "Spara meddelande i "
 
-#: src/compose.c:7081
-#: src/editjpilot.c:276
-#: src/editldap.c:520
-#: src/editvcard.c:192
-#: src/export.c:164
-#: src/import.c:163
-#: src/importmutt.c:239
-#: src/importpine.c:238
-#: src/plugins/archive/archiver_gtk.c:1028
+#: src/compose.c:7167 src/editjpilot.c:276 src/editldap.c:520
+#: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
+#: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1028
 #: src/plugins/bogofilter/bogofilter_gtk.c:188
 #: src/plugins/bogofilter/bogofilter_gtk.c:208
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
@@ -2365,26 +2161,24 @@ msgstr "Spara meddelande i "
 msgid "_Browse"
 msgstr "_Bläddra"
 
-#: src/compose.c:7569
+#: src/compose.c:7643
 msgid "Hea_der"
 msgstr "Brevhuvud"
 
-#: src/compose.c:7574
+#: src/compose.c:7648
 msgid "_Attachments"
 msgstr "Bilagor"
 
-#: src/compose.c:7588
+#: src/compose.c:7662
 msgid "Othe_rs"
 msgstr "Övriga"
 
-#: src/compose.c:7603
-#: src/gtk/headers.h:18
-#: src/plugins/pdf_viewer/poppler_viewer.c:704
-#: src/summary_search.c:426
+#: src/compose.c:7677 src/gtk/headers.h:18
+#: src/plugins/pdf_viewer/poppler_viewer.c:704 src/summary_search.c:452
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: src/compose.c:7830
+#: src/compose.c:7891
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2393,84 +2187,86 @@ msgstr ""
 "Felstavningsprogram kunde inte starta.\n"
 "%s"
 
-#: src/compose.c:7943
+#: src/compose.c:8000
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Från: <i>%s</i>"
 
-#: src/compose.c:7977
+#: src/compose.c:8034
 msgid "Account to use for this email"
 msgstr "Konto att använda för denna e-post"
 
-#: src/compose.c:7979
+#: src/compose.c:8036
 msgid "Sender address to be used"
 msgstr "Avsändaradress att användas"
 
-#: src/compose.c:8143
+#: src/compose.c:8200
 #, c-format
-msgid "The privacy system '%s' cannot be loaded. You will not be able to sign or encrypt this message."
-msgstr "Sekretesssystemet '%s' kan inte laddas. Du kommer inte att kunna signera eller kryptera detta meddelande."
+msgid ""
+"The privacy system '%s' cannot be loaded. You will not be able to sign or "
+"encrypt this message."
+msgstr ""
+"Sekretesssystemet '%s' kan inte laddas. Du kommer inte att kunna signera "
+"eller kryptera detta meddelande."
 
-#: src/compose.c:8243
-#: src/plugins/archive/archiver_gtk.c:1082
+#: src/compose.c:8300 src/plugins/archive/archiver_gtk.c:1082
 msgid "_None"
 msgstr "Ingen"
 
-#: src/compose.c:8344
-#: src/prefs_template.c:749
+#: src/compose.c:8401 src/prefs_template.c:753
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Mallens meddelandetext har ett fel på rad %d."
 
-#: src/compose.c:8460
+#: src/compose.c:8517
 msgid "Template From format error."
 msgstr "Fel i Från-mallformat."
 
-#: src/compose.c:8478
+#: src/compose.c:8535
 msgid "Template To format error."
 msgstr "Fel i Till-mallformat."
 
-#: src/compose.c:8496
+#: src/compose.c:8553
 msgid "Template Cc format error."
 msgstr "Fel i Kopia-mallformat."
 
-#: src/compose.c:8514
+#: src/compose.c:8571
 msgid "Template Bcc format error."
 msgstr "Fel i Blindkopia-mallformat."
 
-#: src/compose.c:8533
+#: src/compose.c:8590
 msgid "Template subject format error."
 msgstr "Fel i Ärende-mallformat."
 
-#: src/compose.c:8797
+#: src/compose.c:8854
 msgid "Invalid MIME type."
 msgstr "Felaktig MIME-typ"
 
-#: src/compose.c:8812
+#: src/compose.c:8869
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:8886
+#: src/compose.c:8943
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:8903
+#: src/compose.c:8960
 msgid "MIME type"
 msgstr "MIME-typ"
 
-#: src/compose.c:8944
+#: src/compose.c:9001
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:8964
+#: src/compose.c:9021
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:8965
+#: src/compose.c:9022
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:9157
+#: src/compose.c:9214
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2481,16 +2277,17 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:9551
-#: src/messageview.c:1116
+#: src/compose.c:9609 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
-msgstr "Claws Mail behöver vara uppkopplad mot ett nätverk för att kunna skicka denna e-post."
+msgstr ""
+"Claws Mail behöver vara uppkopplad mot ett nätverk för att kunna skicka "
+"denna e-post."
 
-#: src/compose.c:9577
+#: src/compose.c:9635
 msgid "Could not queue message."
 msgstr "Kunde inte köa meddelandet."
 
-#: src/compose.c:9579
+#: src/compose.c:9637
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2501,15 +2298,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:9747
+#: src/compose.c:9805
 msgid "Could not save draft."
 msgstr "Kunde inte spara utkast."
 
-#: src/compose.c:9751
+#: src/compose.c:9809
 msgid "Could not save draft"
 msgstr "Kunde inte spara utkast."
 
-#: src/compose.c:9752
+#: src/compose.c:9810
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2517,25 +2314,24 @@ msgstr ""
 "Kunde inte spara utkast.\n"
 "Vill du avbryta avsluta eller kasta denna e-post?"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Cancel exit"
 msgstr "_Avbryt avslutande"
 
-#: src/compose.c:9754
+#: src/compose.c:9812
 msgid "_Discard email"
 msgstr "_Överge e-post"
 
-#: src/compose.c:9914
-#: src/compose.c:9928
+#: src/compose.c:9972 src/compose.c:9986
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:9942
+#: src/compose.c:10000
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Filen '%s' kunde inte läsas."
 
-#: src/compose.c:9944
+#: src/compose.c:10002
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2544,76 +2340,86 @@ msgstr ""
 "Filen '%s' innehåller ogiltiga tecken\n"
 "för den aktuella teckenkodningen, inmatning kan bli fel."
 
-#: src/compose.c:10016
+#: src/compose.c:10081
 msgid "Discard message"
 msgstr "Överge meddelande"
 
-#: src/compose.c:10017
+#: src/compose.c:10082
 msgid "This message has been modified. Discard it?"
 msgstr "Detta meddelande har ändrats. Vill du överge det?"
 
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Discard"
 msgstr "_Överge"
 
-#: src/compose.c:10018
+#: src/compose.c:10083
 msgid "_Save to Drafts"
 msgstr "_Spara till Utkast"
 
-#: src/compose.c:10020
+#: src/compose.c:10085
 msgid "Save changes"
 msgstr "Spara ändringar"
 
-#: src/compose.c:10021
+#: src/compose.c:10086
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Detta meddelande har ändrats. Vill du spara de senaste ändringarna?"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "_Don't save"
 msgstr "_Spara inte"
 
-#: src/compose.c:10022
+#: src/compose.c:10087
 msgid "+_Save to Drafts"
 msgstr "+_Spara till Utkast"
 
-#: src/compose.c:10092
+#: src/compose.c:10157
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Vill du använda mallen '%s' ?"
 
-#: src/compose.c:10094
+#: src/compose.c:10159
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:10095
+#: src/compose.c:10160 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:772 src/prefs_template.c:309 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:10095
+#: src/compose.c:10160
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: src/compose.c:10959
+#: src/compose.c:11024
 msgid "Insert or attach?"
 msgstr "Infoga eller bifoga"
 
-#: src/compose.c:10960
-msgid "Do you want to insert the contents of the file(s) into the message body, or attach it to the email?"
-msgstr "Vill du infoga innehållet i filen(-erna) i meddelandetexten, eller bifoga det till meddelandet?"
+#: src/compose.c:11025
+msgid ""
+"Do you want to insert the contents of the file(s) into the message body, or "
+"attach it to the email?"
+msgstr ""
+"Vill du infoga innehållet i filen(-erna) i meddelandetexten, eller bifoga "
+"det till meddelandet?"
 
-#: src/compose.c:10962
+#: src/compose.c:11027
 msgid "_Attach"
 msgstr "Bifoga"
 
-#: src/compose.c:11178
+#: src/compose.c:11243
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Citatformatfel på rad %d."
 
-#: src/compose.c:11462
+#: src/compose.c:11527
 #, c-format
-msgid "You are about to reply to %d messages. Opening the windows could take some time. Do you want to continue?"
-msgstr "Du är på väg att svara på %d meddelanden. Att öppna fönstren kan ta lite tid. Vill du fortsätta?"
+msgid ""
+"You are about to reply to %d messages. Opening the windows could take some "
+"time. Do you want to continue?"
+msgstr ""
+"Du är på väg att svara på %d meddelanden. Att öppna fönstren kan ta lite "
+"tid. Vill du fortsätta?"
 
 #: src/crash.c:141
 #, c-format
@@ -2637,8 +2443,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Debug-logg"
 
-#: src/crash.c:252
-#: src/toolbar.c:420
+#: src/crash.c:252 src/toolbar.c:421
 msgid "Close"
 msgstr "Stäng"
 
@@ -2654,8 +2459,7 @@ msgstr "Skapa bugrapport"
 msgid "Save crash information"
 msgstr "Spara krash-information"
 
-#: src/editaddress.c:156
-#: src/editaddress.c:232
+#: src/editaddress.c:156 src/editaddress.c:232
 msgid "Add New Person"
 msgstr "Lägg till ny person"
 
@@ -2727,8 +2531,7 @@ msgstr "_Överge"
 msgid "Apply"
 msgstr "Applicera"
 
-#: src/editaddress.c:707
-#: src/editaddress.c:756
+#: src/editaddress.c:707 src/editaddress.c:756
 msgid "Edit Person Data"
 msgstr "Redigera persondata"
 
@@ -2757,53 +2560,41 @@ msgstr "Ta bort bild"
 msgid "Photo"
 msgstr "Foto"
 
-#: src/editaddress.c:959
-#: src/editaddress.c:961
-#: src/expldifdlg.c:516
-#: src/exporthtml.c:761
-#: src/ldif.c:766
+#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:516
+#: src/exporthtml.c:761 src/ldif.c:766
 msgid "Display Name"
 msgstr "Namn att visa"
 
-#: src/editaddress.c:968
-#: src/editaddress.c:972
-#: src/ldif.c:774
+#: src/editaddress.c:961 src/editaddress.c:965 src/ldif.c:774
 msgid "Last Name"
 msgstr "Efternamn"
 
-#: src/editaddress.c:969
-#: src/editaddress.c:971
-#: src/ldif.c:770
+#: src/editaddress.c:962 src/editaddress.c:964 src/ldif.c:770
 msgid "First Name"
 msgstr "Förnamn"
 
-#: src/editaddress.c:975
-#: src/editaddress.c:977
+#: src/editaddress.c:968 src/editaddress.c:970
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: src/editaddress.c:1061
-#: src/editaddress.c:1129
+#: src/editaddress.c:1054 src/editaddress.c:1122
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1271
-#: src/editaddress.c:1340
-#: src/editaddress.c:1360
+#: src/editaddress.c:1264 src/editaddress.c:1333 src/editaddress.c:1353
 #: src/prefs_customheader.c:223
 msgid "Value"
 msgstr "Värde"
 
-#: src/editaddress.c:1427
+#: src/editaddress.c:1424
 msgid "_User Data"
 msgstr "_Användardata"
 
-#: src/editaddress.c:1428
+#: src/editaddress.c:1425
 msgid "_Email Addresses"
 msgstr "E-postadresser"
 
-#: src/editaddress.c:1431
-#: src/editaddress.c:1434
+#: src/editaddress.c:1428 src/editaddress.c:1431
 msgid "O_ther Attributes"
 msgstr "A_ndra attribut"
 
@@ -2815,31 +2606,21 @@ msgstr "Fil verkar vara OK."
 msgid "File does not appear to be a valid address book format."
 msgstr "Filen verkar inte vara i ett giltigt adressboksformat"
 
-#: src/editbook.c:115
-#: src/editjpilot.c:191
-#: src/editvcard.c:98
+#: src/editbook.c:115 src/editjpilot.c:191 src/editvcard.c:98
 msgid "Could not read file."
 msgstr "Kunde inte läsa fil."
 
-#: src/editbook.c:149
-#: src/editbook.c:262
+#: src/editbook.c:149 src/editbook.c:262
 msgid "Edit Addressbook"
 msgstr "Redigera adressbok"
 
-#: src/editbook.c:177
-#: src/editjpilot.c:264
-#: src/editvcard.c:180
+#: src/editbook.c:177 src/editjpilot.c:264 src/editvcard.c:180
 msgid " Check File "
 msgstr " Undersök fil "
 
-#: src/editbook.c:182
-#: src/editjpilot.c:269
-#: src/editvcard.c:185
-#: src/importmutt.c:232
-#: src/importpine.c:231
-#: src/prefs_account.c:1942
-#: src/wizard.c:1371
-#: src/wizard.c:1650
+#: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1934
+#: src/wizard.c:1183 src/wizard.c:1457
 msgid "File"
 msgstr "Fil"
 
@@ -2855,8 +2636,7 @@ msgstr "Ett gruppnamn måste anges"
 msgid "Edit Group Data"
 msgstr "Redigera gruppdata"
 
-#: src/editgroup.c:323
-#: src/exporthtml.c:597
+#: src/editgroup.c:323 src/exporthtml.c:597
 msgid "Group Name"
 msgstr "Gruppnamn"
 
@@ -2888,20 +2668,13 @@ msgstr "Redigera mapp"
 msgid "Input the new name of folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
-#: src/editgroup.c:556
-#: src/foldersel.c:552
-#: src/imap_gtk.c:195
-#: src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:239
-#: src/plugins/rssyl/rssyl_cb_menu.c:89
+#: src/editgroup.c:556 src/foldersel.c:552 src/imap_gtk.c:195 src/mh_gtk.c:145
+#: src/plugins/mailmbox/plugin_gtk.c:239 src/plugins/rssyl/rssyl_cb_menu.c:89
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:557
-#: src/foldersel.c:553
-#: src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:240
-#: src/plugins/rssyl/rssyl_cb_menu.c:90
+#: src/editgroup.c:557 src/foldersel.c:553 src/mh_gtk.c:146
+#: src/plugins/mailmbox/plugin_gtk.c:240 src/plugins/rssyl/rssyl_cb_menu.c:90
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -2913,8 +2686,7 @@ msgstr "Filen verkar inte vara i JPilot-format"
 msgid "Select JPilot File"
 msgstr "Välj JPilotfil"
 
-#: src/editjpilot.c:236
-#: src/editjpilot.c:365
+#: src/editjpilot.c:236 src/editjpilot.c:365
 msgid "Edit JPilot Entry"
 msgstr "Redigera JPilotfält"
 
@@ -2930,20 +2702,16 @@ msgstr "Lägg till nytt JPilotfält"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Redigera LDAP - Välj sökbas"
 
-#: src/editldap_basedn.c:157
-#: src/editldap.c:441
+#: src/editldap_basedn.c:157 src/editldap.c:441
 msgid "Hostname"
 msgstr "Värdnamn"
 
-#: src/editldap_basedn.c:167
-#: src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:386
-#: src/ssl_manager.c:110
+#: src/editldap_basedn.c:167 src/editldap.c:458
+#: src/plugins/clamd/clamav_plugin_gtk.c:386 src/ssl_manager.c:110
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap_basedn.c:177
-#: src/editldap.c:504
+#: src/editldap_basedn.c:177 src/editldap.c:504
 msgid "Search Base"
 msgstr "Sök i databas"
 
@@ -2955,8 +2723,7 @@ msgstr "Tillgänglig(a) sökbas(er)"
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Kunde inte läsa sökbas(er) från server, vänligen ställ in manuellt"
 
-#: src/editldap_basedn.c:292
-#: src/editldap.c:281
+#: src/editldap_basedn.c:292 src/editldap.c:281
 msgid "Could not connect to server"
 msgstr "Kan inte ansluta till server"
 
@@ -2976,8 +2743,7 @@ msgstr "Minst ett attribut måste anges för LDAP sökning."
 msgid "Connected successfully to server"
 msgstr "Anslöt framgångsrikt till server"
 
-#: src/editldap.c:336
-#: src/editldap.c:980
+#: src/editldap.c:336 src/editldap.c:976
 msgid "Edit LDAP Server"
 msgstr "Redigera LDAP-server"
 
@@ -2986,25 +2752,44 @@ msgid "A name that you wish to call the server."
 msgstr "Ett namn som du vill ge servern."
 
 #: src/editldap.c:450
-msgid "This is the hostname of the server. For example, \"ldap.mydomain.com\" may be appropriate for the \"mydomain.com\" organization. An IP address may also be used. You may specify \"localhost\" if running an LDAP server on the same computer as Claws Mail."
-msgstr "Detta är värdnamnet på servern. Till exempel \"ldap.mydomain.comil\" kan vara passande för domänen \"mydomain.com\". Det går även att använda en IP-adress. Du kan ange \"localhost\" om LDAP-servern kör på samma dator som Claws-Mail."
+msgid ""
+"This is the hostname of the server. For example, \"ldap.mydomain.com\" may "
+"be appropriate for the \"mydomain.com\" organization. An IP address may also "
+"be used. You may specify \"localhost\" if running an LDAP server on the same "
+"computer as Claws Mail."
+msgstr ""
+"Detta är värdnamnet på servern. Till exempel \"ldap.mydomain.comil\" kan "
+"vara passande för domänen \"mydomain.com\". Det går även att använda en IP-"
+"adress. Du kan ange \"localhost\" om LDAP-servern kör på samma dator som "
+"Claws-Mail."
 
 #: src/editldap.c:470
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:471
-#: src/prefs_account.c:3318
+#: src/editldap.c:471 src/prefs_account.c:3310
 msgid "SSL"
 msgstr "SSL"
 
 #: src/editldap.c:475
-msgid "Enable secure connection to the LDAP server via TLS. If connection fails, be sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)."
-msgstr "Aktivera säker uppkoppling till LDAP-servern med TLS. Om uppkopplingen misslyckas, kontrollera att konfigurationen i ldap.conf är korrekt (fälten TLS_CACERTDIR and TLS_REQCERT)."
+msgid ""
+"Enable secure connection to the LDAP server via TLS. If connection fails, be "
+"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
+"TLS_REQCERT fields)."
+msgstr ""
+"Aktivera säker uppkoppling till LDAP-servern med TLS. Om uppkopplingen "
+"misslyckas, kontrollera att konfigurationen i ldap.conf är korrekt (fälten "
+"TLS_CACERTDIR and TLS_REQCERT)."
 
 #: src/editldap.c:479
-msgid "Enable secure connection to the LDAP server via SSL. If connection fails, be sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)."
-msgstr "Aktivera säker uppkoppling till LDAP-servern med SSL. Om uppkopplingen misslyckas, kontrollera att konfigurationen i ldap.conf är korrekt (fälten TLS_CACERTDIR and TLS_REQCERT)."
+msgid ""
+"Enable secure connection to the LDAP server via SSL. If connection fails, be "
+"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
+"TLS_REQCERT fields)."
+msgstr ""
+"Aktivera säker uppkoppling till LDAP-servern med SSL. Om uppkopplingen "
+"misslyckas, kontrollera att konfigurationen i ldap.conf är korrekt (fälten "
+"TLS_CACERTDIR and TLS_REQCERT)."
 
 #: src/editldap.c:493
 msgid "The port number that the server listens on. Port 389 is the default."
@@ -3020,50 +2805,85 @@ msgstr "Tryck på denna knappen för att testa anslutningen till servern."
 
 #: src/editldap.c:513
 msgid ""
-"This specifies the name of the directory to be searched on the server. Examples include:\n"
+"This specifies the name of the directory to be searched on the server. "
+"Examples include:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
-"Detta specificerar namnet på katalogen som ska genomsökas på servern. Exempelvis:\n"
+"Detta specificerar namnet på katalogen som ska genomsökas på servern. "
+"Exempelvis:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
 #: src/editldap.c:524
-msgid "Press this button to lookup the name of available directory names on the server."
-msgstr "Tryck på denna knappen för att slå upp tillgängliga kataloger på servern."
+msgid ""
+"Press this button to lookup the name of available directory names on the "
+"server."
+msgstr ""
+"Tryck på denna knappen för att slå upp tillgängliga kataloger på servern."
 
 #: src/editldap.c:580
 msgid "Search Attributes"
 msgstr "Sökattribut"
 
 #: src/editldap.c:589
-msgid "A list of LDAP attribute names that should be searched when attempting to find a name or address."
-msgstr "En lista över LDAP attributnamn som kommer att användas vid sökning efter namn eller adress."
+msgid ""
+"A list of LDAP attribute names that should be searched when attempting to "
+"find a name or address."
+msgstr ""
+"En lista över LDAP attributnamn som kommer att användas vid sökning efter "
+"namn eller adress."
 
 #: src/editldap.c:592
 msgid " Defaults "
 msgstr " Standardvärden "
 
 #: src/editldap.c:596
-msgid "This resets the attribute names to a default value that should find most names and addresses during a name or address search process."
-msgstr "Detta återställer alla attributnamn till standardvärden som bör hitta flest namn och adresser under en namn eller adress sökning."
+msgid ""
+"This resets the attribute names to a default value that should find most "
+"names and addresses during a name or address search process."
+msgstr ""
+"Detta återställer alla attributnamn till standardvärden som bör hitta flest "
+"namn och adresser under en namn eller adress sökning."
 
 #: src/editldap.c:602
 msgid "Max Query Age (secs)"
 msgstr "Maxålder på fråga (sekunder)"
 
 #: src/editldap.c:617
-msgid "This defines the maximum period of time (in seconds) that an address search result is valid for address completion purposes. Search results are stored in a cache until this period of time has passed and then retired. This will improve the response time when attempting to search for the same name or address on subsequent address completion requests. The cache will be searched in preference to performing a new server search request. The default value of 600 seconds (10 minutes), should be sufficient for most servers. A larger value will reduce the search time for subsequent searches. This is useful for servers that have slow response times at the expense of more memory to cache results."
-msgstr "Detta definierar den maximala tid (i sekunder) som en adresssöknings resultat är giltigt för adressifyllningssyften. Sökresultat sparas i en cache till den här tidsperioden tagit slut och tas sedan bort. Detta kommer förbättra svarstiden när man försöker söka efter samma namn eller adress under flera efterföljande adressifyllningsförfrågningar. Cachen kommer sökas före en ny sökning på servern genomförs. Standardvärdet på 600 sekunder (10 minuter), bör vara tillräckligt för de flesta servrar. Ett större värde kommer minska söktiden för efterföljande sökningar. Det kan vara användbart för servrar med långa svarstider, till kostnaden av större minnesåtgång för att cacha resultaten. "
+msgid ""
+"This defines the maximum period of time (in seconds) that an address search "
+"result is valid for address completion purposes. Search results are stored "
+"in a cache until this period of time has passed and then retired. This will "
+"improve the response time when attempting to search for the same name or "
+"address on subsequent address completion requests. The cache will be "
+"searched in preference to performing a new server search request. The "
+"default value of 600 seconds (10 minutes), should be sufficient for most "
+"servers. A larger value will reduce the search time for subsequent searches. "
+"This is useful for servers that have slow response times at the expense of "
+"more memory to cache results."
+msgstr ""
+"Detta definierar den maximala tid (i sekunder) som en adresssöknings "
+"resultat är giltigt för adressifyllningssyften. Sökresultat sparas i en "
+"cache till den här tidsperioden tagit slut och tas sedan bort. Detta kommer "
+"förbättra svarstiden när man försöker söka efter samma namn eller adress "
+"under flera efterföljande adressifyllningsförfrågningar. Cachen kommer sökas "
+"före en ny sökning på servern genomförs. Standardvärdet på 600 sekunder (10 "
+"minuter), bör vara tillräckligt för de flesta servrar. Ett större värde "
+"kommer minska söktiden för efterföljande sökningar. Det kan vara användbart "
+"för servrar med långa svarstider, till kostnaden av större minnesåtgång för "
+"att cacha resultaten. "
 
 #: src/editldap.c:634
 msgid "Include server in dynamic search"
 msgstr "Inkludera servern i dynamisk sökning"
 
 #: src/editldap.c:639
-msgid "Check this option to include this server for dynamic searches when using address completion."
+msgid ""
+"Check this option to include this server for dynamic searches when using "
+"address completion."
 msgstr "Inkludera denna server vid dynamisk sökning vid adress ifyllning."
 
 #: src/editldap.c:645
@@ -3071,7 +2891,12 @@ msgid "Match names 'containing' search term"
 msgstr "Matcha namn 'innehållande' sökterm"
 
 #: src/editldap.c:650
-msgid "Searches for names and addresses can be performed either using \"begins-with\" or \"contains\" search term. Check this option to perform a \"contains\" search; this type of search usually takes longer to complete. Note that for performance reasons, address completion uses \"begins-with\" for all searches against other address interfaces."
+msgid ""
+"Searches for names and addresses can be performed either using \"begins-with"
+"\" or \"contains\" search term. Check this option to perform a \"contains\" "
+"search; this type of search usually takes longer to complete. Note that for "
+"performance reasons, address completion uses \"begins-with\" for all "
+"searches against other address interfaces."
 msgstr "1"
 
 #: src/editldap.c:703
@@ -3079,53 +2904,58 @@ msgid "Bind DN"
 msgstr "Bind-DN"
 
 #: src/editldap.c:712
-msgid "The LDAP user account name to be used to connect to the server. This is usually only used for protected servers. This name is typically formatted as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when performing a search."
-msgstr "LDAP användarnamn att använda för att ansluta till servern. Detta används oftast bara för skyddade servrar. Detta namn är oftast formaterat som: \"cn=användare,dc=claws-mail,dc=org\". Det lämnas oftast tomt vid en sökning."
+msgid ""
+"The LDAP user account name to be used to connect to the server. This is "
+"usually only used for protected servers. This name is typically formatted "
+"as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when "
+"performing a search."
+msgstr ""
+"LDAP användarnamn att använda för att ansluta till servern. Detta används "
+"oftast bara för skyddade servrar. Detta namn är oftast formaterat som: "
+"\"cn=användare,dc=claws-mail,dc=org\". Det lämnas oftast tomt vid en sökning."
 
 #: src/editldap.c:719
 msgid "Bind Password"
 msgstr "Bindlösenord"
 
-#: src/editldap.c:733
+#: src/editldap.c:729
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "Lösenord som ska användas vid anslutning som \"Bind DN\" användaren."
 
-#: src/editldap.c:738
+#: src/editldap.c:734
 msgid "Timeout (secs)"
 msgstr "Väntetid (sek.)"
 
-#: src/editldap.c:752
+#: src/editldap.c:748
 msgid "The timeout period in seconds."
 msgstr "Tidsgräns i sekunder."
 
-#: src/editldap.c:756
+#: src/editldap.c:752
 msgid "Maximum Entries"
 msgstr "Max antal poster"
 
-#: src/editldap.c:770
-msgid "The maximum number of entries that should be returned in the search result."
+#: src/editldap.c:766
+msgid ""
+"The maximum number of entries that should be returned in the search result."
 msgstr "Maximalt antal poster som ska returneras i sökresultatet."
 
-#: src/editldap.c:785
-#: src/prefs_account.c:3209
+#: src/editldap.c:781 src/prefs_account.c:3201
 msgid "Basic"
 msgstr "Grundläggande"
 
-#: src/editldap.c:786
+#: src/editldap.c:782
 msgid "Search"
 msgstr "Sök"
 
-#: src/editldap.c:787
-#: src/gtk/quicksearch.c:661
+#: src/editldap.c:783 src/gtk/quicksearch.c:670
 msgid "Extended"
 msgstr "Utökat"
 
-#: src/editldap.c:985
+#: src/editldap.c:981
 msgid "Add New LDAP Server"
 msgstr "Lägg till ny LDAP-server"
 
-#: src/edittags.c:187
-#: src/prefs_filtering_action.c:1444
+#: src/edittags.c:187 src/prefs_filtering_action.c:1446
 msgid "Tag"
 msgstr "Etikett"
 
@@ -3145,24 +2975,25 @@ msgstr "Ta bort alla etiketter"
 msgid "Do you really want to delete all tags?"
 msgstr "Vill du verkligen ta bort alla etiketter?"
 
-#: src/edittags.c:422
+#: src/edittags.c:415
 msgid "You entered a reserved tag name, please choose another instead."
-msgstr "Du matade in ett reserverat taggnamn, vänligen välj ett annat istället."
+msgstr ""
+"Du matade in ett reserverat taggnamn, vänligen välj ett annat istället."
 
-#: src/edittags.c:464
+#: src/edittags.c:457
 msgid "Tag is not set."
 msgstr "Ingen etikett är angiven."
 
-#: src/edittags.c:529
+#: src/edittags.c:522
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "Lägg till etiketter"
 
-#: src/edittags.c:543
+#: src/edittags.c:536
 msgid "New tag:"
 msgstr "Ny etikett:"
 
-#: src/edittags.c:576
+#: src/edittags.c:569
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr "Välj etiketter att lägga till/ta bort. Ändringar görs direkt. "
 
@@ -3174,8 +3005,7 @@ msgstr "Filen verkar inte vara i giltigt vCard-format."
 msgid "Select vCard File"
 msgstr "Välj vCard-fil"
 
-#: src/editvcard.c:152
-#: src/editvcard.c:256
+#: src/editvcard.c:152 src/editvcard.c:256
 msgid "Edit vCard Entry"
 msgstr "Ändra vCard post"
 
@@ -3183,8 +3013,7 @@ msgstr "Ändra vCard post"
 msgid "Add New vCard Entry"
 msgstr "Lägg til nytt vCard post"
 
-#: src/etpan/imap-thread.c:585
-#: src/etpan/nntp-thread.c:439
+#: src/etpan/imap-thread.c:585 src/etpan/nntp-thread.c:439
 msgid "Impossible to set the client certificate.\n"
 msgstr "Omöjligt att sätta klient-ceritfikatet.\n"
 
@@ -3196,8 +3025,7 @@ msgstr "Ange målmapp och filnamn att skapa."
 msgid "Select stylesheet and formatting."
 msgstr "Välj formatmall och formatering."
 
-#: src/exphtmldlg.c:112
-#: src/expldifdlg.c:114
+#: src/exphtmldlg.c:112 src/expldifdlg.c:114
 msgid "File exported successfully."
 msgstr "Filen exporterades framgångsrik."
 
@@ -3210,8 +3038,7 @@ msgstr ""
 "Målmappen för HTML%s'\n"
 "finns inte. är det OK att skapa en ny mapp?"
 
-#: src/exphtmldlg.c:180
-#: src/expldifdlg.c:190
+#: src/exphtmldlg.c:180 src/expldifdlg.c:190
 msgid "Create Directory"
 msgstr "Skapa mapp"
 
@@ -3224,8 +3051,7 @@ msgstr ""
 "Kan inte skapa destinationsmapp för HTML-fil:\n"
 "%s"
 
-#: src/exphtmldlg.c:191
-#: src/expldifdlg.c:201
+#: src/exphtmldlg.c:191 src/expldifdlg.c:201
 msgid "Failed to Create Directory"
 msgstr "Kunde inte skapa mapp"
 
@@ -3241,10 +3067,7 @@ msgstr "Välj HTML målfil"
 msgid "HTML Output File"
 msgstr "HTML målFil"
 
-#: src/exphtmldlg.c:392
-#: src/expldifdlg.c:409
-#: src/export.c:171
-#: src/import.c:170
+#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:171 src/import.c:170
 #: src/importldif.c:684
 msgid "B_rowse"
 msgstr "B_läddra"
@@ -3253,29 +3076,19 @@ msgstr "B_läddra"
 msgid "Stylesheet"
 msgstr "Stilmall"
 
-#: src/exphtmldlg.c:453
-#: src/gtk/colorlabel.c:406
-#: src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231
-#: src/gtk/menu.c:133
-#: src/mainwindow.c:1175
-#: src/plugins/archive/archiver_prefs.c:241
-#: src/prefs_account.c:946
-#: src/prefs_toolbar.c:775
-#: src/prefs_toolbar.c:1456
-#: src/summaryview.c:6010
+#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1173
+#: src/plugins/archive/archiver_prefs.c:241 src/prefs_account.c:946
+#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1465 src/summaryview.c:6006
 msgid "None"
 msgstr "Ingen"
 
-#: src/exphtmldlg.c:454
-#: src/prefs_folder_item.c:514
-#: src/prefs_other.c:116
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:514 src/prefs_other.c:116
 #: src/prefs_other.c:408
 msgid "Default"
 msgstr "Standard"
 
-#: src/exphtmldlg.c:455
-#: src/plugins/pgpcore/select-keys.c:248
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
 #: src/plugins/pgpcore/sgpgme.c:148
 msgid "Full"
 msgstr "Fullst. namn"
@@ -3320,15 +3133,11 @@ msgstr "Formatera e-postlänkar"
 msgid "Format User Attributes"
 msgstr "Användarattribut"
 
-#: src/exphtmldlg.c:539
-#: src/expldifdlg.c:612
-#: src/importldif.c:891
+#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:891
 msgid "Address Book :"
 msgstr "Adressbok :"
 
-#: src/exphtmldlg.c:549
-#: src/expldifdlg.c:622
-#: src/importldif.c:901
+#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:901
 msgid "File Name :"
 msgstr "Filnamn  :"
 
@@ -3340,9 +3149,7 @@ msgstr "Öppna med Webbläsare"
 msgid "Export Address Book to HTML File"
 msgstr "Exportera adressbok till HTML-fil"
 
-#: src/exphtmldlg.c:656
-#: src/expldifdlg.c:720
-#: src/importldif.c:1020
+#: src/exphtmldlg.c:656 src/expldifdlg.c:720 src/importldif.c:1020
 msgid "File Info"
 msgstr "Filinformation"
 
@@ -3381,8 +3188,12 @@ msgid "Suffix was not supplied"
 msgstr "Inget suffix angivet"
 
 #: src/expldifdlg.c:243
-msgid "A suffix is required if data is to be used for an LDAP server. Are you sure you wish to proceed without a suffix?"
-msgstr "Ett suffix behövs om data ska användas till en LDAP-server. Är du säker på att du vill fortsätta utan ett suffix?"
+msgid ""
+"A suffix is required if data is to be used for an LDAP server. Are you sure "
+"you wish to proceed without a suffix?"
+msgstr ""
+"Ett suffix behövs om data ska användas till en LDAP-server. Är du säker på "
+"att du vill fortsätta utan ett suffix?"
 
 #: src/expldifdlg.c:261
 msgid "Error creating LDIF file"
@@ -3398,26 +3209,32 @@ msgstr "LDIF målfil"
 
 #: src/expldifdlg.c:431
 msgid ""
-"The address book Unique ID is used to create a DN that is formatted similar to:\n"
+"The address book Unique ID is used to create a DN that is formatted similar "
+"to:\n"
 "  uid=102376,ou=people,dc=claws-mail,dc=org"
 msgstr ""
-"Adressbokens Unique ID används för att skapa ett DN som är formatterat liknande:\n"
+"Adressbokens Unique ID används för att skapa ett DN som är formatterat "
+"liknande:\n"
 "  uid=102376,ou=people,dc=claws-mail,dc=org"
 
 #: src/expldifdlg.c:437
 msgid ""
-"The address book Display Name is used to create a DN that is formatted similar to:\n"
+"The address book Display Name is used to create a DN that is formatted "
+"similar to:\n"
 "  cn=John Doe,ou=people,dc=claws-mail,dc=org"
 msgstr ""
-"Adressbokens Display Name används för att skapa ett DN som är formatterat liknande:\n"
+"Adressbokens Display Name används för att skapa ett DN som är formatterat "
+"liknande:\n"
 "  cn=John Doe,ou=people,dc=claws-mail,dc=org"
 
 #: src/expldifdlg.c:443
 msgid ""
-"The first Email Address belonging to a person is used to create a DN that is formatted similar to:\n"
+"The first Email Address belonging to a person is used to create a DN that is "
+"formatted similar to:\n"
 "  mail=john.doe at domain.com,ou=people,dc=claws-mail,dc=org"
 msgstr ""
-"Den första e-postadressen tillhörande en person används för att skapa ett DN som är formaterat liknande:\n"
+"Den första e-postadressen tillhörande en person används för att skapa ett DN "
+"som är formaterat liknande:\n"
 "  mail=john.doe at domain.com,ou=people,dc=claws-mail,dc=org"
 
 #: src/expldifdlg.c:489
@@ -3426,12 +3243,14 @@ msgstr "Suffix"
 
 #: src/expldifdlg.c:499
 msgid ""
-"The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP entry. Examples include:\n"
+"The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
+"entry. Examples include:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
-"Detta suffix används för att skapa \"Distinguished Name\" (eller DN) för en LDAP-post. Exempelvis:\n"
+"Detta suffix används för att skapa \"Distinguished Name\" (eller DN) för en "
+"LDAP-post. Exempelvis:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
@@ -3445,24 +3264,46 @@ msgid "Unique ID"
 msgstr "Unikt ID"
 
 #: src/expldifdlg.c:523
-msgid "The LDIF file contains several data records that are usually loaded into an LDAP server. Each data record in the LDIF file is uniquely identified by a \"Distinguished Name\" (or DN). The suffix is appended to the \"Relative Distinguished Name\" (or RDN) to create the DN. Please select one of the available RDN options that will be used to create the DN."
-msgstr "En LDIF-fil innehåller flera dataposter som vanligtvis laddas in i en LDAP-server. Varje datapost i LDIF-filen identifieras unikt av ett \"Distinguished Name\" (eller DN). Suffixet läggs till slutet av  \"Relative Distinguished Name\" (eller RDN) för att skapa DN. Välj något av de tillgängliga RDN-alternativen som kommer att användas för att skapa DN."
+msgid ""
+"The LDIF file contains several data records that are usually loaded into an "
+"LDAP server. Each data record in the LDIF file is uniquely identified by a "
+"\"Distinguished Name\" (or DN). The suffix is appended to the \"Relative "
+"Distinguished Name\" (or RDN) to create the DN. Please select one of the "
+"available RDN options that will be used to create the DN."
+msgstr ""
+"En LDIF-fil innehåller flera dataposter som vanligtvis laddas in i en LDAP-"
+"server. Varje datapost i LDIF-filen identifieras unikt av ett "
+"\"Distinguished Name\" (eller DN). Suffixet läggs till slutet av  \"Relative "
+"Distinguished Name\" (eller RDN) för att skapa DN. Välj något av de "
+"tillgängliga RDN-alternativen som kommer att användas för att skapa DN."
 
 #: src/expldifdlg.c:543
 msgid "Use DN attribute if present in data"
 msgstr "Använd DN attribut om det finns i data"
 
 #: src/expldifdlg.c:548
-msgid "The addressbook may contain entries that were previously imported from an LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the address book data, may be used in the exported LDIF file. The RDN selected above will be used if the DN user attribute is not found."
-msgstr "Adressboken kan innehålla poster som tidigare importerats från en LDIF-fil. \"Distinguished Name\" (DN) användarattributet, om närvarande i adressboken, kan användas i den exporterade LDIF-filen. RDN valt ovan kommer användas om inte anändarattributet DN hittas."
+msgid ""
+"The addressbook may contain entries that were previously imported from an "
+"LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
+"address book data, may be used in the exported LDIF file. The RDN selected "
+"above will be used if the DN user attribute is not found."
+msgstr ""
+"Adressboken kan innehålla poster som tidigare importerats från en LDIF-fil. "
+"\"Distinguished Name\" (DN) användarattributet, om närvarande i adressboken, "
+"kan användas i den exporterade LDIF-filen. RDN valt ovan kommer användas om "
+"inte anändarattributet DN hittas."
 
 #: src/expldifdlg.c:558
 msgid "Exclude record if no Email Address"
 msgstr "Exkludera e-post om det inte finns någon e-postadress"
 
 #: src/expldifdlg.c:563
-msgid "An addressbook may contain entries without Email Addresses. Check this option to ignore these records."
-msgstr "En adressbok kan innehålla objekt utan e-postadresser. Bocka för här för att ignorera dessa objekt."
+msgid ""
+"An addressbook may contain entries without Email Addresses. Check this "
+"option to ignore these records."
+msgstr ""
+"En adressbok kan innehålla objekt utan e-postadresser. Bocka för här för att "
+"ignorera dessa objekt."
 
 #: src/expldifdlg.c:655
 msgid "Export Address Book to LDIF File"
@@ -3472,8 +3313,7 @@ msgstr "Exportera adressbok till LDIF-fil"
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:113
-#: src/summaryview.c:8154
+#: src/export.c:113 src/summaryview.c:8143
 msgid "Export to mbox file"
 msgstr "Exportera till mbox-fil"
 
@@ -3485,8 +3325,7 @@ msgstr "Välj mappen som ska exportera och specificera mbox-fil."
 msgid "Source folder:"
 msgstr "Ursprungsmapp:"
 
-#: src/export.c:148
-#: src/import.c:142
+#: src/export.c:148 src/import.c:142
 msgid "Mbox file:"
 msgstr "Mbox-fil:"
 
@@ -3510,8 +3349,7 @@ msgstr "Välj exportfil"
 msgid "Full Name"
 msgstr "Fullst. namn"
 
-#: src/exporthtml.c:771
-#: src/importldif.c:1021
+#: src/exporthtml.c:771 src/importldif.c:1021
 #: src/plugins/archive/archiver_gtk.c:736
 msgid "Attributes"
 msgstr "Användarattribut"
@@ -3520,81 +3358,86 @@ msgstr "Användarattribut"
 msgid "Claws Mail Address Book"
 msgstr "Claws-Mail adressbok"
 
-#: src/exporthtml.c:1088
-#: src/exportldif.c:623
+#: src/exporthtml.c:1088 src/exportldif.c:623
 msgid "Name already exists but is not a directory."
 msgstr "Namnet finns redan men det är inte en mapp."
 
-#: src/exporthtml.c:1091
-#: src/exportldif.c:626
+#: src/exporthtml.c:1091 src/exportldif.c:626
 msgid "No permissions to create directory."
 msgstr "Inga rättigheter att skapa mapp."
 
-#: src/exporthtml.c:1094
-#: src/exportldif.c:629
+#: src/exporthtml.c:1094 src/exportldif.c:629
 msgid "Name is too long."
 msgstr "Namnet är för långt."
 
-#: src/exporthtml.c:1097
-#: src/exportldif.c:632
+#: src/exporthtml.c:1097 src/exportldif.c:632
 msgid "Not specified."
 msgstr "Ej specificerad."
 
-#: src/folder.c:1571
-#: src/foldersel.c:374
-#: src/prefs_folder_item.c:308
+#: src/file_checker.c:76
+#, c-format
+msgid "The file %s is missing! Do you want to use the backup file from %s?"
+msgstr "Filen %s saknas! Vill använda säkerhetskopian från %s?"
+
+#: src/file_checker.c:84 src/file_checker.c:106
+#, c-format
+msgid "Could not copy %s to %s"
+msgstr "Kunde inte kopiera %s till %s"
+
+#: src/file_checker.c:98
+#, c-format
+msgid ""
+"The file %s is empty or corrupted! Do you want to use the backup file from "
+"%s?"
+msgstr ""
+"Filen %s är tom eller Felaktig! Vill du använda säkerhetskopian från %s?"
+
+#: src/folder.c:1577 src/foldersel.c:374 src/prefs_folder_item.c:308
 msgid "Inbox"
 msgstr "Inkorgen"
 
-#: src/folder.c:1575
-#: src/foldersel.c:378
+#: src/folder.c:1581 src/foldersel.c:378
 msgid "Sent"
 msgstr "Skickat"
 
-#: src/folder.c:1579
-#: src/foldersel.c:382
-#: src/plugins/attachwarner/attachwarner.c:219
-#: src/prefs_folder_item.c:311
+#: src/folder.c:1585 src/foldersel.c:382
+#: src/plugins/attachwarner/attachwarner.c:219 src/prefs_folder_item.c:311
 msgid "Queue"
 msgstr "Kö"
 
-#: src/folder.c:1583
-#: src/foldersel.c:386
-#: src/prefs_folder_item.c:312
+#: src/folder.c:1589 src/foldersel.c:386 src/prefs_folder_item.c:312
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/folder.c:1587
-#: src/foldersel.c:390
-#: src/prefs_folder_item.c:310
+#: src/folder.c:1593 src/foldersel.c:390 src/prefs_folder_item.c:310
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/folder.c:2017
+#: src/folder.c:2023
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Behandlar (%s)...\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopierar %s till %s...\n"
 
-#: src/folder.c:3261
+#: src/folder.c:3267
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Flyttar meddelande %s till %s...\n"
 
-#: src/folder.c:3563
+#: src/folder.c:3569
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Uppdaterar cache %s...."
 
-#: src/folder.c:4435
+#: src/folder.c:4443
 msgid "Processing messages..."
 msgstr "Behandlar meddelanden..."
 
-#: src/folder.c:4571
+#: src/folder.c:4579
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synkroniserar %s för frånkopplad användning...\n"
@@ -3603,51 +3446,32 @@ msgstr "Synkroniserar %s för frånkopplad användning...\n"
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: src/foldersel.c:554
-#: src/imap_gtk.c:199
-#: src/mh_gtk.c:147
-#: src/plugins/mailmbox/plugin_gtk.c:241
-#: src/plugins/rssyl/rssyl_cb_menu.c:91
+#: src/foldersel.c:554 src/imap_gtk.c:199 src/mh_gtk.c:147
+#: src/plugins/mailmbox/plugin_gtk.c:241 src/plugins/rssyl/rssyl_cb_menu.c:91
 msgid "NewFolder"
 msgstr "Nymapp"
 
-#: src/foldersel.c:562
-#: src/imap_gtk.c:210
-#: src/imap_gtk.c:216
-#: src/imap_gtk.c:272
-#: src/imap_gtk.c:277
-#: src/mh_gtk.c:155
-#: src/mh_gtk.c:259
-#: src/news_gtk.c:314
-#: src/plugins/mailmbox/plugin_gtk.c:249
-#: src/plugins/mailmbox/plugin_gtk.c:419
-#: src/plugins/rssyl/rssyl_cb_menu.c:97
+#: src/foldersel.c:562 src/imap_gtk.c:210 src/imap_gtk.c:216
+#: src/imap_gtk.c:272 src/imap_gtk.c:277 src/mh_gtk.c:155 src/mh_gtk.c:259
+#: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:249
+#: src/plugins/mailmbox/plugin_gtk.c:416 src/plugins/rssyl/rssyl_cb_menu.c:97
 #: src/plugins/rssyl/rssyl_cb_menu.c:341
-#: src/plugins/vcalendar/vcal_folder.c:2028
+#: src/plugins/vcalendar/vcal_folder.c:2026
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "Ett mappnamn kan inte innehålla '%c'."
 
-#: src/foldersel.c:572
-#: src/imap_gtk.c:226
-#: src/imap_gtk.c:284
-#: src/mh_gtk.c:165
-#: src/mh_gtk.c:266
-#: src/news_gtk.c:321
-#: src/plugins/mailmbox/plugin_gtk.c:261
-#: src/plugins/mailmbox/plugin_gtk.c:428
-#: src/plugins/rssyl/rssyl_cb_menu.c:107
+#: src/foldersel.c:572 src/imap_gtk.c:226 src/imap_gtk.c:284 src/mh_gtk.c:165
+#: src/mh_gtk.c:266 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:261
+#: src/plugins/mailmbox/plugin_gtk.c:425 src/plugins/rssyl/rssyl_cb_menu.c:107
 #: src/plugins/rssyl/rssyl_cb_menu.c:348
-#: src/plugins/vcalendar/vcal_folder.c:2035
+#: src/plugins/vcalendar/vcal_folder.c:2033
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Mappen '%s' finns redan."
 
-#: src/foldersel.c:579
-#: src/imap_gtk.c:232
-#: src/mh_gtk.c:171
-#: src/plugins/mailmbox/plugin_gtk.c:268
-#: src/plugins/rssyl/rssyl_cb_menu.c:113
+#: src/foldersel.c:579 src/imap_gtk.c:232 src/mh_gtk.c:171
+#: src/plugins/mailmbox/plugin_gtk.c:268 src/plugins/rssyl/rssyl_cb_menu.c:113
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Kan inte skapa mappen '%s'."
@@ -3660,8 +3484,7 @@ msgstr "_Markera alla som lästa"
 msgid "R_un processing rules"
 msgstr "Kör behandlingsregler"
 
-#: src/folderview.c:233
-#: src/mainwindow.c:544
+#: src/folderview.c:233 src/mainwindow.c:544
 msgid "_Search folder..."
 msgstr "_Sök i mapp..."
 
@@ -3677,157 +3500,130 @@ msgstr "T_öm papperskorg..."
 msgid "Send _queue..."
 msgstr "Skicka köade..."
 
-#: src/folderview.c:380
-#: src/folderview.c:427
+#: src/folderview.c:380 src/folderview.c:427
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79
-#: src/prefs_matcher.c:388
-#: src/summaryview.c:6286
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:388 src/summaryview.c:6282
 msgid "New"
 msgstr "Ny(a)"
 
-#: src/folderview.c:381
-#: src/folderview.c:428
+#: src/folderview.c:381 src/folderview.c:428
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80
-#: src/prefs_matcher.c:387
-#: src/summaryview.c:6288
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:387 src/summaryview.c:6284
 msgid "Unread"
 msgstr "Oläst(a)"
 
-#: src/folderview.c:382
-#: src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:382 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:81
 msgid "Total"
 msgstr "Totalt"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:430
-#: src/summaryview.c:448
+#: src/folderview.c:430 src/summaryview.c:448
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:734
+#: src/folderview.c:727
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:797
-#: src/summaryview.c:4113
-#: src/summaryview.c:4115
+#: src/folderview.c:790 src/summaryview.c:4109 src/summaryview.c:4111
 msgid "Mark all as read"
 msgstr "Markera alla som lästa"
 
-#: src/folderview.c:798
-#: src/summaryview.c:4114
+#: src/folderview.c:791 src/summaryview.c:4110
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Vill du verkligen markera alla meddelanden i denna mapp som lästa?"
 
-#: src/folderview.c:1021
-#: src/imap.c:4490
-#: src/mainwindow.c:5308
-#: src/setup.c:91
+#: src/folderview.c:1014 src/imap.c:4497 src/mainwindow.c:5128 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Avsöker mapp %s%c%s..."
 
-#: src/folderview.c:1025
-#: src/imap.c:4495
-#: src/mainwindow.c:5313
-#: src/setup.c:96
+#: src/folderview.c:1018 src/imap.c:4502 src/mainwindow.c:5133 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Avsöker mapp %s...."
 
-#: src/folderview.c:1056
+#: src/folderview.c:1049
 msgid "Rebuild folder tree"
 msgstr "Uppdatera mapplista"
 
-#: src/folderview.c:1057
-msgid "Rebuilding the folder tree will remove local caches. Do you want to continue?"
-msgstr "Den lokala bufferten kommer att tas bort om du uppdaterar mapplistan. Vill du fortsätta?"
+#: src/folderview.c:1050
+msgid ""
+"Rebuilding the folder tree will remove local caches. Do you want to continue?"
+msgstr ""
+"Den lokala bufferten kommer att tas bort om du uppdaterar mapplistan. Vill "
+"du fortsätta?"
 
-#: src/folderview.c:1067
+#: src/folderview.c:1060
 msgid "Rebuilding folder tree..."
 msgstr "Uppdaterar mapplistan..."
 
-#: src/folderview.c:1069
-#: src/folderview.c:1110
+#: src/folderview.c:1062 src/folderview.c:1103
 msgid "Scanning folder tree..."
 msgstr "Söker igenom mapplistan..."
 
-#: src/folderview.c:1201
+#: src/folderview.c:1194
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Kunde inte genomsöka mapp %s\n"
 
-#: src/folderview.c:1255
+#: src/folderview.c:1248
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelande i alla mappar..."
 
-#: src/folderview.c:2083
+#: src/folderview.c:2076
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Stänger mapp %s..."
 
-#: src/folderview.c:2178
+#: src/folderview.c:2171
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Öppnar mapp %s..."
 
-#: src/folderview.c:2196
+#: src/folderview.c:2189
 msgid "Folder could not be opened."
 msgstr "Mappen kunde inte öppnas."
 
-#: src/folderview.c:2337
-#: src/mainwindow.c:3059
-#: src/mainwindow.c:3063
+#: src/folderview.c:2330 src/mainwindow.c:2877 src/mainwindow.c:2881
 msgid "Empty trash"
 msgstr "Töm papperskorg"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2331
 msgid "Delete all messages in trash?"
 msgstr "Ta bort alla meddelande från papperskorgen?"
 
-#: src/folderview.c:2339
+#: src/folderview.c:2332
 msgid "+_Empty trash"
 msgstr "+_Töm papperskorg"
 
-#: src/folderview.c:2383
-#: src/inc.c:1620
-#: src/toolbar.c:2689
+#: src/folderview.c:2376 src/inc.c:1528 src/toolbar.c:2678
 msgid "Offline warning"
 msgstr "Varning om frånkopplat läge"
 
-#: src/folderview.c:2384
-#: src/toolbar.c:2690
+#: src/folderview.c:2377 src/toolbar.c:2679
 msgid "You're working offline. Override?"
 msgstr "Du arbetar frånkopplad. Åsidosätta?"
 
-#: src/folderview.c:2395
-#: src/toolbar.c:2709
+#: src/folderview.c:2388 src/toolbar.c:2698
 msgid "Send queued messages"
 msgstr "Skicka köade meddelanden"
 
-#: src/folderview.c:2396
-#: src/toolbar.c:2710
+#: src/folderview.c:2389 src/toolbar.c:2699
 msgid "Send all queued messages?"
 msgstr "Skicka alla köade meddelanden?"
 
-#: src/folderview.c:2397
-#: src/messageview.c:875
-#: src/messageview.c:892
-#: src/toolbar.c:2711
+#: src/folderview.c:2390 src/messageview.c:853 src/messageview.c:870
+#: src/toolbar.c:2700
 msgid "_Send"
 msgstr "_Skicka"
 
-#: src/folderview.c:2405
-#: src/toolbar.c:2729
+#: src/folderview.c:2398 src/toolbar.c:2718
 msgid "Some errors occurred while sending queued messages."
 msgstr "Några fel uppstod vid avsändande av meddelanden i kö."
 
-#: src/folderview.c:2408
-#: src/main.c:2862
-#: src/toolbar.c:2732
+#: src/folderview.c:2401 src/main.c:2689 src/toolbar.c:2721
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3836,66 +3632,64 @@ msgstr ""
 "Några fel uppstod vid skickande av köade meddelanden:\n"
 "%s"
 
-#: src/folderview.c:2485
+#: src/folderview.c:2478
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Vill du verkligen kopiera mappen '%s' i '%s'?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2479
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Vill du verkligen göra mappen '%s' till en undermapp till '%s' ?"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Copy folder"
 msgstr "Kopiera mapp"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2481
 msgid "Move folder"
 msgstr "Flytta mapp"
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopiera %s till %s..."
 
-#: src/folderview.c:2499
+#: src/folderview.c:2492
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Flyttar %s till %s..."
 
-#: src/folderview.c:2530
+#: src/folderview.c:2523
 msgid "Source and destination are the same."
 msgstr "Källa och destination är de samma."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2526
 msgid "Can't copy a folder to one of its children."
 msgstr "Kan inte kopiera en mapp till ett av dess barn."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2527
 msgid "Can't move a folder to one of its children."
 msgstr "Kan inte flytta en mapp till ett av dess barn."
 
-#: src/folderview.c:2537
+#: src/folderview.c:2530
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "En mapp kan inte flyttas mellan olika brevlådor."
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Copy failed!"
 msgstr "Kopiering misslyckades!"
 
-#: src/folderview.c:2540
+#: src/folderview.c:2533
 msgid "Move failed!"
 msgstr "Flytt misslyckades!"
 
-#: src/folderview.c:2591
+#: src/folderview.c:2584
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Behandlar konfiguration för mappen %s"
 
-#: src/folderview.c:3018
-#: src/summaryview.c:4554
-#: src/summaryview.c:4653
+#: src/folderview.c:3011 src/summaryview.c:4550 src/summaryview.c:4649
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Destinationsmappen kan bara användas till att spara undermappar."
 
@@ -3935,8 +3729,7 @@ msgstr "modererad"
 msgid "readonly"
 msgstr "skrivskyddad"
 
-#: src/grouplistdialog.c:351
-#: src/plugins/att_remover/att_remover.c:297
+#: src/grouplistdialog.c:351 src/plugins/att_remover/att_remover.c:297
 #: src/plugins/vcalendar/vcal_manager.c:113
 #: src/plugins/vcalendar/vcal_manager.c:146
 msgid "unknown"
@@ -3946,8 +3739,7 @@ msgstr "okänd"
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan ej hämta diskussionsgrupplista."
 
-#: src/grouplistdialog.c:459
-#: src/summaryview.c:1579
+#: src/grouplistdialog.c:459 src/summaryview.c:1579
 msgid "Done."
 msgstr "Färdig."
 
@@ -3974,17 +3766,20 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"För support och diskussioner, prenumerera på Claws Mail's sändlista för användare:\n"
+"För support och diskussioner, prenumerera på Claws Mail's sändlista för "
+"användare:\n"
 
 #: src/gtk/about.c:143
 msgid ""
 "\n"
 "\n"
-"Claws Mail is free software released under the GPL. If you wish to donate to the Claws Mail project you can do so at:\n"
+"Claws Mail is free software released under the GPL. If you wish to donate to "
+"the Claws Mail project you can do so at:\n"
 msgstr ""
 "\n"
 "\n"
-"Claws Mail är fri programvara släppt under GPL-licensen. Om du vill donera till Claws Mail-projektet kan du göra det på:\n"
+"Claws Mail är fri programvara släppt under GPL-licensen. Om du vill donera "
+"till Claws Mail-projektet kan du göra det på:\n"
 
 #: src/gtk/about.c:159
 msgid ""
@@ -4043,9 +3838,7 @@ msgstr ""
 "Lokal: %s (teckenkodning: %s)\n"
 "Operativsystem: okänt"
 
-#: src/gtk/about.c:243
-#: src/prefs_themes.c:728
-#: src/wizard.c:545
+#: src/gtk/about.c:243 src/prefs_themes.c:728 src/wizard.c:523
 msgid "The Claws Mail Team"
 msgstr "Claws Mail-laget"
 
@@ -4095,7 +3888,9 @@ msgstr "tillhandahåller stöd för krypterade uppkopplingar mot servrar\n"
 #: src/gtk/about.c:451
 msgctxt "IPv6"
 msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
-msgstr "tillhandahåller stöd för IPv6-adresser, det nya Internetadresseringsprotokollet\n"
+msgstr ""
+"tillhandahåller stöd för IPv6-adresser, det nya "
+"Internetadresseringsprotokollet\n"
 
 #: src/gtk/about.c:462
 msgctxt "iconv"
@@ -4125,27 +3920,44 @@ msgstr "tillhandahåller stöd för sessionshantering\n"
 #: src/gtk/about.c:512
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
-msgstr "tillhandahåller stöd för att upptäcka förändringar av nätverksuppkopplingen\n"
+msgstr ""
+"tillhandahåller stöd för att upptäcka förändringar av nätverksuppkopplingen\n"
 
 #: src/gtk/about.c:544
 msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 3, or (at your option) any later "
+"version.\n"
 "\n"
 msgstr ""
-"Detta program är fri mjukvara; du kan redistribuera det och/eller modifiera det enligt villkoren i GNU General Public License som publicerad av the Free Software Foundation; enligt version 3, eller (efter ditt eget val) någon senare version.\n"
+"Detta program är fri mjukvara; du kan redistribuera det och/eller modifiera "
+"det enligt villkoren i GNU General Public License som publicerad av the Free "
+"Software Foundation; enligt version 3, eller (efter ditt eget val) någon "
+"senare version.\n"
 "\n"
 
 #: src/gtk/about.c:550
 msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
 msgstr ""
-"Detta program distribueras med förhoppningen att det kommer att vara andvändbart, men UTAN NÅGON SOM HELST GARANTI; utan ens den implicita garantin av SÄLJBARHET eller ÄNDAMÅLSENLIGHET FÖR NÅGOT SÄRSKILT SYFTE. Se GNU General Public License för fler detaljer.\n"
+"Detta program distribueras med förhoppningen att det kommer att vara "
+"andvändbart, men UTAN NÅGON SOM HELST GARANTI; utan ens den implicita "
+"garantin av SÄLJBARHET eller ÄNDAMÅLSENLIGHET FÖR NÅGOT SÄRSKILT SYFTE. Se "
+"GNU General Public License för fler detaljer.\n"
 "\n"
 
 #: src/gtk/about.c:568
-msgid "You should have received a copy of the GNU General Public License along with this program. If not, see <"
-msgstr "Du bör ha fått en kopia av GNU General Public License tillsammans med detta program; om inte, se <"
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <"
+msgstr ""
+"Du bör ha fått en kopia av GNU General Public License tillsammans med detta "
+"program; om inte, se <"
 
 #: src/gtk/about.c:573
 msgid ""
@@ -4155,55 +3967,44 @@ msgstr ""
 ">. \n"
 "\n"
 
-#: src/gtk/about.c:699
-#: src/main.c:2689
+#: src/gtk/about.c:699 src/main.c:2516
 msgid "Session statistics\n"
 msgstr "Sessionsstatistik\n"
 
-#: src/gtk/about.c:709
-#: src/gtk/about.c:712
-#: src/main.c:2699
-#: src/main.c:2702
+#: src/gtk/about.c:709 src/gtk/about.c:712 src/main.c:2526 src/main.c:2529
 #, c-format
 msgid "Started: %s\n"
 msgstr "Startat: %s\n"
 
-#: src/gtk/about.c:719
-#: src/main.c:2708
+#: src/gtk/about.c:719 src/main.c:2535
 msgid "Incoming traffic\n"
 msgstr "Inkommande trafik\n"
 
-#: src/gtk/about.c:722
-#: src/main.c:2711
+#: src/gtk/about.c:722 src/main.c:2538
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Mottagna meddelanden: %d\n"
 
-#: src/gtk/about.c:729
-#: src/main.c:2717
+#: src/gtk/about.c:729 src/main.c:2544
 msgid "Outgoing traffic\n"
 msgstr "Utgående trafik\n"
 
-#: src/gtk/about.c:732
-#: src/main.c:2720
+#: src/gtk/about.c:732 src/main.c:2547
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nya/Omdirigerade meddelanden: %d\n"
 
-#: src/gtk/about.c:737
-#: src/main.c:2724
+#: src/gtk/about.c:737 src/main.c:2551
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Besvarade meddelanden: %d\n"
 
-#: src/gtk/about.c:742
-#: src/main.c:2728
+#: src/gtk/about.c:742 src/main.c:2555
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Vidarebefordrade meddelanden: %d\n"
 
-#: src/gtk/about.c:747
-#: src/main.c:2732
+#: src/gtk/about.c:747 src/main.c:2559
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Totalt utgående meddelanden: %d\n"
@@ -4246,78 +4047,63 @@ msgstr "Ve_rsionsinformation"
 msgid "_Statistics"
 msgstr "_Statistik"
 
-#: src/gtk/colorlabel.c:38
-#: src/prefs_common.c:368
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:358
 msgid "Orange"
 msgstr "Orange"
 
-#: src/gtk/colorlabel.c:39
-#: src/prefs_common.c:372
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:362
 msgid "Red"
 msgstr "Röd"
 
-#: src/gtk/colorlabel.c:40
-#: src/prefs_common.c:376
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:366
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/gtk/colorlabel.c:41
-#: src/prefs_common.c:380
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:370
 msgid "Sky blue"
 msgstr "Himmelsblå"
 
-#: src/gtk/colorlabel.c:42
-#: src/prefs_common.c:384
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:374
 msgid "Blue"
 msgstr "Blå"
 
-#: src/gtk/colorlabel.c:43
-#: src/prefs_common.c:388
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:378
 msgid "Green"
 msgstr "Grön"
 
-#: src/gtk/colorlabel.c:44
-#: src/prefs_common.c:392
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:382
 msgid "Brown"
 msgstr "Brun"
 
-#: src/gtk/colorlabel.c:45
-#: src/prefs_common.c:396
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:386
 msgid "Grey"
 msgstr "Grå"
 
-#: src/gtk/colorlabel.c:46
-#: src/prefs_common.c:400
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:390
 msgid "Light brown"
 msgstr "Ljusbrun"
 
-#: src/gtk/colorlabel.c:47
-#: src/prefs_common.c:404
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:394
 msgid "Dark red"
 msgstr "Mörkröd"
 
-#: src/gtk/colorlabel.c:48
-#: src/prefs_common.c:408
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:398
 msgid "Dark pink"
 msgstr "Mörkrosa"
 
-#: src/gtk/colorlabel.c:49
-#: src/prefs_common.c:412
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:402
 msgid "Steel blue"
 msgstr "Stålblå"
 
-#: src/gtk/colorlabel.c:50
-#: src/prefs_common.c:416
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:406
 msgid "Gold"
 msgstr "Guld"
 
-#: src/gtk/colorlabel.c:51
-#: src/prefs_common.c:420
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:410
 msgid "Bright green"
 msgstr "Ljusgrön"
 
-#: src/gtk/colorlabel.c:52
-#: src/prefs_common.c:424
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:414
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -4327,19 +4113,18 @@ msgstr "Sorteringsordning för brevlådor"
 
 #: src/gtk/foldersort.c:190
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
-msgstr "Flytta mappar upp eller ner för att ändra sorteringsordningen i mapplistan."
+msgstr ""
+"Flytta mappar upp eller ner för att ändra sorteringsordningen i mapplistan."
 
 #: src/gtk/foldersort.c:216
 msgid "Mailboxes"
 msgstr "Brevlådor"
 
-#: src/gtk/gtkaspell.c:341
-#: src/gtk/gtkaspell.c:660
+#: src/gtk/gtkaspell.c:341 src/gtk/gtkaspell.c:660
 msgid "No dictionary selected."
 msgstr "Ingen ordlista vald."
 
-#: src/gtk/gtkaspell.c:365
-#: src/gtk/gtkaspell.c:395
+#: src/gtk/gtkaspell.c:365 src/gtk/gtkaspell.c:395
 #, c-format
 msgid "Couldn't initialize %s speller."
 msgstr "Kunde inte starta %s stavningsprogram."
@@ -4378,8 +4163,7 @@ msgstr ""
 msgid "Change to..."
 msgstr "Ändra till..."
 
-#: src/gtk/gtkaspell.c:1811
-#: src/gtk/gtkaspell.c:1949
+#: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
 msgid "More..."
 msgstr "Mer..."
 
@@ -4423,8 +4207,7 @@ msgstr "Använd alternativ (%s)"
 msgid "Use both dictionaries"
 msgstr "Använd båda ordböckerna"
 
-#: src/gtk/gtkaspell.c:2054
-#: src/prefs_spelling.c:144
+#: src/gtk/gtkaspell.c:2054 src/prefs_spelling.c:144
 msgid "Check while typing"
 msgstr "Kontrollera medan jag skriver"
 
@@ -4446,11 +4229,8 @@ msgstr ""
 "Rättstavningsprogrammet kunde inte byta alternativ ordlista.\n"
 "%s"
 
-#: src/gtk/headers.h:8
-#: src/prefs_filtering_action.c:1257
-#: src/prefs_matcher.c:2152
-#: src/prefs_summary_column.c:84
-#: src/quote_fmt.c:49
+#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1259
+#: src/prefs_matcher.c:2158 src/prefs_summary_column.c:84 src/quote_fmt.c:49
 #: src/summaryview.c:446
 msgid "Date"
 msgstr "Datum"
@@ -4459,17 +4239,13 @@ msgstr "Datum"
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/gtk/headers.h:9
-#: src/prefs_filtering_action.c:1254
-#: src/prefs_matcher.c:2149
-#: src/prefs_summary_column.c:82
-#: src/quote_fmt.c:50
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1256
+#: src/prefs_matcher.c:2155 src/prefs_summary_column.c:82 src/quote_fmt.c:50
 #: src/summaryview.c:444
 msgid "From"
 msgstr "Från"
 
-#: src/gtk/headers.h:9
-#: src/summary_search.c:412
+#: src/gtk/headers.h:9 src/summary_search.c:438
 msgid "From:"
 msgstr "Från:"
 
@@ -4485,19 +4261,14 @@ msgstr "Avsändare:"
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: src/gtk/headers.h:12
-#: src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2150
-#: src/prefs_summary_column.c:83
-#: src/quote_fmt.c:57
+#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1257
+#: src/prefs_matcher.c:2156 src/prefs_summary_column.c:83 src/quote_fmt.c:57
 #: src/summaryview.c:445
 msgid "To"
 msgstr "Till"
 
-#: src/gtk/headers.h:13
-#: src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2151
-#: src/quote_fmt.c:58
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1258
+#: src/prefs_matcher.c:2157 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Kopia"
 
@@ -4505,10 +4276,8 @@ msgstr "Kopia"
 msgid "Bcc"
 msgstr "Blindkopia"
 
-#: src/gtk/headers.h:15
-#: src/prefs_filtering_action.c:1258
-#: src/prefs_matcher.c:2153
-#: src/quote_fmt.c:61
+#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1260
+#: src/prefs_matcher.c:2159 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Meddelande-ID"
 
@@ -4520,10 +4289,8 @@ msgstr "Meddelande-ID:"
 msgid "In-Reply-To"
 msgstr "Svar-På"
 
-#: src/gtk/headers.h:17
-#: src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2155
-#: src/quote_fmt.c:60
+#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1262
+#: src/prefs_matcher.c:2161 src/quote_fmt.c:60
 msgid "References"
 msgstr "Referenser"
 
@@ -4531,11 +4298,8 @@ msgstr "Referenser"
 msgid "References:"
 msgstr "Referenser:"
 
-#: src/gtk/headers.h:18
-#: src/prefs_filtering_action.c:1253
-#: src/prefs_matcher.c:2148
-#: src/prefs_summary_column.c:81
-#: src/quote_fmt.c:56
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1255
+#: src/prefs_matcher.c:2154 src/prefs_summary_column.c:81 src/quote_fmt.c:56
 #: src/summaryview.c:443
 msgid "Subject"
 msgstr "Ämne"
@@ -4552,8 +4316,7 @@ msgstr "Kommando:"
 msgid "Keywords"
 msgstr "Nyckelord"
 
-#: src/gtk/headers.h:20
-#: src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/gtk/headers.h:20 src/plugins/pdf_viewer/poppler_viewer.c:706
 msgid "Keywords:"
 msgstr "Nyckelord:"
 
@@ -4629,10 +4392,8 @@ msgstr "Mottaget"
 msgid "Received:"
 msgstr "Mottaget:"
 
-#: src/gtk/headers.h:32
-#: src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2154
-#: src/quote_fmt.c:59
+#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1261
+#: src/prefs_matcher.c:2160 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Diskussionsgrupper"
 
@@ -4656,16 +4417,13 @@ msgstr "Seen"
 msgid "Seen:"
 msgstr "Seen:"
 
-#: src/gtk/headers.h:36
-#: src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164
-#: src/prefs_summary_column.c:79
+#: src/gtk/headers.h:36 src/gtk/progressdialog.c:149
+#: src/gtk/sslcertwindow.c:164 src/prefs_summary_column.c:79
 #: src/summaryview.c:2786
 msgid "Status"
 msgstr "Status"
 
-#: src/gtk/headers.h:36
-#: src/prefs_themes.c:904
+#: src/gtk/headers.h:36 src/prefs_themes.c:904
 msgid "Status:"
 msgstr "Status:"
 
@@ -4705,8 +4463,7 @@ msgstr "Användarprogram:"
 msgid "Content-Type"
 msgstr "Innehållstyp"
 
-#: src/gtk/headers.h:41
-#: src/image_viewer.c:327
+#: src/gtk/headers.h:41 src/image_viewer.c:327
 msgid "Content-Type:"
 msgstr "Innehållstyp:"
 
@@ -4734,8 +4491,7 @@ msgstr "Företräde"
 msgid "Precedence:"
 msgstr "Företräde:"
 
-#: src/gtk/headers.h:45
-#: src/prefs_account.c:1067
+#: src/gtk/headers.h:45 src/prefs_account.c:1067
 msgid "Organization"
 msgstr "Organisation"
 
@@ -4952,48 +4708,46 @@ msgid "Icon Legend"
 msgstr "Ikonförklaring"
 
 #: src/gtk/icon_legend.c:140
-msgid "<span weight=\"bold\">The following icons are used to show the status of messages and folders:</span>"
-msgstr "<span weight=\"bold\">Följande ikoner visar vilken statusett meddelade har:</span>"
+msgid ""
+"<span weight=\"bold\">The following icons are used to show the status of "
+"messages and folders:</span>"
+msgstr ""
+"<span weight=\"bold\">Följande ikoner visar vilken statusett meddelade har:</"
+"span>"
 
-#: src/gtk/inputdialog.c:246
-#: src/gtk/inputdialog.c:268
+#: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Skriv in lösenord för %s på %s:"
 
-#: src/gtk/inputdialog.c:249
-#: src/gtk/inputdialog.c:252
-#: src/gtk/inputdialog.c:271
-#: src/gtk/inputdialog.c:274
+#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
+#: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
 #, c-format
 msgid "Input password for %s:"
 msgstr "Skriv in lösenord för %s:"
 
-#: src/gtk/inputdialog.c:255
-#: src/gtk/inputdialog.c:277
+#: src/gtk/inputdialog.c:242 src/gtk/inputdialog.c:264
 msgid "Input password:"
 msgstr "Skriv in lösenord:"
 
-#: src/gtk/inputdialog.c:256
-#: src/gtk/inputdialog.c:284
-#: src/gtk/inputdialog.c:296
+#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
+#: src/gtk/inputdialog.c:283
 msgid "Input password"
 msgstr "Skriv in lösenord"
 
-#: src/gtk/inputdialog.c:286
+#: src/gtk/inputdialog.c:273
 msgid "Remember password for this session"
 msgstr "Kom ihåg lösenord för denna session"
 
-#: src/gtk/inputdialog.c:385
-#: src/gtk/inputdialog.c:434
+#: src/gtk/inputdialog.c:372 src/gtk/inputdialog.c:421
 msgid "Remember this"
 msgstr "Kom ihåg detta"
 
-#: src/gtk/logwindow.c:451
+#: src/gtk/logwindow.c:447
 msgid "Clear _Log"
 msgstr "Töm _Logg"
 
-#: src/gtk/menu.c:145
+#: src/gtk/menu.c:137
 msgid ""
 "<span><b>Warning:</b> This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -5003,8 +4757,7 @@ msgstr ""
 "har blivit avklippt för säkerhets skull. Detta meddelande kan vara\n"
 "skadat, felaktigt eller en del av ett DoS-försök.</span>"
 
-#: src/gtk/pluginwindow.c:164
-#: src/gtk/pluginwindow.c:169
+#: src/gtk/pluginwindow.c:164 src/gtk/pluginwindow.c:169
 msgid ""
 "\n"
 "\n"
@@ -5037,11 +4790,9 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:304
-#: src/plugins/acpi_notifier/acpi_notifier.c:790
+#: src/gtk/pluginwindow.c:304 src/plugins/acpi_notifier/acpi_notifier.c:790
 #: src/plugins/archive/archiver_prefs.c:92
-#: src/plugins/att_remover/att_remover.c:519
-#: src/plugins/attachwarner/attachwarner_prefs.c:201
+#: src/plugins/attachwarner/attachwarner_prefs.c:228
 #: src/plugins/address_keeper/address_keeper_prefs.c:248
 #: src/plugins/bogofilter/bogofilter_gtk.c:457
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
@@ -5057,12 +4808,10 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:479
 #: src/plugins/notification/notification_prefs.c:496
 #: src/plugins/notification/notification_prefs.c:513
-#: src/plugins/pgpcore/prefs_gpg.c:557
-#: src/plugins/rssyl/rssyl_prefs.c:63
+#: src/plugins/pgpcore/prefs_gpg.c:557 src/plugins/rssyl/rssyl_prefs.c:63
 #: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:648
-#: src/plugins/vcalendar/vcal_prefs.c:645
-#: src/prefs_toolbar.c:939
+#: src/plugins/vcalendar/vcal_prefs.c:647 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
@@ -5074,310 +4823,304 @@ msgstr "Läs in..."
 msgid "Unload"
 msgstr "Glöm"
 
-#: src/gtk/pluginwindow.c:351
-#: src/prefs_summaries.c:221
+#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:221
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/gtk/pluginwindow.c:373
-msgid "More plugins are available from the Claws Mail website."
-msgstr "Fler insticksmoduler är tillgängliga från Claws-Mails webbplats."
-
-#: src/gtk/pluginwindow.c:379
-#: src/prefs_themes.c:843
-msgid "Get more..."
-msgstr "Hämta mer..."
+#: src/gtk/pluginwindow.c:374
+#, c-format
+msgid ""
+"For more information about plugins see the <a href=\"%s\"><span underline="
+"\"none\">Claws Mail website</span></a>."
+msgstr ""
+"För mer information om insticksmoduler se <a href=\"%s\"><span underline="
+"\"none\">Claws Mails webbplats</span></a>."
 
-#: src/gtk/pluginwindow.c:415
+#: src/gtk/pluginwindow.c:414
 msgid "Click here to load one or more plugins"
 msgstr "Klicka här för att läsa in en eller flera insticksmoduler"
 
-#: src/gtk/pluginwindow.c:418
+#: src/gtk/pluginwindow.c:417
 msgid "Unload the selected plugin"
 msgstr "Glöm vald insticksmodul"
 
-#: src/gtk/pluginwindow.c:483
+#: src/gtk/pluginwindow.c:482
 msgid "Loaded plugins"
 msgstr "Inlästa insticksmoduler"
 
-#: src/gtk/prefswindow.c:679
+#: src/gtk/prefswindow.c:671
 msgid "Page Index"
 msgstr "Sidindex"
 
-#: src/gtk/progressdialog.c:91
-#: src/mainwindow.c:830
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:828
 msgid "_Hide"
 msgstr "_Dölj"
 
-#: src/gtk/progressdialog.c:141
-#: src/prefs_account.c:3208
-#: src/prefs_account.c:3226
-#: src/prefs_account.c:3244
-#: src/prefs_account.c:3262
-#: src/prefs_account.c:3280
-#: src/prefs_account.c:3298
-#: src/prefs_account.c:3317
-#: src/prefs_account.c:3399
-#: src/prefs_filtering_action.c:1419
-#: src/prefs_filtering.c:397
-#: src/prefs_filtering.c:1881
+#: src/gtk/progressdialog.c:141 src/prefs_account.c:3200
+#: src/prefs_account.c:3218 src/prefs_account.c:3236 src/prefs_account.c:3254
+#: src/prefs_account.c:3272 src/prefs_account.c:3290 src/prefs_account.c:3309
+#: src/prefs_account.c:3399 src/prefs_filtering_action.c:1421
+#: src/prefs_filtering.c:397 src/prefs_filtering.c:1877
 msgid "Account"
 msgstr "Konto"
 
-#: src/gtk/quicksearch.c:433
+#: src/gtk/quicksearch.c:442
 msgid "all messages"
 msgstr "alla meddelanden"
 
-#: src/gtk/quicksearch.c:434
+#: src/gtk/quicksearch.c:443
 msgid "messages whose age is greater than # days"
 msgstr "meddelanden som är äldre än # dagar"
 
-#: src/gtk/quicksearch.c:435
+#: src/gtk/quicksearch.c:444
 msgid "messages whose age is less than # days"
 msgstr "meddelanden som är yngre än # dagar"
 
-#: src/gtk/quicksearch.c:436
+#: src/gtk/quicksearch.c:445
 msgid "messages whose age is greater than # hours"
 msgstr "meddelanden som är äldre än # timmar"
 
-#: src/gtk/quicksearch.c:437
+#: src/gtk/quicksearch.c:446
 msgid "messages whose age is less than # hours"
 msgstr "meddelanden som är yngre än # timmar"
 
-#: src/gtk/quicksearch.c:438
+#: src/gtk/quicksearch.c:447
 msgid "messages which contain S in the message body"
 msgstr "meddelanden som innehåller S i meddelandetexten"
 
-#: src/gtk/quicksearch.c:439
+#: src/gtk/quicksearch.c:448
 msgid "messages which contain S in the whole message"
 msgstr "meddelanden som innehåller S i hela meddelandet"
 
-#: src/gtk/quicksearch.c:440
+#: src/gtk/quicksearch.c:449
 msgid "messages carbon-copied to S"
 msgstr "meddelanden som skickats som kopia till S"
 
-#: src/gtk/quicksearch.c:441
+#: src/gtk/quicksearch.c:450
 msgid "message is either to: or cc: to S"
 msgstr "meddelanden är antingen till: eller kopia: S"
 
-#: src/gtk/quicksearch.c:442
+#: src/gtk/quicksearch.c:451
 msgid "deleted messages"
 msgstr "borttagna meddelanden"
 
-#: src/gtk/quicksearch.c:443
+#: src/gtk/quicksearch.c:452
 msgid "messages which contain S in the Sender field"
 msgstr "meddelanden som innehåller S i avsändaren"
 
-#: src/gtk/quicksearch.c:444
+#: src/gtk/quicksearch.c:453
 msgid "true if execute \"S\" succeeds"
 msgstr "sant om \"S\" gick bra att exekvera"
 
-#: src/gtk/quicksearch.c:445
+#: src/gtk/quicksearch.c:454
 msgid "messages originating from user S"
 msgstr "meddelanden med avsändaren S"
 
-#: src/gtk/quicksearch.c:446
+#: src/gtk/quicksearch.c:455
 msgid "forwarded messages"
 msgstr "vidarebefordrade meddelanden"
 
-#: src/gtk/quicksearch.c:447
+#: src/gtk/quicksearch.c:456
 msgid "messages which have attachments"
 msgstr "meddelanden som har bifogade filer"
 
-#: src/gtk/quicksearch.c:448
+#: src/gtk/quicksearch.c:457
 msgid "messages which contain header S"
 msgstr "meddelanden som innehåller brevhuvudet S"
 
-#: src/gtk/quicksearch.c:449
+#: src/gtk/quicksearch.c:458
 msgid "messages which contain S in Message-ID header"
 msgstr "meddelanden som innehåller S i brevhuvudet Message-ID"
 
-#: src/gtk/quicksearch.c:450
+#: src/gtk/quicksearch.c:459
 msgid "messages which contain S in In-Reply-To header"
 msgstr "meddelanden som innehåller S i brevhuvudet In-Reply-To"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:460
 msgid "messages which are marked with color #"
 msgstr "meddelanden markerade med färgen #"
 
-#: src/gtk/quicksearch.c:452
+#: src/gtk/quicksearch.c:461
 msgid "locked messages"
 msgstr "låsta meddelanden"
 
-#: src/gtk/quicksearch.c:453
+#: src/gtk/quicksearch.c:462
 msgid "messages which are in newsgroup S"
 msgstr "meddelanden som är i diskussionsgrupp S"
 
-#: src/gtk/quicksearch.c:454
+#: src/gtk/quicksearch.c:463
 msgid "new messages"
 msgstr "nya meddelanden"
 
-#: src/gtk/quicksearch.c:455
+#: src/gtk/quicksearch.c:464
 msgid "old messages"
 msgstr "gamla meddelanden"
 
-#: src/gtk/quicksearch.c:456
+#: src/gtk/quicksearch.c:465
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "ofullständiga meddelanden (ofullständigt nerladdade)"
 
-#: src/gtk/quicksearch.c:457
+#: src/gtk/quicksearch.c:466
 msgid "messages which have been replied to"
 msgstr "meddelanden som har besvarats"
 
-#: src/gtk/quicksearch.c:458
+#: src/gtk/quicksearch.c:467
 msgid "read messages"
 msgstr "lästa meddelanden"
 
-#: src/gtk/quicksearch.c:459
+#: src/gtk/quicksearch.c:468
 msgid "messages which contain S in subject"
 msgstr "meddelanden som innehåller S i ämnesraden"
 
-#: src/gtk/quicksearch.c:460
+#: src/gtk/quicksearch.c:469
 msgid "messages whose score is equal to # points"
 msgstr "meddelanden vars poäng är lika med # poäng"
 
-#: src/gtk/quicksearch.c:461
+#: src/gtk/quicksearch.c:470
 msgid "messages whose score is greater than # points"
 msgstr "meddelanden vars poäng är mer än # poäng"
 
-#: src/gtk/quicksearch.c:462
+#: src/gtk/quicksearch.c:471
 msgid "messages whose score is lower than # points"
 msgstr "meddelanden vars poäng är mindre än # poäng"
 
-#: src/gtk/quicksearch.c:463
+#: src/gtk/quicksearch.c:472
 msgid "messages whose size is equal to # bytes"
 msgstr "meddelanden vars storlek är lika med # bytes"
 
-#: src/gtk/quicksearch.c:464
+#: src/gtk/quicksearch.c:473
 msgid "messages whose size is greater than # bytes"
 msgstr "meddelanden vars storlek är större än # bytes"
 
-#: src/gtk/quicksearch.c:465
+#: src/gtk/quicksearch.c:474
 msgid "messages whose size is smaller than # bytes"
 msgstr "meddelanden vars storlek är mindre än # bytes"
 
-#: src/gtk/quicksearch.c:466
+#: src/gtk/quicksearch.c:475
 msgid "messages which have been sent to S"
 msgstr "meddelanden som är sända till S"
 
-#: src/gtk/quicksearch.c:467
+#: src/gtk/quicksearch.c:476
 msgid "messages which tags contain S"
 msgstr "meddelanden som som har etiketter som innehåller S"
 
-#: src/gtk/quicksearch.c:468
+#: src/gtk/quicksearch.c:477
 msgid "messages which have tag(s)"
 msgstr "meddelanden som har etikett(er)"
 
-#: src/gtk/quicksearch.c:469
+#: src/gtk/quicksearch.c:478
 msgid "marked messages"
 msgstr "markerade meddelanden"
 
-#: src/gtk/quicksearch.c:470
+#: src/gtk/quicksearch.c:479
 msgid "unread messages"
 msgstr "olästa meddelanden"
 
-#: src/gtk/quicksearch.c:471
+#: src/gtk/quicksearch.c:480
 msgid "messages which contain S in References header"
 msgstr "meddelanden som innehåller S i referenshuvud"
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:481
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
-msgstr "meddelanden som returnerar 0 när de skickas till kommando - %F är meddelandefil"
+msgstr ""
+"meddelanden som returnerar 0 när de skickas till kommando - %F är "
+"meddelandefil"
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:482
 msgid "messages which contain S in X-Label header"
 msgstr "meddelanden som innehåller S i brevhuvudet X-Label"
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:484
 msgid "logical AND operator"
 msgstr "logisk OCH operator"
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:485
 msgid "logical OR operator"
 msgstr "logisk ELLER operator"
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:486
 msgid "logical NOT operator"
 msgstr "logisk ICKE operator"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:487
 msgid "case sensitive search"
 msgstr "gemen-/versalkänslig sökning"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:488
 msgid "match using regular expressions instead of substring search"
-msgstr "matcha med hjälp av reguljära uttryck istället för sökning av delsträng"
+msgstr ""
+"matcha med hjälp av reguljära uttryck istället för sökning av delsträng"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:490
 msgid "all filtering expressions are allowed"
 msgstr "alla filtreringsuttryck är tillåtna"
 
-#: src/gtk/quicksearch.c:490
-#: src/summary_search.c:457
+#: src/gtk/quicksearch.c:499 src/summary_search.c:483
 msgid "Extended Search"
 msgstr "Utökad sökning"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:500
 msgid ""
-"Extended Search allows the user to define criteria that messages must have in order to match and be displayed in the message list.\n"
+"Extended Search allows the user to define criteria that messages must have "
+"in order to match and be displayed in the message list.\n"
 "The following symbols can be used:"
 msgstr ""
-"Utökad sökning låter användaren definiera kriteria som meddelanden måste uppfylla för att matcha och visas i meddelandelistan.\n"
+"Utökad sökning låter användaren definiera kriteria som meddelanden måste "
+"uppfylla för att matcha och visas i meddelandelistan.\n"
 "Följande symboler kan användas:"
 
-#: src/gtk/quicksearch.c:591
+#: src/gtk/quicksearch.c:600
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Något gick fel under sökning. Vänligen kontrollera dina loggar."
 
-#: src/gtk/quicksearch.c:657
+#: src/gtk/quicksearch.c:666
 msgid "From/To/Subject/Tag"
 msgstr "Från/Till/Ämne/Etiketter"
 
-#: src/gtk/quicksearch.c:668
-#: src/plugins/archive/archiver_prefs.c:322
+#: src/gtk/quicksearch.c:677 src/plugins/archive/archiver_prefs.c:322
 msgid "Recursive"
 msgstr "Rekursivt"
 
-#: src/gtk/quicksearch.c:677
+#: src/gtk/quicksearch.c:686
 msgid "Sticky"
 msgstr "Klibbig"
 
-#: src/gtk/quicksearch.c:687
+#: src/gtk/quicksearch.c:696
 msgid "Type-ahead"
 msgstr "Sök vid inmatning"
 
-#: src/gtk/quicksearch.c:699
+#: src/gtk/quicksearch.c:708
 msgid "Run on select"
 msgstr "Kör vid markering"
 
-#: src/gtk/quicksearch.c:741
+#: src/gtk/quicksearch.c:750
 msgid "Clear the current search"
 msgstr "Rensa nuvarande sökning"
 
-#: src/gtk/quicksearch.c:751
-#: src/summary_search.c:410
+#: src/gtk/quicksearch.c:760 src/summary_search.c:436
 msgid "Edit search criteria"
 msgstr "Redigera sökkriteria "
 
-#: src/gtk/quicksearch.c:760
+#: src/gtk/quicksearch.c:769
 msgid "Information about extended symbols"
 msgstr "Information om utökade symboler"
 
-#: src/gtk/quicksearch.c:798
-#: src/gtk/quicksearch.c:813
+#: src/gtk/quicksearch.c:807 src/gtk/quicksearch.c:822
 msgid "_Information"
 msgstr "_Information"
 
-#: src/gtk/quicksearch.c:800
-#: src/gtk/quicksearch.c:815
+#: src/gtk/quicksearch.c:808 src/gtk/quicksearch.c:823
+msgid "E_dit"
+msgstr "_Redigera"
+
+#: src/gtk/quicksearch.c:809 src/gtk/quicksearch.c:824 src/prefs_actions.c:347
+#: src/prefs_filtering.c:495 src/prefs_template.c:328
 msgid "C_lear"
 msgstr "Töm"
 
-#: src/gtk/sslcertwindow.c:157
-#: src/gtk/sslcertwindow.c:348
-#: src/gtk/sslcertwindow.c:398
-#: src/gtk/sslcertwindow.c:462
+#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:348
+#: src/gtk/sslcertwindow.c:398 src/gtk/sslcertwindow.c:462
 msgid "Correct"
 msgstr "Korrekt"
 
@@ -5389,19 +5132,16 @@ msgstr "Ägare"
 msgid "Signer"
 msgstr "Signerad av"
 
-#: src/gtk/sslcertwindow.c:170
-#: src/gtk/sslcertwindow.c:194
+#: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
 #: src/prefs_themes.c:860
 msgid "Name: "
 msgstr "Namn: "
 
-#: src/gtk/sslcertwindow.c:178
-#: src/gtk/sslcertwindow.c:202
+#: src/gtk/sslcertwindow.c:178 src/gtk/sslcertwindow.c:202
 msgid "Organization: "
 msgstr "Organisation: "
 
-#: src/gtk/sslcertwindow.c:186
-#: src/gtk/sslcertwindow.c:210
+#: src/gtk/sslcertwindow.c:186 src/gtk/sslcertwindow.c:210
 msgid "Location: "
 msgstr "Plats:"
 
@@ -5442,15 +5182,13 @@ msgstr ""
 "Certifikatet för %s är okänt.\n"
 "%sVill du acceptera det?"
 
-#: src/gtk/sslcertwindow.c:350
-#: src/gtk/sslcertwindow.c:400
+#: src/gtk/sslcertwindow.c:350 src/gtk/sslcertwindow.c:400
 #: src/gtk/sslcertwindow.c:464
 #, c-format
 msgid "Signature status: %s"
 msgstr "Signatur skapad %s"
 
-#: src/gtk/sslcertwindow.c:358
-#: src/gtk/sslcertwindow.c:408
+#: src/gtk/sslcertwindow.c:358 src/gtk/sslcertwindow.c:408
 msgid "_View certificate"
 msgstr "_Visa certifikat"
 
@@ -5462,14 +5200,12 @@ msgstr "SSL-certifikat är ogiltigt"
 msgid "SSL certificate is unknown"
 msgstr "SSL-certifikat är okänt"
 
-#: src/gtk/sslcertwindow.c:369
-#: src/gtk/sslcertwindow.c:419
+#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:419
 #: src/gtk/sslcertwindow.c:481
 msgid "_Cancel connection"
 msgstr "_Avbryt anslutning"
 
-#: src/gtk/sslcertwindow.c:369
-#: src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:481
 msgid "_Accept and save"
 msgstr "_Acceptera och spara"
 
@@ -5527,21 +5263,16 @@ msgstr "SSL-cer_tifikat förändrat"
 msgid "Tags:"
 msgstr "Etiketter:"
 
-#: src/headerview.c:216
-#: src/plugins/notification/notification_popup.c:316
+#: src/headerview.c:216 src/plugins/notification/notification_popup.c:316
 #: src/plugins/notification/notification_popup.c:621
-#: src/plugins/notification/notification_trayicon.c:854
-#: src/summaryview.c:3344
-#: src/summaryview.c:3361
-#: src/summaryview.c:3382
+#: src/plugins/notification/notification_trayicon.c:854 src/summaryview.c:3344
+#: src/summaryview.c:3361 src/summaryview.c:3382
 msgid "(No From)"
 msgstr "(Ingen avsändare)"
 
-#: src/headerview.c:231
-#: src/plugins/notification/notification_popup.c:318
+#: src/headerview.c:231 src/plugins/notification/notification_popup.c:318
 #: src/plugins/notification/notification_popup.c:625
-#: src/plugins/notification/notification_trayicon.c:857
-#: src/summaryview.c:3395
+#: src/plugins/notification/notification_trayicon.c:857 src/summaryview.c:3395
 #: src/summaryview.c:3399
 msgid "(No Subject)"
 msgstr "(Inget ämne)"
@@ -5550,8 +5281,7 @@ msgstr "(Inget ämne)"
 msgid "Error:"
 msgstr "Fel:"
 
-#: src/image_viewer.c:299
-#: src/mimeview.c:2578
+#: src/image_viewer.c:299 src/mimeview.c:2546
 #: src/plugins/pdf_viewer/poppler_viewer.c:700
 msgid "Filename:"
 msgstr "Filnamn:"
@@ -5590,8 +5320,12 @@ msgstr "IMAP-fel vid %s: strömfel\n"
 
 #: src/imap.c:619
 #, c-format
-msgid "IMAP error on %s: parse error (very probably non-RFC compliance from the server)\n"
-msgstr "IMAP-fel vid %s: tolkningsfel (mycket troligt följer inte servern RFC-standarden)\n"
+msgid ""
+"IMAP error on %s: parse error (very probably non-RFC compliance from the "
+"server)\n"
+msgstr ""
+"IMAP-fel vid %s: tolkningsfel (mycket troligt följer inte servern RFC-"
+"standarden)\n"
 
 #: src/imap.c:623
 #, c-format
@@ -5610,8 +5344,12 @@ msgstr "IMAP-fel vid %s: ödesdigert fel\n"
 
 #: src/imap.c:632
 #, c-format
-msgid "IMAP error on %s: protocol error(very probably non-RFC compliance from the server)\n"
-msgstr "IMAP-fel vid %s: protokollfel (mycket troligt följer inte servern RFC-standarden)\n"
+msgid ""
+"IMAP error on %s: protocol error(very probably non-RFC compliance from the "
+"server)\n"
+msgstr ""
+"IMAP-fel vid %s: protokollfel (mycket troligt följer inte servern RFC-"
+"standarden)\n"
 
 #: src/imap.c:636
 #, c-format
@@ -5782,21 +5520,25 @@ msgstr "IMAP-fel vid %s: Okänt fel [%d]\n"
 msgid ""
 "\n"
 "\n"
-"CRAM-MD5 logins only work if libetpan has been compiled with SASL support and the CRAM-MD5 SASL plugin is installed."
+"CRAM-MD5 logins only work if libetpan has been compiled with SASL support "
+"and the CRAM-MD5 SASL plugin is installed."
 msgstr ""
 "\n"
 "\n"
-"CRAM-MD5 inloggning fungerar endast om libetpan har kompilerats med SASL-stöd och om CRAM-MD5 SASL insticksmodulen är installerad."
+"CRAM-MD5 inloggning fungerar endast om libetpan har kompilerats med SASL-"
+"stöd och om CRAM-MD5 SASL insticksmodulen är installerad."
 
 #: src/imap.c:923
 msgid ""
 "\n"
 "\n"
-"DIGEST-MD5 logins only work if libetpan has been compiled with SASL support and the DIGEST-MD5 SASL plugin is installed."
+"DIGEST-MD5 logins only work if libetpan has been compiled with SASL support "
+"and the DIGEST-MD5 SASL plugin is installed."
 msgstr ""
 "\n"
 "\n"
-"DIGEST-MD5 inloggning fungerar endast om libetpan har kompilerats med SASL-stöd och om DIGEST-MD5 SASL insticksmodulen är installerad."
+"DIGEST-MD5 inloggning fungerar endast om libetpan har kompilerats med SASL-"
+"stöd och om DIGEST-MD5 SASL insticksmodulen är installerad."
 
 #: src/imap.c:930
 #, c-format
@@ -5813,45 +5555,37 @@ msgstr "Anslutning till %s misslyckades: inloggning avslogs, %s\n"
 msgid "Connecting to %s failed"
 msgstr "Anslutning till %s misslyckades"
 
-#: src/imap.c:959
-#: src/imap.c:962
+#: src/imap.c:959 src/imap.c:962
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-anslutning till %s har blivit nedkopplad. Ansluter igen...\n"
 
-#: src/imap.c:992
-#: src/imap.c:3539
-#: src/imap.c:4199
-#: src/imap.c:4296
-#: src/imap.c:4479
-#: src/imap.c:5276
+#: src/imap.c:992 src/imap.c:3546 src/imap.c:4206 src/imap.c:4303
+#: src/imap.c:4486 src/imap.c:5283
 msgid "Claws Mail needs network access in order to access the IMAP server."
-msgstr "Claws Mail behöver vara uppkopplad mot ett nätverk för att kunna kontakta IMAP-servern."
+msgstr ""
+"Claws Mail behöver vara uppkopplad mot ett nätverk för att kunna kontakta "
+"IMAP-servern."
 
-#: src/imap.c:1086
-#: src/inc.c:816
-#: src/news.c:394
-#: src/send_message.c:308
+#: src/imap.c:1086 src/inc.c:802 src/news.c:388 src/send_message.c:269
 msgid "Insecure connection"
 msgstr "Osäker anslutning"
 
-#: src/imap.c:1087
-#: src/inc.c:817
-#: src/news.c:395
-#: src/send_message.c:309
+#: src/imap.c:1087 src/inc.c:803 src/news.c:389 src/send_message.c:270
 msgid ""
-"This connection is configured to be secured using SSL, but SSL is not available in this build of Claws Mail. \n"
+"This connection is configured to be secured using SSL, but SSL is not "
+"available in this build of Claws Mail. \n"
 "\n"
-"Do you want to continue connecting to this server? The communication would not be secure."
+"Do you want to continue connecting to this server? The communication would "
+"not be secure."
 msgstr ""
-"Den här anslutningen är konfigurerad att vara säkrad med hjälp av SSL, men SSL är inte tillgängligt i det här bygget av Claws-Mail. \n"
+"Den här anslutningen är konfigurerad att vara säkrad med hjälp av SSL, men "
+"SSL är inte tillgängligt i det här bygget av Claws-Mail. \n"
 "\n"
-"Vill du fortsätta att ansluta till den här servern? Kommunikationen kommer inte vara säker."
+"Vill du fortsätta att ansluta till den här servern? Kommunikationen kommer "
+"inte vara säker."
 
-#: src/imap.c:1093
-#: src/inc.c:823
-#: src/news.c:401
-#: src/send_message.c:315
+#: src/imap.c:1093 src/inc.c:809 src/news.c:395 src/send_message.c:276
 msgid "Con_tinue connecting"
 msgstr "Försätt ansluta"
 
@@ -5870,158 +5604,150 @@ msgstr "Kan inte ansluta till IMAP4-server: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan inte ansluta till IMAP4-server: %s:%d\n"
 
-#: src/imap.c:1187
-#: src/imap.c:3961
+#: src/imap.c:1187 src/imap.c:3968
 msgid "Can't start TLS session.\n"
 msgstr "Kan inte starta TLS session.\n"
 
-#: src/imap.c:1243
+#: src/imap.c:1250
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kunde inte logga in på IMAP4-server %s.\n"
 
-#: src/imap.c:1246
+#: src/imap.c:1253
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kunde inte logga in på IMAP-server %s."
 
-#: src/imap.c:1640
+#: src/imap.c:1647
 msgid "Adding messages..."
 msgstr "Lägger till meddelanden..."
 
-#: src/imap.c:1842
-#: src/mh.c:520
+#: src/imap.c:1849 src/mh.c:520
 msgid "Copying messages..."
 msgstr "Kopierar meddelanden..."
 
-#: src/imap.c:2421
+#: src/imap.c:2428
 msgid "can't set deleted flags\n"
 msgstr "kan inte sätta borttaget-flaggor\n"
 
-#: src/imap.c:2428
-#: src/imap.c:4906
+#: src/imap.c:2435 src/imap.c:4913
 msgid "can't expunge\n"
 msgstr "kan inte utplåna\n"
 
-#: src/imap.c:2779
+#: src/imap.c:2786
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Letar efter icke prenumererade mappar i %s..."
 
-#: src/imap.c:2782
+#: src/imap.c:2789
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Letar efter undermappar till %s...."
 
-#: src/imap.c:3078
+#: src/imap.c:3085
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan inte skapa brevlåda: LIST mislyckades\n"
 
-#: src/imap.c:3093
+#: src/imap.c:3100
 msgid "can't create mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: src/imap.c:3184
+#: src/imap.c:3191
 msgid "New folder name must not contain the namespace path separator"
 msgstr "Nytt mappnamn kan inte innehålla namnrymdens sökvägs-avdelare."
 
-#: src/imap.c:3221
+#: src/imap.c:3228
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan inte döpa om brevlåda: %s till %s\n"
 
-#: src/imap.c:3333
+#: src/imap.c:3340
 msgid "can't delete mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: src/imap.c:3620
+#: src/imap.c:3627
 msgid "LIST failed\n"
 msgstr "LIST misslyckades\n"
 
-#: src/imap.c:3705
+#: src/imap.c:3712
 msgid "Flagging messages..."
 msgstr "Flaggar meddelande..."
 
-#: src/imap.c:3806
+#: src/imap.c:3813
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan inte välja mapp: %s\n"
 
-#: src/imap.c:3958
+#: src/imap.c:3965
 msgid "Server requires TLS to log in.\n"
 msgstr "Servern kräver TLS för att logga in.\n"
 
-#: src/imap.c:3968
+#: src/imap.c:3975
 msgid "Can't refresh capabilities.\n"
 msgstr "Kan inte uppdatera egenskaper.\n"
 
-#: src/imap.c:3973
+#: src/imap.c:3980
 #, c-format
-msgid "Connection to %s failed: server requires TLS, but Claws Mail has been compiled without OpenSSL support.\n"
-msgstr "Anslutning till %s misslyckades: servern kräver TLS, men Claws-Mail har kompilerats utan stöd för OpenSSL.\n"
+msgid ""
+"Connection to %s failed: server requires TLS, but Claws Mail has been "
+"compiled without OpenSSL support.\n"
+msgstr ""
+"Anslutning till %s misslyckades: servern kräver TLS, men Claws-Mail har "
+"kompilerats utan stöd för OpenSSL.\n"
 
-#: src/imap.c:3981
+#: src/imap.c:3988
 msgid "Server logins are disabled.\n"
 msgstr "Serverinloggningar är avaktiverade.\n"
 
-#: src/imap.c:4204
+#: src/imap.c:4211
 msgid "Fetching message..."
 msgstr "Hämtar meddelande..."
 
-#: src/imap.c:4899
+#: src/imap.c:4906
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan inte sätta borttaget-flaggor: %d\n"
 
-#: src/imap.c:5932
+#: src/imap.c:5939
 msgid ""
-"You have one or more IMAP accounts defined. However this version of Claws Mail has been built without IMAP support; your IMAP account(s) are disabled.\n"
+"You have one or more IMAP accounts defined. However this version of Claws "
+"Mail has been built without IMAP support; your IMAP account(s) are "
+"disabled.\n"
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
-"Du har ett eller flera IMAP-konton konfigurerade. Men denna version av Claws-Mail har byggts utan IMAP-stöd; dina IMAP-konton är inaktiverade.\n"
+"Du har ett eller flera IMAP-konton konfigurerade. Men denna version av Claws-"
+"Mail har byggts utan IMAP-stöd; dina IMAP-konton är inaktiverade.\n"
 "\n"
 "Du behöver troligen installera libetpan och kompilera om Claws-Mail."
 
-#: src/imap_gtk.c:63
-#: src/mh_gtk.c:55
-#: src/plugins/mailmbox/plugin_gtk.c:59
+#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/plugins/mailmbox/plugin_gtk.c:59
 msgid "Create _new folder..."
 msgstr "Skapa _ny mapp..."
 
-#: src/imap_gtk.c:65
-#: src/mh_gtk.c:56
-#: src/news_gtk.c:61
+#: src/imap_gtk.c:65 src/mh_gtk.c:56 src/news_gtk.c:61
 #: src/plugins/mailmbox/plugin_gtk.c:60
 msgid "_Rename folder..."
 msgstr "Byt n_amn på mapp..."
 
-#: src/imap_gtk.c:66
-#: src/mh_gtk.c:57
-#: src/plugins/mailmbox/plugin_gtk.c:61
+#: src/imap_gtk.c:66 src/mh_gtk.c:57 src/plugins/mailmbox/plugin_gtk.c:61
 msgid "M_ove folder..."
 msgstr "_Flytta mapp..."
 
-#: src/imap_gtk.c:67
-#: src/mh_gtk.c:58
-#: src/plugins/mailmbox/plugin_gtk.c:62
+#: src/imap_gtk.c:67 src/mh_gtk.c:58 src/plugins/mailmbox/plugin_gtk.c:62
 msgid "Cop_y folder..."
 msgstr "_Kopiera mapp..."
 
-#: src/imap_gtk.c:69
-#: src/mh_gtk.c:59
-#: src/plugins/mailmbox/plugin_gtk.c:63
+#: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:63
 #: src/plugins/rssyl/rssyl_gtk.c:61
 msgid "_Delete folder..."
 msgstr "_Ta bort mapp..."
 
-#: src/imap_gtk.c:71
-#: src/news_gtk.c:59
+#: src/imap_gtk.c:71 src/news_gtk.c:59
 msgid "Synchronise"
 msgstr "Synkronisera"
 
-#: src/imap_gtk.c:72
-#: src/news_gtk.c:60
+#: src/imap_gtk.c:72 src/news_gtk.c:60
 msgid "Down_load messages"
 msgstr "_Ladda ner meddelanden"
 
@@ -6033,27 +5759,20 @@ msgstr "Pren_umerationer"
 msgid "_Subscribe..."
 msgstr "_Prenumerera"
 
-#: src/imap_gtk.c:78
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "Säg _upp prenumeration"
 
-#: src/imap_gtk.c:80
-#: src/mh_gtk.c:60
-#: src/news_gtk.c:63
+#: src/imap_gtk.c:80 src/mh_gtk.c:60 src/news_gtk.c:63
 #: src/plugins/mailmbox/plugin_gtk.c:64
 msgid "_Check for new messages"
 msgstr "Leta efter _nya meddelanden"
 
-#: src/imap_gtk.c:81
-#: src/mh_gtk.c:61
-#: src/plugins/mailmbox/plugin_gtk.c:65
+#: src/imap_gtk.c:81 src/mh_gtk.c:61 src/plugins/mailmbox/plugin_gtk.c:65
 msgid "C_heck for new folders"
 msgstr "L_eta efter nya mappar"
 
-#: src/imap_gtk.c:82
-#: src/mh_gtk.c:62
-#: src/plugins/mailmbox/plugin_gtk.c:66
+#: src/imap_gtk.c:82 src/mh_gtk.c:62 src/plugins/mailmbox/plugin_gtk.c:66
 msgid "R_ebuild folder tree"
 msgstr "Uppdat_era mapplista"
 
@@ -6071,35 +5790,26 @@ msgstr ""
 "(om du vill skapa en mapp för att spara undermappar\n"
 "endast och inga meddelanden, lägg till '/' på slutet av namnet)"
 
-#: src/imap_gtk.c:200
-#: src/mh_gtk.c:148
+#: src/imap_gtk.c:200 src/mh_gtk.c:148
 msgid "Inherit properties from parent folder"
 msgstr "Ärv egenskaper från överliggande mapp"
 
-#: src/imap_gtk.c:261
-#: src/mh_gtk.c:249
-#: src/news_gtk.c:305
-#: src/plugins/mailmbox/plugin_gtk.c:408
-#: src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/vcalendar/vcal_folder.c:2020
+#: src/imap_gtk.c:261 src/mh_gtk.c:249 src/news_gtk.c:305
+#: src/plugins/mailmbox/plugin_gtk.c:405 src/plugins/rssyl/rssyl_cb_menu.c:333
+#: src/plugins/vcalendar/vcal_folder.c:2018
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Ange nytt namn för '%s':"
 
-#: src/imap_gtk.c:263
-#: src/mh_gtk.c:251
-#: src/plugins/mailmbox/plugin_gtk.c:409
+#: src/imap_gtk.c:263 src/mh_gtk.c:251 src/plugins/mailmbox/plugin_gtk.c:406
 #: src/plugins/rssyl/rssyl_cb_menu.c:334
-#: src/plugins/vcalendar/vcal_folder.c:2021
+#: src/plugins/vcalendar/vcal_folder.c:2019
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
-#: src/imap_gtk.c:292
-#: src/mh_gtk.c:274
-#: src/news_gtk.c:327
-#: src/plugins/mailmbox/plugin_gtk.c:438
-#: src/plugins/rssyl/rssyl_cb_menu.c:354
-#: src/plugins/vcalendar/vcal_folder.c:2041
+#: src/imap_gtk.c:292 src/mh_gtk.c:274 src/news_gtk.c:327
+#: src/plugins/mailmbox/plugin_gtk.c:433 src/plugins/rssyl/rssyl_cb_menu.c:354
+#: src/plugins/vcalendar/vcal_folder.c:2039
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6107,25 +5817,22 @@ msgstr ""
 "Mappen kunde inte döpas om.\n"
 "Det nya mappnamnet är inte tillåtet."
 
-#: src/imap_gtk.c:360
-#: src/mh_gtk.c:199
-#: src/plugins/rssyl/rssyl_cb_menu.c:234
+#: src/imap_gtk.c:360 src/mh_gtk.c:199 src/plugins/rssyl/rssyl_cb_menu.c:234
 #, c-format
 msgid ""
-"All folders and messages under '%s' will be permanently deleted. Recovery will not be possible.\n"
+"All folders and messages under '%s' will be permanently deleted. Recovery "
+"will not be possible.\n"
 "\n"
 "Do you really want to delete?"
 msgstr ""
-"Alla mappar och meddelande under '%s' kommer att tas bort permanent. Det går inte att ångra operationen.\n"
+"Alla mappar och meddelande under '%s' kommer att tas bort permanent. Det går "
+"inte att ångra operationen.\n"
 "\n"
 "Vill du verkligen ta bort?"
 
-#: src/imap_gtk.c:381
-#: src/mh_gtk.c:220
-#: src/news_gtk.c:280
-#: src/plugins/mailmbox/plugin_gtk.c:343
-#: src/plugins/rssyl/rssyl_cb_menu.c:256
-#: src/plugins/vcalendar/vcal_folder.c:1974
+#: src/imap_gtk.c:381 src/mh_gtk.c:220 src/news_gtk.c:280
+#: src/plugins/mailmbox/plugin_gtk.c:341 src/plugins/rssyl/rssyl_cb_menu.c:256
+#: src/plugins/vcalendar/vcal_folder.c:1972
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan inte ta bort mappen '%s'."
@@ -6139,8 +5846,7 @@ msgstr "Vill du söka efter ej prenumererade undermappar till '%s'?"
 msgid "Search recursively"
 msgstr "Sök rekursivt"
 
-#: src/imap_gtk.c:515
-#: src/imap_gtk.c:574
+#: src/imap_gtk.c:515 src/imap_gtk.c:574
 msgid "Subscriptions"
 msgstr "Prenumerationer"
 
@@ -6153,13 +5859,11 @@ msgstr "+_Sök"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Välj en undermapp till %s att prenumerera på: "
 
-#: src/imap_gtk.c:537
-#: src/mainwindow.c:672
+#: src/imap_gtk.c:537 src/mainwindow.c:672
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: src/imap_gtk.c:539
-#: src/imap_gtk.c:541
+#: src/imap_gtk.c:539 src/imap_gtk.c:541
 msgid "All of them"
 msgstr "Allihop"
 
@@ -6167,11 +5871,14 @@ msgstr "Allihop"
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
-"If there are new folders, created and subscribed to from another client, use \"Check for new folders\" at the mailbox's root folder."
+"If there are new folders, created and subscribed to from another client, use "
+"\"Check for new folders\" at the mailbox's root folder."
 msgstr ""
-"Den här mappen prenumeras redan på och har inga undermappar som inte prenumeras på.\n"
+"Den här mappen prenumeras redan på och har inga undermappar som inte "
+"prenumeras på.\n"
 "\n"
-"Om det finns nya mappar, skapade och prenumerade från en annan klient, använd \"Leta efter nya mappar\" i brevlådans rot-mapp."
+"Om det finns nya mappar, skapade och prenumerade från en annan klient, "
+"använd \"Leta efter nya mappar\" i brevlådans rot-mapp."
 
 #: src/imap_gtk.c:566
 #, c-format
@@ -6186,10 +5893,8 @@ msgstr "prenumerera"
 msgid "unsubscribe"
 msgstr "säg upp prenumeration"
 
-#: src/imap_gtk.c:569
-#: src/prefs_folder_item.c:1441
-#: src/prefs_folder_item.c:1469
-#: src/prefs_folder_item.c:1497
+#: src/imap_gtk.c:569 src/prefs_folder_item.c:1441
+#: src/prefs_folder_item.c:1469 src/prefs_folder_item.c:1497
 msgid "Apply to subfolders"
 msgstr "Använd på undermappar"
 
@@ -6201,8 +5906,7 @@ msgstr "+_Prenumerera"
 msgid "+_Unsubscribe"
 msgstr "+Säg _upp prenumeration"
 
-#: src/import.c:113
-#: src/import.c:207
+#: src/import.c:113 src/import.c:207
 msgid "Import mbox file"
 msgstr "Importera mbox-fil"
 
@@ -6246,15 +5950,11 @@ msgstr "Väld och döp om LDIF-fältnamn att importera."
 msgid "File imported."
 msgstr "Fil importerad."
 
-#: src/importldif.c:450
-#: src/importmutt.c:123
-#: src/importpine.c:122
+#: src/importldif.c:450 src/importmutt.c:123 src/importpine.c:122
 msgid "Please select a file."
 msgstr "Vänligen välj en fil."
 
-#: src/importldif.c:456
-#: src/importmutt.c:128
-#: src/importpine.c:127
+#: src/importldif.c:456 src/importmutt.c:128 src/importpine.c:127
 msgid "Address book name must be supplied."
 msgstr "Ett addressboksnamn måste anges."
 
@@ -6267,7 +5967,9 @@ msgid "Select LDIF File"
 msgstr "Välj LDIF fil"
 
 #: src/importldif.c:667
-msgid "Specify the name for the address book that will be created from the LDIF file data."
+msgid ""
+"Specify the name for the address book that will be created from the LDIF "
+"file data."
 msgstr "Ange namnet på adressbokenn som kommer skapas från data i LDIF-filen."
 
 #: src/importldif.c:672
@@ -6286,8 +5988,7 @@ msgstr "Välj LDIF-fil att importera."
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:726
-#: src/summaryview.c:441
+#: src/importldif.c:726 src/summaryview.c:441
 msgid "S"
 msgstr "S"
 
@@ -6308,8 +6009,21 @@ msgid "Attribute"
 msgstr "Attribut"
 
 #: src/importldif.c:807
-msgid "Choose the LDIF field that will be renamed or selected for import in the list above. Reserved fields (marked with a tick in the \"R\" column), are automatically imported and cannot be renamed. A single click in the Select (\"S\") column will select the field for import with a tick. A single click anywhere in the row will select that field for rename in the input area below the list. A double click anywhere in the row will also select the field for import."
-msgstr "Välj LDIF-fältet som kommer att döpas om eller bli valt för import i listan ovan. Reserverade fält (markerade med en bock i \"R\"-kolumnen), blir automatiskt importerade och kan inte döpas om. En enkelklick i Select- (\"S\")-kolumnen markerar fältet för import med en bock. Ett enkelklick var som i raden väljer det fältet för omdöpning i fältet under listan. Genom att dubbelklicka var som helst i raden så väljer du fältet för import."
+msgid ""
+"Choose the LDIF field that will be renamed or selected for import in the "
+"list above. Reserved fields (marked with a tick in the \"R\" column), are "
+"automatically imported and cannot be renamed. A single click in the Select "
+"(\"S\") column will select the field for import with a tick. A single click "
+"anywhere in the row will select that field for rename in the input area "
+"below the list. A double click anywhere in the row will also select the "
+"field for import."
+msgstr ""
+"Välj LDIF-fältet som kommer att döpas om eller bli valt för import i listan "
+"ovan. Reserverade fält (markerade med en bock i \"R\"-kolumnen), blir "
+"automatiskt importerade och kan inte döpas om. En enkelklick i Select- (\"S"
+"\")-kolumnen markerar fältet för import med en bock. Ett enkelklick var som "
+"i raden väljer det fältet för omdöpning i fältet under listan. Genom att "
+"dubbelklicka var som helst i raden så väljer du fältet för import."
 
 #: src/importldif.c:822
 msgid "The LDIF field can be renamed to the User Attribute name."
@@ -6355,8 +6069,7 @@ msgstr "Välj MUTT fil"
 msgid "Import MUTT file into Address Book"
 msgstr "Impora MUTT-fil till Adressbok"
 
-#: src/importmutt.c:289
-#: src/importpine.c:289
+#: src/importmutt.c:289 src/importpine.c:289
 msgid "Please select a file to import."
 msgstr "Vänligen välj en fil att importera."
 
@@ -6372,150 +6085,143 @@ msgstr "Välj Pine Fil"
 msgid "Import Pine file into Address Book"
 msgstr "Impora Pine-fil till Adressbok"
 
-#: src/inc.c:205
-#: src/inc.c:312
-#: src/inc.c:339
+#: src/inc.c:186 src/inc.c:293 src/inc.c:320
 msgid "Claws Mail needs network access in order to get mails."
-msgstr "Claws Mail behöver vara uppkopplad mot ett nätverk för att kunna hämta e-post."
+msgstr ""
+"Claws Mail behöver vara uppkopplad mot ett nätverk för att kunna hämta e-"
+"post."
 
-#: src/inc.c:361
+#: src/inc.c:342
 #, c-format
 msgid "%s failed\n"
 msgstr "%s misslyckades\n"
 
-#: src/inc.c:432
+#: src/inc.c:413
 msgid "Retrieving new messages"
 msgstr "Hämtar nya meddelanden"
 
-#: src/inc.c:493
+#: src/inc.c:474
 msgid "Standby"
 msgstr "Vänta"
 
-#: src/inc.c:618
-#: src/inc.c:672
+#: src/inc.c:604 src/inc.c:658
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: src/inc.c:629
+#: src/inc.c:615
 msgid "Retrieving"
 msgstr "Hämtar"
 
-#: src/inc.c:638
+#: src/inc.c:624
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Färdig (%d meddelande (%s) mottaget)"
 msgstr[1] "Färdig (%d meddelanden (%s) mottagna)"
 
-#: src/inc.c:644
+#: src/inc.c:630
 msgid "Done (no new messages)"
 msgstr "Klart (inga nya meddelande)"
 
-#: src/inc.c:649
+#: src/inc.c:635
 msgid "Connection failed"
 msgstr "Förbindelse misslyckades"
 
-#: src/inc.c:652
+#: src/inc.c:638
 msgid "Auth failed"
 msgstr "Aut. misslyckades"
 
-#: src/inc.c:659
-#: src/prefs_matcher.c:393
-#: src/prefs_summary_column.c:88
-#: src/summaryview.c:2782
-#: src/summaryview.c:6312
+#: src/inc.c:645 src/prefs_matcher.c:393 src/prefs_summary_column.c:88
+#: src/summaryview.c:2782 src/summaryview.c:6308
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:669
-#: src/plugins/spamassassin/spamassassin_gtk.c:378
+#: src/inc.c:655 src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Timeout"
 msgstr "Time out"
 
-#: src/inc.c:756
+#: src/inc.c:742
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Färdig (%d nytt meddelande)"
 msgstr[1] "Färdig (%d nya meddelanden)"
 
-#: src/inc.c:760
+#: src/inc.c:746
 msgid "Finished (no new messages)"
 msgstr "Färdigt (inga nya meddelande)"
 
-#: src/inc.c:799
+#: src/inc.c:785
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Hämtar nya meddelanden"
 
-#: src/inc.c:832
+#: src/inc.c:818
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Konto '%s': Ansluter till POP3 server: %s:%d..."
 
-#: src/inc.c:850
+#: src/inc.c:836
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Kan inte ansluta till POP3-server: %s:%d"
 
-#: src/inc.c:854
+#: src/inc.c:840
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan inte ansluta till POP3-server: %s:%d\n"
 
-#: src/inc.c:934
-#: src/send_message.c:478
+#: src/inc.c:920 src/send_message.c:486
 msgid "Authenticating..."
 msgstr "Autentiserar"
 
-#: src/inc.c:936
+#: src/inc.c:922
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Tar emot meddelanden från %s (%s) ..."
 
-#: src/inc.c:942
+#: src/inc.c:928
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Tar emot antal nya meddelanden (STAT)..."
 
-#: src/inc.c:946
+#: src/inc.c:932
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Tar emot antal nya meddelanden (LAST)..."
 
-#: src/inc.c:950
+#: src/inc.c:936
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Tar emot antal nya meddelanden (UIDL)..."
 
-#: src/inc.c:954
+#: src/inc.c:940
 msgid "Getting the size of messages (LIST)..."
 msgstr "Tar emot storleken på meddelanden (LIST)..."
 
-#: src/inc.c:961
-#: src/send_message.c:496
+#: src/inc.c:947 src/send_message.c:504
 msgid "Quitting"
 msgstr "Avslutar"
 
-#: src/inc.c:986
+#: src/inc.c:972
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Tar emot meddelande (%d / %d) (%s / %s)"
 
-#: src/inc.c:999
+#: src/inc.c:985
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Tar emot (%d meddelande (%s) mottaget)"
 msgstr[1] "Tar emot (%d meddelanden (%s) mottagna)"
 
-#: src/inc.c:1158
+#: src/inc.c:1144
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Anslutning till %s:%d misslyckades."
 
-#: src/inc.c:1163
+#: src/inc.c:1149
 msgid "Error occurred while processing mail."
 msgstr "Fel uppstod vid behandling av e-post."
 
-#: src/inc.c:1169
+#: src/inc.c:1155
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6524,39 +6230,37 @@ msgstr ""
 "Fel uppstod vid behandling av post:\n"
 "%s"
 
-#: src/inc.c:1175
+#: src/inc.c:1161
 msgid "No disk space left."
 msgstr "Inget diskutrymme kvar"
 
-#: src/inc.c:1180
+#: src/inc.c:1166
 msgid "Can't write file."
 msgstr "Kan inte skriva till fil."
 
-#: src/inc.c:1185
+#: src/inc.c:1171
 msgid "Socket error."
 msgstr "Socket fel."
 
-#: src/inc.c:1188
+#: src/inc.c:1174
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Socket-fel på anslutning till %s:%d."
 
-#: src/inc.c:1193
-#: src/send_message.c:406
-#: src/send_message.c:670
+#: src/inc.c:1179 src/send_message.c:414 src/send_message.c:678
 msgid "Connection closed by the remote host."
 msgstr "Anslutning avslutades av motstående värddator."
 
-#: src/inc.c:1196
+#: src/inc.c:1182
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Anslutning till %s:%d avslutades av motstående värddator."
 
-#: src/inc.c:1201
+#: src/inc.c:1187
 msgid "Mailbox is locked."
 msgstr "Brevlådan är låst."
 
-#: src/inc.c:1205
+#: src/inc.c:1191
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6565,13 +6269,11 @@ msgstr ""
 "Brevlådan är låst:\n"
 "%s"
 
-#: src/inc.c:1211
-#: src/send_message.c:655
+#: src/inc.c:1197 src/send_message.c:663
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades"
 
-#: src/inc.c:1217
-#: src/send_message.c:658
+#: src/inc.c:1203 src/send_message.c:666
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6580,42 +6282,34 @@ msgstr ""
 "Autentisering misslyckades:\n"
 "%s"
 
-#: src/inc.c:1222
-#: src/send_message.c:674
-msgid "Session timed out. You may be able to recover by increasing the timeout value in Preferences/Other/Miscellaneous."
-msgstr "Sessionen överskred tidsgränsen. Det kan vara möjligt att återställa genom att öka tidsgränsens värde i Egenskaper/Övrigt/Blandat."
+#: src/inc.c:1208 src/send_message.c:682
+msgid ""
+"Session timed out. You may be able to recover by increasing the timeout "
+"value in Preferences/Other/Miscellaneous."
+msgstr ""
+"Sessionen överskred tidsgränsen. Det kan vara möjligt att återställa genom "
+"att öka tidsgränsens värde i Egenskaper/Övrigt/Blandat."
 
-#: src/inc.c:1227
+#: src/inc.c:1213
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Anslutning till %s:%d överskred tidsgränsen."
 
-#: src/inc.c:1265
+#: src/inc.c:1251
 msgid "Incorporation cancelled\n"
 msgstr "Införlivande avbröts\n"
 
-#: src/inc.c:1457
-#, c-format
-msgid "Claws Mail: %d new message"
-msgid_plural "Claws Mail: %d new messages"
-msgstr[0] "Claws-Mail: %d nytt meddelande"
-msgstr[1] "Claws-Mail: %d nya meddelanden"
-
-#: src/inc.c:1584
-msgid "Unable to connect: you are offline."
-msgstr "Kan inte ansluta: du är frånkopplad."
-
-#: src/inc.c:1610
+#: src/inc.c:1518
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sDu arbetar frånkopplad. Åsidosätta i %d minuter?"
 
-#: src/inc.c:1616
+#: src/inc.c:1524
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sDu arbetar frånkopplad. Åsidosätta?"
 
-#: src/inc.c:1623
+#: src/inc.c:1531
 msgid "On_ly once"
 msgstr "Endast en gång"
 
@@ -6623,7 +6317,7 @@ msgstr "Endast en gång"
 msgid "Nick Name"
 msgstr "Smeknamn"
 
-#: src/main.c:272
+#: src/main.c:241
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6632,12 +6326,7 @@ msgstr ""
 "Filen '%s' finns redan.\n"
 "Kan inte ska skapa mapp."
 
-#: src/main.c:294
-#: src/main.c:307
-msgid "Exiting..."
-msgstr "Avslutar..."
-
-#: src/main.c:438
+#: src/main.c:362
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6646,7 +6335,7 @@ msgstr ""
 "Konfiguration för %s hittad.\n"
 "Vill du migrera denna konfiguration?"
 
-#: src/main.c:440
+#: src/main.c:364
 #, c-format
 msgid ""
 "\n"
@@ -6659,276 +6348,310 @@ msgstr ""
 "Dina Sylpheed-filterregler kan konverteras av ett\n"
 "skript tillgängligt på %s."
 
-#: src/main.c:452
+#: src/main.c:376
 msgid "Keep old configuration"
 msgstr "Behåll gammal konfiguration"
 
-#: src/main.c:455
-msgid "Keeping a backup will allow you to go back to an older version, but may take a while if you have cached IMAP or News data, and will take some extra room on your disk."
-msgstr "Att spara en backup kan låta dig gå tillbaka till en äldre version, men kommer att ta ett stund om du har cachad IMAP eller diskussionsgruppsdata, och kommer ta extra plats på din disk."
+#: src/main.c:379
+msgid ""
+"Keeping a backup will allow you to go back to an older version, but may take "
+"a while if you have cached IMAP or News data, and will take some extra room "
+"on your disk."
+msgstr ""
+"Att spara en backup kan låta dig gå tillbaka till en äldre version, men "
+"kommer att ta ett stund om du har cachad IMAP eller diskussionsgruppsdata, "
+"och kommer ta extra plats på din disk."
 
-#: src/main.c:463
+#: src/main.c:387
 msgid "Migration of configuration"
 msgstr "Migration av konfiguration"
 
-#: src/main.c:474
+#: src/main.c:398
 msgid "Copying configuration... This may take a while..."
 msgstr "Kopierar konfiguration...Detta kan ta en stund..."
 
-#: src/main.c:483
+#: src/main.c:407
 msgid "Migration failed!"
 msgstr "Migrationen misslyckades!"
 
-#: src/main.c:492
+#: src/main.c:416
 msgid "Migrating configuration..."
 msgstr "Migrerar konfiguration..."
 
-#: src/main.c:1039
+#: src/main.c:934
 msgid "Failed to register folder item update hook"
 msgstr "Misslyckades registrera kopplingspunkt för mapp-postuppdatering"
 
-#: src/main.c:1046
+#: src/main.c:941
 msgid "Failed to register folder update hook"
 msgstr "Misslyckades registrera kopplingspunkt för mappuppdatering"
 
-#: src/main.c:1226
+#: src/main.c:1110
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread stöds inte av glib.\n"
 
-#: src/main.c:1245
+#: src/main.c:1129
 msgid "Sylpheed-Claws 2.6.0 (or older)"
 msgstr "Sylpheed-Claws 2.6.0 (eller äldre)"
 
-#: src/main.c:1248
+#: src/main.c:1132
 msgid "Sylpheed-Claws 1.9.15 (or older)"
 msgstr "Sylpheed-Claws 1.9.15 (eller äldre)"
 
-#: src/main.c:1251
+#: src/main.c:1135
 msgid "Sylpheed-Claws 1.0.5 (or older)"
 msgstr "Sylpheed-Claws 1.0.5 (eller äldre)"
 
-#: src/main.c:1574
+#: src/main.c:1434
 #, c-format
 msgid ""
-"The following plugin failed to load. Check the Plugins configuration for more information:\n"
+"The following plugin failed to load. Check the Plugins configuration for "
+"more information:\n"
 "%s"
 msgid_plural ""
-"The following plugins failed to load. Check the Plugins configuration for more information:\n"
+"The following plugins failed to load. Check the Plugins configuration for "
+"more information:\n"
 "%s"
 msgstr[0] ""
-"Följande insticksmodul kunde inte läsas in. Kontrollera insticksmodulernas konfiguration för mer information:\n"
+"Följande insticksmodul kunde inte läsas in. Kontrollera insticksmodulernas "
+"konfiguration för mer information:\n"
 "%s"
 msgstr[1] ""
-"Följande insticksmoduler kunde inte läsas in. Kontrollera insticksmodulernas konfiguration för mer information:\n"
+"Följande insticksmoduler kunde inte läsas in. Kontrollera insticksmodulernas "
+"konfiguration för mer information:\n"
 "%s"
 
-#: src/main.c:1602
-msgid "Claws Mail has detected a configured mailbox, but it is incomplete. It is possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the mailbox parent folder's context menu to try to fix it."
-msgstr "Claws-Mail har upptäckt en konfigurerad brevlåda, men den är inte komplett. Det kan bero på ett misslyckat IMAP-konto. Använd \"Uppdatera mapplista\" i snabbmenyn till brevlådans föräldramapp för att försöka fixa det."
-
-#: src/main.c:1608
-msgid "Claws Mail has detected a configured mailbox, but could not load it. It is probably provided by an out-of-date external plugin. Please reinstall the plugin and try again."
-msgstr "Claws-Mail har upptäckt en konfigurerad brevlåda, men kunde inte läsa in den. Den är troligtvis tillhandahållen av en utdaterad extern insticksmodul. Vänligen installera insticksmodulen och försök igen."
+#: src/main.c:1462
+msgid ""
+"Claws Mail has detected a configured mailbox, but it is incomplete. It is "
+"possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
+"mailbox parent folder's context menu to try to fix it."
+msgstr ""
+"Claws-Mail har upptäckt en konfigurerad brevlåda, men den är inte komplett. "
+"Det kan bero på ett misslyckat IMAP-konto. Använd \"Uppdatera mapplista\" i "
+"snabbmenyn till brevlådans föräldramapp för att försöka fixa det."
 
-#: src/main.c:1637
-#, c-format
-msgid "Claws Mail can not start without its data volume (%s)."
-msgstr "Claws-Mail kan inte starta utan sin data volym (%s)."
+#: src/main.c:1468
+msgid ""
+"Claws Mail has detected a configured mailbox, but could not load it. It is "
+"probably provided by an out-of-date external plugin. Please reinstall the "
+"plugin and try again."
+msgstr ""
+"Claws-Mail har upptäckt en konfigurerad brevlåda, men kunde inte läsa in "
+"den. Den är troligtvis tillhandahållen av en utdaterad extern insticksmodul. "
+"Vänligen installera insticksmodulen och försök igen."
 
-#: src/main.c:1884
+#: src/main.c:1711
 msgid "Missing filename\n"
 msgstr "Saknar filnamn\n"
 
-#: src/main.c:1891
+#: src/main.c:1718
 msgid "Cannot open filename for reading\n"
 msgstr "Kan inte öppna filnamn för läsning\n"
 
-#: src/main.c:1902
+#: src/main.c:1729
 msgid "Malformed header\n"
 msgstr "Felaktigt brevhuvud\n"
 
-#: src/main.c:1909
+#: src/main.c:1736
 msgid "Duplicated 'To:' header\n"
 msgstr "Duplicerat brevhuvud 'To:'\n"
 
-#: src/main.c:1924
+#: src/main.c:1751
 msgid "Missing required 'To:' header\n"
 msgstr "Nödvändigt brevhuvud 'To:' saknas\n"
 
-#: src/main.c:2071
+#: src/main.c:1898
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Användning: %s [VAL]...\n"
 
-#: src/main.c:2073
+#: src/main.c:1900
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adress]               öppna nytt meddelandefönster"
 
-#: src/main.c:2074
+#: src/main.c:1901
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
-"                         use - as file name for reading from standard input;\n"
-"                         content format: headers first (To: required) until an\n"
+"                         use - as file name for reading from standard "
+"input;\n"
+"                         content format: headers first (To: required) until "
+"an\n"
 "                         empty line, then mail body until end of file."
 msgstr ""
-"  --compose-from-file fil          öppna kompositionsfönstret med data från given fil;\n"
-"                                   änvänd - som filnamn för att läsa från standard input;\n"
-"                                   innehållsformat: brevhuvuden först (To: krävs) tills tom rad,\n"
+"  --compose-from-file fil          öppna kompositionsfönstret med data från "
+"given fil;\n"
+"                                   änvänd - som filnamn för att läsa från "
+"standard input;\n"
+"                                   innehållsformat: brevhuvuden först (To: "
+"krävs) tills tom rad,\n"
 "                                   sedan meddelandetexten tills filslut."
 
-#: src/main.c:2079
+#: src/main.c:1906
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
-msgstr "  --subscribe [uri]                prenumerera på den angivna URI'n, om möjligt"
+msgstr ""
+"  --subscribe [uri]                prenumerera på den angivna URI'n, om "
+"möjligt"
 
-#: src/main.c:2080
+#: src/main.c:1907
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
-msgstr "  --attach fil1 [fil2]...          öppna nytt meddelandefönster med valda filer bifogade"
+msgstr ""
+"  --attach fil1 [fil2]...          öppna nytt meddelandefönster med valda "
+"filer bifogade"
 
-#: src/main.c:2083
+#: src/main.c:1910
 msgid "  --receive              receive new messages"
 msgstr "  --receive                        ta emot nya meddelanden"
 
-#: src/main.c:2084
+#: src/main.c:1911
 msgid "  --receive-all          receive new messages of all accounts"
-msgstr "  --receive-all                    ta emot nya meddelanden från alla konton"
+msgstr ""
+"  --receive-all                    ta emot nya meddelanden från alla konton"
 
-#: src/main.c:2085
+#: src/main.c:1912
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving       avbryt mottagande av meddelanden"
 
-#: src/main.c:2086
+#: src/main.c:1913
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending        avbryt skickande av meddelanden"
 
-#: src/main.c:2087
+#: src/main.c:1914
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
 "                         folder ex.: \"#mh/Mailbox/inbox\" or \"Mail\"\n"
-"                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] or g: tag\n"
+"                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] or "
+"g: tag\n"
 "                         request: search string\n"
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr ""
 "  --search mapp typ söksträng [rekursivt]\n"
 "                                   söker meddelanden\n"
-"                                   mapp ex.: \"#mh/Mailbox/inbox\" eller \"Mail\"\n"
-"                                   typ: s[ubject],f[rom],t[o],e[xtended],m[ixed] eller g: tag\n"
+"                                   mapp ex.: \"#mh/Mailbox/inbox\" eller "
+"\"Mail\"\n"
+"                                   typ: s[ubject],f[rom],t[o],e[xtended],m"
+"[ixed] eller g: tag\n"
 "                                   söksträng: söksträng att söka på\n"
-"                                   rekursivt: falskt om arg. börjar på 0, n, N, f or F"
+"                                   rekursivt: falskt om arg. börjar på 0, n, "
+"N, f or F"
 
-#: src/main.c:2094
+#: src/main.c:1921
 msgid "  --send                 send all queued messages"
 msgstr "  --send                           skicka alla köade meddelanden"
 
-#: src/main.c:2095
+#: src/main.c:1922
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mapp]...               visa totalt antal meddelanden"
 
-#: src/main.c:2096
+#: src/main.c:1923
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status-full [mapp]...          visa status för varje mapp"
 
-#: src/main.c:2098
+#: src/main.c:1925
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics                     visa sessionsstatistik"
 
-#: src/main.c:2099
+#: src/main.c:1926
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics               återställ sessionsstatistik"
 
-#: src/main.c:2100
+#: src/main.c:1927
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
 msgstr ""
 "  --select mapp[/meddelande]       hoppar till angiven mapp/meddelande\n"
-"                                   mapp är ett mapp-id som 'mapp/underkatalog'"
+"                                   mapp är ett mapp-id som 'mapp/"
+"underkatalog'"
 
-#: src/main.c:2102
+#: src/main.c:1929
 msgid "  --online               switch to online mode"
 msgstr "  --online                         byt till anslutet läge"
 
-#: src/main.c:2103
+#: src/main.c:1930
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline                        byt till frånkopplat läge"
 
-#: src/main.c:2104
+#: src/main.c:1931
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q                 avsluta Claws Mail"
 
-#: src/main.c:2105
+#: src/main.c:1932
 msgid "  --debug                debug mode"
 msgstr "  --debug                          avlusningsläge"
 
-#: src/main.c:2106
+#: src/main.c:1933
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug                          avlusningsläge"
 
-#: src/main.c:2107
+#: src/main.c:1934
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h                        visa denna hjälp och avsluta"
 
-#: src/main.c:2108
+#: src/main.c:1935
 msgid "  --version -v           output version information and exit"
-msgstr "  --version -v                     skriv ut versionsinformation och avsluta"
+msgstr ""
+"  --version -v                     skriv ut versionsinformation och avsluta"
 
-#: src/main.c:2109
-msgid "  --version-full -V      output version and built-in features information and exit"
-msgstr "  --version-full -V                skriv ut versionsinformation och inbyggd funktionsinformation och avsluta"
+#: src/main.c:1936
+msgid ""
+"  --version-full -V      output version and built-in features information "
+"and exit"
+msgstr ""
+"  --version-full -V                skriv ut versionsinformation och inbyggd "
+"funktionsinformation och avsluta"
 
-#: src/main.c:2110
+#: src/main.c:1937
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir                     skriv ut konfigurationsmapp"
 
-#: src/main.c:2111
+#: src/main.c:1938
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
 msgstr "  --alternate-config-dir [mapp]    använd angiven konfigurationsmapp"
 
-#: src/main.c:2161
+#: src/main.c:1988
 msgid "Unknown option\n"
 msgstr "Okänt alternativ\n"
 
-#: src/main.c:2179
+#: src/main.c:2006
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Behandlar (%s)..."
 
-#: src/main.c:2182
+#: src/main.c:2009
 msgid "top level folder"
 msgstr "toppnivåmapp"
 
-#: src/main.c:2265
+#: src/main.c:2092
 msgid "Queued messages"
 msgstr "Meddelanden i kö"
 
-#: src/main.c:2266
+#: src/main.c:2093
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Några osända meddelanden ligger i kö. Avsluta nu?"
 
-#: src/main.c:2999
+#: src/main.c:2818
 msgid "NetworkManager: network is online.\n"
 msgstr "Nätverkshanteraren: nätverket är online.\n"
 
-#: src/main.c:3005
+#: src/main.c:2824
 msgid "NetworkManager: network is offline.\n"
 msgstr "Nätverkshanteraren: nätverket är frånkopplat.\n"
 
-#: src/mainwindow.c:503
-#: src/messageview.c:210
+#: src/mainwindow.c:503 src/messageview.c:208
 msgid "_File"
 msgstr "_Arkiv"
 
-#: src/mainwindow.c:505
-#: src/messageview.c:212
-#: src/summaryview.c:436
+#: src/mainwindow.c:505 src/messageview.c:210 src/summaryview.c:436
 msgid "_View"
 msgstr "_Visa"
 
@@ -6964,23 +6687,19 @@ msgstr "Exportera _valda till mbox-fil..."
 msgid "Empty all _Trash folders"
 msgstr "_Töm alla papperskorgar"
 
-#: src/mainwindow.c:526
-#: src/messageview.c:219
+#: src/mainwindow.c:526 src/messageview.c:217
 msgid "_Save email as..."
 msgstr "_Spara epost som..."
 
-#: src/mainwindow.c:527
-#: src/messageview.c:220
+#: src/mainwindow.c:527 src/messageview.c:218
 msgid "_Save part as..."
 msgstr "_Spara del som..."
 
-#: src/mainwindow.c:530
-#: src/messageview.c:221
+#: src/mainwindow.c:530 src/messageview.c:219
 msgid "Page setup..."
 msgstr "Sidinstä_llningar..."
 
-#: src/mainwindow.c:531
-#: src/messageview.c:222
+#: src/mainwindow.c:531 src/messageview.c:220
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
@@ -7048,127 +6767,99 @@ msgstr "E_xpandera alla trådar"
 msgid "Co_llapse all threads"
 msgstr "Ko_llapsa alla trådar"
 
-#: src/mainwindow.c:568
-#: src/messageview.c:233
+#: src/mainwindow.c:568 src/messageview.c:231
 msgid "_Go to"
 msgstr "_Gå till"
 
-#: src/mainwindow.c:569
-#: src/messageview.c:234
+#: src/mainwindow.c:569 src/messageview.c:232
 msgid "_Previous message"
 msgstr "_Föregående meddelande"
 
-#: src/mainwindow.c:570
-#: src/messageview.c:235
+#: src/mainwindow.c:570 src/messageview.c:233
 msgid "_Next message"
 msgstr "_Nästa meddelande"
 
-#: src/mainwindow.c:572
-#: src/messageview.c:237
+#: src/mainwindow.c:572 src/messageview.c:235
 msgid "P_revious unread message"
 msgstr "Fö_regående olästa meddelande"
 
-#: src/mainwindow.c:573
-#: src/messageview.c:238
+#: src/mainwindow.c:573 src/messageview.c:236
 msgid "N_ext unread message"
 msgstr "N_ästa olästa meddelanden"
 
-#: src/mainwindow.c:575
-#: src/messageview.c:240
+#: src/mainwindow.c:575 src/messageview.c:238
 msgid "Previous ne_w message"
 msgstr "Föregående n_ytt meddelande"
 
-#: src/mainwindow.c:576
-#: src/messageview.c:241
+#: src/mainwindow.c:576 src/messageview.c:239
 msgid "Ne_xt new message"
 msgstr "N_ästa nya meddelande"
 
-#: src/mainwindow.c:578
-#: src/messageview.c:243
+#: src/mainwindow.c:578 src/messageview.c:241
 msgid "Previous _marked message"
 msgstr "Föregående _markerade meddelande"
 
-#: src/mainwindow.c:579
-#: src/messageview.c:244
+#: src/mainwindow.c:579 src/messageview.c:242
 msgid "Next m_arked message"
 msgstr "Nästa m_arkerade meddelande"
 
-#: src/mainwindow.c:581
-#: src/messageview.c:246
+#: src/mainwindow.c:581 src/messageview.c:244
 msgid "Previous _labeled message"
 msgstr "Föregående _färgade meddelande"
 
-#: src/mainwindow.c:582
-#: src/messageview.c:247
+#: src/mainwindow.c:582 src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "Nästa fär_gade meddelande"
 
-#: src/mainwindow.c:584
-#: src/messageview.c:249
+#: src/mainwindow.c:584 src/messageview.c:247
 msgid "Previous opened message"
 msgstr "Föregående öppnat meddelande"
 
-#: src/mainwindow.c:585
-#: src/messageview.c:250
+#: src/mainwindow.c:585 src/messageview.c:248
 msgid "Next opened message"
 msgstr "Nästa öppnade meddelande"
 
-#: src/mainwindow.c:587
-#: src/messageview.c:252
+#: src/mainwindow.c:587 src/messageview.c:250
 msgid "Parent message"
 msgstr "Överliggande meddelande"
 
-#: src/mainwindow.c:589
-#: src/messageview.c:254
+#: src/mainwindow.c:589 src/messageview.c:252
 msgid "Next unread _folder"
 msgstr "Nästa olästa _mapp"
 
-#: src/mainwindow.c:590
-#: src/messageview.c:255
+#: src/mainwindow.c:590 src/messageview.c:253
 msgid "_Other folder..."
 msgstr "Annan ma_pp..."
 
-#: src/mainwindow.c:592
-#: src/messageview.c:257
-#: src/mimeview.c:210
+#: src/mainwindow.c:592 src/messageview.c:255 src/mimeview.c:201
 msgid "Next part"
 msgstr "Nästa del"
 
-#: src/mainwindow.c:593
-#: src/messageview.c:258
-#: src/mimeview.c:211
+#: src/mainwindow.c:593 src/messageview.c:256 src/mimeview.c:202
 msgid "Previous part"
 msgstr "Föregående del"
 
-#: src/mainwindow.c:596
-#: src/messageview.c:259
+#: src/mainwindow.c:596 src/messageview.c:257
 msgid "Message scroll"
 msgstr "Meddelanderullning"
 
-#: src/mainwindow.c:597
-#: src/messageview.c:260
+#: src/mainwindow.c:597 src/messageview.c:258
 msgid "Previous line"
 msgstr "Föregående rad"
 
-#: src/mainwindow.c:598
-#: src/messageview.c:261
+#: src/mainwindow.c:598 src/messageview.c:259
 msgid "Next line"
 msgstr "Nästa rad"
 
-#: src/mainwindow.c:599
-#: src/messageview.c:262
-#: src/printing.c:487
+#: src/mainwindow.c:599 src/messageview.c:260 src/printing.c:487
 msgid "Previous page"
 msgstr "Föregående sida"
 
-#: src/mainwindow.c:600
-#: src/messageview.c:263
-#: src/printing.c:494
+#: src/mainwindow.c:600 src/messageview.c:261 src/printing.c:494
 msgid "Next page"
 msgstr "Nästa sida"
 
-#: src/mainwindow.c:618
-#: src/messageview.c:281
+#: src/mainwindow.c:618 src/messageview.c:279
 msgid "Decode"
 msgstr "Avkoda"
 
@@ -7176,34 +6867,27 @@ msgstr "Avkoda"
 msgid "Open in new _window"
 msgstr "_Öppna i nytt fönster"
 
-#: src/mainwindow.c:626
-#: src/messageview.c:288
+#: src/mainwindow.c:626 src/messageview.c:286
 msgid "Mess_age source"
 msgstr "Meddel_andets källkod"
 
-#: src/mainwindow.c:628
-#: src/messageview.c:289
+#: src/mainwindow.c:628 src/messageview.c:287
 msgid "Message part"
 msgstr " Meddelandedel"
 
-#: src/mainwindow.c:629
-#: src/messageview.c:290
+#: src/mainwindow.c:629 src/messageview.c:288
 msgid "View as text"
 msgstr "Visa som text"
 
-#: src/mainwindow.c:630
-#: src/messageview.c:291
-#: src/toolbar.c:401
+#: src/mainwindow.c:630 src/messageview.c:289 src/toolbar.c:402
 msgid "Open"
 msgstr "Öppna"
 
-#: src/mainwindow.c:632
-#: src/messageview.c:293
+#: src/mainwindow.c:632 src/messageview.c:291
 msgid "Open with..."
 msgstr "Öppna _med..."
 
-#: src/mainwindow.c:636
-#: src/messageview.c:296
+#: src/mainwindow.c:636 src/messageview.c:294
 msgid "Quotes"
 msgstr "Citat"
 
@@ -7233,26 +6917,22 @@ msgstr "_Skicka köade meddelanden"
 
 #: src/mainwindow.c:652
 msgid "Compose a_n email message"
-msgstr "_Nytt e-postmeddelande"
+msgstr "Skriv e-postmeddela_nde"
 
 #: src/mainwindow.c:653
 msgid "Compose a news message"
 msgstr "Nytt diskussionsgruppsmeddelande"
 
-#: src/mainwindow.c:655
-#: src/messageview.c:302
+#: src/mainwindow.c:655 src/messageview.c:300
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "Sva_ra"
 
-#: src/mainwindow.c:656
-#: src/messageview.c:303
-#: src/summaryview.c:428
+#: src/mainwindow.c:656 src/messageview.c:301 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "Svara t_ill"
 
-#: src/mainwindow.c:659
-#: src/messageview.c:306
+#: src/mainwindow.c:659 src/messageview.c:304
 msgid "Mailing _list"
 msgstr "Sänd_lista"
 
@@ -7260,21 +6940,15 @@ msgstr "Sänd_lista"
 msgid "Follow-up and reply to"
 msgstr "Följ upp och svara till"
 
-#: src/mainwindow.c:663
-#: src/messageview.c:309
-#: src/toolbar.c:2087
+#: src/mainwindow.c:663 src/messageview.c:307 src/toolbar.c:2088
 msgid "_Forward"
 msgstr "Vidarebe_fordra"
 
-#: src/mainwindow.c:664
-#: src/messageview.c:310
-#: src/toolbar.c:2088
+#: src/mainwindow.c:664 src/messageview.c:308 src/toolbar.c:2089
 msgid "For_ward as attachment"
 msgstr "_Vidarebefordra som bilaga"
 
-#: src/mainwindow.c:665
-#: src/messageview.c:311
-#: src/toolbar.c:2089
+#: src/mainwindow.c:665 src/messageview.c:309 src/toolbar.c:2090
 msgid "Redirec_t"
 msgstr "Omdiri_gera"
 
@@ -7322,9 +6996,7 @@ msgstr "Ta _bort..."
 msgid "Cancel a news message"
 msgstr "Avbryt ett diskussionsgruppmeddelande"
 
-#: src/mainwindow.c:689
-#: src/mainwindow.c:690
-#: src/summaryview.c:429
+#: src/mainwindow.c:689 src/mainwindow.c:690 src/summaryview.c:429
 msgid "_Mark"
 msgstr "_Markera"
 
@@ -7344,10 +7016,8 @@ msgstr "Markera som _läst"
 msgid "Mark all read"
 msgstr "Markera alla som lästa"
 
-#: src/mainwindow.c:699
-#: src/prefs_filtering_action.c:199
-#: src/toolbar.c:207
-#: src/toolbar.c:417
+#: src/mainwindow.c:699 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/toolbar.c:418
 msgid "Ignore thread"
 msgstr "Ignorera tråd"
 
@@ -7355,10 +7025,8 @@ msgstr "Ignorera tråd"
 msgid "Unignore thread"
 msgstr "Sluta ignorera tråd"
 
-#: src/mainwindow.c:701
-#: src/prefs_filtering_action.c:200
-#: src/toolbar.c:208
-#: src/toolbar.c:418
+#: src/mainwindow.c:701 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/toolbar.c:419
 msgid "Watch thread"
 msgstr "Bevaka tråd"
 
@@ -7374,23 +7042,19 @@ msgstr "Markera som _skräppost"
 msgid "Mark as _ham"
 msgstr "Markera som ej skräppost"
 
-#: src/mainwindow.c:709
-#: src/prefs_filtering_action.c:181
+#: src/mainwindow.c:709 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Lås"
 
-#: src/mainwindow.c:710
-#: src/prefs_filtering_action.c:182
+#: src/mainwindow.c:710 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Lås upp"
 
-#: src/mainwindow.c:712
-#: src/summaryview.c:430
+#: src/mainwindow.c:712 src/summaryview.c:430
 msgid "Color la_bel"
 msgstr "Färgm_arkera"
 
-#: src/mainwindow.c:713
-#: src/summaryview.c:431
+#: src/mainwindow.c:713 src/summaryview.c:431
 msgid "Ta_gs"
 msgstr "_Etiketter"
 
@@ -7398,14 +7062,11 @@ msgstr "_Etiketter"
 msgid "Re-_edit"
 msgstr "_Omredigera"
 
-#: src/mainwindow.c:719
-#: src/messageview.c:312
-#: src/mimeview.c:1039
+#: src/mainwindow.c:719 src/messageview.c:310 src/mimeview.c:1030
 msgid "Check signature"
 msgstr "Kontrollera signatur"
 
-#: src/mainwindow.c:724
-#: src/messageview.c:316
+#: src/mainwindow.c:724 src/messageview.c:314
 msgid "Add sender to address boo_k"
 msgstr "Lägg till avsändaren till adressbo_ken"
 
@@ -7433,49 +7094,35 @@ msgstr "Filtrera _markerade meddelanden"
 msgid "Run folder pr_ocessing rules"
 msgstr "Kör behandlingsregler för mappen"
 
-#: src/mainwindow.c:735
-#: src/messageview.c:319
+#: src/mainwindow.c:735 src/messageview.c:317
 msgid "_Create filter rule"
 msgstr "Skapa filter_regel"
 
-#: src/mainwindow.c:736
-#: src/mainwindow.c:742
-#: src/messageview.c:320
-#: src/messageview.c:326
+#: src/mainwindow.c:736 src/mainwindow.c:742 src/messageview.c:318
+#: src/messageview.c:324
 msgid "_Automatically"
 msgstr "_Automatiskt"
 
-#: src/mainwindow.c:737
-#: src/mainwindow.c:743
-#: src/mainwindow.c:847
-#: src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:737 src/mainwindow.c:743 src/mainwindow.c:845
+#: src/messageview.c:319 src/messageview.c:325
 msgid "By _From"
 msgstr "Efter _Från"
 
-#: src/mainwindow.c:738
-#: src/mainwindow.c:744
-#: src/mainwindow.c:848
-#: src/messageview.c:322
-#: src/messageview.c:328
+#: src/mainwindow.c:738 src/mainwindow.c:744 src/mainwindow.c:846
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _To"
 msgstr "Efter _Till"
 
-#: src/mainwindow.c:739
-#: src/mainwindow.c:745
-#: src/messageview.c:323
-#: src/messageview.c:329
+#: src/mainwindow.c:739 src/mainwindow.c:745 src/messageview.c:321
+#: src/messageview.c:327
 msgid "By _Subject"
 msgstr "Efter _Ämne"
 
-#: src/mainwindow.c:741
-#: src/messageview.c:325
-#: src/summaryview.c:434
+#: src/mainwindow.c:741 src/messageview.c:323 src/summaryview.c:434
 msgid "Create processing rule"
 msgstr "Skapa behandlingsregel"
 
-#: src/mainwindow.c:748
-#: src/messageview.c:333
+#: src/mainwindow.c:748 src/messageview.c:331
 msgid "List _URLs..."
 msgstr "Lista _webbadresser..."
 
@@ -7615,202 +7262,186 @@ msgstr "_Dölj lästa meddelanden"
 msgid "Hide deleted messages"
 msgstr "Dölj borttagna meddelanden"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:815
 msgid "_Fullscreen"
 msgstr "_Helskärm"
 
-#: src/mainwindow.c:818
-#: src/messageview.c:345
+#: src/mainwindow.c:816 src/messageview.c:343
 msgid "Show all _headers"
 msgstr "Visa alla brev_huvuden"
 
-#: src/mainwindow.c:819
-#: src/messageview.c:346
+#: src/mainwindow.c:817 src/messageview.c:344
 msgid "_Collapse all"
 msgstr "Ko_llapsa alla"
 
-#: src/mainwindow.c:820
-#: src/messageview.c:347
+#: src/mainwindow.c:818 src/messageview.c:345
 msgid "Collapse from level _2"
 msgstr "Kollapsa från nivå _2"
 
-#: src/mainwindow.c:821
-#: src/messageview.c:348
+#: src/mainwindow.c:819 src/messageview.c:346
 msgid "Collapse from level _3"
 msgstr "Kollapsa från nivå _3"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:823
 msgid "Text _below icons"
 msgstr "Text under ikoner"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:824
 msgid "Text be_side icons"
 msgstr "Text bredvid ikoner"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:825
 msgid "_Icons only"
 msgstr "Endast _ikoner"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:826
 msgid "_Text only"
 msgstr "Endast _text"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:833
 msgid "_Standard"
 msgstr "_Standard"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:834
 msgid "_Three columns"
 msgstr "_Tre kolumner"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:835
 msgid "_Wide message"
 msgstr "_Brett meddelande"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:836
 msgid "W_ide message list"
 msgstr "Bred meddelandelista"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:837
 msgid "S_mall screen"
 msgstr "Liten skärm"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:841
 msgid "By _number"
 msgstr "Efter _Nummer"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:842
 msgid "By s_ize"
 msgstr "Efter storlek"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:843
 msgid "By _date"
 msgstr "Efter _datum"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:844
 msgid "By thread date"
 msgstr "Efter Datum för tråd"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:847
 msgid "By s_ubject"
 msgstr "Efter _ämne"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:848
 msgid "By _color label"
 msgstr "Efter färgmarkering"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:849
 msgid "By tag"
 msgstr "Efter etikett"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:850
 msgid "By _mark"
 msgstr "Efter _markering"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:851
 msgid "By _status"
 msgstr "Efter _status"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:852
 msgid "By a_ttachment"
 msgstr "Efter _bilaga"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:853
 msgid "By score"
 msgstr "Efter poäng"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:854
 msgid "By locked"
 msgstr "Efter låst"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:855
 msgid "D_on't sort"
 msgstr "S_ortera inte"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:859
 msgid "Ascending"
 msgstr "Stigande"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:860
 msgid "Descending"
 msgstr "Fallande"
 
-#: src/mainwindow.c:903
-#: src/messageview.c:389
+#: src/mainwindow.c:901 src/messageview.c:387
 msgid "_Auto detect"
 msgstr "Upptäck _automatiskt"
 
-#: src/mainwindow.c:1299
-#: src/summaryview.c:6238
+#: src/mainwindow.c:1297 src/summaryview.c:6234
 msgid "Apply tags..."
 msgstr "Lägg till etiketter..."
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:1935
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Något/några fel inträffade. Klicka här för att se loggen."
 
-#: src/mainwindow.c:2127
+#: src/mainwindow.c:1950
 msgid "You are online. Click the icon to go offline"
 msgstr "Du är ansluten. Klicka här för att koppla ifrån"
 
-#: src/mainwindow.c:2130
+#: src/mainwindow.c:1953
 msgid "You are offline. Click the icon to go online"
 msgstr "Du är inte ansluten. Klicka här för att ansluta"
 
-#: src/mainwindow.c:2144
+#: src/mainwindow.c:1967
 msgid "Select account"
 msgstr "Välj konto"
 
-#: src/mainwindow.c:2171
-#: src/prefs_logging.c:140
+#: src/mainwindow.c:1994 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Nätverkslogg"
 
-#: src/mainwindow.c:2175
+#: src/mainwindow.c:1998
 msgid "Filtering/Processing debug log"
 msgstr "Felsökningslogg för filtrerings- och behandllingsregler"
 
-#: src/mainwindow.c:2194
-#: src/prefs_logging.c:392
+#: src/mainwindow.c:2017 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "filtreringslogg aktiverad\n"
 
-#: src/mainwindow.c:2196
-#: src/prefs_logging.c:394
+#: src/mainwindow.c:2019 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "filtreringslogg avaktiverad\n"
 
-#: src/mainwindow.c:2642
-#: src/mainwindow.c:2649
-#: src/mainwindow.c:2692
-#: src/mainwindow.c:2725
-#: src/mainwindow.c:2757
-#: src/mainwindow.c:2802
+#: src/mainwindow.c:2460 src/mainwindow.c:2467 src/mainwindow.c:2510
+#: src/mainwindow.c:2543 src/mainwindow.c:2575 src/mainwindow.c:2620
 #: src/plugins/notification/notification_trayicon.c:363
 #: src/prefs_folder_item.c:1067
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: src/mainwindow.c:2803
-#: src/prefs_summary_open.c:114
+#: src/mainwindow.c:2621 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "inget"
 
-#: src/mainwindow.c:3060
-#: src/mainwindow.c:3064
+#: src/mainwindow.c:2878 src/mainwindow.c:2882
 msgid "Delete all messages in trash folders?"
 msgstr "Ta bort alla meddelande från papperskorgar?"
 
-#: src/mainwindow.c:3061
+#: src/mainwindow.c:2879
 msgid "Don't quit"
 msgstr "A_vsluta inte"
 
-#: src/mainwindow.c:3090
-#: src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2908 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:3091
+#: src/mainwindow.c:2909
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7820,116 +7451,106 @@ msgstr ""
 "Om en existerande brevlåda specificeras, kommer den\n"
 "att genomsökas automatiskt."
 
-#: src/mainwindow.c:3097
-#: src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:158
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Brevlådan '%s' finns redan."
 
-#: src/mainwindow.c:3102
-#: src/plugins/mailmbox/plugin_gtk.c:202
-#: src/setup.c:52
-#: src/wizard.c:774
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:202 src/setup.c:52
+#: src/wizard.c:737
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:3107
-#: src/plugins/mailmbox/plugin_gtk.c:209
-#: src/setup.c:55
+#: src/mainwindow.c:2925 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
-"Maybe some files already exist, or you don't have the permission to write there."
+"Maybe some files already exist, or you don't have the permission to write "
+"there."
 msgstr ""
 "Skapande av brevlåda misslyckades.\n"
 "Några filer finns kanske redan, eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:3553
+#: src/mainwindow.c:3373
 msgid "No posting allowed"
 msgstr "Inte tillåtet att skicka"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "Fel vid import av mbox-fil."
 
-#: src/mainwindow.c:4140
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:3960 src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "Export till mbox-fil misslyckades"
 
-#: src/mainwindow.c:4190
-#: src/plugins/notification/notification_trayicon.c:518
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:518
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:4190
-#: src/plugins/notification/notification_trayicon.c:518
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:518
 msgid "Exit Claws Mail?"
 msgstr "Avsluta Claws Mail?"
 
-#: src/mainwindow.c:4379
+#: src/mainwindow.c:4199
 msgid "Folder synchronisation"
 msgstr "Synkronisera mappar"
 
-#: src/mainwindow.c:4380
+#: src/mainwindow.c:4200
 msgid "Do you want to synchronise your folders now?"
 msgstr "Vill du synkronisera dina mappar nu?"
 
-#: src/mainwindow.c:4381
+#: src/mainwindow.c:4201
 msgid "+_Synchronise"
 msgstr "+_Synkronisera"
 
-#: src/mainwindow.c:4810
+#: src/mainwindow.c:4630
 msgid "Deleting duplicated messages..."
 msgstr "Tar bort meddelandedubbletter..."
 
-#: src/mainwindow.c:4847
+#: src/mainwindow.c:4667
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Ta bort %d meddelandedubbletter i %d mappar.\n"
 msgstr[1] "Ta bort %d dubblerade meddelande i %d mappar.\n"
 
-#: src/mainwindow.c:5102
-#: src/summaryview.c:5727
+#: src/mainwindow.c:4922 src/summaryview.c:5723
 msgid "Processing rules to apply before folder rules"
 msgstr "Behandlingsregler att applicera före mappregler"
 
-#: src/mainwindow.c:5110
+#: src/mainwindow.c:4930
 msgid "Processing rules to apply after folder rules"
 msgstr "Behandlingsregler att applicera efter mappregler"
 
-#: src/mainwindow.c:5118
-#: src/summaryview.c:5738
+#: src/mainwindow.c:4938 src/summaryview.c:5734
 msgid "Filtering configuration"
 msgstr "Filtreringskonfiguration"
 
-#: src/mainwindow.c:5233
+#: src/mainwindow.c:5053
 msgid "Can not register as default client: impossible to get executable path."
-msgstr "Kan inte registrera som standardklient: omöjligt att hitta sökväg till exekverbar fil."
+msgstr ""
+"Kan inte registrera som standardklient: omöjligt att hitta sökväg till "
+"exekverbar fil."
 
-#: src/mainwindow.c:5292
+#: src/mainwindow.c:5112
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws-Mail har blivit registrerad som standardklient."
 
-#: src/mainwindow.c:5294
-msgid "Can not register as default client: impossible to write to the registry."
-msgstr "Kan inte registrera som standardklient: omöjligt att skriva till registret."
+#: src/mainwindow.c:5114
+msgid ""
+"Can not register as default client: impossible to write to the registry."
+msgstr ""
+"Kan inte registrera som standardklient: omöjligt att skriva till registret."
 
-#: src/mainwindow.c:5452
+#: src/mainwindow.c:5272
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "Glömde %d lösenord i %d konton.\n"
 msgstr[1] "Glömde %d lösenord i %d konton.\n"
 
-#: src/matcher.c:209
-#: src/matcher.c:210
-#: src/matcher.c:211
-#: src/matcher.c:212
-#: src/matcher.c:213
-#: src/matcher.c:214
-#: src/matcher.c:215
+#: src/matcher.c:209 src/matcher.c:210 src/matcher.c:211 src/matcher.c:212
+#: src/matcher.c:213 src/matcher.c:214 src/matcher.c:215
 #, c-format
 msgid "%s header"
 msgstr "%s brevhuvud"
@@ -7950,48 +7571,30 @@ msgstr "meddelandetextrad"
 msgid "tag"
 msgstr "etikett"
 
-#: src/matcher.c:517
-#: src/matcher.c:522
-#: src/matcher.c:542
-#: src/matcher.c:547
-#: src/message_search.c:212
-#: src/prefs_matcher.c:737
-#: src/summary_search.c:452
+#: src/matcher.c:523 src/matcher.c:528 src/matcher.c:548 src/matcher.c:553
+#: src/message_search.c:217 src/prefs_matcher.c:739 src/summary_search.c:478
 msgid "Case sensitive"
 msgstr "Gemen-/versalkänslig"
 
-#: src/matcher.c:517
-#: src/matcher.c:522
-#: src/matcher.c:542
-#: src/matcher.c:547
+#: src/matcher.c:523 src/matcher.c:528 src/matcher.c:548 src/matcher.c:553
 msgid "Case insensitive"
 msgstr "Gemen-/versalokänslig"
 
-#: src/matcher.c:1809
+#: src/matcher.c:1819
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "kollar om meddelande matchar [ %s ]\n"
 
-#: src/matcher.c:1878
-#: src/matcher.c:1897
-#: src/matcher.c:1910
+#: src/matcher.c:1888 src/matcher.c:1907 src/matcher.c:1920
 msgid "message matches\n"
 msgstr "meddelande matchar\n"
 
-#: src/matcher.c:1885
-#: src/matcher.c:1903
-#: src/matcher.c:1912
+#: src/matcher.c:1895 src/matcher.c:1913 src/matcher.c:1922
 msgid "message does not match\n"
 msgstr "meddelande matchar inte\n"
 
-#: src/matcher.c:2175
-#: src/matcher.c:2176
-#: src/matcher.c:2177
-#: src/matcher.c:2178
-#: src/matcher.c:2179
-#: src/matcher.c:2180
-#: src/matcher.c:2181
-#: src/matcher.c:2182
+#: src/matcher.c:2185 src/matcher.c:2186 src/matcher.c:2187 src/matcher.c:2188
+#: src/matcher.c:2189 src/matcher.c:2190 src/matcher.c:2191 src/matcher.c:2192
 msgid "(none)"
 msgstr "(ingen)"
 
@@ -8019,11 +7622,8 @@ msgstr "Skriv mbox-fil"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Filen finns redan. Vill du skriva över den?"
 
-#: src/mbox.c:555
-#: src/messageview.c:1868
-#: src/mimeview.c:1850
-#: src/prefs_themes.c:553
-#: src/textview.c:3120
+#: src/mbox.c:555 src/messageview.c:1843 src/mimeview.c:1844
+#: src/prefs_themes.c:553 src/textview.c:3120
 msgid "Overwrite"
 msgstr "Skriv över"
 
@@ -8048,45 +7648,39 @@ msgstr "Leta i aktuellt meddelande"
 msgid "Find text:"
 msgstr "Hitta text:"
 
-#: src/message_search.c:332
-#: src/summary_search.c:768
+#: src/message_search.c:346 src/summary_search.c:791
 msgid "Search failed"
 msgstr "Sökning misslyckades"
 
-#: src/message_search.c:333
-#: src/summary_search.c:769
+#: src/message_search.c:347 src/summary_search.c:792
 msgid "Search string not found."
 msgstr "Söksträng ej funnen."
 
-#: src/message_search.c:342
+#: src/message_search.c:356
 msgid "Beginning of message reached; continue from end?"
 msgstr "Början av meddelande nådd; fortsätt från slutet?"
 
-#: src/message_search.c:345
+#: src/message_search.c:359
 msgid "End of message reached; continue from beginning?"
 msgstr "Slutet av meddelande nått; fortsätt från början?"
 
-#: src/message_search.c:348
-#: src/summary_search.c:780
+#: src/message_search.c:362 src/summary_search.c:803
 msgid "Search finished"
 msgstr "Sökning färdig"
 
-#: src/messageview.c:299
-#: src/textview.c:245
+#: src/messageview.c:297 src/textview.c:245
 msgid "Compose _new message"
-msgstr "_Nytt meddelande"
+msgstr "Skriv _nytt meddelande"
 
-#: src/messageview.c:729
-#: src/messageview.c:1413
-#: src/messageview.c:1610
+#: src/messageview.c:711 src/messageview.c:1388 src/messageview.c:1585
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Meddelandevy"
 
-#: src/messageview.c:860
+#: src/messageview.c:838
 msgid "<No Return-Path found>"
 msgstr "<Igen Returväg hittad>"
 
-#: src/messageview.c:868
+#: src/messageview.c:846
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8101,12 +7695,11 @@ msgstr ""
 "Returväg: %s\n"
 "Det rekommenderas att du inte skickar något läskvitto."
 
-#: src/messageview.c:875
-#: src/messageview.c:892
+#: src/messageview.c:853 src/messageview.c:870
 msgid "_Don't Send"
 msgstr "_Skicka inte"
 
-#: src/messageview.c:888
+#: src/messageview.c:866
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -8118,70 +7711,66 @@ msgstr ""
 "officiellt adresserat till dig.\n"
 "Det rekommenderas att du inte skickar något läskvitto."
 
-#: src/messageview.c:1341
+#: src/messageview.c:1319
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Hämtar meddelande (%s)..."
 
-#: src/messageview.c:1377
-#: src/procmime.c:983
+#: src/messageview.c:1355 src/procmime.c:986
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Kunde inte dekryptera: %s"
 
-#: src/messageview.c:1460
-#: src/messageview.c:1468
+#: src/messageview.c:1435 src/messageview.c:1443
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Meddelandet följer inte MIME-standarden. Det kan återges fel."
 
-#: src/messageview.c:1860
-#: src/messageview.c:1863
-#: src/mimeview.c:2003
-#: src/plugins/fancy/fancy_viewer.c:667
-#: src/summaryview.c:4814
-#: src/summaryview.c:4817
-#: src/textview.c:3108
+#: src/messageview.c:1835 src/messageview.c:1838 src/mimeview.c:1997
+#: src/plugins/fancy/fancy_viewer.c:668 src/summaryview.c:4810
+#: src/summaryview.c:4813 src/textview.c:3108
 msgid "Save as"
 msgstr "Spara som"
 
-#: src/messageview.c:1869
+#: src/messageview.c:1844
 msgid "Overwrite existing file?"
 msgstr "Skriv över befintlig fil?"
 
-#: src/messageview.c:1877
-#: src/summaryview.c:4834
-#: src/summaryview.c:4837
-#: src/summaryview.c:4852
+#: src/messageview.c:1852 src/summaryview.c:4830 src/summaryview.c:4833
+#: src/summaryview.c:4848
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Kan inte spara filen '%s'."
 
-#: src/messageview.c:1931
+#: src/messageview.c:1905
 #, c-format
 msgid "Show all %s."
 msgstr "Visa alla %s."
 
-#: src/messageview.c:1933
+#: src/messageview.c:1907
 msgid "Only the first megabyte of text is shown."
 msgstr "Endast den första megabyten text visas."
 
-#: src/messageview.c:1964
-msgid "You got a return receipt for this message : it has been displayed by the recipient."
-msgstr "Du har fått ett läskvitto för detta meddelande : det har visats för mottagaren."
+#: src/messageview.c:1938
+msgid ""
+"You got a return receipt for this message : it has been displayed by the "
+"recipient."
+msgstr ""
+"Du har fått ett läskvitto för detta meddelande : det har visats för "
+"mottagaren."
 
-#: src/messageview.c:1967
+#: src/messageview.c:1941
 msgid "You asked for a return receipt in this message."
 msgstr "Detta meddelande begär returkvitto."
 
-#: src/messageview.c:1973
+#: src/messageview.c:1947
 msgid "This message asks for a return receipt."
 msgstr "Detta meddelande begär returkvitto."
 
-#: src/messageview.c:1974
+#: src/messageview.c:1948
 msgid "Send receipt"
 msgstr "Skicka kvitto"
 
-#: src/messageview.c:2017
+#: src/messageview.c:1991
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8189,7 +7778,7 @@ msgstr ""
 "Detta meddelande har tagits emot delvis,\n"
 "och har tagits bort från servern."
 
-#: src/messageview.c:2023
+#: src/messageview.c:1997
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8198,17 +7787,15 @@ msgstr ""
 "Detta meddelande har tagits emot delvis;\n"
 "det är %s."
 
-#: src/messageview.c:2027
-#: src/messageview.c:2049
+#: src/messageview.c:2001 src/messageview.c:2023
 msgid "Mark for download"
 msgstr "Markera för nerladdning"
 
-#: src/messageview.c:2028
-#: src/messageview.c:2040
+#: src/messageview.c:2002 src/messageview.c:2014
 msgid "Mark for deletion"
 msgstr "Markera för borttagning"
 
-#: src/messageview.c:2033
+#: src/messageview.c:2007
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8217,13 +7804,12 @@ msgstr ""
 "Detta meddelande har tagits emot delvis;\n"
 "det är %s och kommer att laddas ner."
 
-#: src/messageview.c:2038
-#: src/messageview.c:2051
+#: src/messageview.c:2012 src/messageview.c:2025
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Avmarkera"
 
-#: src/messageview.c:2044
+#: src/messageview.c:2018
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8232,32 +7818,35 @@ msgstr ""
 "Detta meddelande har tagits emot delvis;\n"
 "det är %s och kommer att tas bort."
 
-#: src/messageview.c:2117
+#: src/messageview.c:2091
 msgid "Return Receipt Notification"
 msgstr "Återsänd läskvittounderrättelse"
 
-#: src/messageview.c:2118
+#: src/messageview.c:2092
 msgid ""
-"More than one of your accounts uses the address that this message was sent to.\n"
-"Please choose which account you want to use for sending the receipt notification:"
+"More than one of your accounts uses the address that this message was sent "
+"to.\n"
+"Please choose which account you want to use for sending the receipt "
+"notification:"
 msgstr ""
-"Mer än ett av dina konton använder adressen som detta meddelande skickades till.\n"
-"Vänligen välj vilket av kontona som du vill använda för att skicka läskvittot:"
+"Mer än ett av dina konton använder adressen som detta meddelande skickades "
+"till.\n"
+"Vänligen välj vilket av kontona som du vill använda för att skicka "
+"läskvittot:"
 
-#: src/messageview.c:2122
-#: src/plugins/rssyl/rssyl_gtk.c:480
+#: src/messageview.c:2096 src/plugins/rssyl/rssyl_gtk.c:480
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: src/messageview.c:2122
+#: src/messageview.c:2096
 msgid "_Send Notification"
 msgstr "_Skicka Underrättelse"
 
-#: src/messageview.c:2189
+#: src/messageview.c:2163
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Kan inte skriva ut: meddelandet innehåller ingen text."
 
-#: src/messageview.c:2958
+#: src/messageview.c:2932
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8265,7 +7854,7 @@ msgstr ""
 "\n"
 "  Det finns inga meddelanden i denna mapp"
 
-#: src/messageview.c:2966
+#: src/messageview.c:2940
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8273,7 +7862,7 @@ msgstr ""
 "\n"
 "  Meddelandet har blivit borttaget"
 
-#: src/messageview.c:2967
+#: src/messageview.c:2941
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8281,10 +7870,8 @@ msgstr ""
 "\n"
 "  Meddelandet har flyttats till papperskorgen eller till en annan mapp"
 
-#: src/messageview.c:3000
-#: src/messageview.c:3006
-#: src/summaryview.c:4187
-#: src/summaryview.c:6975
+#: src/messageview.c:2974 src/messageview.c:2980 src/summaryview.c:4183
+#: src/summaryview.c:6964
 msgid "An error happened while learning.\n"
 msgstr "fel uppstod vid inlärning.\n"
 
@@ -8297,18 +7884,15 @@ msgstr "kan inte kopiera meddelande %s till %s\n"
 msgid "Moving messages..."
 msgstr "Flyttar meddelanden..."
 
-#: src/mh.c:662
-#: src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:662 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Tar bort meddelanden..."
 
-#: src/mh_gtk.c:63
-#: src/plugins/mailmbox/plugin_gtk.c:67
+#: src/mh_gtk.c:63 src/plugins/mailmbox/plugin_gtk.c:67
 msgid "Remove _mailbox..."
 msgstr "Ta bort brev_låda"
 
-#: src/mh_gtk.c:358
-#: src/plugins/mailmbox/plugin_gtk.c:290
+#: src/mh_gtk.c:358 src/plugins/mailmbox/plugin_gtk.c:290
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
@@ -8317,117 +7901,105 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan '%s'?\n"
 "(Meddelanden kommer INTE att tas bort från disken)"
 
-#: src/mh_gtk.c:360
-#: src/plugins/mailmbox/plugin_gtk.c:292
+#: src/mh_gtk.c:360 src/plugins/mailmbox/plugin_gtk.c:292
 msgid "Remove mailbox"
 msgstr "/Ta bort brevlåda"
 
-#: src/mimeview.c:202
+#: src/mimeview.c:193
 msgid "_Open"
 msgstr "Öppna"
 
-#: src/mimeview.c:204
+#: src/mimeview.c:195
 msgid "Open _with..."
 msgstr "Öppna _med..."
 
-#: src/mimeview.c:206
+#: src/mimeview.c:197
 msgid "Send to..."
 msgstr "Skicka till..."
 
-#: src/mimeview.c:207
+#: src/mimeview.c:198
 msgid "_Display as text"
 msgstr "Visa som text"
 
-#: src/mimeview.c:208
+#: src/mimeview.c:199
 msgid "_Save as..."
 msgstr "_Spara som"
 
-#: src/mimeview.c:209
+#: src/mimeview.c:200
 msgid "Save _all..."
 msgstr "_Spara alla..."
 
-#: src/mimeview.c:282
+#: src/mimeview.c:273
 msgid "MIME Type"
 msgstr "MIME-typ"
 
-#: src/mimeview.c:1044
-#: src/mimeview.c:1049
-#: src/mimeview.c:1054
-#: src/mimeview.c:1059
+#: src/mimeview.c:1035 src/mimeview.c:1040 src/mimeview.c:1045
+#: src/mimeview.c:1050
 msgid "View full information"
 msgstr "Visa fullständig information"
 
-#: src/mimeview.c:1065
+#: src/mimeview.c:1056
 msgid "Check again"
 msgstr "Kontrollera igen"
 
-#: src/mimeview.c:1077
+#: src/mimeview.c:1068
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Klicka på ikonen för att markera den."
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1070
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Klicka på ikonen eller tryck '%s' för att markera den."
 
-#: src/mimeview.c:1089
+#: src/mimeview.c:1080
 msgid "Timeout checking the signature. Click the icon to try again."
-msgstr "Tidsgränsen för att kontroller signaturen överskreds. Klicka på ikonen för att försöka igen."
+msgstr ""
+"Tidsgränsen för att kontroller signaturen överskreds. Klicka på ikonen för "
+"att försöka igen."
 
-#: src/mimeview.c:1091
+#: src/mimeview.c:1082
 #, c-format
-msgid "Timeout checking the signature. Click the icon or hit '%s' to try again."
-msgstr "Tidsgränsen för att kontrollera signaturen överskreds. Klicka på ikonen eller tryck '%s' för att försöka igen."
+msgid ""
+"Timeout checking the signature. Click the icon or hit '%s' to try again."
+msgstr ""
+"Tidsgränsen för att kontrollera signaturen överskreds. Klicka på ikonen "
+"eller tryck '%s' för att försöka igen."
 
-#: src/mimeview.c:1330
+#: src/mimeview.c:1322
 msgid "Checking signature..."
 msgstr "kontrollera signatur..."
 
-#: src/mimeview.c:1373
+#: src/mimeview.c:1363
 msgid "Go back to email"
 msgstr "Gå tillbaka till e-post"
 
-#: src/mimeview.c:1769
-#: src/mimeview.c:1858
-#: src/mimeview.c:2050
-#: src/mimeview.c:2093
-#: src/mimeview.c:2224
-#: src/plugins/fancy/fancy_viewer.c:420
+#: src/mimeview.c:1763 src/mimeview.c:1852 src/mimeview.c:2044
+#: src/mimeview.c:2080 src/mimeview.c:2192
+#: src/plugins/fancy/fancy_viewer.c:421
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Kan inte spara del av flerdelsmeddelande: %s"
 
-#: src/mimeview.c:1847
-#: src/textview.c:3118
+#: src/mimeview.c:1841 src/textview.c:3118
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Skriv över befintlig fil '%s'?"
 
-#: src/mimeview.c:1889
-#: src/plugins/archive/archiver_prefs.c:128
+#: src/mimeview.c:1883 src/plugins/archive/archiver_prefs.c:128
 msgid "Select destination folder"
 msgstr "Välj destinationsmapp"
 
-#: src/mimeview.c:1896
-#: src/plugins/archive/archiver_prefs.c:134
+#: src/mimeview.c:1890 src/plugins/archive/archiver_prefs.c:134
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' är inte en mapp."
 
-#: src/mimeview.c:2125
-msgid "No registered viewer for this file type."
-msgstr "Det finns ingen registrerad visare för den här filtypen."
-
-#: src/mimeview.c:2157
-#: src/mimeview.c:2164
-#: src/textview.c:3039
+#: src/mimeview.c:2127 src/mimeview.c:2134 src/textview.c:3039
 msgid "Open with"
 msgstr "Öppna med"
 
-#: src/mimeview.c:2158
-#: src/mimeview.c:2165
-#: src/textview.c:3040
+#: src/mimeview.c:2128 src/mimeview.c:2135 src/textview.c:3040
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8436,119 +8008,124 @@ msgstr ""
 "Skriv in kommandoraden för att öppna filen:\n"
 "('%s' kommer att ersättas med filnamnet)"
 
-#: src/mimeview.c:2258
+#: src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "Kör icke betrodd binär?"
 
-#: src/mimeview.c:2259
+#: src/mimeview.c:2227
 msgid ""
-"This attachment is an executable file. Executing untrusted binaries is dangerous and could probably lead to compromission of your computer.\n"
+"This attachment is an executable file. Executing untrusted binaries is "
+"dangerous and could probably lead to compromission of your computer.\n"
 "\n"
 "Do you want to run this file?"
 msgstr ""
-"Denna bilaga är en binär-fil. Att köra icke betrodda binärer är farligt och kan troligen leda till att din dator blir komprometterad.\n"
+"Denna bilaga är en binär-fil. Att köra icke betrodda binärer är farligt och "
+"kan troligen leda till att din dator blir komprometterad.\n"
 "\n"
 "Vill du köra denna fil?"
 
-#: src/mimeview.c:2263
+#: src/mimeview.c:2231
 msgid "Run binary"
 msgstr "Kör binär"
 
-#: src/mimeview.c:2565
+#: src/mimeview.c:2533
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/mimeview.c:2566
-#: src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/mimeview.c:2534 src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Size:"
 msgstr "Storlek:"
 
-#: src/mimeview.c:2578
-#: src/plugins/vcalendar/vcalendar.c:1271
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1730
+#: src/mimeview.c:2546 src/plugins/vcalendar/vcalendar.c:1271
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1741
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1751
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: src/news.c:300
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "NNTP-anslutning till %s:%d har kopplats från.\n"
 
-#: src/news.c:333
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Konto '%s': Ansluter till NNTP-server: %s:%d...\n"
 
-#: src/news.c:354
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Fel vid inloggning till %s:%d ...\n"
 
-#: src/news.c:432
-msgid "Libetpan does not support return code 480 so for now we choose to continue\n"
-msgstr "Libetpan stöder inte returkod 480 så vi väljer att fortsätta för tillfället\n"
+#: src/news.c:438
+msgid ""
+"Libetpan does not support return code 480 so for now we choose to continue\n"
+msgstr ""
+"Libetpan stöder inte returkod 480 så vi väljer att fortsätta för tillfället\n"
 
-#: src/news.c:441
+#: src/news.c:447
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Mode Reader misslyckades, fortsätter ändå\n"
 
-#: src/news.c:445
+#: src/news.c:451
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Fel vid skapande av session med %s:%d\n"
 
-#: src/news.c:459
+#: src/news.c:466
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Fel vid autentisering mot %s:%d ...\n"
 
-#: src/news.c:484
+#: src/news.c:491
 msgid "Claws Mail needs network access in order to access the News server."
-msgstr "Claws-Mail behöver vara anslutet till nätverket för att ansluta till diskussionsgruppsservern."
+msgstr ""
+"Claws-Mail behöver vara anslutet till nätverket för att ansluta till "
+"diskussionsgruppsservern."
 
-#: src/news.c:853
+#: src/news.c:862
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "kunde inte välja grupp: %s\n"
 
-#: src/news.c:1042
-#: src/news.c:1212
+#: src/news.c:1051 src/news.c:1221
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "kunde inte ställa in grupp: %s\n"
 
-#: src/news.c:1051
+#: src/news.c:1060
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "felaktigt artikelomfång: %d - %d\n"
 
-#: src/news.c:1121
-#: src/news.c:1145
-#: src/news.c:1169
+#: src/news.c:1130 src/news.c:1154 src/news.c:1178
 msgid "couldn't get xhdr\n"
 msgstr "kunde inte hämta xhdr\n"
 
-#: src/news.c:1205
+#: src/news.c:1214
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "hämtar xover %d - %d i %s...\n"
 
-#: src/news.c:1220
+#: src/news.c:1229
 msgid "couldn't get xover\n"
 msgstr "kunde inte hämta xover\n"
 
-#: src/news.c:1235
+#: src/news.c:1244
 msgid "invalid xover line\n"
 msgstr "felaktig xover-rad\n"
 
-#: src/news.c:1450
+#: src/news.c:1459
 msgid ""
-"You have one or more News accounts defined. However this version of Claws Mail has been built without News support; your News account(s) are disabled.\n"
+"You have one or more News accounts defined. However this version of Claws "
+"Mail has been built without News support; your News account(s) are "
+"disabled.\n"
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
-"Du har ett eller flera Diskussionsgruppskonton definierade. Men denna version av Claws-Mail är byggd utan stöd för Diskussionsgrupper; ditt/dina Diskussionsgruppskonton är inaktiverade.\n"
+"Du har ett eller flera Diskussionsgruppskonton definierade. Men denna "
+"version av Claws-Mail är byggd utan stöd för Diskussionsgrupper; ditt/dina "
+"Diskussionsgruppskonton är inaktiverade.\n"
 "\n"
 "Du behöver troligen installera libetpan och kompilera om Claws-Mail."
 
@@ -8569,8 +8146,7 @@ msgstr "Verkligen avsluta prenumeration på diskussionsgrupp '%s'?"
 msgid "Unsubscribe newsgroup"
 msgstr "Avsluta prenumeration på diskussionsgrupp"
 
-#: src/news_gtk.c:267
-#: src/plugins/rssyl/rssyl_gtk.c:678
+#: src/news_gtk.c:267 src/plugins/rssyl/rssyl_gtk.c:678
 msgid "_Unsubscribe"
 msgstr "S_äg upp prenumeration"
 
@@ -8688,8 +8264,7 @@ msgstr "Denna insticksmodul hanterar olika ACPI post LEDs."
 msgid "Laptop LED"
 msgstr "Laptop LED"
 
-#: src/plugins/archive/archiver.c:43
-#: src/plugins/archive/archiver_prefs.c:93
+#: src/plugins/archive/archiver.c:43 src/plugins/archive/archiver_prefs.c:93
 msgid "Mail Archiver"
 msgstr "E-postarkiverare"
 
@@ -8702,7 +8277,10 @@ msgstr "Skapa Arkiv..."
 msgid ""
 "This plugin adds archiving features to Claws Mail.\n"
 "\n"
-"It enables you to select a mail folder that you want to be archived, and then choose a name, format and location for the archive. Subfolders can be included and MD5 checksums can be added for each file in the archive. Several archiving options are also available.\n"
+"It enables you to select a mail folder that you want to be archived, and "
+"then choose a name, format and location for the archive. Subfolders can be "
+"included and MD5 checksums can be added for each file in the archive. "
+"Several archiving options are also available.\n"
 "\n"
 "The archive can be stored as:\n"
 "\tTAR\n"
@@ -8712,17 +8290,22 @@ msgid ""
 "\n"
 "The archive can be compressed using:\n"
 "%s\n"
-"The archives can be restored with any standard tool that supports the chosen format and compression.\n"
+"The archives can be restored with any standard tool that supports the chosen "
+"format and compression.\n"
 "\n"
 "The supported folder types are MH, IMAP, RSSyl and vCalendar.\n"
 "\n"
 "To activate the archiving feature go to /Tools/Create Archive\n"
 "\n"
-"Default options can be set in /Configuration/Preferences/Plugins/Mail Archiver"
+"Default options can be set in /Configuration/Preferences/Plugins/Mail "
+"Archiver"
 msgstr ""
 "Denna insticksmodul lägger till arkiveringsmöjligheter till Claws Mail.\n"
 "\n"
-"Den tillåter dig att välja en mailmapp som du vill arkivera, välja ett namn, format och plats för arkivet. Undermappar kan inkluderas och MD5-kontrollsummor kan läggas till för varje fil i arkivet.Flera arkiveringsinställningar finns tillgängliga.\n"
+"Den tillåter dig att välja en mailmapp som du vill arkivera, välja ett namn, "
+"format och plats för arkivet. Undermappar kan inkluderas och MD5-"
+"kontrollsummor kan läggas till för varje fil i arkivet.Flera "
+"arkiveringsinställningar finns tillgängliga.\n"
 "Arkivet kan lagras som:\n"
 "\tTAR\n"
 "\tPAX\n"
@@ -8732,13 +8315,15 @@ msgstr ""
 "Arkivet kan komprimeras med hjälp av:\n"
 "%s\n"
 "\n"
-"Arkiven kan återställas med vilket verktyg som helst som stöder det valda formatet och komprimeringen.\n"
+"Arkiven kan återställas med vilket verktyg som helst som stöder det valda "
+"formatet och komprimeringen.\n"
 "\n"
 "Mapptyperna som stöds är MH, IMAP, RSSyl och vCalendar.\n"
 "\n"
 "För att aktivera arkiveringsmöjligheterna, gå till /Verktyg/Skapa Arkiv\n"
 "\n"
-"Standardinställningar kan sättas i /Konfiguration/Egenskaper/Insticksmoduler/E-postarkiveraren"
+"Standardinställningar kan sättas i /Konfiguration/Egenskaper/Insticksmoduler/"
+"E-postarkiveraren"
 
 #: src/plugins/archive/archiver.c:156
 msgid "Archiver"
@@ -8857,16 +8442,14 @@ msgstr "Komprimeringsnivå"
 #: src/plugins/archive/archiver_gtk.c:800
 #: src/plugins/archive/archiver_gtk.c:808
 #: src/plugins/archive/archiver_gtk.c:816
-#: src/plugins/pdf_viewer/poppler_viewer.c:720
-#: src/prefs_folder_item.c:516
+#: src/plugins/pdf_viewer/poppler_viewer.c:720 src/prefs_folder_item.c:516
 msgid "Yes"
 msgstr "Ja"
 
 #: src/plugins/archive/archiver_gtk.c:800
 #: src/plugins/archive/archiver_gtk.c:808
 #: src/plugins/archive/archiver_gtk.c:816
-#: src/plugins/pdf_viewer/poppler_viewer.c:723
-#: src/prefs_folder_item.c:515
+#: src/plugins/pdf_viewer/poppler_viewer.c:723 src/prefs_folder_item.c:515
 #: src/prefs_summaries.c:369
 msgid "No"
 msgstr "Inga"
@@ -8890,7 +8473,9 @@ msgstr "Välj epost före"
 
 #: src/plugins/archive/archiver_gtk.c:904
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
-msgstr "Välj filnamn för arkiv [filändelsen bör reflektera att det är ett arkiv som .tgz]"
+msgstr ""
+"Välj filnamn för arkiv [filändelsen bör reflektera att det är ett arkiv som ."
+"tgz]"
 
 #: src/plugins/archive/archiver_gtk.c:952
 #, c-format
@@ -8915,7 +8500,9 @@ msgstr "Mapp som är rooten på arkivet"
 
 #: src/plugins/archive/archiver_gtk.c:1031
 msgid "Click this button to select a folder which is to be root of the archive"
-msgstr "Klicka på denna knapp för att välja vilken mapp som skall vara root för arkivet"
+msgstr ""
+"Klicka på denna knapp för att välja vilken mapp som skall vara root för "
+"arkivet"
 
 #: src/plugins/archive/archiver_gtk.c:1037
 msgid "Name for archive"
@@ -8927,7 +8514,7 @@ msgstr "Plats och namn för arkivet"
 
 #: src/plugins/archive/archiver_gtk.c:1045
 #: src/plugins/archive/archiver_prefs.c:198
-#: src/plugins/pgpcore/select-keys.c:424
+#: src/plugins/pgpcore/select-keys.c:420
 msgid "_Select"
 msgstr "Välj"
 
@@ -8997,7 +8584,8 @@ msgid ""
 "Be aware though, that this dramatically increases the time it\n"
 "will take to create the archive"
 msgstr ""
-"Välj detta alternativ för att lägga till MD5-kontrollsummor till varje fil i arkivet.\n"
+"Välj detta alternativ för att lägga till MD5-kontrollsummor till varje fil i "
+"arkivet.\n"
 "Lägg dock märke till, att detta dramatiskt ökar tiden det\n"
 "kommer ta att skapa arkivet"
 
@@ -9012,7 +8600,8 @@ msgid ""
 "The naming scheme: date_from at to@subject.\n"
 "Names will be truncated to max 96 characters"
 msgstr ""
-"Välj detta alternativ för att använda deskriptiva namn för varje fil i arkivet.\n"
+"Välj detta alternativ för att använda deskriptiva namn för varje fil i "
+"arkivet.\n"
 "Namnschema: datum_från at till@ämne.\n"
 "Namn kommer att klippas av till max 96 tecken"
 
@@ -9058,7 +8647,8 @@ msgstr "Välj detta alternativ för att använda BZIP2-kompression som standard"
 
 #: src/plugins/archive/archiver_prefs.c:238
 msgid "Choose this option to use COMPRESS compression by default"
-msgstr "Välj detta alternativ för att använda COMPRESS-kompression som standard"
+msgstr ""
+"Välj detta alternativ för att använda COMPRESS-kompression som standard"
 
 #: src/plugins/archive/archiver_prefs.c:246
 msgid "Choose this option to disable compression by default"
@@ -9090,7 +8680,8 @@ msgstr "Diverse standardinställningar"
 
 #: src/plugins/archive/archiver_prefs.c:324
 msgid "Choose this option to include subfolders in the archives by default"
-msgstr "Välj detta alternativ för att inkludera undermappar i arkivet som standard"
+msgstr ""
+"Välj detta alternativ för att inkludera undermappar i arkivet som standard"
 
 #: src/plugins/archive/archiver_prefs.c:325
 msgid "MD5sum"
@@ -9098,11 +8689,13 @@ msgstr "MD5sum"
 
 #: src/plugins/archive/archiver_prefs.c:327
 msgid ""
-"Choose this option to add MD5 checksums for each file in the archives by default.\n"
+"Choose this option to add MD5 checksums for each file in the archives by "
+"default.\n"
 "Be aware though, that this dramatically increases the time it\n"
 "will take to create the archives"
 msgstr ""
-"Välj detta alternativ för att lägga till MD5-kontrollsummor för varje fil i arkivet som standard.\n"
+"Välj detta alternativ för att lägga till MD5-kontrollsummor för varje fil i "
+"arkivet som standard.\n"
 "Observera att detta dramatiskt ökar tiden det tar att skapa arkivet."
 
 #: src/plugins/archive/archiver_prefs.c:331
@@ -9130,13 +8723,11 @@ msgid "Remove attachments"
 msgstr "Ta bort bilagor"
 
 #: src/plugins/att_remover/att_remover.c:357
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:330
-#: src/prefs_themes.c:973
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:330 src/prefs_themes.c:973
 msgid "Remove"
 msgstr "Ta bort"
 
-#: src/plugins/att_remover/att_remover.c:365
-#: src/prefs_summary_column.c:80
+#: src/plugins/att_remover/att_remover.c:365 src/prefs_summary_column.c:80
 #: src/summaryview.c:2770
 msgid "Attachment"
 msgstr "Bilaga"
@@ -9162,33 +8753,39 @@ msgstr "Detta meddelande har inga bilagor."
 msgid "Remove attachments..."
 msgstr "Ta bort bilagor..."
 
-#: src/plugins/att_remover/att_remover.c:507
-#: src/plugins/att_remover/att_remover.c:574
+#: src/plugins/att_remover/att_remover.c:506
+#: src/plugins/att_remover/att_remover.c:566
 msgid "AttRemover"
 msgstr "AttRemover"
 
-#: src/plugins/att_remover/att_remover.c:579
+#: src/plugins/att_remover/att_remover.c:571
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
-"Warning: this operation will be completely un-cancellable and the deleted attachments will be lost forever, and ever, and ever."
+"Warning: this operation will be completely un-cancellable and the deleted "
+"attachments will be lost forever, and ever, and ever."
 msgstr ""
 "Denna insticksmodul tar bort bilagor från e-post.\n"
 "\n"
-"Varning: denna operation går inte att avbryta och de borttagna bilagorna kommer att vara borta för alltid."
+"Varning: denna operation går inte att avbryta och de borttagna bilagorna "
+"kommer att vara borta för alltid."
 
-#: src/plugins/att_remover/att_remover.c:603
+#: src/plugins/att_remover/att_remover.c:595
 msgid "Attachment handling"
 msgstr "Bilagehantering"
 
 #: src/plugins/attachwarner/attachwarner.c:216
 #, c-format
 msgid ""
-"An attachment is mentioned in the mail you're sending, but no file was attached. Mention appears on line %d, which begins with text: <span weight=\"bold\">%.20s</span>...\n"
+"An attachment is mentioned in the mail you're sending, but no file was "
+"attached. Mention appears on line %d, which begins with text: <span weight="
+"\"bold\">%.20s</span>...\n"
 "\n"
 "%s it anyway?"
 msgstr ""
-"En bilaga nämns i e-posten du skickar, men det finns ingen fil  bifogad. På rad %d nämns bilagan, som börjar med texten: <span weight=\"bold\">%.20s</span>...\n"
+"En bilaga nämns i e-posten du skickar, men det finns ingen fil  bifogad. På "
+"rad %d nämns bilagan, som börjar med texten: <span weight=\"bold\">%.20s</"
+"span>...\n"
 "\n"
 "%s den ändå?"
 
@@ -9205,49 +8802,80 @@ msgstr "Bilagevarnare"
 #: src/plugins/attachwarner/attachwarner.c:252
 #: src/plugins/address_keeper/address_keeper.c:254
 msgid "Failed to register check before send hook"
-msgstr "Misslyckades att registrera kopplingspunkt för registerkontroll innan sänd"
+msgstr ""
+"Misslyckades att registrera kopplingspunkt för registerkontroll innan sänd"
 
 #: src/plugins/attachwarner/attachwarner.c:292
-msgid "Warns user if some reference to attachments is found in the message text and no file is attached."
-msgstr "Varna användare om någon referens till bilagor finns i meddelandetexten och ingen fil är bifogad."
+msgid ""
+"Warns user if some reference to attachments is found in the message text and "
+"no file is attached."
+msgstr ""
+"Varna användare om någon referens till bilagor finns i meddelandetexten och "
+"ingen fil är bifogad."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:53
+#: src/plugins/attachwarner/attachwarner_prefs.c:54
 msgid "attach"
 msgstr "bifoga"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:80
+#: src/plugins/attachwarner/attachwarner_prefs.c:85
+msgid "One of the following regular expressions is matched (one per line):"
+msgstr "Ett av följande reguljära uttryck matchar (en per rad):"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:89
+msgid "Expressions are case sensitive"
+msgstr "Uttryck är skiftlägeskänsliga"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:96
+msgid "Case sensitive when matching for the regular expressions in the list"
+msgstr "Skiftlägeskänslig vid matching av reguljära uttryck i listan"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:114
+msgid "Lines starting with quotation marks"
+msgstr "Rader som börjar med citattecken"
+
+#: src/plugins/attachwarner/attachwarner_prefs.c:121
 msgid ""
-"Warn when matching the following regular expressions:\n"
-"(one per line)"
+"Exclude quoted lines from checking for the regular expressions above. Note "
+"that handmade quotes cannot be distinguished from quotes generated by "
+"replying."
 msgstr ""
-"Varna vid matching av följande reguljära uttryck:\n"
-"(en per rad)"
+"Exkludera citerade rader från kontroll av reguljära uttrycken ovan. Notera "
+"att citattecken som är gjorda för hand inte kan skiljas från citat som har "
+"genererats genom att svara."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:99
-msgid "Skip quoted lines"
-msgstr "Hoppa över citerade rader"
+#: src/plugins/attachwarner/attachwarner_prefs.c:124
+msgid "Forwarded or redirected messages"
+msgstr "Vidarebefordrade eller omdirigerade meddelanden"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:106
-msgid "Exclude quoted lines from checking for the regular expressions above"
-msgstr "Exkludera citerade rader från kontroll av reguljära uttrycken ovan"
+#: src/plugins/attachwarner/attachwarner_prefs.c:131
+msgid ""
+"Don't check for missing attachments when forwarding or redirecting messages"
+msgstr ""
+"Kontrollera inte efter saknade bilagor vid vidarebefordran och "
+"omdirigeringar av meddelanden"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:109
-msgid "Skip forwards and redirections"
-msgstr "Hoppa över vidarebefordringar och omdirigeringar"
+#: src/plugins/attachwarner/attachwarner_prefs.c:134
+#: src/prefs_msg_colors.c:362
+msgid "Signatures"
+msgstr "Signaturer"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:116
-msgid "Don't check for missing attachments when forwarding or redirecting messages"
-msgstr "Kontrollera inte efter saknade bilagor vid vidarebefordran och omdirigeringar av meddelanden"
+#: src/plugins/attachwarner/attachwarner_prefs.c:141
+msgid ""
+"Exclude lines from the first signature-separator onwards from checking for "
+"the regular expressions above"
+msgstr ""
+"Exkludera rader från den första signatur-separatorn och framåt vid kontroll "
+"av dom reguljära uttrycken ovan"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:119
-msgid "Skip signature"
-msgstr "Hoppa över signatur"
+#: src/plugins/attachwarner/attachwarner_prefs.c:147
+msgid "Warn when"
+msgstr "Varna när"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:126
-msgid "Exclude lines from the first signature-separator onwards from checking for the regular expressions above"
-msgstr "Exkludera rader från den första signatur-separatorn och framåt vid kontroll av dom reguljära uttrycken ovan"
+#: src/plugins/attachwarner/attachwarner_prefs.c:151
+msgid "Excluding"
+msgstr "Exkluderande"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:202
+#: src/plugins/attachwarner/attachwarner_prefs.c:229
 msgid "Attach Warner"
 msgstr "Bilagevarnare"
 
@@ -9273,8 +8901,7 @@ msgstr "Sökväg till adressboken där adresser behålls"
 #: src/plugins/bogofilter/bogofilter_gtk.c:234
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
 #: src/plugins/spamassassin/spamassassin_gtk.c:447
-#: src/prefs_filtering_action.c:573
-#: src/prefs_filtering_action.c:580
+#: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
 #: src/prefs_matcher.c:676
 msgid "Select..."
 msgstr "Välj ..."
@@ -9304,7 +8931,8 @@ msgid "Keep addresses which appear in 'Bcc' headers"
 msgstr "Behåll adresser som finns i 'Bcc'-brevhuvuden"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:160
-msgid "Exclude addresses matching the following regular expressions (one per line):"
+msgid ""
+"Exclude addresses matching the following regular expressions (one per line):"
 msgstr ""
 "Exkludera adresser som matchar följande reguljära uttryck:\n"
 "(en per rad)"
@@ -9324,24 +8952,31 @@ msgstr "Bogofilter: filtrerar meddelanden..."
 
 #: src/plugins/bogofilter/bogofilter.c:602
 msgid ""
-"The Bogofilter plugin couldn't filter a message. The probable cause of the error is that it didn't learn from any mail.\n"
-"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bogofilter with a few hundred spam and ham messages."
+"The Bogofilter plugin couldn't filter a message. The probable cause of the "
+"error is that it didn't learn from any mail.\n"
+"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bogofilter "
+"with a few hundred spam and ham messages."
 msgstr ""
-"Insticksmodulen Bogofilter kunde inte filtrera ett meddelande. Troligaste orsaken till fel är att den inte har blivit upplärd från några meddelanden.\n"
-"Använd \"/Markera som skräp\" och \"/Markera/Markera som ej skräp\" för att träna Bogofiler med ett par hundra skräp- och icke skräpmeddelanden. "
+"Insticksmodulen Bogofilter kunde inte filtrera ett meddelande. Troligaste "
+"orsaken till fel är att den inte har blivit upplärd från några meddelanden.\n"
+"Använd \"/Markera som skräp\" och \"/Markera/Markera som ej skräp\" för att "
+"träna Bogofiler med ett par hundra skräp- och icke skräpmeddelanden. "
 
 #: src/plugins/bogofilter/bogofilter.c:609
 #, c-format
-msgid "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` couldn't be run."
-msgstr "Insticksmodulen Bogofilter kunde inte filtrera ett meddelande. Kommandot `%s %s %s` kunde inte köra."
+msgid ""
+"The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
+"couldn't be run."
+msgstr ""
+"Insticksmodulen Bogofilter kunde inte filtrera ett meddelande. Kommandot `%s "
+"%s %s` kunde inte köra."
 
 #: src/plugins/bogofilter/bogofilter.c:755
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: lär från meddelande..."
 
 #: src/plugins/bogofilter/bogofilter.c:768
-#: src/plugins/bogofilter/bogofilter.c:817
-#: src/plugins/bsfilter/bsfilter.c:511
+#: src/plugins/bogofilter/bogofilter.c:817 src/plugins/bsfilter/bsfilter.c:511
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Inlärning misslyckades; `%s` avslutade med status %d."
@@ -9361,19 +8996,29 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter.c:1002
 msgid ""
-"This plugin can check all messages that are received from an IMAP, LOCAL or POP account for spam using Bogofilter. You will need Bogofilter installed locally.\n"
+"This plugin can check all messages that are received from an IMAP, LOCAL or "
+"POP account for spam using Bogofilter. You will need Bogofilter installed "
+"locally.\n"
 "\n"
-"Before Bogofilter can recognize spam messages, you have to train it by marking a few hundred spam and ham messages with the use of \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\".\n"
+"Before Bogofilter can recognize spam messages, you have to train it by "
+"marking a few hundred spam and ham messages with the use of \"/Mark/Mark as "
+"spam\" and \"/Mark/Mark as ham\".\n"
 "\n"
-"When a message is identified as spam it can be deleted or saved in a specially designated folder.\n"
+"When a message is identified as spam it can be deleted or saved in a "
+"specially designated folder.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
 msgstr ""
-"Denna insticksmodul kan kontrollera alla meddelanden som tas emot från ett IMAP-, LOKALT- eller POP-konto efter skräppost med Bogofilter.Du behöver ha Bogofilter installerat lokalt.\n"
+"Denna insticksmodul kan kontrollera alla meddelanden som tas emot från ett "
+"IMAP-, LOKALT- eller POP-konto efter skräppost med Bogofilter.Du behöver ha "
+"Bogofilter installerat lokalt.\n"
 "\n"
-"Innan Bogofilter kan känna igen skräppost måste du träna den genom att markera ett par hundra skräp- och icke-skräpmeddelanden genom att använda \"/Markera/Markera som skräp\" och \"/Markera/Markera som icke skräp\".\n"
+"Innan Bogofilter kan känna igen skräppost måste du träna den genom att "
+"markera ett par hundra skräp- och icke-skräpmeddelanden genom att använda \"/"
+"Markera/Markera som skräp\" och \"/Markera/Markera som icke skräp\".\n"
 "\n"
-"När ett meddelande identifieras som skräp kan det tas bort eller sparas i en speciell folder.\n"
+"När ett meddelande identifieras som skräp kan det tas bort eller sparas i en "
+"speciell folder.\n"
 "\n"
 "Alternativ finns i /Konfiguration/Egenskaper/Insticksmoduler/Bogofilter"
 
@@ -9409,8 +9054,7 @@ msgstr "Meddelanden större än så här kommer inte kontrolleras"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:170
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:370
-#: src/prefs_account.c:1487
+#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1483
 msgid "KB"
 msgstr "KB"
 
@@ -9423,7 +9067,8 @@ msgstr "Spara skräppost i"
 #: src/plugins/bogofilter/bogofilter_gtk.c:186
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
 #: src/plugins/spamassassin/spamassassin_gtk.c:416
-msgid "Folder for storing identified spam. Leave empty to use the trash folder."
+msgid ""
+"Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr "Mapp för att spara skräppost. Lämna tom för att använda papperskorgen."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:192
@@ -9437,8 +9082,12 @@ msgid "When unsure, move to"
 msgstr "När osäker, flytta till"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:206
-msgid "Folder for storing mail for which spam status is Unsure. Leave empty to use the Inbox folder."
-msgstr "Mapp för att spara e-post för vilken skräppoststatus är Osäker. Lämna tom för att använda Inkorgen,"
+msgid ""
+"Folder for storing mail for which spam status is Unsure. Leave empty to use "
+"the Inbox folder."
+msgstr ""
+"Mapp för att spara e-post för vilken skräppoststatus är Osäker. Lämna tom "
+"för att använda Inkorgen,"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:212
 msgid "Click this button to select a folder for storing Unsure mails."
@@ -9461,8 +9110,12 @@ msgstr "Vitlista avsändare från adressbok/-mapp"
 #: src/plugins/bogofilter/bogofilter_gtk.c:228
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
 #: src/plugins/spamassassin/spamassassin_gtk.c:441
-msgid "Messages coming from your address book contacts will be received in the normal folder even if detected as spam"
-msgstr "Meddelanden från kontakter i adressboken kommer att tas emot i normala mappen även om de anses vara skräppost"
+msgid ""
+"Messages coming from your address book contacts will be received in the "
+"normal folder even if detected as spam"
+msgstr ""
+"Meddelanden från kontakter i adressboken kommer att tas emot i normala "
+"mappen även om de anses vara skräppost"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:238
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
@@ -9476,8 +9129,12 @@ msgid "Learn whitelisted emails as ham"
 msgstr "Lär in vitlistad e-post som icke-skräp"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:242
-msgid "If Bogofilter thought an email was spam or unsure, but it was whitelisted, learn it as ham."
-msgstr "Om Bogofilter trodde en e-post var skräp eller osäker, men den blev vitlistad, lär in som icke-skräp."
+msgid ""
+"If Bogofilter thought an email was spam or unsure, but it was whitelisted, "
+"learn it as ham."
+msgstr ""
+"Om Bogofilter trodde en e-post var skräp eller osäker, men den blev "
+"vitlistad, lär in som icke-skräp."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:251
 msgid "Bogofilter call"
@@ -9494,8 +9151,12 @@ msgid "Mark spam as read"
 msgstr "Markera skräppost som lästa"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:209
-msgid "If Bsfilter thought an email was spam or unsure, but it was whitelisted, learn it as ham."
-msgstr "Om Bsfilter trodde ett meddelande var skräp eller osäker, men den blev vitlistad, lär in som icke-skräp."
+msgid ""
+"If Bsfilter thought an email was spam or unsure, but it was whitelisted, "
+"learn it as ham."
+msgstr ""
+"Om Bsfilter trodde ett meddelande var skräp eller osäker, men den blev "
+"vitlistad, lär in som icke-skräp."
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:218
 msgid "Bsfilter call"
@@ -9505,8 +9166,7 @@ msgstr "Bsfilteranrop"
 msgid "Path to bsfilter executable"
 msgstr "Sökväg till bsfilters exekverbara fil"
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:401
-#: src/plugins/bsfilter/bsfilter.c:82
+#: src/plugins/bsfilter/bsfilter_gtk.c:401 src/plugins/bsfilter/bsfilter.c:82
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
@@ -9520,16 +9180,24 @@ msgstr "Bsfilter: filtrerar meddelande..."
 
 #: src/plugins/bsfilter/bsfilter.c:393
 msgid ""
-"The Bsfilter plugin couldn't filter a message. The probable cause of the error is that it didn't learn from any mail.\n"
-"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bsfilter with a few hundred spam and ham messages."
+"The Bsfilter plugin couldn't filter a message. The probable cause of the "
+"error is that it didn't learn from any mail.\n"
+"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bsfilter with "
+"a few hundred spam and ham messages."
 msgstr ""
-"Insticksmodulen Bsfilter kunde inte filtrera ett meddelande. Troligaste orsaken till fel är att den inte har blivit upplärd från några meddelanden.\n"
-"Använd \"/Markera som skräp\" och \"/Markera/Markera som ej skräp\" för att träna Bsfilter med ett par hundra skräp- och icke skräpmeddelanden. "
+"Insticksmodulen Bsfilter kunde inte filtrera ett meddelande. Troligaste "
+"orsaken till fel är att den inte har blivit upplärd från några meddelanden.\n"
+"Använd \"/Markera som skräp\" och \"/Markera/Markera som ej skräp\" för att "
+"träna Bsfilter med ett par hundra skräp- och icke skräpmeddelanden. "
 
 #: src/plugins/bsfilter/bsfilter.c:400
 #, c-format
-msgid "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be run."
-msgstr "Insticksmodulen Bsfilter kunde inte filtrera ett meddelande. Kommandot `%s` kunde inte köra."
+msgid ""
+"The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
+"run."
+msgstr ""
+"Insticksmodulen Bsfilter kunde inte filtrera ett meddelande. Kommandot `%s` "
+"kunde inte köra."
 
 #: src/plugins/bsfilter/bsfilter.c:501
 msgid "Bsfilter: learning from message..."
@@ -9537,19 +9205,29 @@ msgstr "Bsfilter: lär från meddelande..."
 
 #: src/plugins/bsfilter/bsfilter.c:641
 msgid ""
-"This plugin can check all messages that are received from an IMAP, LOCAL or POP account for spam using Bsfilter. You will need Bsfilter installed locally.\n"
+"This plugin can check all messages that are received from an IMAP, LOCAL or "
+"POP account for spam using Bsfilter. You will need Bsfilter installed "
+"locally.\n"
 "\n"
-"Before Bsfilter can recognize spam messages, you have to train it by marking a few hundred spam and ham messages with the use of \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\".\n"
+"Before Bsfilter can recognize spam messages, you have to train it by marking "
+"a few hundred spam and ham messages with the use of \"/Mark/Mark as spam\" "
+"and \"/Mark/Mark as ham\".\n"
 "\n"
-"When a message is identified as spam it can be deleted or saved in a specially designated folder.\n"
+"When a message is identified as spam it can be deleted or saved in a "
+"specially designated folder.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bsfilter"
 msgstr ""
-"Denna insticksmodul kan kontrollera alla meddelanden som tas emot från ett IMAP-, LOKALT- eller POP-konto efter skräppost med Bsfilter.Du behöver ha Bsfilter installerat lokalt.\n"
+"Denna insticksmodul kan kontrollera alla meddelanden som tas emot från ett "
+"IMAP-, LOKALT- eller POP-konto efter skräppost med Bsfilter.Du behöver ha "
+"Bsfilter installerat lokalt.\n"
 "\n"
-"Innan Bsfilter kan känna igen skräppost måste du träna den genom att markera ett par hundra skräp- och icke-skräpmeddelanden genom att använda \"/Markera/Markera som skräp\" och \"/Markera/Markera som icke skräp\".\n"
+"Innan Bsfilter kan känna igen skräppost måste du träna den genom att markera "
+"ett par hundra skräp- och icke-skräpmeddelanden genom att använda \"/Markera/"
+"Markera som skräp\" och \"/Markera/Markera som icke skräp\".\n"
 "\n"
-"När ett meddelande identifieras som skräp kan det tas bort eller sparas i en speciell folder.\n"
+"När ett meddelande identifieras som skräp kan det tas bort eller sparas i en "
+"speciell folder.\n"
 "\n"
 "Alternativ finns i /Konfiguration/Egenskaper/Insticksmoduler/Bsfilter"
 
@@ -9622,9 +9300,11 @@ msgstr ""
 
 #: src/plugins/clamd/clamav_plugin.c:314
 msgid ""
-"This plugin uses Clam AntiVirus to scan all messages that are received from an IMAP, LOCAL or POP account.\n"
+"This plugin uses Clam AntiVirus to scan all messages that are received from "
+"an IMAP, LOCAL or POP account.\n"
 "\n"
-"When a message attachment is found to contain a virus it can be deleted or saved in a specially designated folder.\n"
+"When a message attachment is found to contain a virus it can be deleted or "
+"saved in a specially designated folder.\n"
 "\n"
 "Because this plugin communicates with clamd via a\n"
 "socket then there are some minimum requirements to\n"
@@ -9640,9 +9320,11 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
 msgstr ""
-"Denna insticksmodul använder Clam Antivirus för att skanna alla meddelanden som är mottagna från ett IMAP-, LOCAL-, eller POP-konto.\n"
+"Denna insticksmodul använder Clam Antivirus för att skanna alla meddelanden "
+"som är mottagna från ett IMAP-, LOCAL-, eller POP-konto.\n"
 "\n"
-"När en bilaga hittas som innehåller ett virus kan det tas bort eller sparas in en folder som utsetts för detta.\n"
+"När en bilaga hittas som innehåller ett virus kan det tas bort eller sparas "
+"in en folder som utsetts för detta.\n"
 "\n"
 "Eftersom denna insticksmodul kommunicerar med clamd vi en\n"
 "socket så finns det några krav på rättigheterna för din hem-mapp\n"
@@ -9654,7 +9336,8 @@ msgstr ""
 "clamav-daemonen att kommunicera via en TCP-socket\n"
 "och välja manuell konfiguration för clamd.\n"
 "\n"
-"Inställningar kan hittas i /Konfiguration/Egenskaper/Insticksmoduler/Clam Antivirus"
+"Inställningar kan hittas i /Konfiguration/Egenskaper/Insticksmoduler/Clam "
+"Antivirus"
 
 #: src/plugins/clamd/clamav_plugin.c:353
 msgid "Virus detection"
@@ -9685,12 +9368,16 @@ msgid "Save mail that contains viruses"
 msgstr "Spara e-post som innehåller virus"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:292
-msgid "Folder for storing infected mail. Leave empty to use the default trash folder"
-msgstr "Mapp för att spara infekterad post. Lämna tom för att använda standardpapperskorgen."
+msgid ""
+"Folder for storing infected mail. Leave empty to use the default trash folder"
+msgstr ""
+"Mapp för att spara infekterad post. Lämna tom för att använda "
+"standardpapperskorgen."
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:300
 msgid "Click this button to select a folder for storing infected mail"
-msgstr "Klicka på denna knapp för att välja mapp för att spara infekterad e-post."
+msgstr ""
+"Klicka på denna knapp för att välja mapp för att spara infekterad e-post."
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:308
 msgid "Automatic configuration"
@@ -9705,8 +9392,12 @@ msgid "Where is clamd.conf"
 msgstr "Var finns clamd.conf"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:329
-msgid "Full path to clamd.conf. If this field is not empty then the plugin has been able to locate the file automatically"
-msgstr "Full sökväg till clamd.conf. Om detta fält inte är tomt så har insticksmodulen lyckats hitta filen automatiskt"
+msgid ""
+"Full path to clamd.conf. If this field is not empty then the plugin has been "
+"able to locate the file automatically"
+msgstr ""
+"Full sökväg till clamd.conf. Om detta fält inte är tomt så har "
+"insticksmodulen lyckats hitta filen automatiskt"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:333
 msgid "Br_owse"
@@ -9722,7 +9413,8 @@ msgstr "Kontrollera behörigheterna för mappar och modifiera om nödvändigt"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:358
 msgid "Click this button to check and adjust folder permissions"
-msgstr "Klicka på den här knappen för att kontrollera och modifiera mapprättigheter"
+msgstr ""
+"Klicka på den här knappen för att kontrollera och modifiera mapprättigheter"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:366
 msgid "Remote Host"
@@ -9801,8 +9493,7 @@ msgstr "Socket-skrivfel"
 msgid "Socket read error"
 msgstr "Socket-läsfel"
 
-#: src/plugins/demo/demo.c:31
-#: src/plugins/demo/demo.c:100
+#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:100
 msgid "Demo"
 msgstr "Demo"
 
@@ -9812,108 +9503,115 @@ msgstr "Misslyckades registrera kopplingspunkt för loggtext"
 
 #: src/plugins/demo/demo.c:76
 msgid ""
-"This Plugin is only a demo of how to write plugins for Claws Mail. It installs a hook for new log output and writes it to stdout.\n"
+"This Plugin is only a demo of how to write plugins for Claws Mail. It "
+"installs a hook for new log output and writes it to stdout.\n"
 "\n"
 "It is not really useful."
 msgstr ""
-"Denna insticksmodul är bara en demonstration av hur man skriver insticksmoduler till Claws-Mail. Den installerar en kopplingspunkt för ny loggutskrift och skriver till standard ut.\n"
+"Denna insticksmodul är bara en demonstration av hur man skriver "
+"insticksmoduler till Claws-Mail. Den installerar en kopplingspunkt för ny "
+"loggutskrift och skriver till standard ut.\n"
 "\n"
 "Den är verkligen inte användbar."
 
-#: src/plugins/fancy/fancy_viewer.c:391
+#: src/plugins/fancy/fancy_viewer.c:392
 msgid "Remote content loading is disabled."
 msgstr "Laddning av fjärrinnehåll är avaktiverat."
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:469
 msgid "Load images"
 msgstr "Ladda bilder"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:471
 msgid "Enable remote content"
 msgstr "Tillåt externt innehåll"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:473
 msgid "Enable Javascript"
 msgstr "Aktivera Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:475
 msgid "Enable Plugins"
 msgstr "Aktivera Insticksmoduler"
 
-#: src/plugins/fancy/fancy_viewer.c:476
+#: src/plugins/fancy/fancy_viewer.c:477
 msgid "Enable Java"
 msgstr "Aktivera Java"
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:479
 msgid "Open links with external browser"
 msgstr "Öppna länkar med extern browser"
 
-#: src/plugins/fancy/fancy_viewer.c:647
+#: src/plugins/fancy/fancy_viewer.c:648
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ett fel uppstod: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:698
+#: src/plugins/fancy/fancy_viewer.c:704
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s är ett felaktigt eller ett flöde som inte stöds"
 
-#: src/plugins/fancy/fancy_viewer.c:709
+#: src/plugins/fancy/fancy_viewer.c:715
 msgid "Search the Web"
 msgstr "Sök webben"
 
-#: src/plugins/fancy/fancy_viewer.c:721
+#: src/plugins/fancy/fancy_viewer.c:727
 msgid "Open in Viewer"
 msgstr "Öppna i visare"
 
-#: src/plugins/fancy/fancy_viewer.c:723
+#: src/plugins/fancy/fancy_viewer.c:729
 msgid "Open in Viewer (enable remote content)"
 msgstr "Öppna i Visare (aktivera fjärrinnehåll)"
 
-#: src/plugins/fancy/fancy_viewer.c:732
+#: src/plugins/fancy/fancy_viewer.c:738
 msgid "Open in Browser"
 msgstr "Öppna i browser"
 
-#: src/plugins/fancy/fancy_viewer.c:742
+#: src/plugins/fancy/fancy_viewer.c:748
 msgid "Open Image"
 msgstr "Öppna Bild"
 
-#: src/plugins/fancy/fancy_viewer.c:751
+#: src/plugins/fancy/fancy_viewer.c:757
 msgid "Copy Link"
 msgstr "Kopiera Länk"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:761
 msgid "Download Link"
 msgstr "Ladda ner Länk"
 
-#: src/plugins/fancy/fancy_viewer.c:766
+#: src/plugins/fancy/fancy_viewer.c:772
 msgid "Save Image As"
 msgstr "Spara Bild Som"
 
-#: src/plugins/fancy/fancy_viewer.c:776
+#: src/plugins/fancy/fancy_viewer.c:782
 msgid "Copy Image"
 msgstr "Kopiera Bild"
 
-#: src/plugins/fancy/fancy_viewer.c:794
+#: src/plugins/fancy/fancy_viewer.c:800
 msgid "Import feed"
 msgstr "Importera flöde"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1013
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1032
+#: src/plugins/fancy/fancy_viewer.c:1038
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML-Visare"
 
-#: src/plugins/fancy/fancy_viewer.c:1037
+#: src/plugins/fancy/fancy_viewer.c:1043
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
-"By default all remote content is blocked. Options can be found in /Configuration/Preferences/Plugins/Fancy"
+"By default all remote content is blocked. Options can be found in /"
+"Configuration/Preferences/Plugins/Fancy"
 msgstr ""
-"Denna insticksmodul återger HTML-formaterad e-post med biblioteket Webkit %d.%d.%d.\n"
-"Som standard är allt fjärrinnehåll blockerat och bilder visas inte automatiskt. Inställningar kan hittas i /Konfiguration/Egenskaper/Insticksmoduler/Fancy"
+"Denna insticksmodul återger HTML-formaterad e-post med biblioteket Webkit %d."
+"%d.%d.\n"
+"Som standard är allt fjärrinnehåll blockerat och bilder visas inte "
+"automatiskt. Inställningar kan hittas i /Konfiguration/Egenskaper/"
+"Insticksmoduler/Fancy"
 
 #: src/plugins/fancy/fancy_prefs.c:141
 msgid "Display images"
@@ -9980,7 +9678,8 @@ msgid ""
 "in the email."
 msgstr ""
 "Att ladda externa resurser kan leda till sekretessproblem.\n"
-"När laddning av fjärrinnehållet är inaktiverat, så kommer inget att efterfrågas\n"
+"När laddning av fjärrinnehållet är inaktiverat, så kommer inget att "
+"efterfrågas\n"
 "från nätverket. Rendering av bilder, skript, pluginobjekt eller\n"
 "javaappletar kan fortfarande vara aktiverat för innehåll som är\n"
 "bifogat i e-brevet."
@@ -10013,11 +9712,15 @@ msgstr "Kunde inte registrera kopplingspunkt för mottagning av post"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:209
 msgid ""
-"This plugin modifies the downloaded messages. It inserts headers containing some download information: UIDL, Claws Mail account name, POP server, user ID and retrieval time.\n"
+"This plugin modifies the downloaded messages. It inserts headers containing "
+"some download information: UIDL, Claws Mail account name, POP server, user "
+"ID and retrieval time.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Fetchinfo"
 msgstr ""
-"Denna insticksmodul modifierar nedladdade meddelanden. Den sätter in huvuden som innehåller en del nedladdningsinformation, Claws Mails kontonamn, POP-server, användarID och mottagningstid.\n"
+"Denna insticksmodul modifierar nedladdade meddelanden. Den sätter in huvuden "
+"som innehåller en del nedladdningsinformation, Claws Mails kontonamn, POP-"
+"server, användarID och mottagningstid.\n"
 "\n"
 "Alternativ kan hittas i /Konfiguration/Egenskaper/Insticksmoduler/FetchInfo"
 
@@ -10100,8 +9803,7 @@ msgstr "Insticksmodulen GData: Autentiserad\n"
 msgid "GData plugin: Starting async authentication\n"
 msgstr "Insticksmodulen GData: Startar asynkron autentisering\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/prefs_account.c:1724
+#: src/plugins/gdata/cm_gdata_prefs.c:78 src/prefs_account.c:1720
 msgid "Authentication"
 msgstr "Autentisering"
 
@@ -10111,8 +9813,7 @@ msgid "Username:"
 msgstr "Användarnamn:"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:91
-#: src/plugins/spam_report/spam_report_prefs.c:165
-#: src/wizard.c:1601
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1413
 msgid "Password:"
 msgstr "Lösenord:"
 
@@ -10124,8 +9825,7 @@ msgstr "Avsökningsintervall (sekunder):"
 msgid "Maximum number of results:"
 msgstr "Maximalt antal resultat:"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:146
-#: src/plugins/gdata/gdata_plugin.c:101
+#: src/plugins/gdata/cm_gdata_prefs.c:146 src/plugins/gdata/gdata_plugin.c:101
 #: src/plugins/gdata/gdata_plugin.c:156
 msgid "GData"
 msgstr "GData"
@@ -10136,29 +9836,36 @@ msgid ""
 "GData Plugin: Failed to write plugin configuration to file\n"
 msgstr ""
 "\n"
-"Insticksmodulen GData: Misslyckades att skriva insicksmodulens konfiguration till fil\n"
+"Insticksmodulen GData: Misslyckades att skriva insicksmodulens konfiguration "
+"till fil\n"
 
 #: src/plugins/gdata/gdata_plugin.c:107
 msgid "Failed to register address completion hook in the GData plugin"
-msgstr "Misslyckades att registrera kopplingspunkt för adresskomplettering i insticksmodulen GData"
+msgstr ""
+"Misslyckades att registrera kopplingspunkt för adresskomplettering i "
+"insticksmodulen GData"
 
 #: src/plugins/gdata/gdata_plugin.c:114
 msgid "Failed to register offline switch hook in the GData plugin"
-msgstr "Misslyckades registrera kopplingspunkt för frånkopplat läge i insticksmodulen GData"
+msgstr ""
+"Misslyckades registrera kopplingspunkt för frånkopplat läge i "
+"insticksmodulen GData"
 
 #: src/plugins/gdata/gdata_plugin.c:161
 msgid ""
 "This plugin provides access to the GData protocol for Claws Mail.\n"
 "\n"
 "The GData protocol is an interface to Google services.\n"
-"Currently, the only implemented functionality is to include Google Contacts into the Tab-address completion.\n"
+"Currently, the only implemented functionality is to include Google Contacts "
+"into the Tab-address completion.\n"
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
 "Den här insticksmodulen ger access till GData-protokollet till Claws Mail.\n"
 "\n"
 "GData-protokollet är ett interface till Googles tjänster.\n"
-"För närvarande är dem enda implementerade funktionaliteten inkludering av Google Contacts i Tab-komplettering av adresser.\n"
+"För närvarande är dem enda implementerade funktionaliteten inkludering av "
+"Google Contacts i Tab-komplettering av adresser.\n"
 "Respons till <berndth at gmx.de> är välkommet."
 
 #: src/plugins/gdata/gdata_plugin.c:187
@@ -10191,7 +9898,7 @@ msgstr ""
 "Om en existerande brevlåda specificeras, kommer den\n"
 "att genomsökas automatiskt."
 
-#: src/plugins/mailmbox/plugin_gtk.c:323
+#: src/plugins/mailmbox/plugin_gtk.c:322
 #, c-format
 msgid ""
 "All folder(s) and message(s) under '%s' will be deleted.\n"
@@ -10200,36 +9907,37 @@ msgstr ""
 "Alla mappar och meddelanden under '%s' kommer att tas bort.\n"
 "Vill du verkligen fortsätta?"
 
-#: src/plugins/newmail/newmail.c:110
-#: src/plugins/newmail/newmail.c:153
+#: src/plugins/newmail/newmail.c:111 src/plugins/newmail/newmail.c:162
 msgid "NewMail"
 msgstr "NewMail"
 
-#: src/plugins/newmail/newmail.c:115
+#: src/plugins/newmail/newmail.c:116
 msgid "Failed to register newmail hook"
 msgstr "Kunde inte registrera kopplingspunkt för newmail"
 
-#: src/plugins/newmail/newmail.c:132
+#: src/plugins/newmail/newmail.c:137 src/plugins/newmail/newmail.c:140
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "Kan inte öppna loggfil %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:145
+#: src/plugins/newmail/newmail.c:154
 #, c-format
 msgid ""
-"This plugin writes a header summary to a log file for each mail received after sorting.\n"
+"This plugin writes a header summary to a log file for each mail received "
+"after sorting.\n"
 "\n"
 "Default is ~/Mail/NewLog\n"
 "\n"
 "Current log is %s"
 msgstr ""
-"Denna insticksmodul skriver en sammanfattning till en loggfil för varje mottagen epost efter sortering.\n"
+"Denna insticksmodul skriver en sammanfattning till en loggfil för varje "
+"mottagen epost efter sortering.\n"
 "\n"
 "Standard är ~/Mail/NewLog\n"
 "\n"
 "Nuvarande logg är %s"
 
-#: src/plugins/newmail/newmail.c:179
+#: src/plugins/newmail/newmail.c:188
 msgid "Log file"
 msgstr "Loggfil"
 
@@ -10268,45 +9976,65 @@ msgstr "Insticksmodulen Notifiering kräver stöd för trådar."
 
 #: src/plugins/notification/notification_plugin.c:225
 msgid "Failed to register folder item update hook in the Notification plugin"
-msgstr "Misslyckades registrera kopplingspunkt för mapp-postuppdatering i insticksmodulen Notification"
+msgstr ""
+"Misslyckades registrera kopplingspunkt för mapp-postuppdatering i "
+"insticksmodulen Notification"
 
 #: src/plugins/notification/notification_plugin.c:233
 msgid "Failed to register folder update hook in the Notification plugin"
-msgstr "Misslyckades registrera kopplingspunkt för mappuppdatering i insticksmodulen Notification"
+msgstr ""
+"Misslyckades registrera kopplingspunkt för mappuppdatering i insticksmodulen "
+"Notification"
 
 #: src/plugins/notification/notification_plugin.c:243
 msgid "Failed to register msginfo update hook in the Notification plugin"
-msgstr "Misslyckades registrera kopplingspunkt för msginfo i insticksmodulen Notification"
+msgstr ""
+"Misslyckades registrera kopplingspunkt för msginfo i insticksmodulen "
+"Notification"
 
 #: src/plugins/notification/notification_plugin.c:253
 msgid "Failed to register offline switch hook in the Notification plugin"
-msgstr "Misslyckades registrera kopplingspunkt för offline switch i insticksmodulen Notification"
+msgstr ""
+"Misslyckades registrera kopplingspunkt för offline switch i insticksmodulen "
+"Notification"
 
 #: src/plugins/notification/notification_plugin.c:264
 msgid "Failed to register main window close hook in the Notification plugin"
-msgstr "Misslyckades att registrera stäng-kopplingspunkt för huvudfönstret i insticksmodulen Notification"
+msgstr ""
+"Misslyckades att registrera stäng-kopplingspunkt för huvudfönstret i "
+"insticksmodulen Notification"
 
 #: src/plugins/notification/notification_plugin.c:277
 msgid "Failed to register got iconified hook in the Notification plugin"
-msgstr "Misslyckades registrera kopplingspunkt för ikonifiera i insticksmodulen Notification"
+msgstr ""
+"Misslyckades registrera kopplingspunkt för ikonifiera i insticksmodulen "
+"Notification"
 
 #: src/plugins/notification/notification_plugin.c:290
 msgid "Failed to register account list changed hook in the Notification plugin"
-msgstr "Misslyckades registrera kopplingspunkt för förändrad kontolista i insticksmodulen Notification"
+msgstr ""
+"Misslyckades registrera kopplingspunkt för förändrad kontolista i "
+"insticksmodulen Notification"
 
 #: src/plugins/notification/notification_plugin.c:303
 msgid "Failed to register theme change hook int the Notification plugin"
-msgstr "Misslyckades registrera kopplingspunkt för temaförändring i insticksmodulen Notification"
+msgstr ""
+"Misslyckades registrera kopplingspunkt för temaförändring i insticksmodulen "
+"Notification"
 
 #: src/plugins/notification/notification_plugin.c:419
 msgid ""
-"This plugin provides various ways to notify the user of new and unread email.\n"
-"The plugin is extensively configurable in the plugins section of the preferences dialog.\n"
+"This plugin provides various ways to notify the user of new and unread "
+"email.\n"
+"The plugin is extensively configurable in the plugins section of the "
+"preferences dialog.\n"
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"Denna insticksmodul ger dig flera sätt att notifiera användaren att det finns ny och oläst e-post.\n"
-"Insticksmodulen är mycket konfigurerbar i sektionen insticksmoduler i Egenskaper-dialogen.\n"
+"Denna insticksmodul ger dig flera sätt att notifiera användaren att det "
+"finns ny och oläst e-post.\n"
+"Insticksmodulen är mycket konfigurerbar i sektionen insticksmoduler i "
+"Egenskaper-dialogen.\n"
 "\n"
 "Feedback till <berndth at gmx.de> välkomnas."
 
@@ -10352,6 +10080,11 @@ msgstr "Nytt okänt meddelande"
 msgid "Unknown message type arrived"
 msgstr "Okänd meddelandetyp anlände"
 
+#: src/plugins/notification/notification_popup.c:381
+#: src/plugins/notification/notification_trayicon.c:647
+msgid "Present main window"
+msgstr "Visa huvudfönster"
+
 #: src/plugins/notification/notification_popup.c:491
 msgid "Mail message"
 msgstr "Epostmeddelande"
@@ -10410,9 +10143,8 @@ msgstr "Banderoll"
 msgid "Popup"
 msgstr "Popup"
 
-#: src/plugins/notification/notification_prefs.c:464
-#: src/prefs_actions.c:263
-#: src/prefs_receive.c:147
+#: src/plugins/notification/notification_prefs.c:464 src/prefs_actions.c:263
+#: src/prefs_receive.c:133
 msgid "Command"
 msgstr "Kommando"
 
@@ -10434,7 +10166,8 @@ msgid ""
 "Notification Plugin: Failed to write plugin configuration to file\n"
 msgstr ""
 "\n"
-"Notifieringsinsticksmodulen: Misslyckades att skriva modulinställningar till fil\n"
+"Notifieringsinsticksmodulen: Misslyckades att skriva modulinställningar till "
+"fil\n"
 
 #: src/plugins/notification/notification_prefs.c:597
 msgid "Include folder types"
@@ -10481,17 +10214,13 @@ msgid "Show banner"
 msgstr "Visa banderoll"
 
 #: src/plugins/notification/notification_prefs.c:746
-#: src/plugins/pgpcore/select-keys.c:242
-#: src/plugins/pgpcore/sgpgme.c:144
-#: src/prefs_receive.c:197
-#: src/prefs_summaries.c:462
+#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:144
+#: src/prefs_receive.c:183 src/prefs_summaries.c:462
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/plugins/notification/notification_prefs.c:748
-#: src/prefs_receive.c:195
-#: src/prefs_summaries.c:444
-#: src/prefs_summaries.c:463
+#: src/plugins/notification/notification_prefs.c:748 src/prefs_receive.c:181
+#: src/prefs_summaries.c:444 src/prefs_summaries.c:463
 msgid "Always"
 msgstr "Alltid"
 
@@ -10558,8 +10287,7 @@ msgstr "Förgrundsfärg"
 
 #: src/plugins/notification/notification_prefs.c:882
 #: src/plugins/notification/notification_prefs.c:1102
-#: src/prefs_msg_colors.c:281
-#: src/prefs_msg_colors.c:302
+#: src/prefs_msg_colors.c:281 src/prefs_msg_colors.c:302
 #: src/prefs_msg_colors.c:323
 msgid "Background"
 msgstr "Bakgrund"
@@ -10581,8 +10309,7 @@ msgstr "Tidsgräns för popup:"
 #: src/plugins/notification/notification_prefs.c:1028
 #: src/plugins/notification/notification_prefs.c:1300
 #: src/plugins/notification/notification_prefs.c:1608
-#: src/plugins/spamassassin/spamassassin_gtk.c:391
-#: src/prefs_other.c:558
+#: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:558
 #: src/prefs_summaries.c:496
 msgid "seconds"
 msgstr "sekunder"
@@ -10802,209 +10529,282 @@ msgstr "Format:"
 msgid "Optimized:"
 msgstr "Optimerad:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1165
+#: src/plugins/pdf_viewer/poppler_viewer.c:1181
 msgid "PDF properties"
 msgstr "PDF-egenskaper"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1263
+#: src/plugins/pdf_viewer/poppler_viewer.c:1279
 msgid "Loading..."
 msgstr "Laddar..."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1322
+#: src/plugins/pdf_viewer/poppler_viewer.c:1338
 #, c-format
 msgid "%s Document"
 msgstr "%s Dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1328
+#: src/plugins/pdf_viewer/poppler_viewer.c:1344
 #, c-format
 msgid "of %d"
 msgstr "av %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1705
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1721
+#: src/plugins/pdf_viewer/poppler_viewer.c:1943
 msgid "Document Index"
 msgstr "Dokumentindex"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1895
+#: src/plugins/pdf_viewer/poppler_viewer.c:1911
 msgid "First Page"
 msgstr "Första sidan"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1898
+#: src/plugins/pdf_viewer/poppler_viewer.c:1914
 msgid "Previous Page"
 msgstr "Föregående sida"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1901
+#: src/plugins/pdf_viewer/poppler_viewer.c:1917
 msgid "Next Page"
 msgstr "Nästa sida"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1904
+#: src/plugins/pdf_viewer/poppler_viewer.c:1920
 msgid "Last Page"
 msgstr "Sista sidan"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1907
+#: src/plugins/pdf_viewer/poppler_viewer.c:1923
 msgid "Zoom In"
 msgstr "Zooma in"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1909
+#: src/plugins/pdf_viewer/poppler_viewer.c:1925
 msgid "Zoom Out"
 msgstr "Zooma ut"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1912
+#: src/plugins/pdf_viewer/poppler_viewer.c:1928
 msgid "Fit Page"
 msgstr "Passa Sida"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1915
+#: src/plugins/pdf_viewer/poppler_viewer.c:1931
 msgid "Fit Page Width"
 msgstr "Passa Sidbredd"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1918
+#: src/plugins/pdf_viewer/poppler_viewer.c:1934
 msgid "Rotate Left"
 msgstr "Rotera Vänster"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1921
+#: src/plugins/pdf_viewer/poppler_viewer.c:1937
 msgid "Rotate Right"
 msgstr "Rotera Höger"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1940
 msgid "Document Info"
 msgstr "Dokumentinfo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1929
+#: src/plugins/pdf_viewer/poppler_viewer.c:1945
 msgid "Page Number"
 msgstr "Sidnummer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1931
+#: src/plugins/pdf_viewer/poppler_viewer.c:1947
 msgid "Zoom Factor"
 msgstr "Anpassad zoom"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2036
+#: src/plugins/pdf_viewer/poppler_viewer.c:2052
 #, c-format
 msgid ""
-"This plugin enables the viewing of PDF and PostScript attachments using the Poppler %s Lib and the gs tool.\n"
+"This plugin enables the viewing of PDF and PostScript attachments using the "
+"Poppler %s Lib and the gs tool.\n"
 "\n"
 "Any feedback is welcome: iwkse at claws-mail.org"
 msgstr ""
-"Den här insticksmodulen tillåter dig att se PDF och PostScript-bilagor med hjälp av biblioteket Poppler %s och verktyget gs.\n"
+"Den här insticksmodulen tillåter dig att se PDF och PostScript-bilagor med "
+"hjälp av biblioteket Poppler %s och verktyget gs.\n"
 "\n"
 "All feedback är välkommen: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2042
-#: src/plugins/pdf_viewer/poppler_viewer.c:2050
-#: src/plugins/pdf_viewer/poppler_viewer.c:2070
+#: src/plugins/pdf_viewer/poppler_viewer.c:2058
+#: src/plugins/pdf_viewer/poppler_viewer.c:2066
+#: src/plugins/pdf_viewer/poppler_viewer.c:2086
 msgid "PDF Viewer"
 msgstr "PDF-visare"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2046
+#: src/plugins/pdf_viewer/poppler_viewer.c:2062
 #, c-format
 msgid ""
-"Warning: could not find ghostscript binary (gs) required for %s plugin to process PostScript attachments, only PDF attachments will be displayed. To enable PostScript support please install gs program.\n"
+"Warning: could not find ghostscript binary (gs) required for %s plugin to "
+"process PostScript attachments, only PDF attachments will be displayed. To "
+"enable PostScript support please install gs program.\n"
 "\n"
 "%s"
 msgstr ""
-"Varning: kunde inte hitta ghostscript-binären (gs) som krävs för insticksmodulen %s för att processa PostScript-bilagor, endast PDF-bilagor kommer att visas. För att aktivera PostScript-stöd vänligen installera programmet gs.\n"
+"Varning: kunde inte hitta ghostscript-binären (gs) som krävs för "
+"insticksmodulen %s för att processa PostScript-bilagor, endast PDF-bilagor "
+"kommer att visas. För att aktivera PostScript-stöd vänligen installera "
+"programmet gs.\n"
 "\n"
 "%s"
 
-#: src/plugins/python/python_plugin.c:338
-#: src/plugins/python/python_plugin.c:482
+#: src/plugins/python/python_plugin.c:358
+#: src/plugins/python/python_plugin.c:502
 msgid "Python scripts"
 msgstr "Pythonskript"
 
-#: src/plugins/python/python_plugin.c:477
+#: src/plugins/python/python_plugin.c:497
 msgid "Show Python console..."
 msgstr "Visa Python-konsol..."
 
-#: src/plugins/python/python_plugin.c:483
+#: src/plugins/python/python_plugin.c:503
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: src/plugins/python/python_plugin.c:485
-#: src/prefs_account.c:2488
-#: src/prefs_account.c:2510
-#: src/prefs_account.c:2769
-#: src/wizard.c:1379
-#: src/wizard.c:1658
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2480
+#: src/prefs_account.c:2502 src/prefs_account.c:2761 src/wizard.c:1191
+#: src/wizard.c:1465
 msgid "Browse"
 msgstr "Bläddra"
 
-#: src/plugins/python/python_plugin.c:548
-#: src/plugins/python/python_plugin.c:602
+#: src/plugins/python/python_plugin.c:646
+#: src/plugins/python/python_plugin.c:725
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:554
+#: src/plugins/python/python_plugin.c:652
 msgid "Failed to register \"compose create hook\" in the Python plugin"
-msgstr "Misslyckades registrera kopplingspunkt för \"Compose Create\" i insticksmodulen Python"
+msgstr ""
+"Misslyckades registrera kopplingspunkt för \"Compose Create\" i "
+"insticksmodulen Python"
 
-#: src/plugins/python/python_plugin.c:607
+#: src/plugins/python/python_plugin.c:730
 msgid ""
 "This plugin provides Python integration features.\n"
+"Python code can be entered interactively into an embedded Python console, "
+"under Tools -> Show Python console, or stored in scripts.\n"
+"\n"
+"These scripts are then available via the menu. You can assign keyboard "
+"shortcuts to them just like it is done with other menu items. You can also "
+"put buttons for script invokation into the toolbars using Claws Mail's "
+"builtin toolbar editor.\n"
+"\n"
+"You can provide scripts working on the main window by placing files into ~/."
+"claws-mail/python-scripts/main.\n"
+"\n"
+"You can also provide scripts working on an open compose window by placing "
+"files into ~/.claws-mail/python-scripts/compose.\n"
+"\n"
+"The folder ~/.claws-mail/python-scripts/auto/ may contain some scripts that "
+"are automatically executed when certain events occur. Currently, the "
+"following files in this directory are recognised:\n"
+"\n"
+"compose_any\n"
+"Gets executed whenever a compose window is opened, no matterif that opening "
+"happened as a result of composing a new message,replying or forwarding a "
+"message.\n"
+"\n"
+"startup\n"
+"Executed at plugin load\n"
+"\n"
+"shutdown\n"
+"Executed at plugin unload\n"
+"\n"
 "\n"
 "For the most up-to-date API documentation, type\n"
 "\n"
 " help(clawsmail)\n"
 "\n"
-"in the interactive Python console under Tools -> Show Python console.\n"
+"in the interactive Python console.\n"
 "\n"
-"The source distribution of this plugin comes with various example scripts in the \"examples\" subdirectory. If you wrote a script that you would be interested in sharing, feel free to send it to me to have it considered for inclusion in the examples.\n"
+"The source distribution of this plugin comes with various example scripts in "
+"the \"examples\" subdirectory. If you wrote a script that you would be "
+"interested in sharing, feel free to send it to me to have it considered for "
+"inclusion in the examples.\n"
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"Denna insticksmodul ger integreringsfunktioner för Python.\n"
+"Denna insticksmodul tillhandahåller funktioner för att integrera Python.\n"
+"Pyhonkod kan matas in interaktivt i en inbäddad Pythonkonsol, under Verktyg -"
+"> Visa Pythonkonsol, eller sparas i skript.\n"
+"\n"
+"Dessa skript är då tillgängliga via menyn. Du kan tilldela "
+"tangentborgsgenvägar till dessa precis som man gör med andra menyval. Du kan "
+"även lägga till knappar för att köra skript i verktygsraden med hjälp av "
+"Claws Mails verktygsradsredigerare.\n"
+"\n"
+"Du kan tillhandahålla skript som kör i huvudfönstret genom att lägga till "
+"filer i ~/.claws-mail/python-scripts/main.\n"
+"\n"
+"Du kan även tillhandahålla skript som kör på ett öppet \"Skriv Meddelande\"-"
+"fönster genom att lägga till filer i ~/.claws-mail/python-scripts/compose.\n"
+"\n"
+"Mappen ~/.claws-mail/python-scripts/auto/ kan innehålla skript som "
+"automatiskt körs när speciella händelser sker. För närvarande känns följande "
+"filer i denna mapp igen:\n"
+"\n"
+"compose_any\n"
+"Körs när ett \"Skriv Meddelande\"-fönster öppnas, oberoende på om det hände "
+"som ett resultat av att skapa ett nytt meddelande, eller om man har svarat "
+"på eller vidarebefordrat ett meddelande.\n"
+"\n"
+"startup\n"
+"Exekveras när insticksmodulen laddas\n"
+"\n"
+"shutdown\n"
+"Exekveras när insticksmodulen stängs ner\n"
+"\n"
 "\n"
 "För den mest uppdaterade API-dokumentationen, skriv\n"
 "\n"
 " help(clawsmail)\n"
 "\n"
-"i den interaktiva Python-konsollen under Verktyg -> Visa Python-konsoll.\n"
+"I den interaktiva Pythonkonsolen.\n"
 "\n"
-"Källkodsdistributionen av denna insticksmodul kommer med olika exempelskript i \"examples\"-mappen. Om duskrev ett skript som du skulle vara intresserad av att dela med dig, var vänlig skicka den till mig för att få den övervägs att inkluderas i exemplen.\n"
+"Källkodsdistributionen av denna insticksmodul kommer med olika exempelskript "
+"i \"examples\"-mappen. Om du skrev ett skript som du vill dela med dig av, "
+"skicka det gärna till mig för att få det bedömt för inkludering i exemplen.\n"
 "\n"
-"Feedback till <berndth at gmx.de> välkomnas."
+"Synpunkter till <berndth at gmx.de> uppskattas."
 
-#: src/plugins/python/python_plugin.c:636
+#: src/plugins/python/python_plugin.c:781
 msgid "Python integration"
 msgstr "Pythonintegrering"
 
-#: src/plugins/pgpcore/passphrase.c:86
-#: src/plugins/pgpcore/prefs_gpg.c:108
+#: src/plugins/pgpcore/passphrase.c:86 src/plugins/pgpcore/prefs_gpg.c:108
 msgid "Passphrase"
 msgstr "Lösenfras"
 
-#: src/plugins/pgpcore/passphrase.c:253
+#: src/plugins/pgpcore/passphrase.c:249
 msgid "[no user id]"
 msgstr "[inget användarid.]"
 
-#: src/plugins/pgpcore/passphrase.c:264
+#: src/plugins/pgpcore/passphrase.c:260
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the new key:</span>\n"
+"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the "
+"new key:</span>\n"
 "\n"
 "%.*s\n"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">%sAnge lösenfrasen för den nya nyckeln:</span>\n"
+"<span weight=\"bold\" size=\"larger\">%sAnge lösenfrasen för den nya nyckeln:"
+"</span>\n"
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:267
+#: src/plugins/pgpcore/passphrase.c:263
 msgid "Passphrases did not match.\n"
 msgstr "Lösenordsfraserna är inte lika.\n"
 
-#: src/plugins/pgpcore/passphrase.c:270
+#: src/plugins/pgpcore/passphrase.c:266
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the new key:</span>\n"
+"<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the "
+"new key:</span>\n"
 "\n"
 "%.*s\n"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Repetera lösenfrasen för den nya nyckeln:</span>\n"
+"<span weight=\"bold\" size=\"larger\">Repetera lösenfrasen för den nya "
+"nyckeln:</span>\n"
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:274
+#: src/plugins/pgpcore/passphrase.c:270
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</span>\n"
+"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
+"span>\n"
 "\n"
 "%.*s\n"
 msgstr ""
@@ -11012,7 +10812,7 @@ msgstr ""
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:277
+#: src/plugins/pgpcore/passphrase.c:273
 msgid "Bad passphrase.\n"
 msgstr "Fel lösenfras.\n"
 
@@ -11021,11 +10821,14 @@ msgid "Key import"
 msgstr "Nyckelimport"
 
 #: src/plugins/pgpcore/pgp_viewer.c:122
-msgid "This key is not in your keyring. Do you want Claws Mail to try and import it from a keyserver?"
-msgstr "Den här nyckeln finns inte i din nyckelring. Vill du att Claws-Mail ska försöka importera den från en nyckelserver?"
+msgid ""
+"This key is not in your keyring. Do you want Claws Mail to try and import it "
+"from a keyserver?"
+msgstr ""
+"Den här nyckeln finns inte i din nyckelring. Vill du att Claws-Mail ska "
+"försöka importera den från en nyckelserver?"
 
-#: src/plugins/pgpcore/pgp_viewer.c:129
-#: src/plugins/pgpcore/pgp_viewer.c:201
+#: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:201
 msgid ""
 "\n"
 "  Key ID "
@@ -11033,8 +10836,7 @@ msgstr ""
 "\n"
 " Nyckel-ID "
 
-#: src/plugins/pgpcore/pgp_viewer.c:132
-#: src/plugins/pgpcore/pgp_viewer.c:194
+#: src/plugins/pgpcore/pgp_viewer.c:132 src/plugins/pgpcore/pgp_viewer.c:194
 msgid "   This key is not in your keyring.\n"
 msgstr "   Den här nyckeln finns inte i din nyckelring.\n"
 
@@ -11104,16 +10906,20 @@ msgstr "PGP/Core"
 
 #: src/plugins/pgpcore/plugin.c:66
 msgid ""
-"This plugin handles PGP core operations, it is used by other plugins, like PGP/Mime.\n"
+"This plugin handles PGP core operations, it is used by other plugins, like "
+"PGP/Mime.\n"
 "\n"
-"Options can be found in /Configuration/Preferences/Plugins/GPG and /Configuration/[Account Preferences]/Plugins/GPG\n"
+"Options can be found in /Configuration/Preferences/Plugins/GPG and /"
+"Configuration/[Account Preferences]/Plugins/GPG\n"
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Denna insticksmodul hanterar PGP-grundoperationer, den används av andra insticksmoduler, som PGP/Mime.\\n"
-"Alternativ finns under /Konfiguration/Egenskaper/Insticksmoduler/GPG och /Konfiguration/Egenskaper/[Kontoegenskaper]/Insticksmoduler/GPG\n"
+"Denna insticksmodul hanterar PGP-grundoperationer, den används av andra "
+"insticksmoduler, som PGP/Mime.\\nAlternativ finns under /Konfiguration/"
+"Egenskaper/Insticksmoduler/GPG och /Konfiguration/Egenskaper/"
+"[Kontoegenskaper]/Insticksmoduler/GPG\n"
 "\n"
 "Insticksmodulen använder GPGME-biblioteket som ett skal omkring GnuPG.\n"
 "\n"
@@ -11143,8 +10949,7 @@ msgstr "Förfaller efter"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "'0' kommer att lagra lösenfrasen för hela sessionen"
 
-#: src/plugins/pgpcore/prefs_gpg.c:145
-#: src/prefs_receive.c:173
+#: src/plugins/pgpcore/prefs_gpg.c:145 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "minut(er)"
 
@@ -11198,55 +11003,52 @@ msgstr "Ingen exakt matchning för '%s': vänligen välj nyckel."
 msgid "Collecting info for '%s' ... %c"
 msgstr "Samlar information för '%s' ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:239
-#: src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:142
 msgid "Undefined"
 msgstr "Odefinierad"
 
-#: src/plugins/pgpcore/select-keys.c:245
-#: src/plugins/pgpcore/sgpgme.c:146
+#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:146
 msgid "Marginal"
 msgstr "Marginal"
 
-#: src/plugins/pgpcore/select-keys.c:251
-#: src/plugins/pgpcore/sgpgme.c:150
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:150
 msgid "Ultimate"
 msgstr "Ultimat"
 
-#: src/plugins/pgpcore/select-keys.c:370
+#: src/plugins/pgpcore/select-keys.c:366
 msgid "Select Keys"
 msgstr "Välj nycklar"
 
-#: src/plugins/pgpcore/select-keys.c:397
+#: src/plugins/pgpcore/select-keys.c:393
 msgid "Key ID"
 msgstr "Nyckel-ID"
 
-#: src/plugins/pgpcore/select-keys.c:400
+#: src/plugins/pgpcore/select-keys.c:396
 msgid "Trust"
 msgstr "Tillit"
 
-#: src/plugins/pgpcore/select-keys.c:425
+#: src/plugins/pgpcore/select-keys.c:421
 msgid "_Other"
 msgstr "_Övrigt"
 
-#: src/plugins/pgpcore/select-keys.c:426
+#: src/plugins/pgpcore/select-keys.c:422
 msgid "Do_n't encrypt"
 msgstr "Kryptera i_nte"
 
-#: src/plugins/pgpcore/select-keys.c:585
+#: src/plugins/pgpcore/select-keys.c:581
 msgid "Add key"
 msgstr "Lägg till nyckel"
 
-#: src/plugins/pgpcore/select-keys.c:586
+#: src/plugins/pgpcore/select-keys.c:582
 msgid "Enter another user or key ID:"
 msgstr "Skriv in ett annan användar- eller nyckel-ID:"
 
-#: src/plugins/pgpcore/select-keys.c:608
+#: src/plugins/pgpcore/select-keys.c:604
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Kryptera till %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:609
+#: src/plugins/pgpcore/select-keys.c:605
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -11265,28 +11067,22 @@ msgstr ""
 "\n"
 "Litar du tillräckligt på den för att använda den ändå? "
 
-#: src/plugins/pgpcore/sgpgme.c:80
-#: src/privacy.c:249
-#: src/privacy.c:253
-#: src/privacy.c:270
-#: src/privacy.c:274
+#: src/plugins/pgpcore/sgpgme.c:80 src/privacy.c:249 src/privacy.c:253
+#: src/privacy.c:270 src/privacy.c:274
 msgid "No signature found"
 msgstr "Ingen signatur funnen"
 
-#: src/plugins/pgpcore/sgpgme.c:184
-#: src/plugins/pgpcore/sgpgme.c:203
+#: src/plugins/pgpcore/sgpgme.c:184 src/plugins/pgpcore/sgpgme.c:203
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Signaturen kan inte kontrolleras - %s"
 
-#: src/plugins/pgpcore/sgpgme.c:188
-#: src/plugins/pgpcore/sgpgme.c:192
+#: src/plugins/pgpcore/sgpgme.c:188 src/plugins/pgpcore/sgpgme.c:192
 #: src/plugins/pgpcore/sgpgme.c:242
 msgid "The signature has not been checked."
 msgstr "Signaturen har inte kontrollerats."
 
-#: src/plugins/pgpcore/sgpgme.c:198
-#: src/plugins/pgpcore/sgpgme.c:200
+#: src/plugins/pgpcore/sgpgme.c:198 src/plugins/pgpcore/sgpgme.c:200
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: Kan inte hämta nyckel - ingen gpg-agent körs."
 
@@ -11395,12 +11191,17 @@ msgstr "Fel vid inställning av hemlig nyckel %s"
 #: src/plugins/pgpcore/sgpgme.c:677
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
-msgstr "Gpgme-protokoll '%s' är oanvändbar: Motor '%s' är inte korrekt installerad."
+msgstr ""
+"Gpgme-protokoll '%s' är oanvändbar: Motor '%s' är inte korrekt installerad."
 
 #: src/plugins/pgpcore/sgpgme.c:683
 #, c-format
-msgid "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but version %s is required.\n"
-msgstr "Gpgme-protokoll '%s' är oanvändbar: Motor '%s' version %s är installerad, men version %s krävs.\n"
+msgid ""
+"Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
+"version %s is required.\n"
+msgstr ""
+"Gpgme-protokoll '%s' är oanvändbar: Motor '%s' version %s är installerad, "
+"men version %s krävs.\n"
 
 #: src/plugins/pgpcore/sgpgme.c:691
 #, c-format
@@ -11416,8 +11217,12 @@ msgstr ""
 "OpenPGP-stöd avstängt."
 
 #: src/plugins/pgpcore/sgpgme.c:741
-msgid "You have to save the account's information with \"OK\" before being able to generate a key pair.\n"
-msgstr "Du måste spara kontots information med \"OK\" innan du kan generera ett nyckelpar.\n"
+msgid ""
+"You have to save the account's information with \"OK\" before being able to "
+"generate a key pair.\n"
+msgstr ""
+"Du måste spara kontots information med \"OK\" innan du kan generera ett "
+"nyckelpar.\n"
 
 #: src/plugins/pgpcore/sgpgme.c:746
 msgid "No PGP key found"
@@ -11425,21 +11230,26 @@ msgstr "Ingen PGP-nyckel hittad"
 
 #: src/plugins/pgpcore/sgpgme.c:747
 msgid ""
-"Claws Mail did not find a secret PGP key, which means that you won't be able to sign emails or receive encrypted emails.\n"
+"Claws Mail did not find a secret PGP key, which means that you won't be able "
+"to sign emails or receive encrypted emails.\n"
 "Do you want to create a new key pair now?"
 msgstr ""
-"Claws-Mail kunde inte hitta någon hemlig PGP-nyckel, vilket innebär att du kommer inte kunna signera e-post eller ta emot krypterad e-post.\n"
+"Claws-Mail kunde inte hitta någon hemlig PGP-nyckel, vilket innebär att du "
+"kommer inte kunna signera e-post eller ta emot krypterad e-post.\n"
 "Vill du skapa ett nytt nyckelpar nu? "
 
-#: src/plugins/pgpcore/sgpgme.c:817
-#: src/plugins/pgpcore/sgpgme.c:833
+#: src/plugins/pgpcore/sgpgme.c:817 src/plugins/pgpcore/sgpgme.c:833
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Kunde inte generera ett nytt nyckelpar: %s"
 
 #: src/plugins/pgpcore/sgpgme.c:824
-msgid "Generating your new key pair... Please move the mouse around to help generate entropy..."
-msgstr "Genererar ditt nya nyckelpar... Flytta runt muspekaren för att hjälpa till att generera entropi..."
+msgid ""
+"Generating your new key pair... Please move the mouse around to help "
+"generate entropy..."
+msgstr ""
+"Genererar ditt nya nyckelpar... Flytta runt muspekaren för att hjälpa till "
+"att generera entropi..."
 
 #: src/plugins/pgpcore/sgpgme.c:839
 msgid "Couldn't generate a new key pair: unknown error"
@@ -11474,62 +11284,50 @@ msgstr "Kunde inte exportera nyckel."
 msgid "Key export isn't implemented in Windows."
 msgstr "Export av nyckel är inte implementerad i Windows."
 
-#: src/plugins/pgpinline/pgpinline.c:258
+#: src/plugins/pgpinline/pgpinline.c:156
 msgid "Incorrect part"
 msgstr "Felaktig del"
 
-#: src/plugins/pgpinline/pgpinline.c:262
+#: src/plugins/pgpinline/pgpinline.c:160
 msgid "Not a text part"
 msgstr "Inte en textdel"
 
-#: src/plugins/pgpinline/pgpinline.c:273
-#: src/plugins/pgpinline/pgpinline.c:430
+#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
 msgid "Couldn't get text data."
 msgstr "Kunde inte hämta textdata."
 
-#: src/plugins/pgpinline/pgpinline.c:291
+#: src/plugins/pgpinline/pgpinline.c:189
 msgid "Couldn't convert text data to any sane charset."
 msgstr "Kunde inte konvertera text-data till någon vettig teckenuppsättning."
 
-#: src/plugins/pgpinline/pgpinline.c:299
-#: src/plugins/pgpinline/pgpinline.c:624
-#: src/plugins/pgpinline/pgpinline.c:763
-#: src/plugins/pgpinline/pgpinline.c:819
-#: src/plugins/pgpmime/pgpmime.c:73
-#: src/plugins/pgpmime/pgpmime.c:182
-#: src/plugins/pgpmime/pgpmime.c:322
-#: src/plugins/pgpmime/pgpmime.c:500
-#: src/plugins/pgpmime/pgpmime.c:644
-#: src/plugins/smime/smime.c:406
+#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:517
+#: src/plugins/pgpinline/pgpinline.c:656 src/plugins/pgpinline/pgpinline.c:712
+#: src/plugins/pgpmime/pgpmime.c:74 src/plugins/pgpmime/pgpmime.c:183
+#: src/plugins/pgpmime/pgpmime.c:329 src/plugins/pgpmime/pgpmime.c:507
+#: src/plugins/pgpmime/pgpmime.c:651 src/plugins/smime/smime.c:395
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Kunde inte initiera GPG-sammanhang, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:423
+#: src/plugins/pgpinline/pgpinline.c:316
 msgid "Couldn't parse mime part."
 msgstr "Kunde inte tolka mime-del."
 
-#: src/plugins/pgpinline/pgpinline.c:453
-#: src/plugins/pgpmime/pgpmime.c:345
+#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:352
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Kunde inte öppna dekrypterad fil %s"
 
-#: src/plugins/pgpinline/pgpinline.c:470
-#: src/plugins/pgpinline/pgpinline.c:479
-#: src/plugins/pgpinline/pgpinline.c:488
-#: src/plugins/pgpinline/pgpinline.c:496
-#: src/plugins/pgpinline/pgpinline.c:506
-#: src/plugins/pgpinline/pgpinline.c:515
-#: src/plugins/pgpmime/pgpmime.c:356
-#: src/plugins/pgpmime/pgpmime.c:370
+#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
+#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
+#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
+#: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "Kunde inte skriva till dekrypterad fil %s"
 
-#: src/plugins/pgpinline/pgpinline.c:484
-#: src/plugins/pgpinline/pgpinline.c:485
-#: src/plugins/pgpinline/pgpinline.c:486
+#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:379
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -11537,80 +11335,74 @@ msgstr ""
 "\n"
 "--- Start av PGP/Infoga-krypterat data ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:502
-#: src/plugins/pgpinline/pgpinline.c:503
-#: src/plugins/pgpinline/pgpinline.c:504
+#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:397
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Slut på PGP/Infoga-krypterat data ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:523
-#: src/plugins/pgpmime/pgpmime.c:382
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:389
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "Kunde inte stänga dekrypterad fil %s"
 
-#: src/plugins/pgpinline/pgpinline.c:535
+#: src/plugins/pgpinline/pgpinline.c:428
 msgid "Couldn't scan decrypted file."
 msgstr "Kunde inte läsa dekryptera fil."
 
-#: src/plugins/pgpinline/pgpinline.c:543
+#: src/plugins/pgpinline/pgpinline.c:436
 msgid "Couldn't scan decrypted file parts."
 msgstr "Kunde inte läsa dekrypterade fildelar."
 
-#: src/plugins/pgpinline/pgpinline.c:598
-#: src/plugins/pgpinline/pgpinline.c:790
+#: src/plugins/pgpinline/pgpinline.c:491 src/plugins/pgpinline/pgpinline.c:683
 msgid "Malformed message"
 msgstr "Felaktigt meddelande"
 
-#: src/plugins/pgpinline/pgpinline.c:609
+#: src/plugins/pgpinline/pgpinline.c:502
 msgid "Couldn't create temporary file."
 msgstr "Kunde inte skapa tillfällig fil."
 
-#: src/plugins/pgpinline/pgpinline.c:648
-#: src/plugins/pgpmime/pgpmime.c:527
+#: src/plugins/pgpinline/pgpinline.c:541 src/plugins/pgpmime/pgpmime.c:534
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Signering av data misslyckades, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:666
-#: src/plugins/pgpmime/pgpmime.c:552
+#: src/plugins/pgpinline/pgpinline.c:559 src/plugins/pgpmime/pgpmime.c:559
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Signering av data misslyckades på grund av ogiltig signerare: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:675
-#: src/plugins/pgpmime/pgpmime.c:561
+#: src/plugins/pgpinline/pgpinline.c:568 src/plugins/pgpmime/pgpmime.c:568
 msgid "Data signing failed, no results."
 msgstr "Signering av data misslyckades, inga resultat."
 
-#: src/plugins/pgpinline/pgpinline.c:685
-#: src/plugins/pgpmime/pgpmime.c:572
+#: src/plugins/pgpinline/pgpinline.c:578 src/plugins/pgpmime/pgpmime.c:579
 msgid "Data signing failed, no contents."
 msgstr "Signering av data misslyckades, inget innehåll."
 
-#: src/plugins/pgpinline/pgpinline.c:729
-msgid "Please note that attachments are not encrypted by the PGP/Inline system, nor are email headers, like Subject."
-msgstr "Vänligen notera att bilagor inte krypteras av PGP/Inline-systemet, ej heller brevhuvuden, så som Ämne."
+#: src/plugins/pgpinline/pgpinline.c:622
+msgid ""
+"Please note that attachments are not encrypted by the PGP/Inline system, nor "
+"are email headers, like Subject."
+msgstr ""
+"Vänligen notera att bilagor inte krypteras av PGP/Inline-systemet, ej heller "
+"brevhuvuden, så som Ämne."
 
-#: src/plugins/pgpinline/pgpinline.c:773
-#: src/plugins/pgpmime/pgpmime.c:654
+#: src/plugins/pgpinline/pgpinline.c:666 src/plugins/pgpmime/pgpmime.c:661
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Kunde inte lägga till GPG-nyckel %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:801
-#: src/plugins/pgpmime/pgpmime.c:683
+#: src/plugins/pgpinline/pgpinline.c:694 src/plugins/pgpmime/pgpmime.c:690
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Kunde inte skapa tillfällig fil, %s."
 
-#: src/plugins/pgpinline/pgpinline.c:832
-#: src/plugins/pgpmime/pgpmime.c:710
+#: src/plugins/pgpinline/pgpinline.c:725 src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Kryptering misslyckades, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:899
+#: src/plugins/pgpinline/pgpinline.c:793
 msgid "PGP/Inline"
 msgstr "PGP/Infoga"
 
@@ -11620,47 +11412,56 @@ msgstr "PGP/infoga"
 
 #: src/plugins/pgpinline/plugin.c:60
 msgid ""
-"This plugin handles the deprecated Inline method of signing and/or encrypting mails. You can decrypt mails, verify signatures or sign and encrypt your own mails.\n"
+"This plugin handles the deprecated Inline method of signing and/or "
+"encrypting mails. You can decrypt mails, verify signatures or sign and "
+"encrypt your own mails.\n"
 "\n"
-"It can be selected as the Default Privacy System in /Configuration/[Account Preferences]/Privacy and when composing a message from /Options/Privacy System\n"
+"It can be selected as the Default Privacy System in /Configuration/[Account "
+"Preferences]/Privacy and when composing a message from /Options/Privacy "
+"System\n"
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Denna insticksmodul hanterar den förkastade Infoga-metoden för signering och/eller kryptering av e-post. Du kan dekryptera e-post, verifiera signaturer eller signera och kryptera din egna e-postmeddelanden.\n"
+"Denna insticksmodul hanterar den förkastade Infoga-metoden för signering och/"
+"eller kryptering av e-post. Du kan dekryptera e-post, verifiera signaturer "
+"eller signera och kryptera din egna e-postmeddelanden.\n"
 "\n"
-"Den kan väljas som Standard Sekretesssystem i /Konfiguration/[Kontoegenskaper]/Sekretess och vid skapandet av meddelande från /Alternativ/Sekretesssystem\n"
+"Den kan väljas som Standard Sekretesssystem i /Konfiguration/"
+"[Kontoegenskaper]/Sekretess och vid skapandet av meddelande från /Alternativ/"
+"Sekretesssystem\n"
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:202
+#: src/plugins/pgpmime/pgpmime.c:203
 msgid "Signature boundary not found."
 msgstr "Signaturavgränsare inte funnen"
 
-#: src/plugins/pgpmime/pgpmime.c:394
-#: src/plugins/smime/smime.c:487
+#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:476
 msgid "Couldn't parse decrypted file."
 msgstr "Kunde inte tolka dektrypterad fil."
 
-#: src/plugins/pgpmime/pgpmime.c:400
-#: src/plugins/smime/smime.c:494
+#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:483
 msgid "Couldn't parse decrypted file parts."
 msgstr "Kunde inte tolka dekrypterade fildelar."
 
-#: src/plugins/pgpmime/pgpmime.c:446
-#: src/plugins/pgpmime/pgpmime.c:485
+#: src/plugins/pgpmime/pgpmime.c:453 src/plugins/pgpmime/pgpmime.c:492
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Kunde inte skapa tillfällig fil: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:610
-msgid "Please note that email headers, like Subject, are not encrypted by the PGP/Mime system."
-msgstr "Vänligen notera att brevhuvuden, så som Ämne, inte krypteras av PGP/Mime-systemet."
+#: src/plugins/pgpmime/pgpmime.c:617
+msgid ""
+"Please note that email headers, like Subject, are not encrypted by the PGP/"
+"Mime system."
+msgstr ""
+"Vänligen notera att brevhuvuden, så som Ämne, inte krypteras av PGP/Mime-"
+"systemet."
 
-#: src/plugins/pgpmime/pgpmime.c:780
+#: src/plugins/pgpmime/pgpmime.c:788
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -11670,17 +11471,24 @@ msgstr "PGP/MIME"
 
 #: src/plugins/pgpmime/plugin.c:60
 msgid ""
-"This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt mails, verify signatures or sign and encrypt your own mails.\n"
+"This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
+"mails, verify signatures or sign and encrypt your own mails.\n"
 "\n"
-"It can be selected as the Default Privacy System in /Configuration/[Account Preferences]/Privacy and when composing a message from /Options/Privacy System\n"
+"It can be selected as the Default Privacy System in /Configuration/[Account "
+"Preferences]/Privacy and when composing a message from /Options/Privacy "
+"System\n"
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Denna insticksmodul hanterar PGP/MIME-signerade och/eller krypterade e-postmeddelanden. Du kan dekryptera e-post, verifiera signaturer eller signera och kryptera din egna e-postmeddelanden.\n"
+"Denna insticksmodul hanterar PGP/MIME-signerade och/eller krypterade e-"
+"postmeddelanden. Du kan dekryptera e-post, verifiera signaturer eller "
+"signera och kryptera din egna e-postmeddelanden.\n"
 "\n"
-"Den kan väljas som Standard Sekretesssystem i /Konfiguration/[Kontoegenskaper]/Sekretess och vid skapande av meddelande från /Alternativ/Sekretesssystem\n"
+"Den kan väljas som Standard Sekretesssystem i /Konfiguration/"
+"[Kontoegenskaper]/Sekretess och vid skapande av meddelande från /Alternativ/"
+"Sekretesssystem\n"
 "\n"
 "Insticksmodulen använder GPGME-biblioteket som ett skal omkring GnuPG.\n"
 "\n"
@@ -11769,10 +11577,12 @@ msgstr "Ange namnet på den nya RSS mappen."
 #: src/plugins/rssyl/rssyl_gtk.c:169
 msgid ""
 "Creation of folder tree failed.\n"
-"Maybe some files already exist, or you don't have the permission to write there?"
+"Maybe some files already exist, or you don't have the permission to write "
+"there?"
 msgstr ""
 "Fel vid skapandet av mapp.\n"
-"Det finns kanske redan filer, eller så har du inte rättigheter att skriva där?"
+"Det finns kanske redan filer, eller så har du inte rättigheter att skriva "
+"där?"
 
 #: src/plugins/rssyl/rssyl_gtk.c:184
 msgid "RSSyl..."
@@ -11808,7 +11618,8 @@ msgid ""
 "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
 msgstr ""
 "<b>Uppdateringsintervall i minuter:</b>\n"
-"<small>(Sätt 0 för att avaktivera automatisk uppdatering av detta flöde)</small>"
+"<small>(Sätt 0 för att avaktivera automatisk uppdatering av detta flöde)</"
+"small>"
 
 #: src/plugins/rssyl/rssyl_gtk.c:407
 msgid ""
@@ -11842,8 +11653,7 @@ msgstr "_OK"
 msgid "Set feed properties"
 msgstr "Ställ egenskaper för flöde"
 
-#: src/plugins/rssyl/rssyl_gtk.c:634
-#: src/plugins/rssyl/rssyl_gtk.c:658
+#: src/plugins/rssyl/rssyl_gtk.c:634 src/plugins/rssyl/rssyl_gtk.c:658
 msgid "Unsubscribe feed"
 msgstr "Avbryt prenumeration på flöde"
 
@@ -11857,13 +11667,17 @@ msgstr "Ta bort buffrade nyheter"
 
 #: src/plugins/rssyl/plugin.c:63
 msgid ""
-"This plugin allows you to create a mailbox tree where you can add newsfeeds in RSS 1.0, RSS 2.0 or Atom format.\n"
+"This plugin allows you to create a mailbox tree where you can add newsfeeds "
+"in RSS 1.0, RSS 2.0 or Atom format.\n"
 "\n"
-"Each newsfeed will create a folder with appropriate entries, fetched from the web. You can read them, and delete or keep old entries."
+"Each newsfeed will create a folder with appropriate entries, fetched from "
+"the web. You can read them, and delete or keep old entries."
 msgstr ""
-"Denna insticksmodul gör så att du kan skapa en postlåda med nyhetsflöden i RSS 1.0, RSS 2.0 eller Atom format.\n"
+"Denna insticksmodul gör så att du kan skapa en postlåda med nyhetsflöden i "
+"RSS 1.0, RSS 2.0 eller Atom format.\n"
 "\n"
-"Varje nyhetsmating kommer att hamna i en egen mapp, hämtad från webben. Du kan läsa dem och ta bort eller spara gamla nyheter."
+"Varje nyhetsmating kommer att hamna i en egen mapp, hämtad från webben. Du "
+"kan läsa dem och ta bort eller spara gamla nyheter."
 
 #: src/plugins/rssyl/plugin.c:87
 msgid "RSS feed"
@@ -11925,19 +11739,19 @@ msgstr "Ta bort mapp"
 msgid "Can't remove feed '%s'."
 msgstr "Kan inte ta bort flöde '%s'."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:283
-#: src/plugins/rssyl/feed.c:1856
+#: src/plugins/rssyl/rssyl_cb_menu.c:283 src/plugins/rssyl/feed.c:1856
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update the feeds."
-msgstr[0] "Claws Mail behöver ett nätverk tillgängligt för att uppdatera flödet."
-msgstr[1] "Claws Mail behöver ett nätverk tillgängligt för att uppdatera flödena"
+msgstr[0] ""
+"Claws Mail behöver ett nätverk tillgängligt för att uppdatera flödet."
+msgstr[1] ""
+"Claws Mail behöver ett nätverk tillgängligt för att uppdatera flödena"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:376
 msgid "Select a .opml file"
 msgstr "Välj en .opml-fil"
 
-#: src/plugins/rssyl/rssyl.c:133
-#: src/plugins/rssyl/rssyl.c:145
+#: src/plugins/rssyl/rssyl.c:133 src/plugins/rssyl/rssyl.c:145
 msgid "Refresh all feeds"
 msgstr "Uppdatera alla flöden"
 
@@ -11949,23 +11763,19 @@ msgstr "Kan inte öppna temporär fil"
 msgid "Cannot init libCURL"
 msgstr "Kan inte initiera libCURL"
 
-#: src/plugins/rssyl/feed.c:231
-#: src/plugins/vcalendar/vcal_folder.c:1593
+#: src/plugins/rssyl/feed.c:231 src/plugins/vcalendar/vcal_folder.c:1593
 msgid "401 (Authorisation required)"
 msgstr "401 (Behörighet krävs)"
 
-#: src/plugins/rssyl/feed.c:234
-#: src/plugins/vcalendar/vcal_folder.c:1596
+#: src/plugins/rssyl/feed.c:234 src/plugins/vcalendar/vcal_folder.c:1596
 msgid "403 (Unauthorised)"
 msgstr "403 (Obehörig)"
 
-#: src/plugins/rssyl/feed.c:237
-#: src/plugins/vcalendar/vcal_folder.c:1599
+#: src/plugins/rssyl/feed.c:237 src/plugins/vcalendar/vcal_folder.c:1599
 msgid "404 (Not found)"
 msgstr "404 (Hittades inte)"
 
-#: src/plugins/rssyl/feed.c:240
-#: src/plugins/vcalendar/vcal_folder.c:1602
+#: src/plugins/rssyl/feed.c:240 src/plugins/vcalendar/vcal_folder.c:1602
 #, c-format
 msgid "Error %ld"
 msgstr "Fel: %ld"
@@ -11986,8 +11796,12 @@ msgstr "Updaterar flöde '%s'..."
 
 #: src/plugins/rssyl/feed.c:1214
 #, c-format
-msgid "RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch comments of '%s'"
-msgstr "RSSyl: Hämtning av kommentarer stöds inte för RDF-flöden. Kan inte hämta kommentarer för '%s'"
+msgid ""
+"RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
+"comments of '%s'"
+msgstr ""
+"RSSyl: Hämtning av kommentarer stöds inte för RDF-flöden. Kan inte hämta "
+"kommentarer för '%s'"
 
 #: src/plugins/rssyl/feed.c:1223
 msgid "This feed format is not supported yet."
@@ -12044,63 +11858,76 @@ msgstr ""
 msgid "Can't subscribe feed '%s'."
 msgstr "Kan inte prenumera på '%s'."
 
-#: src/plugins/smime/plugin.c:38
-#: src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:924
+#: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
+#: src/plugins/smime/smime.c:883
 msgid "S/MIME"
 msgstr "S/MIME"
 
 #: src/plugins/smime/plugin.c:59
 msgid ""
-"This plugin handles S/MIME signed and/or encrypted mails. You can decrypt mails, verify signatures or sign and encrypt your own mails.\n"
+"This plugin handles S/MIME signed and/or encrypted mails. You can decrypt "
+"mails, verify signatures or sign and encrypt your own mails.\n"
 "\n"
-"It can be selected as the Default Privacy System in /Configuration/[Account Preferences]/Privacy and when composing a message from /Options/Privacy System\n"
+"It can be selected as the Default Privacy System in /Configuration/[Account "
+"Preferences]/Privacy and when composing a message from /Options/Privacy "
+"System\n"
 "\n"
 "This plugin uses the GPGME library as a wrapper for GnuPG.\n"
-"This plugin also needs gpgsm, gnupg-agent and dirmngr installed and configured.\n"
+"This plugin also needs gpgsm, gnupg-agent and dirmngr installed and "
+"configured.\n"
 "\n"
-"Information about how to get S/MIME certificates working with GPGSM can be found at:\n"
+"Information about how to get S/MIME certificates working with GPGSM can be "
+"found at:\n"
 "http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Denna insticksmodul hanterar S/MIME signerade och/eller krypterade e-postmeddelanden. Du kan dekryptera e-post, verifiera signaturer eller signera och kryptera din egen e-post.\n"
+"Denna insticksmodul hanterar S/MIME signerade och/eller krypterade e-"
+"postmeddelanden. Du kan dekryptera e-post, verifiera signaturer eller "
+"signera och kryptera din egen e-post.\n"
 "\n"
-"Den kan väljas som Standard Sekretesssystem i /Konfiguration/[Kontoegenskaper]/Sekretess eller vid skapande av ett meddelande från /Alternativ/Sekretesssystem\n"
+"Den kan väljas som Standard Sekretesssystem i /Konfiguration/"
+"[Kontoegenskaper]/Sekretess eller vid skapande av ett meddelande från /"
+"Alternativ/Sekretesssystem\n"
 "\n"
 "Denna insticksmodul använder GPGME-biblioteket som ett skal runt GnuPG.\n"
-"Denna insticksmodul behöver också gpgsm, gnupg-agent och dirmngr installerad och konfigurerad.\n"
+"Denna insticksmodul behöver också gpgsm, gnupg-agent och dirmngr installerad "
+"och konfigurerad.\n"
 "\n"
-"Information om hur man får S/MIME-certifikat att fungera med GPGSM kan hittas på:\n"
+"Information om hur man får S/MIME-certifikat att fungera med GPGSM kan "
+"hittas på:\n"
 "http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
 "\n"
 "GPGME har copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:414
+#: src/plugins/smime/smime.c:403
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "kunde inte ställa in GPG-protokoll, %s"
 
-#: src/plugins/smime/smime.c:442
+#: src/plugins/smime/smime.c:431
 msgid "Couldn't open temporary file"
 msgstr "Kunde inte öppna tillfällig fil"
 
-#: src/plugins/smime/smime.c:453
-#: src/plugins/smime/smime.c:468
+#: src/plugins/smime/smime.c:442 src/plugins/smime/smime.c:457
 msgid "Couldn't write to temporary file"
 msgstr "Kunde inte skriva till tillfällig fil"
 
-#: src/plugins/smime/smime.c:479
+#: src/plugins/smime/smime.c:468
 msgid "Couldn't close temporary file"
 msgstr "Kunde inte stänga tillfällig fil"
 
-#: src/plugins/smime/smime.c:695
-msgid "Please note that email headers, like Subject, are not encrypted by the S/MIME system."
-msgstr "Vänligen notera att brevhuvuden, så som Ämne, inte krypteras av S/MIME-systemet. "
+#: src/plugins/smime/smime.c:684
+msgid ""
+"Please note that email headers, like Subject, are not encrypted by the S/"
+"MIME system."
+msgstr ""
+"Vänligen notera att brevhuvuden, så som Ämne, inte krypteras av S/MIME-"
+"systemet. "
 
 #: src/plugins/spam_report/spam_report_prefs.c:80
-#: src/plugins/spam_report/spam_report.c:340
-#: src/plugins/spam_report/spam_report.c:380
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
 msgid "SpamReport"
 msgstr "Skräppostrapportering"
 
@@ -12112,15 +11939,15 @@ msgstr "Aktiverad"
 msgid "Forward to:"
 msgstr "Vidarebefordra till:"
 
-#: src/plugins/spam_report/spam_report.c:294
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Rapporterar skräppost..."
 
-#: src/plugins/spam_report/spam_report.c:329
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Rapportera skräppost online..."
 
-#: src/plugins/spam_report/spam_report.c:385
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12136,7 +11963,7 @@ msgstr ""
 " * spamcop.net\n"
 " * nomineringssystemet på lists.debian.org."
 
-#: src/plugins/spam_report/spam_report.c:410
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Skräppostrapportering"
 
@@ -12155,19 +11982,30 @@ msgstr "SpamAssassin-insticksmodulen filtrering misslyckades.\n"
 
 #: src/plugins/spamassassin/spamassassin.c:238
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
-msgstr "SpamAssassin-insticksmodulen är inaktiverad genom dess inställningar.\n"
+msgstr ""
+"SpamAssassin-insticksmodulen är inaktiverad genom dess inställningar.\n"
 
 #: src/plugins/spamassassin/spamassassin.c:243
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrerar meddelande..."
 
 #: src/plugins/spamassassin/spamassassin.c:372
-msgid "The SpamAssassin plugin couldn't filter a message. The probable cause of the error is an unreachable spamd daemon. Please make sure spamd is running and accessible."
-msgstr "SpamAssassin-insticksmodulen kunde inte filtrera ett meddelande. Den troliga orsaken till felet är en icke nåbar smapd-daemon. Vänligen se till att spamd kör och är tillgänglig."
+msgid ""
+"The SpamAssassin plugin couldn't filter a message. The probable cause of the "
+"error is an unreachable spamd daemon. Please make sure spamd is running and "
+"accessible."
+msgstr ""
+"SpamAssassin-insticksmodulen kunde inte filtrera ett meddelande. Den troliga "
+"orsaken till felet är en icke nåbar smapd-daemon. Vänligen se till att spamd "
+"kör och är tillgänglig."
 
 #: src/plugins/spamassassin/spamassassin.c:429
-msgid "Claws Mail needs network access in order to feed this mail(s) to the remote learner."
-msgstr "Claws-Mail behöver tillgång till nätverket för att kunna förse fjärrinläraren med detta meddelande(n)."
+msgid ""
+"Claws Mail needs network access in order to feed this mail(s) to the remote "
+"learner."
+msgstr ""
+"Claws-Mail behöver tillgång till nätverket för att kunna förse "
+"fjärrinläraren med detta meddelande(n)."
 
 #: src/plugins/spamassassin/spamassassin.c:574
 msgid "Failed to get username"
@@ -12175,25 +12013,36 @@ msgstr "Kunde inte hämta användarnamn"
 
 #: src/plugins/spamassassin/spamassassin.c:586
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
-msgstr "SpamAssassin-insticksmodulen är inläst men inaktiverad genom dess inställningar.\n"
+msgstr ""
+"SpamAssassin-insticksmodulen är inläst men inaktiverad genom dess "
+"inställningar.\n"
 
 #: src/plugins/spamassassin/spamassassin.c:620
 msgid ""
-"This plugin can check all messages that are received from an IMAP, LOCAL or POP account for spam using a SpamAssassin server. You will need a SpamAssassin Server (spamd) running somewhere.\n"
+"This plugin can check all messages that are received from an IMAP, LOCAL or "
+"POP account for spam using a SpamAssassin server. You will need a "
+"SpamAssassin Server (spamd) running somewhere.\n"
 "\n"
 "It can also be used for marking messages as Ham or Spam.\n"
 "\n"
-"When a message is identified as spam it can be deleted or saved in a specially designated folder.\n"
+"When a message is identified as spam it can be deleted or saved in a "
+"specially designated folder.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
-"Denna insticksmodul kan kontrollera alla meddelanden som tas emot från IMAP-, LOCAL eller POP-konto efter skräppost genom att använda en SpamAssassin-server. Du kommer att behöva en SpamAssassin-server (spamd) som kör någonstans.\n"
+"Denna insticksmodul kan kontrollera alla meddelanden som tas emot från "
+"IMAP-, LOCAL eller POP-konto efter skräppost genom att använda en "
+"SpamAssassin-server. Du kommer att behöva en SpamAssassin-server (spamd) som "
+"kör någonstans.\n"
 "\n"
-"Den kan också användas för att markera meddelanden som Skräp eller Inte Skräp.\n"
+"Den kan också användas för att markera meddelanden som Skräp eller Inte "
+"Skräp.\n"
 "\n"
-"När ett meddelande identifieras som skräp kan den raderas eller sparas i en speciell mapp.\n"
+"När ett meddelande identifieras som skräp kan den raderas eller sparas i en "
+"speciell mapp.\n"
 "\n"
-"Alternativ kan hittas i /Konfiguration/Egenskaper/Insticksmoduler/SpamAssassin"
+"Alternativ kan hittas i /Konfiguration/Egenskaper/Insticksmoduler/"
+"SpamAssassin"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:91
 msgid "Localhost"
@@ -12244,8 +12093,12 @@ msgid "Path of Unix socket"
 msgstr "Sökväg till Unix socket"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:387
-msgid "Maximum time allowed for checking. If the check takes longer it will be aborted."
-msgstr "Maximal tillåten tid för kontroll. Om kontrollen tar längre tid kommer den att avbrytas."
+msgid ""
+"Maximum time allowed for checking. If the check takes longer it will be "
+"aborted."
+msgstr ""
+"Maximal tillåten tid för kontroll. Om kontrollen tar längre tid kommer den "
+"att avbrytas."
 
 #: src/plugins/tnef_parse/tnef_parse.c:65
 #, c-format
@@ -12285,11 +12138,14 @@ msgstr "TNEF-tolk"
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
-"The plugin uses the Ytnef library, which is copyright 2002-2007 by Randall Hand <yerase at yerot.com>"
+"The plugin uses the Ytnef library, which is copyright 2002-2007 by Randall "
+"Hand <yerase at yerot.com>"
 msgstr ""
-"Denna insticksmodul till Claws Mail tillåter dig att läsa application/ms-tnef-bilagor.\n"
+"Denna insticksmodul till Claws Mail tillåter dig att läsa application/ms-"
+"tnef-bilagor.\n"
 "\n"
-"Insticksmodulen använder sig av Ytnef-biblioteket, som är copyright 2002-2007 Randall Hand <yerase at yerot.com>"
+"Insticksmodulen använder sig av Ytnef-biblioteket, som är copyright "
+"2002-2007 Randall Hand <yerase at yerot.com>"
 
 #: src/plugins/vcalendar/common-views.c:62
 msgid "_Edit this meeting..."
@@ -12313,7 +12169,8 @@ msgstr "Skapa möte från meddelande..."
 
 #: src/plugins/vcalendar/vcalendar.c:120
 #, c-format
-msgid "You are about to create %d meetings, one by one. Do you want to continue?"
+msgid ""
+"You are about to create %d meetings, one by one. Do you want to continue?"
 msgstr "Du är på väg att skapa %d möten, ett efter ett. Vill du fortsätta?"
 
 #: src/plugins/vcalendar/vcalendar.c:139
@@ -12340,12 +12197,9 @@ msgstr "avvisa"
 msgid "You have a Todo item."
 msgstr "Du har en Att-Göra-post."
 
-#: src/plugins/vcalendar/vcalendar.c:483
-#: src/plugins/vcalendar/vcalendar.c:490
-#: src/plugins/vcalendar/vcalendar.c:495
-#: src/plugins/vcalendar/vcalendar.c:503
-#: src/plugins/vcalendar/vcalendar.c:512
-#: src/plugins/vcalendar/vcalendar.c:750
+#: src/plugins/vcalendar/vcalendar.c:483 src/plugins/vcalendar/vcalendar.c:490
+#: src/plugins/vcalendar/vcalendar.c:495 src/plugins/vcalendar/vcalendar.c:503
+#: src/plugins/vcalendar/vcalendar.c:512 src/plugins/vcalendar/vcalendar.c:750
 msgid "Details follow:"
 msgstr "Detaljer följer:"
 
@@ -12372,8 +12226,11 @@ msgstr "%s <span weight=\"bold\">(denna händelse återkommer)</span>"
 
 #: src/plugins/vcalendar/vcalendar.c:570
 #, c-format
-msgid "%s <span weight=\"bold\">(this event is part of a recurring event)</span>"
-msgstr "%s <span weight=\"bold\">(denna händelse är en del av en återkommande händelse)</span>"
+msgid ""
+"%s <span weight=\"bold\">(this event is part of a recurring event)</span>"
+msgstr ""
+"%s <span weight=\"bold\">(denna händelse är en del av en återkommande "
+"händelse)</span>"
 
 #: src/plugins/vcalendar/vcalendar.c:749
 msgid "You have received an answer to an unknown meeting proposal."
@@ -12449,25 +12306,25 @@ msgid "You are already busy at this time."
 msgstr "Du är redan upptagen vid denna tidpunkt."
 
 #: src/plugins/vcalendar/vcalendar.c:1265
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1759
 msgid "Event:"
 msgstr "Händelse:"
 
 #: src/plugins/vcalendar/vcalendar.c:1266
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1727
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1737
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1748
 msgid "Organizer:"
 msgstr "Organisatör:"
 
 #: src/plugins/vcalendar/vcalendar.c:1267
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1729
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1740
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1750
 msgid "Location:"
 msgstr "Plats:"
 
 #: src/plugins/vcalendar/vcalendar.c:1268
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1717
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1728
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1749
 msgid "Summary:"
 msgstr "Sammanfattning:"
 
@@ -12480,8 +12337,8 @@ msgid "Ending:"
 msgstr "Slutar:"
 
 #: src/plugins/vcalendar/vcalendar.c:1272
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1752
 msgid "Attendees:"
 msgstr "Närvarande:"
 
@@ -12489,96 +12346,94 @@ msgstr "Närvarande:"
 msgid "Action:"
 msgstr "Aktivitet:"
 
-#: src/plugins/vcalendar/vcal_prefs.c:256
+#: src/plugins/vcalendar/vcal_prefs.c:258
 msgid "Reminders"
 msgstr "Påminnelser"
 
-#: src/plugins/vcalendar/vcal_prefs.c:265
+#: src/plugins/vcalendar/vcal_prefs.c:267
 msgid "Alert me"
 msgstr "Varna mig"
 
-#: src/plugins/vcalendar/vcal_prefs.c:277
+#: src/plugins/vcalendar/vcal_prefs.c:279
 msgid "minutes before an event"
 msgstr "minuter före en aktivitet"
 
-#: src/plugins/vcalendar/vcal_prefs.c:289
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Calendar export"
 msgstr "Kalenderexport"
 
-#: src/plugins/vcalendar/vcal_prefs.c:300
+#: src/plugins/vcalendar/vcal_prefs.c:302
 msgid "Automatically export calendar to"
 msgstr "Exportera kalender automatiskt till"
 
-#: src/plugins/vcalendar/vcal_prefs.c:309
-#: src/plugins/vcalendar/vcal_prefs.c:415
+#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:417
 msgid "You can export to a local file or URL"
 msgstr "Du kan exportera till en lokal fil eller URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:311
+#: src/plugins/vcalendar/vcal_prefs.c:313
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Specificera en lokal fil eller URL (http://server/mapp/fil.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:319
-#: src/plugins/vcalendar/vcal_prefs.c:425
-#: src/prefs_account.c:1263
-#: src/prefs_account.c:1770
+#: src/plugins/vcalendar/vcal_prefs.c:321
+#: src/plugins/vcalendar/vcal_prefs.c:427 src/prefs_account.c:1259
+#: src/prefs_account.c:1766
 msgid "User ID"
 msgstr "Användar-ID"
 
-#: src/plugins/vcalendar/vcal_prefs.c:327
-#: src/plugins/vcalendar/vcal_prefs.c:433
-#: src/prefs_account.c:1269
-#: src/prefs_account.c:1790
-#: src/prefs_account.c:2499
-#: src/prefs_account.c:2521
-#: src/wizard.c:1389
-#: src/wizard.c:1668
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1265
+#: src/prefs_account.c:1786 src/prefs_account.c:2491 src/prefs_account.c:2513
+#: src/wizard.c:1201 src/wizard.c:1475
 msgid "Password"
 msgstr "Lösenord"
 
-#: src/plugins/vcalendar/vcal_prefs.c:341
+#: src/plugins/vcalendar/vcal_prefs.c:343
 msgid "Include webcal subscriptions in export"
 msgstr "Inkludera webcal-prenumerationer i export"
 
-#: src/plugins/vcalendar/vcal_prefs.c:351
+#: src/plugins/vcalendar/vcal_prefs.c:353
 msgid "Command to run after calendar export"
 msgstr "Kommando att köra efter kalnderexport"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:382
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Registrera Claws kalender i XFCE's Orage clock"
 
-#: src/plugins/vcalendar/vcal_prefs.c:382
+#: src/plugins/vcalendar/vcal_prefs.c:384
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr "Tillåter Orage (nyare versioner än 4.4) att se Claws-Mails kalender"
 
-#: src/plugins/vcalendar/vcal_prefs.c:394
+#: src/plugins/vcalendar/vcal_prefs.c:396
 msgid "Free/Busy information"
 msgstr "Ledig/Upptagen information"
 
-#: src/plugins/vcalendar/vcal_prefs.c:406
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Automatically export free/busy status to"
 msgstr "Exportera automatiskt ledig/upptagen-status till"
 
-#: src/plugins/vcalendar/vcal_prefs.c:417
+#: src/plugins/vcalendar/vcal_prefs.c:419
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Specificera en lokal fil eller URL (http://server/path/file.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:447
+#: src/plugins/vcalendar/vcal_prefs.c:449
 msgid "Command to run after free/busy status export"
 msgstr "Kommando att köra efter export av ledig/upptagen-status"
 
-#: src/plugins/vcalendar/vcal_prefs.c:474
+#: src/plugins/vcalendar/vcal_prefs.c:476
 msgid "Get free/busy status of others from"
 msgstr "Hämta andras ledig/upptagen-status från"
 
-#: src/plugins/vcalendar/vcal_prefs.c:482
+#: src/plugins/vcalendar/vcal_prefs.c:484
 #, c-format
-msgid "Specify a local file or URL (http://server/path/file.ifb). Use %u for the left part of the email address, %d for the domain"
-msgstr "Specificera en lokal fil eller URL (http://server/sökväg/fil.ifb). Använd %u för vänsterdelen av emailadressen, %d för domänen"
+msgid ""
+"Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
+"left part of the email address, %d for the domain"
+msgstr ""
+"Specificera en lokal fil eller URL (http://server/sökväg/fil.ifb). Använd %u "
+"för vänsterdelen av emailadressen, %d för domänen"
 
-#: src/plugins/vcalendar/vcal_prefs.c:646
-#: src/plugins/vcalendar/plugin.c:43
+#: src/plugins/vcalendar/vcal_prefs.c:648 src/plugins/vcalendar/plugin.c:43
 #: src/plugins/vcalendar/plugin.c:64
 msgid "vCalendar"
 msgstr "vCalendar"
@@ -12615,6 +12470,10 @@ msgstr "_Veckovy"
 msgid "_Month view"
 msgstr "_Månadsvy"
 
+#: src/plugins/vcalendar/vcal_folder.c:1091
+msgid "Meetings"
+msgstr "Möten"
+
 #: src/plugins/vcalendar/vcal_folder.c:1475
 msgid "in the past"
 msgstr "i det förflutna"
@@ -12699,7 +12558,9 @@ msgstr ""
 
 #: src/plugins/vcalendar/vcal_folder.c:1874
 msgid "Claws Mail needs network access in order to update the Webcal feed."
-msgstr "Claws-Mail måste vara anslutet till nätverket för att kunna uppdatera Webcal-flödet."
+msgstr ""
+"Claws-Mail måste vara anslutet till nätverket för att kunna uppdatera Webcal-"
+"flödet."
 
 #: src/plugins/vcalendar/vcal_folder.c:1885
 #, c-format
@@ -12712,7 +12573,9 @@ msgstr "ny prenumeration"
 
 #: src/plugins/vcalendar/vcal_folder.c:1897
 msgid "Claws Mail needs network access in order to update the subscription."
-msgstr "Claws-Mail måste vara anslutet till nätverket för att uppdatera prenumerationen."
+msgstr ""
+"Claws-Mail måste vara anslutet till nätverket för att uppdatera "
+"prenumerationen."
 
 #: src/plugins/vcalendar/vcal_folder.c:1909
 msgid "Subscribe to WebCal"
@@ -12722,11 +12585,11 @@ msgstr "Prenumerera på WebCal"
 msgid "Enter the WebCal URL:"
 msgstr "Mata in WebCal URL-en:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1923
+#: src/plugins/vcalendar/vcal_folder.c:1921
 msgid "Could not parse the URL."
 msgstr "Kunde inte tolka URLen."
 
-#: src/plugins/vcalendar/vcal_folder.c:1952
+#: src/plugins/vcalendar/vcal_folder.c:1950
 msgid "Do you really want to unsubscribe?"
 msgstr "Vill du verkligen avbryta prenumerationen?"
 
@@ -12835,11 +12698,13 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"It isn't possible to have this meeting with everyone in the previous or next 6 hours."
+"It isn't possible to have this meeting with everyone in the previous or next "
+"6 hours."
 msgstr ""
 "\n"
 "\n"
-"Det är inte möjligt att ha detta möte med alla i föregående eller nästa 6 timmar."
+"Det är inte möjligt att ha detta möte med alla i föregående eller nästa 6 "
+"timmar."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:826
 #, c-format
@@ -12876,7 +12741,7 @@ msgid "available"
 msgstr "tillgänglig"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:899
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1150
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1151
 msgid "Free/busy retrieval failed"
 msgstr "Hämtning av ledig/upptagen misslyckades"
 
@@ -12892,26 +12757,30 @@ msgstr "Skicka ändå"
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr "Alla är inte tillgängliga. Se verktygstipsen för mer information..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1132
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1133
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "Hämtar planering för %s...."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1159
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1160
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1172
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1179
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1187
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1180
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
 msgid "Everyone is available."
 msgstr "Alla är tillgängliga."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1188
-msgid "Everyone seems available, but some free/busy information failed to be retrieved."
-msgstr "Alla verkar vara tillgängliga, men en del ledig/upptagen-information misslyckades att hämtas."
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1189
+msgid ""
+"Everyone seems available, but some free/busy information failed to be "
+"retrieved."
+msgstr ""
+"Alla verkar vara tillgängliga, men en del ledig/upptagen-information "
+"misslyckades att hämtas."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1360
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1361
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -12919,61 +12788,61 @@ msgstr ""
 "Kunde inte skicka mötesinbjudan.\n"
 "Kontrollera mottagarna."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1476
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1493
 msgid "Save & Send"
 msgstr "Spara & Skicka"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1494
 msgid "Check availability"
 msgstr "Kontrollera tillgänglighet"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1600
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "<b>Starts at:</b> "
 msgstr "<b>Startar vid:</b>"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1627
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1623
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1647
 msgid "<b> on:</b>"
 msgstr "<b> på:</b>"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1641
 msgid "<b>Ends at:</b> "
 msgstr "<b>Slutar vid:</b>"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1661
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1682
 msgid "New meeting"
 msgstr "Nytt möte"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1663
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1684
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Redigera möte"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1763
 msgid "Time:"
 msgstr "Tid:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1878
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1896
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d timme"
 msgstr[1] "%d timmar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1881
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1899
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuter"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1892
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Kommande aktivitet: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1893
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1911
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -12990,39 +12859,39 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1910
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1928
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "Påminn mig om %d minut"
 msgstr[1] "Påminn mig om %d minuter"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2036
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2054
 msgid "Empty calendar"
 msgstr "Töm kalender"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2037
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2055
 msgid "There is nothing to export."
 msgstr "Det finns inget att exportera."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2077
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2095
 msgid "Could not export the calendar."
 msgstr "Kunde inte exportera kalendern."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2112
 msgid "Export calendar to ICS"
 msgstr "Exportera kalender till ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2135
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "Kunde inte exportera kalendern till '%s'\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2232
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2251
 msgid "Could not export the freebusy info."
 msgstr "Kunde inte exportera ledig/upptagen-information."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2263
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2283
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Kunde inte exportera ledig/upptagen till '%s'\n"
@@ -13091,41 +12960,49 @@ msgstr "Avvisad:"
 msgid "Tentatively Accepted: "
 msgstr "Preliminärt Accepterat:"
 
-#: src/plugins/vcalendar/day-view.c:601
-#: src/plugins/vcalendar/month-view.c:701
+#: src/plugins/vcalendar/day-view.c:601 src/plugins/vcalendar/month-view.c:701
 msgid "Start"
 msgstr "Start"
 
-#: src/plugins/vcalendar/day-view.c:614
-#: src/plugins/vcalendar/month-view.c:714
+#: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:714
 msgid "Show"
 msgstr "Visa"
 
-#: src/plugins/vcalendar/day-view.c:622
-#: src/plugins/vcalendar/month-view.c:722
-#: src/prefs_account.c:1456
-#: src/prefs_folder_item.c:562
+#: src/plugins/vcalendar/day-view.c:622 src/plugins/vcalendar/month-view.c:722
+#: src/prefs_account.c:1452 src/prefs_folder_item.c:562
 #: src/prefs_matcher.c:334
 msgid "days"
 msgstr "dagar"
 
 #: src/plugins/vcalendar/plugin.c:69
 msgid ""
-"This plugin enables vCalendar message handling like that produced by Evolution or Outlook.\n"
-"\n"
-"When loaded, it will create a vCalendar mailbox in the Folder List, which will be populated by meetings that you have accepted or created.\n"
-"Meeting requests that you receive will be presented in an appropriate form and you will be able to accept or decline them.\n"
-"To create a meeting right-click on the vCalendar or Meetings folder and choose \"New meeting...\".\n"
-"\n"
-"You will also be able to subscribe to remote webCal feeds,export your meetings and calendars, publish your free/busy information and retrieve that information from others."
+"This plugin enables vCalendar message handling like that produced by "
+"Evolution or Outlook.\n"
+"\n"
+"When loaded, it will create a vCalendar mailbox in the Folder List, which "
+"will be populated by meetings that you have accepted or created.\n"
+"Meeting requests that you receive will be presented in an appropriate form "
+"and you will be able to accept or decline them.\n"
+"To create a meeting right-click on the vCalendar or Meetings folder and "
+"choose \"New meeting...\".\n"
+"\n"
+"You will also be able to subscribe to remote webCal feeds,export your "
+"meetings and calendars, publish your free/busy information and retrieve that "
+"information from others."
 msgstr ""
-"Denna insticksmodul aktiverar vCalendar-meddelandehantering likt det som finns i Evolution eller Outlook.\n"
+"Denna insticksmodul aktiverar vCalendar-meddelandehantering likt det som "
+"finns i Evolution eller Outlook.\n"
 "\n"
-"Vid laddning kommer den skapa en vCalendar-mailbox i mapplistan, som kommer att fyllas med möten som du har accepterat eller skapat.\n"
-"Mötesförfrågningar som du får kommer att presenteras i lämplig form och du kommer ha möjlighet att acceptera eller tacka nej till dom.\n"
-"För att skapa ett möte, högerklicka på vCalendar- eller Mötes-mappen och välj \"Nytt möte...\".\n"
+"Vid laddning kommer den skapa en vCalendar-mailbox i mapplistan, som kommer "
+"att fyllas med möten som du har accepterat eller skapat.\n"
+"Mötesförfrågningar som du får kommer att presenteras i lämplig form och du "
+"kommer ha möjlighet att acceptera eller tacka nej till dom.\n"
+"För att skapa ett möte, högerklicka på vCalendar- eller Mötes-mappen och "
+"välj \"Nytt möte...\".\n"
 "\n"
-"Du kommer också att kunna prenumerera på fjärrflöden från webCal, exportera dina möten och kalendrar, publicera din ledig/upptagen-information och ta emot denna information från andra."
+"Du kommer också att kunna prenumerera på fjärrflöden från webCal, exportera "
+"dina möten och kalendrar, publicera din ledig/upptagen-information och ta "
+"emot denna information från andra."
 
 #: src/plugins/vcalendar/plugin.c:102
 msgid "Calendar"
@@ -13231,8 +13108,7 @@ msgstr "Syntaxfel på tidsmarkering i hälsning\n"
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Syntaxfel på tidsmarkering i hälsning (inte ASCII)\n"
 
-#: src/pop.c:190
-#: src/pop.c:217
+#: src/pop.c:190 src/pop.c:217
 msgid "POP3 protocol error\n"
 msgstr "POP3 protokollfel\n"
 
@@ -13271,16 +13147,12 @@ msgstr "fel uppstod i POP3 session\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP-kommandot stöds ej\n"
 
-#: src/prefs_account.c:332
-#: src/prefs_account.c:1430
-#: src/prefs_account.c:2416
-#: src/wizard.c:1549
+#: src/prefs_account.c:332 src/prefs_account.c:1426 src/prefs_account.c:2408
+#: src/wizard.c:1361
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:335
-#: src/prefs_account.c:1543
-#: src/prefs_account.c:2431
+#: src/prefs_account.c:335 src/prefs_account.c:1539 src/prefs_account.c:2423
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -13288,8 +13160,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "Server för diskussionsgrupper (NNTP)"
 
-#: src/prefs_account.c:337
-#: src/wizard.c:1551
+#: src/prefs_account.c:337 src/wizard.c:1363
 msgid "Local mbox file"
 msgstr "Lokal mbox-fil"
 
@@ -13337,450 +13208,434 @@ msgstr "Denna server kräver autentisering"
 msgid "Authenticate on connect"
 msgstr "Autentisera vid kontakt"
 
-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1216
 msgid "News server"
 msgstr "Server för diskussionsgrupper"
 
-#: src/prefs_account.c:1226
+#: src/prefs_account.c:1222
 msgid "Server for receiving"
 msgstr "Server för mottagning"
 
-#: src/prefs_account.c:1232
+#: src/prefs_account.c:1228
 msgid "Local mailbox"
 msgstr "Lokal brevlåda"
 
-#: src/prefs_account.c:1239
+#: src/prefs_account.c:1235
 msgid "SMTP server (send)"
 msgstr "SMTP-server (skicka)"
 
-#: src/prefs_account.c:1247
+#: src/prefs_account.c:1243
 msgid "Use mail command rather than SMTP server"
 msgstr "Använd mail-kommandot istället för SMTP-server"
 
-#: src/prefs_account.c:1256
+#: src/prefs_account.c:1252
 msgid "command to send mails"
 msgstr "kommando för att skicka e-post"
 
-#: src/prefs_account.c:1318
+#: src/prefs_account.c:1314
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account.c:1404
+#: src/prefs_account.c:1400
 msgid "Local"
 msgstr "Lokal"
 
-#: src/prefs_account.c:1410
-#: src/prefs_account.c:1499
+#: src/prefs_account.c:1406 src/prefs_account.c:1495
 msgid "Default Inbox"
 msgstr "Standardinkorg"
 
-#: src/prefs_account.c:1417
-#: src/prefs_account.c:1424
-#: src/prefs_account.c:1506
-#: src/prefs_account.c:1513
+#: src/prefs_account.c:1413 src/prefs_account.c:1420 src/prefs_account.c:1502
+#: src/prefs_account.c:1509
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ofiltrerade meddelande kommer sparas i denna mapp"
 
-#: src/prefs_account.c:1421
-#: src/prefs_account.c:1510
-#: src/prefs_account.c:1974
+#: src/prefs_account.c:1417 src/prefs_account.c:1506 src/prefs_account.c:1966
 #: src/prefs_customheader.c:237
 msgid "Bro_wse"
 msgstr "Bläddra"
 
-#: src/prefs_account.c:1432
+#: src/prefs_account.c:1428
 msgid "Use secure authentication (APOP)"
 msgstr "Använd säker autentisering (APOP)"
 
-#: src/prefs_account.c:1435
+#: src/prefs_account.c:1431
 msgid "Remove messages on server when received"
 msgstr "Ta bort meddelanden på server när de mottagits"
 
-#: src/prefs_account.c:1446
+#: src/prefs_account.c:1442
 msgid "Remove after"
 msgstr "Ta bort efter"
 
-#: src/prefs_account.c:1453
-#: src/prefs_account.c:1463
+#: src/prefs_account.c:1449 src/prefs_account.c:1459
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dagar och 0 timmar : ta bort omedelbart"
 
-#: src/prefs_account.c:1466
-#: src/prefs_matcher.c:333
+#: src/prefs_account.c:1462 src/prefs_matcher.c:333
 msgid "hours"
 msgstr "timmar"
 
-#: src/prefs_account.c:1476
+#: src/prefs_account.c:1472
 msgid "Receive size limit"
 msgstr "Storleksgräns för mottagande"
 
-#: src/prefs_account.c:1479
-msgid "Messages over this limit will be partially retrieved. When selecting them you will be able to download them fully or delete them."
-msgstr "Meddelande som är större än denna gräns kommer att tas emot delvis. När du väljer dem kommer du kunna ta emot hela eller ta bort dem."
+#: src/prefs_account.c:1475
+msgid ""
+"Messages over this limit will be partially retrieved. When selecting them "
+"you will be able to download them fully or delete them."
+msgstr ""
+"Meddelande som är större än denna gräns kommer att tas emot delvis. När du "
+"väljer dem kommer du kunna ta emot hela eller ta bort dem."
 
-#: src/prefs_account.c:1519
-#: src/prefs_account.c:2446
+#: src/prefs_account.c:1515 src/prefs_account.c:2438
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1526
+#: src/prefs_account.c:1522
 msgid "Maximum number of articles to download"
 msgstr "Maximalt antal artiklar att ladda ner"
 
-#: src/prefs_account.c:1536
+#: src/prefs_account.c:1532
 msgid "unlimited if 0 is specified"
 msgstr "obegränsad om 0 väljs"
 
-#: src/prefs_account.c:1549
-#: src/prefs_account.c:1742
+#: src/prefs_account.c:1545 src/prefs_account.c:1738
 msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
-#: src/prefs_account.c:1559
-#: src/prefs_account.c:1751
-#: src/prefs_send.c:286
+#: src/prefs_account.c:1555 src/prefs_account.c:1747 src/prefs_send.c:290
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: src/prefs_account.c:1571
+#: src/prefs_account.c:1567
 msgid "IMAP server directory"
 msgstr "Mapp på IMAP server"
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1571
 msgid "(usually empty)"
 msgstr "(vanligtvis tom)"
 
-#: src/prefs_account.c:1589
+#: src/prefs_account.c:1585
 msgid "Show subscribed folders only"
 msgstr "Visa enbart prenumererade mappar"
 
-#: src/prefs_account.c:1596
+#: src/prefs_account.c:1592
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Bandbreddseffektivt läge (förhindrar hämtning av fjärretiketter)"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1594
 msgid "This mode uses less bandwidth, but can be slower with some servers."
-msgstr "Detta läge använder mindre bandbredd, men kan vara långsammare med vissa servrar."
+msgstr ""
+"Detta läge använder mindre bandbredd, men kan vara långsammare med vissa "
+"servrar."
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1601
 msgid "Filter messages on receiving"
 msgstr "Filtrera meddelanden vid mottagning"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1608
 msgid "Allow filtering using plugins on receiving"
 msgstr "Tillåt insticksmoduler filtrera vid mottagning"
 
-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1612
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Hämta e-post' hämtar nya meddelanden för detta konto"
 
-#: src/prefs_account.c:1697
-#: src/prefs_customheader.c:209
-#: src/prefs_matcher.c:620
-#: src/prefs_matcher.c:1952
-#: src/prefs_matcher.c:1974
+#: src/prefs_account.c:1693 src/prefs_customheader.c:209
+#: src/prefs_matcher.c:620 src/prefs_matcher.c:1958 src/prefs_matcher.c:1980
 msgid "Header"
 msgstr "Brevhuvud"
 
-#: src/prefs_account.c:1699
+#: src/prefs_account.c:1695
 msgid "Generate Message-ID"
 msgstr "Generera Meddelande-ID"
 
-#: src/prefs_account.c:1702
+#: src/prefs_account.c:1698
 msgid "Send account mail address in Message-ID"
 msgstr "Skicka kontots email-adress i Meddelande-ID"
 
-#: src/prefs_account.c:1705
+#: src/prefs_account.c:1701
 msgid "Generate X-Mailer header"
 msgstr "Generera brevhuvudet X-Mailer"
 
-#: src/prefs_account.c:1712
+#: src/prefs_account.c:1708
 msgid "Add user-defined header"
 msgstr "Lägg till användardefinierat brevhuvud"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1723
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autentisering (SMTP AUTH)"
 
-#: src/prefs_account.c:1816
-msgid "If you leave these entries empty, the same user ID and password as receiving will be used."
-msgstr "Om du ej fyller i dessa, kommer samma användar-ID och lösenord som vid mottagning att användas."
+#: src/prefs_account.c:1808
+msgid ""
+"If you leave these entries empty, the same user ID and password as receiving "
+"will be used."
+msgstr ""
+"Om du ej fyller i dessa, kommer samma användar-ID och lösenord som vid "
+"mottagning att användas."
 
-#: src/prefs_account.c:1827
+#: src/prefs_account.c:1819
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentisera med POP3 innan avsändning"
 
-#: src/prefs_account.c:1842
+#: src/prefs_account.c:1834
 msgid "POP authentication timeout: "
 msgstr "POP autentiseringstimeout"
 
-#: src/prefs_account.c:1850
+#: src/prefs_account.c:1842
 msgid "minutes"
 msgstr "minuter"
 
-#: src/prefs_account.c:1920
-#: src/prefs_account.c:1966
+#: src/prefs_account.c:1912 src/prefs_account.c:1958
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/prefs_account.c:1923
+#: src/prefs_account.c:1915
 msgid "Automatically insert signature"
 msgstr "Infoga signatur automatiskt"
 
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1920
 msgid "Signature separator"
 msgstr "Signaturseparator"
 
-#: src/prefs_account.c:1953
+#: src/prefs_account.c:1945
 msgid "Command output"
 msgstr "Kommando utdata"
 
-#: src/prefs_account.c:1986
+#: src/prefs_account.c:1978
 msgid "Automatically set the following addresses"
 msgstr "Sätt automatiskt följande adresser"
 
-#: src/prefs_account.c:2038
+#: src/prefs_account.c:2030
 msgid "Spell check dictionaries"
 msgstr "Ordlistor för stavningskontroll"
 
-#: src/prefs_account.c:2048
-#: src/prefs_folder_item.c:1094
+#: src/prefs_account.c:2040 src/prefs_folder_item.c:1094
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Standardordlista:"
 
-#: src/prefs_account.c:2061
-#: src/prefs_folder_item.c:1128
+#: src/prefs_account.c:2053 src/prefs_folder_item.c:1128
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Standard alternativordlista"
 
-#: src/prefs_account.c:2147
-#: src/prefs_account.c:3263
-#: src/prefs_compose_writing.c:350
-#: src/prefs_folder_item.c:1443
-#: src/prefs_folder_item.c:1834
-#: src/prefs_quote.c:119
-#: src/prefs_quote.c:237
-#: src/prefs_spelling.c:336
-#: src/prefs_wrapping.c:153
+#: src/prefs_account.c:2139 src/prefs_account.c:3255
+#: src/prefs_compose_writing.c:350 src/prefs_folder_item.c:1443
+#: src/prefs_folder_item.c:1834 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Nytt"
 
-#: src/prefs_account.c:2162
-#: src/prefs_folder_item.c:1471
-#: src/prefs_quote.c:134
-#: src/toolbar.c:407
+#: src/prefs_account.c:2154 src/prefs_folder_item.c:1471 src/prefs_quote.c:134
+#: src/toolbar.c:408
 msgid "Reply"
 msgstr "Svara"
 
-#: src/prefs_account.c:2177
-#: src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1499
-#: src/prefs_quote.c:149
-#: src/toolbar.c:411
+#: src/prefs_account.c:2169 src/prefs_filtering_action.c:191
+#: src/prefs_folder_item.c:1499 src/prefs_quote.c:149 src/toolbar.c:412
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: src/prefs_account.c:2224
+#: src/prefs_account.c:2216
 msgid "Default privacy system"
 msgstr "Standard sekretesssystem"
 
-#: src/prefs_account.c:2253
+#: src/prefs_account.c:2245
 msgid "Always sign messages"
 msgstr "Signera alltid meddelanden"
 
-#: src/prefs_account.c:2255
+#: src/prefs_account.c:2247
 msgid "Always encrypt messages"
 msgstr "Kryptera alltid meddelanden"
 
-#: src/prefs_account.c:2257
+#: src/prefs_account.c:2249
 msgid "Always sign messages when replying to a signed message"
 msgstr "Signera alltid meddelanden som svar på ett signerat meddelande"
 
-#: src/prefs_account.c:2260
+#: src/prefs_account.c:2252
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Kryptera alltid meddelanden som svar på ett krypterat meddelande"
 
-#: src/prefs_account.c:2263
+#: src/prefs_account.c:2255
 msgid "Encrypt sent messages with your own key in addition to recipient's"
-msgstr "Kryptera skickade meddelanden med din egen nyckel tillsammans med mottagarens"
+msgstr ""
+"Kryptera skickade meddelanden med din egen nyckel tillsammans med mottagarens"
 
-#: src/prefs_account.c:2265
+#: src/prefs_account.c:2257
 msgid "Save sent encrypted messages as clear text"
 msgstr "Spara skickade krypterade meddelanden i klartext"
 
-#: src/prefs_account.c:2420
-#: src/prefs_account.c:2435
-#: src/prefs_account.c:2449
+#: src/prefs_account.c:2412 src/prefs_account.c:2427 src/prefs_account.c:2441
 msgid "Don't use SSL"
 msgstr "Använd inte SSL"
 
-#: src/prefs_account.c:2423
+#: src/prefs_account.c:2415
 msgid "Use SSL for POP3 connection"
 msgstr "Använd SSL för POP3-förbindelse"
 
-#: src/prefs_account.c:2426
-#: src/prefs_account.c:2441
-#: src/prefs_account.c:2472
+#: src/prefs_account.c:2418 src/prefs_account.c:2433 src/prefs_account.c:2464
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Använd STARTTLS-kommando för att starta SSL-session"
 
-#: src/prefs_account.c:2438
+#: src/prefs_account.c:2430
 msgid "Use SSL for IMAP4 connection"
 msgstr "Använd SSL för IMAP4-förbindelse"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2450
 msgid "Use SSL for NNTP connection"
 msgstr "Använd SSL för NNTP-förbindelse"
 
-#: src/prefs_account.c:2462
+#: src/prefs_account.c:2454
 msgid "Send (SMTP)"
 msgstr "Skicka (SMTP)"
 
-#: src/prefs_account.c:2466
+#: src/prefs_account.c:2458
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Använd inte SSL (men, om nödvändigt, använd STARTTLS)"
 
-#: src/prefs_account.c:2469
+#: src/prefs_account.c:2461
 msgid "Use SSL for SMTP connection"
 msgstr "Använd SSL för SMTP-förbindelse"
 
-#: src/prefs_account.c:2477
+#: src/prefs_account.c:2469
 msgid "Client certificates"
 msgstr "Klientcertifikat"
 
-#: src/prefs_account.c:2485
+#: src/prefs_account.c:2477
 msgid "Certificate for receiving"
 msgstr "Certifikat för mottagning"
 
-#: src/prefs_account.c:2490
-#: src/prefs_account.c:2492
-#: src/prefs_account.c:2512
-#: src/prefs_account.c:2514
+#: src/prefs_account.c:2482 src/prefs_account.c:2484 src/prefs_account.c:2504
+#: src/prefs_account.c:2506
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Klient-certifikat som PKCS12 eller PEM-fil"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2499
 msgid "Certificate for sending"
 msgstr "Certifikat för sändning"
 
-#: src/prefs_account.c:2540
+#: src/prefs_account.c:2532
 msgid "Use non-blocking SSL"
 msgstr "Använd icke-blockerande SSL"
 
-#: src/prefs_account.c:2552
+#: src/prefs_account.c:2544
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Stäng av detta om du har SSL-anslutningsproblem"
 
-#: src/prefs_account.c:2668
+#: src/prefs_account.c:2660
 msgid "SMTP port"
 msgstr "SMTP-port"
 
-#: src/prefs_account.c:2675
+#: src/prefs_account.c:2667
 msgid "POP3 port"
 msgstr "POP3-port"
 
-#: src/prefs_account.c:2682
+#: src/prefs_account.c:2674
 msgid "IMAP4 port"
 msgstr "IMAP4-port"
 
-#: src/prefs_account.c:2689
+#: src/prefs_account.c:2681
 msgid "NNTP port"
 msgstr "NNTP-port"
 
-#: src/prefs_account.c:2695
+#: src/prefs_account.c:2687
 msgid "Domain name"
 msgstr "Domännamn"
 
-#: src/prefs_account.c:2698
-msgid "The domain name will be used in the generated Message-ID, and when connecting to SMTP servers."
-msgstr "Domännamnet kommer att användas i det genererade Meddelande-ID't, och vid anslutning till SMTP-servrar."
+#: src/prefs_account.c:2690
+msgid ""
+"The domain name will be used in the generated Message-ID, and when "
+"connecting to SMTP servers."
+msgstr ""
+"Domännamnet kommer att användas i det genererade Meddelande-ID't, och vid "
+"anslutning till SMTP-servrar."
 
-#: src/prefs_account.c:2712
+#: src/prefs_account.c:2704
 msgid "Use command to communicate with server"
 msgstr "Använd kommando för att kommunicera med server"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2712
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Flytta borttagna meddelanden till papperskorgen och utplåna omedelbart"
 
-#: src/prefs_account.c:2722
-msgid "Moves deleted mails to trash instead of using the \\Deleted flag without expunging."
-msgstr "Flyttar borttagna meddelanden till papperskorgen istället för att använda \\Deleted-flaggan utan att utplåna."
+#: src/prefs_account.c:2714
+msgid ""
+"Moves deleted mails to trash instead of using the \\Deleted flag without "
+"expunging."
+msgstr ""
+"Flyttar borttagna meddelanden till papperskorgen istället för att använda "
+"\\Deleted-flaggan utan att utplåna."
 
-#: src/prefs_account.c:2726
+#: src/prefs_account.c:2718
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Markera kross-postade meddelanden som läst med färg:"
 
-#: src/prefs_account.c:2782
+#: src/prefs_account.c:2774
 msgid "Put sent messages in"
 msgstr "Spara skickade meddelanden i"
 
-#: src/prefs_account.c:2784
+#: src/prefs_account.c:2776
 msgid "Put queued messages in"
 msgstr "Spara köade meddelanden i"
 
-#: src/prefs_account.c:2786
+#: src/prefs_account.c:2778
 msgid "Put draft messages in"
 msgstr "Lagra utkast i"
 
-#: src/prefs_account.c:2788
+#: src/prefs_account.c:2780
 msgid "Put deleted messages in"
 msgstr "Lagra bortagna meddelande i"
 
-#: src/prefs_account.c:2846
+#: src/prefs_account.c:2838
 msgid "Account name is not entered."
 msgstr "Konto har inte angivits"
 
-#: src/prefs_account.c:2850
+#: src/prefs_account.c:2842
 msgid "Mail address is not entered."
 msgstr "Epostadress har inte angivits"
 
-#: src/prefs_account.c:2857
+#: src/prefs_account.c:2849
 msgid "SMTP server is not entered."
 msgstr "SMTP-server har inte angivits"
 
-#: src/prefs_account.c:2862
+#: src/prefs_account.c:2854
 msgid "User ID is not entered."
 msgstr "Användar-ID har inte angivits."
 
-#: src/prefs_account.c:2867
+#: src/prefs_account.c:2859
 msgid "POP3 server is not entered."
 msgstr "POP3-server har inte angivits."
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2879
 msgid "The default Inbox folder doesn't exist."
 msgstr "Standardmapp för Inkorgen finns inte."
 
-#: src/prefs_account.c:2893
+#: src/prefs_account.c:2885
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4-server har inte angivits"
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2890
 msgid "NNTP server is not entered."
 msgstr "NNTP-server har inte angivits"
 
-#: src/prefs_account.c:2904
+#: src/prefs_account.c:2896
 msgid "local mailbox filename is not entered."
 msgstr "lokal brevlåda har inte angivits"
 
-#: src/prefs_account.c:2910
+#: src/prefs_account.c:2902
 msgid "mail command is not entered."
 msgstr "Epost kommando har inte angivits"
 
-#: src/prefs_account.c:3227
+#: src/prefs_account.c:3219
 msgid "Receive"
 msgstr "Ta emot"
 
-#: src/prefs_account.c:3281
-#: src/prefs_folder_item.c:1850
-#: src/prefs_quote.c:238
+#: src/prefs_account.c:3273 src/prefs_folder_item.c:1850 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Mallar"
 
-#: src/prefs_account.c:3299
+#: src/prefs_account.c:3291
 msgid "Privacy"
 msgstr "Sekretess"
 
@@ -13797,21 +13652,19 @@ msgstr "Inställningar för nytt konto"
 msgid "%s - Account preferences"
 msgstr "%s - Kontoegenskaper"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3794
 msgid "Select signature file"
 msgstr "Välj fil med signatur"
 
-#: src/prefs_account.c:3813
-#: src/prefs_account.c:3830
-#: src/wizard.c:1237
+#: src/prefs_account.c:3812 src/prefs_account.c:3829 src/wizard.c:1053
 msgid "Select certificate file"
 msgstr "Välj certifikatsfil"
 
-#: src/prefs_account.c:3926
+#: src/prefs_account.c:3925
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/prefs_account.c:4066
+#: src/prefs_account.c:4065
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (insticksmodulen kunde inte laddas)"
@@ -13840,81 +13693,72 @@ msgstr "Redigera filteraktivitet"
 msgid "Append the new action above to the list"
 msgstr "Lägg till den nya aktiviteten sist i listan"
 
-#: src/prefs_actions.c:329
-#: src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477
-#: src/prefs_matcher.c:768
-#: src/prefs_template.c:309
-#: src/prefs_toolbar.c:1043
-msgid "Replace"
-msgstr "Ersätt"
-
 #: src/prefs_actions.c:335
 msgid "Replace the selected action in list with the action above"
 msgstr "Ersätt vald aktivitet i listan med aktiviteten ovan "
 
-#: src/prefs_actions.c:343
+#: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:778 src/prefs_template.c:318
+#: src/prefs_toolbar.c:1056
+msgid "Re_move"
+msgstr "Ta bort"
+
+#: src/prefs_actions.c:345
 msgid "Delete the selected action from the list"
 msgstr "Ta bort vald aktivitet från listan"
 
-#: src/prefs_actions.c:351
-#: src/prefs_filtering.c:500
-#: src/prefs_template.c:332
+#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:336
 msgid "Clear all the input fields in the dialog"
 msgstr "Rensa alla inmatningsfält i dialogrutan"
 
-#: src/prefs_actions.c:359
+#: src/prefs_actions.c:363
 msgid "Show information on configuring actions"
 msgstr "Visa information om konfiguration av aktiviteter"
 
-#: src/prefs_actions.c:390
+#: src/prefs_actions.c:394
 msgid "Move the selected action up"
 msgstr "Flytta upp vald aktivitet"
 
-#: src/prefs_actions.c:398
+#: src/prefs_actions.c:402
 msgid "Move selected action down"
 msgstr "Flytta ner vald aktivitet"
 
-#: src/prefs_actions.c:531
-#: src/prefs_filtering_action.c:702
-#: src/prefs_filtering.c:833
-#: src/prefs_filtering.c:835
-#: src/prefs_filtering.c:836
-#: src/prefs_filtering.c:946
-#: src/prefs_matcher.c:891
-#: src/prefs_template.c:465
+#: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
+#: src/prefs_filtering.c:836 src/prefs_filtering.c:838
+#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:897
+#: src/prefs_template.c:469
 msgid "(New)"
 msgstr "(Ny)"
 
-#: src/prefs_actions.c:596
+#: src/prefs_actions.c:600
 msgid "Menu name is not set."
 msgstr "Menynamn är inte angivet."
 
-#: src/prefs_actions.c:601
+#: src/prefs_actions.c:605
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "Det är inte tillåtet att börja menynamnet med '/'."
 
-#: src/prefs_actions.c:606
+#: src/prefs_actions.c:610
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Det är inte tillåtet att använda kolon ':' i menynamnet."
 
-#: src/prefs_actions.c:612
+#: src/prefs_actions.c:616
 msgid "There is an action with this name already."
 msgstr "Det finns redan en aktivitet med detta namn."
 
-#: src/prefs_actions.c:631
+#: src/prefs_actions.c:635
 msgid "Menu name is too long."
 msgstr "Menynamnet är för långt."
 
-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:644
 msgid "Command-line not set."
 msgstr "Kommandorad är inte angivet."
 
-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:649
 msgid "Menu name and command are too long."
 msgstr "Menynamnet och kommandot är för långt."
 
-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:655
 #, c-format
 msgid ""
 "The command\n"
@@ -13925,219 +13769,179 @@ msgstr ""
 "%s\n"
 "har syntax fel."
 
-#: src/prefs_actions.c:709
+#: src/prefs_actions.c:713
 msgid "Delete action"
 msgstr "Ta bort aktivitet"
 
-#: src/prefs_actions.c:710
+#: src/prefs_actions.c:714
 msgid "Do you really want to delete this action?"
 msgstr "Vill du verkligen ta bort denna aktivitet? "
 
-#: src/prefs_actions.c:730
+#: src/prefs_actions.c:734
 msgid "Delete all actions"
 msgstr "Ta bort alla aktiviteter"
 
-#: src/prefs_actions.c:731
+#: src/prefs_actions.c:735
 msgid "Do you really want to delete all the actions?"
 msgstr "Vill du verkligen ta bort alla denna aktiviteter? "
 
-#: src/prefs_actions.c:894
-#: src/prefs_actions.c:925
-#: src/prefs_filtering.c:1496
-#: src/prefs_filtering.c:1518
-#: src/prefs_matcher.c:2103
-#: src/prefs_template.c:565
-#: src/prefs_template.c:590
+#: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1499
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2109
+#: src/prefs_template.c:569 src/prefs_template.c:594
 msgid "Entry not saved"
 msgstr "Posten sparades inte"
 
-#: src/prefs_actions.c:895
-#: src/prefs_actions.c:926
-#: src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519
-#: src/prefs_template.c:566
-#: src/prefs_template.c:591
+#: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1522 src/prefs_template.c:570
+#: src/prefs_template.c:595
 msgid "The entry was not saved. Close anyway?"
 msgstr "Posten sparades inte. Stänga ändå?"
 
-#: src/prefs_actions.c:896
-#: src/prefs_actions.c:901
-#: src/prefs_actions.c:927
-#: src/prefs_filtering.c:1476
-#: src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520
-#: src/prefs_matcher.c:2105
-#: src/prefs_template.c:567
-#: src/prefs_template.c:592
-#: src/prefs_template.c:597
+#: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
+#: src/prefs_filtering.c:1479 src/prefs_filtering.c:1501
+#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2111
+#: src/prefs_template.c:571 src/prefs_template.c:596 src/prefs_template.c:601
 msgid "+_Continue editing"
 msgstr "+_Fortsätt redigering"
 
-#: src/prefs_actions.c:899
+#: src/prefs_actions.c:903
 msgid "Actions list not saved"
 msgstr "Aktivitetslistan är inte sparad"
 
-#: src/prefs_actions.c:900
+#: src/prefs_actions.c:904
 msgid "The actions list has been modified. Close anyway?"
 msgstr "Aktivitetslistan har ändrats. Stänga ändå?"
 
-#: src/prefs_actions.c:970
+#: src/prefs_actions.c:974
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\">Menynamn:</span>"
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:975
 msgid "Use / in menu name to make submenus."
 msgstr "Använd '/' i menynamn för att skapa undermenyer."
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:977
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Kommandorad:</span>"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:978
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Börjar med:</span>"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:979
 msgid "to send message body or selection to command's standard input"
-msgstr "för att skicka meddelandetexten eller markerad text till kommandots standard indata"
+msgstr ""
+"för att skicka meddelandetexten eller markerad text till kommandots standard "
+"indata"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:980
 msgid "to send user provided text to command's standard input"
 msgstr "för att skicka text till kommandots standard indata"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:981
 msgid "to send user provided hidden text to command's standard input"
-msgstr "skicka gömd text som anges av användaren till kommandots standard indata"
+msgstr ""
+"skicka gömd text som anges av användaren till kommandots standard indata"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:982
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Avsluta med:</span>"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:983
 msgid "to replace message body or selection with command's standard output"
-msgstr "för att byta ut meddelandetexten eller markering med kommandots standard ut"
+msgstr ""
+"för att byta ut meddelandetexten eller markering med kommandots standard ut"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:984
 msgid "to insert command's standard output without replacing old text"
 msgstr "för att infoga kommandots standard ut utan att ersätta gammal text"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:985
 msgid "to run command asynchronously"
 msgstr "för att köra kommando asynkront"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:986
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Använd:</span>"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:987
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "för filen från valt meddelande i RFC822/2822-format "
 
-#: src/prefs_actions.c:984
-msgid "for the list of the files of the selected messages in RFC822/2822 format"
+#: src/prefs_actions.c:988
+msgid ""
+"for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "för listan an filer från valda meddelanden i RFC822/2822-format"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:989
 msgid "for the file of the selected decoded message MIME part"
 msgstr "för filen från valt avkodat meddelandes MIME-del"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:990
 msgid "for a user provided argument"
 msgstr "för ett användarinmatat argument"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:991
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "för ett användarinmatat dolt argument (dvs lösenord)"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:992
 msgid "for the text selection"
 msgstr "för textmarkering"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:993
 msgid "apply filtering actions between {} to selected messages"
 msgstr "applicera filteraktivitet mellan {} för valda meddelanden"
 
 # xxxx här är jag xxxx
-#: src/prefs_actions.c:990
+#: src/prefs_actions.c:994
 msgid "for a literal %"
 msgstr "%-tecken"
 
-#: src/prefs_actions.c:1000
-#: src/prefs_themes.c:959
+#: src/prefs_actions.c:1004 src/prefs_themes.c:959
 msgid "Actions"
 msgstr "Aktiviteter"
 
-#: src/prefs_actions.c:1001
-msgid "The Actions feature is a way for the user to launch external commands to process a complete message file or just one of its parts."
-msgstr "Aktivitetsfunktionen är ett sätt för användaren att köra externa kommandon för att behandla ett helt meddelande eller bara någon av dess delar."
+#: src/prefs_actions.c:1005
+msgid ""
+"The Actions feature is a way for the user to launch external commands to "
+"process a complete message file or just one of its parts."
+msgstr ""
+"Aktivitetsfunktionen är ett sätt för användaren att köra externa kommandon "
+"för att behandla ett helt meddelande eller bara någon av dess delar."
 
-#: src/prefs_actions.c:1088
-#: src/prefs_filtering.c:1694
-#: src/prefs_template.c:1097
+#: src/prefs_actions.c:1092 src/prefs_filtering.c:1697
+#: src/prefs_template.c:1101
 msgid "D_uplicate"
 msgstr "D_uplicera"
 
-#: src/prefs_actions.c:1215
+#: src/prefs_actions.c:1212
 msgid "Current actions"
 msgstr "Aktuella aktiviteter"
 
-#: src/prefs_actions.c:1314
-#: src/prefs_filtering.c:1071
-#: src/prefs_filtering.c:1129
+#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074
+#: src/prefs_filtering.c:1132
 msgid "Action string is not valid."
 msgstr "Aktivitetssträngen är inte giltig."
 
-#: src/prefs_common.c:230
-#: src/prefs_quote.c:69
+#: src/prefs_common.c:220 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hej!\\n"
 
-#: src/prefs_common.c:304
-msgid ""
-"On %d\\n"
-"%f wrote:\\n"
-"\\n"
-"%q\\n"
-"%X"
-msgstr ""
-"Den %d\\n"
-"skrev %s:\\n"
-"\\n"
-"%q\\n"
-"%X"
-
-#: src/prefs_common.c:310
-#: src/prefs_quote.c:85
-msgid ""
-"\\n"
-"\\n"
-"Begin forwarded message:\\n"
-"\\n"
-"?d{Date: %d\\n"
-"}?f{From: %f\\n"
-"}?t{To: %t\\n"
-"}?c{Cc: %c\\n"
-"}?n{Newsgroups: %n\\n"
-"}?s{Subject: %s\\n"
-"}\\n"
-"\\n"
-"%M"
-msgstr ""
-"\\n"
-"\\n"
-"Start av vidarebefordrat meddelande:\\n"
-"\\n"
-"?d{Datum:%d\\n"
-"}?f{Från:%f\\n"
-"}?t{Till: %t\\n"
-"}?c{Kopia: %c\\n"
-"}?n{Diskussionsgrupper: %n\\n"
-"}?s{Ämne: %s\\n"
-"}\\n"
-"\\n"
-"%M"
-
-#: src/prefs_common.c:450
+#: src/prefs_common.c:294
+msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
+msgstr "Den %d\\nskrev %s:\\n\\n%q\\n%X"
+
+#: src/prefs_common.c:300 src/prefs_quote.c:85
+msgid ""
+"\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
+"\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
+msgstr ""
+"\\n\\nStart av vidarebefordrat meddelande:\\n\\n?d{Datum:%d\\n}?f{Från:%f"
+"\\n}?t{Till: %t\\n}?c{Kopia: %c\\n}?n{Diskussionsgrupper: %n\\n}?s{Ämne: %s"
+"\\n}\\n\\n%M"
+
+#: src/prefs_common.c:440
 msgid "%x(%a) %H:%M"
 msgstr "%y/%m/%d(%a) %H:%M"
 
@@ -14169,8 +13973,7 @@ msgstr "Starta automatiskt extern redigerare"
 msgid "Automatically save message to Drafts folder every"
 msgstr "Spara meddelandetext automatiskt till utkastmappen varje"
 
-#: src/prefs_compose_writing.c:158
-#: src/prefs_wrapping.c:101
+#: src/prefs_compose_writing.c:158 src/prefs_wrapping.c:101
 msgid "characters"
 msgstr "tecken"
 
@@ -14202,8 +14005,7 @@ msgstr "Svaraknappen svarar till sändlista"
 msgid "Forwarding"
 msgstr "Vidarebefordra"
 
-#: src/prefs_compose_writing.c:214
-#: src/prefs_filtering_action.c:192
+#: src/prefs_compose_writing.c:214 src/prefs_filtering_action.c:192
 msgid "Forward as attachment"
 msgstr "Vidarebefordra som bilaga"
 
@@ -14219,13 +14021,11 @@ msgstr "Vid 'släpp' av filer i redigerarfönstret"
 msgid "Ask"
 msgstr "Fråga"
 
-#: src/prefs_compose_writing.c:230
-#: src/toolbar.c:425
+#: src/prefs_compose_writing.c:230 src/toolbar.c:426
 msgid "Insert"
 msgstr "Infoga"
 
-#: src/prefs_compose_writing.c:231
-#: src/toolbar.c:426
+#: src/prefs_compose_writing.c:231 src/toolbar.c:427
 msgid "Attach"
 msgstr "Bifoga"
 
@@ -14237,10 +14037,8 @@ msgstr "Skriver"
 msgid "Custom header configuration"
 msgstr "Anpassad brehuvudsinställning"
 
-#: src/prefs_customheader.c:507
-#: src/prefs_display_header.c:599
-#: src/prefs_matcher.c:1577
-#: src/prefs_matcher.c:1592
+#: src/prefs_customheader.c:507 src/prefs_display_header.c:599
+#: src/prefs_matcher.c:1583 src/prefs_matcher.c:1598
 msgid "Header name is not set."
 msgstr "Brevhuvudsnamn är inte angivet."
 
@@ -14338,29 +14136,32 @@ msgstr "%s kommer att ersättas med filnamnet / URI"
 msgid "Use system defaults when possible"
 msgstr "Använd systemets standardprogram, om möjligt"
 
-#: src/prefs_ext_prog.c:146
+#: src/prefs_ext_prog.c:141
 msgid "Web browser"
 msgstr "Webbläsare"
 
-#: src/prefs_ext_prog.c:180
+#: src/prefs_ext_prog.c:169
 msgid "Text editor"
 msgstr "Textredigerare"
 
-#: src/prefs_ext_prog.c:208
+#: src/prefs_ext_prog.c:197
 msgid "Command for 'Display as text'"
 msgstr "Kommando för 'Visa som text'"
 
-#: src/prefs_ext_prog.c:221
-msgid "This option enables MIME parts to be displayed in the message view via a script when using the 'Display as text' contextual menu item"
-msgstr "Detta alternativ möjliggör MIME-delar att visas i meddelandevyn via ett skript genom att använda 'Visa som text' i snabbmenyn"
+#: src/prefs_ext_prog.c:210
+msgid ""
+"This option enables MIME parts to be displayed in the message view via a "
+"script when using the 'Display as text' contextual menu item"
+msgstr ""
+"Detta alternativ möjliggör MIME-delar att visas i meddelandevyn via ett "
+"skript genom att använda 'Visa som text' i snabbmenyn"
 
-#: src/prefs_ext_prog.c:280
-#: src/prefs_image_viewer.c:138
+#: src/prefs_ext_prog.c:269 src/prefs_image_viewer.c:138
 #: src/prefs_message.c:354
 msgid "Message View"
 msgstr "Meddelandevy"
 
-#: src/prefs_ext_prog.c:281
+#: src/prefs_ext_prog.c:270
 msgid "External Programs"
 msgstr "Externa program"
 
@@ -14376,19 +14177,14 @@ msgstr "Kopiera"
 msgid "Hide"
 msgstr "Dölj"
 
-#: src/prefs_filtering_action.c:179
-#: src/prefs_filtering_action.c:180
-#: src/prefs_filtering_action.c:181
-#: src/prefs_filtering_action.c:182
-#: src/prefs_filtering_action.c:183
-#: src/prefs_filtering_action.c:184
-#: src/prefs_filtering_action.c:185
-#: src/prefs_filtering_action.c:186
+#: src/prefs_filtering_action.c:179 src/prefs_filtering_action.c:180
+#: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:182
+#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:184
+#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
 msgid "Message flags"
 msgstr "Meddelandeflaggor"
 
-#: src/prefs_filtering_action.c:179
-#: src/prefs_summary_column.c:78
+#: src/prefs_filtering_action.c:179 src/prefs_summary_column.c:78
 #: src/summaryview.c:2776
 msgid "Mark"
 msgstr "Markera"
@@ -14409,11 +14205,8 @@ msgstr "Markera som skräp"
 msgid "Mark as ham"
 msgstr "Markera som ej skräp"
 
-#: src/prefs_filtering_action.c:187
-#: src/prefs_filtering_action.c:1436
-#: src/toolbar.c:204
-#: src/toolbar.c:435
-#: src/toolbar.c:2106
+#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1438
+#: src/toolbar.c:205 src/toolbar.c:436 src/toolbar.c:2107
 msgid "Execute"
 msgstr "Kör"
 
@@ -14421,8 +14214,7 @@ msgstr "Kör"
 msgid "Color label"
 msgstr "Färgmarkering"
 
-#: src/prefs_filtering_action.c:191
-#: src/prefs_filtering_action.c:192
+#: src/prefs_filtering_action.c:191 src/prefs_filtering_action.c:192
 #: src/prefs_filtering_action.c:193
 msgid "Resend"
 msgstr "Skicka om"
@@ -14431,12 +14223,9 @@ msgstr "Skicka om"
 msgid "Redirect"
 msgstr "Omdirigera"
 
-#: src/prefs_filtering_action.c:194
-#: src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1440
-#: src/prefs_matcher.c:626
-#: src/prefs_summary_column.c:87
-#: src/summaryview.c:449
+#: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
+#: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:626
+#: src/prefs_summary_column.c:87 src/summaryview.c:449
 msgid "Score"
 msgstr "Poäng"
 
@@ -14448,12 +14237,9 @@ msgstr "Ändra poäng"
 msgid "Set score"
 msgstr "Ange poäng"
 
-#: src/prefs_filtering_action.c:196
-#: src/prefs_filtering_action.c:197
-#: src/prefs_filtering_action.c:198
-#: src/prefs_matcher.c:630
-#: src/prefs_summary_column.c:89
-#: src/summaryview.c:451
+#: src/prefs_filtering_action.c:196 src/prefs_filtering_action.c:197
+#: src/prefs_filtering_action.c:198 src/prefs_matcher.c:630
+#: src/prefs_summary_column.c:89 src/summaryview.c:451
 msgid "Tags"
 msgstr "Etiketter"
 
@@ -14469,8 +14255,7 @@ msgstr "Ta bort etikett"
 msgid "Clear tags"
 msgstr "Rensa etiketter"
 
-#: src/prefs_filtering_action.c:199
-#: src/prefs_filtering_action.c:200
+#: src/prefs_filtering_action.c:199 src/prefs_filtering_action.c:200
 msgid "Threads"
 msgstr "Trådar"
 
@@ -14482,117 +14267,110 @@ msgstr "Stoppa filter"
 msgid "Action configuration"
 msgstr "Aktivitetskonfiguration"
 
-#: src/prefs_filtering_action.c:427
-#: src/prefs_filtering.c:1892
+#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1888
 #: src/prefs_matcher.c:583
 msgid "Rule"
 msgstr "Regel"
 
-#: src/prefs_filtering_action.c:440
-#: src/prefs_filtering.c:433
+#: src/prefs_filtering_action.c:440 src/prefs_filtering.c:433
 msgid "Action"
 msgstr "Aktivitet"
 
-#: src/prefs_filtering_action.c:933
+#: src/prefs_filtering_action.c:935
 msgid "Command-line not set"
 msgstr "Kommandorad är inte angivet"
 
-#: src/prefs_filtering_action.c:934
+#: src/prefs_filtering_action.c:936
 msgid "Destination is not set."
 msgstr "Destination är inte angiven"
 
-#: src/prefs_filtering_action.c:945
+#: src/prefs_filtering_action.c:947
 msgid "Recipient is not set."
 msgstr "Mottagare har inte angetts."
 
-#: src/prefs_filtering_action.c:963
+#: src/prefs_filtering_action.c:965
 msgid "Score is not set"
 msgstr "Poäng är inte angivet"
 
-#: src/prefs_filtering_action.c:971
+#: src/prefs_filtering_action.c:973
 msgid "Header is not set."
 msgstr "Brevhuvud är inte angivet."
 
-#: src/prefs_filtering_action.c:978
+#: src/prefs_filtering_action.c:980
 msgid "Target addressbook/folder is not set."
 msgstr "Epostadress har inte angivits"
 
-#: src/prefs_filtering_action.c:992
+#: src/prefs_filtering_action.c:994
 msgid "Tag name is empty."
 msgstr "Etikettnamn är inte angivet."
 
-#: src/prefs_filtering_action.c:1214
+#: src/prefs_filtering_action.c:1216
 msgid "No action was defined."
 msgstr "Ingen aktivitet är definierad."
 
 # xxxx här är jag xxxx
-#: src/prefs_filtering_action.c:1252
-#: src/prefs_matcher.c:2147
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2153
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "procent-tecken"
 
-#: src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2156
+#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2162
 msgid "filename (should not be modified)"
 msgstr "filnamn (får inte ändras)"
 
-#: src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2157
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2163
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "ny rad"
 
-#: src/prefs_filtering_action.c:1263
-#: src/prefs_matcher.c:2158
+#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2164
 msgid "escape character for quotes"
 msgstr "undantagstecken för citat"
 
-#: src/prefs_filtering_action.c:1264
-#: src/prefs_matcher.c:2159
+#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2165
 msgid "quote character"
 msgstr "citattecken"
 
-#: src/prefs_filtering_action.c:1273
+#: src/prefs_filtering_action.c:1275
 msgid "Filtering Action: 'Execute'"
 msgstr "Filteraktivitet: 'Kör'"
 
-#: src/prefs_filtering_action.c:1274
+#: src/prefs_filtering_action.c:1276
 msgid ""
-"'Execute' allows you to send a message or message element to an external program or script.\n"
+"'Execute' allows you to send a message or message element to an external "
+"program or script.\n"
 "The following symbols can be used:"
 msgstr ""
-"'Kör' låter dig skicka ett meddelande eller del av ett meddelande till ett externt program eller skript.\n"
+"'Kör' låter dig skicka ett meddelande eller del av ett meddelande till ett "
+"externt program eller skript.\n"
 "Följande symboler kan användas:"
 
-#: src/prefs_filtering_action.c:1420
+#: src/prefs_filtering_action.c:1422
 msgid "Recipient"
 msgstr "Mottagare"
 
-#: src/prefs_filtering_action.c:1424
+#: src/prefs_filtering_action.c:1426
 msgid "Book/Folder"
 msgstr "Adressbok/Mapp"
 
-#: src/prefs_filtering_action.c:1428
+#: src/prefs_filtering_action.c:1430
 msgid "Destination"
 msgstr "Destination"
 
-#: src/prefs_filtering_action.c:1432
+#: src/prefs_filtering_action.c:1434
 msgid "Color"
 msgstr "Färger"
 
-#: src/prefs_filtering_action.c:1518
+#: src/prefs_filtering_action.c:1520
 msgid "Current action list"
 msgstr "Aktuell aktivitetslista"
 
-#: src/prefs_filtering.c:197
-#: src/prefs_filtering.c:359
+#: src/prefs_filtering.c:197 src/prefs_filtering.c:359
 msgid "Filtering/Processing configuration"
 msgstr "Filtrerings/Behandllingsinställningar"
 
-#: src/prefs_filtering.c:266
-#: src/prefs_filtering.c:864
-#: src/prefs_filtering.c:978
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
+#: src/prefs_filtering.c:981
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Alla"
@@ -14602,9 +14380,12 @@ msgid "Condition"
 msgstr "Villkor"
 
 #: src/prefs_filtering.c:424
+msgid " D_efine... "
+msgstr " D_efiniera... "
+
 #: src/prefs_filtering.c:446
-msgid " Define... "
-msgstr " Definiera... "
+msgid " De_fine... "
+msgstr " De_finiera... "
 
 #: src/prefs_filtering.c:475
 msgid "Append the new rule above to the list"
@@ -14614,88 +14395,87 @@ msgstr "Lägg till den nya regeln ovan, sist i listan"
 msgid "Replace the selected rule in list with the rule above"
 msgstr "Ersätt vald regel i listan med regeln ovan"
 
-#: src/prefs_filtering.c:492
+#: src/prefs_filtering.c:493
 msgid "Delete the selected rule from the list"
 msgstr "Ta bort vald regel från listan"
 
-#: src/prefs_filtering.c:529
+#: src/prefs_filtering.c:532
 msgid "Move the selected rule to the top"
 msgstr "Flytta vald regel till början"
 
-#: src/prefs_filtering.c:532
-msgid "Page up"
-msgstr "Sida upp"
+#: src/prefs_filtering.c:535
+msgid "Page u_p"
+msgstr "Sida u_pp"
 
-#: src/prefs_filtering.c:540
+#: src/prefs_filtering.c:543
 msgid "Move the selected rule one page up"
 msgstr "Flytta vald regel en sida upp"
 
-#: src/prefs_filtering.c:549
+#: src/prefs_filtering.c:552
 msgid "Move the selected rule up"
 msgstr "Flytta upp vald regel"
 
-#: src/prefs_filtering.c:557
+#: src/prefs_filtering.c:560
 msgid "Move the selected rule down"
 msgstr "Flytta ner vald regel"
 
-#: src/prefs_filtering.c:560
-msgid "Page down"
-msgstr "Sida ner"
+#: src/prefs_filtering.c:563
+msgid "Page dow_n"
+msgstr "Sida n_er"
 
-#: src/prefs_filtering.c:568
+#: src/prefs_filtering.c:571
 msgid "Move the selected rule one page down"
 msgstr "Flytta vald regel en sida ner"
 
-#: src/prefs_filtering.c:577
+#: src/prefs_filtering.c:580
 msgid "Move the selected rule to the bottom"
 msgstr "Flytta vald regel till slutet"
 
-#: src/prefs_filtering.c:1035
-#: src/prefs_filtering.c:1121
+#: src/prefs_filtering.c:1038 src/prefs_filtering.c:1124
 msgid "Condition string is not valid."
 msgstr "Villkorssträngen är inte giltig."
 
-#: src/prefs_filtering.c:1108
+#: src/prefs_filtering.c:1111
 msgid "Condition string is empty."
 msgstr "Villkorssträngen är tom"
 
-#: src/prefs_filtering.c:1114
+#: src/prefs_filtering.c:1117
 msgid "Action string is empty."
 msgstr "Aktivitetssträngen är tom."
 
-#: src/prefs_filtering.c:1202
+#: src/prefs_filtering.c:1205
 msgid "Delete rule"
 msgstr "Ta bort regel"
 
-#: src/prefs_filtering.c:1203
+#: src/prefs_filtering.c:1206
 msgid "Do you really want to delete this rule?"
 msgstr "Vill du verkligen ta bort denna regel?"
 
-#: src/prefs_filtering.c:1221
+#: src/prefs_filtering.c:1224
 msgid "Delete all rules"
 msgstr "Ta bort alla regler"
 
-#: src/prefs_filtering.c:1222
+#: src/prefs_filtering.c:1225
 msgid "Do you really want to delete all the rules?"
 msgstr "Vill du verkligen ta bort alla regler?"
 
-#: src/prefs_filtering.c:1474
+#: src/prefs_filtering.c:1477
 msgid "Filtering rules not saved"
 msgstr "Filtreringsreglerna är inte sparade"
 
-#: src/prefs_filtering.c:1475
+#: src/prefs_filtering.c:1478
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "Listan med filterregler har ändrats. Stäng ändå?"
 
-#: src/prefs_filtering.c:1697
+#: src/prefs_filtering.c:1700
 msgid "Move one page up"
 msgstr "Flytta upp en sida"
 
-#: src/prefs_filtering.c:1698
+#: src/prefs_filtering.c:1701
 msgid "Move one page down"
 msgstr "Flytta ner en sida"
 
-#: src/prefs_filtering.c:1860
+#: src/prefs_filtering.c:1856
 msgid "Enable"
 msgstr "Aktivera"
 
@@ -14711,33 +14491,32 @@ msgstr ""
 "Välj kolumner att visa i mapplistan. Du kan ändra\n"
 "ordningen genom att använda Upp / Ner knapparna eller genom att dra raderna."
 
-#: src/prefs_folder_column.c:258
-#: src/prefs_summary_column.c:272
+#: src/prefs_folder_column.c:258 src/prefs_summary_column.c:272
 msgid "Hidden columns"
 msgstr "Dolda kolumner"
 
-#: src/prefs_folder_column.c:290
-#: src/prefs_summaries.c:406
-#: src/prefs_summaries.c:548
-#: src/prefs_summary_column.c:304
+#: src/prefs_folder_column.c:290 src/prefs_summaries.c:406
+#: src/prefs_summaries.c:548 src/prefs_summary_column.c:304
 msgid "Displayed columns"
 msgstr "Visade kolumner"
 
-#: src/prefs_folder_column.c:329
-#: src/prefs_msg_colors.c:494
-#: src/prefs_summary_column.c:343
-#: src/prefs_toolbar.c:1055
+#: src/prefs_folder_column.c:329 src/prefs_msg_colors.c:494
+#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1064
 msgid " Use default "
 msgstr " Använd standard "
 
-#: src/prefs_folder_item.c:270
-#: src/prefs_folder_item.c:878
+#: src/prefs_folder_item.c:270 src/prefs_folder_item.c:878
 #: src/prefs_folder_item.c:1403
-msgid "<i>These preferences will not be saved as this folder is a top-level folder. However, you can set them for the whole mailbox tree by using \"Apply to subfolders\".</i>"
-msgstr "<i>Dessa inställningar kommer inte sparas eftersom denna mapp är en mapp i toppnivån. Dock så kan du sätta dom för hela brevlådeträdet genom att använda \"Applicera på undermappar\".</i>"
+msgid ""
+"<i>These preferences will not be saved as this folder is a top-level folder. "
+"However, you can set them for the whole mailbox tree by using \"Apply to "
+"subfolders\".</i>"
+msgstr ""
+"<i>Dessa inställningar kommer inte sparas eftersom denna mapp är en mapp i "
+"toppnivån. Dock så kan du sätta dom för hela brevlådeträdet genom att "
+"använda \"Applicera på undermappar\".</i>"
 
-#: src/prefs_folder_item.c:282
-#: src/prefs_folder_item.c:890
+#: src/prefs_folder_item.c:282 src/prefs_folder_item.c:890
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -14777,8 +14556,7 @@ msgstr "Mapp-chmod"
 msgid "Folder color"
 msgstr "Mappfärg"
 
-#: src/prefs_folder_item.c:435
-#: src/prefs_folder_item.c:1672
+#: src/prefs_folder_item.c:435 src/prefs_folder_item.c:1672
 msgid "Pick color for folder"
 msgstr "Välj färg för mapp"
 
@@ -14795,16 +14573,24 @@ msgid "Scan for new mail"
 msgstr "Leta efter ny post"
 
 #: src/prefs_folder_item.c:484
-msgid "Turn this option on if mail is delivered directly to this folder by server side filtering on IMAP or by an external application"
-msgstr "Aktivera detta alternativ om e-post levereras direkt till denna mapp genom filtrering på server-sidan för IMAP eller genom en extern applikation"
+msgid ""
+"Turn this option on if mail is delivered directly to this folder by server "
+"side filtering on IMAP or by an external application"
+msgstr ""
+"Aktivera detta alternativ om e-post levereras direkt till denna mapp genom "
+"filtrering på server-sidan för IMAP eller genom en extern applikation"
 
 #: src/prefs_folder_item.c:504
 msgid "Select the HTML part of multipart messages"
 msgstr "Välj HTML-delen av flerdels-/alternativmeddelanden"
 
 #: src/prefs_folder_item.c:521
-msgid "\"Default\" will follow global preference (found in /Preferences/Message View/Text Options)"
-msgstr "\"Standardval\" kommer att följa global inställning (som hittas i /Egenskaper/Meddelandevy/Textval)"
+msgid ""
+"\"Default\" will follow global preference (found in /Preferences/Message "
+"View/Text Options)"
+msgstr ""
+"\"Standardval\" kommer att följa global inställning (som hittas i /"
+"Egenskaper/Meddelandevy/Textval)"
 
 #: src/prefs_folder_item.c:531
 msgid "Synchronise for offline use"
@@ -14832,12 +14618,11 @@ msgstr "Begär läskvitto"
 
 #: src/prefs_folder_item.c:914
 msgid "Save copy of outgoing messages to this folder instead of Sent"
-msgstr "Spara en kopia av utgående meddelande i denna mapp istället för Skickat"
+msgstr ""
+"Spara en kopia av utgående meddelande i denna mapp istället för Skickat"
 
-#: src/prefs_folder_item.c:927
-#: src/prefs_folder_item.c:950
-#: src/prefs_folder_item.c:974
-#: src/prefs_folder_item.c:997
+#: src/prefs_folder_item.c:927 src/prefs_folder_item.c:950
+#: src/prefs_folder_item.c:974 src/prefs_folder_item.c:997
 #: src/prefs_folder_item.c:1020
 msgid "Default "
 msgstr "Standard "
@@ -14875,14 +14660,15 @@ msgstr "Egenskaper för mapp %s"
 msgid "Folder and Message Lists"
 msgstr "Mapp- och meddelandelistor"
 
-#: src/prefs_fonts.c:99
-#: src/prefs_matcher.c:2024
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2030
 msgid "Message"
 msgstr "Meddelande"
 
 #: src/prefs_fonts.c:126
 msgid "Derive small and bold fonts from Folder and Message Lists font"
-msgstr "Härled typsnitt för liten och fet text från Mapp- och meddelandelistors typsnitt"
+msgstr ""
+"Härled typsnitt för liten och fet text från Mapp- och meddelandelistors "
+"typsnitt"
 
 #: src/prefs_fonts.c:136
 msgid "Small"
@@ -14900,9 +14686,7 @@ msgstr "Använd ett annat typsnitt för utskrift"
 msgid "Message Printing"
 msgstr "Meddelandeutskrift"
 
-#: src/prefs_fonts.c:268
-#: src/prefs_msg_colors.c:839
-#: src/prefs_summaries.c:681
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:681
 #: src/prefs_themes.c:368
 msgid "Display"
 msgstr "Visa"
@@ -14911,9 +14695,7 @@ msgstr "Visa"
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: src/prefs_gtk.c:938
-#: src/toolbar.c:212
-#: src/toolbar.c:421
+#: src/prefs_gtk.c:938 src/toolbar.c:213 src/toolbar.c:422
 msgid "Preferences"
 msgstr "Egenskaper"
 
@@ -14941,18 +14723,15 @@ msgstr "Skriv ut bilder"
 msgid "Image Viewer"
 msgstr "Bildvisare"
 
-#: src/prefs_logging.c:147
-#: src/prefs_logging.c:254
+#: src/prefs_logging.c:147 src/prefs_logging.c:254
 msgid "Restrict the log window to"
 msgstr "Begränsa loggfönstret till"
 
-#: src/prefs_logging.c:159
-#: src/prefs_logging.c:266
+#: src/prefs_logging.c:159 src/prefs_logging.c:266
 msgid "0 to stop logging in the log window"
 msgstr "0 för att sluta logga i loggfönstret"
 
-#: src/prefs_logging.c:161
-#: src/prefs_logging.c:268
+#: src/prefs_logging.c:161 src/prefs_logging.c:268
 msgid "lines"
 msgstr "rader"
 
@@ -14968,11 +14747,14 @@ msgstr "Aktivera loggning av filtrering- och behandlingsregler"
 msgid ""
 "If checked, turns on logging of filtering and processing rules.\n"
 "The log is accessible from 'Tools/Filtering log'.\n"
-"Caution: enabling this option will slow down the filtering/processing, this might be critical when applying many rules upon thousands of messages."
+"Caution: enabling this option will slow down the filtering/processing, this "
+"might be critical when applying many rules upon thousands of messages."
 msgstr ""
 "Om ikryssad, aktiverar loggning av filtrering- och behandlingsregler.\n"
 "Loggen är tillgänglig från 'Verktyg/Filterlogg'.\n"
-"Varning: aktivering kommer göra filtrering och behandlingsregler långsammare. Det kan vara avgörande vid applicerande av många regler på tusentals meddelanden."
+"Varning: aktivering kommer göra filtrering och behandlingsregler "
+"långsammare. Det kan vara avgörande vid applicerande av många regler på "
+"tusentals meddelanden."
 
 #: src/prefs_logging.c:187
 msgid "Log filtering/processing when..."
@@ -15017,15 +14799,22 @@ msgstr "Hög"
 #: src/prefs_logging.c:238
 msgid ""
 "Select the level of detail of the logging.\n"
-"Choose Low to see when rules are applied, which conditions match or don't match and what actions are performed.\n"
-"Choose Medium to see more details about the message that is being processed, and why rules are skipped.\n"
-"Choose High to explicitly show the reason why all rules are processed or skipped, and why all conditions are matched or not matched.\n"
+"Choose Low to see when rules are applied, which conditions match or don't "
+"match and what actions are performed.\n"
+"Choose Medium to see more details about the message that is being processed, "
+"and why rules are skipped.\n"
+"Choose High to explicitly show the reason why all rules are processed or "
+"skipped, and why all conditions are matched or not matched.\n"
 "Caution: the higher the level, the greater the impact on performance."
 msgstr ""
 "Välj detaljnivå för loggning.\n"
-"Välj Låg för att se när regler appliceras, vilka vilkor som matchar respektive inte matchar och vilka åtgärder som görs.\n"
-"Välj Mellan för att se mer detaljer om meddelandet som behandlas, och varför regler inte appliceras.\n"
-"Välj Hög för att visa anledningen till varför alla regler antingen appliceras eller inte, och vilka villkor som matchar respektive inte matchar.\n"
+"Välj Låg för att se när regler appliceras, vilka vilkor som matchar "
+"respektive inte matchar och vilka åtgärder som görs.\n"
+"Välj Mellan för att se mer detaljer om meddelandet som behandlas, och varför "
+"regler inte appliceras.\n"
+"Välj Hög för att visa anledningen till varför alla regler antingen "
+"appliceras eller inte, och vilka villkor som matchar respektive inte "
+"matchar.\n"
 "Varning: högre loggnivå har större negativ inverkan på prestanda."
 
 #: src/prefs_logging.c:280
@@ -15052,9 +14841,7 @@ msgstr "Felmeddelanden"
 msgid "Status messages for filtering/processing log"
 msgstr "Statusmeddelanden för loggning av filtrering- och behandlingsregler"
 
-#: src/prefs_logging.c:427
-#: src/prefs_msg_colors.c:145
-#: src/prefs_other.c:689
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:689
 msgid "Other"
 msgstr "Övrigt"
 
@@ -15082,8 +14869,7 @@ msgstr "högre än"
 msgid "lower than"
 msgstr "lägre än"
 
-#: src/prefs_matcher.c:341
-#: src/prefs_matcher.c:347
+#: src/prefs_matcher.c:341 src/prefs_matcher.c:347
 msgid "exactly"
 msgstr "exakt"
 
@@ -15127,13 +14913,11 @@ msgstr "meddelandedel"
 msgid "whole message"
 msgstr "hela meddelandet"
 
-#: src/prefs_matcher.c:389
-#: src/summaryview.c:6302
+#: src/prefs_matcher.c:389 src/summaryview.c:6298
 msgid "Marked"
 msgstr "Markerad"
 
-#: src/prefs_matcher.c:390
-#: src/summaryview.c:6300
+#: src/prefs_matcher.c:390 src/summaryview.c:6296
 msgid "Deleted"
 msgstr "Borttagen"
 
@@ -15141,16 +14925,12 @@ msgstr "Borttagen"
 msgid "Replied"
 msgstr "Besvarat"
 
-#: src/prefs_matcher.c:392
-#: src/summaryview.c:6294
+#: src/prefs_matcher.c:392 src/summaryview.c:6290
 msgid "Forwarded"
 msgstr "Vidarebefordrat"
 
-#: src/prefs_matcher.c:394
-#: src/summaryview.c:6284
-#: src/toolbar.c:414
-#: src/toolbar.c:950
-#: src/toolbar.c:1996
+#: src/prefs_matcher.c:394 src/summaryview.c:6280 src/toolbar.c:415
+#: src/toolbar.c:951 src/toolbar.c:1997
 msgid "Spam"
 msgstr "Skräppost"
 
@@ -15158,8 +14938,7 @@ msgstr "Skräppost"
 msgid "Has attachment"
 msgstr "Har bilaga"
 
-#: src/prefs_matcher.c:396
-#: src/summaryview.c:6320
+#: src/prefs_matcher.c:396 src/summaryview.c:6316
 msgid "Signed"
 msgstr "Signerat"
 
@@ -15243,8 +15022,7 @@ msgstr "Uttryck"
 msgid "Flags"
 msgstr "Flaggor"
 
-#: src/prefs_matcher.c:624
-#: src/prefs_msg_colors.c:410
+#: src/prefs_matcher.c:624 src/prefs_msg_colors.c:410
 msgid "Color labels"
 msgstr "Färgmarkering"
 
@@ -15260,142 +15038,139 @@ msgstr "Delvis nedladdat"
 msgid "External program test"
 msgstr "Externt programtest"
 
-#: src/prefs_matcher.c:707
-#: src/prefs_matcher.c:1598
-#: src/prefs_matcher.c:1613
-#: src/prefs_matcher.c:2495
+#: src/prefs_matcher.c:707 src/prefs_matcher.c:1604 src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:2501
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Alla"
 
-#: src/prefs_matcher.c:739
+#: src/prefs_matcher.c:741
 msgid "Use regexp"
 msgstr "Anv. regex"
 
-#: src/prefs_matcher.c:812
+#: src/prefs_matcher.c:818
 msgid "Message must match"
 msgstr "Meddelande måste matcha"
 
-#: src/prefs_matcher.c:816
+#: src/prefs_matcher.c:822
 msgid "at least one"
 msgstr "minst en av"
 
-#: src/prefs_matcher.c:817
+#: src/prefs_matcher.c:823
 msgid "all"
 msgstr "alla"
 
-#: src/prefs_matcher.c:820
+#: src/prefs_matcher.c:826
 msgid "of above rules"
 msgstr "ovanstående regler"
 
-#: src/prefs_matcher.c:1516
-#: src/prefs_matcher.c:1582
+#: src/prefs_matcher.c:1522 src/prefs_matcher.c:1588
 msgid "Search pattern is not set."
 msgstr "Sökmönster är inte angivet."
 
-#: src/prefs_matcher.c:1525
+#: src/prefs_matcher.c:1531
 msgid "Test command is not set."
 msgstr "Testkommando är inte angivet."
 
-#: src/prefs_matcher.c:1599
+#: src/prefs_matcher.c:1605
 msgid "all addresses in all headers"
 msgstr "alla e-postadresser i alla brevhuvud"
 
-#: src/prefs_matcher.c:1602
+#: src/prefs_matcher.c:1608
 msgid "any address in any header"
 msgstr "någon e-postadress i något brevhuvud"
 
-#: src/prefs_matcher.c:1604
+#: src/prefs_matcher.c:1610
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "adressen(erna) i brevhuvudet '%s'"
 
-#: src/prefs_matcher.c:1605
+#: src/prefs_matcher.c:1611
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
 "\n"
-"If you want to match %s against the whole address book, you have to select '%s' from the book/folder drop-down list."
+"If you want to match %s against the whole address book, you have to select "
+"'%s' from the book/folder drop-down list."
 msgstr ""
 "Adressbok/adressmapp är inte satt.\n"
 "\n"
-"Om du vill matcha %s mot hela adressboken, så måste du välja '%s' från adressbokens/adressmapens rullgardinsmeny."
+"Om du vill matcha %s mot hela adressboken, så måste du välja '%s' från "
+"adressbokens/adressmapens rullgardinsmeny."
 
-#: src/prefs_matcher.c:1824
+#: src/prefs_matcher.c:1830
 msgid "Headers part"
 msgstr "Brevhuvudsdel"
 
-#: src/prefs_matcher.c:1828
+#: src/prefs_matcher.c:1834
 msgid "Body part"
 msgstr "Meddelandedel"
 
-#: src/prefs_matcher.c:1832
+#: src/prefs_matcher.c:1838
 msgid "Whole message"
 msgstr "Hela meddelandet"
 
-#: src/prefs_matcher.c:1951
-#: src/prefs_matcher.c:1995
+#: src/prefs_matcher.c:1957 src/prefs_matcher.c:2001
 msgid "in"
 msgstr "i"
 
-#: src/prefs_matcher.c:1953
+#: src/prefs_matcher.c:1959
 msgid "content is"
 msgstr "innehåll är"
 
-#: src/prefs_matcher.c:1962
+#: src/prefs_matcher.c:1968
 msgid "Age is"
 msgstr "Ålder är"
 
-#: src/prefs_matcher.c:1967
+#: src/prefs_matcher.c:1973
 msgid "Flag"
 msgstr "Flagga"
 
-#: src/prefs_matcher.c:1968
-#: src/prefs_matcher.c:1985
+#: src/prefs_matcher.c:1974 src/prefs_matcher.c:1991
 msgid "is"
 msgstr "är"
 
-#: src/prefs_matcher.c:1973
+#: src/prefs_matcher.c:1979
 msgid "Name:"
 msgstr "Namn: "
 
-#: src/prefs_matcher.c:1984
+#: src/prefs_matcher.c:1990
 msgid "Label"
 msgstr "Etikett"
 
-#: src/prefs_matcher.c:1990
+#: src/prefs_matcher.c:1996
 msgid "Value:"
 msgstr "Värde:"
 
-#: src/prefs_matcher.c:2007
+#: src/prefs_matcher.c:2013
 msgid "Score is"
 msgstr "Poäng är"
 
-#: src/prefs_matcher.c:2008
+#: src/prefs_matcher.c:2014
 msgid "points"
 msgstr "poäng"
 
-#: src/prefs_matcher.c:2018
+#: src/prefs_matcher.c:2024
 msgid "Size is"
 msgstr "Storlek är"
 
-#: src/prefs_matcher.c:2023
+#: src/prefs_matcher.c:2029
 msgid "Scope:"
 msgstr "Omfattning:"
 
-#: src/prefs_matcher.c:2025
+#: src/prefs_matcher.c:2031
 msgid "tags"
 msgstr "etiketter"
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2036
 msgid "type is"
 msgstr "typ är"
 
-#: src/prefs_matcher.c:2034
+#: src/prefs_matcher.c:2040
 msgid "Program returns"
 msgstr "Programmet returnerar"
 
-#: src/prefs_matcher.c:2104
+#: src/prefs_matcher.c:2110
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -15403,21 +15178,24 @@ msgstr ""
 "Posten sparades inte.\n"
 "Stäng ändå?"
 
-#: src/prefs_matcher.c:2168
+#: src/prefs_matcher.c:2174
 msgid "Match Type: 'Test'"
 msgstr "Matchningstyp: 'Test'"
 
-#: src/prefs_matcher.c:2169
+#: src/prefs_matcher.c:2175
 msgid ""
-"'Test' allows you to test a message or message element using an external program or script. The program will return either 0 or 1.\n"
+"'Test' allows you to test a message or message element using an external "
+"program or script. The program will return either 0 or 1.\n"
 "\n"
 "The following symbols can be used:"
 msgstr ""
-"'Test' låter dig testa ett meddelande eller del av ett meddelande med ett externt program eller skript. Programmet kommer returnera antingen 1 eller 0.\n"
+"'Test' låter dig testa ett meddelande eller del av ett meddelande med ett "
+"externt program eller skript. Programmet kommer returnera antingen 1 eller "
+"0.\n"
 "\n"
 "Följande symboler kan användas:"
 
-#: src/prefs_matcher.c:2268
+#: src/prefs_matcher.c:2274
 msgid "Current condition rules"
 msgstr "Nuvarande villkorsregler"
 
@@ -15461,8 +15239,7 @@ msgstr "Välj HTML-delen av flerdels-/alternativmeddelanden"
 msgid "Line space"
 msgstr "Radavstånd"
 
-#: src/prefs_message.c:189
-#: src/prefs_message.c:223
+#: src/prefs_message.c:189 src/prefs_message.c:223
 msgid "pixel(s)"
 msgstr "punkt(er)"
 
@@ -15526,8 +15303,7 @@ msgstr "Om det är mer än tre citatnivåer, kommer färgerna återanvändas"
 msgid "1st Level"
 msgstr "Nivå 1"
 
-#: src/prefs_msg_colors.c:190
-#: src/prefs_msg_colors.c:216
+#: src/prefs_msg_colors.c:190 src/prefs_msg_colors.c:216
 #: src/prefs_msg_colors.c:242
 msgid "Text"
 msgstr "Text"
@@ -15588,18 +15364,17 @@ msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Välj färg för signaturer"
 
-#: src/prefs_msg_colors.c:362
-msgid "Signatures"
-msgstr "Signaturer"
-
-#: src/prefs_msg_colors.c:367
-#: src/prefs_summaries.c:354
+#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:354
 msgid "Folder list"
 msgstr "Mapplista"
 
 #: src/prefs_msg_colors.c:380
-msgid "Pick color for Target folder. Target folder is used when the option 'Execute immediately when moving or deleting messages' is turned off"
-msgstr "Välj färg för målfolder. Målfolder används när alternativet 'Utför omedelbart vid flyttning och borttaganing av meddelanden' är avaktiverat"
+msgid ""
+"Pick color for Target folder. Target folder is used when the option 'Execute "
+"immediately when moving or deleting messages' is turned off"
+msgstr ""
+"Välj färg för målfolder. Målfolder används när alternativet 'Utför "
+"omedelbart vid flyttning och borttaganing av meddelanden' är avaktiverat"
 
 #: src/prefs_msg_colors.c:384
 msgid "Target folder"
@@ -15615,8 +15390,7 @@ msgstr "Mappen innehåller nya meddelanden"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:428
-#: src/prefs_msg_colors.c:459
+#: src/prefs_msg_colors.c:428 src/prefs_msg_colors.c:459
 #, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
@@ -15624,8 +15398,7 @@ msgstr "Välj färg för 'color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:432
-#: src/prefs_msg_colors.c:463
+#: src/prefs_msg_colors.c:432 src/prefs_msg_colors.c:463
 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "Välj etikett för 'color %d'"
@@ -15738,10 +15511,12 @@ msgstr "Tillåt konfigurerbara tangentbordsgenvägar"
 
 #: src/prefs_other.c:503
 msgid ""
-"If checked, you can change the keyboard shortcuts of most of the menu items by focusing on the menu item and pressing a key combination.\n"
+"If checked, you can change the keyboard shortcuts of most of the menu items "
+"by focusing on the menu item and pressing a key combination.\n"
 "Uncheck this option if you want to lock all existing keyboard shortcuts."
 msgstr ""
-"Om ikryssad kan du ändra tangentbordsgenvägar för de flesta menyval genom att ha fokus på menyvalet och samtidigt trycka en tangentkombination.\n"
+"Om ikryssad kan du ändra tangentbordsgenvägar för de flesta menyval genom "
+"att ha fokus på menyvalet och samtidigt trycka en tangentkombination.\n"
 "Lämna  ej ikryssad om du vil låsa alla nuvarande tangentbordsgenvägar."
 
 #: src/prefs_other.c:510
@@ -15793,8 +15568,13 @@ msgstr ""
 "(programmet 'shred' är inte tillgängligt)"
 
 #: src/prefs_other.c:583
-msgid "Use the 'shred' program to overwrite files with random data before deleting them. This slows down deletion. Be sure to read shred's man page for caveats."
-msgstr "Använd programmet 'shred' för att skriva över filer med slumpmässig data före borttagning. Detta gör borttagning långsammare. Läs i manualen till 'shred' för att få information om nackdelar."
+msgid ""
+"Use the 'shred' program to overwrite files with random data before deleting "
+"them. This slows down deletion. Be sure to read shred's man page for caveats."
+msgstr ""
+"Använd programmet 'shred' för att skriva över filer med slumpmässig data "
+"före borttagning. Detta gör borttagning långsammare. Läs i manualen till "
+"'shred' för att få information om nackdelar."
 
 #: src/prefs_other.c:587
 msgid "Synchronise offline folders as soon as possible"
@@ -15805,82 +15585,74 @@ msgid "Miscellaneous"
 msgstr "Blandat"
 
 #: src/prefs_quote.c:77
-msgid ""
-"On %d\\n"
-"%f wrote:\\n"
-"\\n"
-"%q"
-msgstr ""
-"Den %d\\n"
-"skrev %f:\\n"
-"\\n"
-"%q"
+msgid "On %d\\n%f wrote:\\n\\n%q"
+msgstr "Den %d\\nskrev %f:\\n\\n%q"
 
-#: src/prefs_receive.c:137
+#: src/prefs_receive.c:123
 msgid "External incorporation program"
 msgstr "Externt inkorporerat program"
 
-#: src/prefs_receive.c:140
+#: src/prefs_receive.c:126
 msgid "Use external program for receiving mail"
 msgstr "Använt externt program för att ta emot e-post"
 
-#: src/prefs_receive.c:156
+#: src/prefs_receive.c:142
 msgid "Automatic checking"
 msgstr "Kontrollera automatiskt"
 
-#: src/prefs_receive.c:163
+#: src/prefs_receive.c:149
 msgid "Check for new mail every"
 msgstr "Kolla efter ny e-post varje"
 
-#: src/prefs_receive.c:181
+#: src/prefs_receive.c:167
 msgid "Check for new mail on start-up"
 msgstr "Kolla efter ny e-post vid start"
 
-#: src/prefs_receive.c:184
+#: src/prefs_receive.c:170
 msgid "Dialogs"
 msgstr "Dialoger"
 
-#: src/prefs_receive.c:186
+#: src/prefs_receive.c:172
 msgid "Show receive dialog"
 msgstr "Visa mottagningsdialog"
 
-#: src/prefs_receive.c:196
+#: src/prefs_receive.c:182
 msgid "Only on manual receiving"
 msgstr "Bara vid manuell hämtning"
 
-#: src/prefs_receive.c:207
+#: src/prefs_receive.c:193
 msgid "Close receive dialog when finished"
 msgstr "Stäng mottagningsdialog när den är klar"
 
-#: src/prefs_receive.c:210
+#: src/prefs_receive.c:196
 msgid "Don't popup error dialog on receive error"
 msgstr "Visa inte felmeddelande vid mottagande"
 
-#: src/prefs_receive.c:213
-msgid "After checking for new mail"
-msgstr "Efter att ha kontrollerat ny e-post"
+#: src/prefs_receive.c:199
+msgid "After receiving new mail"
+msgstr "Efter att ha mottagit ny e-post"
 
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:201
 msgid "Go to Inbox"
 msgstr "Gå till Inkorgen"
 
-#: src/prefs_receive.c:217
+#: src/prefs_receive.c:203
 msgid "Update all local folders"
 msgstr "Uppdatera alla lokala mappar"
 
-#: src/prefs_receive.c:220
+#: src/prefs_receive.c:205
 msgid "Run command"
 msgstr "Kör kommando"
 
-#: src/prefs_receive.c:225
+#: src/prefs_receive.c:210
 msgid "after automatic check"
 msgstr "efter automatisk kontroll"
 
-#: src/prefs_receive.c:227
+#: src/prefs_receive.c:212
 msgid "after manual check"
 msgstr "efter manuell kontroll"
 
-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:220
 #, c-format
 msgid ""
 "Command to execute:\n"
@@ -15889,183 +15661,180 @@ msgstr ""
 "Kommando att köra:\n"
 "(använd %d för antal nya meddelande)"
 
-#: src/prefs_receive.c:260
-msgid "Blink LED"
-msgstr "Blinka lysdiod"
-
-#: src/prefs_receive.c:261
-msgid "Play sound"
-msgstr "Spela ljud"
-
-#: src/prefs_receive.c:263
-msgid "Show info banner"
-msgstr "Visa info-meddelande"
-
-#: src/prefs_receive.c:397
-#: src/prefs_send.c:348
+#: src/prefs_receive.c:343 src/prefs_send.c:357
 msgid "Mail Handling"
 msgstr "Posthantering"
 
-#: src/prefs_receive.c:398
+#: src/prefs_receive.c:344
 msgid "Receiving"
 msgstr "Mottagning"
 
-#: src/prefs_send.c:159
+#: src/prefs_send.c:161
 msgid "Save sent messages to Sent folder"
 msgstr "Spara skickade meddelanden till Skickat mappen"
 
-#: src/prefs_send.c:162
+#: src/prefs_send.c:164
 msgid "Confirm before sending queued messages"
 msgstr "Bekräfta innan köade meddelanden skickas"
 
-#: src/prefs_send.c:165
+#: src/prefs_send.c:167
 msgid "Never send Return Receipts"
 msgstr "Skicka aldrig läskvitton"
 
-#: src/prefs_send.c:168
+#: src/prefs_send.c:170
 msgid "Show send dialog"
 msgstr "Visa sänddialog"
 
-#: src/prefs_send.c:176
+#: src/prefs_send.c:172
+msgid "Warn when Subject is empty"
+msgstr "Varna när ämnesraden är tom"
+
+#: src/prefs_send.c:180
 msgid "Outgoing encoding"
 msgstr "Utgående kodning"
 
-#: src/prefs_send.c:201
-msgid "If 'Automatic' is selected, the optimal encoding for the current locale will be used"
-msgstr "Om 'Automatisk' är valt kommer den bästa teckenkodningen för den nuvarande lokalen användas"
+#: src/prefs_send.c:205
+msgid ""
+"If 'Automatic' is selected, the optimal encoding for the current locale will "
+"be used"
+msgstr ""
+"Om 'Automatisk' är valt kommer den bästa teckenkodningen för den nuvarande "
+"lokalen användas"
 
-#: src/prefs_send.c:216
+#: src/prefs_send.c:220
 msgid "Automatic (Recommended)"
 msgstr "Automatisk (Rekommenderad)"
 
-#: src/prefs_send.c:218
+#: src/prefs_send.c:222
 msgid "7bit ASCII (US-ASCII)"
 msgstr "7 bitars ASCII (US-ASCII)"
 
-#: src/prefs_send.c:219
+#: src/prefs_send.c:223
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_send.c:221
+#: src/prefs_send.c:225
 msgid "Western European (ISO-8859-1)"
 msgstr "Västeuropeisk (ISO-8859-1)"
 
-#: src/prefs_send.c:222
+#: src/prefs_send.c:226
 msgid "Western European (ISO-8859-15)"
 msgstr "Västeuropeisk (ISO-8859-1)"
 
-#: src/prefs_send.c:224
+#: src/prefs_send.c:228
 msgid "Central European (ISO-8859-2)"
 msgstr "Centraleuropeisk (ISO-8859-2)"
 
-#: src/prefs_send.c:226
+#: src/prefs_send.c:230
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: src/prefs_send.c:227
+#: src/prefs_send.c:231
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: src/prefs_send.c:229
+#: src/prefs_send.c:233
 msgid "Greek (ISO-8859-7)"
 msgstr "Grekisk (ISO-8859-7)"
 
-#: src/prefs_send.c:231
+#: src/prefs_send.c:235
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreiska  (ISO-8859-8)"
 
-#: src/prefs_send.c:232
+#: src/prefs_send.c:236
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreiska (Windows-1255)"
 
-#: src/prefs_send.c:234
+#: src/prefs_send.c:238
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabisk (ISO-8859-6)"
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:239
 msgid "Arabic (Windows-1256)"
 msgstr "Arabisk (Windows-1256)"
 
-#: src/prefs_send.c:237
+#: src/prefs_send.c:241
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkisk (ISO-8859-9)"
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:243
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kyrillisk (ISO-8859-5)"
 
-#: src/prefs_send.c:240
+#: src/prefs_send.c:244
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kyrillisk (KOI8-R)"
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:245
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kyrillisk (KOI8-U)"
 
-#: src/prefs_send.c:242
+#: src/prefs_send.c:246
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kyrillisk (Windows-1251)"
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:248
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japansk (ISO-2022-JP)"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:250
 msgid "Japanese (EUC-JP)"
 msgstr "Japansk (EUC-JP)"
 
-#: src/prefs_send.c:247
+#: src/prefs_send.c:251
 msgid "Japanese (Shift_JIS)"
 msgstr "Japansk (Shift_JIS)"
 
-#: src/prefs_send.c:250
+#: src/prefs_send.c:254
 msgid "Simplified Chinese (GB18030)"
 msgstr "Förenklad kinesiska (GB18030)"
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:255
 msgid "Simplified Chinese (GB2312)"
 msgstr "Förenklad kinesisk (GB2312)"
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:256
 msgid "Simplified Chinese (GBK)"
 msgstr "Förenklad kinesiska (GBK)"
 
-#: src/prefs_send.c:253
+#: src/prefs_send.c:257
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditionell kinesisk (Big5)"
 
-#: src/prefs_send.c:255
+#: src/prefs_send.c:259
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditionell kinesisk (EUC-TW)"
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:260
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kinesisk (ISO-2022-CN)"
 
-#: src/prefs_send.c:259
+#: src/prefs_send.c:263
 msgid "Korean (EUC-KR)"
 msgstr "Koreansk (EUC-KR)"
 
-#: src/prefs_send.c:261
+#: src/prefs_send.c:265
 msgid "Thai (TIS-620)"
 msgstr "Thailändska (TIS-620)"
 
-#: src/prefs_send.c:262
+#: src/prefs_send.c:266
 msgid "Thai (Windows-874)"
 msgstr "Thailändska (Windows-874)"
 
-#: src/prefs_send.c:266
+#: src/prefs_send.c:270
 msgid "Transfer encoding"
 msgstr "Överföringskodning"
 
-#: src/prefs_send.c:277
-msgid "Specify Content-Transfer-Encoding used when message body contains non-ASCII characters"
-msgstr "Specificera vilken Content-Transfer-Encoding som ska användas när meddelande innehåller icke ASCII-tecken"
+#: src/prefs_send.c:281
+msgid ""
+"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
+"characters"
+msgstr ""
+"Specificera vilken Content-Transfer-Encoding som ska användas när meddelande "
+"innehåller icke ASCII-tecken"
 
-#: src/prefs_send.c:349
-#: src/send_message.c:483
-#: src/send_message.c:487
-#: src/send_message.c:492
+#: src/prefs_send.c:358 src/send_message.c:491 src/send_message.c:495
+#: src/send_message.c:500
 msgid "Sending"
 msgstr "Skickar"
 
@@ -16193,8 +15962,7 @@ msgstr "årtalet som ett decimaltal"
 msgid "the time zone or name or abbreviation"
 msgstr "tidszon, namn eller förkortning"
 
-#: src/prefs_summaries.c:191
-#: src/prefs_summaries.c:239
+#: src/prefs_summaries.c:191 src/prefs_summaries.c:239
 #: src/prefs_summaries.c:522
 msgid "Date format"
 msgstr "Datumformat"
@@ -16268,8 +16036,12 @@ msgid "Execute immediately when moving or deleting messages"
 msgstr "Utför omedelbart vid flyttning och borttagning av meddelanden"
 
 #: src/prefs_summaries.c:476
-msgid "Defers moving, copying and deleting of messages until you choose 'Tools/Execute'"
-msgstr "Fördröjer flyttning, kopiering och borttagning av meddelanden till du väljer 'Verktyg/Utför'"
+msgid ""
+"Defers moving, copying and deleting of messages until you choose 'Tools/"
+"Execute'"
+msgstr ""
+"Fördröjer flyttning, kopiering och borttagning av meddelanden till du väljer "
+"'Verktyg/Utför'"
 
 #: src/prefs_summaries.c:479
 msgid "Mark message as read"
@@ -16304,8 +16076,12 @@ msgid "Translate header names"
 msgstr "Översätt brevhuvudsnamn"
 
 #: src/prefs_summaries.c:565
-msgid "The display of standard headers (such as 'From:', 'Subject:') will be translated into your language."
-msgstr "Visning av standardbrevhuvud (så som 'From:', 'Subject:') kommer översättas till svenska."
+msgid ""
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."
+msgstr ""
+"Visning av standardbrevhuvud (så som 'From:', 'Subject:') kommer översättas "
+"till svenska."
 
 #: src/prefs_summaries.c:682
 msgid "Summaries"
@@ -16325,7 +16101,8 @@ msgid ""
 "the order by using the Up / Down buttons or by dragging the items."
 msgstr ""
 "Välj kolumner som ska visas i meddelandelistan. Du kan ändra\n"
-"ordningen genom att använda Upp / Ner knapparna eller genom att dra kolumnnamnen"
+"ordningen genom att använda Upp / Ner knapparna eller genom att dra "
+"kolumnnamnen"
 
 #: src/prefs_summary_open.c:109
 msgid "first marked email"
@@ -16368,8 +16145,12 @@ msgid "This name is used as the Menu item"
 msgstr "Det här namnet används redan som Meny-val"
 
 #: src/prefs_template.c:81
-msgid "Override composing account's From header. This doesn't change the composing account."
-msgstr "Åsidosätt skapande kontots Från-brevhuvud. Detta ändrar inte vilket konto som används för att skapa."
+msgid ""
+"Override composing account's From header. This doesn't change the composing "
+"account."
+msgstr ""
+"Åsidosätt skapande kontots Från-brevhuvud. Detta ändrar inte vilket konto "
+"som används för att skapa."
 
 #: src/prefs_template.c:307
 msgid "Append the new template above to the list"
@@ -16379,92 +16160,91 @@ msgstr "Lägg till den nya mallen ovan sist i listan"
 msgid "Replace the selected template in list with the template above"
 msgstr "Byt ut den valda mallen i listan med mallen ovan"
 
-#: src/prefs_template.c:324
+#: src/prefs_template.c:326
 msgid "Delete the selected template from the list"
 msgstr "Ta bort den valda mallen från listan"
 
-#: src/prefs_template.c:340
+#: src/prefs_template.c:344
 msgid "Show information on configuring templates"
 msgstr "Visa information om konfigurering av mallar"
 
-#: src/prefs_template.c:364
+#: src/prefs_template.c:368
 msgid "Move the selected template to the top"
 msgstr "Flytta den valda mallen överst"
 
-#: src/prefs_template.c:374
+#: src/prefs_template.c:378
 msgid "Move the selected template up"
 msgstr "Flytta upp vald mallen"
 
-#: src/prefs_template.c:382
+#: src/prefs_template.c:386
 msgid "Move the selected template down"
 msgstr "Flytta ned vald mall"
 
-#: src/prefs_template.c:392
+#: src/prefs_template.c:396
 msgid "Move the selected template to the bottom"
 msgstr "Flytta den valda mallen sist"
 
-#: src/prefs_template.c:408
+#: src/prefs_template.c:412
 msgid "Template configuration"
 msgstr "Mallkonfiguration"
 
-#: src/prefs_template.c:595
+#: src/prefs_template.c:599
 msgid "Templates list not saved"
 msgstr "Malllistan är inte sparad."
 
-#: src/prefs_template.c:596
+#: src/prefs_template.c:600
 msgid "The templates list has been modified. Close anyway?"
 msgstr "Listan med mallar har ändrats. Stänga ändå?"
 
-#: src/prefs_template.c:757
+#: src/prefs_template.c:761
 msgid "The template's name is not set."
 msgstr "Mallens namn är inte angivet."
 
-#: src/prefs_template.c:794
+#: src/prefs_template.c:798
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "\"Från\"-fältet i mallen innehåller en felaktig email-adress."
 
-#: src/prefs_template.c:800
+#: src/prefs_template.c:804
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "\"Till\"-fältet av mallen innehåller en ogiltig email-adress."
 
-#: src/prefs_template.c:806
+#: src/prefs_template.c:810
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "\"Cc\"-fältet av mallen innehåller en ogiltig email-adress."
 
-#: src/prefs_template.c:812
+#: src/prefs_template.c:816
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "\"Bcc\"-fältet av mallen innehåller en ogiltig email-adress."
 
-#: src/prefs_template.c:818
+#: src/prefs_template.c:822
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "\"Ämne\"-fältet i mallen är ogiltig."
 
-#: src/prefs_template.c:888
+#: src/prefs_template.c:892
 msgid "Delete template"
 msgstr "Ta bort mall"
 
-#: src/prefs_template.c:889
+#: src/prefs_template.c:893
 msgid "Do you really want to delete this template?"
 msgstr "Vill du verkligen ta bort denna mall?"
 
-#: src/prefs_template.c:901
+#: src/prefs_template.c:905
 msgid "Delete all templates"
 msgstr "Ta bort alla mallar"
 
-#: src/prefs_template.c:902
+#: src/prefs_template.c:906
 msgid "Do you really want to delete all the templates?"
 msgstr "Vill du verkligen ta bort alla mallar?"
 
-#: src/prefs_template.c:1224
+#: src/prefs_template.c:1221
 msgid "Current templates"
 msgstr "Befintliga mallar"
 
-#: src/prefs_template.c:1252
+#: src/prefs_template.c:1249
 msgid "Template"
 msgstr "Mall"
 
-#: src/prefs_themes.c:347
-#: src/prefs_themes.c:727
+#: src/prefs_themes.c:347 src/prefs_themes.c:727
 msgid "Default internal theme"
 msgstr "Internt standardtema"
 
@@ -16602,6 +16382,10 @@ msgstr "Välj"
 msgid "Install new..."
 msgstr "Installera nytt..."
 
+#: src/prefs_themes.c:843
+msgid "Get more..."
+msgstr "Hämta mer..."
+
 #: src/prefs_themes.c:854
 msgid "Information"
 msgstr "Information"
@@ -16638,67 +16422,67 @@ msgstr "Posten har ingen ikon definierad."
 msgid "Item has no text defined."
 msgstr "Posten har inte text definierad."
 
-#: src/prefs_toolbar.c:911
+#: src/prefs_toolbar.c:916
 msgid "Toolbar item"
 msgstr "Objekt på verktygsrad"
 
-#: src/prefs_toolbar.c:927
+#: src/prefs_toolbar.c:932
 msgid "Item type"
 msgstr "Typ av objekt"
 
-#: src/prefs_toolbar.c:937
+#: src/prefs_toolbar.c:942
 msgid "Internal Function"
 msgstr "Intern funktion"
 
-#: src/prefs_toolbar.c:938
+#: src/prefs_toolbar.c:943
 msgid "User Action"
 msgstr "Användaraktivitet"
 
-#: src/prefs_toolbar.c:940
-#: src/toolbar.c:232
+#: src/prefs_toolbar.c:945 src/toolbar.c:233
 msgid "Separator"
 msgstr "Separator"
 
-#: src/prefs_toolbar.c:947
+#: src/prefs_toolbar.c:952
 msgid "Event executed on click"
 msgstr "Aktivitet vid klick"
 
-#: src/prefs_toolbar.c:986
+#: src/prefs_toolbar.c:991
 msgid "Toolbar text"
 msgstr "Text på verktygsraden"
 
-#: src/prefs_toolbar.c:1001
-#: src/prefs_toolbar.c:1372
+#: src/prefs_toolbar.c:1006 src/prefs_toolbar.c:1381
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/prefs_toolbar.c:1252
-#: src/prefs_toolbar.c:1266
-#: src/prefs_toolbar.c:1280
+#: src/prefs_toolbar.c:1042
+msgid "A_dd"
+msgstr "Lägg till"
+
+#: src/prefs_toolbar.c:1261 src/prefs_toolbar.c:1275 src/prefs_toolbar.c:1289
 msgid "Toolbars"
 msgstr "Verktygsrader"
 
-#: src/prefs_toolbar.c:1253
+#: src/prefs_toolbar.c:1262
 msgid "Main Window"
 msgstr "Huvudfönster"
 
-#: src/prefs_toolbar.c:1267
+#: src/prefs_toolbar.c:1276
 msgid "Message Window"
 msgstr "Meddelandefönster"
 
-#: src/prefs_toolbar.c:1281
+#: src/prefs_toolbar.c:1290
 msgid "Compose Window"
-msgstr "Nytt meddelande"
+msgstr "Skriv Meddelandefönster"
 
-#: src/prefs_toolbar.c:1395
+#: src/prefs_toolbar.c:1404
 msgid "Icon text"
 msgstr "Ikontext"
 
-#: src/prefs_toolbar.c:1404
+#: src/prefs_toolbar.c:1413
 msgid "Mapped event"
 msgstr "Tilldelad händelse"
 
-#: src/prefs_toolbar.c:1701
+#: src/prefs_toolbar.c:1710
 msgid "Toolbar item icon"
 msgstr "Ikon för verktygsraden"
 
@@ -16759,8 +16543,7 @@ msgstr "Zooma ut"
 msgid "Page %d"
 msgstr "Sida %d"
 
-#: src/privacy.c:255
-#: src/privacy.c:276
+#: src/privacy.c:255 src/privacy.c:276
 msgid "No information available"
 msgstr "Ingen information tillgänglig"
 
@@ -16768,14 +16551,11 @@ msgstr "Ingen information tillgänglig"
 msgid "No recipient keys defined."
 msgstr "Ingen mottagarnyckel är definierad."
 
-#: src/procmime.c:419
-#: src/procmime.c:421
-#: src/procmime.c:422
+#: src/procmime.c:422 src/procmime.c:424 src/procmime.c:425
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fel vid avkodning av BASE64]\n"
 
-#: src/procmsg.c:915
-#: src/procmsg.c:918
+#: src/procmsg.c:915 src/procmsg.c:918
 msgid "Already trying to send."
 msgstr "Försöker redan sända."
 
@@ -16798,20 +16578,31 @@ msgid "An error happened during SMTP session."
 msgstr "Ett fel uppstod i SMTP-session."
 
 #: src/procmsg.c:1724
-msgid "No specific account has been found to send, and an error happened during SMTP session."
-msgstr "Inget specifikt konto har hittats för att skicka, och ett fel inträffade under SMTP-session."
+msgid ""
+"No specific account has been found to send, and an error happened during "
+"SMTP session."
+msgstr ""
+"Inget specifikt konto har hittats för att skicka, och ett fel inträffade "
+"under SMTP-session."
 
 #: src/procmsg.c:1732
-msgid "Couldn't determine sending informations. Maybe the email hasn't been generated by Claws Mail."
-msgstr "Kunde inte bestämma sändningsinformation. Kanske har e-postmeddelandet inte skapats av Claws-Mail."
+msgid ""
+"Couldn't determine sending information. Maybe the email hasn't been "
+"generated by Claws Mail."
+msgstr ""
+"Kunde inte bestämma sändningsinformation. Möjligen har e-postmeddelandet "
+"inte skapats av Claws-Mail."
 
 #: src/procmsg.c:1750
 msgid "Couldn't create temporary file for news sending."
-msgstr "Kunde inte skapa tillfällig fil för skickande av diskussionsgruppmeddelande."
+msgstr ""
+"Kunde inte skapa tillfällig fil för skickande av diskussionsgruppmeddelande."
 
 #: src/procmsg.c:1763
 msgid "Error when writing temporary file for news sending."
-msgstr "Ett fel uppstod när tillfällig fil för skickande av diskussionsgruppmeddelande skrevs."
+msgstr ""
+"Ett fel uppstod när tillfällig fil för skickande av "
+"diskussionsgruppmeddelande skrevs."
 
 #: src/procmsg.c:1777
 #, c-format
@@ -16962,30 +16753,36 @@ msgstr ""
 
 #: src/quote_fmt.c:91
 msgid ""
-"insert <span style=\"oblique\">expr</span> if x is not set, where x is one of\n"
+"insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
+"of\n"
 "the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "symbols (or their long equivalent)"
 msgstr ""
-"infoga <span style=\"oblique\">uttr</span> om x inte är satt, där x är någon av\n"
+"infoga <span style=\"oblique\">uttr</span> om x inte är satt, där x är någon "
+"av\n"
 "symbolerna [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "(eller deras långa motsvarighet)"
 
 #: src/quote_fmt.c:92
 msgid ""
 "insert file:\n"
-"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file to insert"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
+"to insert"
 msgstr ""
 "infoga fil:\n"
-"<span style=\"oblique\">sub_expr</span> utvärderas som sökvägen till filen att infoga"
+"<span style=\"oblique\">sub_expr</span> utvärderas som sökvägen till filen "
+"att infoga"
 
 #: src/quote_fmt.c:93
 msgid ""
 "insert program output:\n"
-"<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to get\n"
+"<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
+"get\n"
 "the output from"
 msgstr ""
 "infoga utdata från program:\n"
-"<span style=\"oblique\">sub_expr</span> utvärderas som kommandorad som genererar utdata"
+"<span style=\"oblique\">sub_expr</span> utvärderas som kommandorad som "
+"genererar utdata"
 
 #: src/quote_fmt.c:94
 msgid ""
@@ -17000,10 +16797,12 @@ msgstr ""
 #: src/quote_fmt.c:95
 msgid ""
 "attach file:\n"
-"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file to attach"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
+"to attach"
 msgstr ""
 "bifoga fil:\n"
-"<span style=\"oblique\">sub_expr</span> utvärderas som sökvägen till filen att bifoga"
+"<span style=\"oblique\">sub_expr</span> utvärderas som sökvägen till filen "
+"att bifoga"
 
 #: src/quote_fmt.c:97
 msgid "<span weight=\"bold\">definition of terms:</span>"
@@ -17050,8 +16849,12 @@ msgid "Use template when composing new messages"
 msgstr "Använd mall för att skapa nytt meddelande"
 
 #: src/quote_fmt.c:197
-msgid "Override From header. This doesn't change the account used to compose the new message."
-msgstr "Åsidosätt Från-brevhuvud. Detta ändrar inte vilket konto som används för att skapa nytt meddelande."
+msgid ""
+"Override From header. This doesn't change the account used to compose the "
+"new message."
+msgstr ""
+"Åsidosätt Från-brevhuvud. Detta ändrar inte vilket konto som används för att "
+"skapa nytt meddelande."
 
 #: src/quote_fmt.c:297
 msgid "Use template when replying to messages"
@@ -17059,10 +16862,11 @@ msgstr "Använd mall för att svara på meddelande"
 
 #: src/quote_fmt.c:321
 msgid "Override From header. This doesn't change the account used to reply."
-msgstr "Åsidosätt Från-brevhuvud. Detta ändrar inte vilket konto som används för att svara."
+msgstr ""
+"Åsidosätt Från-brevhuvud. Detta ändrar inte vilket konto som används för att "
+"svara."
 
-#: src/quote_fmt.c:332
-#: src/quote_fmt.c:460
+#: src/quote_fmt.c:332 src/quote_fmt.c:460
 msgid "Quotation mark"
 msgstr "Citattecken"
 
@@ -17072,15 +16876,21 @@ msgstr "Använd mall för att vidarebefordra meddelande"
 
 #: src/quote_fmt.c:449
 msgid "Override From header. This doesn't change the account used to forward."
-msgstr "Åsidosätt Från-brevhuvud. Detta ändrar inte vilket konto som används för att vidarebefordra."
+msgstr ""
+"Åsidosätt Från-brevhuvud. Detta ändrar inte vilket konto som används för att "
+"vidarebefordra."
 
 #: src/quote_fmt.c:539
 msgid "Defaults"
 msgstr "Standard"
 
 #: src/quote_fmt.c:557
-msgid "The \"From\" field of the \"New message\" template contains an invalid email address."
-msgstr "\"Från\"-fältet i \"Nytt meddelande\"-mallen innehåller en ogiltig email-adress."
+msgid ""
+"The \"From\" field of the \"New message\" template contains an invalid email "
+"address."
+msgstr ""
+"\"Från\"-fältet i \"Nytt meddelande\"-mallen innehåller en ogiltig email-"
+"adress."
 
 #: src/quote_fmt.c:560
 msgid "The \"Subject\" field of the \"New message\" template is invalid."
@@ -17118,77 +16928,73 @@ msgstr "Kunde inte exekvera kommando: %s"
 msgid "Error occurred while executing command: %s"
 msgstr "Ett fel uppstod medan kommando: %s kördes"
 
-#: src/send_message.c:331
+#: src/send_message.c:339
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: src/send_message.c:336
+#: src/send_message.c:344
 msgid "Doing POP before SMTP..."
 msgstr "Gör POP före SMTP..."
 
-#: src/send_message.c:339
+#: src/send_message.c:347
 msgid "POP before SMTP"
 msgstr "POP innan SMTP"
 
-#: src/send_message.c:344
+#: src/send_message.c:352
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Konto '%s': Ansluter till SMTP-server: %s:%d..."
 
-#: src/send_message.c:401
+#: src/send_message.c:409
 msgid "Mail sent successfully."
 msgstr "Post skickad utan problem"
 
-#: src/send_message.c:468
+#: src/send_message.c:476
 msgid "Sending HELO..."
 msgstr "Skickar HELO"
 
-#: src/send_message.c:469
-#: src/send_message.c:474
-#: src/send_message.c:479
+#: src/send_message.c:477 src/send_message.c:482 src/send_message.c:487
 msgid "Authenticating"
 msgstr "(meddelande)verifiering"
 
-#: src/send_message.c:470
-#: src/send_message.c:475
+#: src/send_message.c:478 src/send_message.c:483
 msgid "Sending message..."
 msgstr "Skickar meddelande..."
 
-#: src/send_message.c:473
+#: src/send_message.c:481
 msgid "Sending EHLO..."
 msgstr "Skickar EHLO..."
 
-#: src/send_message.c:482
+#: src/send_message.c:490
 msgid "Sending MAIL FROM..."
 msgstr "Skickar MAIL FROM..."
 
-#: src/send_message.c:486
+#: src/send_message.c:494
 msgid "Sending RCPT TO..."
 msgstr "Skickar RCPT TO..."
 
-#: src/send_message.c:491
+#: src/send_message.c:499
 msgid "Sending DATA..."
 msgstr "Skickar DATA..."
 
-#: src/send_message.c:495
+#: src/send_message.c:503
 msgid "Quitting..."
 msgstr "Avslutar..."
 
-#: src/send_message.c:524
+#: src/send_message.c:532
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Skickar meddelande (%d / %d byte)"
 
-#: src/send_message.c:577
+#: src/send_message.c:585
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: src/send_message.c:646
-#: src/send_message.c:666
+#: src/send_message.c:654 src/send_message.c:674
 msgid "Error occurred while sending the message."
 msgstr "Ett fel uppstod medans meddelandet skickades"
 
-#: src/send_message.c:649
+#: src/send_message.c:657
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -17234,42 +17040,40 @@ msgstr "Ta bort certifikat"
 msgid "Do you really want to delete this certificate?"
 msgstr "Vill du verkligen ta bort detta certifikat?"
 
-#: src/summary_search.c:266
+#: src/summary_search.c:271
 msgid "Search messages"
 msgstr "Sök meddelanden"
 
-#: src/summary_search.c:292
+#: src/summary_search.c:293
 msgid "Match any of the following"
 msgstr "Matcha någon av följande"
 
-#: src/summary_search.c:294
+#: src/summary_search.c:295
 msgid "Match all of the following"
 msgstr "Matcha alla följande"
 
-#: src/summary_search.c:433
+#: src/summary_search.c:459
 msgid "Body:"
 msgstr "Meddelandetext:"
 
-#: src/summary_search.c:440
+#: src/summary_search.c:466
 msgid "Condition:"
 msgstr "Villkor: "
 
-#: src/summary_search.c:470
+#: src/summary_search.c:496
 msgid "Find _all"
 msgstr "Hitta _alla"
 
-#: src/summary_search.c:679
-#: src/summaryview.c:1105
-#: src/summaryview.c:1366
+#: src/summary_search.c:702 src/summaryview.c:1105 src/summaryview.c:1366
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Söker i %s... \n"
 
-#: src/summary_search.c:776
+#: src/summary_search.c:799
 msgid "Beginning of list reached; continue from end?"
 msgstr "Början av lista nådd; fortsätt från slutet?"
 
-#: src/summary_search.c:778
+#: src/summary_search.c:801
 msgid "End of list reached; continue from beginning?"
 msgstr "Slutet av lista nådd; fortsätt från början?"
 
@@ -17298,8 +17102,7 @@ msgstr "Några markeringar finns kvar. Behandla dem?"
 msgid "Scanning folder (%s)..."
 msgstr "Genomsöker mapp (%s)..."
 
-#: src/summaryview.c:1829
-#: src/summaryview.c:1881
+#: src/summaryview.c:1829 src/summaryview.c:1881
 msgid "No more unread messages"
 msgstr "Inga fler olästa meddelande"
 
@@ -17307,12 +17110,10 @@ msgstr "Inga fler olästa meddelande"
 msgid "No unread message found. Search from the end?"
 msgstr "Inget oläst meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1842
-#: src/summaryview.c:1894
-#: src/summaryview.c:1941
-#: src/summaryview.c:1993
-#: src/summaryview.c:2072
-msgid "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
+#: src/summaryview.c:1842 src/summaryview.c:1894 src/summaryview.c:1941
+#: src/summaryview.c:1993 src/summaryview.c:2072
+msgid ""
+"Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr "Internt fel: oväntat värde för prefs_common.next_unread_msg_dialog\n"
 
 #: src/summaryview.c:1850
@@ -17323,8 +17124,7 @@ msgstr "Inga olästa meddelanden"
 msgid "No unread message found. Go to next folder?"
 msgstr "Inget oläst meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:1928
-#: src/summaryview.c:1980
+#: src/summaryview.c:1928 src/summaryview.c:1980
 msgid "No more new messages"
 msgstr "Inga fler nya meddelande"
 
@@ -17340,8 +17140,7 @@ msgstr "Inga nya meddelanden"
 msgid "No new message found. Go to next folder?"
 msgstr "Inget nytt meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:2018
-#: src/summaryview.c:2059
+#: src/summaryview.c:2018 src/summaryview.c:2059
 msgid "No more marked messages"
 msgstr "Inga fler markerade meddelanden"
 
@@ -17357,8 +17156,7 @@ msgstr "Inget markerat meddelande"
 msgid "No marked message found. Go to next folder?"
 msgstr "Inget markerat meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:2097
-#: src/summaryview.c:2122
+#: src/summaryview.c:2097 src/summaryview.c:2122
 msgid "No more labeled messages"
 msgstr "Inga fler färgade meddelanden"
 
@@ -17366,8 +17164,7 @@ msgstr "Inga fler färgade meddelanden"
 msgid "No labeled message found. Search from the end?"
 msgstr "Inget färgat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:2107
-#: src/summaryview.c:2132
+#: src/summaryview.c:2107 src/summaryview.c:2132
 msgid "No labeled messages."
 msgstr "Inget färgat meddelande"
 
@@ -17389,8 +17186,7 @@ msgstr "%d borttagen"
 msgid "%s%d moved"
 msgstr "%s%d flyttad"
 
-#: src/summaryview.c:2624
-#: src/summaryview.c:2631
+#: src/summaryview.c:2624 src/summaryview.c:2631
 msgid ", "
 msgstr ", "
 
@@ -17405,8 +17201,7 @@ msgid_plural " items selected"
 msgstr[0] " objekt valt"
 msgstr[1] " objekt valda"
 
-#: src/summaryview.c:2661
-#: src/summaryview.c:2697
+#: src/summaryview.c:2661 src/summaryview.c:2697
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d ny(a), %d oläst(a), %d totalt (%s)"
@@ -17479,71 +17274,73 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Till: %s, på %s</span>"
 
-#: src/summaryview.c:4290
+#: src/summaryview.c:4286
 msgid "You're not the author of the article.\n"
 msgstr "Du är inte artikelns författare.\n"
 
-#: src/summaryview.c:4383
+#: src/summaryview.c:4379
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "Vill du verkligen ta bort det valda meddelandet?"
 msgstr[1] "Vill du verkligen ta bort de %d valda meddelanden?"
 
-#: src/summaryview.c:4386
+#: src/summaryview.c:4382
 msgid "Delete message(s)"
 msgstr "Ta bort meddelandet"
 
-#: src/summaryview.c:4549
+#: src/summaryview.c:4545
 msgid "Destination is same as current folder."
 msgstr "Destinationen är samma som aktuell mapp."
 
-#: src/summaryview.c:4648
+#: src/summaryview.c:4644
 msgid "Destination to copy is same as current folder."
 msgstr "Destinationen att kopiera är samma som aktuell mapp."
 
-#: src/summaryview.c:4821
+#: src/summaryview.c:4817
 msgid "Append or Overwrite"
 msgstr "Lägg till eller Skriv över"
 
-#: src/summaryview.c:4822
+#: src/summaryview.c:4818
 msgid "Append or overwrite existing file?"
 msgstr "Lägg till eller skriv över befintlig fil?"
 
-#: src/summaryview.c:4823
+#: src/summaryview.c:4819
 msgid "_Append"
 msgstr "_Bifoga"
 
-#: src/summaryview.c:4823
+#: src/summaryview.c:4819
 msgid "_Overwrite"
 msgstr "_Skriv över"
 
-#: src/summaryview.c:4864
+#: src/summaryview.c:4860
 #, c-format
-msgid "You are about to print %d messages, one by one. Do you want to continue?"
-msgstr "Du är på väg att skriva ut %d meddelanden, ett och ett. Vill du fortsätta?"
+msgid ""
+"You are about to print %d messages, one by one. Do you want to continue?"
+msgstr ""
+"Du är på väg att skriva ut %d meddelanden, ett och ett. Vill du fortsätta?"
 
-#: src/summaryview.c:5341
+#: src/summaryview.c:5337
 msgid "Building threads..."
 msgstr "Skapar trådar..."
 
-#: src/summaryview.c:5587
+#: src/summaryview.c:5583
 msgid "Skip these rules"
 msgstr "Hoppa över dessa regler"
 
-#: src/summaryview.c:5590
+#: src/summaryview.c:5586
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Använd dessa regler oavsett vilket konto de tillhör"
 
-#: src/summaryview.c:5593
+#: src/summaryview.c:5589
 msgid "Apply these rules if they apply to the current account"
 msgstr "Använd dessa regler om de är giltiga för nuvarande konto"
 
-#: src/summaryview.c:5622
+#: src/summaryview.c:5618
 msgid "Filtering"
 msgstr "Filtrerar"
 
-#: src/summaryview.c:5623
+#: src/summaryview.c:5619
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -17551,59 +17348,59 @@ msgstr ""
 "Det finns några filtreringsregler som tillhör ett konto.\n"
 "Välj vad som skall göras med dessa regler:"
 
-#: src/summaryview.c:5625
+#: src/summaryview.c:5621
 msgid "_Filter"
 msgstr "_Filter"
 
-#: src/summaryview.c:5653
+#: src/summaryview.c:5649
 msgid "Filtering..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:5732
+#: src/summaryview.c:5728
 msgid "Processing configuration"
 msgstr "Behandlar konfiguration"
 
-#: src/summaryview.c:6280
+#: src/summaryview.c:6276
 msgid "Ignored thread"
 msgstr "Ignorera tråd"
 
-#: src/summaryview.c:6282
+#: src/summaryview.c:6278
 msgid "Watched thread"
 msgstr "Bevakad tråd"
 
-#: src/summaryview.c:6290
+#: src/summaryview.c:6286
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Besvarat men även vidarebefordrat - klicka för att se svar"
 
-#: src/summaryview.c:6292
+#: src/summaryview.c:6288
 msgid "Replied - click to see reply"
 msgstr "Svarat på - klicka för att se svar"
 
-#: src/summaryview.c:6304
+#: src/summaryview.c:6300
 msgid "To be moved"
 msgstr "Att flyttas"
 
-#: src/summaryview.c:6306
+#: src/summaryview.c:6302
 msgid "To be copied"
 msgstr "Att bli kopierad"
 
-#: src/summaryview.c:6318
+#: src/summaryview.c:6314
 msgid "Signed, has attachment(s)"
 msgstr "Signerat, har bilaga(or)"
 
-#: src/summaryview.c:6322
+#: src/summaryview.c:6318
 msgid "Encrypted, has attachment(s)"
 msgstr "Krypterad, har bilaga(or)"
 
-#: src/summaryview.c:6324
+#: src/summaryview.c:6320
 msgid "Encrypted"
 msgstr "Krypterad"
 
-#: src/summaryview.c:6326
+#: src/summaryview.c:6322
 msgid "Has attachment(s)"
 msgstr "Har bilaga(or)"
 
-#: src/summaryview.c:7963
+#: src/summaryview.c:7952
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -17612,11 +17409,11 @@ msgstr ""
 "Fel i reguljärt uttryck (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8071
+#: src/summaryview.c:8060
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Gå tillbaka till mapplistan (Du har olästa meddelanden)"
 
-#: src/summaryview.c:8076
+#: src/summaryview.c:8065
 msgid "Go back to the folder list"
 msgstr "Gå tillbaka till mapplistan"
 
@@ -17696,9 +17493,7 @@ msgstr "     - För att spara, välj "
 msgid "'Save as...'"
 msgstr "'Spara som...'"
 
-#: src/textview.c:992
-#: src/textview.c:1004
-#: src/textview.c:1016
+#: src/textview.c:992 src/textview.c:1004 src/textview.c:1016
 #: src/textview.c:1026
 msgid " (Shortcut key: '"
 msgstr "(Tangentbordsgenväg: '"
@@ -17777,323 +17572,278 @@ msgstr "Varning försök till nätfiske"
 msgid "_Open URL"
 msgstr "_Öppna URL"
 
-#: src/toolbar.c:191
-#: src/toolbar.c:1948
+#: src/toolbar.c:192 src/toolbar.c:1949
 msgid "Receive Mail from all Accounts"
 msgstr "Hämta e-post från alla konton"
 
-#: src/toolbar.c:192
-#: src/toolbar.c:1953
+#: src/toolbar.c:193 src/toolbar.c:1954
 msgid "Receive Mail from current Account"
 msgstr "Hämta e-post från aktuellt konto"
 
-#: src/toolbar.c:193
-#: src/toolbar.c:1957
+#: src/toolbar.c:194 src/toolbar.c:1958
 msgid "Send Queued Messages"
 msgstr "Skicka köade meddelande"
 
-#: src/toolbar.c:194
-#: src/toolbar.c:918
-#: src/toolbar.c:1975
-#: src/toolbar.c:1986
+#: src/toolbar.c:195 src/toolbar.c:919 src/toolbar.c:1976 src/toolbar.c:1987
 msgid "Compose Email"
 msgstr "Skriv e-postmeddelande"
 
-#: src/toolbar.c:195
+#: src/toolbar.c:196
 msgid "Compose News"
 msgstr "Skriv diskussionsgruppmeddelande"
 
-#: src/toolbar.c:196
-#: src/toolbar.c:2014
-#: src/toolbar.c:2024
+#: src/toolbar.c:197 src/toolbar.c:2015 src/toolbar.c:2025
 msgid "Reply to Message"
 msgstr "Svara på meddelande"
 
-#: src/toolbar.c:197
-#: src/toolbar.c:2031
-#: src/toolbar.c:2041
+#: src/toolbar.c:198 src/toolbar.c:2032 src/toolbar.c:2042
 msgid "Reply to Sender"
 msgstr "Svara till avsändare"
 
-#: src/toolbar.c:198
-#: src/toolbar.c:2048
-#: src/toolbar.c:2058
+#: src/toolbar.c:199 src/toolbar.c:2049 src/toolbar.c:2059
 msgid "Reply to All"
 msgstr "Svara till Alla"
 
-#: src/toolbar.c:199
-#: src/toolbar.c:2065
-#: src/toolbar.c:2075
+#: src/toolbar.c:200 src/toolbar.c:2066 src/toolbar.c:2076
 msgid "Reply to Mailing-list"
 msgstr "Svara till sändlista"
 
-#: src/toolbar.c:200
-#: src/toolbar.c:1969
+#: src/toolbar.c:201 src/toolbar.c:1970
 msgid "Open email"
 msgstr "Öppna e-post"
 
-#: src/toolbar.c:201
-#: src/toolbar.c:2082
-#: src/toolbar.c:2093
+#: src/toolbar.c:202 src/toolbar.c:2083 src/toolbar.c:2094
 msgid "Forward Message"
 msgstr "Vidarebefordra meddelande"
 
-#: src/toolbar.c:202
-#: src/toolbar.c:2098
+#: src/toolbar.c:203 src/toolbar.c:2099
 msgid "Trash Message"
 msgstr "Flytta till papperskorg"
 
-#: src/toolbar.c:203
-#: src/toolbar.c:2102
+#: src/toolbar.c:204 src/toolbar.c:2103
 msgid "Delete Message"
 msgstr "Ta bort meddelande"
 
-#: src/toolbar.c:205
-#: src/toolbar.c:2110
+#: src/toolbar.c:206 src/toolbar.c:2111
 msgid "Go to Previous Unread Message"
 msgstr "Gå till föregående olästa meddelande"
 
-#: src/toolbar.c:206
-#: src/toolbar.c:2114
+#: src/toolbar.c:207 src/toolbar.c:2115
 msgid "Go to Next Unread Message"
 msgstr "Gå till nästa olästa meddelande"
 
-#: src/toolbar.c:209
-#: src/toolbar.c:419
+#: src/toolbar.c:210 src/toolbar.c:420
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/toolbar.c:210
+#: src/toolbar.c:211
 msgid "Learn Spam or Ham"
 msgstr "Inlärning Skräp eller Ej skräp"
 
-#: src/toolbar.c:211
+#: src/toolbar.c:212
 msgid "Open folder/Go to folder list"
 msgstr "Öppna mapp/Gå till mapplista"
 
-#: src/toolbar.c:214
-#: src/toolbar.c:2120
+#: src/toolbar.c:215 src/toolbar.c:2121
 msgid "Send Message"
 msgstr "Skicka meddelande"
 
-#: src/toolbar.c:215
-#: src/toolbar.c:2124
+#: src/toolbar.c:216 src/toolbar.c:2125
 msgid "Put into queue folder and send later"
 msgstr "Placera i kömapp och skicka senare"
 
-#: src/toolbar.c:216
-#: src/toolbar.c:2128
+#: src/toolbar.c:217 src/toolbar.c:2129
 msgid "Save to draft folder"
 msgstr "Spara till utkastsmapp"
 
-#: src/toolbar.c:217
-#: src/toolbar.c:2132
+#: src/toolbar.c:218 src/toolbar.c:2133
 msgid "Insert file"
 msgstr "Infoga fil"
 
-#: src/toolbar.c:218
-#: src/toolbar.c:2136
+#: src/toolbar.c:219 src/toolbar.c:2137
 msgid "Attach file"
 msgstr "Bifoga fil"
 
-#: src/toolbar.c:219
-#: src/toolbar.c:2140
+#: src/toolbar.c:220 src/toolbar.c:2141
 msgid "Insert signature"
 msgstr "Infoga signatur"
 
-#: src/toolbar.c:220
-#: src/toolbar.c:2144
+#: src/toolbar.c:221 src/toolbar.c:2145
 msgid "Edit with external editor"
 msgstr "Redigera med extern redigerare"
 
-#: src/toolbar.c:221
-#: src/toolbar.c:2148
+#: src/toolbar.c:222 src/toolbar.c:2149
 msgid "Wrap long lines of current paragraph"
 msgstr "Radbryt långa rader i aktuellt stycke"
 
-#: src/toolbar.c:222
-#: src/toolbar.c:2152
+#: src/toolbar.c:223 src/toolbar.c:2153
 msgid "Wrap all long lines"
 msgstr "Radbryt alla långa rader"
 
-#: src/toolbar.c:225
-#: src/toolbar.c:437
-#: src/toolbar.c:2161
+#: src/toolbar.c:226 src/toolbar.c:438 src/toolbar.c:2162
 msgid "Check spelling"
 msgstr "Kontrollera stavning"
 
-#: src/toolbar.c:227
+#: src/toolbar.c:228
 msgid "Claws Mail Actions Feature"
 msgstr "Claws-Mails aktivitetsfunktion"
 
-#: src/toolbar.c:228
-#: src/toolbar.c:2177
+#: src/toolbar.c:229 src/toolbar.c:2178
 msgid "Cancel receiving"
 msgstr "Avbryt hämtning"
 
-#: src/toolbar.c:230
-#: src/toolbar.c:2185
+#: src/toolbar.c:231 src/toolbar.c:2186
 msgid "Cancel receiving/sending"
 msgstr "Avbryt mottagning/sändning"
 
-#: src/toolbar.c:231
-#: src/toolbar.c:1961
+#: src/toolbar.c:232 src/toolbar.c:1962
 msgid "Close window"
 msgstr "Stäng fönster"
 
-#: src/toolbar.c:233
+#: src/toolbar.c:234
 msgid "Claws Mail Plugins"
 msgstr "Claws Mail Insticksmoduler"
 
-#: src/toolbar.c:377
-#: src/toolbar.c:412
+#: src/toolbar.c:378 src/toolbar.c:413
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/toolbar.c:400
+#: src/toolbar.c:401
 msgid "Folders"
 msgstr "Mappar"
 
-#: src/toolbar.c:402
+#: src/toolbar.c:403
 msgid "Get Mail"
 msgstr "Hämta e-post"
 
-#: src/toolbar.c:403
+#: src/toolbar.c:404
 msgid "Get"
 msgstr "Hämta"
 
-#: src/toolbar.c:405
-#: src/toolbar.c:406
+#: src/toolbar.c:406 src/toolbar.c:407
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Nytt"
 
-#: src/toolbar.c:408
+#: src/toolbar.c:409
 msgid "All"
 msgstr "Alla"
 
-#: src/toolbar.c:409
+#: src/toolbar.c:410
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "Avsändare"
 
-#: src/toolbar.c:410
+#: src/toolbar.c:411
 msgid "List"
 msgstr "Lista"
 
-#: src/toolbar.c:415
+#: src/toolbar.c:416
 msgid "Prev"
 msgstr "Föregående"
 
-#: src/toolbar.c:416
+#: src/toolbar.c:417
 msgid "Next"
 msgstr "Nästa"
 
-#: src/toolbar.c:424
+#: src/toolbar.c:425
 msgid "Draft"
 msgstr "Utkast"
 
-#: src/toolbar.c:427
+#: src/toolbar.c:428
 msgid "Insert sig."
 msgstr "Infoga signatur"
 
-#: src/toolbar.c:428
+#: src/toolbar.c:429
 msgid "Edit"
 msgstr "Redigera"
 
-#: src/toolbar.c:429
+#: src/toolbar.c:430
 msgid "Wrap para."
 msgstr "Radbryt para."
 
-#: src/toolbar.c:430
+#: src/toolbar.c:431
 msgid "Wrap all"
 msgstr "Radbryt alla"
 
-#: src/toolbar.c:432
-#: src/toolbar.c:433
+#: src/toolbar.c:433 src/toolbar.c:434
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/toolbar.c:434
+#: src/toolbar.c:435
 msgid "Stop all"
 msgstr "Stoppa alla"
 
-#: src/toolbar.c:910
+#: src/toolbar.c:911
 msgid "Compose News message"
 msgstr "Nytt diskussionsgrupps-meddelande"
 
-#: src/toolbar.c:952
+#: src/toolbar.c:953
 msgid "Learn spam"
 msgstr "Markera som skräp"
 
-#: src/toolbar.c:961
+#: src/toolbar.c:962
 msgid "Ham"
 msgstr "Icke spam"
 
-#: src/toolbar.c:963
+#: src/toolbar.c:964
 msgid "Learn ham"
 msgstr "Markera som ej skräp"
 
-#: src/toolbar.c:1943
+#: src/toolbar.c:1944
 msgid "Go to folder list"
 msgstr "Gå till mapplista"
 
-#: src/toolbar.c:1949
+#: src/toolbar.c:1950
 msgid "Receive Mail from selected Account"
 msgstr "Ta emot e-post från valt konto"
 
-#: src/toolbar.c:1965
+#: src/toolbar.c:1966
 msgid "Open preferences"
 msgstr "Öppna egenskaper"
 
-#: src/toolbar.c:1976
+#: src/toolbar.c:1977
 msgid "Compose with selected Account"
 msgstr "Skriv nytt från valt konto"
 
-#: src/toolbar.c:1997
+#: src/toolbar.c:1998
 msgid "Learn as..."
 msgstr "Markera som..."
 
-#: src/toolbar.c:2007
+#: src/toolbar.c:2008
 msgid "Learn as _Spam"
 msgstr "Markera som _skräp"
 
-#: src/toolbar.c:2008
+#: src/toolbar.c:2009
 msgid "Learn as _Ham"
 msgstr "Markera som _ej skräp"
 
-#: src/toolbar.c:2015
+#: src/toolbar.c:2016
 msgid "Reply to Message options"
 msgstr "Alternativ för Svarsmeddelande"
 
-#: src/toolbar.c:2019
-#: src/toolbar.c:2036
-#: src/toolbar.c:2053
-#: src/toolbar.c:2070
+#: src/toolbar.c:2020 src/toolbar.c:2037 src/toolbar.c:2054 src/toolbar.c:2071
 msgid "_Reply with quote"
 msgstr "Sva_ra med citat"
 
-#: src/toolbar.c:2020
-#: src/toolbar.c:2037
-#: src/toolbar.c:2054
-#: src/toolbar.c:2071
+#: src/toolbar.c:2021 src/toolbar.c:2038 src/toolbar.c:2055 src/toolbar.c:2072
 msgid "Reply without _quote"
 msgstr "Svara utan _citat"
 
-#: src/toolbar.c:2032
+#: src/toolbar.c:2033
 msgid "Reply to Sender options"
 msgstr "Alternativ för Svara till avsändare"
 
-#: src/toolbar.c:2049
+#: src/toolbar.c:2050
 msgid "Reply to All options"
 msgstr "Alternativ för Svara till Alla"
 
-#: src/toolbar.c:2066
+#: src/toolbar.c:2067
 msgid "Reply to Mailing-list options"
 msgstr "Alternativ för Svara till sändlista"
 
-#: src/toolbar.c:2083
+#: src/toolbar.c:2084
 msgid "Forward Message options"
 msgstr "Alternativ för vidarebefordra meddelande"
 
@@ -18118,12 +17868,12 @@ msgstr "Vänligen välj webbadress att öppna."
 msgid "Select All"
 msgstr "Markera alla"
 
-#: src/wizard.c:539
+#: src/wizard.c:517
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Välkommen till Claws Mail"
 
-#: src/wizard.c:562
+#: src/wizard.c:540
 #, c-format
 msgid ""
 "\n"
@@ -18176,7 +17926,8 @@ msgstr ""
 "-------------------------\n"
 "\n"
 "Nu när du har ställt in ditt konto kan du hämta din\n"
-"e-post genom att klicka på 'Hämta e-post'-knappen till vänster på verktygsraden.\n"
+"e-post genom att klicka på 'Hämta e-post'-knappen till vänster på "
+"verktygsraden.\n"
 "\n"
 "Claws-Mail har många extra funktioner tillgänliga via instickmoduler,\n"
 "som anti-skräppostfilter och inlärning (via Bogofilter eller\n"
@@ -18214,143 +17965,135 @@ msgstr ""
 "Om du önskar donera till Claws Mail projektet kan du göra så på <%s>.\n"
 "\n"
 
-#: src/wizard.c:638
+#: src/wizard.c:616
 msgid "Please enter the mailbox name."
 msgstr "Ange brevlådenamnet."
 
-#: src/wizard.c:681
+#: src/wizard.c:644
 msgid "Please enter your name and email address."
 msgstr "Ange ditt namn och epostadress"
 
-#: src/wizard.c:692
+#: src/wizard.c:655
 msgid "Please enter your receiving server and username."
 msgstr "Ange din mottagande server och användarnamn."
 
-#: src/wizard.c:702
+#: src/wizard.c:665
 msgid "Please enter your username."
 msgstr "Ange ditt användarnamn."
 
-#: src/wizard.c:712
+#: src/wizard.c:675
 msgid "Please enter your SMTP server."
 msgstr "Ange din SMTP-server."
 
-#: src/wizard.c:723
+#: src/wizard.c:686
 msgid "Please enter your SMTP username."
 msgstr "Ange ditt SMTP-användarnamn."
 
-#: src/wizard.c:1013
+#: src/wizard.c:965
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Ditt namn:</span>"
 
-#: src/wizard.c:1023
+#: src/wizard.c:975
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Din e-postadress:</span>"
 
-#: src/wizard.c:1033
+#: src/wizard.c:985
 msgid "Your organization:"
 msgstr "Din organisation:"
 
-#: src/wizard.c:1141
+#: src/wizard.c:1018
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Brevlådans namn:</span>"
 
-#: src/wizard.c:1149
-msgid "You can also specify an absolute path, for example: \"/home/john/Documents/Mail\""
-msgstr "Du kan också ange en absolut sökväg, till exempel: \"/home/john/Documents/Mail\""
-
-#: src/wizard.c:1157
-msgid "on internal memory"
-msgstr "på internt minne"
-
-#: src/wizard.c:1160
-msgid "on external memory card"
-msgstr "på externt minneskort"
-
-#: src/wizard.c:1163
-msgid "on internal memory card"
-msgstr "på internt minneskort"
-
-#: src/wizard.c:1213
-msgid "<span weight=\"bold\">Store data</span>"
-msgstr "<span weight=\"bold\">Spara data</span>"
+#: src/wizard.c:1026
+msgid ""
+"You can also specify an absolute path, for example: \"/home/john/Documents/"
+"Mail\""
+msgstr ""
+"Du kan också ange en absolut sökväg, till exempel: \"/home/john/Documents/"
+"Mail\""
 
-#: src/wizard.c:1281
-msgid "You can specify the port number by appending it at the end: \"mail.example.com:25\""
-msgstr "Du kan ange portnummer genom att lägga till det på slutet: \"mail.example.com:25\""
+#: src/wizard.c:1097
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:25\""
+msgstr ""
+"Du kan ange portnummer genom att lägga till det på slutet: \"mail.example."
+"com:25\""
 
-#: src/wizard.c:1284
+#: src/wizard.c:1100
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Adress till SMTP server:</span>"
 
-#: src/wizard.c:1290
+#: src/wizard.c:1106
 msgid "Use authentication"
 msgstr "Använd autentisering"
 
-#: src/wizard.c:1298
+#: src/wizard.c:1114
 msgid "<span size=\"small\">(empty to use the same as receive)</span>"
 msgstr "<span size=\"small\">(tomt för samma som vid mottagning)</span>"
 
-#: src/wizard.c:1312
+#: src/wizard.c:1128
 msgid "SMTP username:"
 msgstr "SMTP användarnamn:"
 
-#: src/wizard.c:1323
+#: src/wizard.c:1139
 msgid "SMTP password:"
 msgstr "SMTP lösenord:"
 
-#: src/wizard.c:1340
+#: src/wizard.c:1152
 msgid "Use SSL to connect to SMTP server"
 msgstr "Använd SSL för att ansluta till SMTP-server"
 
-#: src/wizard.c:1351
-#: src/wizard.c:1630
+#: src/wizard.c:1163 src/wizard.c:1437
 msgid "Use SSL via STARTTLS"
 msgstr "Använd SSL via STARTTLS"
 
-#: src/wizard.c:1363
-#: src/wizard.c:1642
+#: src/wizard.c:1175 src/wizard.c:1449
 msgid "Client SSL certificate (optional)"
 msgstr "Klient SSL-certifikat (frivilligt)"
 
-#: src/wizard.c:1425
-#: src/wizard.c:1450
-#: src/wizard.c:1573
+#: src/wizard.c:1237 src/wizard.c:1262 src/wizard.c:1385
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Server adress:</span>"
 
-#: src/wizard.c:1480
+#: src/wizard.c:1292
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Lokal brevlåda:</span>"
 
-#: src/wizard.c:1540
+#: src/wizard.c:1352
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Server typ:</span>"
 
-#: src/wizard.c:1550
+#: src/wizard.c:1362
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1584
-msgid "You can specify the port number by appending it at the end: \"mail.example.com:110\""
-msgstr "Du kan ange portnummer genom att lägga till det på slutet: \"mail.example.com:110\""
+#: src/wizard.c:1396
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:110\""
+msgstr ""
+"Du kan ange portnummer genom att lägga till det på slutet: \"mail.example."
+"com:110\""
 
-#: src/wizard.c:1589
+#: src/wizard.c:1401
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Användarnamn:</span>"
 
-#: src/wizard.c:1619
+#: src/wizard.c:1426
 msgid "Use SSL to connect to receiving server"
 msgstr "Använd SSL för att ansluta till mottagande server"
 
-#: src/wizard.c:1684
+#: src/wizard.c:1491
 msgid "IMAP server directory:"
 msgstr "IMAP-serverkatalog:"
 
-#: src/wizard.c:1695
+#: src/wizard.c:1502
 msgid "Show only subscribed folders"
 msgstr "Visa endast prenumererade mappar"
 
-#: src/wizard.c:1703
+#: src/wizard.c:1510
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"
@@ -18358,134 +18101,56 @@ msgstr ""
 "<span weight=\"bold\">Varning: denna version av Claws-Mail\n"
 "har byggts utan IMAP-stöd.</span>"
 
-#: src/wizard.c:1823
+#: src/wizard.c:1628
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws-Mails konfigurationsguide"
 
-#: src/wizard.c:1857
+#: src/wizard.c:1662
 msgid "Welcome to Claws Mail"
 msgstr "Välkommen till Claws-Mail"
 
-#: src/wizard.c:1865
+#: src/wizard.c:1670
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
-"We will begin by defining some basic information about you and your most common mail options so that you can start to use Claws Mail in less than five minutes."
+"We will begin by defining some basic information about you and your most "
+"common mail options so that you can start to use Claws Mail in less than "
+"five minutes."
 msgstr ""
 "Välkommen till Claws Mails konfigurationguide.\n"
 "\n"
-"Vi kommer att börja med att bestämma lite information om dig och dina vanligaste e-postinställningar så att du kan börja använda Claws Mail på mindre än fem minuter."
+"Vi kommer att börja med att bestämma lite information om dig och dina "
+"vanligaste e-postinställningar så att du kan börja använda Claws Mail på "
+"mindre än fem minuter."
 
-#: src/wizard.c:1888
+#: src/wizard.c:1683
 msgid "About You"
 msgstr "Om Dig"
 
-#: src/wizard.c:1896
-#: src/wizard.c:1911
-#: src/wizard.c:1926
-#: src/wizard.c:1942
+#: src/wizard.c:1691 src/wizard.c:1706 src/wizard.c:1721 src/wizard.c:1737
 msgid "Bold fields must be completed"
 msgstr "Fetmarkerade fält måste fyllas i"
 
-#: src/wizard.c:1903
+#: src/wizard.c:1698
 msgid "Receiving mail"
 msgstr "Tar emot post"
 
-#: src/wizard.c:1918
+#: src/wizard.c:1713
 msgid "Sending mail"
 msgstr "Skickar post"
 
-#: src/wizard.c:1934
+#: src/wizard.c:1729
 msgid "Saving mail on disk"
 msgstr "Sparar brev på disk"
 
-#: src/wizard.c:1950
+#: src/wizard.c:1745
 msgid "Configuration finished"
 msgstr "Konfigurationen är klar"
 
-#: src/wizard.c:1958
+#: src/wizard.c:1753
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
 "Claws är nu klart att användas.\n"
 "Klicka Spara för att starta."
-
-#~ msgid "`%c' can't be included in folder name."
-#~ msgstr "Ett mappnamn kan inte innehålla '%c'."
-
-#~ msgid "Select ..."
-#~ msgstr "Välj ..."
-
-#~ msgid "The mailbox `%s' already exists."
-#~ msgstr "Brevlådan '%s' finns redan."
-
-#~ msgid "The folder `%s' already exists."
-#~ msgstr "Mappen '%s' finns redan."
-
-#~ msgid "Can't create the folder `%s'."
-#~ msgstr "Kan inte skapa mappen '%s'."
-
-#~ msgid ""
-#~ "Really remove the mailbox `%s' ?\n"
-#~ "(The messages are NOT deleted from the disk)"
-#~ msgstr ""
-#~ "Vill du verkligen ta bort brevlådan '%s'?\n"
-#~ "(Meddelanden kommer INTE att tas bort från disken)"
-
-#~ msgid "Can't remove the folder `%s'."
-#~ msgstr "Kan inte ta bort mappen '%s'."
-
-#~ msgid "Input new name for `%s':"
-#~ msgstr "Ange nytt namn för '%s':"
-
-#, fuzzy
-#~ msgid "Newmail plugin unloaded\n"
-#~ msgstr "%s (insticksmodulen kunde inte laddas)"
-
-#~ msgid ""
-#~ "Cannot load plugin NewMail\n"
-#~ "$HOME is too long\n"
-#~ msgstr ""
-#~ "Kunde inte läsa in insticksmodulen NewMail\n"
-#~ "$HOME är för lång\n"
-
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Utskrift misslyckades:\n"
-#~ " %s"
-
-#~ msgid ""
-#~ "Printing HTML is only possible if the program 'html2ps' is installed."
-#~ msgstr ""
-#~ "Utskrift av HTML är endast möjligt om programmet 'html2ps' är installerat"
-
-#~ msgid "Filename is null."
-#~ msgstr "Filnamn är null."
-
-#~ msgid "Conversion to postscript failed."
-#~ msgstr "Konvertering till postscript misslyckades."
-
-#~ msgid "Printer %s doesn't accept PostScript files."
-#~ msgstr "Skrivaren %s accepterar inte PostScript-filer"
-
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Utskrift misslyckades:\n"
-#~ "%s"
-
-#~ msgid "Navigation to %s blocked"
-#~ msgstr "Navigering till %s blockerad"
-
-#~ msgid "Proxy Setting"
-#~ msgstr "Proxy-inställning"
-
-#~ msgid "Auto-Load images"
-#~ msgstr "Ladda bilder automatiskt"
-
-#~ msgid "Block external content"
-#~ msgstr "Blockera externt innehåll"

-----------------------------------------------------------------------

Summary of changes:
 po/cs.po    | 4594 ++++++++++++++++++--------------------
 po/de.po    | 4021 +++++++++++++++++-----------------
 po/es.po    | 3745 ++++++++++++++++---------------
 po/fr.po    | 4526 ++++++++++++++++++++------------------
 po/he.po    | 5104 ++++++++++++++++++++++---------------------
 po/nl.po    | 5998 ++++++++++++++++++++++++--------------------------
 po/pt_BR.po | 6169 ++++++++++++++++++++-------------------------------
 po/sk.po    | 6008 ++++++++++++++++----------------------------------
 po/sv.po    | 7097 ++++++++++++++++++++++++++++-------------------------------
 9 files changed, 21696 insertions(+), 25566 deletions(-)


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list