update translations

[claws.git] / po / de.po

diff --git a/po/de.po b/po/de.po
index 91944aae7bc018a2952b91f3d7d3074dd535e1a7..cdcaf9da47a90720698580daa77bee54a59cf957 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -2,28 +2,28 @@
 # Copyright © 2002-2014 The Claws Mail team.
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
-# Stephan Sachse <white@dev-zero.com>, 2005-2010
-# Marc Arens <marens@marens.eu>, 2009
-# Thomas Gilgin <thg1@karate-muellheim.de>, 2004, 2005
-# Hubert Gilgin, 2004
-# Jens Oberender <j.obi@troja.net>, 2003, 2004
-# Kilian Krause <kk@verfaction.de>, 2002
+# Stephan Sachse <white@dev-zero.com>, 2005-2010.
+# Marc Arens <marens@marens.eu>, 2009.
+# Thomas Gilgin <thg1@karate-muellheim.de>, 2004, 2005.
+# Hubert Gilgin, 2004.
+# Jens Oberender <j.obi@troja.net>, 2003, 2004.
+# Kilian Krause <kk@verfaction.de>, 2002.
 # Thomas Bellmann <ThomasBellmann@gmx.net>, 2012-2015, 2015.
-# Simon Legner <Simon.Legner@gmail.com>, 2016.
+# Simon Legner <Simon.Legner@gmail.com>, 2016, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"
-"POT-Creation-Date: 2016-11-10 10:48+0000\n"
-"PO-Revision-Date: 2016-11-10 08:30+0200\n"
+"POT-Creation-Date: 2017-03-19 16:13+0100\n"
+"PO-Revision-Date: 2017-03-19 17:11+0100\n"
 "Last-Translator: Simon Legner <Simon.Legner@gmail.com>\n"
-"Language-Team: -\n"
+"Language-Team: English <>\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-Generator: Virtaal 0.7.1\n"
+"X-Generator: Lokalize 2.0\n"
 "X-Poedit-Bookmarks: 2990,1708,-1,2647,2658,2696,2793,-1,-1,-1\n"
 
 # in General: maybe should unify "receive, retrieve" when translating into german.
@@ -31,7 +31,6 @@ msgstr ""
 # what is better:
 # "message body" -> "Textkörper" or "Nachrichtenkörper"?
 # "failed" -> "schlug fehl" or "fehlgeschlagen"?
-#
 #: src/account.c:396 src/account.c:463
 msgid ""
 "Some composing windows are open.\n"
@@ -71,65 +70,65 @@ msgstr "Konten mit ferngelegenen Ordnern sind nicht kopierbar."
 msgid "Copy of %s"
 msgstr "Kopie von %s"
 
-#: src/account.c:1075
+#: src/account.c:1096
 #, 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:1077
+#: src/account.c:1098
 msgid "(Untitled)"
 msgstr "(Unbenannt)"
 
-#: src/account.c:1078
+#: src/account.c:1099
 msgid "Delete account"
 msgstr "Konto löschen"
 
-#: src/account.c:1562
+#: src/account.c:1589
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1568
+#: src/account.c:1595
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Abrufen' holt Nachrichten von den gewählten Konten ab"
 
-#: src/account.c:1575 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7205 src/editaddress.c:1264
+#: src/account.c:1602 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7334 src/editaddress.c:1264
 #: src/editaddress.c:1321 src/editaddress.c:1341
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
 #: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:465
-#: src/plugins/pdf_viewer/poppler_viewer.c:1800
+#: src/plugins/pdf_viewer/poppler_viewer.c:1792
 #: src/plugins/pgpcore/select-keys.c:395 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1866 src/prefs_template.c:79
+#: src/prefs_filtering.c:1868 src/prefs_template.c:79
 msgid "Name"
 msgstr "Name"
 
-#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4141
+#: src/account.c:1610 src/prefs_account.c:1096 src/prefs_account.c:4141
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/account.c:1591 src/ssl_manager.c:100
+#: src/account.c:1618 src/ssl_manager.c:100
 msgid "Server"
 msgstr "Server"
 
-#: src/action.c:382
+#: src/action.c:380
 #, c-format
 msgid "Could not get message file %d"
 msgstr "Nachrichtendatei %d nicht abrufbar"
 
-#: src/action.c:419
+#: src/action.c:418
 msgid "Could not get message part."
 msgstr "Nachrichtenteil ist nicht abrufbar."
 
-#: src/action.c:436
+#: src/action.c:435
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "Teil einer mehrteiligen Nachricht nicht abrufbar: %s"
 
-#: src/action.c:608
+#: src/action.c:607
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -138,11 +137,11 @@ msgstr ""
 "Die gewählte Aktion ist im Editor-Fenster nicht anwendbar,\n"
 "weil sie %%f, %%F, %%as oder %%p enthält."
 
-#: src/action.c:720
+#: src/action.c:719
 msgid "There is no filtering action set"
 msgstr "Es ist keine Filteraktion definiert"
 
-#: src/action.c:722
+#: src/action.c:721
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -151,7 +150,7 @@ msgstr ""
 "Ungültige Filteraktion(en):\n"
 "%s"
 
-#: src/action.c:987
+#: src/action.c:986
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -162,34 +161,34 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:989 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:884
-#: src/plugins/tnef_parse/tnef_parse.c:67
-#: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/action.c:988 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:857
+#: src/plugins/tnef_parse/tnef_parse.c:75
+#: src/plugins/vcalendar/vcal_folder.c:1827
+#: src/plugins/vcalendar/vcal_folder.c:1831
+#: src/plugins/vcalendar/vcal_folder.c:1844
+#: src/plugins/vcalendar/vcal_folder.c:1847 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/action.c:1207 src/action.c:1372
+#: src/action.c:1206 src/action.c:1371
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: src/action.c:1243
+#: src/action.c:1242
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Läuft: %s\n"
 
-#: src/action.c:1247
+#: src/action.c:1246
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Beendet: %s\n"
 
-#: src/action.c:1280
+#: src/action.c:1279
 msgid "Action's input/output"
 msgstr "Ein-/Ausgabe der Aktion"
 
-#: src/action.c:1608
+#: src/action.c:1607
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -200,11 +199,11 @@ msgstr ""
 "('%%h' wird durch das Argument ersetzt)\n"
 "  %s"
 
-#: src/action.c:1613
+#: src/action.c:1612
 msgid "Action's hidden user argument"
 msgstr "Versteckte Benutzerargumente der Aktion"
 
-#: src/action.c:1617
+#: src/action.c:1616
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -215,7 +214,7 @@ msgstr ""
 "('%%u' wird durch das Argument ersetzt)\n"
 "  %s"
 
-#: src/action.c:1622
+#: src/action.c:1621
 msgid "Action's user argument"
 msgstr "Benutzerargument der Aktion"
 
@@ -308,13 +307,13 @@ msgstr ""
 
 #: src/addrcustomattr.c:212 src/addressbook.c:438 src/addressbook.c:466
 #: src/addressbook.c:483 src/edittags.c:272
-#: src/plugins/archive/archiver_gtk.c:1186 src/prefs_actions.c:1090
-#: src/prefs_filtering.c:1693 src/prefs_template.c:1119
+#: src/plugins/archive/archiver_gtk.c:1307 src/prefs_actions.c:1084
+#: src/prefs_filtering.c:1695 src/prefs_template.c:1109
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: src/addrcustomattr.c:213 src/edittags.c:273 src/prefs_actions.c:1091
-#: src/prefs_filtering.c:1694 src/prefs_template.c:1120
+#: src/addrcustomattr.c:213 src/edittags.c:273 src/prefs_actions.c:1085
+#: src/prefs_filtering.c:1696 src/prefs_template.c:1110
 msgid "Delete _all"
 msgstr "_alle Löschen"
 
@@ -324,7 +323,7 @@ msgstr "Standard _wiederherstellen"
 
 #: src/addrcustomattr.c:403
 msgid "Attribute name is not set."
-msgstr "Zusatzangabe nicht benannt."
+msgstr "Zusatzangabe nicht gesetzt."
 
 #: src/addrcustomattr.c:462
 msgctxt "Dialog title"
@@ -345,11 +344,11 @@ msgstr ""
 
 #: src/addrduplicates.c:127
 msgid "Show duplicates in the same book"
-msgstr "Duplikate im selben Buch anzeigen"
+msgstr "Duplikate im selben Adressbuch anzeigen"
 
 #: src/addrduplicates.c:133
 msgid "Show duplicates in different books"
-msgstr "Duplikate aus anderen Büchern anzeigen"
+msgstr "Duplikate aus anderen Adressbüchern anzeigen"
 
 #: src/addrduplicates.c:144
 msgid "Find address book email duplicates"
@@ -370,7 +369,7 @@ msgid "Duplicate email addresses"
 msgstr "Doppelte E-Mailadressen"
 
 #: src/addrduplicates.c:442 src/addressadd.c:227
-#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:434
+#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:526
 msgid "Address"
 msgstr "Adresse"
 
@@ -430,17 +429,17 @@ msgid "_Book"
 msgstr "Adressb_uch"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:586 src/mainwindow.c:512
+#: src/addressbook.c:482 src/compose.c:602 src/mainwindow.c:514
 #: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: src/addressbook.c:407 src/compose.c:591 src/mainwindow.c:515
+#: src/addressbook.c:407 src/compose.c:607 src/mainwindow.c:517
 #: src/messageview.c:212
 msgid "_Tools"
 msgstr "E_xtras"
 
-#: src/addressbook.c:408 src/compose.c:592 src/mainwindow.c:517
+#: src/addressbook.c:408 src/compose.c:608 src/mainwindow.c:519
 #: src/messageview.c:213
 msgid "_Help"
 msgstr "_Hilfe"
@@ -473,14 +472,14 @@ msgstr "Adressbuch _bearbeiten"
 msgid "_Delete book"
 msgstr "Adressbuch _löschen"
 
-#: src/addressbook.c:427 src/compose.c:603
+#: src/addressbook.c:427 src/compose.c:619
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:433
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Save"
 msgstr "_Speichern"
 
-#: src/addressbook.c:428 src/compose.c:607 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:623 src/messageview.c:222
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
@@ -495,13 +494,13 @@ msgid "C_ut"
 msgstr "_Ausschneiden"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:615 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:631 src/mainwindow.c:548 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopieren"
 
 #: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:616 src/plugins/managesieve/sieve_editor.c:97
+#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Einfügen"
 
@@ -545,8 +544,8 @@ msgstr "Duplikate finden..."
 msgid "Edit custom attributes..."
 msgstr "Benutzerdefinierte Angaben..."
 
-#: src/addressbook.c:458 src/compose.c:695 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:709 src/mainwindow.c:815
+#: src/messageview.c:337
 msgid "_About"
 msgstr "Ü_ber"
 
@@ -557,8 +556,8 @@ msgstr "Eintrag ü_berfliegen"
 #: src/addressbook.c:507 src/crash.c:456 src/crash.c:475 src/importldif.c:114
 #: src/plugins/pgpcore/select-keys.c:250 src/plugins/pgpcore/sgpgme.c:143
 #: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:402
-#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:682
-#: src/prefs_themes.c:714 src/prefs_themes.c:715
+#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:782
+#: src/prefs_themes.c:814 src/prefs_themes.c:815
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -663,7 +662,7 @@ msgid "Sources"
 msgstr "Quellen"
 
 #: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
-#: src/toolbar.c:225 src/toolbar.c:2142
+#: src/toolbar.c:268 src/toolbar.c:2441
 msgid "Address book"
 msgstr "Adressbuch"
 
@@ -697,8 +696,8 @@ 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:2916 src/addressbook.c:2942 src/addressbook.c:2949
-#: src/plugins/archive/archiver_prefs.c:329 src/prefs_filtering_action.c:177
-#: src/toolbar.c:415
+#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:177
+#: src/toolbar.c:494
 msgid "Delete"
 msgstr "Löschen"
 
@@ -711,7 +710,7 @@ 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:2928 src/imap_gtk.c:360 src/mh_gtk.c:206
+#: src/addressbook.c:2928 src/imap_gtk.c:370 src/mh_gtk.c:206
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
 msgid "Delete folder"
 msgstr "Ordner löschen"
@@ -823,8 +822,8 @@ msgstr "Adressbuch"
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:348
-#: src/folderview.c:436 src/prefs_account.c:2799 src/prefs_folder_column.c:78
+#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:355
+#: src/folderview.c:443 src/prefs_account.c:2799 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Ordner"
 
@@ -857,12 +856,12 @@ msgstr "Adressbuch"
 #: src/plugins/bsfilter/bsfilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:326
 #: src/plugins/spamassassin/spamassassin.c:117
-#: src/plugins/spamassassin/spamassassin_gtk.c:442
-#: src/plugins/spamassassin/spamassassin_gtk.c:489
-#: src/plugins/spamassassin/spamassassin_gtk.c:612 src/prefs_matcher.c:675
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1618 src/prefs_matcher.c:1625
-#: src/prefs_matcher.c:1633 src/prefs_matcher.c:1635 src/prefs_matcher.c:2519
-#: src/prefs_matcher.c:2523
+#: 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:675
+#: src/prefs_matcher.c:710 src/prefs_matcher.c:1619 src/prefs_matcher.c:1626
+#: src/prefs_matcher.c:1634 src/prefs_matcher.c:1636 src/prefs_matcher.c:2520
+#: src/prefs_matcher.c:2524
 msgid "Any"
 msgstr "Alle"
 
@@ -915,7 +914,7 @@ msgstr "Diese Kopfzeilenfelder bearbeiten"
 msgid "Include subfolders"
 msgstr "Unterordner einbeziehen"
 
-#: src/addrgather.c:450 src/prefs_filtering_action.c:1425
+#: src/addrgather.c:450 src/prefs_filtering_action.c:1426
 msgid "Header Name"
 msgstr "Kopfzeilenname"
 
@@ -965,18 +964,18 @@ msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Fehler bei Aktualisierung. Änderungen nicht ins Verzeichnis geschrieben."
 
-#: src/alertpanel.c:146 src/compose.c:9454
+#: src/alertpanel.c:146 src/compose.c:9625
 msgid "Notice"
 msgstr "Anmerkung"
 
-#: src/alertpanel.c:159 src/compose.c:5689 src/compose.c:6212
-#: src/compose.c:11905 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4802
+#: src/alertpanel.c:159 src/compose.c:5780 src/compose.c:6301
+#: src/compose.c:12048 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:882 src/plugins/pgpcore/sgpgme.c:788
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4893
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5630 src/inc.c:663
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5717 src/inc.c:663
 #: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
 msgid "Error"
 msgstr "Fehler"
@@ -1097,7 +1096,7 @@ msgstr "Ihre Claws Mail-Version ist zu alt für das Plugin '%s'."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Ihre Claws Mail-Version ist zu alt für das Plugin."
 
-#: src/common/session.c:183 src/imap.c:1210
+#: src/common/session.c:183 src/imap.c:1207
 msgid "SSL/TLS handshake failed\n"
 msgstr "SSL/TLS-Verbindung schlug fehl\n"
 
@@ -1130,30 +1129,30 @@ msgstr "Nachricht ist zu groß (Maximalgröße ist %s)\n"
 msgid "couldn't start STARTTLS session\n"
 msgstr "STARTTLS-Sitzung kann nicht gestartet werden\n"
 
-#: src/common/socket.c:569
+#: src/common/socket.c:571
 msgid "Socket IO timeout.\n"
 msgstr "Socket I/O-Zeitüberschreitung\n"
 
-#: src/common/socket.c:598
+#: src/common/socket.c:600
 msgid "Connection timed out.\n"
 msgstr "Verbindung abgelaufen.\n"
 
-#: src/common/socket.c:732
+#: src/common/socket.c:734
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: Verbindung schlug fehl (%s).\n"
 
-#: src/common/socket.c:972
+#: src/common/socket.c:974
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: unbekannter Host.\n"
 
-#: src/common/socket.c:1064
+#: src/common/socket.c:1066
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: Auflösen des Hosts schlug fehl (%s).\n"
 
-#: src/common/socket.c:1368
+#: src/common/socket.c:1370
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "schreibe auf fd%d: %s\n"
@@ -1243,582 +1242,582 @@ msgstr "<nicht im Zertifikat>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Betreff gelöscht durch RegExp)"
 
-#: src/common/utils.c:259
+#: src/common/utils.c:256
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
-#: src/common/utils.c:260
+#: src/common/utils.c:257
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dKB"
 
-#: src/common/utils.c:261
+#: src/common/utils.c:258
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMB"
 
-#: src/common/utils.c:262
+#: src/common/utils.c:259
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4764
+#: src/common/utils.c:4759
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: src/common/utils.c:4765
+#: src/common/utils.c:4760
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Montag"
 
-#: src/common/utils.c:4766
+#: src/common/utils.c:4761
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: src/common/utils.c:4767
+#: src/common/utils.c:4762
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: src/common/utils.c:4768
+#: src/common/utils.c:4763
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: src/common/utils.c:4769
+#: src/common/utils.c:4764
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Freitag"
 
-#: src/common/utils.c:4770
+#: src/common/utils.c:4765
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Samstag"
 
-#: src/common/utils.c:4772
+#: src/common/utils.c:4767
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Januar"
 
-#: src/common/utils.c:4773
+#: src/common/utils.c:4768
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Februar"
 
-#: src/common/utils.c:4774
+#: src/common/utils.c:4769
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "März"
 
-#: src/common/utils.c:4775
+#: src/common/utils.c:4770
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "April"
 
-#: src/common/utils.c:4776
+#: src/common/utils.c:4771
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4777
+#: src/common/utils.c:4772
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Juni"
 
-#: src/common/utils.c:4778
+#: src/common/utils.c:4773
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Juli"
 
-#: src/common/utils.c:4779
+#: src/common/utils.c:4774
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "August"
 
-#: src/common/utils.c:4780
+#: src/common/utils.c:4775
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "September"
 
-#: src/common/utils.c:4781
+#: src/common/utils.c:4776
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Oktober"
 
-#: src/common/utils.c:4782
+#: src/common/utils.c:4777
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "November"
 
-#: src/common/utils.c:4783
+#: src/common/utils.c:4778
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Dezember"
 
-#: src/common/utils.c:4785
+#: src/common/utils.c:4780
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "So"
 
-#: src/common/utils.c:4786
+#: src/common/utils.c:4781
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Mo"
 
-#: src/common/utils.c:4787
+#: src/common/utils.c:4782
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Di"
 
-#: src/common/utils.c:4788
+#: src/common/utils.c:4783
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mi"
 
-#: src/common/utils.c:4789
+#: src/common/utils.c:4784
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Do"
 
-#: src/common/utils.c:4790
+#: src/common/utils.c:4785
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Fr"
 
-#: src/common/utils.c:4791
+#: src/common/utils.c:4786
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sa"
 
-#: src/common/utils.c:4793
+#: src/common/utils.c:4788
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:4794
+#: src/common/utils.c:4789
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:4795
+#: src/common/utils.c:4790
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mrz"
 
-#: src/common/utils.c:4796
+#: src/common/utils.c:4791
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Apr"
 
-#: src/common/utils.c:4797
+#: src/common/utils.c:4792
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4798
+#: src/common/utils.c:4793
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4799
+#: src/common/utils.c:4794
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:4800
+#: src/common/utils.c:4795
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aug"
 
-#: src/common/utils.c:4801
+#: src/common/utils.c:4796
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4802
+#: src/common/utils.c:4797
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Okt"
 
-#: src/common/utils.c:4803
+#: src/common/utils.c:4798
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4804
+#: src/common/utils.c:4799
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dez"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4810
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4811
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4812
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4813
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/compose.c:575
+#: src/compose.c:591
 msgid "_Add..."
 msgstr "_Hinzufügen..."
 
-#: src/compose.c:576 src/mh_gtk.c:367 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:592 src/mh_gtk.c:377 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:316
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: src/compose.c:578 src/folderview.c:247
+#: src/compose.c:594 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Eigenschaften..."
 
-#: src/compose.c:585 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:516 src/messageview.c:211
 msgid "_Message"
 msgstr "_Nachricht"
 
-#: src/compose.c:588
+#: src/compose.c:604
 msgid "_Spelling"
 msgstr "_Rechtschreibung"
 
-#: src/compose.c:590 src/compose.c:657
+#: src/compose.c:606 src/compose.c:673
 msgid "_Options"
 msgstr "_Optionen"
 
-#: src/compose.c:594
+#: src/compose.c:610
 msgid "S_end"
 msgstr "S_enden"
 
-#: src/compose.c:595
+#: src/compose.c:611
 msgid "Send _later"
 msgstr "Später senden"
 
-#: src/compose.c:598
+#: src/compose.c:614
 msgid "_Attach file"
 msgstr "Datei anhängen"
 
-#: src/compose.c:599
+#: src/compose.c:615
 msgid "_Insert file"
 msgstr "Datei einfügen"
 
-#: src/compose.c:600
+#: src/compose.c:616
 msgid "Insert si_gnature"
 msgstr "Si_gnatur anfügen"
 
-#: src/compose.c:601
+#: src/compose.c:617
 msgid "_Replace signature"
 msgstr "Signatur E_rsetzen"
 
-#: src/compose.c:605
+#: src/compose.c:621
 msgid "_Print"
 msgstr "Drucken"
 
-#: src/compose.c:610 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:626 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Rückgängig"
 
-#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:627 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Wiederholen"
 
-#: src/compose.c:614 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:630 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
-#: src/compose.c:618
+#: src/compose.c:634
 msgid "_Special paste"
 msgstr "_Spezielles Einfügen"
 
-#: src/compose.c:619
+#: src/compose.c:635
 msgid "As _quotation"
 msgstr "als _Zitat"
 
-#: src/compose.c:620
+#: src/compose.c:636
 msgid "_Wrapped"
 msgstr "mit _Umbruch"
 
-#: src/compose.c:621
+#: src/compose.c:637
 msgid "_Unwrapped"
 msgstr "_ohne Umbruch"
 
-#: src/compose.c:623 src/mainwindow.c:547
+#: src/compose.c:639 src/mainwindow.c:549
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Alles auswählen"
 
-#: src/compose.c:625
+#: src/compose.c:641
 msgid "A_dvanced"
 msgstr "Erweitert"
 
-#: src/compose.c:626
+#: src/compose.c:642
 msgid "Move a character backward"
 msgstr "Ein Zeichen rückwärts"
 
-#: src/compose.c:627
+#: src/compose.c:643
 msgid "Move a character forward"
 msgstr "Ein Zeichen vorwärts"
 
-#: src/compose.c:628
+#: src/compose.c:644
 msgid "Move a word backward"
 msgstr "Ein Wort rückwärts"
 
-#: src/compose.c:629
+#: src/compose.c:645
 msgid "Move a word forward"
 msgstr "Ein Wort vorwärts"
 
-#: src/compose.c:630
+#: src/compose.c:646
 msgid "Move to beginning of line"
 msgstr "Zum Zeilenanfang"
 
-#: src/compose.c:631
+#: src/compose.c:647
 msgid "Move to end of line"
 msgstr "Zum Zeilenende"
 
-#: src/compose.c:632
+#: src/compose.c:648
 msgid "Move to previous line"
 msgstr "Zur vorigen Zeile"
 
-#: src/compose.c:633
+#: src/compose.c:649
 msgid "Move to next line"
 msgstr "Zur nächsten Zeile"
 
-#: src/compose.c:634
+#: src/compose.c:650
 msgid "Delete a character backward"
 msgstr "Ein Zeichen rückwärts löschen"
 
-#: src/compose.c:635
+#: src/compose.c:651
 msgid "Delete a character forward"
 msgstr "Ein Zeichen vorwärts löschen"
 
-#: src/compose.c:636
+#: src/compose.c:652
 msgid "Delete a word backward"
 msgstr "Ein Wort rückwärts löschen"
 
-#: src/compose.c:637
+#: src/compose.c:653
 msgid "Delete a word forward"
 msgstr "Ein Wort vorwärts löschen"
 
-#: src/compose.c:638
+#: src/compose.c:654
 msgid "Delete line"
 msgstr "Zeile löschen"
 
-#: src/compose.c:639
+#: src/compose.c:655
 msgid "Delete to end of line"
 msgstr "Bis zum Ende der Zeile löschen"
 
-#: src/compose.c:642 src/messageview.c:228
+#: src/compose.c:658 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Suchen"
 
-#: src/compose.c:645
+#: src/compose.c:661
 msgid "_Wrap current paragraph"
 msgstr "Aktuellen Absatz _umbrechen"
 
-#: src/compose.c:646
+#: src/compose.c:662
 msgid "Wrap all long _lines"
 msgstr "Alle _langen Zeilen umbrechen"
 
-#: src/compose.c:648
+#: src/compose.c:664
 msgid "Edit with e_xternal editor"
 msgstr "Mit e_xternem Editor bearbeiten"
 
-#: src/compose.c:651
+#: src/compose.c:667
 msgid "_Check all or check selection"
 msgstr "Alles oder markierte Auswahl _prüfen"
 
-#: src/compose.c:652
+#: src/compose.c:668
 msgid "_Highlight all misspelled words"
 msgstr "Alle _Schreibfehler hervorheben"
 
-#: src/compose.c:653
+#: src/compose.c:669
 msgid "Check _backwards misspelled word"
 msgstr "_Rechtschreibung rückwärts prüfen"
 
-#: src/compose.c:654
+#: src/compose.c:670
 msgid "_Forward to next misspelled word"
 msgstr "_Nächstes falsch geschriebenes Wort"
 
-#: src/compose.c:662
+#: src/compose.c:677
 msgid "Reply _mode"
 msgstr "Antwortmodus"
 
-#: src/compose.c:664
+#: src/compose.c:679
 msgid "Privacy _System"
 msgstr "Datenschutz_system"
 
-#: src/compose.c:669
+#: src/compose.c:683
 msgid "_Priority"
 msgstr "_Priorität"
 
-#: src/compose.c:671 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:685 src/mainwindow.c:611 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "Zei_chenkodierung"
 
-#: src/compose.c:676 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:690 src/mainwindow.c:616 src/messageview.c:269
 msgid "Western European"
 msgstr "Westeuropäisch"
 
-#: src/compose.c:677 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:691 src/mainwindow.c:617 src/messageview.c:270
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: src/compose.c:678 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:692 src/mainwindow.c:618 src/messageview.c:271
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: src/compose.c:679 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:693 src/mainwindow.c:619 src/messageview.c:272
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: src/compose.c:680 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:694 src/mainwindow.c:620 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "Kyrillisch"
 
-#: src/compose.c:681 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:695 src/mainwindow.c:621 src/messageview.c:274
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: src/compose.c:682 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:696 src/mainwindow.c:622 src/messageview.c:275
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: src/compose.c:683 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:697 src/mainwindow.c:623 src/messageview.c:276
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: src/compose.c:684 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:698 src/mainwindow.c:624 src/messageview.c:277
 msgid "Thai"
 msgstr "Thailändisch"
 
-#: src/compose.c:687 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:701 src/mainwindow.c:734 src/messageview.c:313
 msgid "_Address book"
 msgstr "_Adressbuch"
 
-#: src/compose.c:689
+#: src/compose.c:703
 msgid "_Template"
 msgstr "Vorlage"
 
-#: src/compose.c:691 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:705 src/mainwindow.c:762 src/messageview.c:333
 msgid "Actio_ns"
 msgstr "A_ktionen"
 
-#: src/compose.c:700
+#: src/compose.c:714
 msgid "Aut_o wrapping"
 msgstr "Aut_omatisch umbrechen"
 
-#: src/compose.c:701
+#: src/compose.c:715
 msgid "Auto _indent"
 msgstr "Automa_tisch einrücken"
 
-#: src/compose.c:702
+#: src/compose.c:716
 msgid "Si_gn"
 msgstr "Unterzeichnen"
 
-#: src/compose.c:703
+#: src/compose.c:717
 msgid "_Encrypt"
 msgstr "Verschlüsseln"
 
-#: src/compose.c:704
+#: src/compose.c:718
 msgid "_Request Return Receipt"
 msgstr "Empfangsbestätigung anfordern"
 
-#: src/compose.c:705
+#: src/compose.c:719
 msgid "Remo_ve references"
 msgstr "_Referenzen entfernen"
 
-#: src/compose.c:706
+#: src/compose.c:720
 msgid "Show _ruler"
 msgstr "_Lineal anzeigen"
 
-#: src/compose.c:711 src/compose.c:721
+#: src/compose.c:725 src/compose.c:735
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:712 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:726 src/mainwindow.c:665 src/messageview.c:302
 msgid "_All"
 msgstr "_Alle"
 
-#: src/compose.c:713 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:727 src/mainwindow.c:666 src/messageview.c:303
 msgid "_Sender"
 msgstr "Absender"
 
-#: src/compose.c:714
+#: src/compose.c:728
 msgid "_Mailing-list"
 msgstr "_Mailingliste"
 
-#: src/compose.c:719
+#: src/compose.c:733
 msgid "_Highest"
 msgstr "S_ehr hoch"
 
-#: src/compose.c:720
+#: src/compose.c:734
 msgid "Hi_gh"
 msgstr "_Hoch"
 
-#: src/compose.c:722
+#: src/compose.c:736
 msgid "Lo_w"
 msgstr "_Gering"
 
-#: src/compose.c:723
+#: src/compose.c:737
 msgid "_Lowest"
 msgstr "_Sehr gering"
 
-#: src/compose.c:728 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:742 src/mainwindow.c:880 src/messageview.c:350
 msgid "_Automatic"
 msgstr "_Automatisch"
 
-#: src/compose.c:729 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:743 src/mainwindow.c:881 src/messageview.c:351
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:730 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:744 src/mainwindow.c:882 src/messageview.c:352
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:734 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:748 src/mainwindow.c:886 src/messageview.c:356
 msgid "Central European (ISO-8859-_2)"
 msgstr "Mitteleuropäisch (ISO-8859-_2)"
 
-#: src/compose.c:737 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:751 src/mainwindow.c:889 src/messageview.c:359
 msgid "Greek (ISO-8859-_7)"
 msgstr "Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:742 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:756 src/mainwindow.c:894 src/messageview.c:364
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Türkisch (ISO-8859-_9)"
 
-#: src/compose.c:1071
+#: src/compose.c:1085
 msgid "New message From format error."
 msgstr "Neue Nachricht hat Formatierungsfehler in 'Von'."
 
-#: src/compose.c:1163
+#: src/compose.c:1177
 msgid "New message subject format error."
 msgstr "Neue Nachricht hat Formatierungsfehler im Betreff."
 
-#: src/compose.c:1194 src/quote_fmt.c:570
+#: src/compose.c:1208 src/quote_fmt.c:570
 #, 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:1455
+#: src/compose.c:1469
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr ""
 "Keine Antwort möglich. Die ursprüngliche E-Mail gibt es vermutlich nicht."
 
-#: src/compose.c:1638 src/quote_fmt.c:587
+#: src/compose.c:1652 src/quote_fmt.c:587
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
@@ -1826,12 +1825,12 @@ msgstr ""
 "Das \"Von\"-Feld der \"Antworten\"-Vorlage enthält eine ungültige E-"
 "Mailadresse."
 
-#: src/compose.c:1686 src/quote_fmt.c:590
+#: src/compose.c:1700 src/quote_fmt.c:590
 #, 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:1822 src/compose.c:2014 src/quote_fmt.c:607
+#: src/compose.c:1834 src/compose.c:2025 src/quote_fmt.c:607
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1839,56 +1838,56 @@ msgstr ""
 "Das \"Von\" Feld der \"Weiterleiten\"-Vorlage enthält eine ungültige E-"
 "Mailadresse."
 
-#: src/compose.c:1882 src/quote_fmt.c:610
+#: src/compose.c:1894 src/quote_fmt.c:610
 #, 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:2056
+#: src/compose.c:2067
 msgid "Fw: multiple emails"
 msgstr "Fw: mehrere E-Mails"
 
-#: src/compose.c:2539
+#: src/compose.c:2569
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Der Körper der \"Umleiten\"-Vorlage hat einen Fehler in Zeile %d."
 
-#: src/compose.c:2606 src/gtk/headers.h:14
+#: src/compose.c:2636 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2609 src/gtk/headers.h:15
+#: src/compose.c:2639 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2612 src/gtk/headers.h:12
+#: src/compose.c:2642 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
-#: src/compose.c:2615 src/compose.c:4948 src/compose.c:4950
+#: src/compose.c:2645 src/compose.c:4963 src/compose.c:4965
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Newsgruppen:"
 
-#: src/compose.c:2618 src/gtk/headers.h:34
+#: src/compose.c:2648 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Followup an:"
 
-#: src/compose.c:2621 src/gtk/headers.h:17
+#: src/compose.c:2651 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "In-Reply-To:"
 
-#: src/compose.c:2625 src/compose.c:4945 src/compose.c:4953
-#: src/gtk/headers.h:13 src/summary_search.c:433
+#: src/compose.c:2655 src/compose.c:4960 src/compose.c:4968
+#: src/gtk/headers.h:13 src/summary_search.c:481
 msgid "To:"
 msgstr "An:"
 
-#: src/compose.c:2834
+#: src/compose.c:2841
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Datei konnte nicht angehängt werden (Zeichensatzkonvertierung schlug fehl)."
 
-#: src/compose.c:2840
+#: src/compose.c:2847
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1903,16 +1902,16 @@ msgstr[1] ""
 "Die folgenden Dateien wurden angehängt: \n"
 "%s"
 
-#: src/compose.c:3115
+#: src/compose.c:3124
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Das \"Zitatzeichen\" der Vorlage ist ungültig."
 
-#: src/compose.c:3615
+#: src/compose.c:3630
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Die Größe der Datei '%s' ist nicht ermittelbar."
 
-#: src/compose.c:3626
+#: src/compose.c:3641
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1921,57 +1920,57 @@ msgstr ""
 "Sie sind dabei eine %s große Datei in den Nachrichtenkörper einzufügen. "
 "Möchten Sie das wirklich tun?"
 
-#: src/compose.c:3629
+#: src/compose.c:3644
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
-#: src/compose.c:3630 src/compose.c:10510 src/compose.c:11386
+#: src/compose.c:3645 src/compose.c:10651 src/compose.c:11527
 msgid "_Insert"
 msgstr "Einfügen"
 
-#: src/compose.c:3754
+#: src/compose.c:3769
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:3755
+#: src/compose.c:3770
 msgid "Empty file"
 msgstr "Leere Datei"
 
-#: src/compose.c:3756
+#: src/compose.c:3771
 msgid "_Attach anyway"
 msgstr "Trotzdem _anhängen"
 
-#: src/compose.c:3765
+#: src/compose.c:3780
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:3792
+#: src/compose.c:3807
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:4785 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4800 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Bearbeitet]"
 
-#: src/compose.c:4792 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4807 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Nachricht verfassen%s"
 
-#: src/compose.c:4795 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4810 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[kein Betreff] - Nachricht verfassen%s"
 
-#: src/compose.c:4797 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4812 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Nachricht verfassen"
 
-#: src/compose.c:4824 src/messageview.c:889
+#: src/compose.c:4839 src/messageview.c:903
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1979,51 +1978,57 @@ msgstr ""
 "Kein Konto zum Versenden von E-Mails angegeben.\n"
 "Bitte wählen Sie einen E-Mail-Konto vor dem Senden."
 
-#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5118
-#: src/prefs_account.c:3323 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5060 src/compose.c:5097
+#, c-format
+msgid "The only recipient is the default '%s' address. Send anyway?"
+msgstr "Der einzige Empfänger ist die Standard-Adresse '%s'. Trotzdem senden?"
+
+#: src/compose.c:5062 src/compose.c:5099 src/compose.c:5142 src/compose.c:5190
+#: src/prefs_account.c:3323 src/toolbar.c:484 src/toolbar.c:516
 msgid "Send"
 msgstr "Senden"
 
-#: src/compose.c:5045
-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:5046 src/compose.c:5078 src/compose.c:5111 src/compose.c:5631
-#: src/folderview.c:2462 src/messageview.c:855 src/messageview.c:872
-#: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
+#: src/compose.c:5064 src/compose.c:5101 src/compose.c:5135 src/compose.c:5183
+#: src/compose.c:5718 src/folderview.c:2543 src/messageview.c:856
+#: src/messageview.c:884 src/plugins/attachwarner/attachwarner.c:210
+#: src/toolbar.c:2933
 msgid "_Send"
 msgstr "_Senden"
 
-#: src/compose.c:5077
-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:5094
+#: src/compose.c:5118
 msgid "Recipient is not specified."
 msgstr "Kein Empfänger angegeben."
 
-#: src/compose.c:5113 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5137 src/compose.c:5185
+#: src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_Postausgang"
 
-#: src/compose.c:5114
+#: src/compose.c:5138
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Betreff ist leer. %s"
 
-#: src/compose.c:5115 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5139 src/compose.c:5187
+#: src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Trotzdem senden?"
 
-#: src/compose.c:5116 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5140 src/compose.c:5188
+#: src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Trotzdem vorspeichern?"
 
-#: src/compose.c:5118 src/toolbar.c:425
+#: src/compose.c:5142 src/compose.c:5190 src/toolbar.c:517
 msgid "Send later"
 msgstr "Später senden"
 
-#: src/compose.c:5171 src/compose.c:9974
+#: src/compose.c:5186
+#, c-format
+msgid "Sending to %d recipients. %s"
+msgstr "Sende an %d Empfänger. %s"
+
+#: src/compose.c:5243 src/compose.c:10123
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2033,7 +2038,7 @@ msgstr ""
 "\n"
 "Zeichensatz-Konvertierung schlug fehl."
 
-#: src/compose.c:5174 src/compose.c:9977
+#: src/compose.c:5246 src/compose.c:10126
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2043,7 +2048,7 @@ msgstr ""
 "\n"
 "Schlüssel des Empfängers nicht erhältlich."
 
-#: src/compose.c:5180 src/compose.c:9971
+#: src/compose.c:5252 src/compose.c:10120
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2054,7 +2059,7 @@ msgstr ""
 "\n"
 "Fehler bei digitaler Signatur: %s"
 
-#: src/compose.c:5183
+#: src/compose.c:5255
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2065,11 +2070,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5185
+#: src/compose.c:5257
 msgid "Could not queue message for sending."
 msgstr "Nachricht konnte nicht zum Senden vorgespeichert werden."
 
-#: src/compose.c:5200 src/compose.c:5260
+#: src/compose.c:5272 src/compose.c:5332
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2078,7 +2083,7 @@ msgstr ""
 "gesendet. Benutzen Sie 'Ausgehende Nachrichten senden'\n"
 "aus dem Hauptmenü zum Wiederholen."
 
-#: src/compose.c:5256
+#: src/compose.c:5328
 #, c-format
 msgid ""
 "%s\n"
@@ -2088,7 +2093,7 @@ msgstr ""
 "Benutzen Sie \"Vorgespeicherte Nachrichten senden\" vom Hauptfenster zum "
 "Wiederholen."
 
-#: src/compose.c:5627
+#: src/compose.c:5714
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2099,7 +2104,7 @@ msgstr ""
 "spezifizierten Zeichensatz %s konvertiert werden.\n"
 "Als %s senden?"
 
-#: src/compose.c:5685
+#: src/compose.c:5776
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2112,100 +2117,104 @@ msgstr ""
 "\n"
 "Trotzdem senden?"
 
-#: src/compose.c:5796
+#: src/compose.c:5887
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "E-Mail konnte nicht verschlüsselt werden: %s"
 
-#: src/compose.c:5917
+#: src/compose.c:6008
 msgid "Encryption warning"
 msgstr "Verschlüsselungshinweis"
 
-#: src/compose.c:5918
+#: src/compose.c:6009
 msgid "C_ontinue"
 msgstr "F_ortfahren"
 
-#: src/compose.c:5967
+#: src/compose.c:6058
 msgid "No account for sending mails available!"
 msgstr "Kein Konto zum Versenden von E-Mails vorhanden!"
 
-#: src/compose.c:5976
+#: src/compose.c:6067
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Gewähltes Konto ist nicht NNTP: Absenden schlug fehl."
 
-#: src/compose.c:6211
+#: src/compose.c:6300
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Der Anhang %s existiert nicht mehr. Ignorieren?"
 
-#: src/compose.c:6212 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6301 src/mainwindow.c:656 src/toolbar.c:274 src/toolbar.c:2466
 msgid "Cancel sending"
 msgstr "Senden abbrechen"
 
-#: src/compose.c:6212
+#: src/compose.c:6301
 msgid "Ignore attachment"
 msgstr "Anhang ignorieren"
 
 # Maybe not completely correct translated but I could not get the context...
-#: src/compose.c:6252
+#: src/compose.c:6341
 #, c-format
 msgid "Original %s part"
 msgstr "Originaler %s-Teil"
 
-#: src/compose.c:6813
+#: src/compose.c:6942
 msgid "Add to address _book"
 msgstr "Zum Adress_buch hinzufügen"
 
-#: src/compose.c:6974
+#: src/compose.c:7103
 msgid "Delete entry contents"
 msgstr "Inhalt des Eintrags löschen"
 
-#: src/compose.c:6978 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7107 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Mit <tab> automatisch aus dem Adressbuch vervollständigen"
 
-#: src/compose.c:7193
+#: src/compose.c:7322
 msgid "Mime type"
 msgstr "MIME-Typ"
 
-#: src/compose.c:7199 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
-#: src/prefs_matcher.c:630 src/prefs_summaries.c:434
-#: src/prefs_summary_column.c:85 src/summaryview.c:444
+#: src/compose.c:7328 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
+#: src/prefs_matcher.c:630 src/prefs_summaries.c:442
+#: src/prefs_summary_column.c:85 src/summaryview.c:446
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:7262
+#: src/compose.c:7391
 msgid "Save Message to "
 msgstr "Nachricht speichern unter "
 
-#: src/compose.c:7299 src/editjpilot.c:276 src/editldap.c:519
+#: src/compose.c:7428 src/editjpilot.c:276 src/editldap.c:519
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
-#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1025
+#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1075
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
-#: src/plugins/clamd/clamav_plugin_gtk.c:299
-#: src/plugins/spamassassin/spamassassin_gtk.c:417
+#: src/plugins/clamd/clamav_plugin_gtk.c:300
+#: src/plugins/spamassassin/spamassassin_gtk.c:418
 msgid "_Browse"
 msgstr "_Durchsuchen"
 
-#: src/compose.c:7772
+#: src/compose.c:7450
+msgid "Select folder to save message to"
+msgstr "Ordner für das Speichern der Nachricht wählen"
+
+#: src/compose.c:7907
 msgid "Hea_der"
 msgstr "_Kopfzeile"
 
-#: src/compose.c:7777
+#: src/compose.c:7912
 msgid "_Attachments"
 msgstr "_Anhänge"
 
-#: src/compose.c:7791
+#: src/compose.c:7926
 msgid "Othe_rs"
 msgstr "_Weiteres"
 
-#: src/compose.c:7806
+#: src/compose.c:7941
 msgid "S_ubject:"
 msgstr "B_etreff:"
 
-#: src/compose.c:8030
+#: src/compose.c:8165
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2214,19 +2223,19 @@ msgstr ""
 "Rechtschreibprüfung konnte nicht gestartet werden.\n"
 "%s"
 
-#: src/compose.c:8169
+#: src/compose.c:8312
 msgid "_From:"
 msgstr "V_on:"
 
-#: src/compose.c:8186
+#: src/compose.c:8329
 msgid "Account to use for this email"
 msgstr "Für diese E-Mail zu verwendendes Konto"
 
-#: src/compose.c:8188
+#: src/compose.c:8331
 msgid "Sender address to be used"
 msgstr "Zu benutzende Absenderadresse"
 
-#: src/compose.c:8354
+#: src/compose.c:8497
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2235,68 +2244,50 @@ 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:8455 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8598 src/plugins/archive/archiver_gtk.c:1174
 msgid "_None"
 msgstr "_Keines"
 
-#: src/compose.c:8556 src/prefs_template.c:760
+#: src/compose.c:8699 src/prefs_template.c:750
 #, 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:8672
-msgid "Template From format error."
-msgstr "Formatierungsfehler in Von-Vorlage."
-
-#: src/compose.c:8690
-msgid "Template To format error."
-msgstr "Formatierungsfehler in An-Vorlage."
-
-#: src/compose.c:8708
-msgid "Template Cc format error."
-msgstr "Formatierungsfehler in Cc-Vorlage."
-
-#: src/compose.c:8726
-msgid "Template Bcc format error."
-msgstr "Formatierungsfehler in Bcc-Vorlage."
-
-#: src/compose.c:8744
-msgid "Template Reply-To format error."
-msgstr "Formatierungsfehler in Reply-to-Vorlage."
-
-#: src/compose.c:8763
-msgid "Template subject format error."
-msgstr "Formatierungsfehler in Betreff-Vorlage."
+#: src/compose.c:8794
+#, c-format
+msgctxt "'%s' stands for a header name"
+msgid "Template '%s' format error."
+msgstr "Formatierungsfehler in '%s'-Vorlage."
 
-#: src/compose.c:9032
+#: src/compose.c:9195
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME-Typ."
 
-#: src/compose.c:9047
+#: src/compose.c:9210
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:9121
+#: src/compose.c:9284
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:9138
+#: src/compose.c:9301
 msgid "MIME type"
 msgstr "MIME-Typ"
 
-#: src/compose.c:9179
+#: src/compose.c:9342
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:9199
+#: src/compose.c:9362
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:9200
+#: src/compose.c:9363
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:9451
+#: src/compose.c:9622
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2307,15 +2298,15 @@ msgstr ""
 "Prozess beenden?\n"
 "Prozessgruppen-ID: %d"
 
-#: src/compose.c:9940 src/messageview.c:1083
+#: src/compose.c:10089 src/messageview.c:1105
 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:9966
+#: src/compose.c:10115
 msgid "Could not queue message."
 msgstr "Nachricht konnte nicht vorgespeichert werden."
 
-#: src/compose.c:9968
+#: src/compose.c:10117
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2325,15 +2316,15 @@ msgstr ""
 "Nachricht konnte nicht vorgespeichert werden\n"
 "%s."
 
-#: src/compose.c:10146
+#: src/compose.c:10295
 msgid "Could not save draft."
 msgstr "Entwurf konnte nicht gespeichert werden."
 
-#: src/compose.c:10150
+#: src/compose.c:10299
 msgid "Could not save draft"
 msgstr "Entwurf konnte nicht gespeichert werden"
 
-#: src/compose.c:10151
+#: src/compose.c:10300
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2341,24 +2332,24 @@ msgstr ""
 "Entwurf konnte nicht gespeichert werden.\n"
 "Möchten Sie das Beenden zurücknehmen oder die Nachricht verwerfen?"
 
-#: src/compose.c:10153
+#: src/compose.c:10302
 msgid "_Cancel exit"
 msgstr "Beenden _zurücknehmen"
 
-#: src/compose.c:10153
+#: src/compose.c:10302
 msgid "_Discard email"
 msgstr "_Nachricht verwerfen"
 
-#: src/compose.c:10313 src/compose.c:10327
+#: src/compose.c:10462 src/compose.c:10476
 msgid "Select file"
 msgstr "Datei auswählen"
 
-#: src/compose.c:10341
+#: src/compose.c:10490
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Datei '%s' konnte nicht gelesen werden."
 
-#: src/compose.c:10343
+#: src/compose.c:10492
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2367,50 +2358,50 @@ msgstr ""
 "Die Datei '%s' enthält ungültige Zeichen\n"
 "für die aktuelle Kodierung, Einfügung kann fehlerhaft sein."
 
-#: src/compose.c:10430
+#: src/compose.c:10571
 msgid "Discard message"
 msgstr "Nachricht verwerfen"
 
-#: src/compose.c:10431
+#: src/compose.c:10572
 msgid "This message has been modified. Discard it?"
 msgstr "Diese Nachricht wurde geändert. Verwerfen?"
 
-#: src/compose.c:10432 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10573 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Verwerfen"
 
-#: src/compose.c:10432 src/compose.c:10436
+#: src/compose.c:10573 src/compose.c:10577
 msgid "_Save to Drafts"
 msgstr "Entwurf _speichern"
 
-#: src/compose.c:10434 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10575 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Änderungen speichern"
 
-#: src/compose.c:10435
+#: src/compose.c:10576
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Diese Nachricht wurde geändert. Die letzten Änderungen speichern?"
 
-#: src/compose.c:10436
+#: src/compose.c:10577
 msgid "_Don't save"
 msgstr "_Nicht Speichern"
 
-#: src/compose.c:10507
+#: src/compose.c:10648
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Möchten Sie die Vorlage '%s' anwenden?"
 
-#: src/compose.c:10509
+#: src/compose.c:10650
 msgid "Apply template"
 msgstr "Vorlage anwenden"
 
-#: src/compose.c:10510 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1050
+#: src/compose.c:10651 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/prefs_filtering.c:477 src/prefs_matcher.c:774 src/prefs_template.c:311
+#: src/prefs_toolbar.c:1063
 msgid "_Replace"
 msgstr "Ersetzen"
 
-#: src/compose.c:11379
+#: src/compose.c:11520
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2425,20 +2416,20 @@ msgstr[1] ""
 "Wollen Sie den Inhalt von %d Dateien in den Nachrichtenkörper einfügen oder "
 "an die Nachricht anhängen?"
 
-#: src/compose.c:11385
+#: src/compose.c:11526
 msgid "Insert or attach?"
 msgstr "Einfügen oder Anhängen?"
 
-#: src/compose.c:11386
+#: src/compose.c:11527
 msgid "_Attach"
 msgstr "_Anhang"
 
-#: src/compose.c:11604
+#: src/compose.c:11745
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Zitat-Formatierungsfehler in Zeile %d."
 
-#: src/compose.c:11899
+#: src/compose.c:12042
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2469,7 +2460,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Fehlerprotokoll"
 
-#: src/crash.c:251 src/toolbar.c:422
+#: src/crash.c:251 src/toolbar.c:534
 msgid "Close"
 msgstr "Schließen"
 
@@ -2551,7 +2542,7 @@ msgstr "Es muss eine E-Mail-Adresse angegeben werden."
 msgid "A Name and Value must be supplied."
 msgstr "Es müssen ein Name und ein Feldwert angegeben sein."
 
-#: src/editaddress.c:675 src/prefs_folder_item.c:1679
+#: src/editaddress.c:675 src/prefs_folder_item.c:1694
 msgid "Discard"
 msgstr "Verwerfen"
 
@@ -2707,12 +2698,12 @@ msgstr "Ordner bearbeiten"
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen des Ordners ein:"
 
-#: src/editgroup.c:556 src/foldersel.c:586 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/editgroup.c:556 src/foldersel.c:594 src/imap_gtk.c:193 src/mh_gtk.c:144
 #: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:91
 msgid "New folder"
 msgstr "Neuer Ordner"
 
-#: src/editgroup.c:557 src/foldersel.c:587 src/mh_gtk.c:145
+#: src/editgroup.c:557 src/foldersel.c:595 src/mh_gtk.c:145
 #: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen des neuen Ordners ein:"
@@ -2746,7 +2737,7 @@ msgid "Hostname"
 msgstr "Hostname"
 
 #: src/editldap_basedn.c:166 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:389 src/ssl_manager.c:108
+#: src/plugins/clamd/clamav_plugin_gtk.c:390 src/ssl_manager.c:108
 msgid "Port"
 msgstr "Port"
 
@@ -2998,7 +2989,7 @@ msgstr ""
 msgid "Basic"
 msgstr "Allgemein"
 
-#: src/editldap.c:782 src/gtk/quicksearch.c:680
+#: src/editldap.c:782 src/gtk/quicksearch.c:708
 msgid "Extended"
 msgstr "Erweitert"
 
@@ -3006,8 +2997,8 @@ msgstr "Erweitert"
 msgid "Add New LDAP Server"
 msgstr "Neuen LDAP-Server hinzufügen"
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1446
-#: src/prefs_summaries.c:441
+#: src/edittags.c:187 src/prefs_filtering_action.c:1447
+#: src/prefs_summaries.c:449
 msgid "Tag"
 msgstr "Marke"
 
@@ -3130,10 +3121,10 @@ msgid "Stylesheet"
 msgstr "Stylesheet"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:387 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
-#: src/plugins/archive/archiver_prefs.c:235
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1190
+#: src/plugins/archive/archiver_prefs.c:313
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:941
-#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:5928
+#: src/prefs_toolbar.c:790 src/prefs_toolbar.c:1479 src/summaryview.c:6017
 msgid "None"
 msgstr "ohne"
 
@@ -3373,7 +3364,7 @@ msgstr "Adressbuch in LDIF-Datei exportieren"
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:113 src/summaryview.c:8075
+#: src/export.c:113 src/summaryview.c:8175
 msgid "Export to mbox file"
 msgstr "Export in Mbox-Datei"
 
@@ -3405,12 +3396,16 @@ msgstr "Quellordner kann nicht gefunden werden."
 msgid "Select exporting file"
 msgstr "Export-Datei wählen"
 
+#: src/export.c:268
+msgid "Select folder to export"
+msgstr "Ordner zum Exportieren wählen"
+
 #: src/exporthtml.c:767
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
 #: src/exporthtml.c:771 src/importldif.c:1021
-#: src/plugins/archive/archiver_gtk.c:735
+#: src/plugins/archive/archiver_gtk.c:769
 msgid "Attributes"
 msgstr "Merkmal"
 
@@ -3629,23 +3624,23 @@ msgstr ""
 "Filtere Nachricht (%s%s%s)\n"
 "%sNachrichtendatei: %s\n"
 
-#: src/folder.c:1570 src/foldersel.c:404 src/prefs_folder_item.c:315
+#: src/folder.c:1570 src/foldersel.c:412 src/prefs_folder_item.c:315
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: src/folder.c:1574 src/foldersel.c:408
+#: src/folder.c:1574 src/foldersel.c:416
 msgid "Sent"
 msgstr "Gesendet"
 
-#: src/folder.c:1578 src/foldersel.c:412 src/prefs_folder_item.c:318
+#: src/folder.c:1578 src/foldersel.c:420 src/prefs_folder_item.c:318
 msgid "Queue"
 msgstr "Postausgang"
 
-#: src/folder.c:1582 src/foldersel.c:416 src/prefs_folder_item.c:319
+#: src/folder.c:1582 src/foldersel.c:424 src/prefs_folder_item.c:319
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/folder.c:1586 src/foldersel.c:420 src/prefs_folder_item.c:317
+#: src/folder.c:1586 src/foldersel.c:428 src/prefs_folder_item.c:317
 msgid "Drafts"
 msgstr "Entwürfe"
 
@@ -3664,116 +3659,129 @@ msgstr "Kopiere %s nach %s...\n"
 msgid "Moving %s to %s...\n"
 msgstr "Verschiebe %s nach %s...\n"
 
-#: src/folder.c:3568
+#: src/folder.c:3572
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "aktualisiere Pufferspeicher für %s..."
 
-#: src/folder.c:4430
+#: src/folder.c:4434
 msgid "Processing messages..."
 msgstr "Bearbeitung läuft..."
 
-#: src/folder.c:4565
+#: src/folder.c:4569
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronisiere %s für Offline-Nutzung...\n"
 
-#: src/folder.c:4822
+#: src/folder.c:4828
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Ein Ordnername darf nicht mit einem Punkt beginnen oder enden."
 
-#: src/folder.c:4826
+#: src/folder.c:4832
 msgid "A folder name can not end with a space."
 msgstr "Ein Ordnername darf nicht mit einem Leerzeichen enden."
 
-#: src/foldersel.c:248
+#: src/foldersel.c:250
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: src/foldersel.c:588 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/foldersel.c:596 src/imap_gtk.c:197 src/mh_gtk.c:146
 #: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "NewFolder"
 msgstr "NeuerOrdner"
 
-#: src/foldersel.c:596 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:604 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
 #: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:422
+#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:432
 #: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2052
+#: src/plugins/vcalendar/vcal_folder.c:2063
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' darf nicht im Ordnernamen enthalten sein."
 
-#: src/foldersel.c:611 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/foldersel.c:619 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:434 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2059
+#: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:217
+#: src/plugins/vcalendar/vcal_folder.c:2070
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Der Ordner '%s' existiert bereits."
 
-#: src/foldersel.c:618 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:626 src/imap_gtk.c:230 src/mh_gtk.c:173
 #: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
 #: src/plugins/rssyl/rssyl_cb_menu.c:124
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Ordner '%s' konnte nicht erstellt werden."
 
-#: src/folderview.c:242
+#: src/folderview.c:247
 msgid "Mark all re_ad"
 msgstr "Alle _gelesen markieren"
 
-#: src/folderview.c:243
+#: src/folderview.c:248
+msgid "Mark all u_nread"
+msgstr "Alle als _ungelesen markieren"
+
+#: src/folderview.c:249
 msgid "Mark all read recursi_vely"
 msgstr "Rekursiv alle als gelesen marki_eren"
 
-#: src/folderview.c:245
+#: src/folderview.c:250
+msgid "Mark all unread recursi_vely"
+msgstr "Rekursiv alle als ungelesen marki_eren"
+
+#: src/folderview.c:252
 msgid "R_un processing rules"
 msgstr "Verarbeit_ungsregel anwenden"
 
-#: src/folderview.c:246 src/mainwindow.c:551
+#: src/folderview.c:253 src/mainwindow.c:553
 msgid "_Search folder..."
 msgstr "_Ordner durchsuchen..."
 
-#: src/folderview.c:248
+#: src/folderview.c:255
 msgid "Process_ing..."
 msgstr "_Verarbeitungsregeln..."
 
-#: src/folderview.c:249
+#: src/folderview.c:256
 msgid "Empty _trash..."
 msgstr "_Papierkorb leeren"
 
-#: src/folderview.c:250
+#: src/folderview.c:257
 msgid "Send _queue..."
 msgstr "_Postausgang senden..."
 
-#: src/folderview.c:390 src/folderview.c:437
+#: src/folderview.c:397 src/folderview.c:444
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6202
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6291
 msgid "New"
 msgstr "Neu"
 
-#: src/folderview.c:391 src/folderview.c:438
+#: src/folderview.c:398 src/folderview.c:445
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6204
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6293
+#: src/toolbar.c:509
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: src/folderview.c:392 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:399 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:81
 msgid "Total"
 msgstr "Gesamt"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:440 src/summaryview.c:445
+#: src/folderview.c:447 src/summaryview.c:447
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:775
+#: src/folderview.c:782
 msgid "Setting folder info..."
 msgstr "Ordnerdaten werden erstellt..."
 
-#: src/folderview.c:847
+#: src/folderview.c:867 src/summaryview.c:4138
+msgid "Mark all as read"
+msgstr "Alle als gelesen markieren"
+
+#: src/folderview.c:868
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -3781,100 +3789,113 @@ msgstr ""
 "Möchten Sie wirklich alle Mails in diesem Ordner und seinen Unterordnern als "
 "gelesen markieren?"
 
-#: src/folderview.c:849 src/summaryview.c:4055
+#: src/folderview.c:870 src/summaryview.c:4139
 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:853 src/summaryview.c:4054
-msgid "Mark all as read"
-msgstr "Alle als gelesen markieren"
+#: src/folderview.c:873 src/summaryview.c:4177
+msgid "Mark all as unread"
+msgstr "Alle als ungelesen markieren"
 
-#: src/folderview.c:1032 src/imap.c:4636
+#: src/folderview.c:874
+msgid ""
+"Do you really want to mark all mails in this folder and its sub-folders as "
+"unread?"
+msgstr ""
+"Möchten Sie wirklich alle Mails in diesem Ordner und seinen Unterordnern als "
+"ungelesen markieren?"
+
+#: src/folderview.c:876 src/summaryview.c:4178
+msgid "Do you really want to mark all mails in this folder as unread?"
+msgstr ""
+"Möchten Sie wirklich alle Mails in diesem Ordner als ungelesen markieren?"
+
+#: src/folderview.c:1066 src/imap.c:4605
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Ordner %s%s wird durchsucht..."
 
-#: src/folderview.c:1035 src/imap.c:4640 src/mainwindow.c:5197 src/setup.c:96
+#: src/folderview.c:1069 src/imap.c:4609 src/mainwindow.c:5249 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Ordner %s wird durchsucht..."
 
-#: src/folderview.c:1066
+#: src/folderview.c:1100
 msgid "Rebuild folder tree"
 msgstr "Ordnerbaum erneuern"
 
-#: src/folderview.c:1067
+#: src/folderview.c:1101
 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:1077
+#: src/folderview.c:1111
 msgid "Rebuilding folder tree..."
 msgstr "Ordnerbaum wird erneuert..."
 
-#: src/folderview.c:1079
+#: src/folderview.c:1113
 msgid "Scanning folder tree..."
 msgstr "Ordnerbaum wird durchsucht..."
 
-#: src/folderview.c:1170
+#: src/folderview.c:1204
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Ordner %s konnte nicht durchsucht werden\n"
 
-#: src/folderview.c:1224
+#: src/folderview.c:1258
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ordner werden auf neue Nachrichten geprüft..."
 
-#: src/folderview.c:2148
+#: src/folderview.c:2229
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Schließe Ordner %s..."
 
-#: src/folderview.c:2243
+#: src/folderview.c:2324
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Öffne Ordner %s..."
 
-#: src/folderview.c:2261
+#: src/folderview.c:2342
 msgid "Folder could not be opened."
 msgstr "Ordner konnte nicht geöffnet werden."
 
-#: src/folderview.c:2403 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2484 src/mainwindow.c:2906 src/mainwindow.c:2910
 msgid "Empty trash"
 msgstr "Papierkorb leeren"
 
-#: src/folderview.c:2404
+#: src/folderview.c:2485
 msgid "Delete all messages in trash?"
 msgstr "Alle Nachrichten im Papierkorb löschen?"
 
-#: src/folderview.c:2405
+#: src/folderview.c:2486
 msgid "_Empty trash"
 msgstr "Papierkorb _leeren"
 
-#: src/folderview.c:2448 src/inc.c:1533 src/toolbar.c:2607
+#: src/folderview.c:2529 src/inc.c:1533 src/toolbar.c:2911
 msgid "Offline warning"
 msgstr "Offline-Warnung"
 
-#: src/folderview.c:2449 src/toolbar.c:2608
+#: src/folderview.c:2530 src/toolbar.c:2912
 msgid "You're working offline. Override?"
 msgstr "Sie arbeiten offline. Trotzdem fortfahren?"
 
-#: src/folderview.c:2460 src/toolbar.c:2627
+#: src/folderview.c:2541 src/toolbar.c:2931
 msgid "Send queued messages"
 msgstr "Vorgespeicherte Nachrichten senden"
 
-#: src/folderview.c:2461 src/toolbar.c:2628
+#: src/folderview.c:2542 src/toolbar.c:2932
 msgid "Send all queued messages?"
 msgstr "Alle vorgespeicherten Nachrichten senden?"
 
-#: src/folderview.c:2470 src/toolbar.c:2647
+#: src/folderview.c:2551 src/toolbar.c:2951
 msgid "Some errors occurred while sending queued messages."
 msgstr "Fehler beim Senden vorgespeicherter Nachrichten."
 
-#: src/folderview.c:2473 src/main.c:2744 src/toolbar.c:2650
+#: src/folderview.c:2554 src/main.c:2752 src/toolbar.c:2954
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3883,66 +3904,66 @@ msgstr ""
 "Fehler beim Senden vorgespeicherter Nachrichten:\n"
 "%s"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2629
 #, 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:2549
+#: src/folderview.c:2630
 #, 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:2551
+#: src/folderview.c:2632
 msgid "Copy folder"
 msgstr "Kopiere Ordner"
 
-#: src/folderview.c:2551
+#: src/folderview.c:2632
 msgid "Move folder"
 msgstr "Ordner verschieben"
 
-#: src/folderview.c:2562
+#: src/folderview.c:2643
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopiere %s nach %s..."
 
-#: src/folderview.c:2562
+#: src/folderview.c:2643
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "%s wird nach %s verschoben..."
 
-#: src/folderview.c:2596
+#: src/folderview.c:2677
 msgid "Source and destination are the same."
 msgstr "Quelle und Ziel sind identisch."
 
-#: src/folderview.c:2599
+#: src/folderview.c:2680
 msgid "Can't copy a folder to one of its children."
 msgstr "Ein Ordner ist nicht in untergeordnete Ordner kopierbar."
 
-#: src/folderview.c:2600
+#: src/folderview.c:2681
 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:2603
+#: src/folderview.c:2684
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Ordner können nicht zwischen verschiedenen Mailboxen verschoben werden"
 
-#: src/folderview.c:2606
+#: src/folderview.c:2687
 msgid "Copy failed!"
 msgstr "Kopieren schlug fehl!"
 
-#: src/folderview.c:2606
+#: src/folderview.c:2687
 msgid "Move failed!"
 msgstr "Verschieben schlug fehl!"
 
-#: src/folderview.c:2656
+#: src/folderview.c:2737
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Konfiguration Verarbeitung für Ordner %s"
 
-#: src/folderview.c:3096 src/summaryview.c:4493 src/summaryview.c:4594
+#: src/folderview.c:3177 src/summaryview.c:4574 src/summaryview.c:4680
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Der Zielordner kann nur Unterordner aufnehmen."
 
@@ -3983,8 +4004,8 @@ msgid "readonly"
 msgstr "nur lesen"
 
 #: src/grouplistdialog.c:351 src/plugins/att_remover/att_remover.c:297
-#: src/plugins/vcalendar/vcal_manager.c:113
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -3992,7 +4013,7 @@ msgstr "unbekannt"
 msgid "Can't retrieve newsgroup list."
 msgstr "Newsgruppenliste ist nicht abrufbar."
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1922 src/summaryview.c:1562
+#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1922 src/summaryview.c:1585
 msgid "Done."
 msgstr "Fertig."
 
@@ -4001,64 +4022,45 @@ msgstr "Fertig."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d Newsgruppen erhalten (%s gelesen)"
 
-#: src/gtk/about.c:131
-msgid ""
-"Claws Mail is a lightweight, fast and highly-configurable email client.\n"
-"\n"
-"For further information visit the Claws Mail website:\n"
+#: src/gtk/about.c:132
+msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
 msgstr ""
-"Claws Mail ist ein schlankes, schnelles und sehr flexibles E-Mailprogramm.\n"
-"\n"
-"Weitere Informationen finden Sie auf der Webseite von Claws Mail:\n"
+"Claws Mail ist ein schlankes, schnelles und sehr flexibles E-Mailprogramm."
 
-#: src/gtk/about.c:137
+#: src/gtk/about.c:135
+msgid "For further information visit the Claws Mail website:"
+msgstr "Weitere Informationen finden Sie auf der Webseite von Claws Mail:"
+
+#: src/gtk/about.c:140
 msgid ""
-"\n"
-"\n"
-"For support and discussion subscribe to the Claws Mail users' mailing list:\n"
+"For support and discussion subscribe to the Claws Mail users' mailing list:"
 msgstr ""
-"\n"
-"\n"
-"Für Hilfe und Diskussionen können Sie die Claws Mail-Users-Mailingliste "
-"abonnieren:\n"
+"Für Hilfe und Diskussionen können Sie die Claws Mail-Users-Mailingliste"
+" abonnieren:"
 
-#: src/gtk/about.c:142
+#: src/gtk/about.c:146
 msgid ""
-"\n"
-"\n"
 "Claws Mail is free software released under the GPL. If you wish to donate to "
-"the Claws Mail project you can do so at:\n"
+"the Claws Mail project you can do so at:"
 msgstr ""
-"\n"
-"\n"
 "Claws Mail ist freie Software, veröffentlicht unter der GPL. Wenn Sie an das "
-"Claws Mail-Projekt spenden möchten, hier entlang:\n"
+"Claws Mail-Projekt spenden möchten, hier entlang:"
 
-#: src/gtk/about.c:158
+#: src/gtk/about.c:162
 msgid ""
-"\n"
-"\n"
-"Copyright (C) 1999-2016\n"
+"Copyright (C) 1999-2017\n"
 "The Claws Mail Team\n"
 " and Hiroyuki Yamamoto"
 msgstr ""
-"\n"
-"\n"
-"Copyright (C) 1999-2016\n"
-"Das Claws Mail Team\n"
-" und Hiroyuki Yamamoto"
+"Copyright (C) 1999-2017\n"
+"Das Claws-Mail-Team\n"
+"und Hiroyuki Yamamoto"
 
-#: src/gtk/about.c:161
-msgid ""
-"\n"
-"\n"
-"System Information\n"
-msgstr ""
-"\n"
-"\n"
-"Systeminformationen\n"
+#: src/gtk/about.c:167
+msgid "System Information\n"
+msgstr "Systeminformationen\n"
 
-#: src/gtk/about.c:168
+#: src/gtk/about.c:173
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4067,7 +4069,7 @@ msgstr ""
 "Locale: %s (Zeichensatz: %s)\n"
 "Betriebssystem: %s %s (%s)"
 
-#: src/gtk/about.c:177
+#: src/gtk/about.c:182
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4076,7 +4078,7 @@ msgstr ""
 "Locale: %s (Zeichensatz: %s)\n"
 "Betriebssystem: %s"
 
-#: src/gtk/about.c:186
+#: src/gtk/about.c:191
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4085,118 +4087,118 @@ msgstr ""
 "Locale: %s (Zeichensatz: %s)\n"
 "Betriebssystem: unbekannt"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:705 src/wizard.c:527
+#: src/gtk/about.c:247 src/prefs_themes.c:805 src/wizard.c:527
 msgid "The Claws Mail Team"
 msgstr "Das Claws Mail Team"
 
-#: src/gtk/about.c:261
+#: src/gtk/about.c:266
 msgid "Previous team members"
 msgstr "Frühere Teammitglieder"
 
-#: src/gtk/about.c:280
+#: src/gtk/about.c:285
 msgid "The translation team"
 msgstr "Das Übersetzerteam"
 
-#: src/gtk/about.c:299
+#: src/gtk/about.c:304
 msgid "Documentation team"
 msgstr "Das Dokumentationsteam"
 
-#: src/gtk/about.c:318
+#: src/gtk/about.c:322
 msgid "Logo"
 msgstr "Logo"
 
 # UI adapted
-#: src/gtk/about.c:337
+#: src/gtk/about.c:341
 msgid "Icons"
 msgstr "Grafische Symbole"
 
-#: src/gtk/about.c:356
+#: src/gtk/about.c:360
 msgid "Contributors"
 msgstr "Mitwirkende"
 
-#: src/gtk/about.c:404
-msgid "Compiled-in Features\n"
-msgstr "Einkompilierte Funktionen\n"
+#: src/gtk/about.c:408
+msgid "Compiled-in Features"
+msgstr "Einkompilierte Funktionen"
 
-#: src/gtk/about.c:420
+#: src/gtk/about.c:425
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr "für X-Face Kopfzeilen\n"
 
-#: src/gtk/about.c:430
+#: src/gtk/about.c:435
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr "für Rechtschreibprüfung\n"
 
-#: src/gtk/about.c:440
+#: src/gtk/about.c:445
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
 msgstr "für verschlüsselte Server-Verbindungen\n"
 
-#: src/gtk/about.c:450
+#: src/gtk/about.c:455
 msgctxt "IPv6"
 msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
 msgstr "für IPv6, das neue Internet-Adressprotokoll\n"
 
-#: src/gtk/about.c:461
+#: src/gtk/about.c:466
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr "für das Konvertieren verschiedener Zeichensätze\n"
 
-#: src/gtk/about.c:471
+#: src/gtk/about.c:476
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "für die Nutzung von PalmOS Adressbüchern\n"
 
-#: src/gtk/about.c:481
+#: src/gtk/about.c:486
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "für verteilte LDAP-Adressbücher\n"
 
-#: src/gtk/about.c:491
+#: src/gtk/about.c:496
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "für IMAP- und NNTP-Server\n"
 
-#: src/gtk/about.c:501
+#: src/gtk/about.c:506
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "für das Verwalten von Sitzungen\n"
 
-#: src/gtk/about.c:511
+#: src/gtk/about.c:516
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "für das Erkennen von Änderungen der Netzwerkverbindung\n"
 
-#: src/gtk/about.c:543
+#: src/gtk/about.c:526
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "für SVG-Themes\n"
+
+#: src/gtk/about.c:558
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 3, or (at your option) any later "
-"version.\n"
-"\n"
+"Software Foundation; either version 3, or (at your option) any later version."
 msgstr ""
 "Dieses Programm ist freie Software; Sie können es weitergeben und/oder "
 "modifizieren im Sinne der GNU General Public License, wie sie von der Free "
 "Software Foundation veröffentlicht wird; entweder Version 3, oder "
-"(wahlweise) jede neuere Version.\n"
-"\n"
+"(wahlweise) jede neuere Version."
 
-#: src/gtk/about.c:549
+#: src/gtk/about.c:565
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
+"more details."
 msgstr ""
 "Dieses Programm wird in der Hoffnung vertrieben, dass es nützlich ist, "
 "jedoch OHNE JEGLICHE GARANTIE; selbst ohne die implizite Garantie der "
 "TAUGLICHKEIT oder der EIGNUNG FÜR EINEN BESTIMMTEN ZWECK. Lesen Sie die GNU "
-"General Public License für weitere Details.\n"
-"\n"
+"General Public License für weitere Details."
 
-#: src/gtk/about.c:567
+#: src/gtk/about.c:584
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4204,85 +4206,85 @@ msgstr ""
 "Sie sollten eine Kopie der GNU General Public License mit diesem Programm "
 "erhalten haben. Wenn nicht, finden Sie diese unter "
 
-#: src/gtk/about.c:698 src/main.c:2568
+#: src/gtk/about.c:717 src/main.c:2576
 msgid "Session statistics\n"
 msgstr "Sitzungsstatistik\n"
 
-#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2578 src/main.c:2581
+#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2586 src/main.c:2589
 #, c-format
 msgid "Started: %s\n"
 msgstr "Beginn: %s\n"
 
-#: src/gtk/about.c:718 src/main.c:2587
+#: src/gtk/about.c:737 src/main.c:2595
 msgid "Incoming traffic\n"
 msgstr "Eingang\n"
 
-#: src/gtk/about.c:721 src/main.c:2590
+#: src/gtk/about.c:740 src/main.c:2598
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Empfangene Nachrichten: %d\n"
 
-#: src/gtk/about.c:728 src/main.c:2596
+#: src/gtk/about.c:747 src/main.c:2604
 msgid "Outgoing traffic\n"
 msgstr "Ausgang\n"
 
 # msgid "/_Tools/---"
 # msgstr "/E_xtras/---"
-#: src/gtk/about.c:731 src/main.c:2599
+#: src/gtk/about.c:750 src/main.c:2607
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Neue/weitergeleitete Nachrichten: %d\n"
 
-#: src/gtk/about.c:736 src/main.c:2603
+#: src/gtk/about.c:755 src/main.c:2611
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Beantwortete Nachrichten: %d\n"
 
-#: src/gtk/about.c:741 src/main.c:2607
+#: src/gtk/about.c:760 src/main.c:2615
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Weitergeleitete Nachrichten: %d\n"
 
-#: src/gtk/about.c:746 src/main.c:2611
+#: src/gtk/about.c:765 src/main.c:2619
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Alle verschickten Nachrichten: %d\n"
 
-#: src/gtk/about.c:773
+#: src/gtk/about.c:792
 msgid "About Claws Mail"
 msgstr "Über Claws Mail"
 
-#: src/gtk/about.c:831
+#: src/gtk/about.c:850
 msgid ""
-"Copyright (C) 1999-2016\n"
+"Copyright (C) 1999-2017\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2016\n"
+"Copyright (C) 1999-2017\n"
 "Das Claws Mail Team\n"
 "und Hiroyuki Yamamoto"
 
-#: src/gtk/about.c:845
+#: src/gtk/about.c:864
 msgid "_Info"
 msgstr "Über"
 
-#: src/gtk/about.c:851
+#: src/gtk/about.c:870
 msgid "_Authors"
 msgstr "_Autoren"
 
-#: src/gtk/about.c:857
+#: src/gtk/about.c:876
 msgid "_Features"
 msgstr "_Funktionen"
 
-#: src/gtk/about.c:863
+#: src/gtk/about.c:882
 msgid "_License"
 msgstr "_Lizenz"
 
-#: src/gtk/about.c:871
+#: src/gtk/about.c:890
 msgid "_Release Notes"
 msgstr "_Versionsbeschreibung"
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:896
 msgid "_Statistics"
 msgstr "_Statistik"
 
@@ -4489,8 +4491,8 @@ msgid "Configuring..."
 msgstr "Konfiguriere…"
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2165 src/prefs_summaries.c:435
-#: src/prefs_summary_column.c:84 src/quote_fmt.c:49 src/summaryview.c:443
+#: src/prefs_matcher.c:2166 src/prefs_summaries.c:443
+#: src/prefs_summary_column.c:84 src/quote_fmt.c:49 src/summaryview.c:445
 msgid "Date"
 msgstr "Datum"
 
@@ -4499,12 +4501,12 @@ msgid "Date:"
 msgstr "Datum:"
 
 #: src/gtk/headers.h:10 src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2162 src/prefs_summaries.c:437
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:50 src/summaryview.c:441
+#: src/prefs_matcher.c:2163 src/prefs_summaries.c:445
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:50 src/summaryview.c:443
 msgid "From"
 msgstr "Von"
 
-#: src/gtk/headers.h:10 src/summary_search.c:426
+#: src/gtk/headers.h:10 src/summary_search.c:474
 msgid "From:"
 msgstr "Von:"
 
@@ -4520,25 +4522,23 @@ msgstr "Absender:"
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: src/gtk/headers.h:13 src/plugins/address_keeper/address_keeper_prefs.c:140
-#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2163
-#: src/prefs_summaries.c:438 src/prefs_summary_column.c:83 src/quote_fmt.c:57
-#: src/summaryview.c:442
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1257
+#: src/prefs_matcher.c:2164 src/prefs_summaries.c:446
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:57 src/summaryview.c:444
 msgid "To"
 msgstr "An"
 
-#: src/gtk/headers.h:14 src/plugins/address_keeper/address_keeper_prefs.c:149
-#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2164
-#: src/quote_fmt.c:58
+#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1258
+#: src/prefs_matcher.c:2165 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
-#: src/gtk/headers.h:15 src/plugins/address_keeper/address_keeper_prefs.c:158
+#: src/gtk/headers.h:15
 msgid "Bcc"
 msgstr "Bcc"
 
 #: src/gtk/headers.h:16 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2166 src/quote_fmt.c:61
+#: src/prefs_matcher.c:2167 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Message-ID"
 
@@ -4551,7 +4551,7 @@ msgid "In-Reply-To"
 msgstr "In-Reply-To"
 
 #: src/gtk/headers.h:18 src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2168 src/quote_fmt.c:60
+#: src/prefs_matcher.c:2169 src/quote_fmt.c:60
 msgid "References"
 msgstr "Referenzen"
 
@@ -4560,17 +4560,17 @@ msgid "References:"
 msgstr "Referenzen:"
 
 #: src/gtk/headers.h:19 src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2161 src/prefs_summaries.c:439
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:56 src/summaryview.c:440
+#: src/prefs_matcher.c:2162 src/prefs_summaries.c:447
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:56 src/summaryview.c:442
 msgid "Subject"
 msgstr "Betreff"
 
 #: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:700
-#: src/summary_search.c:440
+#: src/summary_search.c:488
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:433
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:431
 msgid "Comments"
 msgstr "Kommentare"
 
@@ -4659,7 +4659,7 @@ msgid "Received:"
 msgstr "Empfangen:"
 
 #: src/gtk/headers.h:33 src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2167 src/quote_fmt.c:59
+#: src/prefs_matcher.c:2168 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Newsgruppen"
 
@@ -4684,12 +4684,12 @@ msgid "Seen:"
 msgstr "Seen:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:443
-#: src/prefs_summary_column.c:79 src/summaryview.c:2763
+#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:451
+#: src/prefs_summary_column.c:79 src/summaryview.c:2808
 msgid "Status"
 msgstr "Status"
 
-#: src/gtk/headers.h:37 src/prefs_themes.c:880
+#: src/gtk/headers.h:37 src/prefs_themes.c:996
 msgid "Status:"
 msgstr "Status:"
 
@@ -5069,12 +5069,12 @@ msgstr ""
 "%s\n"
 
 #: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:790
-#: src/plugins/address_keeper/address_keeper_prefs.c:256
-#: src/plugins/archive/archiver_prefs.c:90
+#: src/plugins/address_keeper/address_keeper_prefs.c:273
+#: src/plugins/archive/archiver_prefs.c:106
 #: src/plugins/attachwarner/attachwarner_prefs.c:229
 #: src/plugins/bogofilter/bogofilter_gtk.c:498
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
-#: src/plugins/clamd/clamav_plugin_gtk.c:548
+#: src/plugins/clamd/clamav_plugin_gtk.c:549
 #: src/plugins/fancy/fancy_prefs.c:114
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:137
@@ -5090,8 +5090,8 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:522
 #: src/plugins/pgpcore/prefs_gpg.c:617 src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:944
+#: src/plugins/spamassassin/spamassassin_gtk.c:648
+#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:957
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -5103,7 +5103,7 @@ msgstr "Aktivieren..."
 msgid "Unload"
 msgstr "Deaktivieren"
 
-#: src/gtk/pluginwindow.c:350 src/prefs_summaries.c:222
+#: src/gtk/pluginwindow.c:350 src/prefs_summaries.c:229
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -5129,7 +5129,7 @@ msgstr "Aktivierte Plugins"
 msgid "Page Index"
 msgstr "Seitenindex"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:843
 msgid "_Hide"
 msgstr "_Ausblenden"
 
@@ -5137,211 +5137,215 @@ msgstr "_Ausblenden"
 #: src/prefs_account.c:3286 src/prefs_account.c:3304 src/prefs_account.c:3322
 #: src/prefs_account.c:3340 src/prefs_account.c:3358 src/prefs_account.c:3376
 #: src/prefs_account.c:3395 src/prefs_account.c:3488
-#: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
-#: src/prefs_filtering.c:1875
+#: src/prefs_filtering_action.c:1422 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1877
 msgid "Account"
 msgstr "Konto"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:478
 msgid "all messages"
 msgstr "Alle Nachrichten"
 
-#: src/gtk/quicksearch.c:452
+#: src/gtk/quicksearch.c:479
 msgid "messages whose age is greater than # days"
 msgstr "Nachrichten, die älter sind als # Tage"
 
-#: src/gtk/quicksearch.c:453
+#: src/gtk/quicksearch.c:480
 msgid "messages whose age is less than # days"
 msgstr "Nachrichten, die jünger sind als # Tage"
 
-#: src/gtk/quicksearch.c:454
+#: src/gtk/quicksearch.c:481
 msgid "messages whose age is greater than # hours"
 msgstr "Nachrichten, die älter sind als # Stunden"
 
-#: src/gtk/quicksearch.c:455
+#: src/gtk/quicksearch.c:482
 msgid "messages whose age is less than # hours"
 msgstr "Nachrichten, die jünger sind als # Stunden"
 
-#: src/gtk/quicksearch.c:456
+#: src/gtk/quicksearch.c:483
 msgid "messages which contain S in the message body"
 msgstr "Nachrichten, die S im Nachrichtenkörper enthalten"
 
-#: src/gtk/quicksearch.c:457
+#: src/gtk/quicksearch.c:484
 msgid "messages which contain S in the whole message"
 msgstr "Nachrichten, die S in der ganzen Nachricht enthalten"
 
-#: src/gtk/quicksearch.c:458
+#: src/gtk/quicksearch.c:485
 msgid "messages carbon-copied to S"
 msgstr "Nachrichten mit Kopie an S"
 
-#: src/gtk/quicksearch.c:459
-msgid "message is either to: or cc: to S"
-msgstr "Nachricht ist entweder to: oder cc: an S"
+#: src/gtk/quicksearch.c:486
+msgid "message is either To: or Cc: to S"
+msgstr "Nachricht ist entweder To: oder Cc: an S"
 
-#: src/gtk/quicksearch.c:460
+#: src/gtk/quicksearch.c:487
 msgid "deleted messages"
 msgstr "Gelöschte Nachrichten"
 
-#: src/gtk/quicksearch.c:461
+#: src/gtk/quicksearch.c:488
 msgid "messages which contain S in the Sender field"
 msgstr "Nachrichten, die S in der 'Absender'-Kopfzeile enthalten"
 
-#: src/gtk/quicksearch.c:462
+#: src/gtk/quicksearch.c:489
 msgid "true if execute \"S\" succeeds"
 msgstr "Wahr, wenn Ausführung von S erfolgreich"
 
-#: src/gtk/quicksearch.c:463
+#: src/gtk/quicksearch.c:490
 msgid "messages originating from user S"
 msgstr "Nachrichten, die von Benutzer S stammen"
 
-#: src/gtk/quicksearch.c:464
+#: src/gtk/quicksearch.c:491
 msgid "forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: src/gtk/quicksearch.c:465
+#: src/gtk/quicksearch.c:492
 msgid "messages which have attachments"
 msgstr "Nachrichten mit Anhängen"
 
-#: src/gtk/quicksearch.c:466
+#: src/gtk/quicksearch.c:493
 msgid "messages which contain S in any header name or value"
 msgstr "Nachrichten, deren Kopfzeilen irgendwo in Name oder Wert S enthalten"
 
-#: src/gtk/quicksearch.c:467
+#: src/gtk/quicksearch.c:494
 msgid "messages which contain S in the value of any header"
 msgstr "Nachrichten, deren Kopfzeilen irgendwo den Wert S enthalten"
 
-#: src/gtk/quicksearch.c:468
+#: src/gtk/quicksearch.c:495
 msgid "messages which contain S in Message-ID header"
 msgstr "Nachrichten mit S in der 'Message-ID'-Kopfzeile"
 
-#: src/gtk/quicksearch.c:469
+#: src/gtk/quicksearch.c:496
 msgid "messages which contain S in In-Reply-To header"
 msgstr "Nachrichten mit S in der 'In-Reply-To'-Kopfzeile"
 
-#: src/gtk/quicksearch.c:470
+#: src/gtk/quicksearch.c:497
 msgid "messages which are marked with color #"
 msgstr "Nachrichten, die farblich mit # markiert sind"
 
-#: src/gtk/quicksearch.c:471
+#: src/gtk/quicksearch.c:498
 msgid "locked messages"
 msgstr "Gesperrte Nachrichten"
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:499
 msgid "messages which are in newsgroup S"
 msgstr "Nachrichten in der Newsgruppe S"
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:500
 msgid "new messages"
 msgstr "Neue Nachrichten"
 
-#: src/gtk/quicksearch.c:474
+#: src/gtk/quicksearch.c:501
 msgid "old messages"
 msgstr "Alte Nachrichten"
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:502
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "Unvollständige Nachrichten (teilweise geladen)"
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:503
 msgid "messages which you have replied to"
 msgstr "Nachrichten, die beantwortet wurden"
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:504
 msgid "read messages"
 msgstr "Gelesene Nachrichten"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:505
 msgid "messages which contain S in subject"
 msgstr "Nachrichten, die S im Betreff enthalten"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:506
 msgid "messages whose score is equal to # points"
 msgstr "Nachrichten mit einer Bewertung von # Punkten"
 
-#: src/gtk/quicksearch.c:480
+#: src/gtk/quicksearch.c:507
 msgid "messages whose score is greater than # points"
 msgstr "Nachrichten mit einer Bewertung von mehr als # Punkten"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:508
 msgid "messages whose score is lower than # points"
 msgstr "Nachrichten mit einer Bewertung von weniger als # Punkten"
 
-#: src/gtk/quicksearch.c:482
+#: src/gtk/quicksearch.c:509
 msgid "messages whose size is equal to # bytes"
 msgstr "Nachrichten mit einer Größe von # Bytes"
 
-#: src/gtk/quicksearch.c:483
+#: src/gtk/quicksearch.c:510
 msgid "messages whose size is greater than # bytes"
 msgstr "Nachrichten größer als # Bytes"
 
-#: src/gtk/quicksearch.c:484
+#: src/gtk/quicksearch.c:511
 msgid "messages whose size is smaller than # bytes"
 msgstr "Nachrichten kleiner als # Bytes"
 
-#: src/gtk/quicksearch.c:485
+#: src/gtk/quicksearch.c:512
 msgid "messages which have been sent to S"
 msgstr "Nachrichten, die an S gesendet wurden"
 
-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:513
 msgid "messages which tags contain S"
 msgstr "Nachrichten, die Marken mit S enthalten"
 
-#: src/gtk/quicksearch.c:487
+#: src/gtk/quicksearch.c:514
 msgid "messages which have tag(s)"
 msgstr "Nachrichten, die Marke(n) enthalten"
 
-#: src/gtk/quicksearch.c:488
+#: src/gtk/quicksearch.c:515
 msgid "marked messages"
 msgstr "Markierte Nachrichten"
 
-#: src/gtk/quicksearch.c:489
+#: src/gtk/quicksearch.c:516
 msgid "unread messages"
 msgstr "Ungelesene Nachrichten"
 
-#: src/gtk/quicksearch.c:490
+#: src/gtk/quicksearch.c:517
 msgid "messages which contain S in References header"
 msgstr "Nachrichten, die S in der Referenz-Kopfzeile enthalten"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:518
 #, 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:492
+#: src/gtk/quicksearch.c:519
 msgid "messages which contain S in X-Label header"
 msgstr "Nachrichten, die S in der 'X-Label'-Kopfzeile enthalten"
 
-#: src/gtk/quicksearch.c:494
+#: src/gtk/quicksearch.c:521
 msgid "logical AND operator"
 msgstr "Logischer UND-Operator"
 
-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:522
 msgid "logical OR operator"
 msgstr "Logischer ODER-Operator"
 
-#: src/gtk/quicksearch.c:496
+#: src/gtk/quicksearch.c:523
 msgid "logical NOT operator"
 msgstr "Logischer NICHT-Operator"
 
-#: src/gtk/quicksearch.c:497
+#: src/gtk/quicksearch.c:524
 msgid "case sensitive search"
 msgstr "Groß-/Kleinschreibung beachten"
 
-#: src/gtk/quicksearch.c:498
+#: src/gtk/quicksearch.c:525
 msgid "match using regular expressions instead of substring search"
 msgstr "Suche mit regulären Ausdrücken anstatt nach Teilzeichenfolgen"
 
-#: src/gtk/quicksearch.c:500
-msgid "all filtering expressions are allowed"
-msgstr "alle Filterausdrücke sind erlaubt"
+#: src/gtk/quicksearch.c:527
+msgid ""
+"all filtering expressions are allowed, but cannot be mixed through logical "
+"operators with the expressions above"
+msgstr ""
+"Alle Filterausdrücke sind erlaubt, können aber nicht mit logischen "
+"Operatoren mit obigen Ausdrücken gemischt werden"
 
-#: src/gtk/quicksearch.c:509 src/summary_search.c:471
+#: src/gtk/quicksearch.c:537 src/summary_search.c:521
 msgid "Extended Search"
 msgstr "Erweiterte Suche"
 
-#: src/gtk/quicksearch.c:510
+#: src/gtk/quicksearch.c:538
 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"
@@ -5351,53 +5355,53 @@ msgstr ""
 "erfüllen müssen, um in der Liste angezeigt zu werden.\n"
 "Folgende Symbole können verwendet werden:"
 
-#: src/gtk/quicksearch.c:610
+#: src/gtk/quicksearch.c:638
 msgid "Something went wrong during search. Please check your logs."
 msgstr ""
 "Während der Suche lief etwas schief. Bitte überprüfen Sie die Protokoll-"
 "Dateien."
 
-#: src/gtk/quicksearch.c:676
+#: src/gtk/quicksearch.c:704
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Von/An/Betreff/Marke"
 
-#: src/gtk/quicksearch.c:687 src/plugins/archive/archiver_prefs.c:314
+#: src/gtk/quicksearch.c:715 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Rekursiv"
 
-#: src/gtk/quicksearch.c:696
+#: src/gtk/quicksearch.c:724
 msgid "Sticky"
 msgstr "Dauerhaft"
 
-#: src/gtk/quicksearch.c:706
+#: src/gtk/quicksearch.c:734
 msgid "Type-ahead"
 msgstr "Zeichenweise"
 
-#: src/gtk/quicksearch.c:718
+#: src/gtk/quicksearch.c:746
 msgid "Run on select"
 msgstr "In Markierten"
 
-#: src/gtk/quicksearch.c:760
+#: src/gtk/quicksearch.c:788
 msgid "Clear the current search"
 msgstr "Die aktuelle Suche löschen"
 
-#: src/gtk/quicksearch.c:770 src/summary_search.c:424
+#: src/gtk/quicksearch.c:798 src/summary_search.c:472
 msgid "Edit search criteria"
 msgstr "Suchkriterien anpassen"
 
-#: src/gtk/quicksearch.c:779
+#: src/gtk/quicksearch.c:807
 msgid "Information about extended symbols"
 msgstr "Information zu Symbolen für die erweiterten Suche"
 
-#: src/gtk/quicksearch.c:817 src/gtk/quicksearch.c:832
+#: src/gtk/quicksearch.c:845 src/gtk/quicksearch.c:869
 msgid "_Information"
 msgstr "_Information"
 
-#: src/gtk/quicksearch.c:818 src/gtk/quicksearch.c:833
+#: src/gtk/quicksearch.c:846 src/gtk/quicksearch.c:870
 msgid "E_dit"
 msgstr "Bearbeiten"
 
-#: src/gtk/quicksearch.c:819 src/gtk/quicksearch.c:834 src/prefs_actions.c:347
+#: src/gtk/quicksearch.c:847 src/gtk/quicksearch.c:871 src/prefs_actions.c:347
 #: src/prefs_filtering.c:495 src/prefs_template.c:330
 msgid "C_lear"
 msgstr "_Leeren"
@@ -5416,7 +5420,7 @@ msgid "Signer"
 msgstr "Unterzeichner"
 
 #: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:836
+#: src/prefs_themes.c:952
 msgid "Name: "
 msgstr "Name: "
 
@@ -5549,15 +5553,15 @@ msgstr "Marken:"
 
 #: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:884 src/summaryview.c:3334
-#: src/summaryview.c:3352 src/summaryview.c:3373
+#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3379
+#: src/summaryview.c:3397 src/summaryview.c:3418
 msgid "(No From)"
 msgstr "(Kein Von)"
 
 #: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:887 src/summaryview.c:3385
-#: src/summaryview.c:3388
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3430
+#: src/summaryview.c:3433
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
@@ -5565,7 +5569,7 @@ msgstr "(Kein Betreff)"
 msgid "Error:"
 msgstr "Fehler:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2558
+#: src/image_viewer.c:299 src/mimeview.c:2611
 #: src/plugins/att_remover/att_remover.c:301
 #: src/plugins/pdf_viewer/poppler_viewer.c:696
 msgid "Filename:"
@@ -5579,193 +5583,193 @@ msgstr "Dateigröße:"
 msgid "Load Image"
 msgstr "Bild laden"
 
-#: src/imap.c:579
+#: src/imap.c:576
 msgid "IMAP connection broken\n"
 msgstr "IMAP-Verbindung unterbrochen\n"
 
-#: src/imap.c:618 src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630
-#: src/imap.c:634 src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:647
-#: src/imap.c:650 src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662
-#: src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677
-#: src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692
-#: src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707
-#: src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722
-#: src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737
-#: src/imap.c:741 src/imap.c:745
+#: src/imap.c:615 src/imap.c:618 src/imap.c:621 src/imap.c:624 src/imap.c:627
+#: src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640 src/imap.c:644
+#: src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:656 src/imap.c:659
+#: src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674
+#: src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689
+#: src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704
+#: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
+#: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
+#: src/imap.c:738 src/imap.c:742
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP Fehler auf %s:"
 
-#: src/imap.c:618
+#: src/imap.c:615
 msgid "authenticated"
 msgstr " authentifiziert"
 
-#: src/imap.c:621
+#: src/imap.c:618
 msgid "not authenticated"
 msgstr " nicht authentifiziert"
 
-#: src/imap.c:624
+#: src/imap.c:621
 msgid "bad state"
 msgstr "schlechter Zustand"
 
-#: src/imap.c:627
+#: src/imap.c:624
 msgid "stream error"
 msgstr "stream-Fehler"
 
-#: src/imap.c:630
+#: src/imap.c:627
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr "Parsingfehler (sehr wahrscheinlich ein nicht RFC-konformer Server)"
 
-#: src/imap.c:634
+#: src/imap.c:631
 msgid "connection refused"
 msgstr "Verbindung verweigert"
 
-#: src/imap.c:637
+#: src/imap.c:634
 msgid "memory error"
 msgstr "Speicherfehler"
 
-#: src/imap.c:640
+#: src/imap.c:637
 msgid "fatal error"
 msgstr "Fataler Fehler"
 
-#: src/imap.c:643
+#: src/imap.c:640
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr "Protokollfehler (sehr wahrscheinlich ein nicht RFC-konformer Server)"
 
-#: src/imap.c:647
+#: src/imap.c:644
 msgid "connection not accepted"
 msgstr "Verbindung nicht akzeptiert"
 
-#: src/imap.c:650
+#: src/imap.c:647
 msgid "APPEND error"
 msgstr "APPEND-Fehler"
 
-#: src/imap.c:653
+#: src/imap.c:650
 msgid "NOOP error"
 msgstr "NOOP-Fehler"
 
-#: src/imap.c:656
+#: src/imap.c:653
 msgid "LOGOUT error"
 msgstr "LOGOUT-Fehler"
 
-#: src/imap.c:659
+#: src/imap.c:656
 msgid "CAPABILITY error"
 msgstr "CAPABILITY-Fehler"
 
-#: src/imap.c:662
+#: src/imap.c:659
 msgid "CHECK error"
 msgstr "CHECK-Fehler"
 
-#: src/imap.c:665
+#: src/imap.c:662
 msgid "CLOSE error"
 msgstr "CLOSE-Fehler"
 
-#: src/imap.c:668
+#: src/imap.c:665
 msgid "EXPUNGE error"
 msgstr "EXPUNGE-Fehler"
 
-#: src/imap.c:671
+#: src/imap.c:668
 msgid "COPY error"
 msgstr "COPY-Fehler"
 
-#: src/imap.c:674
+#: src/imap.c:671
 msgid "UID COPY error"
 msgstr "UID COPY-Fehler"
 
-#: src/imap.c:677
+#: src/imap.c:674
 msgid "CREATE error"
 msgstr "CREATE-Fehler"
 
-#: src/imap.c:680
+#: src/imap.c:677
 msgid "DELETE error"
 msgstr "DELETE-Fehler"
 
-#: src/imap.c:683
+#: src/imap.c:680
 msgid "EXAMINE error"
 msgstr "EXAMINE-Fehler"
 
-#: src/imap.c:686
+#: src/imap.c:683
 msgid "FETCH error"
 msgstr "FETCH-Fehler"
 
-#: src/imap.c:689
+#: src/imap.c:686
 msgid "UID FETCH error"
 msgstr "UID FETCH-Fehler"
 
-#: src/imap.c:692
+#: src/imap.c:689
 msgid "LIST error"
 msgstr "LIST-Fehler"
 
-#: src/imap.c:695
+#: src/imap.c:692
 msgid "LOGIN error"
 msgstr "LOGIN-Fehler"
 
-#: src/imap.c:698
+#: src/imap.c:695
 msgid "LSUB error"
 msgstr "LSUB-Fehler"
 
-#: src/imap.c:701
+#: src/imap.c:698
 msgid "RENAME error"
 msgstr "RENAME-Fehler"
 
-#: src/imap.c:704
+#: src/imap.c:701
 msgid "SEARCH error"
 msgstr "SEARCH-Fehler"
 
-#: src/imap.c:707
+#: src/imap.c:704
 msgid "UID SEARCH error"
 msgstr "UID SEARCH-Fehler"
 
-#: src/imap.c:710
+#: src/imap.c:707
 msgid "SELECT error"
 msgstr "SELECT-Fehler"
 
-#: src/imap.c:713
+#: src/imap.c:710
 msgid "STATUS error"
 msgstr "STATUS-Fehler"
 
-#: src/imap.c:716
+#: src/imap.c:713
 msgid "STORE error"
 msgstr "STORE-Fehler"
 
-#: src/imap.c:719
+#: src/imap.c:716
 msgid "UID STORE error"
 msgstr " UID STORE-Fehler"
 
-#: src/imap.c:722
+#: src/imap.c:719
 msgid "SUBSCRIBE error"
 msgstr " SUBSCRIBE-Fehler"
 
-#: src/imap.c:725
+#: src/imap.c:722
 msgid "UNSUBSCRIBE error"
 msgstr " UNSUBSCRIBE-Fehler"
 
-#: src/imap.c:728
+#: src/imap.c:725
 msgid "STARTTLS error"
 msgstr " STARTTLS-Fehler"
 
-#: src/imap.c:731
+#: src/imap.c:728
 msgid "INVAL error"
 msgstr " INVAL-Fehler"
 
-#: src/imap.c:734
+#: src/imap.c:731
 msgid "EXTENSION error"
 msgstr " EXTENSION-Fehler"
 
-#: src/imap.c:737
+#: src/imap.c:734
 msgid "SASL error"
 msgstr " SASL-Fehler"
 
-#: src/imap.c:741
+#: src/imap.c:738
 msgid "SSL/TLS error"
 msgstr "SSL/TLS-Fehler"
 
-#: src/imap.c:745
+#: src/imap.c:742
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Unbekannter Fehler [%d]"
 
-#: src/imap.c:949
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5777,7 +5781,7 @@ msgstr ""
 "CRAM-MD5-Logins nur möglich, wenn libetpan mit SASL-Unterstützung kompiliert "
 "wurde und das CRAM-MD5 SASL-Plugin installiert ist."
 
-#: src/imap.c:955
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5789,7 +5793,7 @@ msgstr ""
 "DIGEST-MD5-Logins sind nur möglich, wenn libetpan mit SASL-Unterstützung "
 "kompiliert wurde und das DIGEST-MD5 SASL-Plugin installiert ist."
 
-#: src/imap.c:961
+#: src/imap.c:958
 msgid ""
 "\n"
 "\n"
@@ -5801,7 +5805,7 @@ msgstr ""
 "SCRAM-SHA-1 -Logins sind nur möglich, wenn libetpan mit SASL-Unterstützung "
 "kompiliert wurde und das SCRAM-SHA-1 -Plugin installiert ist."
 
-#: src/imap.c:967
+#: src/imap.c:964
 msgid ""
 "\n"
 "\n"
@@ -5813,7 +5817,7 @@ msgstr ""
 "PLAIN-Logins nur möglich, wenn libetpan mit SASL-Unterstützung kompiliert "
 "wurde und das PLAIN SASL-Plugin installiert ist."
 
-#: src/imap.c:973
+#: src/imap.c:970
 msgid ""
 "\n"
 "\n"
@@ -5825,38 +5829,38 @@ msgstr ""
 "LOGIN-Logins sind nur möglich, wenn libetpan mit SASL-Unterstützung "
 "kompiliert wurde und das LOGIN SASL-Plugin installiert ist."
 
-#: src/imap.c:980
+#: src/imap.c:977
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Verbindung zu %s schlug fehl: Login abgelehnt.%s"
 
-#: src/imap.c:984
+#: src/imap.c:981
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Verbindung zu %s schlug fehl: Login abgelehnt.%s\n"
 
-#: src/imap.c:1002
+#: src/imap.c:999
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Verbindung zu %s schlug fehl"
 
-#: src/imap.c:1009 src/imap.c:1012
+#: src/imap.c:1006 src/imap.c:1009
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP-Verbindung zu %s wurde unterbrochen. Neuverbindung...\n"
 
-#: src/imap.c:1042 src/imap.c:3686 src/imap.c:4345 src/imap.c:4439
-#: src/imap.c:4617 src/imap.c:5428
+#: src/imap.c:1039 src/imap.c:3655 src/imap.c:4314 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5397
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail benötigt eine Netzwerkverbindung, um auf den IMAP-Server "
 "zuzugreifen."
 
-#: src/imap.c:1151 src/inc.c:811 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1148 src/inc.c:811 src/news.c:388 src/send_message.c:282
 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
-#: src/imap.c:1152 src/inc.c:812 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1149 src/inc.c:812 src/news.c:389 src/send_message.c:283
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5870,104 +5874,104 @@ msgstr ""
 "Soll die Verbindung zu diesem Server fortgesetzt werden? Die Kommunikation "
 "wäre nicht geschützt."
 
-#: src/imap.c:1158 src/inc.c:818 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1155 src/inc.c:818 src/news.c:395 src/send_message.c:289
 msgid "Con_tinue connecting"
 msgstr "Das Verbinden _fortsetzen"
 
-#: src/imap.c:1168
+#: src/imap.c:1165
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Konto '%s': Verbinde mit IMAP-Server: %s:%d..."
 
-#: src/imap.c:1216
+#: src/imap.c:1213
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Keine Verbindung zum IMAP-Server: %s:%d"
 
-#: src/imap.c:1219
+#: src/imap.c:1216
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Keine Verbindung zum IMAP-Server: %s:%d\n"
 
-#: src/imap.c:1252 src/imap.c:4107
+#: src/imap.c:1249 src/imap.c:4076
 msgid "Can't start STARTTLS session.\n"
 msgstr "STARTTLS-Sitzung konnte nicht gestartet werden.\n"
 
-#: src/imap.c:1319
+#: src/imap.c:1316
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Einloggen am IMAP-Server %s schlug fehl.\n"
 
-#: src/imap.c:1322
+#: src/imap.c:1319
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Einloggen am IMAP-Server %s schlug fehl."
 
-#: src/imap.c:1749
+#: src/imap.c:1746
 msgid "Adding messages..."
 msgstr "Nachrichten werden hinzugefügt..."
 
-#: src/imap.c:1954 src/mh.c:529
+#: src/imap.c:1951 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Nachrichten werden kopiert..."
 
-#: src/imap.c:2547
+#: src/imap.c:2544
 msgid "can't set deleted flags\n"
 msgstr "Gelöscht-Merker nicht setzbar\n"
 
-#: src/imap.c:2554 src/imap.c:5058
+#: src/imap.c:2551 src/imap.c:5027
 msgid "can't expunge\n"
 msgstr "Löschen schlug fehl\n"
 
-#: src/imap.c:2905
+#: src/imap.c:2902
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Suche nach nicht abonnierten Ordnern in %s..."
 
-#: src/imap.c:2908
+#: src/imap.c:2905
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Suche nach Unterordnern von %s..."
 
-#: src/imap.c:3226
+#: src/imap.c:3195
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Mailbox kann nicht erstellt werden: LIST schlug fehl\n"
 
-#: src/imap.c:3241
+#: src/imap.c:3210
 msgid "can't create mailbox\n"
 msgstr "Mailbox kann nicht erstellt werden\n"
 
-#: src/imap.c:3372
+#: src/imap.c:3341
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s kann nicht in %s umbenannt werden\n"
 
-#: src/imap.c:3485
+#: src/imap.c:3454
 msgid "can't delete mailbox\n"
 msgstr "Mailbox kann nicht gelöscht werden\n"
 
-#: src/imap.c:3764
+#: src/imap.c:3733
 msgid "LIST failed\n"
 msgstr "LIST schlug fehl\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3818
 msgid "Flagging messages..."
 msgstr "Nachrichten-Merker setzen..."
 
-#: src/imap.c:3952
+#: src/imap.c:3921
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Ordner %s kann nicht ausgewählt werden\n"
 
-#: src/imap.c:4104
+#: src/imap.c:4073
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Server erfordert STARTTLS zum Einloggen.\n"
 
-#: src/imap.c:4114
+#: src/imap.c:4083
 msgid "Can't refresh capabilities.\n"
 msgstr "Ressourcen können nicht aktualisiert werden.\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4088
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5976,20 +5980,20 @@ msgstr ""
 "Verbindung zu %s schlug fehl: Server erfordert STARTTLS, aber Claws Mail "
 "wurde ohne STARTTLS-Unterstützung kompiliert.\n"
 
-#: src/imap.c:4127
+#: src/imap.c:4096
 msgid "Server logins are disabled.\n"
 msgstr "Serverlogins sind deaktiviert.\n"
 
-#: src/imap.c:4350
+#: src/imap.c:4319
 msgid "Fetching message..."
 msgstr "Nachricht wird abgeholt..."
 
-#: src/imap.c:5051
+#: src/imap.c:5020
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Gelöscht-Merker nicht setzbar: %d\n"
 
-#: src/imap.c:6086
+#: src/imap.c:6055
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -6040,7 +6044,7 @@ msgstr "Ab_onnements"
 msgid "_Subscribe..."
 msgstr "_Abonnieren..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Unsubscribe..."
 msgstr "_Abmelden..."
 
@@ -6077,21 +6081,21 @@ msgid "Inherit properties from parent folder"
 msgstr "Eigenschaften des Überordners übernehmen"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:411 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2044
+#: src/plugins/mailmbox/plugin_gtk.c:421 src/plugins/rssyl/rssyl_cb_menu.c:197
+#: src/plugins/vcalendar/vcal_folder.c:2055
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Neuer Name für '%s':"
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:412
+#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:422
 #: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2045
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid "Rename folder"
 msgstr "Ordner umbenennen"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/mailmbox/plugin_gtk.c:452 src/plugins/rssyl/rssyl_cb_menu.c:224
+#: src/plugins/vcalendar/vcal_folder.c:2076
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6099,7 +6103,23 @@ msgstr ""
 "Der Ordner konnte nicht umbenannt werden.\n"
 "Der neue Name ist nicht zulässig."
 
-#: src/imap_gtk.c:357 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
+#: src/imap_gtk.c:318 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:373
+#: src/summaryview.c:4624
+msgid "Select folder to move selected message to"
+msgid_plural "Select folder to move selected messages to"
+msgstr[0] "Zielordner für das Verschieben der Nachricht wählen"
+msgstr[1] "Zielordner für das Verschieben der Nachrichten wählen"
+
+# msgid "/_Tools/---"
+# msgstr "/E_xtras/---"
+#: src/imap_gtk.c:339 src/mh_gtk.c:329 src/plugins/mailmbox/plugin_gtk.c:394
+#: src/summaryview.c:4709
+msgid "Select folder to copy selected message to"
+msgid_plural "Select folder to copy selected messages to"
+msgstr[0] "Zielordner für das Kopieren der Nachricht wählen"
+msgstr[1] "Zielordner für das Kopieren der Nachrichten wählen"
+
+#: src/imap_gtk.c:367 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6112,44 +6132,44 @@ msgstr ""
 "\n"
 "Möchten Sie sie wirklich löschen?"
 
-#: src/imap_gtk.c:376 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
+#: src/imap_gtk.c:386 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
 #: src/plugins/rssyl/rssyl_cb_menu.c:171
-#: src/plugins/vcalendar/vcal_folder.c:1998
+#: src/plugins/vcalendar/vcal_folder.c:2009
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ordner '%s' kann nicht entfernt werden."
 
-#: src/imap_gtk.c:498
+#: src/imap_gtk.c:508
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr "Möchten Sie nach nicht abonnierten Unterordnern von '%s' suchen?"
 
-#: src/imap_gtk.c:501
+#: src/imap_gtk.c:511
 msgid "Search recursively"
 msgstr "rekursive Suche"
 
-#: src/imap_gtk.c:506 src/imap_gtk.c:565
+#: src/imap_gtk.c:516 src/imap_gtk.c:575
 msgid "Subscriptions"
 msgstr "Abonnements"
 
-#: src/imap_gtk.c:507
+#: src/imap_gtk.c:517
 msgid "_Search"
 msgstr "_Suchen"
 
-#: src/imap_gtk.c:517
+#: src/imap_gtk.c:527
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Wählen Sie einen Unterordner von %s zum Abonnieren: "
 
-#: src/imap_gtk.c:528 src/mainwindow.c:679
+#: src/imap_gtk.c:538 src/mainwindow.c:680
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: src/imap_gtk.c:530 src/imap_gtk.c:532
+#: src/imap_gtk.c:540 src/imap_gtk.c:542
 msgid "All of them"
 msgstr "alle"
 
-#: src/imap_gtk.c:548
+#: src/imap_gtk.c:558
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -6163,29 +6183,29 @@ msgstr ""
 "angemeldet wurden, benutzen Sie \"Auf neue Ordner prüfen\" im Stammordner "
 "der Mailbox."
 
-#: src/imap_gtk.c:557
+#: src/imap_gtk.c:567
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "Möchten Sie den Ordner %s '%s'?"
 
-#: src/imap_gtk.c:558
+#: src/imap_gtk.c:568
 msgid "subscribe"
 msgstr "abonnieren"
 
-#: src/imap_gtk.c:558
+#: src/imap_gtk.c:568
 msgid "unsubscribe"
 msgstr "abmelden"
 
-#: src/imap_gtk.c:560 src/prefs_folder_item.c:1432 src/prefs_folder_item.c:1460
-#: src/prefs_folder_item.c:1488
+#: src/imap_gtk.c:570 src/prefs_folder_item.c:1447 src/prefs_folder_item.c:1475
+#: src/prefs_folder_item.c:1503
 msgid "Apply to subfolders"
 msgstr "Auf Unterordner anwenden"
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:576
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: src/imap_gtk.c:567 src/news_gtk.c:252
+#: src/imap_gtk.c:577 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr "_Abmelden"
 
@@ -6221,6 +6241,10 @@ msgstr "Der Zielordner wurde nicht gefunden."
 msgid "Select importing file"
 msgstr "Importdatei wählen"
 
+#: src/import.c:272
+msgid "Select folder to import to"
+msgstr "Zielordner für den Import wählen"
+
 #: src/importldif.c:185
 msgid "Please specify address book name and file to import."
 msgstr "Bitte Adressbuchnamen und zu importierende Datei angeben."
@@ -6273,7 +6297,7 @@ msgstr "Wählen Sie die zu importierende LDIF-Datei aus."
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:726 src/summaryview.c:438
+#: src/importldif.c:726 src/summaryview.c:440
 msgid "S"
 msgstr "S"
 
@@ -6411,16 +6435,16 @@ msgstr "Erledigt (keine neuen Nachrichten)"
 msgid "Connection failed"
 msgstr "Verbindung schlug fehl"
 
-#: src/inc.c:649 src/plugins/managesieve/managesieve.c:886
+#: src/inc.c:649 src/plugins/managesieve/managesieve.c:887
 msgid "Auth failed"
 msgstr "Authentifizierung schlug fehl"
 
-#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:88 src/summaryview.c:2759 src/summaryview.c:6228
+#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:454
+#: src/prefs_summary_column.c:88 src/summaryview.c:2804 src/summaryview.c:6317
 msgid "Locked"
 msgstr "Gesperrt"
 
-#: src/inc.c:666 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:666 src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Timeout"
 msgstr "Zeitüberschreitung"
 
@@ -6608,7 +6632,7 @@ msgstr "Some SN"
 msgid "Nick Name"
 msgstr "Spitzname"
 
-#: src/main.c:244
+#: src/main.c:246
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6617,7 +6641,7 @@ msgstr ""
 "Datei '%s' existiert bereits.\n"
 "Ordner kann nicht erstellt werden."
 
-#: src/main.c:365
+#: src/main.c:367
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6626,7 +6650,7 @@ msgstr ""
 "Konfiguration für %s gefunden.\n"
 "Soll diese Konfiguration übernommen werden?"
 
-#: src/main.c:367
+#: src/main.c:369
 #, c-format
 msgid ""
 "\n"
@@ -6639,11 +6663,11 @@ msgstr ""
 "Sie können Ihre Sylpheed-Filterregeln mit einem Skript\n"
 "konvertieren, das unter %s verfügbar ist."
 
-#: src/main.c:379
+#: src/main.c:381
 msgid "Keep old configuration"
 msgstr "alte Einstellungen behalten"
 
-#: src/main.c:382
+#: src/main.c:384
 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 "
@@ -6653,31 +6677,31 @@ 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:390
+#: src/main.c:392
 msgid "Migration of configuration"
 msgstr "Umstellung der Konfiguration"
 
-#: src/main.c:401
+#: src/main.c:403
 msgid "Copying configuration... This may take a while..."
 msgstr "Konfiguration wird kopiert... Bitte warten..."
 
-#: src/main.c:410
+#: src/main.c:412
 msgid "Migration failed!"
 msgstr "Umstellung schlug fehl!"
 
-#: src/main.c:419
+#: src/main.c:421
 msgid "Migrating configuration..."
 msgstr "Konfiguration wird umgestellt ..."
 
-#: src/main.c:1120
+#: src/main.c:1128
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread wird von glib nicht unterstützt.\n"
 
-#: src/main.c:1140 src/main.c:1144 src/main.c:1148
+#: src/main.c:1148 src/main.c:1152 src/main.c:1156
 msgid "(or older)"
 msgstr "(oder älter)"
 
-#: src/main.c:1449
+#: src/main.c:1457
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6696,7 +6720,7 @@ msgstr[1] ""
 "Einstellungen des Plugins für mehr Informationen:\n"
 "%s"
 
-#: src/main.c:1500
+#: src/main.c:1508
 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 "
@@ -6707,7 +6731,7 @@ msgstr ""
 "erneuern\" im Kontextmenü vom Hauptverzeichnis der Mailbox könnte das "
 "Problem lösen."
 
-#: src/main.c:1506
+#: src/main.c:1514
 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 "
@@ -6717,36 +6741,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:1751
+#: src/main.c:1759
 msgid "Missing filename\n"
 msgstr "Fehlender Dateiname\n"
 
-#: src/main.c:1758
+#: src/main.c:1766
 msgid "Cannot open filename for reading\n"
 msgstr "Die Datei kann nicht geöffnet werden\n"
 
-#: src/main.c:1769
+#: src/main.c:1777
 msgid "Malformed header\n"
 msgstr "Fehlerhafte Kopfzeilen\n"
 
-#: src/main.c:1776
+#: src/main.c:1784
 msgid "Duplicated 'To:' header\n"
 msgstr "Doppelte 'An:'-Kopfzeile\n"
 
-#: src/main.c:1787
+#: src/main.c:1795
 msgid "Missing required 'To:' header\n"
 msgstr "Erforderliche 'An:'-Kopfzeile fehlt\n"
 
-#: src/main.c:1930
+#: src/main.c:1938
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Aufruf: %s [OPTION]...\n"
 
-#: src/main.c:1932
+#: src/main.c:1940
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [Adresse]  öffnet das Editor-Fenster"
 
-#: src/main.c:1933
+#: src/main.c:1941
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6765,11 +6789,11 @@ msgstr ""
 "                       Leerzeile, dann der Nachrichtenkörper bis zum Ende "
 "der Datei."
 
-#: src/main.c:1938
+#: src/main.c:1946
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]    abonniert die angegebene URI, wenn möglich"
 
-#: src/main.c:1939
+#: src/main.c:1947
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6779,23 +6803,23 @@ msgstr ""
 "                       öffnet das Editor-Fenster mit den angegebenen\n"
 "                       Dateien als Anhang"
 
-#: src/main.c:1942
+#: src/main.c:1950
 msgid "  --receive              receive new messages"
 msgstr "  --receive            empfängt neue Nachrichten"
 
-#: src/main.c:1943
+#: src/main.c:1951
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all        empfängt neue Nachrichten von allen Konten"
 
-#: src/main.c:1944
+#: src/main.c:1952
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving   Empfang von Nachrichten abbrechen"
 
-#: src/main.c:1945
+#: src/main.c:1953
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending     Versand von Nachrichten abbrechen"
 
-#: src/main.c:1946
+#: src/main.c:1954
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6815,15 +6839,15 @@ msgstr ""
 "                       rekursiv: nicht mit einem der folgenden Argumente: 0, "
 "n, N, f or F"
 
-#: src/main.c:1953
+#: src/main.c:1961
 msgid "  --send                 send all queued messages"
 msgstr "  --send               sendet alle vorgespeicherten Nachrichten"
 
-#: src/main.c:1954
+#: src/main.c:1962
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [Ordner]... zeigt die Anzahl neuer Nachrichten"
 
-#: src/main.c:1955
+#: src/main.c:1963
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6831,15 +6855,15 @@ msgstr ""
 "  --status-full [Ordner]...\n"
 "                       zeigt den Status jeden Ordners"
 
-#: src/main.c:1957
+#: src/main.c:1965
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics         Zeigt Sitzungsstatistiken"
 
-#: src/main.c:1958
+#: src/main.c:1966
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics   Sitzungsstatistiken zurücksetzen"
 
-#: src/main.c:1959
+#: src/main.c:1967
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6848,35 +6872,35 @@ msgstr ""
 "                       springt zu dem angegebenen Ordner/Nachricht\n"
 "                       Ordner ist eine Ordner-ID wie 'Ordner/Unterordner'"
 
-#: src/main.c:1961
+#: src/main.c:1969
 msgid "  --online               switch to online mode"
 msgstr "  --online             schaltet in den Onlinemodus"
 
-#: src/main.c:1962
+#: src/main.c:1970
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline            schaltet in den Offlinemodus"
 
-#: src/main.c:1963
+#: src/main.c:1971
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q     beendet Claws Mail"
 
-#: src/main.c:1964
+#: src/main.c:1972
 msgid "  --debug                debug mode"
 msgstr "  --debug              Debugmodus"
 
-#: src/main.c:1965
+#: src/main.c:1973
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug       Debug-Modus umschalten"
 
-#: src/main.c:1966
+#: src/main.c:1974
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h            zeigt diese Hilfe"
 
-#: src/main.c:1967
+#: src/main.c:1975
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v         gibt Versionsinformationen aus"
 
-#: src/main.c:1968
+#: src/main.c:1976
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6884,11 +6908,11 @@ msgstr ""
 "  --version-full -V    gibt Versionsinformationen und enthaltene Funktionen "
 "aus"
 
-#: src/main.c:1969
+#: src/main.c:1977
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir         gibt das Konfigurationsverzeichnis aus"
 
-#: src/main.c:1970
+#: src/main.c:1978
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6896,7 +6920,7 @@ msgstr ""
 "  --alternate-config-dir  [Verzeichnis]\n"
 "                       benutzt das angegebene Konfigurationsverzeichnis"
 
-#: src/main.c:1972
+#: src/main.c:1980
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
@@ -6904,846 +6928,850 @@ msgstr ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         Geometrie für Haupfenster angeben"
 
-#: src/main.c:2025
+#: src/main.c:2033
 msgid "Unknown option\n"
 msgstr "Unbekannte Option\n"
 
-#: src/main.c:2043
+#: src/main.c:2051
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Bearbeitung erfolgt (%s)..."
 
-#: src/main.c:2046
+#: src/main.c:2054
 msgid "top level folder"
 msgstr "Oberster Ordner"
 
-#: src/main.c:2129
+#: src/main.c:2137
 msgid "Queued messages"
 msgstr "Vorgespeicherte Nachrichten"
 
-#: src/main.c:2130
+#: src/main.c:2138
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Es sind ungesendete Nachrichten vorgespeichert. Jetzt beenden?"
 
-#: src/main.c:2872
+#: src/main.c:2880
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: Netzwerk ist online.\n"
 
-#: src/main.c:2878
+#: src/main.c:2886
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: Netzwerk ist offline.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:513 src/messageview.c:208
 msgid "_File"
 msgstr "_Datei"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:515 src/messageview.c:210 src/summaryview.c:435
 msgid "_View"
 msgstr "_Ansicht"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "_Configuration"
 msgstr "_Konfiguration"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "_Add mailbox"
 msgstr "_Neue Mailbox"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "Change mailbox order..."
 msgstr "Reihenfolge der Mailboxen ändern..."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:529
 msgid "_Import mbox file..."
 msgstr "Mbox-Datei _importieren..."
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "_Export to mbox file..."
 msgstr "In Mbox-Datei e_xportieren..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:531
 msgid "_Export selected to mbox file..."
 msgstr "Auswahl in Mbox-Datei _exportieren..."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "Empty all _Trash folders"
 msgstr "Alle _Papierkörbe leeren"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:536 src/messageview.c:217
 msgid "_Save email as..."
 msgstr "_Speichere E-Mail als..."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:537 src/messageview.c:218
 msgid "_Save part as..."
 msgstr "_Speichere Teil als..."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:540 src/messageview.c:219
 msgid "Page setup..."
 msgstr "D_atei/Seite einrichten..."
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:541 src/messageview.c:220
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:543
 msgid "Synchronise folders"
 msgstr "Ordner syn_chronisieren"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:545
 msgid "E_xit"
 msgstr "_Beenden"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:550
 msgid "Select _thread"
 msgstr "Diskurs aus_wählen"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:552
 msgid "_Find in current message..."
 msgstr "In aktueller _Nachricht suchen..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:554
 msgid "_Quick search"
 msgstr "_Schnellsuche"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:557
 msgid "Show or hi_de"
 msgstr "Ein- oder Aus_blenden"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:558
 msgid "_Toolbar"
 msgstr "_Werkzeugleiste"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "Set displayed _columns"
 msgstr "Angezeigte _Spalten"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:561
 msgid "In _folder list..."
 msgstr "in _Ordnerliste..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:562
 msgid "In _message list..."
 msgstr "in _Nachrichtenliste..."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:567
 msgid "La_yout"
 msgstr "Bildschirm-La_yout"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:569
 msgid "_Sort"
 msgstr "_Sortieren nach"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:571
 msgid "_Attract by subject"
 msgstr "Diskurse na_ch Betreff aufbauen"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:573
 msgid "E_xpand all threads"
 msgstr "Alle Diskurse _ausklappen"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:574
 msgid "Co_llapse all threads"
 msgstr "Alle Diskurse _einklappen"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:576 src/messageview.c:231
 msgid "_Go to"
 msgstr "Ge_he zu"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:577 src/messageview.c:232
 msgid "_Previous message"
 msgstr "voriger N_achricht"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:578 src/messageview.c:233
 msgid "_Next message"
 msgstr "nächster Na_chricht"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:580 src/messageview.c:235
 msgid "P_revious unread message"
 msgstr "vorig_er ungelesener Nachricht"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:581 src/messageview.c:236
 msgid "N_ext unread message"
 msgstr "nächster un_gelesener Nachricht"
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:583 src/messageview.c:238
 msgid "Previous ne_w message"
 msgstr "_voriger neuer Nachricht"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:584 src/messageview.c:239
 msgid "Ne_xt new message"
 msgstr "nächster neuer Nachr_icht"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:586 src/messageview.c:241
 msgid "Previous _marked message"
 msgstr "voriger mar_kierter Nachricht"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:587 src/messageview.c:242
 msgid "Next m_arked message"
 msgstr "nächster _markierter Nachricht"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:589 src/messageview.c:244
 msgid "Previous _labeled message"
 msgstr "voriger ei_ngefärbter Nachricht"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:590 src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "nächster eingefärbter Nach_richt"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:592 src/messageview.c:247
 msgid "Previous opened message"
 msgstr "voriger geöffneter Nachricht"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:593 src/messageview.c:248
 msgid "Next opened message"
 msgstr "nächster geöffneter Nachricht"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:595 src/messageview.c:250
 msgid "Parent message"
 msgstr "übergeordne_ter Nachricht"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:597 src/messageview.c:252
 msgid "Next unread _folder"
 msgstr "nächstem _ungelesenen Ordner"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:598 src/messageview.c:253
 msgid "F_older..."
 msgstr "Ordner..."
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:600 src/messageview.c:255 src/mimeview.c:200
 msgid "Next part"
 msgstr "Nächster Teil"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:601 src/messageview.c:256 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Voriger Teil"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:604 src/messageview.c:257
 msgid "Message scroll"
 msgstr "Blättere zu"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:605 src/messageview.c:258
 msgid "Previous line"
 msgstr "voriger Zeile"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:606 src/messageview.c:259
 msgid "Next line"
 msgstr "nächster Zeile"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:607 src/messageview.c:260 src/printing.c:481
 msgid "Previous page"
 msgstr "voriger Seite"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:608 src/messageview.c:261 src/printing.c:488
 msgid "Next page"
 msgstr "nächster Seite"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:626 src/messageview.c:279
 msgid "Decode"
 msgstr "De_kodierung"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:633
 msgid "Open in new _window"
 msgstr "Öffnen in neuem _Fenster"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:634 src/messageview.c:286
 msgid "Mess_age source"
 msgstr "_Quelltext anzeigen"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:636 src/messageview.c:287
 msgid "Message part"
 msgstr "Nachrichtenteil"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:637 src/messageview.c:288
 msgid "View as text"
 msgstr "Als Text darstellen"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:638 src/messageview.c:289 src/toolbar.c:491
 msgid "Open"
 msgstr "Öffnen"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:640 src/messageview.c:291
 msgid "Open with..."
 msgstr "Öffnen mit..."
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:644 src/messageview.c:294
 msgid "Quotes"
 msgstr "_Zitate"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:646
 msgid "_Update summary"
 msgstr "Darstellung akt_ualisieren"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:649
 msgid "Recei_ve"
 msgstr "_Empfangen"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:650
 msgid "Get from _current account"
 msgstr "Vom a_ktuellen Konto"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:651
 msgid "Get from _all accounts"
 msgstr "Von _allen Konten"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:652
 msgid "Cancel receivin_g"
 msgstr "Empfang _abbrechen"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:655
 msgid "_Send queued messages"
 msgstr "Vorgespei_cherte Nachrichten senden"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:660
 msgid "Compose a_n email message"
 msgstr "Neue _Nachricht verfassen"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:661
 msgid "Compose a news message"
 msgstr "Neue _News-Nachricht verfassen"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:663 src/messageview.c:300
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:664 src/messageview.c:301 src/summaryview.c:427
 msgid "Repl_y to"
 msgstr "An_twort an"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:667 src/messageview.c:304
 msgid "Mailing _list"
 msgstr "Mailingliste"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:668
 msgid "Follow-up and reply to"
 msgstr "Fo_llow-up und Antwort an"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:671 src/messageview.c:307 src/toolbar.c:2368
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:672 src/messageview.c:308 src/toolbar.c:2369
 msgid "For_ward as attachment"
 msgstr "We_iterleiten als Anhang"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:673 src/messageview.c:309 src/toolbar.c:2370
 msgid "Redirec_t"
 msgstr "_Umleiten"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:675
 msgid "Mailing-_List"
 msgstr "Mailin_gliste"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:676
 msgid "Post"
 msgstr "_Verfassen"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:678
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:682
 msgid "Unsubscribe"
 msgstr "A_bmelden"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:684
 msgid "View archive"
 msgstr "Archiv ansehen"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:686
 msgid "Contact owner"
 msgstr "Kontakt"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:690
 msgid "M_ove..."
 msgstr "_Verschieben..."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:691
 msgid "_Copy..."
 msgstr "_Kopieren..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:692
 msgid "Move to _trash"
 msgstr "In den _Papierkorb verschieben"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:693
 msgid "_Delete..."
 msgstr "_Löschen..."
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:694
 msgid "Move thread to tr_ash"
 msgstr "Diskurs in den _Papierkorb verschieben"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:695
 msgid "Delete t_hread"
 msgstr "Diskurs e_ntfernen"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:696
 msgid "Cancel a news message"
 msgstr "New_s-Beitrag annullieren"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:699 src/mainwindow.c:700 src/summaryview.c:428
 msgid "_Mark"
 msgstr "_Markieren"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:701
 msgid "_Unmark"
 msgstr "_Demarkieren"
 
-#: src/mainwindow.c:703
-msgid "Mark as unr_ead"
-msgstr "_Als ungelesen markieren"
-
 #: src/mainwindow.c:704
 msgid "Mark as rea_d"
 msgstr "Als g_elesen markieren"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:705
+msgid "Mark as unr_ead"
+msgstr "_Als ungelesen markieren"
+
+#: src/mainwindow.c:707
 msgid "Mark all read"
-msgstr "Alle als _gelesen markieren"
+msgstr "Alle als gelesen markieren"
+
+#: src/mainwindow.c:708
+msgid "Mark all unread"
+msgstr "Alle als ungelesen markieren"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
-#: src/toolbar.c:419
+#: src/mainwindow.c:710 src/prefs_filtering_action.c:199 src/toolbar.c:242
+#: src/toolbar.c:500
 msgid "Ignore thread"
 msgstr "Dis_kurs ignorieren"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:711
 msgid "Unignore thread"
 msgstr "Diskurs _nicht ignorieren"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
-#: src/toolbar.c:420
+#: src/mainwindow.c:712 src/prefs_filtering_action.c:200 src/toolbar.c:243
+#: src/toolbar.c:501
 msgid "Watch thread"
 msgstr "Diskurs be_obachten"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:713
 msgid "Unwatch thread"
 msgstr "Disk_urs nicht beobachten"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:716
 msgid "Mark as _spam"
 msgstr "Als _Spam markieren"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:717
 msgid "Mark as _ham"
 msgstr "Als Nic_ht-Spam markieren"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:720 src/prefs_filtering_action.c:181 src/toolbar.c:504
 msgid "Lock"
 msgstr "_Sperren"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:721 src/prefs_filtering_action.c:182 src/toolbar.c:505
 msgid "Unlock"
 msgstr "En_tsperren"
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:723 src/summaryview.c:429
 msgid "Color la_bel"
 msgstr "_Farbmarkierung"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:724 src/summaryview.c:430
 msgid "Ta_gs"
 msgstr "Nachrichten-Mar_ken"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "Re-_edit"
 msgstr "Ü_berarbeiten"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:730 src/messageview.c:310 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Digitale Signatur prüfen"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:735 src/messageview.c:314
 msgid "Add sender to address boo_k"
 msgstr "A_bsender ins Adressbuch übernehmen"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "C_ollect addresses"
 msgstr "Adressen sa_mmeln"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:738
 msgid "From current _folder..."
 msgstr "Aus aktuellem Ordner..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "From selected _messages..."
 msgstr "Aus gewählten Nachrichten..."
 
 # msgid "/_Tools/---"
 # msgstr "/E_xtras/---"
-#: src/mainwindow.c:740
+#: src/mainwindow.c:742
 msgid "_Filter all messages in folder"
 msgstr "All_e Nachrichten im Ordner filtern"
 
 # msgid "/_Tools/---"
 # msgstr "/E_xtras/---"
-#: src/mainwindow.c:741
+#: src/mainwindow.c:743
 msgid "Filter _selected messages"
 msgstr "_Gewählte Nachrichten filtern"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "Run folder pr_ocessing rules"
 msgstr "Ordner-Verarbeitungsregeln _anwenden"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:746 src/messageview.c:317
 msgid "_Create filter rule"
 msgstr "Filterre_gel erstellen"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
+#: src/mainwindow.c:747 src/mainwindow.c:753 src/messageview.c:318
 #: src/messageview.c:324
 msgid "_Automatically"
 msgstr "_Automatisch"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
+#: src/mainwindow.c:748 src/mainwindow.c:754 src/mainwindow.c:860
 #: src/messageview.c:319 src/messageview.c:325
 msgid "By _From"
 msgstr "_Nach Absender"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
+#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:861
 #: src/messageview.c:320 src/messageview.c:326
 msgid "By _To"
 msgstr "Nach _Empfänger"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
+#: src/mainwindow.c:750 src/mainwindow.c:756 src/messageview.c:321
 #: src/messageview.c:327
 msgid "By _Subject"
 msgstr "Nach _Betreff"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:752 src/messageview.c:323 src/summaryview.c:433
 msgid "Create processing rule"
 msgstr "_Verarbeitungsregel erstellen"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:759 src/messageview.c:330
 msgid "List _URLs..."
 msgstr "_URLs anzeigen..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:766
 msgid "Ch_eck for new messages in all folders"
 msgstr "Alle _Ordner auf neue Nachrichten prüfen"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:767
 msgid "Delete du_plicated messages"
 msgstr "_Doppelte Nachrichten löschen"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "In selected folder"
 msgstr "In gewähltem Ordner"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "In all folders"
 msgstr "In allen Ordnern"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "E_xecute"
 msgstr "Ausfü_hren"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "Exp_unge"
 msgstr "_Löschen"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "SSL/TLS cer_tificates"
 msgstr "SSL-TLS_Zertifikate"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "Filtering Lo_g"
 msgstr "_Filterprotokoll"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Network _Log"
 msgstr "_Netzwerkprotokoll"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "_Forget all session passwords"
 msgstr "Alle _Sitzungskennwörter verwerfen"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "Forget _master passphrase"
 msgstr "Haupt-Passphrase vergessen"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "C_hange current account"
 msgstr "Aktuelles Konto _wechseln"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:792
 msgid "_Preferences for current account..."
 msgstr "Einstellungen für akt_uelles Konto..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:793
 msgid "Create _new account..."
 msgstr "Neues _Konto erstellen..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "_Edit accounts..."
 msgstr "Konten _bearbeiten..."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "P_references..."
 msgstr "_Einstellungen..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:798
 msgid "Pre-pr_ocessing..."
 msgstr "_Vorverarbeitungsregeln..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:799
 msgid "Post-pro_cessing..."
 msgstr "_Nachverarbeitungsregeln..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "_Filtering..."
 msgstr "_Filtern..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:801
 msgid "_Templates..."
 msgstr "V_orlagen..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "_Actions..."
 msgstr "_Aktionen..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:803
 msgid "Tag_s..."
 msgstr "_Marken..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:805
 msgid "Plu_gins..."
 msgstr "Erweiterungen / _Plugins..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 msgid "_Manual"
 msgstr "_Handbuch"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:809
 msgid "_Online User-contributed FAQ"
 msgstr "_Online-FAQ mit Nutzerbeiträgen"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "Icon _Legend"
 msgstr "_Symbolerklärung"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:812
 msgid "Set as default client"
 msgstr "Als Standardanwendung setzen"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:819
 msgid "Offline _mode"
 msgstr "_Offline arbeiten"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 msgid "Men_ubar"
 msgstr "Men_üleiste"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:821
 msgid "_Message view"
 msgstr "Nachrichtenansicht"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "Status _bar"
 msgstr "Statusanzeige"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "Column headers"
 msgstr "Spaltenköpfe"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 msgid "Th_read view"
 msgstr "_Diskurs-Ansicht"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "Hide read threads"
 msgstr "Gelesene Diskurse verbergen"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "_Hide read messages"
 msgstr "_Gelesene Nachrichten verbergen"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "Hide deleted messages"
 msgstr "Gelöschte _Nachrichten verbergen"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "_Fullscreen"
 msgstr "_Vollbildansicht"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:831 src/messageview.c:342
 msgid "Show all _headers"
 msgstr "Alle _Kopfzeilen anzeigen"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:832 src/messageview.c:343
 msgid "_Collapse all"
 msgstr "Alle einklappen"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:833 src/messageview.c:344
 msgid "Collapse from level _2"
 msgstr "Ab _2. Ebene einklappen"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:834 src/messageview.c:345
 msgid "Collapse from level _3"
 msgstr "Ab _3. Ebene einklappen"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "Text _below icons"
 msgstr "Text _unter Symbolen"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "Text be_side icons"
 msgstr "Text _neben Symbolen"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "_Icons only"
 msgstr "Nur _Symbole"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:841
 msgid "_Text only"
 msgstr "Nur _Text"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "_Standard"
 msgstr "_Standard"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "_Three columns"
 msgstr "_Drei Spalten"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "_Wide message"
 msgstr "_Breite Nachrichtenansicht"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "W_ide message list"
 msgstr "Breite _Nachrichtenliste"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "S_mall screen"
 msgstr "_Ein-Feld-Anzeige"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "By _number"
 msgstr "Nummer"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "By s_ize"
 msgstr "Größe"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "By _date"
 msgstr "_Datum"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "By thread date"
 msgstr "Diskursdatum"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:862
 msgid "By s_ubject"
 msgstr "_Betreff"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:863
 msgid "By _color label"
 msgstr "Farbmarkierung"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:864
 msgid "By tag"
 msgstr "Marke"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:865
 msgid "By _mark"
 msgstr "_Markierung"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:866
 msgid "By _status"
 msgstr "Status"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:867
 msgid "By a_ttachment"
 msgstr "Anhang"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:868
 msgid "By score"
 msgstr "Bewertung"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:869
 msgid "By locked"
 msgstr "Sperre"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:870
 msgid "D_on't sort"
 msgstr "Nicht sortieren"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:874 src/prefs_summaries.c:463
 msgid "Ascending"
 msgstr "Aufsteigend"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:875 src/prefs_summaries.c:464
 msgid "Descending"
 msgstr "Absteigend"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:917 src/messageview.c:387
 msgid "_Auto detect"
 msgstr "_Automatisch erkennen"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6154
+#: src/mainwindow.c:1314 src/summaryview.c:6243
 msgid "Apply tags..."
 msgstr "Marken anwenden..."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1962
 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:1974
+#: src/mainwindow.c:1977
 msgid "You are online. Click the icon to go offline"
 msgstr "Sie sind online. Das Symbol anklicken, um offline zu gehen"
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1980
 msgid "You are offline. Click the icon to go online"
 msgstr "Sie sind offline. Das Symbol anklicken, um online zu gehen"
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1994
 msgid "Select account"
 msgstr "Konto wählen"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2021 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Netzwerkprotokoll"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2025
 msgid "Filtering/Processing debug log"
 msgstr "Filter-/Verarbeitungsprotokoll"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2044 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "Filterprotokoll aktiviert\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2046 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "Filterprotokoll deaktiviert.\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2489 src/mainwindow.c:2496 src/mainwindow.c:2539
+#: src/mainwindow.c:2572 src/mainwindow.c:2604 src/mainwindow.c:2649
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1062
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1077
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2650 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "keine"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2907 src/mainwindow.c:2911
 msgid "Delete all messages in trash folders?"
 msgstr "Alle Nachrichten in Papierkörben löschen?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2908
 msgid "Don't quit"
 msgstr "Nicht beenden"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2937 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2938
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7753,18 +7781,18 @@ msgstr ""
 "Wird eine existierende Mailbox angegeben,\n"
 "wird sie automatisch durchsucht."
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2944 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Die Mailbox '%s' existiert bereits."
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2949 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
 #: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2954 src/plugins/mailmbox/plugin_gtk.c:215 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 "
@@ -7774,84 +7802,115 @@ msgstr ""
 "Möglicherweise existieren einige Dateien bereits oder Sie haben keine "
 "Schreibrechte"
 
-#: src/mainwindow.c:3417
+#: src/mainwindow.c:3423
 msgid "No posting allowed"
 msgstr "keine Nachrichten erlaubt"
 
-#: src/mainwindow.c:4000
+#: src/mainwindow.c:4006
 msgid "Mbox import has failed."
 msgstr "Mbox-Import schlug fehl."
 
-#: src/mainwindow.c:4009 src/mainwindow.c:4018
+#: src/mainwindow.c:4015 src/mainwindow.c:4024
 msgid "Export to mbox has failed."
 msgstr "Export in Mbox schlug fehl."
 
-#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:548
+#: src/mainwindow.c:4065 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:548
+#: src/mainwindow.c:4065 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "Claws Mail beenden?"
 
-#: src/mainwindow.c:4250
+#: src/mainwindow.c:4256
 msgid "Folder synchronisation"
 msgstr "Ordner-Synchronisation"
 
-#: src/mainwindow.c:4251
+#: src/mainwindow.c:4257
 msgid "Do you want to synchronise your folders now?"
 msgstr "Sollen die Ordner jetzt synchronisiert werden?"
 
-#: src/mainwindow.c:4252
+#: src/mainwindow.c:4258
 msgid "_Synchronise"
 msgstr "_Synchronisieren"
 
-#: src/mainwindow.c:4693
+#: src/mainwindow.c:4706
 msgid "Deleting duplicated messages..."
 msgstr "Lösche doppelte Nachrichten..."
 
-#: src/mainwindow.c:4730
+#: src/mainwindow.c:4716
+msgid "No duplicate message found in selected folder.\n"
+msgstr "Keine doppelte Nachricht im gewählten Ordner gefunden.\n"
+
+#: src/mainwindow.c:4722
+#, c-format
+msgid "Deleted %d duplicate message in selected folder.\n"
+msgid_plural "Deleted %d duplicate messages in selected folder.\n"
+msgstr[0] "%d doppelte Nachricht im gewählten Ordner gelöscht.\n"
+msgstr[1] "%d doppelte Nachrichten im gewählten Ordner gelöscht.\n"
+
+#: src/mainwindow.c:4726
+#, c-format
+msgid "Marked %d duplicate message for deletion in selected folder.\n"
+msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
+msgstr[0] "%d doppelte Nachricht im gewählten Ordner zum Löschen markiert.\n"
+msgstr[1] "%d doppelte Nachrichten im gewählten Ordner zum Löschen markiert.\n"
+
+#: src/mainwindow.c:4764
+msgid "Deleting duplicated messages in all folders..."
+msgstr "Lösche doppelte Nachrichten in allen Ordnern..."
+
+#: src/mainwindow.c:4770
 #, 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[0] "%d doppelte Nachricht in %d Ordnern gelöscht.\n"
 msgstr[1] "%d doppelte Nachrichten in Ordner %d gelöscht.\n"
 
-#: src/mainwindow.c:4986 src/summaryview.c:5645
+#: src/mainwindow.c:4775
+#, c-format
+msgid "No duplicate message found in %d folders.\n"
+msgstr "Keine doppelte Nachricht in %d Ordnern gefunden.\n"
+
+#: src/mainwindow.c:4937 src/messageview.c:2657
+msgid "Select folder to go to"
+msgstr "Zielordner wählen"
+
+#: src/mainwindow.c:5038 src/summaryview.c:5734
 msgid "Processing rules to apply before folder rules"
 msgstr "Ordnerregeln vorausgehende Verarbeitungsregeln"
 
-#: src/mainwindow.c:4994
+#: src/mainwindow.c:5046
 msgid "Processing rules to apply after folder rules"
 msgstr "Ordnerregeln nachfolgende Verarbeitungsregeln"
 
-#: src/mainwindow.c:5002 src/summaryview.c:5656
+#: src/mainwindow.c:5054 src/summaryview.c:5745
 msgid "Filtering configuration"
 msgstr "Filter-Konfiguration"
 
-#: src/mainwindow.c:5117
+#: src/mainwindow.c:5169
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Registrierung als Standardanwendung schlug fehl: Pfad zur ausführbaren Datei "
 "wurde nicht gefunden."
 
-#: src/mainwindow.c:5176
+#: src/mainwindow.c:5228
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail wurde als Standardanwendung eingetragen."
 
-#: src/mainwindow.c:5178
+#: src/mainwindow.c:5230
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Eintragung als Standardanwendung schlug fehl: es konnte nicht in die "
 "Registry geschrieben werden."
 
-#: src/mainwindow.c:5192 src/setup.c:91
+#: src/mainwindow.c:5244 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Ordner %s%c%s wird durchsucht..."
 
-#: src/mainwindow.c:5336
+#: src/mainwindow.c:5388
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7881,7 +7940,7 @@ msgid "tag"
 msgstr "Marke"
 
 #: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
-#: src/message_search.c:212 src/prefs_matcher.c:742 src/summary_search.c:466
+#: src/message_search.c:212 src/prefs_matcher.c:743 src/summary_search.c:514
 msgid "Case sensitive"
 msgstr "Groß-/Kleinschreibung"
 
@@ -7889,21 +7948,21 @@ msgstr "Groß-/Kleinschreibung"
 msgid "Case insensitive"
 msgstr "Unabhängig von Groß- oder Kleinschreibung"
 
-#: src/matcher.c:1849
+#: src/matcher.c:1862
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "prüfe, ob Nachricht auf [ %s ] passt\n"
 
-#: src/matcher.c:1920 src/matcher.c:1939 src/matcher.c:1952
+#: src/matcher.c:1933 src/matcher.c:1952 src/matcher.c:1965
 msgid "message matches\n"
 msgstr "Nachricht ist passend\n"
 
-#: src/matcher.c:1927 src/matcher.c:1945 src/matcher.c:1954
+#: src/matcher.c:1940 src/matcher.c:1958 src/matcher.c:1967
 msgid "message does not match\n"
 msgstr "Nachricht ist unpassend\n"
 
-#: src/matcher.c:2217 src/matcher.c:2218 src/matcher.c:2219 src/matcher.c:2220
-#: src/matcher.c:2221 src/matcher.c:2222 src/matcher.c:2223 src/matcher.c:2224
+#: src/matcher.c:2230 src/matcher.c:2231 src/matcher.c:2232 src/matcher.c:2233
+#: src/matcher.c:2234 src/matcher.c:2235 src/matcher.c:2236 src/matcher.c:2237
 msgid "(none)"
 msgstr "(nichts)"
 
@@ -7931,8 +7990,8 @@ 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:551 src/messageview.c:1842 src/mimeview.c:1842
-#: src/prefs_themes.c:533 src/textview.c:3076
+#: src/mbox.c:551 src/messageview.c:1864 src/mimeview.c:1843
+#: src/prefs_themes.c:561 src/textview.c:3086
 msgid "Overwrite"
 msgstr "Überschreiben"
 
@@ -7957,11 +8016,11 @@ msgstr "In aktueller Nachricht suchen"
 msgid "Find text:"
 msgstr "Textsuche nach:"
 
-#: src/message_search.c:328 src/summary_search.c:779
+#: src/message_search.c:328 src/summary_search.c:838
 msgid "Search failed"
 msgstr "Suche schlug fehl"
 
-#: src/message_search.c:329 src/summary_search.c:780
+#: src/message_search.c:329 src/summary_search.c:839
 msgid "Search string not found."
 msgstr "Suchbegriff nicht gefunden."
 
@@ -7973,23 +8032,23 @@ msgstr "Anfang der Nachricht erreicht; vom Ende fortsetzen?"
 msgid "End of message reached; continue from beginning?"
 msgstr "Ende der Nachricht erreicht; vom Anfang fortsetzen?"
 
-#: src/message_search.c:344 src/summary_search.c:791
+#: src/message_search.c:344 src/summary_search.c:850
 msgid "Search finished"
 msgstr "Suche beendet"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:297 src/textview.c:252
 msgid "Compose _new message"
 msgstr "_Neue Nachricht verfassen"
 
-#: src/messageview.c:713 src/messageview.c:1433 src/messageview.c:1584
+#: src/messageview.c:712 src/messageview.c:1455 src/messageview.c:1606
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Nachrichtenansicht"
 
-#: src/messageview.c:840
+#: src/messageview.c:842
 msgid "<No Return-Path found>"
 msgstr "<Kein Antwortpfad gefunden>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8004,64 +8063,66 @@ msgstr ""
 "Antwortpfad: %s\n"
 "Es wird empfohlen, keine Empfangsbestätigung zu senden."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:884
 msgid "_Don't Send"
 msgstr "Nicht Sen_den"
 
-#: src/messageview.c:868
+#: src/messageview.c:875
+#, c-format
+msgctxt "'%s' stands for 'To' then 'Cc'"
 msgid ""
 "This message is asking for a return receipt notification\n"
-"but according to its 'To:' and 'CC:' headers it was not\n"
+"but according to its '%s' and '%s' headers it was not\n"
 "officially addressed to you.\n"
 "It is advised to not send the return receipt."
 msgstr ""
 "Diese Nachricht bittet um eine Empfangsbestätigung,\n"
-"aber nach ihren 'An:'- und 'Cc:'-Angaben ist sie nicht\n"
+"aber nach den '%s'- und '%s'-Angaben ist sie nicht\n"
 "offiziell an Sie adressiert.\n"
 "Es wird empfohlen, keine Empfangsbestätigung zu senden."
 
-#: src/messageview.c:1363
+#: src/messageview.c:1385
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Nachricht (%s) wird abgeholt..."
 
-#: src/messageview.c:1399 src/procmime.c:1008
+#: src/messageview.c:1421 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Entschlüsseln schlug fehl: %s"
 
-#: src/messageview.c:1480 src/messageview.c:1488
+#: src/messageview.c:1502 src/messageview.c:1510
 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:1834 src/messageview.c:1837 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4747
-#: src/summaryview.c:4750 src/textview.c:3064
+#: src/messageview.c:1856 src/messageview.c:1859 src/mimeview.c:2048
+#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4838
+#: src/summaryview.c:4841 src/textview.c:3074
 msgid "Save as"
 msgstr "Speichern als"
 
-#: src/messageview.c:1843
+#: src/messageview.c:1865
 msgid "Overwrite existing file?"
 msgstr "Existierende Datei überschreiben?"
 
-#: src/messageview.c:1851 src/summaryview.c:4767 src/summaryview.c:4770
-#: src/summaryview.c:4785
+#: src/messageview.c:1873 src/summaryview.c:4858 src/summaryview.c:4861
+#: src/summaryview.c:4876
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Datei '%s' konnte nicht gespeichert werden."
 
-#: src/messageview.c:1904
+#: src/messageview.c:1926
 #, c-format
 msgid "Show all %s."
 msgstr "Alle %s anzeigen."
 
-#: src/messageview.c:1906
+#: src/messageview.c:1928
 msgid "Only the first megabyte of text is shown."
 msgstr "Nur das erste Megabyte an Text wird angezeigt."
 
-#: src/messageview.c:1937
+#: src/messageview.c:1959
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8069,19 +8130,19 @@ msgstr ""
 "Sie haben eine Empfangsbestätigung für diese Nachricht: Der Empfänger hat "
 "sie geöffnet."
 
-#: src/messageview.c:1940
+#: src/messageview.c:1962
 msgid "You asked for a return receipt in this message."
 msgstr "Sie haben eine Empfangsbestätigung für diese Nachricht erbeten."
 
-#: src/messageview.c:1946
+#: src/messageview.c:1968
 msgid "This message asks for a return receipt."
 msgstr "Diese Nachricht erwartet eine Empfangsbestätigung."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1969
 msgid "Send receipt"
 msgstr "Bestätigung senden"
 
-#: src/messageview.c:1990
+#: src/messageview.c:2012
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8089,7 +8150,7 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen\n"
 "und auf dem Server gelöscht."
 
-#: src/messageview.c:1996
+#: src/messageview.c:2018
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8098,15 +8159,15 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s groß."
 
-#: src/messageview.c:2000 src/messageview.c:2022
+#: src/messageview.c:2022 src/messageview.c:2044
 msgid "Mark for download"
 msgstr "Zum Herunterladen markieren"
 
-#: src/messageview.c:2001 src/messageview.c:2013
+#: src/messageview.c:2023 src/messageview.c:2035
 msgid "Mark for deletion"
 msgstr "Zum Löschen markieren"
 
-#: src/messageview.c:2006
+#: src/messageview.c:2028
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8115,12 +8176,12 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s groß und wird heruntergeladen."
 
-#: src/messageview.c:2011 src/messageview.c:2024
-#: src/prefs_filtering_action.c:180
+#: src/messageview.c:2033 src/messageview.c:2046
+#: src/prefs_filtering_action.c:180 src/toolbar.c:503
 msgid "Unmark"
 msgstr "Demarkieren"
 
-#: src/messageview.c:2017
+#: src/messageview.c:2039
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8129,11 +8190,11 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s und wird gelöscht werden."
 
-#: src/messageview.c:2090
+#: src/messageview.c:2112
 msgid "Return Receipt Notification"
 msgstr "Empfangsbestätigung"
 
-#: src/messageview.c:2091
+#: src/messageview.c:2113
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8145,19 +8206,19 @@ msgstr ""
 "Bitte wählen Sie, welches Konto Sie zum Senden der Empfangsbestätigung "
 "verwenden möchten:"
 
-#: src/messageview.c:2095 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2117 src/plugins/rssyl/rssyl_feed_props.c:506
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: src/messageview.c:2095
+#: src/messageview.c:2117
 msgid "_Send Notification"
 msgstr "Benachrichtigung _senden"
 
-#: src/messageview.c:2184
+#: src/messageview.c:2206
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Drucken schlug fehl: Die Nachricht enthält keinen Text."
 
-#: src/messageview.c:2944
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8165,7 +8226,7 @@ msgstr ""
 "\n"
 "  Keine Nachrichten in diesem Ordner"
 
-#: src/messageview.c:2952
+#: src/messageview.c:2975
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8173,7 +8234,7 @@ msgstr ""
 "\n"
 "  Nachricht wurde gelöscht"
 
-#: src/messageview.c:2953
+#: src/messageview.c:2976
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8181,8 +8242,8 @@ msgstr ""
 "\n"
 "  Nachricht wurde in den Papierkorb oder einen anderen Ordner verschoben"
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4128
-#: src/summaryview.c:6923
+#: src/messageview.c:3009 src/messageview.c:3015 src/summaryview.c:4251
+#: src/summaryview.c:7010
 msgid "An error happened while learning.\n"
 msgstr "Beim Lernen ist ein Fehler aufgetreten.\n"
 
@@ -8190,7 +8251,7 @@ msgstr "Beim Lernen ist ein Fehler aufgetreten.\n"
 msgid "Moving messages..."
 msgstr "Nachrichten werden verschoben..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:838
 msgid "Deleting messages..."
 msgstr "Nachrichten werden gelöscht..."
 
@@ -8209,7 +8270,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/mh_gtk.c:364 src/plugins/mailmbox/plugin_gtk.c:298
+#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:298
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
@@ -8218,7 +8279,7 @@ msgstr ""
 "Mailbox '%s' wirklich entfernen?\n"
 "(Nachrichten werden NICHT vom Datenträger gelöscht)"
 
-#: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:300
+#: src/mh_gtk.c:376 src/plugins/mailmbox/plugin_gtk.c:300
 msgid "Remove mailbox"
 msgstr "Mailbox entfernen"
 
@@ -8291,31 +8352,74 @@ msgstr "Digitale Signatur wird überprüft..."
 msgid "Go back to email"
 msgstr "Zurück zur E-Mail"
 
-#: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:1761 src/mimeview.c:1853 src/mimeview.c:2095
+#: src/mimeview.c:2131 src/mimeview.c:2243 src/plugins/fancy/fancy_viewer.c:416
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Teil einer mehrteiligen Nachricht konnte nicht gespeichert werden: %s"
 
-#: src/mimeview.c:1839 src/textview.c:3074
+#: src/mimeview.c:1840 src/textview.c:3084
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Existierende Datei '%s' überschreiben?"
 
-#: src/mimeview.c:1881 src/plugins/archive/archiver_prefs.c:126
+#: src/mimeview.c:1864
+#, c-format
+msgid ""
+"An error has occurred while saving message part #%d. Do you want to cancel "
+"operation or skip error and continue?"
+msgstr ""
+"Fehler beim Speichern des Nachrichtenteils #%d. Soll der Vorgang abgebrochen "
+"werden oder der Fehler übersprungen werden?"
+
+#: src/mimeview.c:1867
+msgid "Error saving all message parts"
+msgstr "Fehler beim Speichern der Nachrichtenteile"
+
+#: src/mimeview.c:1868
+msgid "Skip"
+msgstr "Überspringen"
+
+#: src/mimeview.c:1868
+msgid "Skip all"
+msgstr "Alle überspringen"
+
+#: src/mimeview.c:1878
+#, c-format
+msgid "%d file saved successfully."
+msgid_plural "%d files saved successfully."
+msgstr[0] "%d Datei erfolgreich gespeichert."
+msgstr[1] "%d Dateien erfolgreich gespeichert."
+
+#: src/mimeview.c:1886
+#, c-format
+msgid "%d file saved successfully"
+msgid_plural "%d files saved successfully"
+msgstr[0] "%d Datei erfolgreich gespeichert"
+msgstr[1] "%d Dateien erfolgreich gespeichert"
+
+#: src/mimeview.c:1891
+#, c-format
+msgid "%s, %d file failed."
+msgid_plural "%s, %d files failed."
+msgstr[0] "%s, %d Datei fehlgeschlagen."
+msgstr[1] "%s, %d Dateien fehlgeschlagen."
+
+#: src/mimeview.c:1924 src/plugins/archive/archiver_prefs.c:142
+#: src/prefs_filtering_action.c:1297
 msgid "Select destination folder"
 msgstr "Zielordner auswählen"
 
-#: src/mimeview.c:1888 src/plugins/archive/archiver_prefs.c:132
+#: src/mimeview.c:1931 src/plugins/archive/archiver_prefs.c:148
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' ist kein Ordner."
 
-#: src/mimeview.c:2125 src/mimeview.c:2132 src/textview.c:2991
+#: src/mimeview.c:2178 src/mimeview.c:2185 src/textview.c:3001
 msgid "Open with"
 msgstr "Öffnen mit"
 
-#: src/mimeview.c:2126 src/mimeview.c:2133 src/textview.c:2992
+#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3002
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8324,7 +8428,7 @@ msgstr ""
 "Geben Sie den Befehl zum Öffnen der Datei ein:\n"
 "('%s' wird durch den Dateinamen ersetzt)"
 
-#: src/mimeview.c:2228
+#: src/mimeview.c:2281
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8335,11 +8439,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2236
+#: src/mimeview.c:2289
 msgid "Execute untrusted binary?"
 msgstr "Fremde Programmdatei ausführen?"
 
-#: src/mimeview.c:2237
+#: src/mimeview.c:2290
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8351,20 +8455,20 @@ msgstr ""
 "\n"
 "Möchten Sie diese Datei ausführen?"
 
-#: src/mimeview.c:2241
+#: src/mimeview.c:2294
 msgid "Run binary"
 msgstr "Programmdatei ausführen"
 
-#: src/mimeview.c:2543 src/plugins/att_remover/att_remover.c:299
+#: src/mimeview.c:2596 src/plugins/att_remover/att_remover.c:299
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/mimeview.c:2544 src/plugins/att_remover/att_remover.c:300
-#: src/plugins/pdf_viewer/poppler_viewer.c:697 src/summaryview.c:2653
+#: src/mimeview.c:2597 src/plugins/att_remover/att_remover.c:300
+#: src/plugins/pdf_viewer/poppler_viewer.c:697 src/summaryview.c:2698
 msgid "Size:"
 msgstr "Größe:"
 
-#: src/mimeview.c:2558 src/plugins/vcalendar/vcalendar.c:1265
+#: src/mimeview.c:2611 src/plugins/vcalendar/vcalendar.c:1265
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1709
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
 msgid "Description:"
@@ -8631,7 +8735,7 @@ msgid "Laptop LED"
 msgstr "Laptop-LED"
 
 #: src/plugins/address_keeper/address_keeper.c:252
-#: src/plugins/attachwarner/attachwarner.c:256
+#: src/plugins/attachwarner/attachwarner.c:257
 msgid "Failed to register check before send hook"
 msgstr "Registrieren des 'check before send'-Hooks schlug fehl"
 
@@ -8641,63 +8745,59 @@ msgstr "Fügt alle Empfängeradressen in einen Adressbuch-Ordner ein."
 
 #: src/plugins/address_keeper/address_keeper.c:333
 #: src/plugins/address_keeper/address_keeper.h:32
-#: src/plugins/address_keeper/address_keeper_prefs.c:257
+#: src/plugins/address_keeper/address_keeper_prefs.c:274
 msgid "Address Keeper"
 msgstr "Adressbewahrer"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:106
+#: src/plugins/address_keeper/address_keeper_prefs.c:108
 msgid "Address book location"
 msgstr "Adressbuch-Pfad"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:111
+#: src/plugins/address_keeper/address_keeper_prefs.c:113
 msgid "Keep to folder"
 msgstr "In Ordner speichern"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:119
+#: src/plugins/address_keeper/address_keeper_prefs.c:121
 msgid "Address book path where addresses are kept"
 msgstr "Pfad zum Adressbuch, in dem die Adressen gespeichert werden"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:121
+#: src/plugins/address_keeper/address_keeper_prefs.c:123
 #: src/plugins/bogofilter/bogofilter_gtk.c:278
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:446
+#: src/plugins/spamassassin/spamassassin_gtk.c:447
 #: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
 #: src/prefs_matcher.c:679
 msgid "Select..."
 msgstr "Auswählen..."
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:137
+#: src/plugins/address_keeper/address_keeper_prefs.c:139
 msgid "Fields to keep addresses from"
 msgstr "Felder, deren Adressen gespeichert werden"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:144
-msgid "Keep addresses which appear in 'To' headers"
-msgstr "Adressen aus 'An'-Kopfzeile speichern"
-
-#: src/plugins/address_keeper/address_keeper_prefs.c:153
-msgid "Keep addresses which appear in 'Cc' headers"
-msgstr "Adressen aus 'Cc'-Kopfzeile speichern"
-
-#: src/plugins/address_keeper/address_keeper_prefs.c:162
-msgid "Keep addresses which appear in 'Bcc' headers"
-msgstr "Adressen aus 'Bcc'-Kopfzeile speichern"
+#: src/plugins/address_keeper/address_keeper_prefs.c:147
+#: src/plugins/address_keeper/address_keeper_prefs.c:161
+#: src/plugins/address_keeper/address_keeper_prefs.c:175
+#, c-format
+msgctxt "address keeper: %s stands for a header name"
+msgid "Keep addresses which appear in '%s' headers"
+msgstr "Adressen aus '%s'-Kopfzeile behalten"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:168
+#: src/plugins/address_keeper/address_keeper_prefs.c:185
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
 "Adressen ausschließen, wenn die folgenden Regulären Ausdrücke zutreffen "
 "(einer pro Zeile):"
 
-#: src/plugins/archive/archiver.c:43 src/plugins/archive/archiver_prefs.c:91
+#: src/plugins/archive/archiver.c:45 src/plugins/archive/archiver_prefs.c:107
 msgid "Mail Archiver"
 msgstr "Mail-Archiver"
 
-#: src/plugins/archive/archiver.c:54
+#: src/plugins/archive/archiver.c:56
 msgid "Create Archive..."
 msgstr "Erstelle Archiv..."
 
-#: src/plugins/archive/archiver.c:122
+#: src/plugins/archive/archiver.c:123
 #, c-format
 msgid ""
 "This plugin adds archiving features to Claws Mail.\n"
@@ -8708,11 +8808,7 @@ msgid ""
 "Several archiving options are also available.\n"
 "\n"
 "The archive can be stored as:\n"
-"\tTAR\n"
-"\tPAX\n"
-"\tSHAR\n"
-"\tCPIO\n"
-"\n"
+"%s\n"
 "The archive can be compressed using:\n"
 "%s\n"
 "The archives can be restored with any standard tool that supports the chosen "
@@ -8733,11 +8829,7 @@ msgstr ""
 "Verschiedene Archivierungsoptionen sind verfügbar.\n"
 "\n"
 "Das Archiv kann gespeichert werden als:\n"
-"\tTAR\n"
-"\tPAX\n"
-"\tSHAR\n"
-"\tCPIO\n"
-"\n"
+"%s\n"
 "Das Archiv kann komprimiert werden mit:\n"
 "%s\n"
 "Die Archive können mit jedem Standardwerkzeug wiederhergestellt werden, das "
@@ -8750,52 +8842,80 @@ msgstr ""
 "Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/Mail-"
 "Archiver"
 
-#: src/plugins/archive/archiver.c:152
+#: src/plugins/archive/archiver.c:170
 msgid "Archiver"
 msgstr "Archivierer"
 
-#: src/plugins/archive/archiver_gtk.c:104
+#: src/plugins/archive/archiver_gtk.c:107
 msgid "Archiving"
 msgstr "Archiviere"
 
-#: src/plugins/archive/archiver_gtk.c:122
+#: src/plugins/archive/archiver_gtk.c:125
 msgid "Press Cancel button to stop archiving"
 msgstr "Abbrechen-Schaltfläche drücken um Archivierung abzubrechen"
 
-#: src/plugins/archive/archiver_gtk.c:138
+#: src/plugins/archive/archiver_gtk.c:141
 msgid "Archiving:"
 msgstr "Archiviere:"
 
-#: src/plugins/archive/archiver_gtk.c:507
-msgid "Folder and archive must be selected"
-msgstr "Ordner und Archiv müssen ausgewählt sein"
+#: src/plugins/archive/archiver_gtk.c:525
+#, c-format
+msgid ""
+"Some uninitialized data prevents from starting\n"
+"the archiving process:\n"
+"%s%s"
+msgstr ""
+"Nicht initialisierte Daten verhindern den Start\n"
+"der Archivierung:\n"
+"%s%s"
 
-#: src/plugins/archive/archiver_gtk.c:516
+#: src/plugins/archive/archiver_gtk.c:528
+msgid ""
+"\n"
+"- the folder to archive is not set"
+msgstr ""
+"\n"
+"- Archiv-Ordner nicht gesetzt"
+
+#: src/plugins/archive/archiver_gtk.c:529
+msgid ""
+"\n"
+"- the name for archive is not set"
+msgstr ""
+"\n"
+" - Archiv-Name nicht gesetzt"
+
+#: src/plugins/archive/archiver_gtk.c:552
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s: Existiert bereits. Trotzdem fortfahren?"
 
-#: src/plugins/archive/archiver_gtk.c:519
+#: src/plugins/archive/archiver_gtk.c:555
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: ist eine Verknüpfung. Kann nicht fortfahren."
 
-#: src/plugins/archive/archiver_gtk.c:522
+#: src/plugins/archive/archiver_gtk.c:558
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: ist ein Verzeichnis. Kann nicht fortfahren."
 
-#: src/plugins/archive/archiver_gtk.c:525
+#: src/plugins/archive/archiver_gtk.c:561
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: fehlende Rechte. Kann nicht fortfahren."
 
-#: src/plugins/archive/archiver_gtk.c:528
+#: src/plugins/archive/archiver_gtk.c:564
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: unbekannter Fehler. Kann nicht fortfahren."
 
-#: src/plugins/archive/archiver_gtk.c:565
+#: src/plugins/archive/archiver_gtk.c:572
+#: src/plugins/archive/archiver_gtk.c:619
+msgid "Creating archive"
+msgstr "Erstelle Archiv"
+
+#: src/plugins/archive/archiver_gtk.c:585
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -8804,7 +8924,7 @@ msgstr ""
 "Ungültiger Dateiname:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:578
+#: src/plugins/archive/archiver_gtk.c:590
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -8813,7 +8933,7 @@ msgstr ""
 "Ungültiger Claws Mail-Ordner:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:607
+#: src/plugins/archive/archiver_gtk.c:614
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -8828,185 +8948,189 @@ msgstr ""
 "\n"
 "Trotzdem fortfahren?"
 
-#: src/plugins/archive/archiver_gtk.c:709
+#: src/plugins/archive/archiver_gtk.c:631
+#, c-format
+msgid ""
+"Archive creation error:\n"
+"%s"
+msgstr ""
+"Fehler beim Erstellen des Archivs:\n"
+"%s"
+
+#: src/plugins/archive/archiver_gtk.c:743
 msgid "Archive result"
 msgstr "Ergebnis des Archivierens"
 
 # UI adapted
-#: src/plugins/archive/archiver_gtk.c:739
+#: src/plugins/archive/archiver_gtk.c:773
 msgid "Values"
 msgstr "Wert"
 
-#: src/plugins/archive/archiver_gtk.c:748
+#: src/plugins/archive/archiver_gtk.c:782
 msgid "Archive"
 msgstr "Archiv"
 
-#: src/plugins/archive/archiver_gtk.c:754
+#: src/plugins/archive/archiver_gtk.c:788
 msgid "Archive format"
 msgstr "Archivformat"
 
-#: src/plugins/archive/archiver_gtk.c:761
+#: src/plugins/archive/archiver_gtk.c:795
 msgid "Compression method"
 msgstr "Kompressionsmethode"
 
-#: src/plugins/archive/archiver_gtk.c:769
+#: src/plugins/archive/archiver_gtk.c:803
 msgid "Number of files"
 msgstr "Anzahl Dateien"
 
-#: src/plugins/archive/archiver_gtk.c:777
+#: src/plugins/archive/archiver_gtk.c:811
 msgid "Archive Size"
 msgstr "Archivgröße"
 
-#: src/plugins/archive/archiver_gtk.c:785
+#: src/plugins/archive/archiver_gtk.c:819
 msgid "Folder Size"
 msgstr "Ordnergröße"
 
-#: src/plugins/archive/archiver_gtk.c:794
+#: src/plugins/archive/archiver_gtk.c:828
 msgid "Compression level"
 msgstr "Kompressionsstärke"
 
-#: src/plugins/archive/archiver_gtk.c:799
-#: src/plugins/archive/archiver_gtk.c:807
-#: src/plugins/archive/archiver_gtk.c:815
+#: src/plugins/archive/archiver_gtk.c:833
+#: src/plugins/archive/archiver_gtk.c:841
+#: src/plugins/archive/archiver_gtk.c:849
 #: src/plugins/pdf_viewer/poppler_viewer.c:716 src/prefs_folder_item.c:522
 msgid "Yes"
 msgstr "ja"
 
-#: src/plugins/archive/archiver_gtk.c:799
-#: src/plugins/archive/archiver_gtk.c:807
-#: src/plugins/archive/archiver_gtk.c:815
+#: src/plugins/archive/archiver_gtk.c:833
+#: src/plugins/archive/archiver_gtk.c:841
+#: src/plugins/archive/archiver_gtk.c:849
 #: src/plugins/pdf_viewer/poppler_viewer.c:719 src/prefs_folder_item.c:521
-#: src/prefs_summaries.c:372
+#: src/prefs_summaries.c:380
 msgid "No"
 msgstr "Nein"
 
-#: src/plugins/archive/archiver_gtk.c:802
+#: src/plugins/archive/archiver_gtk.c:836
 msgid "MD5 checksum"
 msgstr "MD5-Prüfsumme"
 
-#: src/plugins/archive/archiver_gtk.c:810
+#: src/plugins/archive/archiver_gtk.c:844
 msgid "Descriptive names"
 msgstr "Aussagekräftige Namen"
 
-#: src/plugins/archive/archiver_gtk.c:818
+#: src/plugins/archive/archiver_gtk.c:852
 msgid "Delete selected files"
 msgstr "Ausgewählte Dateien löschen"
 
-#: src/plugins/archive/archiver_gtk.c:827
-#: src/plugins/archive/archiver_gtk.c:1203
+#: src/plugins/archive/archiver_gtk.c:861
+#: src/plugins/archive/archiver_gtk.c:1324
 msgid "Select mails before"
 msgstr "Wähle Nachrichten vor Datum"
 
-#: src/plugins/archive/archiver_gtk.c:903
+#: src/plugins/archive/archiver_gtk.c:917
+msgid "Select folder to archive"
+msgstr "Archivordner wählen"
+
+#: src/plugins/archive/archiver_gtk.c:938
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Dateiname für Archiv angeben [die Endung sollte das Archivformat "
 "wiedergeben, wie zum Beispiel .tgz]"
 
-#: src/plugins/archive/archiver_gtk.c:951
+#: src/plugins/archive/archiver_gtk.c:986
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld von %ld"
 
-#: src/plugins/archive/archiver_gtk.c:988
+#: src/plugins/archive/archiver_gtk.c:1038
 msgid "Create Archive"
 msgstr "Archiv erstellen"
 
-#: src/plugins/archive/archiver_gtk.c:1003
+#: src/plugins/archive/archiver_gtk.c:1053
 msgid "Enter Archiver arguments"
 msgstr "Einstellungen zum Archivieren"
 
-#: src/plugins/archive/archiver_gtk.c:1016
+#: src/plugins/archive/archiver_gtk.c:1066
 msgid "Folder to archive"
 msgstr "Ordner für das Archiv"
 
-#: src/plugins/archive/archiver_gtk.c:1023
+#: src/plugins/archive/archiver_gtk.c:1073
 msgid "Folder which is the root of the archive"
-msgstr "Ordner fürdas Wurzelverzeichnis des Archivs"
+msgstr "Ordner für das Wurzelverzeichnis des Archivs"
 
-#: src/plugins/archive/archiver_gtk.c:1028
+#: src/plugins/archive/archiver_gtk.c:1078
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 "Klicken Sie auf diese Schaltfläche, um einen Ordner zum Speichern des "
 "Archivs zu wählen."
 
-#: src/plugins/archive/archiver_gtk.c:1034
+#: src/plugins/archive/archiver_gtk.c:1084
 msgid "Name for archive"
 msgstr "Name für das Archiv"
 
-#: src/plugins/archive/archiver_gtk.c:1040
+#: src/plugins/archive/archiver_gtk.c:1090
 msgid "Archive location and name"
 msgstr "Archivpfad und -name"
 
-#: src/plugins/archive/archiver_gtk.c:1042
-#: src/plugins/archive/archiver_prefs.c:194
+#: src/plugins/archive/archiver_gtk.c:1092
+#: src/plugins/archive/archiver_prefs.c:225
 #: src/plugins/pgpcore/select-keys.c:421
 msgid "_Select"
 msgstr "_Wählen"
 
-#: src/plugins/archive/archiver_gtk.c:1045
+#: src/plugins/archive/archiver_gtk.c:1095
 msgid "Click this button to select a name and location for the archive"
 msgstr ""
 "Klicken Sie auf diese Schaltfläche, um einen Name und einen Speicherplatz "
-"für das Archiv zu wählen"
-
-#: src/plugins/archive/archiver_gtk.c:1047
-msgid "Choose compression"
-msgstr "Kompression wählen"
-
-#: src/plugins/archive/archiver_gtk.c:1060
-msgid "Choose this option to use ZIP compression for the archive"
-msgstr "Diese Option wählen, um das Archiv per ZIP zu komprimieren"
-
-#: src/plugins/archive/archiver_gtk.c:1067
-msgid "Choose this option to use BZIP2 compression for the archive"
-msgstr "Diese Option wählen, um das Archiv per BZIP2 zu komprimieren"
-
-#: src/plugins/archive/archiver_gtk.c:1074
-msgid "Choose this to use Compress compression for your archive"
-msgstr "Diese Option wählen, um das Archiv per COMPRESS zu komprimieren"
-
-#: src/plugins/archive/archiver_gtk.c:1081
-msgid "Choose this option to disable compression for the archive"
-msgstr "Diese Option wählen, um das Archiv nicht zu komprimieren"
-
-#: src/plugins/archive/archiver_gtk.c:1101
-msgid "Choose format"
-msgstr "Format wählen"
+"für das Archiv zu wählen"
 
-#: src/plugins/archive/archiver_gtk.c:1114
-msgid "Choose this option to use TAR as format for the archive"
-msgstr "Diese Option wählen, um das TAR als Archivformat zu verwenden"
+#: src/plugins/archive/archiver_gtk.c:1097
+msgid "Choose compression"
+msgstr "Kompression wählen"
 
+#: src/plugins/archive/archiver_gtk.c:1109
+#: src/plugins/archive/archiver_gtk.c:1115
 #: src/plugins/archive/archiver_gtk.c:1121
-msgid "Choose this to use SHAR as format for the archive"
-msgstr "Diese Option wählen, um das SHAR als Archivformat zu verwenden"
-
 #: src/plugins/archive/archiver_gtk.c:1128
-msgid "Choose this option to use CPIO as format for the archive"
-msgstr "Diese Option wählen, um das CPIO als Archivformat zu verwenden"
+#: src/plugins/archive/archiver_gtk.c:1134
+#: src/plugins/archive/archiver_gtk.c:1142
+#: src/plugins/archive/archiver_gtk.c:1150
+#: src/plugins/archive/archiver_gtk.c:1156
+#: src/plugins/archive/archiver_gtk.c:1162
+#: src/plugins/archive/archiver_gtk.c:1170
+#: src/plugins/archive/archiver_gtk.c:1177
+#, c-format
+msgid "Choose this option to use %s compression for the archive"
+msgstr "Diese Option wählen, um das Archiv per %s zu komprimieren"
+
+#: src/plugins/archive/archiver_gtk.c:1226
+msgid "Choose format"
+msgstr "Format wählen"
 
-#: src/plugins/archive/archiver_gtk.c:1135
-msgid "Choose this option to use PAX as format for the archive"
-msgstr "Diese Option wählen, um das PAX als Archivformat zu verwenden"
+#: src/plugins/archive/archiver_gtk.c:1238
+#: src/plugins/archive/archiver_gtk.c:1244
+#: src/plugins/archive/archiver_gtk.c:1250
+#: src/plugins/archive/archiver_gtk.c:1256
+#, c-format
+msgid "Choose this to use %s as format for the archive"
+msgstr "Diese Option wählen, um das %s als Archivformat zu verwenden"
 
-#: src/plugins/archive/archiver_gtk.c:1155
+#: src/plugins/archive/archiver_gtk.c:1276
 msgid "Miscellaneous options"
 msgstr "Weitere Optionen"
 
-#: src/plugins/archive/archiver_gtk.c:1164
+#: src/plugins/archive/archiver_gtk.c:1285
 msgid "_Recursive"
 msgstr "_Rekursiv"
 
-#: src/plugins/archive/archiver_gtk.c:1168
+#: src/plugins/archive/archiver_gtk.c:1289
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Diese Option wählen, um Unterordner im Archiv zu berücksichtigen"
 
-#: src/plugins/archive/archiver_gtk.c:1170
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: src/plugins/archive/archiver_gtk.c:1174
+#: src/plugins/archive/archiver_gtk.c:1295
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archive.\n"
 "Be aware though, that this dramatically increases the time it\n"
@@ -9017,12 +9141,12 @@ msgstr ""
 "Beachten Sie, dass dies die Zeit zum Erstellen des Archivs erheblich "
 "verlängert."
 
-#: src/plugins/archive/archiver_gtk.c:1178
+#: src/plugins/archive/archiver_gtk.c:1299
 msgid "R_ename"
 msgstr "_Umbenennen"
 
-#: src/plugins/archive/archiver_gtk.c:1182
-#: src/plugins/archive/archiver_prefs.c:325
+#: src/plugins/archive/archiver_gtk.c:1303
+#: src/plugins/archive/archiver_prefs.c:427
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
 "The naming scheme: date_from@to@subject.\n"
@@ -9033,7 +9157,7 @@ msgstr ""
 "Das Benennungsschema: Datum_von@an@Betreff.\n"
 "Die Namen werden maximal 96 Zeichen lang."
 
-#: src/plugins/archive/archiver_gtk.c:1190
+#: src/plugins/archive/archiver_gtk.c:1311
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9041,11 +9165,11 @@ msgstr ""
 "Diese Option wählen, um Mails nach dem Archivieren zu löschen. Hier werden "
 "nur lokale Mboxen, IMAP4 und POP3 berücksichtigt."
 
-#: src/plugins/archive/archiver_gtk.c:1194
+#: src/plugins/archive/archiver_gtk.c:1315
 msgid "Selection options"
 msgstr "Auswahloptionen "
 
-#: src/plugins/archive/archiver_gtk.c:1210
+#: src/plugins/archive/archiver_gtk.c:1331
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9053,70 +9177,60 @@ msgstr ""
 "E-Mails vor einem bestimmten Datum wählen\n"
 "Das Datum muss ISO-8601 entsprechen [YYYY-MM-DD]"
 
-#: src/plugins/archive/archiver_prefs.c:186
+#: src/plugins/archive/archiver_prefs.c:217
 msgid "Default save folder"
 msgstr "Standardordner"
 
-#: src/plugins/archive/archiver_prefs.c:198
+#: src/plugins/archive/archiver_prefs.c:229
 msgid "Click this button to select the default location for saving archives"
 msgstr ""
 "Klicken Sie auf diese Schaltfläche, um den Standardpfad zum Speichern von "
 "Archiven auszuwählen"
 
-#: src/plugins/archive/archiver_prefs.c:207
+#: src/plugins/archive/archiver_prefs.c:238
 msgid "Default compression"
 msgstr "Standard-Kompression"
 
-#: src/plugins/archive/archiver_prefs.c:219
-msgid "Choose this option to use ZIP compression by default"
-msgstr "Diese Option wählen, um standardmäßig ZIP-Kompression zu verwenden"
-
-#: src/plugins/archive/archiver_prefs.c:226
-msgid "Choose this option to use BZIP2 compression by default"
-msgstr "Diese Option wählen, um standardmäßig BZIP2-Kompression zu verwenden"
-
-#: src/plugins/archive/archiver_prefs.c:233
-msgid "Choose this option to use COMPRESS compression by default"
-msgstr ""
-"Diese Option wählen, um standardmäßig COMPRESS-Kompression zu verwenden"
-
-#: src/plugins/archive/archiver_prefs.c:240
-msgid "Choose this option to disable compression by default"
-msgstr "Diese Option wählen, um standardmäßig nicht zu komprimieren"
+#: src/plugins/archive/archiver_prefs.c:249
+#: src/plugins/archive/archiver_prefs.c:255
+#: src/plugins/archive/archiver_prefs.c:261
+#: src/plugins/archive/archiver_prefs.c:268
+#: src/plugins/archive/archiver_prefs.c:274
+#: src/plugins/archive/archiver_prefs.c:282
+#: src/plugins/archive/archiver_prefs.c:290
+#: src/plugins/archive/archiver_prefs.c:296
+#: src/plugins/archive/archiver_prefs.c:302
+#: src/plugins/archive/archiver_prefs.c:310
+#: src/plugins/archive/archiver_prefs.c:317
+#, c-format
+msgid "Choose this option to use %s compression by default"
+msgstr "Diese Option wählen, um standardmäßig %s-Kompression zu verwenden"
 
-#: src/plugins/archive/archiver_prefs.c:257
+#: src/plugins/archive/archiver_prefs.c:363
 msgid "Default format"
 msgstr "Standard-Format"
 
-#: src/plugins/archive/archiver_prefs.c:269
-msgid "Choose this option to use the TAR format by default"
-msgstr "Diese Option wählen, um standardmäßig das TAR-Format zu verwenden"
-
-#: src/plugins/archive/archiver_prefs.c:276
-msgid "Choose this option to use the SHAR format by default"
-msgstr "Diese Option wählen, um standardmäßig das SHAR-Format zu verwenden"
-
-#: src/plugins/archive/archiver_prefs.c:283
-msgid "Choose this option to use the CPIO format by default"
-msgstr "Diese Option wählen, um standardmäßig das CPIO-Format zu verwenden"
-
-#: src/plugins/archive/archiver_prefs.c:290
-msgid "Choose this option to use the PAX format by default"
-msgstr "Diese Option wählen, um standardmäßig das PAX-Format zu verwenden"
+#: src/plugins/archive/archiver_prefs.c:374
+#: src/plugins/archive/archiver_prefs.c:380
+#: src/plugins/archive/archiver_prefs.c:386
+#: src/plugins/archive/archiver_prefs.c:392
+#, c-format
+msgid "Choose this option to use the %s as format by default"
+msgstr "Diese Option wählen, um standardmäßig das %s-Format zu verwenden"
 
-#: src/plugins/archive/archiver_prefs.c:307
+#: src/plugins/archive/archiver_prefs.c:409
 msgid "Default miscellaneous options"
 msgstr "Weitere Standardwerte setzen"
 
-#: src/plugins/archive/archiver_prefs.c:316
+#: src/plugins/archive/archiver_prefs.c:418
 msgid "Choose this option to include subfolders in the archives by default"
 msgstr "Diese Option wählen, um standardmäßig Unterordner zu archivieren"
 
-#: src/plugins/archive/archiver_prefs.c:317
+#: src/plugins/archive/archiver_prefs.c:419
 msgid "MD5sum"
 msgstr "MD5sum"
 
-#: src/plugins/archive/archiver_prefs.c:319
+#: src/plugins/archive/archiver_prefs.c:421
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archives by "
 "default.\n"
@@ -9128,12 +9242,12 @@ msgstr ""
 "Beachten Sie, dass dies die Zeit zum Erstellen des Archivs erheblich "
 "verlängert."
 
-#: src/plugins/archive/archiver_prefs.c:323
+#: src/plugins/archive/archiver_prefs.c:425
 #: src/plugins/managesieve/sieve_manager.c:761
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: src/plugins/archive/archiver_prefs.c:331
+#: src/plugins/archive/archiver_prefs.c:433
 msgid "Choose this option to delete mails after archiving"
 msgstr "Diese Option wählen, um Mails nach dem Archivieren zu löschen"
 
@@ -9142,12 +9256,12 @@ msgid "Remove attachments"
 msgstr "Anhänge entfernen"
 
 #: src/plugins/att_remover/att_remover.c:357
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:944
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:1060
 msgid "Remove"
 msgstr "Entfernen"
 
-#: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:80 src/summaryview.c:2747
+#: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:452
+#: src/prefs_summary_column.c:80 src/summaryview.c:2792
 msgid "Attachment"
 msgstr "Anhang"
 
@@ -9211,13 +9325,13 @@ msgstr ""
 msgid "Attachment warning"
 msgstr "Warnung: fehlender Anhang?"
 
-#: src/plugins/attachwarner/attachwarner.c:249
-#: src/plugins/attachwarner/attachwarner.c:286
-#: src/plugins/attachwarner/attachwarner.c:338
+#: src/plugins/attachwarner/attachwarner.c:250
+#: src/plugins/attachwarner/attachwarner.c:287
+#: src/plugins/attachwarner/attachwarner.c:339
 msgid "Attach warner"
 msgstr "Anhangswarner"
 
-#: src/plugins/attachwarner/attachwarner.c:296
+#: src/plugins/attachwarner/attachwarner.c:297
 msgid ""
 "Warns user if some reference to attachments is found in the message text and "
 "no file is attached."
@@ -9299,15 +9413,15 @@ msgstr "Anhangswarner"
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:483
+#: src/plugins/bogofilter/bogofilter.c:456
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: hole Nachricht..."
 
-#: src/plugins/bogofilter/bogofilter.c:496
+#: src/plugins/bogofilter/bogofilter.c:469
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtere Nachricht..."
 
-#: src/plugins/bogofilter/bogofilter.c:612
+#: src/plugins/bogofilter/bogofilter.c:585
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -9319,7 +9433,7 @@ msgstr ""
 "Bitte \"/Markieren/Als (Nicht-)Spam markieren\" benutzen, um Bogofilter mit "
 "möglichst vielen (Nicht-)Spam-Nachrichten zu trainieren."
 
-#: src/plugins/bogofilter/bogofilter.c:619
+#: src/plugins/bogofilter/bogofilter.c:592
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -9328,21 +9442,21 @@ msgstr ""
 "Das Bogofilter-Plugin konnte die Nachricht nicht filtern. Der Befehl `%s %s "
 "%s` konnte nicht ausgeführt werden."
 
-#: src/plugins/bogofilter/bogofilter.c:766
+#: src/plugins/bogofilter/bogofilter.c:739
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: lerne von Nachricht..."
 
-#: src/plugins/bogofilter/bogofilter.c:779
-#: src/plugins/bogofilter/bogofilter.c:826 src/plugins/bsfilter/bsfilter.c:513
+#: src/plugins/bogofilter/bogofilter.c:752
+#: src/plugins/bogofilter/bogofilter.c:799 src/plugins/bsfilter/bsfilter.c:486
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Lernen schlug fehl; `%s` wurde mit Status %d beendet."
 
-#: src/plugins/bogofilter/bogofilter.c:794
+#: src/plugins/bogofilter/bogofilter.c:767
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: lerne von Nachrichten..."
 
-#: src/plugins/bogofilter/bogofilter.c:882
+#: src/plugins/bogofilter/bogofilter.c:855
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -9351,7 +9465,7 @@ msgstr ""
 "Lernen schlug fehl; `%s %s %s` wurde mit einem Fehler beendet:\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:1010
+#: src/plugins/bogofilter/bogofilter.c:983
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bogofilter. You will need Bogofilter installed "
@@ -9379,37 +9493,37 @@ msgstr ""
 "Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/"
 "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:676
-#: src/plugins/spamassassin/spamassassin.c:651
+#: src/plugins/bogofilter/bogofilter.c:1016 src/plugins/bsfilter/bsfilter.c:649
+#: src/plugins/spamassassin/spamassassin.c:624
 msgid "Spam detection"
 msgstr "Spam-Erkennung"
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:677
-#: src/plugins/spamassassin/spamassassin.c:652
+#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:650
+#: src/plugins/spamassassin/spamassassin.c:625
 msgid "Spam learning"
 msgstr "Lernen von Spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
 #: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:399
+#: src/plugins/spamassassin/spamassassin_gtk.c:400
 msgid "Process messages on receiving"
 msgstr "Nachrichten beim Empfang überprüfen"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
 #: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:357
+#: src/plugins/spamassassin/spamassassin_gtk.c:358
 msgid "Maximum size"
 msgstr "Maximale Größe"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
 #: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:366
+#: src/plugins/spamassassin/spamassassin_gtk.c:367
 msgid "Messages larger than this will not be checked"
 msgstr "Größere Nachrichten als diese werden nicht überprüft"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
+#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1511
 msgid "KB"
 msgstr "KB"
 
@@ -9427,7 +9541,7 @@ msgstr "Nur als Spam markieren"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:415
+#: src/plugins/spamassassin/spamassassin_gtk.c:416
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
@@ -9436,7 +9550,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:233
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:421
+#: src/plugins/spamassassin/spamassassin_gtk.c:422
 msgid "Click this button to select a folder for storing spam"
 msgstr ""
 "Klicken Sie auf diese Schaltfläche, um einen Ordner zum Speichern von Spam "
@@ -9470,13 +9584,13 @@ msgstr "nur für Nachrichten in MH-Ordnern"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:268
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:436
+#: src/plugins/spamassassin/spamassassin_gtk.c:437
 msgid "Whitelist senders found in address book/folder"
 msgstr "Im Adressbuch/Ordner gefundene, stets akzeptierte Absender"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:272
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:440
+#: src/plugins/spamassassin/spamassassin_gtk.c:441
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9486,7 +9600,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:282
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:450
+#: src/plugins/spamassassin/spamassassin_gtk.c:451
 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
 "Klicken Sie auf diese Schaltfläche, um ein Adressbuch oder einen Ordner "
@@ -9515,7 +9629,7 @@ msgstr "Pfad zur Bogofilter-Programmdatei"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:309
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:428
+#: src/plugins/spamassassin/spamassassin_gtk.c:429
 msgid "Mark spam as read"
 msgstr "Spam als gelesen markieren"
 
@@ -9523,15 +9637,15 @@ msgstr "Spam als gelesen markieren"
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter.c:300
+#: src/plugins/bsfilter/bsfilter.c:273
 msgid "Bsfilter: fetching body..."
 msgstr "Bsfilter: hole Nachrichtenkörper..."
 
-#: src/plugins/bsfilter/bsfilter.c:309
+#: src/plugins/bsfilter/bsfilter.c:282
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: filtere Nachricht..."
 
-#: src/plugins/bsfilter/bsfilter.c:394
+#: src/plugins/bsfilter/bsfilter.c:367
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -9543,7 +9657,7 @@ msgstr ""
 "Bitte \"/Markieren/Als (Nicht-)Spam markieren\" benutzen, um Bsfilter mit "
 "möglichst vielen (Nicht-)Spam-Nachrichten zu trainieren."
 
-#: src/plugins/bsfilter/bsfilter.c:401
+#: src/plugins/bsfilter/bsfilter.c:374
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
@@ -9552,11 +9666,11 @@ msgstr ""
 "Das Bsfilter-Plugin konnte die Nachricht nicht filtern. Der Befehl '%s' "
 "konnte nicht ausgeführt werden."
 
-#: src/plugins/bsfilter/bsfilter.c:502
+#: src/plugins/bsfilter/bsfilter.c:475
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: lerne von Nachricht..."
 
-#: src/plugins/bsfilter/bsfilter.c:643
+#: src/plugins/bsfilter/bsfilter.c:616
 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 "
@@ -9585,7 +9699,7 @@ msgstr ""
 "Bsfilter"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:407
+#: src/plugins/spamassassin/spamassassin_gtk.c:408
 msgid "Save spam in"
 msgstr "Speichere Spam in"
 
@@ -9606,7 +9720,7 @@ msgid "Path to bsfilter executable"
 msgstr "Pfad zur Bsfilter-Programmdatei"
 
 #: src/plugins/clamd/clamav_plugin.c:47
-#: src/plugins/clamd/clamav_plugin_gtk.c:549
+#: src/plugins/clamd/clamav_plugin_gtk.c:550
 msgid "Clam AntiVirus"
 msgstr "Clam AntiVirus"
 
@@ -9719,55 +9833,61 @@ msgstr ""
 msgid "Virus detection"
 msgstr "Virenerkennung"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:249
+# msgid "/_Tools/---"
+# msgstr "/E_xtras/---"
+#: src/plugins/clamd/clamav_plugin_gtk.c:72
+msgid "Select folder to store infected messages in"
+msgstr "Zielordner für infizierte Nachrichten wählen"
+
+#: src/plugins/clamd/clamav_plugin_gtk.c:250
 msgid "Enable virus scanning"
 msgstr "Überprüfung auf Viren aktivieren"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:259
+#: src/plugins/clamd/clamav_plugin_gtk.c:260
 msgid "Maximum attachment size"
 msgstr "Maximale Größe des Anhangs"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:270
+#: src/plugins/clamd/clamav_plugin_gtk.c:271
 msgid "Message attachments larger than this will not be scanned"
 msgstr "Anhänge größer als dieser werden nicht überprüft"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:274
+#: src/plugins/clamd/clamav_plugin_gtk.c:275
 msgid "MB"
 msgstr "MB"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:283
+#: src/plugins/clamd/clamav_plugin_gtk.c:284
 msgid "Save infected mail in"
 msgstr "Infizierte Mails speichern in"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:287
+#: src/plugins/clamd/clamav_plugin_gtk.c:288
 msgid "Save mail that contains viruses"
 msgstr "Speichere Mail, die Viren enthält"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:295
+#: src/plugins/clamd/clamav_plugin_gtk.c:296
 msgid ""
 "Folder for storing infected mail. Leave empty to use the default trash folder"
 msgstr ""
 "Ordner für infizierte Mails. Nichts eintragen, um den Papierkorb zu verwenden"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:303
+#: src/plugins/clamd/clamav_plugin_gtk.c:304
 msgid "Click this button to select a folder for storing infected mail"
 msgstr ""
 "Klicken Sie auf diese Schaltfläche, um einen Ordner für infizierte Mails "
 "auszuwählen."
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:311
+#: src/plugins/clamd/clamav_plugin_gtk.c:312
 msgid "Automatic configuration"
 msgstr "Automatische Konfiguration"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:316
+#: src/plugins/clamd/clamav_plugin_gtk.c:317
 msgid "Should configuration be done automatic or manual"
 msgstr "Soll die Konfiguration automatisch oder von Hand vorgenommen werden?"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:324
+#: src/plugins/clamd/clamav_plugin_gtk.c:325
 msgid "Where is clamd.conf"
 msgstr "Pfad zu clamd.conf"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:332
+#: src/plugins/clamd/clamav_plugin_gtk.c:333
 msgid ""
 "Full path to clamd.conf. If this field is not empty then the plugin has been "
 "able to locate the file automatically"
@@ -9775,38 +9895,38 @@ msgstr ""
 "Absoluter Pfad zu clamd.conf. Wenn dieses Feld nicht leer ist, hat das "
 "Plugin die Datei automatisch lokalisiert."
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:336
+#: src/plugins/clamd/clamav_plugin_gtk.c:337
 msgid "Br_owse"
 msgstr "Durchsuchen"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:340
+#: src/plugins/clamd/clamav_plugin_gtk.c:341
 msgid "Click this button to select full path to clamd.conf"
 msgstr ""
 "Klicken Sie auf diese Schaltfläche, um den absoluten Pfad zu clamd.conf "
 "auszuwählen."
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:348
+#: src/plugins/clamd/clamav_plugin_gtk.c:349
 msgid "Check permission for folders and adjust if necessary"
 msgstr "Die Rechte von Ordnern prüfen und gegebenenfalls anpassen."
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:361
+#: src/plugins/clamd/clamav_plugin_gtk.c:362
 msgid "Click this button to check and adjust folder permissions"
 msgstr ""
 "Klicken Sie auf diese Schaltfläche, um Ordnerrechte zu prüfen und anzupassen"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:369
+#: src/plugins/clamd/clamav_plugin_gtk.c:370
 msgid "Remote Host"
 msgstr "Remote Host"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:377
+#: src/plugins/clamd/clamav_plugin_gtk.c:378
 msgid "Hostname or IP for remote host running clamav daemon"
 msgstr "Hostname oder IP für den Remote Host, auf dem der clamav-Daemon läuft"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:397
+#: src/plugins/clamd/clamav_plugin_gtk.c:398
 msgid "Port number where clamav daemon is listening"
 msgstr "Der vom clamav-Daemon verwendete Port"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:524
+#: src/plugins/clamd/clamav_plugin_gtk.c:525
 msgid ""
 "New config\n"
 "No socket information.\n"
@@ -9816,7 +9936,7 @@ msgstr ""
 "Keine Socket-Information.\n"
 "Antivirus deaktiviert."
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:528
+#: src/plugins/clamd/clamav_plugin_gtk.c:529
 msgid ""
 "New config\n"
 "Clamd does not respond to ping.\n"
@@ -9826,7 +9946,7 @@ msgstr ""
 "Clamd antwortet nicht auf ping.\n"
 "Ist clamd aktiv?"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:117
+#: src/plugins/clamd/libclamd/clamd-plugin.c:121
 #, c-format
 msgid ""
 "%s: Unable to open\n"
@@ -9835,7 +9955,7 @@ msgstr ""
 "%s: Kann nicht geöffnet werden\n"
 "clamd wird deaktiviert"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:215
+#: src/plugins/clamd/libclamd/clamd-plugin.c:216
 #, c-format
 msgid ""
 "%s: Not able to find required information\n"
@@ -9844,30 +9964,30 @@ msgstr ""
 "%s: Kann erforderliche Informationen nicht finden\n"
 "Clamd wird deaktiviert"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:249
+#: src/plugins/clamd/libclamd/clamd-plugin.c:250
 msgid "Could not create socket"
 msgstr "Konnte Socket nicht erstellen"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:422
+#: src/plugins/clamd/libclamd/clamd-plugin.c:437
 msgid ": File does not exist"
 msgstr ": Datei existiert nicht"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:435
+#: src/plugins/clamd/libclamd/clamd-plugin.c:450
 msgid ": Unable to open"
 msgstr ": Kann nicht geöffnet werden"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:455
-#: src/plugins/clamd/libclamd/clamd-plugin.c:460
-#: src/plugins/clamd/libclamd/clamd-plugin.c:474
+#: src/plugins/clamd/libclamd/clamd-plugin.c:470
+#: src/plugins/clamd/libclamd/clamd-plugin.c:475
+#: src/plugins/clamd/libclamd/clamd-plugin.c:489
 msgid "Socket write error"
 msgstr "Socket-Schreibfehler"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:467
+#: src/plugins/clamd/libclamd/clamd-plugin.c:482
 #, c-format
 msgid "%s: Error reading"
 msgstr "%s: Fehler beim Lesen"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:481
+#: src/plugins/clamd/libclamd/clamd-plugin.c:496
 msgid "Socket read error"
 msgstr "Socket-Lesefehler"
 
@@ -10089,17 +10209,17 @@ msgstr ""
 "\n"
 "Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/Fancy"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:167
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:200
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:161
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:194
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:182
 msgid "Fetchinfo"
 msgstr "Fetchinfo"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:173
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:167
 msgid "Failed to register mail receive hook"
 msgstr "Registrieren des \"mail receive hook\" schlug fehl."
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:209
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:203
 msgid ""
 "This plugin modifies the downloaded messages. It inserts headers containing "
 "some download information: UIDL, Claws Mail account name, POP server, user "
@@ -10115,7 +10235,7 @@ msgstr ""
 "Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/"
 "Fetchinfo"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:236
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:230
 msgid "Mail marking"
 msgstr "Modifizieren von Mail-Metadaten"
 
@@ -10272,16 +10392,16 @@ msgstr ""
 "GData-Plugin: Keinen Autorisierungs-Code erhalten, breche "
 "Autorisierungsanfrage ab\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:498
+#: src/plugins/gdata/cm_gdata_contacts.c:497
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "GData-Plugin: Fehler beim Erneuern der Autorisierung: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:507
+#: src/plugins/gdata/cm_gdata_contacts.c:506
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "GData-Plugin: Erneuern der Autorisierung erfolgreich: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:568
+#: src/plugins/gdata/cm_gdata_contacts.c:566
 #, c-format
 msgid ""
 "GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
@@ -10289,7 +10409,7 @@ msgstr ""
 "GData-Plugin: Verstrichene Zeit seit letzter Aktualisierung: %d Minuten, "
 "aktualisiere jetzt\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:577
+#: src/plugins/gdata/cm_gdata_contacts.c:574
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData-Plugin: Versuche, Autorisierung zu erneuern\n"
 
@@ -10646,43 +10766,48 @@ msgstr "Verbindung unterbrochen"
 msgid "Disconnected: %s"
 msgstr "Verbindung unterbrochen: %s"
 
-#: src/plugins/managesieve/managesieve.c:724
-#: src/plugins/managesieve/managesieve.c:869
+#: src/plugins/managesieve/managesieve.c:725
+#: src/plugins/managesieve/managesieve.c:870
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr "Unbearbeitete Nachricht in der Sieve-Sitzung: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:731
+#: src/plugins/managesieve/managesieve.c:732
 msgid "STARTTLS failed"
 msgstr "STARTTLS schlug fehl"
 
-#: src/plugins/managesieve/managesieve.c:796
-#: src/plugins/managesieve/managesieve.c:812
-#: src/plugins/managesieve/managesieve.c:839
-#: src/plugins/managesieve/managesieve.c:921
-#: src/plugins/managesieve/managesieve.c:939
+#: src/plugins/managesieve/managesieve.c:797
+#: src/plugins/managesieve/managesieve.c:813
+#: src/plugins/managesieve/managesieve.c:840
+#: src/plugins/managesieve/managesieve.c:922
+#: src/plugins/managesieve/managesieve.c:940
 msgid "error occurred on SIEVE session\n"
 msgstr "Fehler bei der Sieve-Sitzung\n"
 
-#: src/plugins/managesieve/managesieve.c:865
+#: src/plugins/managesieve/managesieve.c:866
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr "Fehler bei der Sieve-Sitzung: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:874
+#: src/plugins/managesieve/managesieve.c:875
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "Unbearbeitete Nachricht in der Sieve-Sitzung: %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1131
+#: src/plugins/managesieve/managesieve.c:1132
 msgid "Sieve: retrying auth\n"
 msgstr "Sieve: Wiederhole Authentifizierungs-Versuch\n"
 
-#: src/plugins/managesieve/managesieve.c:1133
+#: src/plugins/managesieve/managesieve.c:1134
 msgid "Auth method not available"
 msgstr "Authentifizierungs-Verfahren nicht verfügbar"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5543
+#: src/plugins/managesieve/managesieve.c:1151
+#, c-format
+msgid "sending error on Sieve session: %s\n"
+msgstr "Sendefehler in Sieve-Sitzung: %s\n"
+
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5632
 msgid "_Filter"
 msgstr "_Filtern"
 
@@ -10855,7 +10980,7 @@ msgid "Require STARTTLS"
 msgstr "STARTTLS erforderlich"
 
 #: src/plugins/managesieve/sieve_prefs.c:206
-#: src/plugins/rssyl/rssyl_feed_props.c:264
+#: src/plugins/rssyl/rssyl_feed_props.c:262
 msgid "No authentication"
 msgstr "Keine Authentifizierung"
 
@@ -10875,7 +11000,7 @@ msgid "User ID"
 msgstr "Benutzer-ID"
 
 #: src/plugins/managesieve/sieve_prefs.c:250
-#: src/plugins/rssyl/rssyl_feed_props.c:395
+#: src/plugins/rssyl/rssyl_feed_props.c:393
 #: src/plugins/vcalendar/vcal_prefs.c:399
 #: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1281
 #: src/prefs_account.c:1818 src/prefs_account.c:2535 src/prefs_account.c:2557
@@ -10890,6 +11015,7 @@ msgstr "Authentifizierungsverfahren"
 
 #: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1583
 #: src/prefs_account.c:1779 src/prefs_send.c:233 src/prefs_send.c:304
+#: src/prefs_themes.c:1075
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -11057,7 +11183,7 @@ msgid "New Calendar message"
 msgstr "Neue Kalendernachricht"
 
 #: src/plugins/notification/notification_popup.c:337
-#: src/plugins/notification/notification_trayicon.c:905
+#: src/plugins/notification/notification_trayicon.c:907
 msgid "A new calendar message arrived"
 msgstr "Neue Kalendernachricht erhalten"
 
@@ -11066,7 +11192,7 @@ msgid "New RSS feed article"
 msgstr "Neuer Artikel im RSS-Feed"
 
 #: src/plugins/notification/notification_popup.c:341
-#: src/plugins/notification/notification_trayicon.c:908
+#: src/plugins/notification/notification_trayicon.c:910
 msgid "A new article in a RSS feed arrived"
 msgstr "Einen neuen Artikel eines RSS-Feeds erhalten"
 
@@ -11079,7 +11205,7 @@ msgid "Unknown message type arrived"
 msgstr "Eine Nachricht unbekannten Typs erhalten"
 
 #: src/plugins/notification/notification_popup.c:378
-#: src/plugins/notification/notification_trayicon.c:677
+#: src/plugins/notification/notification_trayicon.c:679
 msgid "Present main window"
 msgstr "Aktuelles Hauptfenster"
 
@@ -11104,7 +11230,7 @@ msgid "Calendar message"
 msgstr "Kalendernachricht"
 
 #: src/plugins/notification/notification_popup.c:501
-#: src/plugins/notification/notification_trayicon.c:942
+#: src/plugins/notification/notification_trayicon.c:944
 #, c-format
 msgid "%d new calendar message arrived"
 msgid_plural "%d new calendar messages arrived"
@@ -11207,12 +11333,12 @@ msgstr "Banner anzeigen"
 
 #: src/plugins/notification/notification_prefs.c:766
 #: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:147
-#: src/prefs_receive.c:231 src/prefs_summaries.c:504
+#: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Nie"
 
 #: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
-#: src/prefs_summaries.c:486 src/prefs_summaries.c:505
+#: src/prefs_summaries.c:494 src/prefs_summaries.c:504
 msgid "Always"
 msgstr "Immer"
 
@@ -11310,8 +11436,8 @@ msgstr "Anzeigedauer des Popups"
 #: src/plugins/notification/notification_prefs.c:1072
 #: src/plugins/notification/notification_prefs.c:1367
 #: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
-#: src/prefs_receive.c:203 src/prefs_summaries.c:538
+#: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:575
+#: src/prefs_receive.c:203 src/prefs_summaries.c:544
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -11456,41 +11582,41 @@ msgstr "Trayicon-Benachrichtigungen anzeigen"
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Neu: %d, ungelesen: %d, gesamt: %d"
 
-#: src/plugins/notification/notification_trayicon.c:855
+#: src/plugins/notification/notification_trayicon.c:857
 msgid "New mail message"
 msgstr "Neue E-Mail"
 
-#: src/plugins/notification/notification_trayicon.c:857
+#: src/plugins/notification/notification_trayicon.c:859
 msgid "New news post"
 msgstr "Neuer Newspost"
 
-#: src/plugins/notification/notification_trayicon.c:859
+#: src/plugins/notification/notification_trayicon.c:861
 msgid "New calendar message"
 msgstr "Neue Kalendernachricht"
 
-#: src/plugins/notification/notification_trayicon.c:861
+#: src/plugins/notification/notification_trayicon.c:863
 msgid "New article in RSS feed"
 msgstr "Neuer Artikel im RSS-Feed"
 
-#: src/plugins/notification/notification_trayicon.c:864
+#: src/plugins/notification/notification_trayicon.c:866
 msgid "New messages arrived"
 msgstr "Neue Nachrichten erhalten"
 
-#: src/plugins/notification/notification_trayicon.c:920
+#: src/plugins/notification/notification_trayicon.c:922
 #, c-format
 msgid "%d new mail message arrived"
 msgid_plural "%d new mail messages arrived"
 msgstr[0] "%d neue E-Mail erhalten"
 msgstr[1] "%d neue E-Mails erhalten"
 
-#: src/plugins/notification/notification_trayicon.c:931
+#: src/plugins/notification/notification_trayicon.c:933
 #, c-format
 msgid "%d new news post arrived"
 msgid_plural "%d new news posts arrived"
 msgstr[0] "%d neuer Newspost erhalten"
 msgstr[1] "%d neue Newsposts erhalten"
 
-#: src/plugins/notification/notification_trayicon.c:953
+#: src/plugins/notification/notification_trayicon.c:955
 #, c-format
 msgid "%d new article in RSS feeds arrived"
 msgid_plural "%d new articles in RSS feeds arrived"
@@ -11558,63 +11684,63 @@ msgid "PDF rendering failed for an unknown reason."
 msgstr "Darstellung des PDFs schlug aus unbekanntem Grund fehl."
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1725
-#: src/plugins/pdf_viewer/poppler_viewer.c:1942
+#: src/plugins/pdf_viewer/poppler_viewer.c:1934
 msgid "Document Index"
 msgstr "Inhaltsverzeichnis"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1910
+#: src/plugins/pdf_viewer/poppler_viewer.c:1902
 msgid "First Page"
 msgstr "Erste Seite"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1913
+#: src/plugins/pdf_viewer/poppler_viewer.c:1905
 msgid "Previous Page"
 msgstr "Vorige Seite"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1916
+#: src/plugins/pdf_viewer/poppler_viewer.c:1908
 msgid "Next Page"
 msgstr "Nächste Seite"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1919
+#: src/plugins/pdf_viewer/poppler_viewer.c:1911
 msgid "Last Page"
 msgstr "Letzte Seite"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1922
+#: src/plugins/pdf_viewer/poppler_viewer.c:1914
 msgid "Zoom In"
 msgstr "Vergrößern"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1916
 msgid "Zoom Out"
 msgstr "Verkleinern"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1919
 msgid "Fit Page"
 msgstr "An Seite anpassen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1930
+#: src/plugins/pdf_viewer/poppler_viewer.c:1922
 msgid "Fit Page Width"
 msgstr "An Seitenbreite anpassen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1933
+#: src/plugins/pdf_viewer/poppler_viewer.c:1925
 msgid "Rotate Left"
 msgstr "Nach links drehen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1936
+#: src/plugins/pdf_viewer/poppler_viewer.c:1928
 msgid "Rotate Right"
 msgstr "Nach rechts drehen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1939
+#: src/plugins/pdf_viewer/poppler_viewer.c:1931
 msgid "Document Info"
 msgstr "Dokument-Informationen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1944
+#: src/plugins/pdf_viewer/poppler_viewer.c:1936
 msgid "Page Number"
 msgstr "Seite Nummer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1946
+#: src/plugins/pdf_viewer/poppler_viewer.c:1938
 msgid "Zoom Factor"
 msgstr "Zoomfaktor"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2051
+#: src/plugins/pdf_viewer/poppler_viewer.c:2043
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11627,13 +11753,13 @@ msgstr ""
 "\n"
 "Jegliche Rückmeldung ist willkommen: iwkse@claws-mail.org"
 
+#: src/plugins/pdf_viewer/poppler_viewer.c:2049
 #: src/plugins/pdf_viewer/poppler_viewer.c:2057
-#: src/plugins/pdf_viewer/poppler_viewer.c:2065
-#: src/plugins/pdf_viewer/poppler_viewer.c:2085
+#: src/plugins/pdf_viewer/poppler_viewer.c:2077
 msgid "PDF Viewer"
 msgstr "PDF-Betrachter"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2061
+#: src/plugins/pdf_viewer/poppler_viewer.c:2053
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11698,7 +11824,7 @@ msgstr ""
 "Dieser Schlüssel ist nicht in Ihrem Ring. Soll Claws Mail versuchen, ihn von "
 "einem Schlüsselserver zu importieren?"
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:279
+#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:280
 msgid ""
 "\n"
 "  Key ID "
@@ -11740,20 +11866,20 @@ msgstr ""
 "\n"
 " Schlüssel-ID importieren"
 
-#: src/plugins/pgpcore/pgp_viewer.c:268
+#: src/plugins/pgpcore/pgp_viewer.c:269
 msgid "   This key has been imported to your keyring.\n"
 msgstr "   Dieser Schlüssel wurde in Ihren Schlüsselring importiert.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:270
+#: src/plugins/pgpcore/pgp_viewer.c:271
 msgid "   This key couldn't be imported to your keyring.\n"
 msgstr ""
 "   Dieser Schlüssel konnte nicht in Ihren Schlüsselring importiert werden.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:271
+#: src/plugins/pgpcore/pgp_viewer.c:272
 msgid "   Key servers are sometimes slow.\n"
 msgstr "   Schlüsselserver sind manchmal sehr langsam.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:273
 msgid ""
 "   You can try to import it manually with the command:\n"
 "\n"
@@ -11763,7 +11889,7 @@ msgstr ""
 "\n"
 "   "
 
-#: src/plugins/pgpcore/pgp_viewer.c:282
+#: src/plugins/pgpcore/pgp_viewer.c:283
 msgid "   This key is in your keyring.\n"
 msgstr "   Dieser Schlüssel ist in Ihrem Schlüsselring.\n"
 
@@ -11823,7 +11949,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:163 src/plugins/rssyl/rssyl_feed_props.c:476
+#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:474
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1874
 #: src/prefs_receive.c:187
 msgid "minutes"
@@ -12242,7 +12368,7 @@ msgstr "Textdaten nicht in normalen Zeichensatz konvertierbar."
 #: src/plugins/pgpinline/pgpinline.c:196 src/plugins/pgpinline/pgpinline.c:518
 #: src/plugins/pgpinline/pgpinline.c:657 src/plugins/pgpinline/pgpinline.c:713
 #: src/plugins/pgpmime/pgpmime.c:183 src/plugins/pgpmime/pgpmime.c:329
-#: src/plugins/pgpmime/pgpmime.c:509 src/plugins/pgpmime/pgpmime.c:652
+#: src/plugins/pgpmime/pgpmime.c:510 src/plugins/pgpmime/pgpmime.c:653
 #: src/plugins/smime/smime.c:413
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
@@ -12296,25 +12422,27 @@ msgstr "Scannen der entschlüsselten Dateiteile schlug fehl."
 msgid "Malformed message"
 msgstr "kaputte Nachricht"
 
-#: src/plugins/pgpinline/pgpinline.c:503
-msgid "Couldn't create temporary file."
-msgstr "Temporäre Datei nicht erstellbar."
+#: src/plugins/pgpinline/pgpinline.c:503 src/plugins/pgpinline/pgpinline.c:695
+#: src/plugins/pgpmime/pgpmime.c:693
+#, c-format
+msgid "Couldn't create temporary file, %s"
+msgstr "Temporäre Datei nicht erstellbar, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:536
+#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:537
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Datensignierung schlug fehl, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:563
+#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:564
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Datensignierung schlug fehl, ungültiger Unterzeichner: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:572
+#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:573
 msgid "Data signing failed, no results."
 msgstr "Datensignierung schlug fehl, kein Ergebnis."
 
-#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:583
+#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:584
 msgid "Data signing failed, no contents."
 msgstr "Datensignierung schlug fehl, Inhalt fehlt."
 
@@ -12326,17 +12454,12 @@ msgstr ""
 "Bitte beachten Sie, dass weder Anhänge noch Kopfzeilen (wie Betreff) vom PGP/"
 "Inline-System verschlüsselt werden."
 
-#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:662
+#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:663
 #, 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:695 src/plugins/pgpmime/pgpmime.c:691
-#, c-format
-msgid "Couldn't create temporary file, %s"
-msgstr "Temporäre Datei nicht erstellbar, %s"
-
-#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:718
+#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:720
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Verschlüsseln schlug fehl, %s"
@@ -12388,16 +12511,16 @@ msgstr "Entschlüsselte Datei nicht analysierbar."
 msgid "Couldn't parse decrypted file parts."
 msgstr "Entschlüsselte Dateiteile nicht analysierbar."
 
-#: src/plugins/pgpmime/pgpmime.c:455 src/plugins/pgpmime/pgpmime.c:494
+#: src/plugins/pgpmime/pgpmime.c:456 src/plugins/pgpmime/pgpmime.c:495
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Anlegen der temporären Datei schlug fehl: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:596
+#: src/plugins/pgpmime/pgpmime.c:597
 msgid "OpenPGP digital signature"
 msgstr "Digitale Signatur von OpenPGP"
 
-#: src/plugins/pgpmime/pgpmime.c:618
+#: src/plugins/pgpmime/pgpmime.c:619
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -12405,7 +12528,7 @@ msgstr ""
 "Bitte beachten Sie, dass Kopfzeilen (wie Betreff) vom PGP/Mime-System nicht "
 "verschlüsselt werden."
 
-#: src/plugins/pgpmime/pgpmime.c:790
+#: src/plugins/pgpmime/pgpmime.c:792
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -12448,7 +12571,7 @@ msgid "Show Python console..."
 msgstr "Python-Konsole öffnen..."
 
 #: src/plugins/python/python_plugin.c:503
-#: src/plugins/rssyl/rssyl_feed_props.c:483
+#: src/plugins/rssyl/rssyl_feed_props.c:481
 msgid "Refresh"
 msgstr "Aktualisieren"
 
@@ -12626,7 +12749,7 @@ msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(leer)"
 
-#: src/plugins/rssyl/rssyl.c:155 src/plugins/rssyl/rssyl.c:166
+#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:167
 msgid "Refresh all feeds"
 msgstr "Alle Feeds _aktualisieren"
 
@@ -12662,11 +12785,6 @@ msgstr "RSS-Feed-Baum entfernen"
 msgid "Select an OPML file"
 msgstr "Wähle eine .opml Datei"
 
-#: src/plugins/rssyl/rssyl_feed.c:75 src/plugins/rssyl/rssyl_subscribe.c:158
-#, c-format
-msgid "Couldn't create folder for new feed '%s'."
-msgstr "Ordner für den neuen Feed '%s' konnte nicht erstellt werden."
-
 #: src/plugins/rssyl/rssyl_feed.h:10
 #, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
@@ -12710,53 +12828,53 @@ msgstr ""
 "RSSyl: Anwendung bricht ab, Aktualisierung des Feeds konnte nicht beendet "
 "werden: '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:270
+#: src/plugins/rssyl/rssyl_feed_props.c:268
 msgid "HTTP Basic authentication"
 msgstr "HTTP-Basis-Authentifizierung "
 
-#: src/plugins/rssyl/rssyl_feed_props.c:291
+#: src/plugins/rssyl/rssyl_feed_props.c:289
 msgid "Use default refresh interval"
 msgstr "Benutze vorgegebenen Zeitintervall zum Aktualisieren"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:301
 msgid "Keep old items"
 msgstr "Alte Einträge behalten"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:307
 msgid "_Trim"
 msgstr "_Abgleichen"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:311
+#: src/plugins/rssyl/rssyl_feed_props.c:309
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr ""
 "Aktualisiert Feed und löscht Einträge, die in der Feed-Quelle nicht mehr "
 "existieren."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:314
+#: src/plugins/rssyl/rssyl_feed_props.c:312
 msgid "Fetch comments if possible"
 msgstr "Hole Kommentare, wenn möglich"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:339
+#: src/plugins/rssyl/rssyl_feed_props.c:337
 msgid "Always mark it as new"
 msgstr "Immer als neu markieren"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:345
+#: src/plugins/rssyl/rssyl_feed_props.c:343
 msgid "Only mark it as new if its text has changed"
 msgstr "Nur als neu markieren, wenn sich der Text geändert hat."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:351
+#: src/plugins/rssyl/rssyl_feed_props.c:349
 msgid "Never mark it as new"
 msgstr "Niemals als neu markieren"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:354
 msgid "Add item title to the top of message"
 msgstr "Titel des Eintrags dem Anfang der Nachricht hinzufügen"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:363
+#: src/plugins/rssyl/rssyl_feed_props.c:361
 msgid "Ignore title rename"
 msgstr "Ignoriere Änderung des Titels"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:368
+#: src/plugins/rssyl/rssyl_feed_props.c:366
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -12764,55 +12882,55 @@ msgstr ""
 "Aktivieren, um den aktuellen Ordnername beizubehalten, selbst wenn sich der "
 "Titel des Feeds ändert"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:372
+#: src/plugins/rssyl/rssyl_feed_props.c:370
 #: src/plugins/vcalendar/vcal_prefs.c:593
 msgid "Verify SSL/TLS certificate validity"
 msgstr "Überprüfe Gültigkeit des SSL/TLS-Zertifikats"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:392
+#: src/plugins/rssyl/rssyl_feed_props.c:390
 msgid "User name"
 msgstr "Benutzername"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:405
+#: src/plugins/rssyl/rssyl_feed_props.c:403
 msgid "Source URL"
 msgstr "Quell-URL"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:418
+#: src/plugins/rssyl/rssyl_feed_props.c:416
 msgid "Fetch comments on posts aged less than"
 msgstr "Kommentare holen von Nachrichten, die jünger sind als"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:426
+#: src/plugins/rssyl/rssyl_feed_props.c:424
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
 #: src/prefs_account.c:1480 src/prefs_folder_item.c:568 src/prefs_matcher.c:337
 msgid "days"
 msgstr "Tag(en)"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:427
+#: src/plugins/rssyl/rssyl_feed_props.c:425
 msgid "Set to -1 to fetch all comments"
 msgstr "-1 verwenden, um alle Kommentare zu holen"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:451
+#: src/plugins/rssyl/rssyl_feed_props.c:449
 msgid "If an item changes"
 msgstr "Wenn sich ein Eintrag ändert"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:456
+#: src/plugins/rssyl/rssyl_feed_props.c:454
 msgid "Items"
 msgstr "Einträge"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:469
+#: src/plugins/rssyl/rssyl_feed_props.c:467
 msgid "Refresh interval"
 msgstr "Aktualisierungsintervall"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:477
+#: src/plugins/rssyl/rssyl_feed_props.c:475
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr ""
 "Auf 0 setzen, um das automatische Aktualisieren dieses Feeds zu deaktivieren"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:529
+#: src/plugins/rssyl/rssyl_feed_props.c:527
 msgid "_OK"
 msgstr "_OK"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:537
+#: src/plugins/rssyl/rssyl_feed_props.c:535
 msgid "Set feed properties"
 msgstr "Feed-Eigenschaften einstellen"
 
@@ -12902,6 +13020,11 @@ msgstr "Aktualisieren"
 msgid "Security and privacy"
 msgstr "Sicherheit und Datenschutz"
 
+#: src/plugins/rssyl/rssyl_subscribe.c:158
+#, c-format
+msgid "Couldn't create folder for new feed '%s'."
+msgstr "Ordner für den neuen Feed '%s' konnte nicht erstellt werden."
+
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 msgid "Subscribe new feed?"
 msgstr "Neue_n Feed abonnieren?"
@@ -12928,17 +13051,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Aktualisiere Kommentare für %s..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1620
 msgid "401 (Authorisation required)"
 msgstr "401 (Autorisierung erforderlich)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1623
 msgid "403 (Unauthorised)"
 msgstr "403 (nicht autorisiert)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1626
 msgid "404 (Not found)"
 msgstr "404 (nicht gefunden)"
 
@@ -13077,21 +13200,21 @@ msgstr ""
 "Bitte beachten, dass Kopfzeilen (wie Betreff) vom S/Mime-System nicht "
 "verschlüsselt werden."
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:301
 msgid "Reporting spam..."
 msgstr "Melde Spam..."
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:336
 msgid "Report spam online..."
 msgstr "Spam online melden..."
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
+#: src/plugins/spam_report/spam_report.c:347
+#: src/plugins/spam_report/spam_report.c:385
 #: src/plugins/spam_report/spam_report_prefs.c:83
 msgid "SpamReport"
 msgstr "SpamReport"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:390
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -13107,7 +13230,7 @@ msgstr ""
 " * spamcop.net\n"
 " * lists.debian.org-Nominierungssystem"
 
-#: src/plugins/spam_report/spam_report.c:413
+#: src/plugins/spam_report/spam_report.c:415
 msgid "Spam reporting"
 msgstr "Spam melden"
 
@@ -13124,7 +13247,7 @@ msgid "Password:"
 msgstr "Kennwort:"
 
 #: src/plugins/spamassassin/spamassassin.c:77
-#: src/plugins/spamassassin/spamassassin_gtk.c:648
+#: src/plugins/spamassassin/spamassassin_gtk.c:649
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
@@ -13136,15 +13259,15 @@ msgstr "SpamAssassin-Plugin konnte nicht zu spamd verbinden.\n"
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "SpamAssassin-Plugin: Filtern schlug fehl.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:238
+#: src/plugins/spamassassin/spamassassin.c:211
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "SpamAssassin-Plugin ist durch seine Einstellungen deaktiviert.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:243
+#: src/plugins/spamassassin/spamassassin.c:216
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: Nachricht wird gefiltert..."
 
-#: src/plugins/spamassassin/spamassassin.c:372
+#: src/plugins/spamassassin/spamassassin.c:345
 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
@@ -13154,7 +13277,7 @@ msgstr ""
 "Fehlerursache ist ein unerreichbarer spamd-Prozess. Bitte stellen Sie "
 "sicher, dass spamd aktiv und erreichbar ist."
 
-#: src/plugins/spamassassin/spamassassin.c:429
+#: src/plugins/spamassassin/spamassassin.c:402
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
@@ -13162,17 +13285,17 @@ msgstr ""
 "Claws Mail benötigt Zugang zum Netz, um Remote-Learner diese Mail(s)  zu "
 "senden."
 
-#: src/plugins/spamassassin/spamassassin.c:574
+#: src/plugins/spamassassin/spamassassin.c:547
 msgid "Failed to get username"
 msgstr "Benutzername nicht abrufbar"
 
-#: src/plugins/spamassassin/spamassassin.c:586
+#: src/plugins/spamassassin/spamassassin.c:559
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "SpamAssassin-Plugin ist geladen, aber durch eigene Einstellungen "
 "deaktiviert.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:620
+#: src/plugins/spamassassin/spamassassin.c:593
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "
@@ -13210,43 +13333,47 @@ msgstr "TCP"
 msgid "Unix Socket"
 msgstr "Unix Socket"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:268
+#: src/plugins/spamassassin/spamassassin_gtk.c:119
+msgid "Select folder to save spam to"
+msgstr "Zielordner für Spam wählen"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:269
 msgid "Enable SpamAssassin plugin"
 msgstr "SpamAssassin-Plugin aktivieren"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:272
+#: src/plugins/spamassassin/spamassassin_gtk.c:273
 msgid "Transport"
 msgstr "Übertragung"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:280
+#: src/plugins/spamassassin/spamassassin_gtk.c:281
 msgid "Type of transport"
 msgstr "Art der Übertragung"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:301
+#: src/plugins/spamassassin/spamassassin_gtk.c:302
 msgid "User"
 msgstr "Benutzername"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:314
+#: src/plugins/spamassassin/spamassassin_gtk.c:315
 msgid "User to use with spamd server"
 msgstr "Benutzername für den spamd-Server"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:316
+#: src/plugins/spamassassin/spamassassin_gtk.c:317
 msgid "spamd"
 msgstr "spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:334
+#: src/plugins/spamassassin/spamassassin_gtk.c:335
 msgid "Hostname or IP address of spamd server"
 msgstr "Hostname oder IP-Adresse des spamd-Servers"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:345
+#: src/plugins/spamassassin/spamassassin_gtk.c:346
 msgid "Port of spamd server"
 msgstr "Port des spamd-Servers"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:351
+#: src/plugins/spamassassin/spamassassin_gtk.c:352
 msgid "Path of Unix socket"
 msgstr "Pfad des Unix Sockets"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:386
+#: src/plugins/spamassassin/spamassassin_gtk.c:387
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
@@ -13254,7 +13381,7 @@ msgstr ""
 "Zeitlimit für die Überprüfung. Nach Ablauf dieser Zeit wird die Überprüfung "
 "abgebrochen."
 
-#: src/plugins/tnef_parse/tnef_parse.c:65
+#: src/plugins/tnef_parse/tnef_parse.c:73
 #, c-format
 msgid ""
 "\n"
@@ -13267,29 +13394,29 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/tnef_parse/tnef_parse.c:122
-#: src/plugins/tnef_parse/tnef_parse.c:129
+#: src/plugins/tnef_parse/tnef_parse.c:130
+#: src/plugins/tnef_parse/tnef_parse.c:137
 msgid "Failed to write the part data."
 msgstr "Schreiben des Datenteils schlug fehl."
 
-#: src/plugins/tnef_parse/tnef_parse.c:174
+#: src/plugins/tnef_parse/tnef_parse.c:182
 msgid "Failed to parse VCalendar data."
 msgstr "Verarbeiten der VCalendar-Daten schlug fehl."
 
-#: src/plugins/tnef_parse/tnef_parse.c:213
+#: src/plugins/tnef_parse/tnef_parse.c:221
 msgid "Failed to parse VTask data."
 msgstr "Verarbeiten der VTask-Daten schlug fehl."
 
-#: src/plugins/tnef_parse/tnef_parse.c:263
+#: src/plugins/tnef_parse/tnef_parse.c:273
 msgid "Failed to parse VCard data."
 msgstr "Verarbeiten der VCard-Daten schlug fehl."
 
-#: src/plugins/tnef_parse/tnef_parse.c:399
-#: src/plugins/tnef_parse/tnef_parse.c:423
+#: src/plugins/tnef_parse/tnef_parse.c:413
+#: src/plugins/tnef_parse/tnef_parse.c:437
 msgid "TNEF Parser"
 msgstr "TNEF-Parser"
 
-#: src/plugins/tnef_parse/tnef_parse.c:428
+#: src/plugins/tnef_parse/tnef_parse.c:442
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
@@ -13406,19 +13533,14 @@ msgstr "Dezember"
 msgid "Week number"
 msgstr "Woche Nummer"
 
-#: src/plugins/vcalendar/month-view.c:887
+#: src/plugins/vcalendar/month-view.c:886
 msgid "Previous month"
 msgstr "Vorheriger Monat"
 
-#: src/plugins/vcalendar/month-view.c:907
+#: src/plugins/vcalendar/month-view.c:906
 msgid "Next month"
 msgstr "Nächster Monat"
 
-#: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:775
-msgid "vCalendar"
-msgstr "vCalendar"
-
 #: src/plugins/vcalendar/plugin.c:73
 msgid ""
 "This plugin enables vCalendar message handling like that produced by "
@@ -13634,63 +13756,63 @@ msgstr "Teilnehmer:"
 msgid "Action:"
 msgstr "Verlauf:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_New meeting..."
 msgstr "_Neues Treffen..."
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Export calendar..."
 msgstr "Kalender _exportieren"
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Subscribe to Webcal..."
 msgstr "WebCal _abonnieren..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Rename..."
 msgstr "_Umbenennen..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "U_pdate subscriptions"
 msgstr "Abonnements akt_ualisieren"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_List view"
 msgstr "_Listenansicht"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Week view"
 msgstr "_Wochenansicht"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_Month view"
 msgstr "_Monatsansicht"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1101
 msgid "Meetings"
 msgstr "Treffen"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1500
 msgid "in the past"
 msgstr "in der Vergangenheit"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1503
 msgid "today"
 msgstr "heute"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1506
 msgid "tomorrow"
 msgstr "morgen"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1509
 msgid "this week"
 msgstr "diese Woche"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1512
 msgid "later"
 msgstr "später"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1516
 #, c-format
 msgid ""
 "\n"
@@ -13699,17 +13821,17 @@ msgstr ""
 "\n"
 "Diese Termine sind geplant %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1611
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Zeitüberschreitung (%d Sekunden) beim Verbinden zu %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1629
 #, c-format
 msgid "Error %ld"
 msgstr "Fehler %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1815
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13722,20 +13844,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
-#, c-format
-msgid ""
-"Could not retrieve the Webcal URL:\n"
-"%s:\n"
-"\n"
-"%s\n"
-msgstr ""
-"Die Webcal-URL konnte nicht abgerufen werden:\n"
-"%s:\n"
-"\n"
-"%s\n"
-
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1841
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -13746,123 +13855,112 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
-#, c-format
-msgid ""
-"This URL does not look like a Webcal URL:\n"
-"%s\n"
-"%s\n"
-msgstr ""
-"Diese URL sieht nicht wie eine WebCal-URL aus:\n"
-"%s\n"
-"%s\n"
-
-#: src/plugins/vcalendar/vcal_folder.c:1863
-#: src/plugins/vcalendar/vcal_folder.c:1866
+#: src/plugins/vcalendar/vcal_folder.c:1872
+#: src/plugins/vcalendar/vcal_folder.c:1875
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Ordner %s konnte nicht erstellt werden."
 
-#: src/plugins/vcalendar/vcal_folder.c:1904
+#: src/plugins/vcalendar/vcal_folder.c:1915
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 "Claws Mail benötigt Zugang zum Netz, um den WebCal-Feed zu aktualisieren."
 
-#: src/plugins/vcalendar/vcal_folder.c:1915
+#: src/plugins/vcalendar/vcal_folder.c:1926
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Hole Kalender für %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1916
+#: src/plugins/vcalendar/vcal_folder.c:1927
 msgid "new subscription"
 msgstr "Neues Abonnement"
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1938
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr ""
 "Claws Mail benötigt Zugang zum Netz, um dieses Abonnement zu aktualisieren."
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1950
 msgid "Subscribe to Webcal"
 msgstr "WebCal abonnieren"
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1950
 msgid "Enter the WebCal URL:"
 msgstr "WebCal-URL eingeben:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1951
+#: src/plugins/vcalendar/vcal_folder.c:1962
 msgid "Could not parse the URL."
 msgstr "Konnte URL nicht analysieren"
 
-#: src/plugins/vcalendar/vcal_folder.c:1979
+#: src/plugins/vcalendar/vcal_folder.c:1990
 msgid "Do you really want to unsubscribe?"
 msgstr "Wollen Sie wirklich abbestellen?"
 
-#: src/plugins/vcalendar/vcal_folder.c:1980
+#: src/plugins/vcalendar/vcal_folder.c:1991
 msgid "Delete subscription"
 msgstr "Abonnement löschen"
 
-#: src/plugins/vcalendar/vcal_manager.c:109
+#: src/plugins/vcalendar/vcal_manager.c:110
 msgid "accepted"
 msgstr "akzeptiert"
 
-#: src/plugins/vcalendar/vcal_manager.c:110
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "tentatively accepted"
 msgstr "Vorläufig akzeptiert"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "declined"
 msgstr "abgelehnt"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "did not answer"
 msgstr "hat nicht geantwortet"
 
-#: src/plugins/vcalendar/vcal_manager.c:142
+#: src/plugins/vcalendar/vcal_manager.c:144
 msgid "individual"
 msgstr "individuell"
 
-#: src/plugins/vcalendar/vcal_manager.c:143
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "group"
 msgstr "Gruppe"
 
-#: src/plugins/vcalendar/vcal_manager.c:144
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "resource"
 msgstr "Ressource"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "room"
 msgstr "Raum"
 
-#: src/plugins/vcalendar/vcal_manager.c:556
+#: src/plugins/vcalendar/vcal_manager.c:558
 msgid "Past"
 msgstr "Früher"
 
-#: src/plugins/vcalendar/vcal_manager.c:559
+#: src/plugins/vcalendar/vcal_manager.c:561
 msgid "Today"
 msgstr "Heute"
 
-#: src/plugins/vcalendar/vcal_manager.c:562
+#: src/plugins/vcalendar/vcal_manager.c:564
 msgid "Tomorrow"
 msgstr "Morgen"
 
-#: src/plugins/vcalendar/vcal_manager.c:565
+#: src/plugins/vcalendar/vcal_manager.c:567
 msgid "This week"
 msgstr "Diese Woche"
 
-#: src/plugins/vcalendar/vcal_manager.c:568
+#: src/plugins/vcalendar/vcal_manager.c:570
 msgid "Later"
 msgstr "Später"
 
-#: src/plugins/vcalendar/vcal_manager.c:1256
+#: src/plugins/vcalendar/vcal_manager.c:1246
 msgid "Accepted: "
 msgstr "Akzeptiert: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1258
+#: src/plugins/vcalendar/vcal_manager.c:1248
 msgid "Declined: "
 msgstr "Abgelehnt: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1260
+#: src/plugins/vcalendar/vcal_manager.c:1250
 msgid "Tentatively Accepted: "
 msgstr "Vorläufig akzeptierte: "
 
@@ -14503,7 +14601,7 @@ msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Abrufen' überprüft dieses Konto auf neue Nachrichten"
 
 #: src/prefs_account.c:1725 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
+#: src/prefs_matcher.c:623 src/prefs_matcher.c:1968 src/prefs_matcher.c:1990
 msgid "Header"
 msgstr "Kopfzeile"
 
@@ -14567,30 +14665,30 @@ msgstr "Automatisch folgende Adressen eintragen"
 msgid "Spell check dictionaries"
 msgstr "Wörterbücher für Rechtschreibung"
 
-#: src/prefs_account.c:2082 src/prefs_folder_item.c:1089
+#: src/prefs_account.c:2082 src/prefs_folder_item.c:1104
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Standard-Wörterbuch"
 
-#: src/prefs_account.c:2095 src/prefs_folder_item.c:1123
+#: src/prefs_account.c:2095 src/prefs_folder_item.c:1138
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Alternatives Standard-Wörterbuch"
 
 #: src/prefs_account.c:2181 src/prefs_account.c:3341
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1434
-#: src/prefs_folder_item.c:1824 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_compose_writing.c:373 src/prefs_folder_item.c:1449
+#: src/prefs_folder_item.c:1841 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:2196 src/prefs_folder_item.c:1462 src/prefs_quote.c:134
-#: src/toolbar.c:409
+#: src/prefs_account.c:2196 src/prefs_folder_item.c:1477 src/prefs_quote.c:134
+#: src/toolbar.c:487
 msgid "Reply"
 msgstr "Antwort"
 
 #: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1490 src/prefs_quote.c:149 src/toolbar.c:413
+#: src/prefs_folder_item.c:1505 src/prefs_quote.c:149 src/toolbar.c:492
 msgid "Forward"
 msgstr "Weiterleiten"
 
@@ -14771,7 +14869,7 @@ msgstr "Kein Mail-Befehl eingetragen."
 msgid "Receive"
 msgstr "Empfangen"
 
-#: src/prefs_account.c:3359 src/prefs_folder_item.c:1840 src/prefs_quote.c:238
+#: src/prefs_account.c:3359 src/prefs_folder_item.c:1857 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Vorlagen"
 
@@ -14842,8 +14940,8 @@ msgid "Replace the selected action in list with the action above"
 msgstr "In der Liste markierte Aktion durch Obige ersetzen"
 
 #: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
-#: src/prefs_filtering.c:486 src/prefs_matcher.c:779 src/prefs_template.c:320
-#: src/prefs_toolbar.c:1056
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:780 src/prefs_template.c:320
+#: src/prefs_toolbar.c:1069
 msgid "D_elete"
 msgstr "Lösch_en"
 
@@ -14868,8 +14966,8 @@ msgid "Move selected action down"
 msgstr "Markierte Aktion abwärts bewegen"
 
 #: 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:896
+#: src/prefs_filtering.c:838 src/prefs_filtering.c:840
+#: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:897
 #: src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Neu)"
@@ -14886,23 +14984,19 @@ msgstr "Der Name des Menüs darf nicht mit '/' beginnen"
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Doppelpunkt ':' ist in Menünamen nicht erlaubt."
 
-#: 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:635
+#: src/prefs_actions.c:629
 msgid "Menu name is too long."
 msgstr "Menüname ist zu lang."
 
-#: src/prefs_actions.c:644
+#: src/prefs_actions.c:638
 msgid "Command-line not set."
 msgstr "Befehlszeile nicht gesetzt."
 
-#: src/prefs_actions.c:649
+#: src/prefs_actions.c:643
 msgid "Menu name and command are too long."
 msgstr "Menüname und Befehl sind zu lang."
 
-#: src/prefs_actions.c:655
+#: src/prefs_actions.c:649
 #, c-format
 msgid ""
 "The command\n"
@@ -14913,140 +15007,140 @@ msgstr ""
 "%s\n"
 "hat einen Syntaxfehler."
 
-#: src/prefs_actions.c:713
+#: src/prefs_actions.c:707
 msgid "Delete action"
 msgstr "Aktion entfernen"
 
-#: src/prefs_actions.c:714
+#: src/prefs_actions.c:708
 msgid "Do you really want to delete this action?"
 msgstr "Soll diese Aktion wirklich entfernt werden?"
 
-#: src/prefs_actions.c:734
+#: src/prefs_actions.c:728
 msgid "Delete all actions"
 msgstr "Alle Aktionen entfernen"
 
-#: src/prefs_actions.c:735
+#: src/prefs_actions.c:729
 msgid "Do you really want to delete all the actions?"
 msgstr "Möchten Sie wirklich alle Aktionen entfernen?"
 
-#: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
+#: src/prefs_actions.c:892 src/prefs_actions.c:923 src/prefs_filtering.c:1499
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2115 src/prefs_template.c:572
 #: src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Eintrag nicht gespeichert"
 
-#: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1522 src/prefs_template.c:573 src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Der Eintrag wurde nicht gespeichert. Trotzdem schließen?"
 
-#: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
-#: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
+#: src/prefs_actions.c:894 src/prefs_actions.c:899 src/prefs_actions.c:925
+#: src/prefs_filtering.c:1479 src/prefs_filtering.c:1501
+#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2118 src/prefs_template.c:574
 #: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "Mit dem Editieren _fortfahren"
 
-#: src/prefs_actions.c:903
+#: src/prefs_actions.c:897
 msgid "Actions list not saved"
 msgstr "Aktionsliste nicht gespeichert"
 
-#: src/prefs_actions.c:904
+#: src/prefs_actions.c:898
 msgid "The actions list has been modified. Close anyway?"
 msgstr "Die Aktionsliste wurde geändert. Trotzdem schließen?"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:968
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Menüname:</span>"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:969
 msgid "Use / in menu name to make submenus."
 msgstr "Ein '/' im Menünamen erzeugt Untermenüs."
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:971
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Befehlszeile:</span>"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:972
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Beginnt mit:</span>"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:973
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "um Nachrichtenkörper oder Auswahl zur Standardeingabe des Befehls zu leiten"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:974
 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:981
+#: src/prefs_actions.c:975
 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:982
+#: src/prefs_actions.c:976
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Endet mit:</span>"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:977
 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:984
+#: src/prefs_actions.c:978
 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:985
+#: src/prefs_actions.c:979
 msgid "to run command asynchronously"
 msgstr "um den Befehl asynchron auszuführen"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:980
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Verwende:</span>"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:981
 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:988
+#: src/prefs_actions.c:982
 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:989
+#: src/prefs_actions.c:983
 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:990
+#: src/prefs_actions.c:984
 msgid "for a user provided argument"
 msgstr "für ein vom Benutzer angegebenes Argument"
 
-#: src/prefs_actions.c:991
+#: src/prefs_actions.c:985
 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:992
+#: src/prefs_actions.c:986
 msgid "for the text selection"
 msgstr "für den ausgewählten Text"
 
-#: src/prefs_actions.c:993
+#: src/prefs_actions.c:987
 msgid "apply filtering actions between {} to selected messages"
 msgstr "Filteraktionen zwischen {} auf gewählte Nachrichten anwenden"
 
-#: src/prefs_actions.c:994
+#: src/prefs_actions.c:988
 msgid "for a literal %"
 msgstr "Symbol für %"
 
-#: src/prefs_actions.c:1004 src/prefs_themes.c:935
+#: src/prefs_actions.c:998 src/prefs_themes.c:1051
 msgid "Actions"
 msgstr "Aktionen"
 
-#: src/prefs_actions.c:1005
+#: src/prefs_actions.c:999
 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."
@@ -15054,29 +15148,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:1092 src/prefs_filtering.c:1695
-#: src/prefs_template.c:1121
+#: src/prefs_actions.c:1086 src/prefs_filtering.c:1697
+#: src/prefs_template.c:1111
 msgid "D_uplicate"
 msgstr "d_uplizieren"
 
-#: src/prefs_actions.c:1212
+#: src/prefs_actions.c:1206
 msgid "Current actions"
 msgstr "Aktuelle Aktionen"
 
-#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074
-#: src/prefs_filtering.c:1132
+#: src/prefs_actions.c:1305 src/prefs_filtering.c:1076
+#: src/prefs_filtering.c:1134
 msgid "Action string is not valid."
 msgstr "Zeichenfolge der Aktion ist ungültig."
 
-#: src/prefs_common.c:225 src/prefs_quote.c:69
+#: src/prefs_common.c:237 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hallo,\\n"
 
-#: src/prefs_common.c:303
+#: src/prefs_common.c:315
 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:309 src/prefs_quote.c:85
+#: src/prefs_common.c:321 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"
@@ -15089,95 +15183,96 @@ msgstr ""
 msgid "%x(%a) %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M"
 
-#: src/prefs_compose_writing.c:125
+#: src/prefs_compose_writing.c:126
 msgid "Automatic account selection"
 msgstr "Automatische Kontoauswahl"
 
-#: src/prefs_compose_writing.c:133
+#: src/prefs_compose_writing.c:134
 msgid "when replying"
 msgstr "Beim Antworten"
 
-#: src/prefs_compose_writing.c:135
+#: src/prefs_compose_writing.c:136
 msgid "when forwarding"
 msgstr "Beim Weiterleiten"
 
-#: src/prefs_compose_writing.c:137
+#: src/prefs_compose_writing.c:138
 msgid "when re-editing"
 msgstr "Beim Überarbeiten"
 
-#: src/prefs_compose_writing.c:140
+#: src/prefs_compose_writing.c:141
 msgid "Editing"
 msgstr "Verfassen"
 
-#: src/prefs_compose_writing.c:144
+#: src/prefs_compose_writing.c:145
 msgid "Automatically launch the external editor"
 msgstr "Externen Editor automatisch aufrufen"
 
-#: src/prefs_compose_writing.c:152
+#: src/prefs_compose_writing.c:153
 msgid "Automatically save message to Drafts folder every"
 msgstr "Automatisch im Entwurfsordner speichern alle"
 
-#: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:101
+#: src/prefs_compose_writing.c:163 src/prefs_wrapping.c:101
 msgid "characters"
 msgstr "Zeichen"
 
-#: src/prefs_compose_writing.c:173
+#: src/prefs_compose_writing.c:174
 msgid "Even if message is to be encrypted"
 msgstr "Auch wenn die Nachricht verschlüsselt werden soll."
 
-#: src/prefs_compose_writing.c:180
+#: src/prefs_compose_writing.c:181
 msgid "Undo level"
 msgstr "Rückgängig-Stufen"
 
-#: src/prefs_compose_writing.c:198
+#: src/prefs_compose_writing.c:199
 msgid "Warn when inserting a file larger than"
 msgstr "Warnen bei Einfügen einer Datei, die größer ist als"
 
-#: src/prefs_compose_writing.c:210
+#: src/prefs_compose_writing.c:211
 msgid "KB into message body "
 msgstr "KB in den Nachrichtenkörper"
 
-#: src/prefs_compose_writing.c:216
+#: src/prefs_compose_writing.c:217
 msgid "Replying"
 msgstr "Antworten"
 
-#: src/prefs_compose_writing.c:219
+#: src/prefs_compose_writing.c:220
 msgid "Reply will quote by default"
 msgstr "'Antwort' standardmäßig mit Zitaten"
 
-#: src/prefs_compose_writing.c:222
+#: src/prefs_compose_writing.c:223
 msgid "Reply button invokes mailing list reply"
 msgstr "'Antwort' aktiviert Mailinglisten-Antwort"
 
-#: src/prefs_compose_writing.c:224
+#: src/prefs_compose_writing.c:225
 msgid "Forwarding"
 msgstr "Weiterleiten"
 
-#: src/prefs_compose_writing.c:227 src/prefs_filtering_action.c:192
+#: src/prefs_compose_writing.c:228 src/prefs_filtering_action.c:192
 msgid "Forward as attachment"
 msgstr "Weiterleiten als Anhang"
 
 #: src/prefs_compose_writing.c:230
-msgid "Keep the original 'From' header when redirecting"
-msgstr "Beim Umleiten die Kopfzeile 'Von' beibehalten"
+#, c-format
+msgid "Keep the original '%s' header when redirecting"
+msgstr "Beim Umleiten die Kopfzeile '%s' beibehalten"
 
-#: src/prefs_compose_writing.c:233
+#: src/prefs_compose_writing.c:236
 msgid "When dropping files into the Compose window"
 msgstr "Wenn Dateien ins Editor-Fenster gezogen wurden"
 
-#: src/prefs_compose_writing.c:242
+#: src/prefs_compose_writing.c:245
 msgid "Ask"
 msgstr "Nachfragen"
 
-#: src/prefs_compose_writing.c:243 src/toolbar.c:427
+#: src/prefs_compose_writing.c:246 src/toolbar.c:519
 msgid "Insert"
 msgstr "Einfügen"
 
-#: src/prefs_compose_writing.c:244 src/toolbar.c:428
+#: src/prefs_compose_writing.c:247 src/toolbar.c:520
 msgid "Attach"
 msgstr "Anhängen"
 
-#: src/prefs_compose_writing.c:371
+#: src/prefs_compose_writing.c:374
 msgid "Writing"
 msgstr "Schreiben"
 
@@ -15185,8 +15280,8 @@ msgstr "Schreiben"
 msgid "Custom header configuration"
 msgstr "Einrichtung benutzerdefinierter Kopfzeilen"
 
-#: src/prefs_customheader.c:506 src/prefs_display_header.c:599
-#: src/prefs_matcher.c:1594 src/prefs_matcher.c:1609
+#: src/prefs_customheader.c:506 src/prefs_display_header.c:601
+#: src/prefs_matcher.c:1595 src/prefs_matcher.c:1610
 msgid "Header name is not set."
 msgstr "Kopfzeilenname ist nicht gesetzt."
 
@@ -15252,27 +15347,27 @@ msgstr "Soll diese Kopfzeile wirklich gelöscht werden?"
 msgid "Current custom headers"
 msgstr "Aktuelle benutzerdefinierte Kopfzeilen"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:252
 msgid "Displayed header configuration"
 msgstr "Angezeigte Kopfzeilen"
 
-#: src/prefs_display_header.c:274
+#: src/prefs_display_header.c:276
 msgid "Header name"
 msgstr "Kopfzeilenname"
 
-#: src/prefs_display_header.c:317
+#: src/prefs_display_header.c:319
 msgid "Displayed Headers"
 msgstr "Angezeigte Kopfzeilen"
 
-#: src/prefs_display_header.c:379
+#: src/prefs_display_header.c:381
 msgid "Hidden headers"
 msgstr "Verborgene Kopfzeilen"
 
-#: src/prefs_display_header.c:405
+#: src/prefs_display_header.c:407
 msgid "Show all unspecified headers"
 msgstr "Alle unspezifizierten Kopfzeilen anzeigen"
 
-#: src/prefs_display_header.c:609
+#: src/prefs_display_header.c:611
 msgid "This header is already in the list."
 msgstr "Diese Kopfzeile steht bereits in der Liste."
 
@@ -15337,8 +15432,8 @@ msgstr "Verbergen"
 msgid "Message flags"
 msgstr "Nachrichten-Merker"
 
-#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:78 src/summaryview.c:2753
+#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:450
+#: src/prefs_summary_column.c:78 src/summaryview.c:2798 src/toolbar.c:502
 msgid "Mark"
 msgstr "Markieren"
 
@@ -15358,12 +15453,12 @@ 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:1438
-#: src/toolbar.c:205 src/toolbar.c:438 src/toolbar.c:2088
+#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1439
+#: src/toolbar.c:238 src/toolbar.c:496 src/toolbar.c:2387
 msgid "Execute"
 msgstr "Ausführen"
 
-#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:440
+#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:448
 msgid "Color label"
 msgstr "Farbmarke"
 
@@ -15377,9 +15472,9 @@ msgid "Redirect"
 msgstr "Umleiten"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:629
-#: src/prefs_summaries.c:445 src/prefs_summary_column.c:87
-#: src/summaryview.c:446
+#: src/prefs_filtering_action.c:1443 src/prefs_matcher.c:629
+#: src/prefs_summaries.c:453 src/prefs_summary_column.c:87
+#: src/summaryview.c:448
 msgid "Score"
 msgstr "Bewertung"
 
@@ -15393,7 +15488,7 @@ msgstr "Bewertung setzen"
 
 #: src/prefs_filtering_action.c:196 src/prefs_filtering_action.c:197
 #: src/prefs_filtering_action.c:198 src/prefs_matcher.c:633
-#: src/prefs_summary_column.c:89 src/summaryview.c:448
+#: src/prefs_summary_column.c:89 src/summaryview.c:450
 msgid "Tags"
 msgstr "Marken"
 
@@ -15421,7 +15516,7 @@ msgstr "Filtern beenden"
 msgid "Action configuration"
 msgstr "Aktionskonfiguration"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1886
+#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1888
 #: src/prefs_matcher.c:586
 msgid "Rule"
 msgstr "Regel"
@@ -15462,25 +15557,25 @@ msgstr "Name der Marke ist leer."
 msgid "No action was defined."
 msgstr "Keine Aktion definiert."
 
-#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2160
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2161
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "Symbol für %"
 
-#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2169
+#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2170
 msgid "filename (should not be modified)"
 msgstr "Dateiname (sollte nicht geändert werden)"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2170
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2171
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "neue Zeile"
 
-#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2171
+#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2172
 msgid "escape character for quotes"
 msgstr "Escape-Zeichen für Zitate"
 
-#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2172
+#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2173
 msgid "quote character"
 msgstr "Zitatzeichen"
 
@@ -15498,23 +15593,23 @@ msgstr ""
 "externes Programm oder Skript zu senden.\n"
 "Folgende Symbole können verwendet werden:"
 
-#: src/prefs_filtering_action.c:1422
+#: src/prefs_filtering_action.c:1423
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: src/prefs_filtering_action.c:1426
+#: src/prefs_filtering_action.c:1427
 msgid "Book/Folder"
 msgstr "Adressbuch/Ordner"
 
-#: src/prefs_filtering_action.c:1430
+#: src/prefs_filtering_action.c:1431
 msgid "Destination"
 msgstr "Ziel"
 
-#: src/prefs_filtering_action.c:1434
+#: src/prefs_filtering_action.c:1435
 msgid "Color"
 msgstr "Farbe"
 
-#: src/prefs_filtering_action.c:1520
+#: src/prefs_filtering_action.c:1521
 msgid "Current action list"
 msgstr "Aktuelle Aktionsliste"
 
@@ -15522,8 +15617,8 @@ msgstr "Aktuelle Aktionsliste"
 msgid "Filtering/Processing configuration"
 msgstr "Filter-/Verarbeitungseinstellungen"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
-#: src/prefs_filtering.c:981
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:869
+#: src/prefs_filtering.c:983
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Alle"
@@ -15552,83 +15647,83 @@ msgstr "In der Liste markierte Regel durch obige Regel ersetzen"
 msgid "Delete the selected rule from the list"
 msgstr "Markierte Regel löschen"
 
-#: src/prefs_filtering.c:532
+#: src/prefs_filtering.c:534
 msgid "Move the selected rule to the top"
 msgstr "Markierte Regel ganz nach oben bewegen"
 
-#: src/prefs_filtering.c:535
+#: src/prefs_filtering.c:537
 msgid "Page u_p"
 msgstr "Seite aufwärts"
 
-#: src/prefs_filtering.c:543
+#: src/prefs_filtering.c:545
 msgid "Move the selected rule one page up"
 msgstr "Markierte Regel eine Seite nach oben bewegen"
 
-#: src/prefs_filtering.c:552
+#: src/prefs_filtering.c:554
 msgid "Move the selected rule up"
 msgstr "Markierte Regel aufwärts bewegen"
 
-#: src/prefs_filtering.c:560
+#: src/prefs_filtering.c:562
 msgid "Move the selected rule down"
 msgstr "Markierte Regel abwärts bewegen"
 
-#: src/prefs_filtering.c:563
+#: src/prefs_filtering.c:565
 msgid "Page dow_n"
 msgstr "Seite abwärts"
 
-#: src/prefs_filtering.c:571
+#: src/prefs_filtering.c:573
 msgid "Move the selected rule one page down"
 msgstr "Markierte Regel eine Seite nach unten bewegen"
 
-#: src/prefs_filtering.c:580
+#: src/prefs_filtering.c:582
 msgid "Move the selected rule to the bottom"
 msgstr "Markierte Regel ganz nach unten bewegen"
 
-#: src/prefs_filtering.c:1038 src/prefs_filtering.c:1124
+#: src/prefs_filtering.c:1040 src/prefs_filtering.c:1126
 msgid "Condition string is not valid."
 msgstr "Bedingungszeichenfolge ist nicht gültig."
 
-#: src/prefs_filtering.c:1111
+#: src/prefs_filtering.c:1113
 msgid "Condition string is empty."
 msgstr "Bedingungszeichenfolge ist leer."
 
-#: src/prefs_filtering.c:1117
+#: src/prefs_filtering.c:1119
 msgid "Action string is empty."
 msgstr "Aktionszeichenfolge ist leer."
 
-#: src/prefs_filtering.c:1205
+#: src/prefs_filtering.c:1207
 msgid "Delete rule"
 msgstr "Regel löschen"
 
-#: src/prefs_filtering.c:1206
+#: src/prefs_filtering.c:1208
 msgid "Do you really want to delete this rule?"
 msgstr "Möchten Sie diese Regel wirklich löschen?"
 
-#: src/prefs_filtering.c:1224
+#: src/prefs_filtering.c:1226
 msgid "Delete all rules"
 msgstr "alle Regeln löschen"
 
-#: src/prefs_filtering.c:1225
+#: src/prefs_filtering.c:1227
 msgid "Do you really want to delete all the rules?"
 msgstr "Möchten Sie wirklich alle Regeln löschen?"
 
-#: src/prefs_filtering.c:1475
+#: src/prefs_filtering.c:1477
 msgid "Filtering rules not saved"
 msgstr "Filterregeln nicht gespeichert"
 
-#: src/prefs_filtering.c:1476
+#: 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:1698
+#: src/prefs_filtering.c:1700
 msgid "Move one page up"
 msgstr "Um eine Seite nach oben bewegen"
 
-#: src/prefs_filtering.c:1699
+#: src/prefs_filtering.c:1701
 msgid "Move one page down"
 msgstr "Um eine Seite nach unten bewegen"
 
-#: src/prefs_filtering.c:1854
+#: src/prefs_filtering.c:1856
 msgid "Enable"
 msgstr "Aktivieren"
 
@@ -15649,13 +15744,13 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Ausgeblendete Spalten"
 
-#: src/prefs_folder_column.c:290 src/prefs_summaries.c:409
-#: src/prefs_summaries.c:587 src/prefs_summary_column.c:304
+#: src/prefs_folder_column.c:290 src/prefs_summaries.c:417
+#: src/prefs_summaries.c:593 src/prefs_summary_column.c:304
 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:1064
+#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1077
 msgid " Use default "
 msgstr " Standard verwenden "
 
@@ -15670,7 +15765,7 @@ msgstr ""
 "Sie können aber mit der Schaltfläche \"Auf Unterordner anwenden\" auf die "
 "ganze Mailbox-Ordnerstruktur übertragen werden."
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:885
+#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:886
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -15710,7 +15805,7 @@ msgstr "Ordner-Zugriffsrechte (via chmod)"
 msgid "Folder color"
 msgstr "Ordnerfarbe"
 
-#: src/prefs_folder_item.c:441 src/prefs_folder_item.c:1663
+#: src/prefs_folder_item.c:441 src/prefs_folder_item.c:1678
 msgid "Pick color for folder"
 msgstr "Farbe für den Ordner wählen"
 
@@ -15766,45 +15861,48 @@ msgstr "entferne alte Nachrichtenkörper"
 msgid "Discard folder cache"
 msgstr "Pufferspeicher für Ordner verwerfen"
 
-#: src/prefs_folder_item.c:894
+#: src/prefs_folder_item.c:895
 msgid "Request Return Receipt"
 msgstr "Empfangsbestätigung anfordern"
 
-#: src/prefs_folder_item.c:909
+#: src/prefs_folder_item.c:910
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 "Kopie ausgehender Nachrichten in diesem Ordner speichern anstatt in "
 "'Gesendet'"
 
-#: src/prefs_folder_item.c:922 src/prefs_folder_item.c:945
-#: src/prefs_folder_item.c:969 src/prefs_folder_item.c:992
-#: src/prefs_folder_item.c:1015
-msgid "Default "
-msgstr "Standard"
+#: src/prefs_folder_item.c:924 src/prefs_folder_item.c:976
+#: src/prefs_folder_item.c:1002 src/prefs_folder_item.c:1028
+#, c-format
+msgctxt "folder properties: %s stands for a header name"
+msgid "Default %s"
+msgstr "Standard %s"
 
-#: src/prefs_folder_item.c:946
-msgid " for replies"
-msgstr " für Antworten"
+#: src/prefs_folder_item.c:950
+#, c-format
+msgctxt "folder properties: %s stands for a header name"
+msgid "Default %s for replies"
+msgstr "Standard %s für Antworten"
 
-#: src/prefs_folder_item.c:1038
+#: src/prefs_folder_item.c:1053
 msgid "Default account"
 msgstr "Standardkonto"
 
-#: src/prefs_folder_item.c:1676
+#: src/prefs_folder_item.c:1691
 msgid "Discard cache"
 msgstr "Zwischenspeicher verwerfen"
 
-#: src/prefs_folder_item.c:1677
+#: src/prefs_folder_item.c:1692
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr ""
 "Möchten Sie lokal zwischengespeicherte Daten für diesen Ordner wirklich "
 "verwerfen?"
 
-#: src/prefs_folder_item.c:1807
+#: src/prefs_folder_item.c:1824
 msgid "General"
 msgstr "Allgemein"
 
-#: src/prefs_folder_item.c:1886
+#: src/prefs_folder_item.c:1903
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Einstellungen für Ordner %s"
@@ -15813,7 +15911,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:2035
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2036
 msgid "Message"
 msgstr "Nachricht"
 
@@ -15838,8 +15936,8 @@ msgstr "Zum Drucken andere Schriftart verwenden"
 msgid "Message Printing"
 msgstr "Nachricht drucken"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:731
-#: src/prefs_themes.c:365
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:768
+#: src/prefs_themes.c:389
 msgid "Display"
 msgstr "Anzeige"
 
@@ -15847,7 +15945,7 @@ msgstr "Anzeige"
 msgid "Fonts"
 msgstr "Schriften"
 
-#: src/prefs_gtk.c:911 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:908 src/toolbar.c:256 src/toolbar.c:514
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -16075,11 +16173,11 @@ msgstr "Textbereich"
 msgid "whole message"
 msgstr "Ganze Nachricht"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6218
+#: src/prefs_matcher.c:394 src/summaryview.c:6307
 msgid "Marked"
 msgstr "Markiert"
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6216
+#: src/prefs_matcher.c:395 src/summaryview.c:6305
 msgid "Deleted"
 msgstr "Gelöscht"
 
@@ -16087,12 +16185,12 @@ msgstr "Gelöscht"
 msgid "Replied"
 msgstr "Beantwortet"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6210
+#: src/prefs_matcher.c:397 src/summaryview.c:6299
 msgid "Forwarded"
 msgstr "Weitergeleitet"
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6200 src/toolbar.c:416
-#: src/toolbar.c:934 src/toolbar.c:1978
+#: src/prefs_matcher.c:399 src/summaryview.c:6289 src/toolbar.c:512
+#: src/toolbar.c:981 src/toolbar.c:2261
 msgid "Spam"
 msgstr "Spam"
 
@@ -16100,7 +16198,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Mit Anhang"
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6236
+#: src/prefs_matcher.c:401 src/summaryview.c:6325
 msgid "Signed"
 msgstr "Signiert"
 
@@ -16200,54 +16298,54 @@ msgstr "Teilweise geladen"
 msgid "External program test"
 msgstr "Externer Programmtest"
 
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1615 src/prefs_matcher.c:1630
-#: src/prefs_matcher.c:2516
+#: src/prefs_matcher.c:710 src/prefs_matcher.c:1616 src/prefs_matcher.c:1631
+#: src/prefs_matcher.c:2517
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Alle"
 
-#: src/prefs_matcher.c:743
+#: src/prefs_matcher.c:744
 msgid "Use regexp"
 msgstr "Regexp verwenden"
 
-#: src/prefs_matcher.c:819
+#: src/prefs_matcher.c:820
 msgid "Message must match"
 msgstr "Nachricht muss auf"
 
-#: src/prefs_matcher.c:823
+#: src/prefs_matcher.c:824
 msgid "at least one"
 msgstr "mindestens eine"
 
-#: src/prefs_matcher.c:824
+#: src/prefs_matcher.c:825
 msgid "all"
 msgstr "alle"
 
-#: src/prefs_matcher.c:827
+#: src/prefs_matcher.c:828
 msgid "of above rules"
 msgstr "der obigen Regeln passen"
 
-#: src/prefs_matcher.c:1533 src/prefs_matcher.c:1599
+#: src/prefs_matcher.c:1534 src/prefs_matcher.c:1600
 msgid "Search pattern is not set."
 msgstr "Suchmuster ist nicht gesetzt."
 
-#: src/prefs_matcher.c:1542
+#: src/prefs_matcher.c:1543
 msgid "Test command is not set."
 msgstr "Test-Befehl ist nicht eingetragen."
 
-#: src/prefs_matcher.c:1616
+#: src/prefs_matcher.c:1617
 msgid "all addresses in all headers"
 msgstr "alle Adressen in allen Kopfzeilen"
 
-#: src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:1620
 msgid "any address in any header"
 msgstr "beliebige Adresse in beliebiger Kopfzeile"
 
-#: src/prefs_matcher.c:1621
+#: src/prefs_matcher.c:1622
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "Die Adresse(n) in der Kopfzeile '%s'"
 
-#: src/prefs_matcher.c:1622
+#: src/prefs_matcher.c:1623
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16260,86 +16358,86 @@ msgstr ""
 "Wenn %s gegen das gesamte Adressbuch verglichen werden soll, muss '%s' in "
 "der Adressbuch/Ordner Auswahl gewählt werden."
 
-#: src/prefs_matcher.c:1841
+#: src/prefs_matcher.c:1842
 msgid "Headers part"
 msgstr "Kopfbereich"
 
-#: src/prefs_matcher.c:1845
+#: src/prefs_matcher.c:1846
 msgid "Headers values"
 msgstr "Werte in Kopfzeilen"
 
-#: src/prefs_matcher.c:1849
+#: src/prefs_matcher.c:1850
 msgid "Body part"
 msgstr "Textbereich"
 
-#: src/prefs_matcher.c:1853
+#: src/prefs_matcher.c:1854
 msgid "Whole message"
 msgstr "Ganzer Nachricht"
 
-#: src/prefs_matcher.c:1966 src/prefs_matcher.c:2008
+#: src/prefs_matcher.c:1967 src/prefs_matcher.c:2009
 msgid "in"
 msgstr "in"
 
-#: src/prefs_matcher.c:1968
+#: src/prefs_matcher.c:1969
 msgid "content is"
 msgstr "Inhalt wird"
 
 # UI adapted
-#: src/prefs_matcher.c:1977
+#: src/prefs_matcher.c:1978
 msgid "Age is"
 msgstr "Alter von"
 
-#: src/prefs_matcher.c:1982
+#: src/prefs_matcher.c:1983
 msgid "Flag"
 msgstr "Merker"
 
-#: src/prefs_matcher.c:1983 src/prefs_matcher.c:1998
+#: src/prefs_matcher.c:1984 src/prefs_matcher.c:1999
 msgid "is"
 msgstr "ist"
 
-#: src/prefs_matcher.c:1988
+#: src/prefs_matcher.c:1989
 msgid "Name:"
 msgstr "Name:"
 
-#: src/prefs_matcher.c:1997
+#: src/prefs_matcher.c:1998
 msgid "Label"
 msgstr "Farbe"
 
-#: src/prefs_matcher.c:2003
+#: src/prefs_matcher.c:2004
 msgid "Value:"
 msgstr "Wert:"
 
-#: src/prefs_matcher.c:2018
+#: src/prefs_matcher.c:2019
 msgid "Score is"
 msgstr "Bewertung ist"
 
-#: src/prefs_matcher.c:2019
+#: src/prefs_matcher.c:2020
 msgid "points"
 msgstr "Punkte"
 
 # UI adapted
-#: src/prefs_matcher.c:2029
+#: src/prefs_matcher.c:2030
 msgid "Size is"
 msgstr "Nachricht ist"
 
-#: src/prefs_matcher.c:2034
+#: src/prefs_matcher.c:2035
 msgid "Scope:"
 msgstr "Umfang:"
 
-#: src/prefs_matcher.c:2036
+#: src/prefs_matcher.c:2037
 msgid "tags"
 msgstr "Marken"
 
 # UI adapted
-#: src/prefs_matcher.c:2041
+#: src/prefs_matcher.c:2042
 msgid "type is"
 msgstr "ist vom Typ"
 
-#: src/prefs_matcher.c:2045
+#: src/prefs_matcher.c:2046
 msgid "Program returns"
 msgstr "Rückgabewert"
 
-#: src/prefs_matcher.c:2115
+#: src/prefs_matcher.c:2116
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -16347,11 +16445,11 @@ msgstr ""
 "Der Eintrag wurde nicht gespeichert.\n"
 "Trotzdem schließen?"
 
-#: src/prefs_matcher.c:2181
+#: src/prefs_matcher.c:2182
 msgid "Match Type: 'Test'"
 msgstr "Treffertyp: 'Test'"
 
-#: src/prefs_matcher.c:2182
+#: src/prefs_matcher.c:2183
 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"
@@ -16363,7 +16461,7 @@ msgstr ""
 "\n"
 "Die folgenden Symbole können verwendet werden:"
 
-#: src/prefs_matcher.c:2281
+#: src/prefs_matcher.c:2282
 msgid "Current condition rules"
 msgstr "Aktuelle Bedingungsregeln"
 
@@ -16557,7 +16655,7 @@ msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Farbe für Signaturen wählen"
 
-#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:357
+#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:365
 msgid "Folder list"
 msgstr "Ordnerliste"
 
@@ -17102,174 +17200,190 @@ msgstr ""
 msgid "Spell Checking"
 msgstr "Rechtschreibprüfung"
 
-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:160
 msgid "the abbreviated weekday name"
 msgstr "der abgekürzte Name des Wochentags"
 
-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:161
 msgid "the full weekday name"
 msgstr "der vollständige Name des Wochentags"
 
-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:162
 msgid "the abbreviated month name"
 msgstr "der abgekürzte Name des Monats"
 
-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:163
 msgid "the full month name"
 msgstr "der vollständige Name des Monats"
 
-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:164
 msgid "the preferred date and time for the current locale"
 msgstr "das bevorzugte Zeit- und Datumsformat (regional)"
 
-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:165
 msgid "the century number (year/100)"
 msgstr "das Jahrhundert (Jahr/100)"
 
-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:166
 msgid "the day of the month as a decimal number"
 msgstr "der Tag des Monats als Dezimalzahl"
 
-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:167
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "die Stunde als Dezimalzahl (24-stündige Anzeige)"
 
-#: src/prefs_summaries.c:161
+#: src/prefs_summaries.c:168
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "die Stunde als Dezimalzahl (12-stündige Anzeige)"
 
-#: src/prefs_summaries.c:162
+#: src/prefs_summaries.c:169
 msgid "the day of the year as a decimal number"
 msgstr "der Tag des Jahres als Dezimalzahl"
 
-#: src/prefs_summaries.c:163
+#: src/prefs_summaries.c:170
 msgid "the month as a decimal number"
 msgstr "der Monat als Dezimalzahl"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:171
 msgid "the minute as a decimal number"
 msgstr "die Minute als Dezimalzahl"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:172
 msgid "either AM or PM"
 msgstr "entweder AM oder PM"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:173
 msgid "the second as a decimal number"
 msgstr "die Sekunde als Dezimalzahl"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:174
 msgid "the day of the week as a decimal number"
 msgstr "der Wochentag als Dezimalzahl"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:175
 msgid "the preferred date for the current locale"
 msgstr "das bevorzugte regionale Datumsformat"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:176
 msgid "the last two digits of a year"
 msgstr "die letzten zwei Stellen des Jahres"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:177
 msgid "the year as a decimal number"
 msgstr "das Jahr als Dezimalzahl"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:178
 msgid "the time zone or name or abbreviation"
 msgstr "die Zeitzone, deren Name oder Abkürzung"
 
-#: src/prefs_summaries.c:192 src/prefs_summaries.c:240
-#: src/prefs_summaries.c:561
+#: src/prefs_summaries.c:199 src/prefs_summaries.c:247
+#: src/prefs_summaries.c:567
 msgid "Date format"
 msgstr "Datumsformat"
 
-#: src/prefs_summaries.c:216
+#: src/prefs_summaries.c:223
 msgid "Specifier"
 msgstr "Platzhalter"
 
-#: src/prefs_summaries.c:258
+#: src/prefs_summaries.c:265
 msgid "Example"
 msgstr "Beispiel"
 
-#: src/prefs_summaries.c:363
+#: src/prefs_summaries.c:371
 msgid "Display message count next to folder name"
 msgstr "Nachrichtenanzahl neben Ordnername anzeigen"
 
 # adapted
-#: src/prefs_summaries.c:373
+#: src/prefs_summaries.c:381
 msgid "Unread messages"
 msgstr "Ungelesene"
 
 # adapted
-#: src/prefs_summaries.c:374
+#: src/prefs_summaries.c:382
 msgid "Unread and Total messages"
 msgstr "Ungelesene und insgesamt"
 
-#: src/prefs_summaries.c:384
+#: src/prefs_summaries.c:392
 msgid "Open last opened folder at start-up"
 msgstr "Zuletzt geöffneten Ordner bei Programmstart öffnen"
 
-#: src/prefs_summaries.c:387
+#: src/prefs_summaries.c:395
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Namen der Newsgruppen abkürzen, wenn länger als"
 
-#: src/prefs_summaries.c:401
+#: src/prefs_summaries.c:409
 msgid "letters"
 msgstr "Zeichen"
 
-#: src/prefs_summaries.c:419
+#: src/prefs_summaries.c:427
 msgid "Message list"
 msgstr "Nachrichtenliste"
 
-#: src/prefs_summaries.c:425
+#: src/prefs_summaries.c:433
 msgid "Sort new folders by"
 msgstr "Neue Ordner sortieren nach"
 
-#: src/prefs_summaries.c:433 src/prefs_summary_column.c:86
+#: src/prefs_summaries.c:441 src/prefs_summary_column.c:86
 msgid "Number"
 msgstr "Nummer"
 
-#: src/prefs_summaries.c:436
+#: src/prefs_summaries.c:444
 msgid "Thread date"
 msgstr "Diskursdatum"
 
-#: src/prefs_summaries.c:447
+#: src/prefs_summaries.c:455
 msgid "Don't sort"
 msgstr "Nicht sortieren"
 
-#: src/prefs_summaries.c:464
+#: src/prefs_summaries.c:472
 msgid "Set default selection when entering a folder"
 msgstr "Standardauswahl beim Öffnen eines Ordners"
 
-#: src/prefs_summaries.c:477
+#: src/prefs_summaries.c:485
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Dialog 'Keine ungelesene/neue Nachricht' anzeigen"
 
-#: src/prefs_summaries.c:487
+#: src/prefs_summaries.c:495
 msgid "Assume 'Yes'"
 msgstr "'Ja' annehmen"
 
-#: src/prefs_summaries.c:488
+#: src/prefs_summaries.c:496
 msgid "Assume 'No'"
 msgstr "'Nein' annehmen"
 
-#: src/prefs_summaries.c:496
+#: src/prefs_summaries.c:501
 msgid "Open message when selected"
 msgstr "Nachricht öffnen, wenn sie ausgewählt ist"
 
 #: src/prefs_summaries.c:506
-msgid "When message view is visible"
-msgstr "Wenn Nachrichtenansicht sichtbar"
+msgid "When opening a folder"
+msgstr "Beim Öffnen eines Ordners"
+
+#: src/prefs_summaries.c:508
+msgid "When displaying search results"
+msgstr "Beim Anzeigen der Suchresultate"
+
+#: src/prefs_summaries.c:510
+msgid "When selecting next or previous message using shortcuts"
+msgstr "Beim Sprung zur nächsten/vorigen Nachricht mittels Tastenkürzel"
 
 #: src/prefs_summaries.c:512
+msgid "When deleting or moving messages"
+msgstr "Beim Löschen/Verschieben von Nachrichten"
+
+#: src/prefs_summaries.c:514
+msgid "When using directional keys"
+msgstr "Beim Verwenden der Pfeiltasten"
+
+#: src/prefs_summaries.c:518
 msgid "Thread using subject in addition to standard headers"
 msgstr "Diskurs verwendet Betreff zusätzlich zu Standardkopfzeilen"
 
-#: src/prefs_summaries.c:516
+#: src/prefs_summaries.c:522
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Verschieben oder Löschen von Nachrichten sofort ausführen"
 
-#: src/prefs_summaries.c:518
+#: src/prefs_summaries.c:524
 msgid ""
 "Defers moving, copying and deleting of messages until you choose 'Tools/"
 "Execute'"
@@ -17277,40 +17391,40 @@ msgstr ""
 "Pausiert das Verschieben, Kopieren und Löschen von Nachrichten, bis 'Extras/"
 "Ausführen' aufgerufen wird"
 
-#: src/prefs_summaries.c:521
+#: src/prefs_summaries.c:527
 msgid "Mark message as read"
 msgstr "Nachricht als gelesen markieren"
 
-#: src/prefs_summaries.c:524
+#: src/prefs_summaries.c:530
 msgid "when selected, after"
 msgstr "Wenn ausgewählt, nach"
 
-#: src/prefs_summaries.c:544
+#: src/prefs_summaries.c:550
 msgid "only when opened in a new window, or replied to"
 msgstr "Nur wenn in neuem Fenster geöffnet oder beantwortet"
 
-#: src/prefs_summaries.c:551
+#: src/prefs_summaries.c:557
 msgid "Display sender using address book"
 msgstr "Absender mit Hilfe des Adressbuchs anzeigen"
 
-#: src/prefs_summaries.c:555
+#: src/prefs_summaries.c:561
 msgid "Show tooltips"
 msgstr "Quickinfos (Tooltips) anzeigen"
 
-#: src/prefs_summaries.c:581
+#: src/prefs_summaries.c:587
 msgid "Date format help"
 msgstr "Hilfe zum Datumsformat"
 
-#: src/prefs_summaries.c:599
+#: src/prefs_summaries.c:605
 msgid "Confirm before marking all messages in a folder as read"
 msgstr ""
 "Bestätigen, bevor alle Mails in einem Ordner als gelesen markiert werden"
 
-#: src/prefs_summaries.c:602
+#: src/prefs_summaries.c:608
 msgid "Translate header names"
 msgstr "Kopfzeilennamen übersetzen"
 
-#: src/prefs_summaries.c:604
+#: src/prefs_summaries.c:610
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
@@ -17318,7 +17432,7 @@ msgstr ""
 "Die Anzeige der Standardkopfzeilen (wie 'From:', 'Subject:') wird in Ihre "
 "Sprache übersetzt."
 
-#: src/prefs_summaries.c:732
+#: src/prefs_summaries.c:769
 msgid "Summaries"
 msgstr "Gesamtansicht"
 
@@ -17428,87 +17542,87 @@ msgstr "Vorlagenliste nicht gespeichert"
 msgid "The templates list has been modified. Close anyway?"
 msgstr "Die Vorlagenliste wurde geändert. Trotzdem schließen?"
 
-#: src/prefs_template.c:768
+#: src/prefs_template.c:758
 msgid "The template's name is not set."
 msgstr "Vorlagenname ist nicht gesetzt."
 
-#: src/prefs_template.c:811
+#: src/prefs_template.c:801
 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:817
+#: src/prefs_template.c:807
 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:823
+#: src/prefs_template.c:813
 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:829
+#: src/prefs_template.c:819
 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:835
+#: src/prefs_template.c:825
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr ""
 "Das \"Reply-To\"-Feld der Vorlage enthält eine ungültige E-Mailadresse."
 
-#: src/prefs_template.c:841
+#: src/prefs_template.c:831
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "Das \"Betreff\"-Feld der Vorlage ist ungültig."
 
-#: src/prefs_template.c:912
+#: src/prefs_template.c:902
 msgid "Delete template"
 msgstr "Vorlage löschen"
 
-#: src/prefs_template.c:913
+#: src/prefs_template.c:903
 msgid "Do you really want to delete this template?"
 msgstr "Möchten Sie diese Vorlage wirklich löschen?"
 
-#: src/prefs_template.c:925
+#: src/prefs_template.c:915
 msgid "Delete all templates"
 msgstr "Alle Vorlagen löschen"
 
-#: src/prefs_template.c:926
+#: src/prefs_template.c:916
 msgid "Do you really want to delete all the templates?"
 msgstr "Möchten Sie wirklich alle Vorlagen löschen?"
 
-#: src/prefs_template.c:1241
+#: src/prefs_template.c:1231
 msgid "Current templates"
 msgstr "Aktuelle Vorlagen"
 
-#: src/prefs_template.c:1269
+#: src/prefs_template.c:1259
 msgid "Template"
 msgstr "Vorlage"
 
-#: src/prefs_themes.c:344 src/prefs_themes.c:704
+#: src/prefs_themes.c:368 src/prefs_themes.c:804
 msgid "Default internal theme"
 msgstr "Internes Standard-Thema"
 
-#: src/prefs_themes.c:366
+#: src/prefs_themes.c:390
 msgid "Themes"
 msgstr "Themen"
 
-#: src/prefs_themes.c:436
+#: src/prefs_themes.c:464
 msgid "Only root can remove system themes"
 msgstr "Nur root kann System-Themen entfernen"
 
-#: src/prefs_themes.c:439
+#: src/prefs_themes.c:467
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "System-Thema '%s' entfernen"
 
-#: src/prefs_themes.c:442
+#: src/prefs_themes.c:470
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Thema '%s' entfernen"
 
-#: src/prefs_themes.c:448
+#: src/prefs_themes.c:476
 msgid "Are you sure you want to remove this theme?"
 msgstr "Soll dieses Thema wirklich gelöscht werden?"
 
-#: src/prefs_themes.c:458
+#: src/prefs_themes.c:486
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17517,24 +17631,24 @@ msgstr ""
 "Datei %s fehlerhaft\n"
 "beim Entfernen des Themas."
 
-#: src/prefs_themes.c:462
+#: src/prefs_themes.c:490
 msgid "Removing theme directory failed."
 msgstr "Entfernen des Thema-Ordners schlug fehl."
 
-#: src/prefs_themes.c:465
+#: src/prefs_themes.c:493
 msgid "Theme removed successfully"
 msgstr "Thema erfolgreich entfernt"
 
-#: src/prefs_themes.c:485
+#: src/prefs_themes.c:513
 msgid "Select theme folder"
 msgstr "Thema-Ordner wählen"
 
-#: src/prefs_themes.c:500
+#: src/prefs_themes.c:528
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Thema '%s' installieren"
 
-#: src/prefs_themes.c:503
+#: src/prefs_themes.c:531
 msgid ""
 "This folder doesn't seem to be a theme folder.\n"
 "Install anyway?"
@@ -17542,15 +17656,15 @@ msgstr ""
 "Dieser Ordner scheint kein Thema-Ordner zu sein.\n"
 "Trotzdem installieren?"
 
-#: src/prefs_themes.c:510
+#: src/prefs_themes.c:538
 msgid "Do you want to install theme for all users?"
 msgstr "Soll dieses Thema für alle Benutzer installiert werden?"
 
-#: src/prefs_themes.c:530
+#: src/prefs_themes.c:558
 msgid "Theme exists"
 msgstr "Thema existiert"
 
-#: src/prefs_themes.c:531
+#: src/prefs_themes.c:559
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -17562,25 +17676,25 @@ msgstr ""
 "\n"
 "Soll es ersetzt werden?"
 
-#: src/prefs_themes.c:537
+#: src/prefs_themes.c:565
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "Das alte Thema in %s konnte nicht gelöscht werden."
 
-#: src/prefs_themes.c:545
+#: src/prefs_themes.c:573
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "Zielordner %s konnte nicht erstellt werden."
 
-#: src/prefs_themes.c:558
+#: src/prefs_themes.c:586
 msgid "Theme installed successfully."
 msgstr "Thema erfolgreich installiert."
 
-#: src/prefs_themes.c:565
+#: src/prefs_themes.c:593
 msgid "Failed installing theme"
 msgstr "Fehler beim Installieren des Themas"
 
-#: src/prefs_themes.c:568
+#: src/prefs_themes.c:596
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17589,58 +17703,74 @@ msgstr ""
 "Datei %s fehlerhaft\n"
 "beim Installieren des Themas."
 
-#: src/prefs_themes.c:666
+#: src/prefs_themes.c:766
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d Themen verfügbar (%d User, %d System, 1 intern)"
 
-#: src/prefs_themes.c:707
+#: src/prefs_themes.c:807
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "Internes Thema hat %d Symbole"
 
-#: src/prefs_themes.c:713
+#: src/prefs_themes.c:813
 msgid "No info file available for this theme"
 msgstr "Keine Infodatei für dieses Thema vorhanden"
 
-#: src/prefs_themes.c:731
+#: src/prefs_themes.c:831
 msgid "Error: couldn't get theme status"
 msgstr "Fehler: Thema-Status nicht verfügbar"
 
-#: src/prefs_themes.c:755
+#: src/prefs_themes.c:861
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d Dateien (%d Symbole), Größe: %s"
 
-#: src/prefs_themes.c:803
+#: src/prefs_themes.c:919
 msgid "Selector"
 msgstr "Auswahl"
 
-#: src/prefs_themes.c:814
+#: src/prefs_themes.c:930
 msgid "Install new..."
 msgstr "Neu installieren..."
 
-#: src/prefs_themes.c:819
+#: src/prefs_themes.c:935
 msgid "Get more..."
 msgstr "Weitere holen..."
 
-#: src/prefs_themes.c:830
+#: src/prefs_themes.c:946
 msgid "Information"
 msgstr "Information"
 
-#: src/prefs_themes.c:844
+#: src/prefs_themes.c:960
 msgid "Author: "
 msgstr "Autor: "
 
-#: src/prefs_themes.c:852
+#: src/prefs_themes.c:968
 msgid "URL:"
 msgstr "URL:"
 
-#: src/prefs_themes.c:894
+#: src/prefs_themes.c:1010
 msgid "Preview"
 msgstr "Vorschau"
 
-#: src/prefs_toolbar.c:176
+#: src/prefs_themes.c:1066
+msgid "SVG rendering"
+msgstr "SVG-Rendering"
+
+#: src/prefs_themes.c:1073
+msgid "Enable alpha channel"
+msgstr "Alpha-Kanal aktivieren"
+
+#: src/prefs_themes.c:1074
+msgid "Force scaling"
+msgstr "Skalierung erzwingen"
+
+#: src/prefs_themes.c:1080
+msgid "Pixels per inch (PPI)"
+msgstr "Pixel pro Zoll (PPI)"
+
+#: src/prefs_toolbar.c:186
 msgid ""
 "Selected Action already set.\n"
 "Please choose another Action from List"
@@ -17648,75 +17778,75 @@ msgstr ""
 "Gewählte Aktion bereits gesetzt.\n"
 "Bitte eine andere Aktion aus der Liste wählen"
 
-#: src/prefs_toolbar.c:177
+#: src/prefs_toolbar.c:187
 msgid "Item has no icon defined."
 msgstr "Element hat kein Symbol definiert."
 
-#: src/prefs_toolbar.c:178
+#: src/prefs_toolbar.c:188
 msgid "Item has no text defined."
 msgstr "Element hat keinen Text definiert"
 
-#: src/prefs_toolbar.c:916
+#: src/prefs_toolbar.c:929
 msgid "Toolbar item"
 msgstr "Werkzeugleisten-Element"
 
-#: src/prefs_toolbar.c:932
+#: src/prefs_toolbar.c:945
 msgid "Item type"
 msgstr "Elementart"
 
-#: src/prefs_toolbar.c:942
+#: src/prefs_toolbar.c:955
 msgid "Internal Function"
 msgstr "Interne Funktion"
 
-#: src/prefs_toolbar.c:943
+#: src/prefs_toolbar.c:956
 msgid "User Action"
 msgstr "Benutzer-Funktion"
 
-#: src/prefs_toolbar.c:945 src/toolbar.c:234
+#: src/prefs_toolbar.c:958 src/toolbar.c:277
 msgid "Separator"
 msgstr "Trenner"
 
-#: src/prefs_toolbar.c:952
+#: src/prefs_toolbar.c:965
 msgid "Event executed on click"
 msgstr "Auszuführender Vorgang"
 
-#: src/prefs_toolbar.c:991
+#: src/prefs_toolbar.c:1004
 msgid "Toolbar text"
 msgstr "Werkzeugleisten-Text"
 
-#: src/prefs_toolbar.c:1006 src/prefs_toolbar.c:1382
+#: src/prefs_toolbar.c:1019 src/prefs_toolbar.c:1395
 msgid "Icon"
 msgstr "Symbol"
 
-#: src/prefs_toolbar.c:1042
+#: src/prefs_toolbar.c:1055
 msgid "A_dd"
 msgstr "Hinzufügen"
 
-#: src/prefs_toolbar.c:1262 src/prefs_toolbar.c:1276 src/prefs_toolbar.c:1290
+#: src/prefs_toolbar.c:1275 src/prefs_toolbar.c:1289 src/prefs_toolbar.c:1303
 msgid "Toolbars"
 msgstr "Werkzeugleisten"
 
-#: src/prefs_toolbar.c:1263
+#: src/prefs_toolbar.c:1276
 msgid "Main Window"
 msgstr "Hauptfenster"
 
-#: src/prefs_toolbar.c:1277
+#: src/prefs_toolbar.c:1290
 msgid "Message Window"
 msgstr "Nachrichtenfenster"
 
-#: src/prefs_toolbar.c:1291
+#: src/prefs_toolbar.c:1304
 msgid "Compose Window"
 msgstr "Editor-Fenster"
 
-#: src/prefs_toolbar.c:1405
+#: src/prefs_toolbar.c:1418
 msgid "Icon text"
 msgstr "Symboltext"
 
-#: src/prefs_toolbar.c:1414
+#: src/prefs_toolbar.c:1427
 msgid "Mapped event"
 msgstr "Abgebildeter Vorgang"
 
-#: src/prefs_toolbar.c:1711
+#: src/prefs_toolbar.c:1724
 msgid "Toolbar item icon"
 msgstr "Symbol für Werkzeugleistenelement"
 
@@ -17789,24 +17919,24 @@ msgstr "Kein Empfängerschlüssel definiert."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fehler beim BASE64-Entschlüsseln]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "es wird bereits versucht zu Senden."
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1558 src/procmsg.c:1618
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Datei %s konnte nicht geöffnet werden."
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1628
 msgid "Queued message header is broken."
 msgstr "Defekte Kopfzeile in vorgespeicherter Nachricht."
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1648
 msgid "An error happened during SMTP session."
 msgstr "Während der SMTP-Sitzung ist ein Fehler aufgetreten."
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1662
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -17814,7 +17944,7 @@ msgstr ""
 "Kein Konto zum Senden gefunden; und während der SMTP-Sitzung trat ein Fehler "
 "auf."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1670
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17822,20 +17952,20 @@ msgstr ""
 "Es fehlen Informationen zum Senden. Möglicherweise wurde diese E-Mail nicht "
 "mit Claws Mail erstellt."
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1693
 msgid "Couldn't create temporary file for news sending."
 msgstr "Temporäre Datei für das Senden der News nicht erstellbar."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1706
 msgid "Error when writing temporary file for news sending."
 msgstr "Fehler beim Schreiben der temporären Datei zum Senden der News."
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1720
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Beim Senden der Nachricht an %s ist ein Fehler aufgetreten."
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2272
 msgid "Filtering messages...\n"
 msgstr "Nachrichten werden gefiltert...\n"
 
@@ -18153,12 +18283,12 @@ msgstr "Text eingeben, um '%s' zu ersetzen"
 msgid "Enter variable"
 msgstr "Variable eingeben"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Senden der Nachricht mit dem Befehl: %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Befehl konnte nicht ausgeführt werden: %s"
@@ -18191,7 +18321,7 @@ msgstr "E-Mail erfolgreich gesendet."
 
 #: src/send_message.c:486
 msgid "Sending HELO..."
-msgstr "Sende HELO..."
+msgstr "HELO wird gesendet..."
 
 #: src/send_message.c:487 src/send_message.c:492 src/send_message.c:497
 msgid "Authenticating"
@@ -18279,313 +18409,313 @@ 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:259
+#: src/summary_search.c:305
 msgid "Search messages"
 msgstr "Nachrichten durchsuchen"
 
-#: src/summary_search.c:281
+#: src/summary_search.c:327
 msgid "Match any of the following"
 msgstr "Enthält beliebiges der folgenden Elemente"
 
-#: src/summary_search.c:283
+#: src/summary_search.c:329
 msgid "Match all of the following"
 msgstr "Enthält alle der folgenden Elemente"
 
-#: src/summary_search.c:447
+#: src/summary_search.c:495
 msgid "Body:"
 msgstr "Text:"
 
-#: src/summary_search.c:454
+#: src/summary_search.c:502
 msgid "Condition:"
 msgstr "Bedingung:"
 
-#: src/summary_search.c:484
+#: src/summary_search.c:536
 msgid "Find _all"
 msgstr "_Alle finden"
 
-#: src/summary_search.c:690 src/summaryview.c:1086 src/summaryview.c:1348
+#: src/summary_search.c:751 src/summaryview.c:1089 src/summaryview.c:1351
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Suche in %s... \n"
 
-#: src/summary_search.c:787
+#: src/summary_search.c:846
 msgid "Beginning of list reached; continue from end?"
 msgstr "Anfang der Liste erreicht. Weiter vom Ende?"
 
-#: src/summary_search.c:789
+#: src/summary_search.c:848
 msgid "End of list reached; continue from beginning?"
 msgstr "Ende der Liste erreicht. Weiter vom Anfang?"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:431
 msgid "Create _filter rule"
 msgstr "Filter_regel erstellen"
 
-#: src/summaryview.c:557
+#: src/summaryview.c:559
 msgid "Toggle quick search bar"
 msgstr "Schnellsuchmenü ein/aus"
 
-#: src/summaryview.c:594
+#: src/summaryview.c:596
 msgid "Toggle multiple selection"
 msgstr "Mehrfachauswahl ein/aus"
 
-#: src/summaryview.c:1276
+#: src/summaryview.c:1279
 msgid "Process mark"
 msgstr "Markierung verarbeiten"
 
-#: src/summaryview.c:1277
+#: src/summaryview.c:1280
 msgid "Some marks are left. Process them?"
 msgstr "Einige Markierungen sind übrig. Verarbeiten?"
 
-#: src/summaryview.c:1327
+#: src/summaryview.c:1330
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Ordner %s wird durchsucht ..."
 
-#: src/summaryview.c:1834 src/summaryview.c:1877
+#: src/summaryview.c:1868 src/summaryview.c:1916
 msgid "No more unread messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1835
+#: src/summaryview.c:1869
 msgid "No unread message found. Search from the end?"
 msgstr "Keine ungelesene Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1847 src/summaryview.c:1890 src/summaryview.c:1926
-#: src/summaryview.c:1969 src/summaryview.c:2038
+#: src/summaryview.c:1881 src/summaryview.c:1929 src/summaryview.c:1966
+#: src/summaryview.c:2014 src/summaryview.c:2081
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Interner Fehler: Unerwarteter Wert für 'prefs_common."
 "next_unread_msg_dialog'\n"
 
-#: src/summaryview.c:1855
+#: src/summaryview.c:1893
 msgid "No unread messages."
 msgstr "Keine ungelesenen Nachrichten."
 
-#: src/summaryview.c:1878
+#: src/summaryview.c:1917
 msgid "No unread message found. Go to next folder?"
 msgstr "Keine ungelesene Nachricht gefunden. Weiter in nächstem Ordner?"
 
-#: src/summaryview.c:1913 src/summaryview.c:1956
+#: src/summaryview.c:1953 src/summaryview.c:2001
 msgid "No more new messages"
 msgstr "Keine weiteren neuen Nachrichten"
 
-#: src/summaryview.c:1914
+#: src/summaryview.c:1954
 msgid "No new message found. Search from the end?"
 msgstr "Keine neue Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1934
+#: src/summaryview.c:1978
 msgid "No new messages."
 msgstr "Keine neuen Nachrichten."
 
-#: src/summaryview.c:1957
+#: src/summaryview.c:2002
 msgid "No new message found. Go to next folder?"
 msgstr "Keine neue Nachricht gefunden. Weiter in nächstem Ordner?"
 
-#: src/summaryview.c:1994 src/summaryview.c:2025
+#: src/summaryview.c:2035 src/summaryview.c:2068
 msgid "No more marked messages"
 msgstr "Keine weiteren markierten Nachrichten"
 
-#: src/summaryview.c:1995
+#: src/summaryview.c:2036
 msgid "No marked message found. Search from the end?"
 msgstr "Keine markierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2045
 msgid "No marked messages."
 msgstr "Keine markierten Nachrichten."
 
-#: src/summaryview.c:2026
+#: src/summaryview.c:2069
 msgid "No marked message found. Go to next folder?"
 msgstr "Keine markierte Nachricht gefunden. Weiter in nächstem Ordner?"
 
-#: src/summaryview.c:2063 src/summaryview.c:2088
+#: src/summaryview.c:2102 src/summaryview.c:2131
 msgid "No more labeled messages"
 msgstr "Keine weiteren farbmarkierten Nachrichten"
 
-#: src/summaryview.c:2064
+#: src/summaryview.c:2103
 msgid "No labeled message found. Search from the end?"
 msgstr "Keine farbmarkierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:2073 src/summaryview.c:2098
+#: src/summaryview.c:2112 src/summaryview.c:2145
 msgid "No labeled messages."
 msgstr "Keine farbmarkierte Nachrichten."
 
-#: src/summaryview.c:2089
+#: src/summaryview.c:2132
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Keine farbmarkierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:2404
+#: src/summaryview.c:2449
 msgid "Attracting messages by subject..."
 msgstr "Nachrichten werden nach Betreff angezogen..."
 
-#: src/summaryview.c:2589
+#: src/summaryview.c:2634
 #, c-format
 msgid "%d deleted"
 msgstr "%d gelöscht"
 
-#: src/summaryview.c:2593
+#: src/summaryview.c:2638
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verschoben"
 
-#: src/summaryview.c:2594 src/summaryview.c:2601
+#: src/summaryview.c:2639 src/summaryview.c:2646
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2599
+#: src/summaryview.c:2644
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopiert"
 
-#: src/summaryview.c:2613
+#: src/summaryview.c:2658
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " Eintrag gewählt"
 msgstr[1] " Einträge gewählt"
 
-#: src/summaryview.c:2631 src/summaryview.c:2674
+#: src/summaryview.c:2676 src/summaryview.c:2719
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d neue, %d ungelesene, %d gesamt (%s)"
 
-#: src/summaryview.c:2649
+#: src/summaryview.c:2694
 msgid "Message summary"
 msgstr "Nachrichtenübersicht"
 
-#: src/summaryview.c:2650
+#: src/summaryview.c:2695
 msgid "New:"
 msgstr "Neu:"
 
-#: src/summaryview.c:2651
+#: src/summaryview.c:2696
 msgid "Unread:"
 msgstr "Ungelesen:"
 
-#: src/summaryview.c:2652
+#: src/summaryview.c:2697
 msgid "Total:"
 msgstr "Gesamt:"
 
-#: src/summaryview.c:2654
+#: src/summaryview.c:2699
 msgid "Marked:"
 msgstr "Markiert:"
 
-#: src/summaryview.c:2655
+#: src/summaryview.c:2700
 msgid "Replied:"
 msgstr "Beantwortet:"
 
-#: src/summaryview.c:2656
+#: src/summaryview.c:2701
 msgid "Forwarded:"
 msgstr "Weitergeleitet:"
 
-#: src/summaryview.c:2657
+#: src/summaryview.c:2702
 msgid "Locked:"
 msgstr "Gesperrt:"
 
-#: src/summaryview.c:2658
+#: src/summaryview.c:2703
 msgid "Ignored:"
 msgstr "Ignoriert:"
 
-#: src/summaryview.c:2659
+#: src/summaryview.c:2704
 msgid "Watched:"
 msgstr "Beobachtet:"
 
-#: src/summaryview.c:2669
+#: src/summaryview.c:2714
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d ausgewählt (%s/%s), %d ungelesen"
 
-#: src/summaryview.c:2962
+#: src/summaryview.c:3007
 msgid "Sorting summary..."
 msgstr "Ordneransicht wird sortiert..."
 
-#: src/summaryview.c:3101
+#: src/summaryview.c:3146
 msgid "Setting summary from message data..."
 msgstr "Ordneransicht wird aus Nachrichtendaten gesetzt..."
 
-#: src/summaryview.c:3306
+#: src/summaryview.c:3351
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
-#: src/summaryview.c:3358
+#: src/summaryview.c:3403
 msgid "(No Recipient)"
 msgstr "(Kein Empfänger)"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3438
 #, c-format
 msgid "From: %s, on %s"
 msgstr "Von: %s, am %s"
 
-#: src/summaryview.c:3402
+#: src/summaryview.c:3447
 #, c-format
 msgid "To: %s, on %s"
 msgstr "An: %s, am %s"
 
-#: src/summaryview.c:4231
+#: src/summaryview.c:4312
 msgid "You're not the author of the article.\n"
 msgstr "Sie sind nicht der Autor dieses Artikels.\n"
 
-#: src/summaryview.c:4321
+#: src/summaryview.c:4402
 #, 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:4324
+#: src/summaryview.c:4405
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Nachricht löschen"
 msgstr[1] "Nachrichten löschen"
 
-#: src/summaryview.c:4488
+#: src/summaryview.c:4569
 msgid "Destination is same as current folder."
 msgstr "Ziel ist der aktuelle Ordner."
 
-#: src/summaryview.c:4589
+#: src/summaryview.c:4675
 msgid "Destination to copy is same as current folder."
 msgstr "Ziel der Kopie ist der aktuelle Ordner."
 
-#: src/summaryview.c:4754
+#: src/summaryview.c:4845
 msgid "Append or Overwrite"
 msgstr "Anhängen oder Überschreiben"
 
-#: src/summaryview.c:4755
+#: src/summaryview.c:4846
 msgid "Append or overwrite existing file?"
 msgstr "Vorhandene Datei anhängen oder überschreiben?"
 
-#: src/summaryview.c:4756
+#: src/summaryview.c:4847
 msgid "_Append"
 msgstr "_Anhängen"
 
-#: src/summaryview.c:4756
+#: src/summaryview.c:4847
 msgid "_Overwrite"
 msgstr "_Überschreiben"
 
-#: src/summaryview.c:4797
+#: src/summaryview.c:4888
 #, 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:5257
+#: src/summaryview.c:5346
 msgid "Building threads..."
 msgstr "Diskurse werden erstellt..."
 
-#: src/summaryview.c:5505
+#: src/summaryview.c:5594
 msgid "Skip these rules"
 msgstr "Diese Regeln überspringen"
 
-#: src/summaryview.c:5508
+#: src/summaryview.c:5597
 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:5511
+#: src/summaryview.c:5600
 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:5540
+#: src/summaryview.c:5629
 msgid "Filtering"
 msgstr "Filter"
 
-#: src/summaryview.c:5541
+#: src/summaryview.c:5630
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18593,56 +18723,56 @@ msgstr ""
 "Einige Filterregeln gehören zu einem bestimmtem Konto.\n"
 "Bitte wählen was mit diesen geschehen soll:"
 
-#: src/summaryview.c:5571
+#: src/summaryview.c:5660
 msgid "Filtering..."
 msgstr "Filtern läuft..."
 
-#: src/summaryview.c:5650
+#: src/summaryview.c:5739
 msgid "Processing configuration"
 msgstr "Verarbeitungsregeln"
 
-#: src/summaryview.c:6196
+#: src/summaryview.c:6285
 msgid "Ignored thread"
 msgstr "Ignorierter Diskurs"
 
-#: src/summaryview.c:6198
+#: src/summaryview.c:6287
 msgid "Watched thread"
 msgstr "Beobachteter Diskurs"
 
-#: src/summaryview.c:6206
+#: src/summaryview.c:6295
 msgid "Replied but also forwarded - click to see reply"
 msgstr ""
 "Beantwortet, aber auch weitergeleitet - klicken, um die Antwort zu sehen"
 
-#: src/summaryview.c:6208
+#: src/summaryview.c:6297
 msgid "Replied - click to see reply"
 msgstr "Beantwortet - klicken, um die Antwort zu sehen"
 
-#: src/summaryview.c:6220
+#: src/summaryview.c:6309
 msgid "To be moved"
 msgstr "Zu verschieben"
 
-#: src/summaryview.c:6222
+#: src/summaryview.c:6311
 msgid "To be copied"
 msgstr "Zu kopieren"
 
-#: src/summaryview.c:6234
+#: src/summaryview.c:6323
 msgid "Signed, has attachment(s)"
 msgstr "Signiert, hat Anhänge"
 
-#: src/summaryview.c:6238
+#: src/summaryview.c:6327
 msgid "Encrypted, has attachment(s)"
 msgstr "Verschlüsselt, hat Anhänge"
 
-#: src/summaryview.c:6240
+#: src/summaryview.c:6329
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
-#: src/summaryview.c:6242
+#: src/summaryview.c:6331
 msgid "Has attachment(s)"
 msgstr "Hat Anhänge"
 
-#: src/summaryview.c:7889
+#: src/summaryview.c:7988
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18651,53 +18781,53 @@ msgstr ""
 "Fehler in Regulärem Ausdruck (regexp):\n"
 "%s"
 
-#: src/summaryview.c:7992
+#: src/summaryview.c:8091
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Zurück zur Ordnerliste (Es gibt ungelesene Nachrichten)"
 
-#: src/summaryview.c:7997
+#: src/summaryview.c:8096
 msgid "Go back to the folder list"
 msgstr "Zurück zur Ordnerliste"
 
-#: src/textview.c:231
+#: src/textview.c:245
 msgid "_Open in web browser"
 msgstr "Im Webbr_owser öffnen"
 
-#: src/textview.c:232
+#: src/textview.c:246
 msgid "Copy this _link"
 msgstr "_Link-Adresse kopieren"
 
-#: src/textview.c:239
+#: src/textview.c:253
 msgid "_Reply to this address"
 msgstr "an diese Ad_resse antworten"
 
-#: src/textview.c:240
+#: src/textview.c:254
 msgid "Add to _Address book"
 msgstr "Zum _Adressbuch hinzufügen"
 
-#: src/textview.c:241
+#: src/textview.c:255
 msgid "Copy this add_ress"
 msgstr "Adresse kopieren"
 
-#: src/textview.c:247
+#: src/textview.c:261
 msgid "_Open image"
 msgstr "Bild _öffnen"
 
-#: src/textview.c:248
+#: src/textview.c:262
 msgid "_Save image..."
 msgstr "Bild _speichern..."
 
-#: src/textview.c:722
+#: src/textview.c:724
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d Bytes)]"
 
-#: src/textview.c:725
+#: src/textview.c:727
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d Bytes)]"
 
-#: src/textview.c:915
+#: src/textview.c:917
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -18711,68 +18841,68 @@ msgstr ""
 "\n"
 "  Benutze "
 
-#: src/textview.c:920
+#: src/textview.c:922
 msgid "'Network Log'"
 msgstr "'Netzwerkprotokoll'"
 
-#: src/textview.c:921
+#: src/textview.c:923
 msgid " in the Tools menu for more information."
 msgstr " im Menü 'Extras' für mehr Informationen."
 
-#: src/textview.c:984
+#: src/textview.c:986
 msgid "  The following can be performed on this part\n"
 msgstr "  Nach einem Rechtsklick auf das Symbol oder Listenelement kann\n"
 
-#: src/textview.c:986
+#: src/textview.c:988
 msgid "  by right-clicking the icon or list item:"
 msgstr "  dieser Teil folgendermaßen gehandhabt werden:"
 
-#: src/textview.c:990
+#: src/textview.c:992
 msgid "     - To save, select "
 msgstr "     - Zum Speichern "
 
-#: src/textview.c:991
+#: src/textview.c:993
 msgid "'Save as...'"
 msgstr "'Speichern als...'"
 
-#: src/textview.c:993 src/textview.c:1005 src/textview.c:1017
-#: src/textview.c:1027
+#: src/textview.c:995 src/textview.c:1007 src/textview.c:1019
+#: src/textview.c:1029
 msgid " (Shortcut key: '"
 msgstr " (Tastenkürzel: ')"
 
-#: src/textview.c:1001
+#: src/textview.c:1003
 msgid "     - To display as text, select "
 msgstr "     - Zum Darstellen als Text "
 
-#: src/textview.c:1002
+#: src/textview.c:1004
 msgid "'Display as text'"
 msgstr "'Als Text darstellen'"
 
-#: src/textview.c:1013
+#: src/textview.c:1015
 msgid "     - To open with an external program, select "
 msgstr "     - Zum Öffnen in einem externen Programm "
 
-#: src/textview.c:1014
+#: src/textview.c:1016
 msgid "'Open'"
 msgstr "'Öffnen'"
 
-#: src/textview.c:1022
+#: src/textview.c:1024
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativ doppelklicken oder mit der mittleren "
 
-#: src/textview.c:1023
+#: src/textview.c:1025
 msgid "mouse button)\n"
 msgstr "Maustaste klicken)\n"
 
-#: src/textview.c:1025
+#: src/textview.c:1027
 msgid "     - Or use "
 msgstr "     - Oder benutze "
 
-#: src/textview.c:1026
+#: src/textview.c:1028
 msgid "'Open with...'"
 msgstr "'Öffnen mit...'"
 
-#: src/textview.c:1140
+#: src/textview.c:1146
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -18783,11 +18913,11 @@ msgstr ""
 "....%s\n"
 "Rückgabewert %d\n"
 
-#: src/textview.c:2189
+#: src/textview.c:2197
 msgid "Tags: "
 msgstr "Marken: "
 
-#: src/textview.c:2895
+#: src/textview.c:2905
 msgid "The real URL is different from the displayed URL."
 msgstr ""
 "Die angezeigte URL unterscheidet sich von der tatsächlichen URL.\n"
@@ -18798,306 +18928,370 @@ msgstr ""
 "\n"
 "Trotzdem öffnen?"
 
-#: src/textview.c:2896
+#: src/textview.c:2906
 msgid "Displayed URL:"
 msgstr "Angezeigte URL:"
 
-#: src/textview.c:2897
+#: src/textview.c:2907
 msgid "Real URL:"
 msgstr "Tatsächliche URL:"
 
-#: src/textview.c:2898
+#: src/textview.c:2908
 msgid "Open it anyway?"
 msgstr "Trotzdem öffnen?"
 
-#: src/textview.c:2899
+#: src/textview.c:2909
 msgid "Phishing attempt warning"
 msgstr "Warnung vor Phishing-Versuch"
 
-#: src/textview.c:2900
+#: src/textview.c:2910
 msgid "_Open URL"
 msgstr "_URL Öffnen"
 
-#: src/toolbar.c:192 src/toolbar.c:1930
+#: src/toolbar.c:224 src/toolbar.c:2213
 msgid "Receive Mail from all Accounts"
 msgstr "E-Mails aller Konten empfangen"
 
-#: src/toolbar.c:193 src/toolbar.c:1935
+#: src/toolbar.c:225 src/toolbar.c:2218
 msgid "Receive Mail from current Account"
 msgstr "E-Mails vom aktuellen Konto empfangen"
 
-#: src/toolbar.c:194 src/toolbar.c:1939
+#: src/toolbar.c:226 src/toolbar.c:2222
 msgid "Send Queued Messages"
 msgstr "Vorgespeicherte Nachrichten senden"
 
-#: src/toolbar.c:195 src/toolbar.c:905 src/toolbar.c:1957 src/toolbar.c:1968
+#: src/toolbar.c:227 src/toolbar.c:952 src/toolbar.c:2240 src/toolbar.c:2251
 msgid "Compose Email"
 msgstr "E-Mail verfassen"
 
-#: src/toolbar.c:196
+#: src/toolbar.c:228
 msgid "Compose News"
 msgstr "News verfassen"
 
-#: src/toolbar.c:197 src/toolbar.c:1996 src/toolbar.c:2006
+#: src/toolbar.c:229 src/toolbar.c:2295 src/toolbar.c:2305
 msgid "Reply to Message"
 msgstr "Nachricht beantworten"
 
-#: src/toolbar.c:198 src/toolbar.c:2013 src/toolbar.c:2023
+#: src/toolbar.c:230 src/toolbar.c:2312 src/toolbar.c:2322
 msgid "Reply to Sender"
 msgstr "Antwort an Absender"
 
-#: src/toolbar.c:199 src/toolbar.c:2030 src/toolbar.c:2040
+#: src/toolbar.c:231 src/toolbar.c:2329 src/toolbar.c:2339
 msgid "Reply to All"
 msgstr "Antwort an alle"
 
-#: src/toolbar.c:200 src/toolbar.c:2047 src/toolbar.c:2057
+#: src/toolbar.c:232 src/toolbar.c:2346 src/toolbar.c:2356
 msgid "Reply to Mailing-list"
 msgstr "Antwort an Mailingliste"
 
-#: src/toolbar.c:201 src/toolbar.c:1951
+#: src/toolbar.c:233 src/toolbar.c:2234
 msgid "Open email"
 msgstr "E-Mail öffnen"
 
-#: src/toolbar.c:202 src/toolbar.c:2064 src/toolbar.c:2075
+#: src/toolbar.c:234 src/toolbar.c:2363 src/toolbar.c:2374
 msgid "Forward Message"
 msgstr "Nachricht weiterleiten"
 
-#: src/toolbar.c:203 src/toolbar.c:2080
+#: src/toolbar.c:235 src/toolbar.c:2379
 msgid "Trash Message"
 msgstr "Nachricht verwerfen"
 
-#: src/toolbar.c:204 src/toolbar.c:2084
+#: src/toolbar.c:236 src/toolbar.c:2383
 msgid "Delete Message"
 msgstr "Nachricht löschen"
 
-#: src/toolbar.c:206 src/toolbar.c:2092
+#: src/toolbar.c:237
+msgid "Delete duplicate messages"
+msgstr "Doppelte Nachrichten löschen"
+
+#: src/toolbar.c:239 src/toolbar.c:2391
 msgid "Go to Previous Unread Message"
 msgstr "Zurück zur vorherigen ungelesenen Nachricht"
 
-#: src/toolbar.c:207 src/toolbar.c:2096
+#: src/toolbar.c:240 src/toolbar.c:2395
 msgid "Go to Next Unread Message"
 msgstr "Weiter zur nächsten ungelesenen Nachricht"
 
-#: src/toolbar.c:210 src/toolbar.c:421
+#: src/toolbar.c:244
+msgid "Mark Message"
+msgstr "Nachricht markieren"
+
+#: src/toolbar.c:245
+msgid "Unmark Message"
+msgstr "Nachricht demarkieren"
+
+#: src/toolbar.c:246
+msgid "Lock Message"
+msgstr "Nachricht sperren"
+
+#: src/toolbar.c:247
+msgid "Unlock Message"
+msgstr "Nachricht entsperren"
+
+#: src/toolbar.c:248
+msgid "Mark all Messages as read"
+msgstr "Alle Nachrichten als gelesen markieren"
+
+#: src/toolbar.c:249
+msgid "Mark all Messages as unread"
+msgstr "Alle Nachrichten als ungelesen markieren"
+
+#: src/toolbar.c:250
+msgid "Mark Message as read"
+msgstr "Nachricht als gelesen markieren"
+
+#: src/toolbar.c:251
+msgid "Mark Message as unread"
+msgstr "Nachricht als ungelesen markieren"
+
+#: src/toolbar.c:253 src/toolbar.c:511
 msgid "Print"
 msgstr "Drucken"
 
-#: src/toolbar.c:211
+#: src/toolbar.c:254
 msgid "Learn Spam or Ham"
 msgstr "Lerne Spam oder Nicht-Spam"
 
-#: src/toolbar.c:212
+#: src/toolbar.c:255
 msgid "Open folder/Go to folder list"
 msgstr "Ordner öffnen/Weiter zur Ordnerliste"
 
-#: src/toolbar.c:215 src/toolbar.c:2102
+#: src/toolbar.c:258 src/toolbar.c:2401
 msgid "Send Message"
 msgstr "Nachricht senden"
 
-#: src/toolbar.c:216 src/toolbar.c:2106
+#: src/toolbar.c:259 src/toolbar.c:2405
 msgid "Put into queue folder and send later"
 msgstr "Im Postausgang ablegen und später senden"
 
-#: src/toolbar.c:217 src/toolbar.c:2110
+#: src/toolbar.c:260 src/toolbar.c:2409
 msgid "Save to draft folder"
 msgstr "Im Entwurfsordner speichern"
 
-#: src/toolbar.c:218 src/toolbar.c:2114
+#: src/toolbar.c:261 src/toolbar.c:2413
 msgid "Insert file"
 msgstr "Datei einfügen"
 
-#: src/toolbar.c:219 src/toolbar.c:2118
+#: src/toolbar.c:262 src/toolbar.c:2417
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#: src/toolbar.c:220 src/toolbar.c:2122
+#: src/toolbar.c:263 src/toolbar.c:2421
 msgid "Insert signature"
 msgstr "Signatur einfügen"
 
-#: src/toolbar.c:221 src/toolbar.c:2126
+#: src/toolbar.c:264 src/toolbar.c:2425
 msgid "Replace signature"
 msgstr "Signatur ersetzen"
 
-#: src/toolbar.c:222 src/toolbar.c:2130
+#: src/toolbar.c:265 src/toolbar.c:2429
 msgid "Edit with external editor"
 msgstr "Mit externem Editor bearbeiten"
 
-#: src/toolbar.c:223 src/toolbar.c:2134
+#: src/toolbar.c:266 src/toolbar.c:2433
 msgid "Wrap long lines of current paragraph"
 msgstr "Lange Zeilen in diesem Absatz umbrechen"
 
-#: src/toolbar.c:224 src/toolbar.c:2138
+#: src/toolbar.c:267 src/toolbar.c:2437
 msgid "Wrap all long lines"
 msgstr "Alle langen _Zeilen umbrechen"
 
-#: src/toolbar.c:227 src/toolbar.c:440 src/toolbar.c:2147
+#: src/toolbar.c:270 src/toolbar.c:528 src/toolbar.c:2446
 msgid "Check spelling"
 msgstr "Rechtschreibung prüfen"
 
-#: src/toolbar.c:229
+#: src/toolbar.c:272
 msgid "Claws Mail Actions Feature"
 msgstr "Claws Mail-Aktionsfunktion"
 
-#: src/toolbar.c:230 src/toolbar.c:2163
+#: src/toolbar.c:273 src/toolbar.c:2462
 msgid "Cancel receiving"
 msgstr "Empfang abbrechen"
 
-#: src/toolbar.c:232 src/toolbar.c:2171
+#: src/toolbar.c:275 src/toolbar.c:2470
 msgid "Cancel receiving/sending"
 msgstr "Empfang/Versand abbrechen"
 
-#: src/toolbar.c:233 src/toolbar.c:1943
+#: src/toolbar.c:276 src/toolbar.c:2226
 msgid "Close window"
 msgstr "Fenster schließen"
 
-#: src/toolbar.c:235
+#: src/toolbar.c:278
 msgid "Claws Mail Plugins"
 msgstr "Claws Mail-Plugins"
 
-#: src/toolbar.c:379 src/toolbar.c:414
+#: src/toolbar.c:442 src/toolbar.c:493
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/toolbar.c:402
-msgid "Folders"
-msgstr "Ordner"
-
-#: src/toolbar.c:404
+#: src/toolbar.c:482
 msgid "Get Mail"
 msgstr "Abrufen"
 
-#: src/toolbar.c:405
+#: src/toolbar.c:483
 msgid "Get"
 msgstr "Holen"
 
-#: src/toolbar.c:407 src/toolbar.c:408
+#: src/toolbar.c:485 src/toolbar.c:486
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/toolbar.c:410
-msgid "All"
-msgstr "Alle"
-
-#: src/toolbar.c:411
+#: src/toolbar.c:488
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "Absender"
 
-#: src/toolbar.c:412
+#: src/toolbar.c:489
+msgid "All"
+msgstr "Alle"
+
+#: src/toolbar.c:490
 msgid "List"
 msgstr "Liste"
 
-#: src/toolbar.c:417
+#: src/toolbar.c:495 src/toolbar.c:2279 src/toolbar.c:2288
+msgid "Delete duplicates"
+msgstr "Duplikate löschen"
+
+#: src/toolbar.c:497
 msgid "Prev"
 msgstr "Vorige"
 
-#: src/toolbar.c:418
+#: src/toolbar.c:498
 msgid "Next"
 msgstr "Nächste"
 
-#: src/toolbar.c:426
+#: src/toolbar.c:506
+msgid "All read"
+msgstr "Alle gelesenen"
+
+#: src/toolbar.c:507
+msgid "All unread"
+msgstr "Alle ungelesenen"
+
+#: src/toolbar.c:508
+msgid "Read"
+msgstr "Gelesen"
+
+#: src/toolbar.c:513
+msgid "Folders"
+msgstr "Ordner"
+
+#: src/toolbar.c:518
 msgid "Draft"
 msgstr "Entwurf"
 
-#: src/toolbar.c:429
+#: src/toolbar.c:521
 msgid "Insert sig."
 msgstr "Signatur einf."
 
-#: src/toolbar.c:430
+#: src/toolbar.c:522
 msgid "Replace sig."
 msgstr "Signatur ers."
 
-#: src/toolbar.c:431
+#: src/toolbar.c:523
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: src/toolbar.c:432
+#: src/toolbar.c:524
 msgid "Wrap para."
 msgstr "Absatz umbr."
 
-#: src/toolbar.c:433
+#: src/toolbar.c:525
 msgid "Wrap all"
 msgstr "Alles umbrechen"
 
-#: src/toolbar.c:435 src/toolbar.c:436
+#: src/toolbar.c:531 src/toolbar.c:532
 msgid "Stop"
 msgstr "Beenden"
 
-#: src/toolbar.c:437
+#: src/toolbar.c:533
 msgid "Stop all"
 msgstr "Alles beenden"
 
-#: src/toolbar.c:897
+#: src/toolbar.c:944
 msgid "Compose News message"
 msgstr "News-Nachricht verfassen"
 
-#: src/toolbar.c:936
+#: src/toolbar.c:983
 msgid "Learn spam"
 msgstr "Lerne Spam"
 
-#: src/toolbar.c:945
+#: src/toolbar.c:992
 msgid "Ham"
 msgstr "Nicht-Spam"
 
-#: src/toolbar.c:947
+#: src/toolbar.c:994
 msgid "Learn ham"
 msgstr "Lerne Nicht-Spam"
 
-#: src/toolbar.c:1925
+#: src/toolbar.c:2208
 msgid "Go to folder list"
 msgstr "Gehe zur Ordnerliste"
 
-#: src/toolbar.c:1931
+#: src/toolbar.c:2214
 msgid "Receive Mail from selected Account"
 msgstr "E-Mails des gewählten Kontos empfangen"
 
-#: src/toolbar.c:1947
+#: src/toolbar.c:2230
 msgid "Open preferences"
 msgstr "Einstellungen öffnen"
 
-#: src/toolbar.c:1958
+#: src/toolbar.c:2241
 msgid "Compose with selected Account"
 msgstr "Mit gewähltem Konto verfassen"
 
-#: src/toolbar.c:1979
+#: src/toolbar.c:2262
 msgid "Learn as..."
 msgstr "lernen als..."
 
-#: src/toolbar.c:1989
+#: src/toolbar.c:2272
 msgid "Learn as _Spam"
 msgstr "lernen als _Spam"
 
-#: src/toolbar.c:1990
+#: src/toolbar.c:2273
 msgid "Learn as _Ham"
 msgstr "Lernen als _Nicht-Spam"
 
-#: src/toolbar.c:1997
+#: src/toolbar.c:2280
+msgid "Delete duplicates options"
+msgstr "_Duplikate löschen (Optionen)"
+
+#: src/toolbar.c:2284
+msgid "Delete duplicates in selected folder"
+msgstr "Doppelte Nachrichten im gewählten Ordner löschen"
+
+#: src/toolbar.c:2285
+msgid "Delete duplicates in all folders"
+msgstr "Duplikate in allen Ordnern löschen"
+
+#: src/toolbar.c:2296
 msgid "Reply to Message options"
 msgstr "Auf Nachricht antworten (Optionen)"
 
-#: src/toolbar.c:2001 src/toolbar.c:2018 src/toolbar.c:2035 src/toolbar.c:2052
+#: src/toolbar.c:2300 src/toolbar.c:2317 src/toolbar.c:2334 src/toolbar.c:2351
 msgid "_Reply with quote"
 msgstr "Antwort mit _Zitat"
 
-#: src/toolbar.c:2002 src/toolbar.c:2019 src/toolbar.c:2036 src/toolbar.c:2053
+#: src/toolbar.c:2301 src/toolbar.c:2318 src/toolbar.c:2335 src/toolbar.c:2352
 msgid "Reply without _quote"
 msgstr "_Antwort ohne Zitat"
 
-#: src/toolbar.c:2014
+#: src/toolbar.c:2313
 msgid "Reply to Sender options"
 msgstr "An Absender antworten  (Optionen)"
 
-#: src/toolbar.c:2031
+#: src/toolbar.c:2330
 msgid "Reply to All options"
 msgstr "An Alle antworten  (Optionen)"
 
-#: src/toolbar.c:2048
+#: src/toolbar.c:2347
 msgid "Reply to Mailing-list options"
 msgstr "An Mailingliste antworten  (Optionen)"
 
-#: src/toolbar.c:2065
+#: src/toolbar.c:2364
 msgid "Forward Message options"
 msgstr "Nachricht weiterleiten  (Optionen)"