[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 "App