[geary] Update German translation

[Translations User D-L <translations src gnome org>]

commit bebc5c6365291abf2eb6fd5331ec0b04ecbfc0e5
Author: Viktor Illmer <mail viktor im>
Date:   Sat Feb 27 18:35:45 2021 +0000

    Update German translation

 po/de.po | 1997 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 986 insertions(+), 1011 deletions(-)
---
diff --git a/po/de.po b/po/de.po
index b8018a896..b57182c4b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -15,21 +15,23 @@
 # Wolfgang Stöggl <c72578 yahoo de>, 2016.
 # Tim Sabsch <tim sabsch com>, 2019-2020.
 # Mario Blättermann <mario blaettermann gmail com>, 2016-2019.
+# Viktor Illmer <mail viktor im>, 2021.
+# Philipp Kiemle <philipp kiemle gmail com>, 2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: geary master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2020-09-19 08:49+0000\n"
-"PO-Revision-Date: 2020-10-11 19:59+0200\n"
+"POT-Creation-Date: 2021-02-24 12:30+0000\n"
+"PO-Revision-Date: 2021-02-27 19:21+0100\n"
 "Last-Translator: Tim Sabsch <tim sabsch com>\n"
-"Language-Team: Deutsch <translation-team-de lists sourceforge net>\n"
+"Language-Team: German <gnome-de gnome org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
+"X-Generator: Poedit 2.4.2\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
@@ -43,8 +45,8 @@ msgstr "Dateien mit Geary versenden"
 #: desktop/geary-autostart.desktop.in.in:3
 #: desktop/org.gnome.Geary.appdata.xml.in.in:11
 #: desktop/org.gnome.Geary.desktop.in.in:3
-#: src/client/accounts/accounts-editor-servers-pane.vala:560
-#: src/client/application/application-main-window.vala:608
+#: src/client/accounts/accounts-editor-servers-pane.vala:552
+#: src/client/application/application-main-window.vala:643
 msgid "Geary"
 msgstr "Geary"
 
@@ -166,82 +168,39 @@ msgid "The last recorded height of the application window."
 msgstr "Die zuletzt gespeicherte Höhe des Anwendungsfensters."
 
 #: desktop/org.gnome.Geary.gschema.xml:26
-msgid "Position of folder list pane"
-msgstr "Position der Ordnerliste"
-
-#: desktop/org.gnome.Geary.gschema.xml:27
-msgid "Position of the folder list Paned grabber."
-msgstr "Position des Teilfensters mit der Ordnerliste."
-
-#: desktop/org.gnome.Geary.gschema.xml:32
-msgid "Position of folder list pane when horizontal"
-msgstr "Position der Ordnerliste im horizontalen Modus"
-
-#: desktop/org.gnome.Geary.gschema.xml:33
-msgid ""
-"Position of the folder list Paned grabber in the horizontal orientation."
-msgstr ""
-"Position des Teilfensters mit der Ordnerliste in horizontaler Ausrichtung."
-
-#: desktop/org.gnome.Geary.gschema.xml:38
-msgid "Position of folder list pane when vertical"
-msgstr "Position der Ordnerliste im vertikalen Modus"
-
-#: desktop/org.gnome.Geary.gschema.xml:39
-msgid "Position of the folder list Paned grabber in the vertical orientation."
-msgstr ""
-"Position des Teilfensters mit der Ordnerliste in vertikaler Ausrichtung."
-
-#: desktop/org.gnome.Geary.gschema.xml:44
-msgid "Orientation of the folder list pane"
-msgstr "Ausrichtung der Ordnerliste"
-
-#: desktop/org.gnome.Geary.gschema.xml:45
-msgid "True if the folder list Paned is in the horizontal orientation."
-msgstr "Horizontale Ausrichtung des Ordnerliste-Teilfensters."
-
-#: desktop/org.gnome.Geary.gschema.xml:50
 msgid "Show/hide formatting toolbar"
 msgstr "Formatierung-Werkzeugleiste ein-/ausblenden"
 
-#: desktop/org.gnome.Geary.gschema.xml:51
+#: desktop/org.gnome.Geary.gschema.xml:27
 msgid "True if the formatting toolbar in the composer is shown."
 msgstr ""
 "Legt fest, ob die Werkzeugleiste für Formatierungen im Verfassen-Fenster "
 "angezeigt werden soll."
 
-#: desktop/org.gnome.Geary.gschema.xml:56
-msgid "Position of message list pane"
-msgstr "Position der Nachrichtenliste"
-
-#: desktop/org.gnome.Geary.gschema.xml:57
-msgid "Position of the message list Paned grabber."
-msgstr "Position des Teilfensters mit der Nachrichtenliste."
-
-#: desktop/org.gnome.Geary.gschema.xml:62
+#: desktop/org.gnome.Geary.gschema.xml:32
 msgid "Autoselect next message"
 msgstr "Automatisch die nächste Nachricht wählen"
 
-#: desktop/org.gnome.Geary.gschema.xml:63
+#: desktop/org.gnome.Geary.gschema.xml:33
 msgid "True if we should autoselect the next available conversation."
 msgstr ""
 "Legt fest, ob die nächste verfügbare Konversation automatisch ausgewählt "
 "werden soll."
 
-#: desktop/org.gnome.Geary.gschema.xml:68
+#: desktop/org.gnome.Geary.gschema.xml:38
 msgid "Display message previews"
 msgstr "Nachrichtenvorschauen anzeigen"
 
-#: desktop/org.gnome.Geary.gschema.xml:69
+#: desktop/org.gnome.Geary.gschema.xml:39
 msgid "True if we should display a short preview of each message."
 msgstr ""
 "Legt fest, ob eine kurze Vorschau jeder Nachricht angezeigt werden soll."
 
-#: desktop/org.gnome.Geary.gschema.xml:74
+#: desktop/org.gnome.Geary.gschema.xml:44
 msgid "Use single key shortcuts"
 msgstr "Einfache Tastenkürzel verwenden"
 
-#: desktop/org.gnome.Geary.gschema.xml:75
+#: desktop/org.gnome.Geary.gschema.xml:45
 msgid ""
 "Enables shortcuts for email actions that do not require pressing <Ctrl> to "
 "emulate those used by Gmail."
@@ -249,11 +208,11 @@ msgstr ""
 "Tastenkürzel für E-Mail-Aktionen verwenden, die keinen Tastendruck von "
 "<Strg> benötigen, um die Funktion in Gmail zu emulieren."
 
-#: desktop/org.gnome.Geary.gschema.xml:82
+#: desktop/org.gnome.Geary.gschema.xml:52
 msgid "Languages that shall be used in the spell checker"
 msgstr "Sprachen, die in der Rechtschreibprüfung verwendet werden sollen"
 
-#: desktop/org.gnome.Geary.gschema.xml:83
+#: desktop/org.gnome.Geary.gschema.xml:53
 msgid ""
 "A list of POSIX locales, with the empty list disabling spell checking and "
 "the null list using desktop languages by default."
@@ -262,12 +221,12 @@ msgstr ""
 "Rechtschreibprüfung. Die »null«-Liste verwendet die globalen "
 "Spracheinstellungen."
 
-#: desktop/org.gnome.Geary.gschema.xml:90
+#: desktop/org.gnome.Geary.gschema.xml:60
 msgid "Languages that are displayed in the spell checker popover"
 msgstr ""
 "Sprachen, die im Einblendmenü der Rechtschreibprüfung angezeigt werden sollen"
 
-#: desktop/org.gnome.Geary.gschema.xml:91
+#: desktop/org.gnome.Geary.gschema.xml:61
 msgid ""
 "List of languages that are always displayed in the popover of the spell "
 "checker."
@@ -275,63 +234,63 @@ msgstr ""
 "Liste der Sprachen, die immer im Einblendmenü der Rechtschreibprüfung "
 "angezeigt werden sollen."
 
-#: desktop/org.gnome.Geary.gschema.xml:96
+#: desktop/org.gnome.Geary.gschema.xml:66
 msgid "Notify of new mail at startup"
 msgstr "Beim Start über neue Nachrichten benachrichtigen"
 
-#: desktop/org.gnome.Geary.gschema.xml:97
+#: desktop/org.gnome.Geary.gschema.xml:67
 msgid "True to notify of new mail at startup."
 msgstr ""
 "Legt fest, ob beim Start Benachrichtigungen bei neuen Nachrichten angezeigt "
 "werden sollen."
 
-#: desktop/org.gnome.Geary.gschema.xml:102
+#: desktop/org.gnome.Geary.gschema.xml:72
 msgid "Ask when opening an attachment"
 msgstr "Fragen, wenn ein Anhang geöffnet wird"
 
-#: desktop/org.gnome.Geary.gschema.xml:103
+#: desktop/org.gnome.Geary.gschema.xml:73
 msgid "True to ask when opening an attachment."
 msgstr "Legt fest, ob nachgefragt werden soll, wenn ein Anhang geöffnet wird."
 
-#: desktop/org.gnome.Geary.gschema.xml:108
+#: desktop/org.gnome.Geary.gschema.xml:78
 msgid "Whether to compose emails in HTML"
 msgstr "Nachrichten in HTML verfassen"
 
-#: desktop/org.gnome.Geary.gschema.xml:109
+#: desktop/org.gnome.Geary.gschema.xml:79
 msgid "True to compose emails in HTML; false for plain text."
 msgstr "Legt fest, ob Nachrichten in HTML verfasst werden sollen."
 
-#: desktop/org.gnome.Geary.gschema.xml:114
+#: desktop/org.gnome.Geary.gschema.xml:84
 msgid "Advisory strategy for full-text searching"
 msgstr "Strategie für Volltextsuche"
 
-#: desktop/org.gnome.Geary.gschema.xml:115
+#: desktop/org.gnome.Geary.gschema.xml:85
 msgid ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 msgstr ""
 "Zulässige Werte sind »exact«, »conservative«, »aggressive« und »horizon«."
 
-#: desktop/org.gnome.Geary.gschema.xml:120
+#: desktop/org.gnome.Geary.gschema.xml:90
 msgid "Zoom of conversation viewer"
 msgstr "Vergrößerungsstufe der Konversationsansicht"
 
-#: desktop/org.gnome.Geary.gschema.xml:121
+#: desktop/org.gnome.Geary.gschema.xml:91
 msgid "The zoom to apply on the conservation view."
 msgstr "Der auf die Konversationsansicht anzuwendende Vergrößerungsstufe."
 
-#: desktop/org.gnome.Geary.gschema.xml:126
+#: desktop/org.gnome.Geary.gschema.xml:96
 msgid "Size of detached composer window"
 msgstr "Größe des abgekoppelten Verfassen-Fensters"
 
-#: desktop/org.gnome.Geary.gschema.xml:127
+#: desktop/org.gnome.Geary.gschema.xml:97
 msgid "The last recorded size of the detached composer window."
 msgstr "Die zuletzt gespeicherte Größe des abgekoppelten Verfassen-Fensters."
 
-#: desktop/org.gnome.Geary.gschema.xml:132
+#: desktop/org.gnome.Geary.gschema.xml:102
 msgid "Undo sending email delay"
 msgstr "Verzögerung bis zum E-Mail-Versand"
 
-#: desktop/org.gnome.Geary.gschema.xml:133
+#: desktop/org.gnome.Geary.gschema.xml:103
 msgid ""
 "The number of seconds to wait before sending an email. Set to zero or less "
 "to disable."
@@ -339,29 +298,29 @@ msgstr ""
 "Die Anzahl an Sekunden, die gewartet wird, bis eine E-Mail versandt wird. "
 "Deaktiviert bei Werten kleiner oder gleich 0."
 
-#: desktop/org.gnome.Geary.gschema.xml:139
+#: desktop/org.gnome.Geary.gschema.xml:109
 msgid "Brief notification display time"
 msgstr "Anzeigedauer von Kurzbenachrichtigungen"
 
-#: desktop/org.gnome.Geary.gschema.xml:140
+#: desktop/org.gnome.Geary.gschema.xml:110
 msgid ""
 "The length of time in seconds for which brief notifications should be "
 "displayed."
 msgstr "Die Dauer in Sekunden, in der Kurzbenachrichtigungen angezeigt werden."
 
-#: desktop/org.gnome.Geary.gschema.xml:146
+#: desktop/org.gnome.Geary.gschema.xml:116
 msgid "List of optional plugins"
-msgstr ""
+msgstr "Liste optionaler Plug-ins"
 
-#: desktop/org.gnome.Geary.gschema.xml:147
+#: desktop/org.gnome.Geary.gschema.xml:117
 msgid "Plugins listed here will be loaded on startup."
-msgstr ""
+msgstr "Die hier angezeigten Plug-ins werden beim Anwendungsstart geladen."
 
-#: desktop/org.gnome.Geary.gschema.xml:152
+#: desktop/org.gnome.Geary.gschema.xml:122
 msgid "Whether we migrated the old settings"
 msgstr "Alte Einstellungen migrieren"
 
-#: desktop/org.gnome.Geary.gschema.xml:153
+#: desktop/org.gnome.Geary.gschema.xml:123
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -371,25 +330,25 @@ msgstr ""
 #. Translators: In-app notification label, when
 #. the app had a problem pinning an otherwise
 #. untrusted TLS certificate
-#: src/client/accounts/accounts-editor.vala:210
+#: src/client/accounts/accounts-editor.vala:208
 msgid "Failed to store certificate"
 msgstr "Zertifikat konnte nicht gespeichert werden"
 
 #. Translators: Label for adding an email account
 #. account for a generic IMAP service provider.
-#: src/client/accounts/accounts-editor-add-pane.vala:108
+#: src/client/accounts/accounts-editor-add-pane.vala:98
 msgid "All others"
 msgstr "Alle übrigen"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:195
-#: src/client/accounts/accounts-editor-servers-pane.vala:321
+#: src/client/accounts/accounts-editor-add-pane.vala:185
+#: src/client/accounts/accounts-editor-servers-pane.vala:313
 msgid "Check your receiving login and password"
 msgstr "Prüfen Sie Ihren Benutzernamen und Passwort zum Empfangen"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:210
-#: src/client/accounts/accounts-editor-servers-pane.vala:334
+#: src/client/accounts/accounts-editor-add-pane.vala:200
+#: src/client/accounts/accounts-editor-servers-pane.vala:326
 msgid "Check your receiving server details"
 msgstr "Prüfen Sie die Serverdetails zum Empfangen"
 
@@ -398,51 +357,51 @@ msgstr "Prüfen Sie die Serverdetails zum Empfangen"
 #. succeeded, so the user probably needs to
 #. specify custom creds here
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:232
-#: src/client/accounts/accounts-editor-servers-pane.vala:355
+#: src/client/accounts/accounts-editor-add-pane.vala:222
+#: src/client/accounts/accounts-editor-servers-pane.vala:347
 msgid "Check your sending login and password"
 msgstr "Prüfen Sie Ihren Benutzernamen und Passwort zum Senden"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:246
-#: src/client/accounts/accounts-editor-servers-pane.vala:368
+#: src/client/accounts/accounts-editor-add-pane.vala:236
+#: src/client/accounts/accounts-editor-servers-pane.vala:360
 msgid "Check your sending server details"
 msgstr "Prüfen Sie die Serverdetails zum Senden"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:261
+#: src/client/accounts/accounts-editor-add-pane.vala:251
 msgid "Check your email address and password"
 msgstr "Prüfen Sie Ihre E-Mail-Adresse und Ihr Passwort"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:272
+#: src/client/accounts/accounts-editor-add-pane.vala:262
 msgid "Could not connect, check your network"
 msgstr "Verbindung konnte nicht hergestellt werden, prüfen Sie Ihr Netzwerk"
 
 #. Translators: In-app notification label for a
 #. generic error creating an account
-#: src/client/accounts/accounts-editor-add-pane.vala:285
+#: src/client/accounts/accounts-editor-add-pane.vala:275
 msgid "An unexpected problem occurred"
 msgstr "Ein unerwartetes Problem ist aufgetreten"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-add-pane.vala:303
+#: src/client/accounts/accounts-editor-add-pane.vala:293
 #, c-format
 msgid "Account not created: %s"
 msgstr "Konto wurde nicht erstellt: %s"
 
 #. Translators: Label for the person's actual name when adding
 #. an account
-#: src/client/accounts/accounts-editor-add-pane.vala:558
+#: src/client/accounts/accounts-editor-add-pane.vala:573
 msgid "Your name"
 msgstr "Ihr Name"
 
 #. Translators: Label used for the address part of an
 #. email address when editing a user's sender address
 #. preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:575
-#: src/client/accounts/accounts-editor-edit-pane.vala:513
+#: src/client/accounts/accounts-editor-add-pane.vala:590
+#: src/client/accounts/accounts-editor-edit-pane.vala:527
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
@@ -451,8 +410,8 @@ msgstr "E-Mail-Adresse"
 #. Translators: This is used as a placeholder for the
 #. address part of an email address when editing a user's
 #. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:579
-#: src/client/accounts/accounts-editor-edit-pane.vala:479
+#: src/client/accounts/accounts-editor-add-pane.vala:594
+#: src/client/accounts/accounts-editor-edit-pane.vala:493
 msgid "person example com"
 msgstr "name beispiel de"
 
@@ -460,16 +419,16 @@ msgstr "name beispiel de"
 #. when adding an account
 #. Translators: Label for the user's login name for an
 #. IMAP, SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:593
-#: src/client/accounts/accounts-editor-servers-pane.vala:889
+#: src/client/accounts/accounts-editor-add-pane.vala:608
+#: src/client/accounts/accounts-editor-servers-pane.vala:881
 msgid "Login name"
 msgstr "Benutzername"
 
 #. Translators: Label for the user's password for an IMAP,
 #. SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:607
-#: src/client/accounts/accounts-editor-servers-pane.vala:1011
-#: ui/password-dialog.glade:108
+#: src/client/accounts/accounts-editor-add-pane.vala:622
+#: src/client/accounts/accounts-editor-servers-pane.vala:1003
+#: ui/password-dialog.glade:98
 msgid "Password"
 msgstr "Passwort"
 
@@ -477,14 +436,14 @@ msgstr "Passwort"
 #. adding an account.
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's IMAP service.
-#: src/client/accounts/accounts-editor-add-pane.vala:629
-#: src/client/accounts/accounts-editor-servers-pane.vala:733
+#: src/client/accounts/accounts-editor-add-pane.vala:644
+#: src/client/accounts/accounts-editor-servers-pane.vala:725
 msgid "IMAP server"
 msgstr "IMAP-Server"
 
 #. Translators: Placeholder for the IMAP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:632
+#: src/client/accounts/accounts-editor-add-pane.vala:647
 msgid "imap.example.com"
 msgstr "imap.example.com"
 
@@ -492,21 +451,47 @@ msgstr "imap.example.com"
 #. adding an account.
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's SMTP service.
-#: src/client/accounts/accounts-editor-add-pane.vala:638
-#: src/client/accounts/accounts-editor-servers-pane.vala:739
+#: src/client/accounts/accounts-editor-add-pane.vala:653
+#: src/client/accounts/accounts-editor-servers-pane.vala:731
 msgid "SMTP server"
 msgstr "SMTP-Server"
 
 #. Translators: Placeholder for the SMTP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:641
+#: src/client/accounts/accounts-editor-add-pane.vala:656
 msgid "smtp.example.com"
 msgstr "smtp.example.com"
 
+#. This is the remove account button in the account settings.
+#: src/client/accounts/accounts-editor-edit-pane.vala:211
+#: ui/accounts_editor_edit_pane.ui:239
+msgid "Remove Account"
+msgstr "Konto entfernen"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:219
+#, c-format
+msgid "Remove Account: %s"
+msgstr "Konto entfernen: %s"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:221
+msgid ""
+"This will remove it from Geary and delete locally cached email data from "
+"your computer. Nothing will be deleted from your service provider."
+msgstr ""
+"Diese Aktion wird es aus Geary entfernen und lokal zwischengespeicherte E-"
+"Mail-Daten von Ihrem Computer löschen. Sie bleiben jedoch bei Ihrem "
+"Dienstanbieter gespeichert."
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:223
+#: src/client/components/stock.vala:19
+#: src/client/plugin/mail-merge/mail-merge.vala:392
+#: ui/password-dialog.glade:182
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
 #. Translators: Label in the account editor for the user's
 #. custom name for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:277
-#: ui/accounts_editor_remove_pane.ui:123
+#: src/client/accounts/accounts-editor-edit-pane.vala:289
 msgid "Account name"
 msgstr "Kontoname"
 
@@ -514,46 +499,46 @@ msgstr "Kontoname"
 #. the name of an account. The string
 #. substitution is the old name of the
 #. account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:318
+#: src/client/accounts/accounts-editor-edit-pane.vala:330
 #, c-format
 msgid "Change account name back to “%s”"
 msgstr "Ändern Sie den Kontonamen zurück zu »%s«"
 
 #. Translators: Tooltip for adding a new email sender/from
 #. address's address to an account
-#: src/client/accounts/accounts-editor-edit-pane.vala:342
+#: src/client/accounts/accounts-editor-edit-pane.vala:354
 msgid "Add a new sender email address"
 msgstr "Eine neue E-Mail-Adresse zum Senden hinzufügen"
 
 #. Translators: Label used to indicate the user has
 #. provided no display name for one of their sender
 #. email addresses in their account settings.
-#: src/client/accounts/accounts-editor-edit-pane.vala:423
+#: src/client/accounts/accounts-editor-edit-pane.vala:437
 msgid "Name not set"
 msgstr "Name ist nicht gesetzt"
 
 #. Translators: This is used as a placeholder for the
 #. display name for an email address when editing a user's
 #. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:464
+#: src/client/accounts/accounts-editor-edit-pane.vala:478
 msgid "Sender Name"
 msgstr "Absendername"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:491
+#: src/client/accounts/accounts-editor-edit-pane.vala:505
 msgid "Remove"
 msgstr "Entfernen"
 
 #. Translators: Label used for the display name part of an
 #. email address when editing a user's sender address
 #. preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:506
+#: src/client/accounts/accounts-editor-edit-pane.vala:520
 msgid "Sender name"
 msgstr "Absendername"
 
 #. Translators: Label used as the undo tooltip after adding an
 #. new sender email address to an account. The string
 #. substitution is the email address added.
-#: src/client/accounts/accounts-editor-edit-pane.vala:573
+#: src/client/accounts/accounts-editor-edit-pane.vala:587
 #, c-format
 msgid "Remove “%s”"
 msgstr "»%s« entfernen"
@@ -561,7 +546,7 @@ msgstr "»%s« entfernen"
 #. Translators: Label used as the undo tooltip after editing a
 #. sender address for an account. The string substitution is
 #. the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:613
+#: src/client/accounts/accounts-editor-edit-pane.vala:627
 #, c-format
 msgid "Undo changes to “%s”"
 msgstr "Änderungen rückgängig machen zu »%s«"
@@ -569,7 +554,7 @@ msgstr "Änderungen rückgängig machen zu »%s«"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:700
+#: src/client/accounts/accounts-editor-edit-pane.vala:714
 #, c-format
 msgid "Add “%s” back"
 msgstr "»%s« wieder hinzufügen"
@@ -577,14 +562,14 @@ msgstr "»%s« wieder hinzufügen"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:742
+#: src/client/accounts/accounts-editor-edit-pane.vala:756
 msgid "Undo signature changes"
 msgstr "Änderungen an der Signatur rückgängig machen"
 
 #. Translators: This label describes the account
 #. preference for the length of time (weeks, months or
 #. years) that past email should be downloaded.
-#: src/client/accounts/accounts-editor-edit-pane.vala:790
+#: src/client/accounts/accounts-editor-edit-pane.vala:804
 msgid "Download mail"
 msgstr "E-Mail herunterladen"
 
@@ -593,100 +578,100 @@ msgstr "E-Mail herunterladen"
 #. should be downloaded for an account. The
 #. string substitution is the duration,
 #. e.g. "1 month back".
-#: src/client/accounts/accounts-editor-edit-pane.vala:822
+#: src/client/accounts/accounts-editor-edit-pane.vala:836
 #, c-format
 msgid "Change download period back to: %s"
 msgstr "Download-Länge zurücksetzen auf: %s"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:843
+#: src/client/accounts/accounts-editor-edit-pane.vala:857
 msgid "Everything"
 msgstr "Alles"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:847
+#: src/client/accounts/accounts-editor-edit-pane.vala:861
 msgid "2 weeks back"
 msgstr "2 Wochen zurück"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:851
+#: src/client/accounts/accounts-editor-edit-pane.vala:865
 msgid "1 month back"
 msgstr "1 Monat zurück"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:855
+#: src/client/accounts/accounts-editor-edit-pane.vala:869
 msgid "3 months back"
 msgstr "3 Monate zurück"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:859
+#: src/client/accounts/accounts-editor-edit-pane.vala:873
 msgid "6 months back"
 msgstr "6 Monate zurück"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:863
+#: src/client/accounts/accounts-editor-edit-pane.vala:877
 msgid "1 year back"
 msgstr "1 Jahr zurück"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:867
+#: src/client/accounts/accounts-editor-edit-pane.vala:881
 msgid "2 years back"
 msgstr "2 Jahre zurück"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:871
+#: src/client/accounts/accounts-editor-edit-pane.vala:885
 msgid "4 years back"
 msgstr "4 Jahre zurück"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:877
+#: src/client/accounts/accounts-editor-edit-pane.vala:891
 #, c-format
 msgid "%d day back"
 msgid_plural "%d days back"
 msgstr[0] "%d Tag zurück"
 msgstr[1] "%d Tage zurück"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:255
-#: src/client/application/application-main-window.vala:2061
+#: src/client/accounts/accounts-editor-list-pane.vala:246
+#: src/client/application/application-main-window.vala:2150
 msgid "Undo"
 msgstr "Rückgängig machen"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:264
-#: src/client/application/application-main-window.vala:2044
+#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/application/application-main-window.vala:2133
 msgid "Redo"
 msgstr "Wiederholen"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:358
-#: src/client/accounts/accounts-editor-list-pane.vala:454
+#: src/client/accounts/accounts-editor-list-pane.vala:349
+#: src/client/accounts/accounts-editor-list-pane.vala:445
 #: src/client/accounts/accounts-editor-row.vala:279
 msgid "Gmail"
 msgstr "Gmail"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:362
-#: src/client/accounts/accounts-editor-list-pane.vala:458
+#: src/client/accounts/accounts-editor-list-pane.vala:353
+#: src/client/accounts/accounts-editor-list-pane.vala:449
 #: src/client/accounts/accounts-editor-row.vala:283
 msgid "Outlook.com"
 msgstr "Outlook.com"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:366
-#: src/client/accounts/accounts-editor-list-pane.vala:462
+#: src/client/accounts/accounts-editor-list-pane.vala:357
+#: src/client/accounts/accounts-editor-list-pane.vala:453
 #: src/client/accounts/accounts-editor-row.vala:287
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but disabled by the user.
-#: src/client/accounts/accounts-editor-list-pane.vala:388
+#: src/client/accounts/accounts-editor-list-pane.vala:379
 msgid "This account has been disabled"
 msgstr "Dieses Konto wurde deaktiviert"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but because of some error are not able to be
 #. used.
-#: src/client/accounts/accounts-editor-list-pane.vala:397
+#: src/client/accounts/accounts-editor-list-pane.vala:388
 msgid "This account has encountered a problem and is unavailable"
 msgstr ""
 "Bei diesem Konto ist ein Fehler aufgetreten und es ist daher nicht verfügbar"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:466
+#: src/client/accounts/accounts-editor-list-pane.vala:457
 msgid "Other email providers"
 msgstr "Andere E-Mail-Anbieter"
 
 #. Translators: Notification shown after removing an
 #. account. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:572
+#: src/client/accounts/accounts-editor-list-pane.vala:563
 #, c-format
 msgid "Account “%s” removed"
 msgstr "Konto »%s« wurde entfernt"
@@ -694,7 +679,7 @@ msgstr "Konto »%s« wurde entfernt"
 #. Translators: Notification shown after removing an account
 #. is undone. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:579
+#: src/client/accounts/accounts-editor-list-pane.vala:570
 #, c-format
 msgid "Account “%s” restored"
 msgstr "Konto »%s« wurde wiederhergestellt"
@@ -721,8 +706,8 @@ msgstr "Sicherheit der Verbindung"
 #. Translators: Label used when no auth scheme is used
 #. by an account's IMAP or SMTP service.
 #: src/client/accounts/accounts-editor-row.vala:484
-#: src/client/accounts/accounts-editor-servers-pane.vala:760
-#: src/client/accounts/accounts-editor-servers-pane.vala:975
+#: src/client/accounts/accounts-editor-servers-pane.vala:752
+#: src/client/accounts/accounts-editor-servers-pane.vala:967
 msgid "None"
 msgstr "Nichts"
 
@@ -739,7 +724,7 @@ msgstr "TLS"
 #. account
 #. Translators: An info bar button label
 #: src/client/accounts/accounts-editor-row.vala:539
-#: src/client/application/application-main-window.vala:554
+#: src/client/application/application-main-window.vala:589
 msgid "Login"
 msgstr "Anmelden"
 
@@ -766,7 +751,7 @@ msgstr "Andere Anmeldedaten verwenden"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-servers-pane.vala:382
+#: src/client/accounts/accounts-editor-servers-pane.vala:374
 #, c-format
 msgid "Account not updated: %s"
 msgstr "Konto wurde nicht aktualisiert: %s"
@@ -774,23 +759,23 @@ msgstr "Konto wurde nicht aktualisiert: %s"
 #. Translators: This label describes the program that
 #. created the account, e.g. an SSO service like GOA, or
 #. locally by Geary.
-#: src/client/accounts/accounts-editor-servers-pane.vala:545
+#: src/client/accounts/accounts-editor-servers-pane.vala:537
 msgid "Account source"
 msgstr "Kontoquelle"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:557
+#: src/client/accounts/accounts-editor-servers-pane.vala:549
 msgid "GNOME Online Accounts"
 msgstr "GNOME Online-Konten"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:616
+#: src/client/accounts/accounts-editor-servers-pane.vala:608
 msgid "Save draft email on server"
 msgstr "E-Mail-Entwürfe auf dem Server speichern"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:671
+#: src/client/accounts/accounts-editor-servers-pane.vala:663
 msgid "Save sent email on server"
 msgstr "Gesendete E-Mails auf dem Server speichern"
 
@@ -799,12 +784,12 @@ msgstr "Gesendete E-Mails auf dem Server speichern"
 #. Translators: Label used when an account's IMAP or
 #. SMTP service uses OAuth2. The string replacement is
 #. the service's login name.
-#: src/client/accounts/accounts-editor-servers-pane.vala:961
+#: src/client/accounts/accounts-editor-servers-pane.vala:953
 #, c-format
 msgid "%s using OAuth2"
 msgstr "%s mittels OAuth2"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:971
+#: src/client/accounts/accounts-editor-servers-pane.vala:963
 msgid "Use receiving server login"
 msgstr "Server-Anmeldedaten zum Empfangen verwenden"
 
@@ -842,146 +827,142 @@ msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: src/client/application/application-client.vala:35
-#, fuzzy
-#| msgid "Copyright 2016-2019 Geary Development Team."
 msgid "Copyright 2016-2020 Geary Development Team."
-msgstr "Copyright 2016-2019 Geary-Entwicklerteam."
+msgstr "Copyright 2016-2020 Geary-Entwicklerteam."
 
 #: src/client/application/application-client.vala:37
 msgid "Visit the Geary web site"
 msgstr "Geary-Webseite besuchen"
 
 #. / Command line option
-#: src/client/application/application-client.vala:97
+#: src/client/application/application-client.vala:102
 msgid "Print debug logging"
 msgstr "Fehlerbehebungsprotokolle anzeigen"
 
 #. / Command line option
-#: src/client/application/application-client.vala:100
+#: src/client/application/application-client.vala:105
 msgid "Start with the main window hidden (deprecated)"
 msgstr "Geary mit verborgenem Hauptfenster starten (veraltet)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:103
+#: src/client/application/application-client.vala:108
 msgid "Enable WebKitGTK Inspector in web views"
 msgstr "WebKitGTK-Inspector in Webanzeigen aktivieren"
 
 #. / Command line option
-#: src/client/application/application-client.vala:106
+#: src/client/application/application-client.vala:111
 msgid "Log conversation monitoring"
 msgstr "Gesprächsmonitoring protokollieren"
 
 #. / Command line option
-#: src/client/application/application-client.vala:109
+#: src/client/application/application-client.vala:114
 msgid "Log IMAP network deserialization"
 msgstr "IMAP-Netzwerkdeserialisierung protokollieren"
 
 #. / Command line option. "Normalization" can also be called
 #. / "synchronization".
-#: src/client/application/application-client.vala:113
+#: src/client/application/application-client.vala:118
 msgid "Log folder normalization"
 msgstr "Ordnerabgleich protokollieren"
 
 #. / Command line option
-#: src/client/application/application-client.vala:116
-#, fuzzy
-#| msgid "Log network activity"
+#: src/client/application/application-client.vala:121
 msgid "Log IMAP network activity"
-msgstr "Netzwerkaktivitäten protokollieren"
+msgstr "IMAP-Netzwerkaktivitäten protokollieren"
 
 #. / Command line option. The IMAP replay queue is how changes
 #. / on the server are replicated on the client.  It could
 #. / also be called the IMAP events queue.
-#: src/client/application/application-client.vala:121
+#: src/client/application/application-client.vala:126
 msgid "Log IMAP replay queue"
 msgstr "IMAP-Ereigniswarteschlange protokollieren"
 
 #. / Command line option
-#: src/client/application/application-client.vala:124
-#, fuzzy
-#| msgid "Log network activity"
+#: src/client/application/application-client.vala:129
 msgid "Log SMTP network activity"
-msgstr "Netzwerkaktivitäten protokollieren"
+msgstr "SMTP-Netzwerkaktivitäten protokollieren"
 
 #. / Command line option
-#: src/client/application/application-client.vala:127
+#: src/client/application/application-client.vala:132
 msgid "Log database queries (generates lots of messages)"
 msgstr ""
 "Datenbankabfragen protokollieren (dabei werden sehr viele Einträge erzeugt)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:130
+#: src/client/application/application-client.vala:135
 msgid "Perform a graceful quit"
 msgstr "Ordnungsgemäß beenden"
 
-#: src/client/application/application-client.vala:132
+#: src/client/application/application-client.vala:137
 msgid "Open a new window"
 msgstr "Ein neues Fenster öffnen"
 
 #. / Command line option
-#: src/client/application/application-client.vala:135
+#: src/client/application/application-client.vala:140
 msgid "Revoke all pinned TLS server certificates"
 msgstr "Alle beschränkten TLS-Server-Zertifikate widerrufen"
 
 #. / Command line option
-#: src/client/application/application-client.vala:138
+#: src/client/application/application-client.vala:143
 msgid "Display program version"
 msgstr "Programmversion anzeigen"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:262
+#: src/client/application/application-client.vala:275
 msgid "Geary version"
 msgstr "Geary-Version"
 
 # Bezieht sich auf Git-Revision
 #. / Application runtime information label
-#: src/client/application/application-client.vala:264
+#: src/client/application/application-client.vala:277
 msgid "Geary revision"
 msgstr "Geary-Revision"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:266
+#: src/client/application/application-client.vala:279
 msgid "GTK version"
 msgstr "GTK-Version"
 
 #. / Applciation runtime information label
-#: src/client/application/application-client.vala:273
+#: src/client/application/application-client.vala:286
 msgid "GLib version"
 msgstr "GLib-Version"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:280
+#: src/client/application/application-client.vala:293
 msgid "WebKitGTK version"
 msgstr "WebKitGTK-Version"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:287
+#: src/client/application/application-client.vala:300
 msgid "Desktop environment"
 msgstr "Desktopumgebung"
 
 #. Translators: This is the file type displayed for
 #. attachments with unknown file types.
-#: src/client/application/application-client.vala:289
-#: src/client/components/components-attachment-pane.vala:91
+#: src/client/application/application-client.vala:302
+#: src/client/application/application-client.vala:308
+#: src/client/application/application-client.vala:314
+#: src/client/components/components-attachment-pane.vala:88
 msgid "Unknown"
 msgstr "Unbekannt"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:293
+#: src/client/application/application-client.vala:306
 msgid "Distribution name"
 msgstr "Distributionsname"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:298
+#: src/client/application/application-client.vala:312
 msgid "Distribution release"
 msgstr "Distributionsveröffentlichung"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:303
+#: src/client/application/application-client.vala:318
 msgid "Installation prefix"
 msgstr "Installationspräfix"
 
-#: src/client/application/application-client.vala:559
+#: src/client/application/application-client.vala:587
 #, c-format
 msgid "About %s"
 msgstr "Info zu %s"
@@ -989,17 +970,19 @@ msgstr "Info zu %s"
 #. Translators: add your name and email address to receive
 #. credit in the About dialog For example: Yamada Taro
 #. <yamada taro example com>
-#: src/client/application/application-client.vala:563
+#: src/client/application/application-client.vala:591
 msgid "translator-credits"
 msgstr ""
 "Benjamin Steinwender <b stbe at>\n"
 "Wolfgang Stöggl <c72578 yahoo de>\n"
 "Mario Blättermann <mario blaettermann gmail com>\n"
-"Tim Sabsch <tim sabsch com>"
+"Tim Sabsch <tim sabsch com>\n"
+"Viktor Illmer <mail viktor im>\n"
+"Philipp Kiemle <philipp kiemle gmail com>"
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/application-client.vala:1045
+#: src/client/application/application-client.vala:1110
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr ""
 "Die Option »--hidden« ist veraltet und wird in einer künftigen Version "
@@ -1007,31 +990,31 @@ msgstr ""
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/application-client.vala:1078
+#: src/client/application/application-client.vala:1143
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Unbekanntes Befehlszeilenargument »%s«"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:479
+#: src/client/application/application-controller.vala:500
 #, c-format
 msgid "A problem occurred sending email for %s"
 msgstr "Ein Problem ist beim Senden von E-Mails für %s aufgetreten"
 
 #. / Notification body
-#: src/client/application/application-controller.vala:483
+#: src/client/application/application-controller.vala:504
 msgid "Email will not be sent until re-connected"
-msgstr "E-Mail wird nicht gesendet, bis wieder eine Verbindung besteht."
+msgstr "E-Mail wird nicht gesendet, bis wieder eine Verbindung besteht"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:582
+#: src/client/application/application-controller.vala:603
 msgid "Conversation marked"
 msgid_plural "Conversations marked"
 msgstr[0] "Konversation markiert"
 msgstr[1] "Konversationen markiert"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:588
+#: src/client/application/application-controller.vala:609
 msgid "Conversation un-marked"
 msgid_plural "Conversations un-marked"
 msgstr[0] "Markierung der Konversation aufgehoben"
@@ -1040,8 +1023,8 @@ msgstr[1] "Markierung der Konversationen aufgehoben"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:614
-#: src/client/application/application-controller.vala:698
+#: src/client/application/application-controller.vala:635
+#: src/client/application/application-controller.vala:719
 #, c-format
 msgid "Conversation moved to %s"
 msgid_plural "Conversations moved to %s"
@@ -1053,8 +1036,8 @@ msgstr[1] "Konversationen verschoben nach %s"
 #. / of the source folder.
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:622
-#: src/client/application/application-controller.vala:644
+#: src/client/application/application-controller.vala:643
+#: src/client/application/application-controller.vala:665
 #, c-format
 msgid "Conversation restored to %s"
 msgid_plural "Conversations restored to %s"
@@ -1062,7 +1045,7 @@ msgstr[0] "Konversation wiederhergestellt nach %s"
 msgstr[1] "Konversationen wiederhergestellt nach %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:665
+#: src/client/application/application-controller.vala:686
 msgid "Conversation archived"
 msgid_plural "Conversations archived"
 msgstr[0] "Konversation archiviert"
@@ -1070,7 +1053,7 @@ msgstr[1] "Konversationen archiviert"
 
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:721
+#: src/client/application/application-controller.vala:742
 #, c-format
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
@@ -1078,7 +1061,7 @@ msgstr[0] "Nachricht wiederhergestellt nach %s"
 msgstr[1] "Nachrichten wiederhergestellt nach %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:742
+#: src/client/application/application-controller.vala:763
 msgid "Message archived"
 msgid_plural "Messages archived"
 msgstr[0] "Nachricht archiviert"
@@ -1087,7 +1070,7 @@ msgstr[1] "Nachrichten archiviert"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:777
+#: src/client/application/application-controller.vala:798
 #, c-format
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
@@ -1097,7 +1080,7 @@ msgstr[1] "Nachrichten verschoben nach %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:805
+#: src/client/application/application-controller.vala:826
 #, c-format
 msgid "Conversation labelled as %s"
 msgid_plural "Conversations labelled as %s"
@@ -1107,19 +1090,19 @@ msgstr[1] "Konversationen beschriftet als %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:813
+#: src/client/application/application-controller.vala:834
 #, c-format
 msgid "Conversation un-labelled as %s"
 msgid_plural "Conversations un-labelled as %s"
 msgstr[0] "Beschriftung der Konversation als %s aufgehoben"
 msgstr[1] "Beschriftung der Konversationen als %s aufgehoben"
 
-#: src/client/application/application-controller.vala:1320
+#: src/client/application/application-controller.vala:1341
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Die Datenbank für %s konnte nicht geöffnet werden"
 
-#: src/client/application/application-controller.vala:1321
+#: src/client/application/application-controller.vala:1342
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -1144,20 +1127,20 @@ msgstr ""
 "dazugehörigen Anhänge verloren. <b>E-Mails auf Ihrem Server werden nicht "
 "betroffen sein.</b>"
 
-#: src/client/application/application-controller.vala:1323
+#: src/client/application/application-controller.vala:1344
 msgid "_Rebuild"
 msgstr "_Wiederherstellen"
 
-#: src/client/application/application-controller.vala:1323
+#: src/client/application/application-controller.vala:1344
 msgid "E_xit"
 msgstr "B_eenden"
 
-#: src/client/application/application-controller.vala:1333
+#: src/client/application/application-controller.vala:1354
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Die Datenbank für »%s« konnte nicht wiederhergestellt werden"
 
-#: src/client/application/application-controller.vala:1334
+#: src/client/application/application-controller.vala:1355
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -1170,89 +1153,100 @@ msgstr ""
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:1501
+#: src/client/application/application-controller.vala:1522
 #, c-format
 msgid "Email sent to %s"
 msgstr "E-Mail gesendet an %s"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2491
+#: src/client/application/application-controller.vala:2516
 #, c-format
 msgid "Email to %s queued for delivery"
 msgstr "E-Mail an %s zum Versand vorgemerkt"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2555
+#: src/client/application/application-controller.vala:2580
 #, c-format
 msgid "Email to %s saved"
 msgstr "E-Mail an %s gespeichert"
 
 #. / Translators: A label for an in-app notification.
-#: src/client/application/application-controller.vala:2570
-#: src/client/application/application-controller.vala:2628
+#: src/client/application/application-controller.vala:2595
+#: src/client/application/application-controller.vala:2653
 msgid "Composer could not be restored"
 msgstr "Verfassen-Fenster konnte nicht wiederhergestellt werden"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2613
+#: src/client/application/application-controller.vala:2638
 #, c-format
 msgid "Email to %s discarded"
 msgstr "E-Mail an %s verworfen"
 
+#. / Translators: Label for account database upgrade dialog
+#: src/client/application/application-database-manager.vala:74
+msgid "Account update in progress"
+msgstr "Konto-Aktualisierung wird durchgeführt"
+
+#. / Translators: Window title for account database upgrade
+#. / dialog
+#: src/client/application/application-database-manager.vala:80
+msgid "Account update"
+msgstr "Konto-Aktualisierung"
+
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:540
+#: src/client/application/application-main-window.vala:575
 msgid "Working offline"
 msgstr "Abgemeldet arbeiten"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:542
+#: src/client/application/application-main-window.vala:577
 msgid "You will not be able to send or receive email until re-connected."
 msgstr ""
 "Sie können keine E-Mails senden oder empfangen, bis wieder eine Verbindung "
 "besteht."
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:549
+#: src/client/application/application-main-window.vala:584
 msgid "Login problem"
 msgstr "Anmeldeproblem"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:551
+#: src/client/application/application-main-window.vala:586
 msgid "An account has reported an incorrect login or password."
 msgstr "Ein Konto hat einen falschen Benutzernamen oder Passwort gemeldet."
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:558
+#: src/client/application/application-main-window.vala:593
 msgid "Retry login, you will be prompted for your password"
 msgstr "Anmeldung erneut versuchen, Sie werden nach einem Passwort gefragt"
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:565
+#: src/client/application/application-main-window.vala:600
 msgid "Security problem"
 msgstr "Sicherheitsproblem"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:567
+#: src/client/application/application-main-window.vala:602
 msgid "An account has reported an untrusted server."
 msgstr "Ein Konto hat einen nicht-vertrauten Server gemeldet."
 
 #. Translators: An info bar button label
-#: src/client/application/application-main-window.vala:570
+#: src/client/application/application-main-window.vala:605
 msgid "Check"
 msgstr "Prüfen"
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:574
+#: src/client/application/application-main-window.vala:609
 msgid "Check the security details for the connection"
 msgstr "Sicherheitsdetails für die Verbindung prüfen"
 
 #. / Translators: Main window title, first string
 #. / substitution being the currently selected folder name,
 #. / the second being the selected account name.
-#: src/client/application/application-main-window.vala:617
+#: src/client/application/application-main-window.vala:652
 #, c-format
 msgid "%s — %s"
 msgstr "%s — %s"
@@ -1260,49 +1254,49 @@ msgstr "%s — %s"
 #. Translators: The name of the folder group containing
 #. folders created by people (as opposed to special-use
 #. folders)
-#: src/client/application/application-main-window.vala:996
+#: src/client/application/application-main-window.vala:1043
 #: src/client/folder-list/folder-list-account-branch.vala:43
 msgid "Labels"
 msgstr "Beschriftungen"
 
-#: src/client/application/application-main-window.vala:1293
+#: src/client/application/application-main-window.vala:1358
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Alle E-Mails aus dem Ordner %s löschen?"
 
-#: src/client/application/application-main-window.vala:1294
+#: src/client/application/application-main-window.vala:1359
 msgid "This removes the email from Geary and your email server."
 msgstr "Dies wird die E-Mail aus Geary und von Ihrem E-Mail-Server löschen."
 
-#: src/client/application/application-main-window.vala:1295
+#: src/client/application/application-main-window.vala:1360
 msgid "This cannot be undone."
 msgstr "Dies kann nicht rückgängig gemacht werden."
 
-#: src/client/application/application-main-window.vala:1296
+#: src/client/application/application-main-window.vala:1361
 #, c-format
 msgid "Empty %s"
 msgstr "%s leeren"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1353
+#: src/client/application/application-main-window.vala:1418
 msgid "Do you want to permanently delete this conversation?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Möchten Sie diese Konversation dauerhaft löschen?"
 msgstr[1] "Möchten Sie diese Konversationen dauerhaft löschen?"
 
-#: src/client/application/application-main-window.vala:1358
-#: src/client/application/application-main-window.vala:1373
+#: src/client/application/application-main-window.vala:1423
+#: src/client/application/application-main-window.vala:1438
 msgid "Delete"
 msgstr "Löschen"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1368
+#: src/client/application/application-main-window.vala:1433
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Möchten Sie diese Nachricht dauerhaft löschen?"
 msgstr[1] "Möchten Sie diese Nachrichten dauerhaft löschen?"
 
-#: src/client/application/application-main-window.vala:1691
+#: src/client/application/application-main-window.vala:1724
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1312,17 +1306,17 @@ msgstr "%s (%d)"
 #. be a human-friendly size string. For example:
 #. Document (100.9MB)
 #. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: src/client/components/components-attachment-pane.vala:107
-#: src/client/composer/composer-widget.vala:1784
+#: src/client/components/components-attachment-pane.vala:104
+#: src/client/composer/composer-widget.vala:1870
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: src/client/components/components-attachment-pane.vala:379
+#: src/client/components/components-attachment-pane.vala:373
 msgid "Are you sure you want to open these attachments?"
 msgstr "Möchten Sie wirklich diese Anhänge öffnen?"
 
-#: src/client/components/components-attachment-pane.vala:380
+#: src/client/components/components-attachment-pane.vala:374
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -1330,42 +1324,95 @@ msgstr ""
 "Anhänge können Ihr System beschädigen, wenn diese geöffnet werden. Öffnen "
 "Sie nur Dateien aus vertrauenswürdigen Quellen."
 
-#: src/client/components/components-attachment-pane.vala:381
+#: src/client/components/components-attachment-pane.vala:375
 msgid "Don’t _ask me again"
 msgstr "Nicht _noch einmal fragen"
 
+#: src/client/components/components-conversation-actions.vala:90
+msgid "Mark conversation"
+msgid_plural "Mark conversations"
+msgstr[0] "Konversation markieren"
+msgstr[1] "Konversationen markieren"
+
+#: src/client/components/components-conversation-actions.vala:95
+msgid "Add label to conversation"
+msgid_plural "Add label to conversations"
+msgstr[0] "Konversation eine Beschriftung zuweisen"
+msgstr[1] "Konversationen eine Beschriftung zuweisen"
+
+#: src/client/components/components-conversation-actions.vala:100
+msgid "Move conversation"
+msgid_plural "Move conversations"
+msgstr[0] "Konversation verschieben"
+msgstr[1] "Konversationen verschieben"
+
+#: src/client/components/components-conversation-actions.vala:105
+#: src/client/conversation-list/conversation-list-view.vala:445
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
+msgstr[0] "Konversation archivieren"
+msgstr[1] "Konversationen archivieren"
+
+#: src/client/components/components-conversation-actions.vala:116
+msgid "Move conversation to Trash"
+msgid_plural "Move conversations to Trash"
+msgstr[0] "Konversation in den Papierkorb verschieben"
+msgstr[1] "Konversationen in den Papierkorb verschieben"
+
+#: src/client/components/components-conversation-actions.vala:126
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] "Konversation löschen"
+msgstr[1] "Konversationen löschen"
+
+#: src/client/components/components-info-bar.vala:248
+msgid "Information"
+msgstr "Information"
+
+#: src/client/components/components-info-bar.vala:252
+msgid "Question"
+msgstr "Frage"
+
+#: src/client/components/components-info-bar.vala:256
+msgid "Warning"
+msgstr "Warnung"
+
+#: src/client/components/components-info-bar.vala:260
+msgid "Error"
+msgstr "Fehler"
+
 # Gemeint is vmtl der WebKitGTK-Inspector
-#: src/client/components/components-inspector.vala:78
+#: src/client/components/components-inspector.vala:71
 msgid "Inspector"
 msgstr "Inspector"
 
 #. / Translators: Title for Inspector logs pane
 #. / Translators: Title for problem report dialog logs pane
-#: src/client/components/components-inspector.vala:93
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:101
+#: src/client/components/components-inspector.vala:86
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:98
 msgid "Logs"
 msgstr "Protokolle"
 
 #. / Translators: Title for Inspector system system information pane
 #. / Translators: Title for problem report system information
 #. / pane
-#: src/client/components/components-inspector.vala:97
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:104
+#: src/client/components/components-inspector.vala:90
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:101
 msgid "System"
 msgstr "System"
 
 #. Button label for saving problem report information
-#: src/client/components/components-inspector.vala:226
-#: src/client/components/components-inspector.vala:229
+#: src/client/components/components-inspector.vala:219
+#: src/client/components/components-inspector.vala:222
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:217
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:220
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:223
-#: ui/problem-details-dialog.ui:47
+#: ui/problem-details-dialog.ui:42
 msgid "Save As"
 msgstr "Speichern als"
 
-#: src/client/components/components-inspector.vala:230
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
-#: ui/accounts_editor_servers_pane.ui:17 ui/composer-headerbar.ui:61
+#: src/client/components/components-inspector.vala:223
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:221
+#: ui/accounts_editor_servers_pane.ui:15 ui/composer-headerbar.ui:55
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1381,15 +1428,10 @@ msgstr "Konversations_vorschau anzeigen"
 
 #. / Translators: Preferences label
 #: src/client/components/components-preferences-window.vala:144
-msgid "Use _three pane view"
-msgstr "_Dreispaltige Ansicht verwenden"
-
-#. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:154
 msgid "Use _single key email shortcuts"
 msgstr "_Einfache E-Mail-Tastenkürzel verwenden"
 
-#: src/client/components/components-preferences-window.vala:156
+#: src/client/components/components-preferences-window.vala:146
 msgid ""
 "Enable keyboard shortcuts for email actions that do not require pressing "
 "<Ctrl>"
@@ -1398,24 +1440,24 @@ msgstr ""
 "<Strg> erfordern"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:167
+#: src/client/components/components-preferences-window.vala:157
 msgid "_Watch for new mail when closed"
 msgstr "_Ständig nach neuen E-Mails prüfen"
 
 #. / Translators: Preferences tooltip
-#: src/client/components/components-preferences-window.vala:171
+#: src/client/components/components-preferences-window.vala:161
 msgid "Geary will keep running after all windows are closed"
 msgstr "Geary wird weiter ausgeführt, nachdem alle Fenster geschlossen wurden"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:189
+#: src/client/components/components-preferences-window.vala:178
 msgid "Preferences"
 msgstr "Einstellungen"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:250
+#: src/client/components/components-preferences-window.vala:234
 msgid "Plugins"
-msgstr ""
+msgstr "Plug-ins"
 
 #. Translators: Info bar title for a generic account
 #. problem.
@@ -1535,42 +1577,6 @@ msgstr "Es wird ein Servername benötigt"
 msgid "Could not look up server name"
 msgstr "Servername konnte nicht abgefragt werden"
 
-#: src/client/components/main-toolbar.vala:116
-msgid "Mark conversation"
-msgid_plural "Mark conversations"
-msgstr[0] "Konversation markieren"
-msgstr[1] "Konversationen markieren"
-
-#: src/client/components/main-toolbar.vala:121
-msgid "Add label to conversation"
-msgid_plural "Add label to conversations"
-msgstr[0] "Konversation eine Beschriftung zuweisen"
-msgstr[1] "Konversationen eine Beschriftung zuweisen"
-
-#: src/client/components/main-toolbar.vala:126
-msgid "Move conversation"
-msgid_plural "Move conversations"
-msgstr[0] "Konversation verschieben"
-msgstr[1] "Konversationen verschieben"
-
-#: src/client/components/main-toolbar.vala:131
-msgid "Archive conversation"
-msgid_plural "Archive conversations"
-msgstr[0] "Konversation archivieren"
-msgstr[1] "Konversationen archivieren"
-
-#: src/client/components/main-toolbar.vala:142
-msgid "Move conversation to Trash"
-msgid_plural "Move conversations to Trash"
-msgstr[0] "Konversation in den Papierkorb verschieben"
-msgstr[1] "Konversationen in den Papierkorb verschieben"
-
-#: src/client/components/main-toolbar.vala:152
-msgid "Delete conversation"
-msgid_plural "Delete conversations"
-msgstr[0] "Konversation löschen"
-msgstr[1] "Konversationen löschen"
-
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
 #: src/client/components/status-bar.vala:26
 msgid "Sending…"
@@ -1591,12 +1597,6 @@ msgstr "Fehler beim Speichern der gesendeten E-Mail"
 msgid "_OK"
 msgstr "_OK"
 
-#: src/client/components/stock.vala:19
-#: src/client/plugin/mail-merge/mail-merge.vala:392
-#: ui/password-dialog.glade:196
-msgid "_Cancel"
-msgstr "_Abbrechen"
-
 #: src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Info"
@@ -1649,21 +1649,21 @@ msgstr "_Speichern"
 msgid "_Keep"
 msgstr "_Behalten"
 
-#: src/client/composer/composer-editor.vala:675
+#: src/client/composer/composer-editor.vala:680
 msgid "Select Color"
 msgstr "Farbe auswählen"
 
-#: src/client/composer/composer-link-popover.vala:139
+#: src/client/composer/composer-link-popover.vala:135
 msgid "Link URL is not correctly formatted, e.g. http://example.com";
 msgstr ""
 "Die Adresse des Verweises ist nicht korrekt formatiert, z.B. http://example.";
 "com"
 
-#: src/client/composer/composer-link-popover.vala:146
+#: src/client/composer/composer-link-popover.vala:142
 msgid "Invalid link URL"
 msgstr "Ungültige Verweisadresse"
 
-#: src/client/composer/composer-link-popover.vala:146
+#: src/client/composer/composer-link-popover.vala:142
 msgid "Invalid email address"
 msgstr "Ungültige E-Mail-Adresse"
 
@@ -1672,19 +1672,19 @@ msgstr "Ungültige E-Mail-Adresse"
 msgid "New Message"
 msgstr "Neue Nachricht"
 
-#: src/client/composer/composer-widget.vala:167
+#: src/client/composer/composer-widget.vala:233
 msgid "Saved"
 msgstr "Gespeichert"
 
-#: src/client/composer/composer-widget.vala:168
+#: src/client/composer/composer-widget.vala:234
 msgid "Saving"
 msgstr "Wird gespeichert"
 
-#: src/client/composer/composer-widget.vala:169
+#: src/client/composer/composer-widget.vala:235
 msgid "Error saving"
 msgstr "Fehler beim Speichern"
 
-#: src/client/composer/composer-widget.vala:170
+#: src/client/composer/composer-widget.vala:236
 msgid "Press Backspace to delete quote"
 msgstr "Rücktaste drücken, um die Einrückung zu entfernen"
 
@@ -1693,7 +1693,7 @@ msgstr "Rücktaste drücken, um die Einrückung zu entfernen"
 #. checking, include all variants of each word. No spaces are
 #. allowed. The words will be converted to lower case based on
 #. locale and English versions included automatically.
-#: src/client/composer/composer-widget.vala:186
+#: src/client/composer/composer-widget.vala:252
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1701,95 +1701,125 @@ msgstr ""
 "Anhang|Anhänge|angehängt|anhängen|Wiedervorlage|Beilage|beilegen|Anlage|"
 "anbei|beigefügt|anhängend"
 
+#. / Translators: Label for composer From address entry
+#: src/client/composer/composer-widget.vala:483
+msgid "_From"
+msgstr "_Von"
+
+#. / Translators: Label for composer To address entry
+#: src/client/composer/composer-widget.vala:493
+msgid "_To"
+msgstr "_An"
+
+#. / Translators: Label for composer CC address entry
+#: src/client/composer/composer-widget.vala:502
+msgid "_Cc"
+msgstr "_Kopie"
+
+#. / Translators: Label for composer BCC address entry
+#: src/client/composer/composer-widget.vala:510
+msgid "_Bcc"
+msgstr "_Blindkopie"
+
+#. / Translators: Label for composer Reply-To address entry
+#: src/client/composer/composer-widget.vala:518
+msgid "_Reply to"
+msgstr "An_twort an"
+
+#. / Translators: Label for composer Subject line entry
+#: src/client/composer/composer-widget.vala:526
+msgid "_Subject"
+msgstr "_Betreff"
+
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:862
+#: src/client/composer/composer-widget.vala:904
 msgid "Do you want to keep or discard this draft message?"
 msgstr "Möchten Sie diesen Nachrichtenentwurf behalten oder verwerfen?"
 
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. only Discard or Cancel.
-#: src/client/composer/composer-widget.vala:888
+#: src/client/composer/composer-widget.vala:930
 msgid "Do you want to discard this draft message?"
 msgstr "Möchten Sie diesen Nachrichtenentwurf verwerfen?"
 
-#: src/client/composer/composer-widget.vala:1440
+#: src/client/composer/composer-widget.vala:1503
 msgid "Send message with an empty subject and body?"
 msgstr "Nachricht ohne Betreff und Inhalt senden?"
 
-#: src/client/composer/composer-widget.vala:1442
+#: src/client/composer/composer-widget.vala:1505
 msgid "Send message with an empty subject?"
 msgstr "Nachricht ohne Betreff senden?"
 
-#: src/client/composer/composer-widget.vala:1444
+#: src/client/composer/composer-widget.vala:1507
 msgid "Send message with an empty body?"
 msgstr "Nachricht ohne Inhalt senden?"
 
-#: src/client/composer/composer-widget.vala:1453
+#: src/client/composer/composer-widget.vala:1516
 msgid "Send message without an attachment?"
 msgstr "Nachricht ohne Anhang senden?"
 
-#: src/client/composer/composer-widget.vala:1772
+#: src/client/composer/composer-widget.vala:1858
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "»%s« ist bereits als Anhang ausgewählt worden."
 
-#: src/client/composer/composer-widget.vala:1804
-#: src/client/composer/composer-widget.vala:1854
+#: src/client/composer/composer-widget.vala:1890
+#: src/client/composer/composer-widget.vala:1940
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "»%s« ist eine leere Datei."
 
-#: src/client/composer/composer-widget.vala:1842
+#: src/client/composer/composer-widget.vala:1928
 #, c-format
 msgid "“%s” could not be found."
 msgstr "»%s« konnte nicht gefunden werden."
 
-#: src/client/composer/composer-widget.vala:1848
+#: src/client/composer/composer-widget.vala:1934
 #, c-format
 msgid "“%s” is a folder."
 msgstr "»%s« ist ein Ordner."
 
-#: src/client/composer/composer-widget.vala:1867
+#: src/client/composer/composer-widget.vala:1953
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "»%s« konnte nicht zum Lesen geöffnet werden."
 
-#: src/client/composer/composer-widget.vala:1875
+#: src/client/composer/composer-widget.vala:1961
 msgid "Cannot add attachment"
 msgstr "Anhang kann nicht hinzugefügt werden"
 
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:1946
+#: src/client/composer/composer-widget.vala:2032
 msgid "Images"
 msgstr "Bilder"
 
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:2010
-#: src/client/conversation-viewer/conversation-email.vala:542
-#: src/client/util/util-email.vala:249 ui/conversation-message.ui:312
+#: src/client/composer/composer-widget.vala:2096
+#: src/client/conversation-viewer/conversation-email.vala:536
+#: src/client/util/util-email.vala:267 ui/conversation-message.ui:283
 msgid "To:"
 msgstr "An:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:2016
-#: src/client/conversation-viewer/conversation-email.vala:547
-#: src/client/util/util-email.vala:254 ui/conversation-message.ui:357
+#: src/client/composer/composer-widget.vala:2102
+#: src/client/conversation-viewer/conversation-email.vala:541
+#: src/client/util/util-email.vala:272 ui/conversation-message.ui:324
 msgid "Cc:"
 msgstr "Kopie:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:2022
-#: src/client/conversation-viewer/conversation-email.vala:552
-#: ui/conversation-message.ui:402
+#: src/client/composer/composer-widget.vala:2108
+#: src/client/conversation-viewer/conversation-email.vala:546
+#: ui/conversation-message.ui:365
 msgid "Bcc:"
 msgstr "Blindkopie:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:2028
+#: src/client/composer/composer-widget.vala:2114
 msgid "Reply-To: "
 msgstr "Antwort an: "
 
@@ -1798,7 +1828,7 @@ msgstr "Antwort an: "
 #. printf argument will be the alternate email address,
 #. and the second will be the account's primary email
 #. address.
-#: src/client/composer/composer-widget.vala:2146
+#: src/client/composer/composer-widget.vala:2232
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s über %2$s"
@@ -1816,51 +1846,51 @@ msgid "Search for more languages"
 msgstr "Nach weiteren Sprachen suchen"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:339
+#: src/client/conversation-list/conversation-list-view.vala:389
 msgid "Move conversation to _Trash"
 msgid_plural "Move conversations to _Trash"
 msgstr[0] "Konversation in den _Papierkorb verschieben"
 msgstr[1] "Konversationen in den _Papierkorb verschieben"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:351
+#: src/client/conversation-list/conversation-list-view.vala:401
 msgid "_Delete conversation"
 msgid_plural "_Delete conversations"
 msgstr[0] "Konversation _löschen"
 msgstr[1] "Konversationen _löschen"
 
-#: src/client/conversation-list/conversation-list-view.vala:364
+#: src/client/conversation-list/conversation-list-view.vala:414
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Als _gelesen markieren"
 
-#: src/client/conversation-list/conversation-list-view.vala:372
+#: src/client/conversation-list/conversation-list-view.vala:422
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: src/client/conversation-list/conversation-list-view.vala:380
+#: src/client/conversation-list/conversation-list-view.vala:430
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "_Stern entfernen"
 
-#: src/client/conversation-list/conversation-list-view.vala:387
+#: src/client/conversation-list/conversation-list-view.vala:437
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "_Stern"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:396
+#: src/client/conversation-list/conversation-list-view.vala:454
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: src/client/conversation-list/conversation-list-view.vala:402
+#: src/client/conversation-list/conversation-list-view.vala:460
 msgid "R_eply All"
 msgstr "Allen _antworten"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:408
+#: src/client/conversation-list/conversation-list-view.vala:466
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Weiterleiten"
@@ -1870,20 +1900,20 @@ msgid "Me"
 msgstr "Ich"
 
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:537
-#: src/client/util/util-email.vala:240
+#: src/client/conversation-viewer/conversation-email.vala:531
+#: src/client/util/util-email.vala:258
 msgid "From:"
 msgstr "Von:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:557
-#: src/client/util/util-email.vala:245
+#: src/client/conversation-viewer/conversation-email.vala:551
+#: src/client/util/util-email.vala:263
 msgid "Date:"
 msgstr "Datum:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:567
-#: src/client/util/util-email.vala:243
+#: src/client/conversation-viewer/conversation-email.vala:561
+#: src/client/util/util-email.vala:261
 msgid "Subject:"
 msgstr "Betreff:"
 
@@ -1895,10 +1925,8 @@ msgstr "Diese E-Mail-Adresse könnte gefälscht sein"
 #. many email addresses to be shown by default in an
 #. email's header, but they are all being shown anyway.
 #: src/client/conversation-viewer/conversation-message.vala:234
-#, fuzzy
-#| msgid "Show Images"
 msgid "Show less"
-msgstr "Bilder anzeigen"
+msgstr "Weniger anzeigen"
 
 #. Translators: Label text displayed when there are
 #. too many email addresses to be shown by default in
@@ -1907,77 +1935,77 @@ msgstr "Bilder anzeigen"
 #: src/client/conversation-viewer/conversation-message.vala:260
 #, c-format
 msgid "%d more…"
-msgstr ""
+msgid_plural "%d more…"
+msgstr[0] "%d weitere …"
+msgstr[1] "%d weitere …"
 
 #. Compact headers. These are partially done here and partially
 #. in load_contacts.
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: src/client/conversation-viewer/conversation-message.vala:529
+#: src/client/conversation-viewer/conversation-message.vala:533
 msgid "No sender"
 msgstr "Kein Absender"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:920
+#: src/client/conversation-viewer/conversation-message.vala:1025
 msgid ", "
 msgstr ", "
 
 #. Translators: This string is used as the HTML IMG ALT
 #. attribute value when displaying an inline image in an email
 #. that did not specify a file name. E.g. <IMG ALT="Image" ...
-#: src/client/conversation-viewer/conversation-message.vala:1040
+#: src/client/conversation-viewer/conversation-message.vala:1147
 msgid "Image"
 msgstr "Bild"
 
 # habe aus fuer remote aus "entfernt" "extern gemacht, da entfernt auch ein Synonym fuer geloescht, also von 
der Nachricht entfernte Bilder sein kann.
 #. Translators: Info bar status message
-#: src/client/conversation-viewer/conversation-message.vala:1305
+#: src/client/conversation-viewer/conversation-message.vala:1419
 msgid "Remote images not shown"
 msgstr "Externe Bilder werden nicht angezeigt"
 
+# Das ist eine Aufforderung an den Nutzer, im Sinne eines Tipps.
+# Siehe https://i.imgur.com/8ioIrG4.png
 #. Translators: Info bar description
-#: src/client/conversation-viewer/conversation-message.vala:1307
+#: src/client/conversation-viewer/conversation-message.vala:1421
 msgid "Only show remote images from senders you trust."
-msgstr "Externe Bilder nur von Absendern anzeigen, denen Sie vertrauen."
+msgstr ""
+"Lassen Sie externe Bilder nur von Absendern anzeigen, denen Sie vertrauen."
 
 #. Translators: Info bar button label
-#: src/client/conversation-viewer/conversation-message.vala:1311
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Show help"
+#: src/client/conversation-viewer/conversation-message.vala:1425
 msgid "Show"
-msgstr "Hilfe anzeigen"
+msgstr "Anzeigen"
 
 #. Translators: Info bar button label
-#: src/client/conversation-viewer/conversation-message.vala:1315
-#, fuzzy
-#| msgid "Always Show From Sender"
+#: src/client/conversation-viewer/conversation-message.vala:1429
 msgid "Always show from sender"
 msgstr "Von diesem Absender immer anzeigen"
 
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:83
+#: src/client/conversation-viewer/conversation-viewer.vala:84
 msgid "No conversations selected"
 msgstr "Keine Konversationen ausgewählt"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:87
+#: src/client/conversation-viewer/conversation-viewer.vala:88
 msgid "Selecting a conversation from the list will display it here"
 msgstr ""
 "Wenn Sie eine Konversation aus der Liste auswählen, wird diese hier angezeigt"
 
 #. Translators: Title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:96
+#: src/client/conversation-viewer/conversation-viewer.vala:97
 msgid "Multiple conversations selected"
 msgstr "Mehrere Konversationen ausgewählt"
 
 #. Translators: Sub-title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:100
+#: src/client/conversation-viewer/conversation-viewer.vala:101
 msgid "Choosing an action will apply to all selected conversations"
 msgstr "Eine Aktion wird auf alle ausgewählten Nachrichten angewandt"
 
@@ -1985,20 +2013,20 @@ msgstr "Eine Aktion wird auf alle ausgewählten Nachrichten angewandt"
 #. conversations have exist in a folder.
 #. Translators: Title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:109
-#: src/client/conversation-viewer/conversation-viewer.vala:122
+#: src/client/conversation-viewer/conversation-viewer.vala:110
+#: src/client/conversation-viewer/conversation-viewer.vala:123
 msgid "No conversations found"
 msgstr "Keine Konversationen gefunden"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have exist in a folder.
-#: src/client/conversation-viewer/conversation-viewer.vala:113
+#: src/client/conversation-viewer/conversation-viewer.vala:114
 msgid "This folder does not contain any conversations"
 msgstr "Dieser Ordner enthält keine Konversationen"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:126
+#: src/client/conversation-viewer/conversation-viewer.vala:127
 msgid "Your search returned no results, try refining your search terms"
 msgstr ""
 "Ihre Suche hat keine Treffer ergeben, versuchen Sie es mit anderen "
@@ -2097,8 +2125,8 @@ msgstr ""
 #. / Translators: Title for problem report dialog error
 #. / information pane
 #. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:99
-#: ui/problem-details-dialog.ui:17
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:96
+#: ui/problem-details-dialog.ui:15
 msgid "Details"
 msgstr "Details"
 
@@ -2156,13 +2184,7 @@ msgstr[1] "%d Ergebnisse"
 #. / subject and the second is the number of unseen
 #. / messages
 #: src/client/plugin/desktop-notifications/desktop-notifications.vala:138
-#, fuzzy, c-format
-#| msgid ""
-#| "%s\n"
-#| "(%d other new message for %s)"
-#| msgid_plural ""
-#| "%s\n"
-#| "(%d other new messages for %s)"
+#, c-format
 msgid ""
 "%s\n"
 "(%d other new message)"
@@ -2171,10 +2193,10 @@ msgid_plural ""
 "(%d other new messages)"
 msgstr[0] ""
 "%s\n"
-"(%d andere neue Nachricht für %s)"
+"(%d weitere neue Nachricht)"
 msgstr[1] ""
 "%s\n"
-"(%d andere neue Nachrichten für %s)"
+"(%d weitere neue Nachrichten)"
 
 #. / Notification body when multiple messages have been
 #. / received at the same time and other unseen messages
@@ -2203,22 +2225,18 @@ msgstr[1] "%s, insgesamt %d neue Nachrichten"
 #. / Notification title when new messages have been
 #. / received
 #: src/client/plugin/desktop-notifications/desktop-notifications.vala:282
-#, fuzzy
-#| msgid "New Message"
 msgid "New message"
 msgid_plural "New messages"
 msgstr[0] "Neue Nachricht"
-msgstr[1] "Neue Nachricht"
+msgstr[1] "Neue Nachrichten"
 
 #: src/client/plugin/email-templates/email-templates.plugin.desktop.in:4
-#, fuzzy
-#| msgid "Email address"
 msgid "Email Templates"
-msgstr "E-Mail-Adresse"
+msgstr "E-Mail-Vorlagen"
 
 #: src/client/plugin/email-templates/email-templates.plugin.desktop.in:5
 msgid "Create reusable templates for sending email"
-msgstr ""
+msgstr "Wiederverwendbare Vorlagen zum E-Mail-Versand erstellen"
 
 #. Translators: Templates folder name alternatives. Separate names
 #. using a vertical bar and put the most common localized name to
@@ -2226,40 +2244,29 @@ msgstr ""
 #. included.
 #: src/client/plugin/email-templates/email-templates.vala:29
 #: src/client/plugin/mail-merge/mail-merge.vala:29
-#, fuzzy
-#| msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgid "Templates | Template Mail | Template Email | Template E-Mail"
-msgstr ""
-"Gesendet | Gesendete E-Mail | Gesendete E-Mails | Sent | Sent Mail | Sent "
-"Email | Sent E-Mail"
+msgstr "Vorlagen | Nachrichtenvorlagen | E-Mail-Vorlagen | Mail-Vorlagen"
 
 #. Translators: The name of the folder used to
 #. store email templates
 #: src/client/plugin/email-templates/email-templates.vala:201
 msgid "Templates"
-msgstr ""
+msgstr "Vorlagen"
 
 #. Translators: Info bar button label for creating a
 #. new email template
 #: src/client/plugin/email-templates/email-templates.vala:282
-#, fuzzy
-#| msgid "Now"
 msgid "New"
-msgstr "Jetzt"
+msgstr "Neu"
 
 #. Translators: Infobar status label for an email template
 #: src/client/plugin/email-templates/email-templates.vala:293
-#, fuzzy
-#| msgid "Message not saved"
 msgid "Message template"
-msgstr "Nachricht nicht gespeichert"
+msgstr "Nachrichtenvorlage"
 
 #. Translators: Info bar button label for sending an
 #. email template
 #: src/client/plugin/email-templates/email-templates.vala:297
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Send"
 msgid "Send"
 msgstr "Senden"
 
@@ -2270,11 +2277,8 @@ msgstr "Senden"
 #: src/client/plugin/email-templates/email-templates.vala:305
 #: src/client/plugin/mail-merge/mail-merge.vala:336
 #: src/client/plugin/special-folders/special-folders.vala:187
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Editing"
 msgid "Edit"
-msgstr "Bearbeitung"
+msgstr "Bearbeiten"
 
 #. / Translators: Menu item label for invoking mail
 #. / merge in composer
@@ -2287,26 +2291,23 @@ msgstr "Bearbeitung"
 #: src/client/plugin/mail-merge/mail-merge.vala:389
 #: src/client/plugin/mail-merge/mail-merge.vala:488
 msgid "Mail Merge"
-msgstr ""
+msgstr "Serien-E-Mail"
 
 #: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:6
 msgid "Fill in and send email templates using a spreadsheet"
-msgstr ""
+msgstr "E-Mail-Vorlagen mithilfe einer Tabelle ausfüllen und versenden"
 
 #. Translators: Info bar label for starting sending a mail
 #. merge
 #: src/client/plugin/mail-merge/mail-merge.vala:118
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Star"
 msgid "Start"
-msgstr "Stern"
+msgstr "Versenden"
 
 #. Translators: Info bar label for pausing sending a mail
 #. merge
 #: src/client/plugin/mail-merge/mail-merge.vala:130
 msgid "Pause"
-msgstr ""
+msgstr "Pausieren"
 
 #. Translators: Info bar description for the mail merge
 #. folder. The first string substitution the number of email
@@ -2315,43 +2316,39 @@ msgstr ""
 #, c-format
 msgid "Sent %u of %u"
 msgid_plural "Sent %u of %u"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%u von %u gesendet"
+msgstr[1] "%u von %u gesendet"
 
 #. Translators: Infobar status label for an email mail merge
 #. template
 #: src/client/plugin/mail-merge/mail-merge.vala:324
 msgid "Mail merge template"
-msgstr ""
+msgstr "Vorlage für Serien-E-Mail"
 
 #. Translators: Info bar button label for performing a
 #. mail-merge on an email template
 #: src/client/plugin/mail-merge/mail-merge.vala:328
 msgid "Merge"
-msgstr ""
+msgstr "Anwenden"
 
 #. / Translators: Action bar menu button label for
 #. / mail-merge plugin
 #: src/client/plugin/mail-merge/mail-merge.vala:377
-#, fuzzy
-#| msgid "Insert an image"
 msgid "Insert field"
-msgstr "Bild einfügen"
+msgstr "Feld einfügen"
 
 #. / Translators: File chooser filer label
 #: src/client/plugin/mail-merge/mail-merge.vala:396
 msgid "Comma separated values (CSV)"
-msgstr ""
+msgstr "Kommagetrennte Werte (CSV)"
 
 #: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
 msgid "Messaging Menu"
-msgstr ""
+msgstr "Nachrichtenmenü"
 
 #: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:5
-#, fuzzy
-#| msgid "Show notifications for new mail"
 msgid "Displays Unity Messaging Menu notifications for new email"
-msgstr "Benachrichtigung bei neuen Nachrichten anzeigen"
+msgstr "Zeigt Benachrichtigungen für neue E-Mails im Unity-Nachrichtenmenü an"
 
 #: src/client/plugin/messaging-menu/messaging-menu.vala:79
 #, c-format
@@ -2360,19 +2357,19 @@ msgstr "%s – Neue Nachrichten"
 
 #: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
 msgid "Sent Sound"
-msgstr ""
+msgstr "»Gesendet«-Benachrichtigungston"
 
 #: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:5
 msgid "Plays the desktop sent-mail sound when an email is sent"
 msgstr ""
+"Spielt den »E-Mail gesendet«-Benachrichtigungston der Arbeitsumgebung ab, "
+"wenn eine E-Mail gesendet wird"
 
 #. Translators: Info bar button label for emptying
 #. trash/spam folders
 #: src/client/plugin/special-folders/special-folders.vala:167
-#, fuzzy
-#| msgid "Empty %s"
 msgid "Empty"
-msgstr "%s leeren"
+msgstr "Leeren"
 
 #. Translators: Info bar status message for a draft email
 #: src/client/plugin/special-folders/special-folders.vala:179
@@ -2466,39 +2463,16 @@ msgstr "Gestern"
 msgid "%A"
 msgstr "%A"
 
-#. / 12 hours format for datetime that a message being replied
-#. / to was received See
-#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:218
-msgid "%a, %b %-e, %Y at %l:%M %P"
-msgstr "%a, %-e. %b %Y um %l:%M %P"
-
-#. / 24 hours format for the datetime that a message being
-#. / replied to was received See
-#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:224
-msgid "%a, %b %-e, %Y at %H:%M"
-msgstr "%a, %-e. %b %Y um %H:%M"
-
-#. / Format for the datetime that a message being replied to
-#. / was received See
-#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:230
-msgid "%a, %b %-e, %Y at %X"
-msgstr "%a, %-e. %b %Y um %X"
-
 #. Translators: Label used when an email has a missing or
 #. an empty subject
-#: src/client/util/util-email.vala:50
-#, fuzzy
-#| msgid "(no subject)"
+#: src/client/util/util-email.vala:52
 msgid "(No subject)"
-msgstr "(kein Betreff)"
+msgstr "(Kein Betreff)"
 
 #. / Translators: This is shown for displaying a list of email
 #. / recipients that happens to be empty, i.e. contains no
 #. / email addresses.
-#: src/client/util/util-email.vala:148
+#: src/client/util/util-email.vala:150
 msgid "(No recipients)"
 msgstr "(Keine Empfänger)"
 
@@ -2507,39 +2481,227 @@ msgstr "(Keine Empfänger)"
 #. / addresses. The first (string) substitution is
 #. / address of the first, the second substitution is
 #. / the number of n - 1 remaining recipients.
-#: src/client/util/util-email.vala:160
+#: src/client/util/util-email.vala:162
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
 msgstr[0] "%s und %d weiterer"
 msgstr[1] "%s und %d weitere"
 
+#. / GLib g_date_time_format format string for the date and
+#. / time that a message being replied to was
+#. / received. This should be roughly similar to an RFC
+#. / 822-style date header value with optional additional
+#. / punctuation for readability. Note that this date may
+#. / be sent to someone in a different locale than the
+#. / sender, so should be unambiguous (for example, do not
+#. / use mm/dd/yyyy since it could be confused with
+#. / dd/mm/yyyy) and must include the time zone.
+#: src/client/util/util-email.vala:194
+msgid "%a, %b %-e %Y at %X %Z"
+msgstr "%a, %-e. %b %Y um %X %Z"
+
 #. / The quoted header for a message being replied to.
-#. / %1$s will be substituted for the date, and %2$s will be substituted for
-#. / the original sender.
-#: src/client/util/util-email.vala:193
+#. / %1$s will be substituted for the date, and %2$s
+#. / will be substituted for the original sender.
+#: src/client/util/util-email.vala:200
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr "Am %1$s schrieb %2$s:"
 
-#. / The quoted header for a message being replied to (in case the date is not known).
-#. / %s will be replaced by the original sender.
-#: src/client/util/util-email.vala:200
+#. / The quoted header for a message being replied to
+#. / (in case the date is not known).  %s will be
+#. / replaced by the original sender.
+#: src/client/util/util-email.vala:211
 #, c-format
 msgid "%s wrote:"
 msgstr "%s schrieb:"
 
-#. / The quoted header for a message being replied to (in case the sender is not known).
-#. / %s will be replaced by the original date
-#: src/client/util/util-email.vala:206
+#. / The quoted header for a message being replied to
+#. / (in case the sender is not known).  %s will be
+#. / replaced by the original date
+#: src/client/util/util-email.vala:221
 #, c-format
 msgid "On %s:"
 msgstr "Am %s:"
 
-#: src/client/util/util-email.vala:235
+#: src/client/util/util-email.vala:253
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Weitergeleitete Nachricht ----------"
 
+#. / Translators: Can be typed in the search box like
+#. / "attachment:file.txt" to find messages with attachments
+#. / with a particular name.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:605
+msgctxt "Search operator"
+msgid "attachment"
+msgstr "Anhang"
+
+#. / Translators: Can be typed in the search box like
+#. / "bcc:johndoe example com" to find messages bcc'd to a
+#. / particular person.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:618
+msgctxt "Search operator"
+msgid "bcc"
+msgstr "Blindkopie"
+
+#. / Translators: Can be typed in the search box like
+#. / "body:word" to find "word" only if it occurs in the body
+#. / of a message.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:630
+msgctxt "Search operator"
+msgid "body"
+msgstr "Nachricht"
+
+#. / Translators: Can be typed in the search box like
+#. / "cc:johndoe example com" to find messages cc'd to a
+#. / particular person.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:642
+msgctxt "Search operator"
+msgid "cc"
+msgstr "Kopie"
+
+#. / Translators: Can be typed in the search box like
+#. / "from:johndoe example com" to find messages from a
+#. / particular sender.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:654
+msgctxt "Search operator"
+msgid "from"
+msgstr "von"
+
+#. / Translators: Can be typed in the search box like
+#. / "subject:word" to find "word" only if it occurs in the
+#. / subject of a message.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:668
+msgctxt "Search operator"
+msgid "subject"
+msgstr "Betreff"
+
+#. / Translators: Can be typed in the search box like
+#. / "to:johndoe example com" to find messages received by a
+#. / particular person.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:680
+msgctxt "Search operator"
+msgid "to"
+msgstr "an"
+
+# an mich
+#. / Translators: Can be typed in the search box after "to:",
+#. / "cc:" and "bcc:" e.g.: "to:me". Matches conversations that
+#. / are addressed to the user.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:691
+msgctxt "Search operator value - mail addressed to the user"
+msgid "me"
+msgstr "mich"
+
+# von mir
+#. / Translators: Can be typed in the search box after "from:"
+#. / i.e.: "from:me". Matches conversations were sent by the
+#. / user.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:704
+msgctxt "Search operator value - mail sent by the user"
+msgid "me"
+msgstr "mir"
+
+#. Boolean operators
+#. /////////////////////////////////////////////////////////
+#. / Translators: Can be typed in the search box like
+#. / "is:unread" to find messages that are read, unread, or
+#. / starred.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:719
+msgctxt "Search operator"
+msgid "is"
+msgstr "ist"
+
+#. / Translators: Can be typed in the search box after "is:"
+#. / i.e.: "is:unread". Matches conversations that are flagged
+#. / unread.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:729
+msgctxt "'is:' search operator value"
+msgid "unread"
+msgstr "ungelesen"
+
+#. / Translators: Can be typed in the search box after "is:"
+#. / i.e.: "is:read". Matches conversations that are flagged as
+#. / read.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:739
+msgctxt "'is:' search operator value"
+msgid "read"
+msgstr "gelesen"
+
+#. / Translators: Can be typed in the search box after "is:"
+#. / i.e.: "is:starred". Matches conversations that are flagged
+#. / as starred.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:749
+msgctxt "'is:' search operator value"
+msgid "starred"
+msgstr "markiert"
+
 #: src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "Bytes"
@@ -2562,7 +2724,7 @@ msgstr "MB"
 #: src/client/util/util-files.vala:28
 msgctxt "Abbreviation for kilobyte"
 msgid "KB"
-msgstr "kB"
+msgstr "KB"
 
 #: src/client/util/util-i18n.vala:271
 msgid "Inbox"
@@ -2573,10 +2735,8 @@ msgid "Drafts"
 msgstr "Entwürfe"
 
 #: src/client/util/util-i18n.vala:277
-#, fuzzy
-#| msgid "Sent by:"
 msgid "Sent"
-msgstr "Gesendet von:"
+msgstr "Gesendet"
 
 #: src/client/util/util-i18n.vala:280
 msgid "Starred"
@@ -2592,7 +2752,7 @@ msgstr "Alle E-Mails"
 
 #: src/client/util/util-i18n.vala:289
 msgid "Junk"
-msgstr ""
+msgstr "Spam"
 
 #: src/client/util/util-i18n.vala:292
 msgid "Trash"
@@ -2606,181 +2766,11 @@ msgstr "Postausgang"
 msgid "Archive"
 msgstr "Archiv"
 
-#. Map of possibly translated search operator names and values
-#. to English/internal names and values. We include the
-#. English version anyway so that when translations provide a
-#. localised version of the operator names but have not also
-#. translated the user manual, the English version in the
-#. manual still works.
-#. Can be typed in the search box like "attachment:file.txt"
-#. to find messages with attachments with a particular name.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:130
-msgctxt "Search operator"
-msgid "attachment"
-msgstr "Anhang"
-
-#. Can be typed in the search box like
-#. "bcc:johndoe example com" to find messages bcc'd to a
-#. particular person.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:139
-msgctxt "Search operator"
-msgid "bcc"
-msgstr "Blindkopie"
-
-#. Can be typed in the search box like "body:word" to find
-#. "word" only if it occurs in the body of a message.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:147
-msgctxt "Search operator"
-msgid "body"
-msgstr "Nachricht"
-
-#. Can be typed in the search box like
-#. "cc:johndoe example com" to find messages cc'd to a
-#. particular person.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:156
-msgctxt "Search operator"
-msgid "cc"
-msgstr "Kopie"
-
-#. Can be typed in the search box like
-#. "from:johndoe example com" to find messages from a
-#. particular sender.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:165
-msgctxt "Search operator"
-msgid "from"
-msgstr "von"
-
-#. Can be typed in the search box like "is:unread" to find
-#. messages that are read, unread, or starred.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:173
-msgctxt "Search operator"
-msgid "is"
-msgstr "ist"
-
-#. Can be typed in the search box like "subject:word" to find
-#. "word" only if it occurs in the subject of a message.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary
-#. User Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:181
-msgctxt "Search operator"
-msgid "subject"
-msgstr "Betreff"
-
-#. Can be typed in the search box like
-#. "to:johndoe example com" to find messages received by a
-#. particular person.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:190
-msgctxt "Search operator"
-msgid "to"
-msgstr "an"
-
-# an mich
-#. Can be typed in the search box after "to:", "cc:" and
-#. "bcc:" e.g.: "to:me". Matches conversations that are
-#. addressed to the user.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:211
-msgctxt "Search operator value - mail addressed to the user"
-msgid "me"
-msgstr "mich"
-
-# von mir
-#. Can be typed in the search box after "from:" i.e.:
-#. "from:me". Matches conversations were sent by the user.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:223
-msgctxt "Search operator value - mail sent by the user"
-msgid "me"
-msgstr "mir"
-
-#. Can be typed in the search box after "is:" i.e.:
-#. "is:read". Matches conversations that are flagged as read.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:235
-msgctxt "'is:' search operator value"
-msgid "read"
-msgstr "gelesen"
-
-#. Can be typed in the search box after "is:" i.e.:
-#. "is:starred". Matches conversations that are flagged as
-#. starred.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:246
-msgctxt "'is:' search operator value"
-msgid "starred"
-msgstr "markiert"
-
-#. Can be typed in the search box after "is:" i.e.:
-#. "is:unread". Matches conversations that are flagged unread.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:256
-msgctxt "'is:' search operator value"
-msgid "unread"
-msgstr "ungelesen"
-
 #. List of general possible folder names to match for the
 #. Draft mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:996
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1006
 msgid "Drafts | Draft"
 msgstr "Entwürfe | Entwurf"
 
@@ -2788,7 +2778,7 @@ msgstr "Entwürfe | Entwurf"
 #. Sent mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1005
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1015
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 "Gesendet | Gesendete E-Mail | Gesendete E-Mails | Sent | Sent Mail | Sent "
@@ -2796,7 +2786,7 @@ msgstr ""
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1010
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1020
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Gesendete Objekte"
@@ -2805,7 +2795,7 @@ msgstr "Gesendete Objekte"
 #. Junk/Spam mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1020
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1030
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2817,13 +2807,13 @@ msgstr ""
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1030
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1040
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Papierkorb | Müll | Trash | Rubbish | Rubbish Bin"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1035
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1045
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Gelöschte Objekte"
@@ -2832,253 +2822,227 @@ msgstr "Gelöschte Objekte"
 #. Archive mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1045
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1055
 msgid "Archive | Archives"
 msgstr "Archiv | Archive | Archive | Archives"
 
-#: src/engine/rfc822/rfc822-message.vala:528
+#: src/engine/rfc822/rfc822-message.vala:551
 #, c-format
 msgid "Could not determine mime type for “%s”."
 msgstr "MIME-Type für »%s« konnte nicht ermittelt werden."
 
-#: src/engine/rfc822/rfc822-message.vala:539
+#: src/engine/rfc822/rfc822-message.vala:562
 #, c-format
 msgid "Could not determine content type for mime type “%s” on “%s”."
 msgstr ""
 "Content-Type für MIME-Type »%s« auf »%s« konnte nicht ermittelt werden."
 
-#: src/engine/rfc822/rfc822-message.vala:1013
+#: src/engine/rfc822/rfc822-message.vala:1015
 msgid "(no subject)"
 msgstr "(kein Betreff)"
 
-#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
+#: ui/accounts_editor_add_pane.ui:7 ui/accounts_editor_list_pane.ui:122
 msgid "Add an account"
 msgstr "Ein Konto hinzufügen"
 
-#: ui/accounts_editor_add_pane.ui:53
-#, fuzzy
-#| msgid "Create"
+#: ui/accounts_editor_add_pane.ui:47
 msgid "_Create"
-msgstr "Erstellen"
+msgstr "_Erstellen"
 
-#: ui/accounts_editor_add_pane.ui:131 ui/accounts_editor_servers_pane.ui:125
+#: ui/accounts_editor_add_pane.ui:119 ui/accounts_editor_servers_pane.ui:115
 msgid "Receiving"
 msgstr "Wird empfangen"
 
-#: ui/accounts_editor_add_pane.ui:179 ui/accounts_editor_servers_pane.ui:165
+#: ui/accounts_editor_add_pane.ui:163 ui/accounts_editor_servers_pane.ui:151
 msgid "Sending"
 msgstr "Wird gesendet"
 
-#: ui/accounts_editor_edit_pane.ui:8
+#: ui/accounts_editor_edit_pane.ui:7
 msgid "Edit Account"
 msgstr "Konto bearbeiten"
 
-#: ui/accounts_editor_edit_pane.ui:9 ui/accounts_editor_servers_pane.ui:9
+#: ui/accounts_editor_edit_pane.ui:8 ui/accounts_editor_servers_pane.ui:8
 msgid "Account Name"
 msgstr "Kontoname"
 
-#: ui/accounts_editor_edit_pane.ui:124
+#: ui/accounts_editor_edit_pane.ui:114
 msgid "Email addresses"
 msgstr "E-Mail-Adressen"
 
-#: ui/accounts_editor_edit_pane.ui:164
+#: ui/accounts_editor_edit_pane.ui:151
 msgid "Signature"
 msgstr "Signatur"
 
-#: ui/accounts_editor_edit_pane.ui:201
+#: ui/accounts_editor_edit_pane.ui:186
 msgid "Settings"
 msgstr "Einstellungen"
 
 #. This is a button in the account settings to show server settings.
-#: ui/accounts_editor_edit_pane.ui:243 ui/accounts_editor_servers_pane.ui:8
+#: ui/accounts_editor_edit_pane.ui:225 ui/accounts_editor_servers_pane.ui:7
 msgid "Server Settings"
 msgstr "Server-Einstellungen"
 
-#. This is the remove account button in the account settings.
-#: ui/accounts_editor_edit_pane.ui:258 ui/accounts_editor_remove_pane.ui:23
-msgid "Remove Account"
-msgstr "Konto entfernen"
-
-#: ui/accounts_editor_edit_pane.ui:262 ui/accounts_editor_remove_pane.ui:27
+#: ui/accounts_editor_edit_pane.ui:242
 msgid "Remove this account from Geary"
 msgstr "Konto aus Geary entfernen"
 
-#: ui/accounts_editor_list_pane.ui:8
+#: ui/accounts_editor_list_pane.ui:7
 msgid "Accounts"
 msgstr "Konten"
 
-#: ui/accounts_editor_list_pane.ui:62
+#: ui/accounts_editor_list_pane.ui:59
 msgid "To get started, select an email provider below."
 msgstr "Wählen Sie unten einen E-Mail-Anbieter aus, um zu beginnen."
 
-#: ui/accounts_editor_list_pane.ui:75
+#: ui/accounts_editor_list_pane.ui:73
 msgid "Welcome to Geary"
 msgstr "Willkommen bei Geary"
 
-#. This title is shown to users when confirming if they want to remove an account. The string substitution 
is replaced with the account's name.
-#: ui/accounts_editor_remove_pane.ui:73
-#, c-format
-msgid "Confirm removing: %s"
-msgstr "Entfernen bestätigen: %s"
-
-#: ui/accounts_editor_remove_pane.ui:91
-msgid ""
-"Removing an account will remove it from Geary and delete locally cached "
-"email data from your computer, but not from your service provider."
-msgstr ""
-"Wenn Sie ein Konto entfernen, wird es aus Geary entfernt und lokal "
-"zwischengespeicherte E-Mail-Daten werden von Ihrem Computer gelöscht. Sie "
-"bleiben jedoch bei Ihrem Dienstleister gespeichert."
-
-#: ui/accounts_editor_remove_pane.ui:122
-msgid "Remove account"
-msgstr "Konto entfernen"
-
-#: ui/accounts_editor_servers_pane.ui:47
+#: ui/accounts_editor_servers_pane.ui:42
 msgid "Apply"
 msgstr "Anwenden"
 
-#: ui/certificate_warning_dialog.glade:7
+#: ui/certificate_warning_dialog.glade:6
 msgid "Untrusted Connection"
 msgstr "Nicht vertrauenswürdige Verbindung"
 
-#: ui/certificate_warning_dialog.glade:29
+#: ui/certificate_warning_dialog.glade:26
 msgid "_Always Trust This Server"
 msgstr "Diesem Server _immer vertrauen"
 
-#: ui/certificate_warning_dialog.glade:43
+#: ui/certificate_warning_dialog.glade:39
 msgid "_Trust This Server"
 msgstr "Diesem Server _vertrauen"
 
-#: ui/certificate_warning_dialog.glade:57
+#: ui/certificate_warning_dialog.glade:52
 msgid "_Don’t Trust This Server"
 msgstr "Diesem Server _nicht vertrauen"
 
-#: ui/composer-editor.ui:100
+#: ui/composer-editor.ui:89
 msgid "Bold text"
 msgstr "Fetter Text"
 
-#: ui/composer-editor.ui:124
+#: ui/composer-editor.ui:111
 msgid "Italic text"
 msgstr "Kursiver Text"
 
-#: ui/composer-editor.ui:148
+#: ui/composer-editor.ui:133
 msgid "Underline text"
 msgstr "Unterstrichener Text"
 
-#: ui/composer-editor.ui:172
+#: ui/composer-editor.ui:155
 msgid "Strikethrough text"
 msgstr "Durchgestrichener Text"
 
-#: ui/composer-editor.ui:205
+#: ui/composer-editor.ui:185
 msgid "Insert bulleted list"
 msgstr "Ungeordnete Liste einfügen"
 
-#: ui/composer-editor.ui:229
+#: ui/composer-editor.ui:207
 msgid "Insert numbered list"
 msgstr "Nummerierte Liste einfügen"
 
-#: ui/composer-editor.ui:262
+#: ui/composer-editor.ui:237
 msgid "Indent or quote text"
 msgstr "Text einrücken oder zitieren"
 
-#: ui/composer-editor.ui:286
+#: ui/composer-editor.ui:259
 msgid "Un-indent or unquote text"
 msgstr "Zitierung oder Einrückung aufheben"
 
-#: ui/composer-editor.ui:315
+#: ui/composer-editor.ui:286
 msgid "Remove text formatting"
 msgstr "Formatierung löschen"
 
-#: ui/composer-editor.ui:334
+#: ui/composer-editor.ui:303
 msgid "Change font type"
 msgstr "Schriftart ändern"
 
-#: ui/composer-editor.ui:349
+#: ui/composer-editor.ui:315
 msgid "Sans Serif"
 msgstr "Sans Serif"
 
-#: ui/composer-editor.ui:360
+#: ui/composer-editor.ui:325
 msgid "Serif"
 msgstr "Serif"
 
-#: ui/composer-editor.ui:371
+#: ui/composer-editor.ui:335
 msgid "Fixed Width"
 msgstr "Feste Breite"
 
-#: ui/composer-editor.ui:397
+#: ui/composer-editor.ui:359
 msgid "Change font color"
 msgstr "Schriftfarbe ändern"
 
-#: ui/composer-editor.ui:412
+#: ui/composer-editor.ui:372
 msgid "Change font size"
 msgstr "Schriftgröße ändern"
 
-#: ui/composer-editor.ui:447
+#: ui/composer-editor.ui:402
 msgid "Insert or update text link"
 msgstr "Verweis in Auswahl einfügen oder aktualisieren"
 
-#: ui/composer-editor.ui:471
+#: ui/composer-editor.ui:424
 msgid "Insert an image"
 msgstr "Bild einfügen"
 
-#: ui/composer-editor.ui:513
+#: ui/composer-editor.ui:463
 msgid "Undo last edit"
 msgstr "Letzte Bearbeitung rückgängig machen"
 
-#: ui/composer-editor.ui:537
+#: ui/composer-editor.ui:485
 msgid "Redo last edit"
 msgstr "Letzte Bearbeitung wiederholen"
 
-#: ui/composer-editor.ui:566 ui/composer-editor.ui:591
+#: ui/composer-editor.ui:512 ui/composer-editor.ui:534
 msgid "Attach a file"
 msgstr "Datei anhängen"
 
-#: ui/composer-editor.ui:615
+#: ui/composer-editor.ui:556
 msgid "Add original attachments"
 msgstr "Ursprüngliche Anhänge hinzufügen"
 
-#: ui/composer-editor.ui:660
+#: ui/composer-editor.ui:598
 msgid "More options"
 msgstr "Weitere Einstellungen"
 
-#: ui/composer-editor.ui:680
+#: ui/composer-editor.ui:617
 msgid "Show formatting toolbar"
 msgstr "Formatierung-Werkzeugleiste einblenden"
 
-#: ui/composer-editor.ui:698
+#: ui/composer-editor.ui:634
 msgid "Select spell checking languages"
 msgstr "Sprachen für Rechtschreibprüfung auswählen"
 
-#: ui/composer-editor.ui:723
+#: ui/composer-editor.ui:658
 msgid "S_ans Serif"
 msgstr "S_ans Serif"
 
-#: ui/composer-editor.ui:728
+#: ui/composer-editor.ui:663
 msgid "S_erif"
 msgstr "S_erif"
 
-#: ui/composer-editor.ui:733
+#: ui/composer-editor.ui:668
 msgid "_Fixed Width"
 msgstr "_Feste Breite"
 
-#: ui/composer-editor.ui:743
+#: ui/composer-editor.ui:678
 msgid "_Small"
 msgstr "_Klein"
 
-#: ui/composer-editor.ui:748
+#: ui/composer-editor.ui:683
 msgid "_Medium"
 msgstr "_Normal"
 
-#: ui/composer-editor.ui:753
+#: ui/composer-editor.ui:688
 msgid "Lar_ge"
 msgstr "Gr_oß"
 
-#: ui/composer-editor.ui:763
+#: ui/composer-editor.ui:698
 msgid "_Rich Text"
 msgstr "_Formatierter Text"
 
-#: ui/composer-editor.ui:768
+#: ui/composer-editor.ui:703
 msgid "_Plain Text"
 msgstr "_Einfacher Text"
 
@@ -3116,97 +3080,69 @@ msgstr "Alles _auswählen"
 msgid "_Inspect…"
 msgstr "_Untersuchen …"
 
-#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
+#: ui/composer-headerbar.ui:20 ui/composer-headerbar.ui:96
 msgid "Detach the composer from the window"
 msgstr "»Verfassen«-Fenster abkoppeln"
 
-#: ui/composer-headerbar.ui:135
+#: ui/composer-headerbar.ui:123
 msgid "_Send"
 msgstr "_Senden"
 
-#: ui/composer-headerbar.ui:162
+#: ui/composer-headerbar.ui:147
 msgid "Discard and Close"
 msgstr "Verwerfen und schließen"
 
-#: ui/composer-headerbar.ui:186
+#: ui/composer-headerbar.ui:169
 msgid "Save and Close"
 msgstr "Speichern und schließen"
 
 #. Note that this button and the Update button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:42
+#: ui/composer-link-popover.ui:38
 msgid "Insert the new link with this URL"
 msgstr "Den neuen Verweis mit dieser Adresse einfügen"
 
-#: ui/composer-link-popover.ui:43
+#: ui/composer-link-popover.ui:39
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ui/composer-link-popover.ui:47
+#: ui/composer-link-popover.ui:43
 msgid "Link URL"
 msgstr "Verweisadresse"
 
 #. Note that this button and the Insert button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:61
+#: ui/composer-link-popover.ui:56
 msgid "Update this link’s URL"
 msgstr "Die Adresse dieses Verweises aktualisieren"
 
-#: ui/composer-link-popover.ui:62
+#: ui/composer-link-popover.ui:57
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: ui/composer-link-popover.ui:75
+#: ui/composer-link-popover.ui:69
 msgid "Delete this link"
 msgstr "Diesen Verweis löschen"
 
-#. Geary account mail will be sent from
-#: ui/composer-widget.ui:61
-#, fuzzy
-#| msgid "_From:"
-msgid "_From"
-msgstr "_Von:"
-
-#. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:131
-msgid "_To"
-msgstr "_An"
-
-#: ui/composer-widget.ui:159
-msgid "Show Cc, Bcc, and Reply-To fields"
-msgstr "Felder »Kopie«, »Blindkopie« und »Antwort an« einblenden"
-
-#: ui/composer-widget.ui:220
-msgid "_Cc"
-msgstr "_Kopie"
-
-#: ui/composer-widget.ui:268
-msgid "_Bcc"
-msgstr "_Blindkopie"
-
-#: ui/composer-widget.ui:316
-msgid "_Reply-To"
-msgstr "_Antwort an"
-
-#: ui/composer-widget.ui:373
-msgid "_Subject"
-msgstr "_Betreff"
-
-#: ui/composer-widget.ui:446
+#: ui/composer-widget.ui:119
 msgid "Drop files here"
 msgstr "Dateien hier ablegen"
 
-#: ui/composer-widget.ui:462
+#: ui/composer-widget.ui:134
 msgid "To add them as attachments"
 msgstr "Als Anhang einfügen"
 
-#: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
+#: ui/composer-widget.ui:217
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "Felder »Kopie«, »Blindkopie« und »Antwort an« einblenden"
+
+#: ui/components-attachment-pane.ui:25 ui/components-attachment-pane.ui:41
 msgid "Select all attachments"
 msgstr "Alle Anhänge auswählen"
 
-#: ui/components-attachment-pane.ui:66
+#: ui/components-attachment-pane.ui:58
 msgid "Save selected attachments"
 msgstr "Ausgewählte Anhänge speichern"
 
-#: ui/components-attachment-pane.ui:85
+#: ui/components-attachment-pane.ui:75
 msgid "Open selected attachments"
 msgstr "Ausgewählte Anhänge öffnen"
 
@@ -3214,118 +3150,135 @@ msgstr "Ausgewählte Anhänge öffnen"
 msgid "Save _All"
 msgstr "A_lle speichern"
 
-#: ui/components-inspector-error-view.ui:31
-#, fuzzy
-#| msgid ""
-#| "If the problem is serious or persists, please save and send these details "
-#| "to the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing "
-#| "list</a> or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/";
-#| "ReportingABug\">new bug report</a>."
+#: ui/components-conversation-actions.ui:76
+msgid "Reply"
+msgstr "Antworten"
+
+#: ui/components-conversation-actions.ui:97
+msgid "Reply All"
+msgstr "Allen antworten"
+
+#: ui/components-conversation-actions.ui:118
+msgid "Forward"
+msgstr "Weiterleiten"
+
+#: ui/components-conversation-actions.ui:147
+msgid "_Archive"
+msgstr "_Archivieren"
+
+#: ui/components-conversation-actions.ui:191
+msgid "Toggle find bar"
+msgstr "Suchleiste anzeigen/verbergen"
+
+#: ui/components-conversation-header-bar.ui:20 ui/main-toolbar.ui:76
+msgid "Back"
+msgstr "Zurück"
+
+#: ui/components-inspector-error-view.ui:27
 msgid ""
 "If the problem is serious or persists, please save and send these details to "
 "one of the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>contact "
 "channels</a> or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/";
 "ReportingABug\">new bug report</a>."
 msgstr ""
-"Falls das Problem schwerwiegend ist oder weiterhin besteht, kopieren Sie "
-"diese Details und senden Sie sie an die <a href=\"https://wiki.gnome.org/";
-"Apps/Geary/Contact\">Mailingliste</a> oder erstellen Sie einen <a href="
-"\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>neuen Fehlerbericht</a>."
+"Falls das Problem schwerwiegend ist oder weiterhin besteht, speichern und "
+"senden Sie diese Details bitte über eine der <a href=\"https://wiki.gnome.";
+"org/Apps/Geary/Contact\">Kontaktmöglichkeiten</a> oder erstellen Sie einen "
+"<a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>neuen "
+"Fehlerbericht</a>."
 
-#: ui/components-inspector-error-view.ui:47
+#: ui/components-inspector-error-view.ui:42
 msgid "Details:"
 msgstr "Details:"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:24
+#: ui/components-inspector.ui:16 ui/problem-details-dialog.ui:21
 msgid "Search for matching log entries"
 msgstr "Nach übereinstimmenden Protokolleinträgen suchen"
 
 #. Tooltip for inspector button
-#: ui/components-inspector.ui:35
+#: ui/components-inspector.ui:30
 msgid "Toggle appending new log entries"
 msgstr "Neue Protokolleinträge anfügen/nicht anfügen"
 
 #. Tooltip for inspector button
-#: ui/components-inspector.ui:55
+#: ui/components-inspector.ui:48
 msgid "Add a marker entry to the log"
-msgstr ""
+msgstr "Eine Markierung zum Protokoll hinzufügen"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:81 ui/problem-details-dialog.ui:51
+#: ui/components-inspector.ui:71 ui/problem-details-dialog.ui:45
 msgid "Save logs entries and details"
 msgstr "Protokolleinträge und -details speichern"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:101 ui/problem-details-dialog.ui:67
+#: ui/components-inspector.ui:89 ui/problem-details-dialog.ui:60
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"
 
 #. Tooltip for inspector button
-#: ui/components-inspector.ui:121
-#, fuzzy
-#| msgid "Search for matching log entries"
+#: ui/components-inspector.ui:107
 msgid "Clears all log entries"
-msgstr "Nach übereinstimmenden Protokolleinträgen suchen"
+msgstr "Leert alle Protokolleinträge"
 
-#: ui/conversation-contact-popover.ui:146
+#: ui/conversation-contact-popover.ui:132
 msgid "New Conversation…"
 msgstr "Neue Konversation …"
 
-#: ui/conversation-contact-popover.ui:159
+#: ui/conversation-contact-popover.ui:144
 msgid "Copy Email Address"
 msgstr "E-Mail-Adresse kopieren"
 
-#: ui/conversation-contact-popover.ui:182
+#: ui/conversation-contact-popover.ui:165
 msgid "Save in Contacts…"
 msgstr "In Kontakte speichern …"
 
-#: ui/conversation-contact-popover.ui:195
+#: ui/conversation-contact-popover.ui:177
 msgid "Show Conversations"
 msgstr "Konversationen anzeigen"
 
-#: ui/conversation-contact-popover.ui:208
+#: ui/conversation-contact-popover.ui:189
 msgid "Open in Contacts"
 msgstr "In Kontakte öffnen"
 
-#: ui/conversation-contact-popover.ui:221
+#: ui/conversation-contact-popover.ui:201
 msgid "Always Load Remote Images"
-msgstr "Entfernte Bilder immer anzeigen"
+msgstr "Externe Bilder immer anzeigen"
 
 #. Title label on contact popover
-#: ui/conversation-contact-popover.ui:264
+#: ui/conversation-contact-popover.ui:240
 msgid "Deceptive email address"
 msgstr "Trügerische E-Mail-Adresse"
 
 #. Contact popover label
-#: ui/conversation-contact-popover.ui:294
+#: ui/conversation-contact-popover.ui:268
 msgid "This email address is:"
 msgstr "Diese E-Mail-Adresse lautet:"
 
 #. Contact popover label
-#: ui/conversation-contact-popover.ui:319
+#: ui/conversation-contact-popover.ui:291
 msgid "But was forged as:"
 msgstr "Aber wurde gefälscht als:"
 
 #. Contact popover label
-#: ui/conversation-contact-popover.ui:344
+#: ui/conversation-contact-popover.ui:314
 msgid "The sender may not be trustworthy"
 msgstr "Der Absender ist eventuell nicht vertrauenswürdig"
 
-#: ui/conversation-email.ui:27
+#: ui/conversation-email.ui:24
 msgid "Save all attachments"
 msgstr "Alle Anhänge speichern"
 
 #. Note: The application will never show this button at the same time as unstar_button, one will always be 
hidden.
-#: ui/conversation-email.ui:50
+#: ui/conversation-email.ui:45
 msgid "Mark this message as starred"
 msgstr "Diese Nachricht mit einem Stern markieren"
 
 #. Note: The application will never show this button at the same time as star_button, one will always be 
hidden.
-#: ui/conversation-email.ui:72
+#: ui/conversation-email.ui:65
 msgid "Mark this message as not starred"
 msgstr "Sternmarkierung von dieser Nachricht entfernen"
 
@@ -3366,23 +3319,23 @@ msgstr "Nachricht _löschen …"
 msgid "_View Source"
 msgstr "_Quelltext anzeigen"
 
-#: ui/conversation-message-link-popover.ui:54
+#: ui/conversation-message-link-popover.ui:49
 msgid "But actually goes to:"
 msgstr "Aber führt tatsächlich zu:"
 
-#: ui/conversation-message-link-popover.ui:84
+#: ui/conversation-message-link-popover.ui:77
 msgid "The link appears to go to:"
 msgstr "Dieser Verweis scheint zu folgender Seite zu führen:"
 
-#: ui/conversation-message-link-popover.ui:96
+#: ui/conversation-message-link-popover.ui:88
 msgid "Deceptive link found"
 msgstr "Trügerischer Verweis gefunden"
 
-#: ui/conversation-message-link-popover.ui:111
+#: ui/conversation-message-link-popover.ui:102
 msgid "The email sender may be leading you to the wrong web site."
 msgstr "Der Absender der E-Mail könnte Sie zur falschen Webseite leiten."
 
-#: ui/conversation-message-link-popover.ui:124
+#: ui/conversation-message-link-popover.ui:114
 msgid "If unsure, contact the sender and ask before continuing."
 msgstr ""
 "Falls Sie unsicher sind, kontaktieren Sie den Absender und fragen Sie, bevor "
@@ -3412,395 +3365,373 @@ msgstr "_Bild speichern unter …"
 msgid "_Select All"
 msgstr "Alles _auswählen"
 
-#: ui/conversation-message.ui:63
+#: ui/conversation-message.ui:54
 msgid "From <email>"
 msgstr "Von <email>"
 
-#: ui/conversation-message.ui:79 ui/conversation-message.ui:178
+#: ui/conversation-message.ui:69 ui/conversation-message.ui:160
 msgid "1/1/1970\t"
 msgstr "1.1.1970\t"
 
-#: ui/conversation-message.ui:102
+#: ui/conversation-message.ui:91
 msgid "Preview body text."
 msgstr "Nachrichtenvorschau anzeigen."
 
-#: ui/conversation-message.ui:202
+#: ui/conversation-message.ui:182
 msgid "Sent by:"
 msgstr "Gesendet von:"
 
-#: ui/conversation-message.ui:247
+#: ui/conversation-message.ui:223
 msgid "Reply to:"
 msgstr "Antwort an:"
 
-#: ui/conversation-message.ui:291
+#: ui/conversation-message.ui:264
 msgid "Subject"
 msgstr "Betreff"
 
-#: ui/conversation-viewer.ui:60
+#: ui/conversation-viewer.ui:53
 msgid "Find in conversation"
 msgstr "In Konversation suchen"
 
-#: ui/conversation-viewer.ui:75
+#: ui/conversation-viewer.ui:67
 msgid "Find the previous occurrence of the search string."
 msgstr "Vorhergehende Übereinstimmungen mit dem Suchtext finden."
 
-#: ui/conversation-viewer.ui:96
+#: ui/conversation-viewer.ui:86
 msgid "Find the next occurrence of the search string."
 msgstr "Nächste Übereinstimmung mit dem Suchtext finden."
 
-#: ui/find_bar.glade:66
+#: ui/find_bar.glade:58
 msgid "Find:"
 msgstr "Suchen:"
 
-#: ui/find_bar.glade:89
+#: ui/find_bar.glade:80
 msgid "_Previous"
 msgstr "_Vorige"
 
-#: ui/find_bar.glade:107
+#: ui/find_bar.glade:97
 msgid "_Next"
 msgstr "_Nächste"
 
-#: ui/find_bar.glade:125
+#: ui/find_bar.glade:114
 msgid "_Case sensitive"
 msgstr "_Groß-/ Kleinschreibung"
 
-#: ui/find_bar.glade:145
+#: ui/find_bar.glade:132
 msgid "label"
 msgstr "Beschriftung"
 
-#: ui/gtk/help-overlay.ui:9
+#: ui/gtk/help-overlay.ui:8
 msgid "Conversation Shortcuts"
 msgstr "Tastenkombinationen für Konversationen"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:377
+#: ui/gtk/help-overlay.ui:12 ui/gtk/help-overlay.ui:194
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "Aktionen"
 
-#: ui/gtk/help-overlay.ui:17
+#: ui/gtk/help-overlay.ui:16
 msgctxt "shortcut window"
 msgid "New conversation"
 msgstr "Neue Konversation"
 
-#: ui/gtk/help-overlay.ui:24
+#: ui/gtk/help-overlay.ui:23
 msgctxt "shortcut window"
 msgid "Reply to sender"
 msgstr "Absender antworten"
 
-#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:281
+#: ui/gtk/help-overlay.ui:30 ui/gtk/help-overlay.ui:450
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "Allen antworten"
 
-#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:288
+#: ui/gtk/help-overlay.ui:37 ui/gtk/help-overlay.ui:457
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:295
+#: ui/gtk/help-overlay.ui:44 ui/gtk/help-overlay.ui:464
 msgctxt "shortcut window"
 msgid "Un-mark/mark read"
 msgstr "Als ungelesen/gelesen markieren"
 
-#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:302
+#: ui/gtk/help-overlay.ui:51 ui/gtk/help-overlay.ui:471
 msgctxt "shortcut window"
 msgid "Mark/un-mark starred"
 msgstr "Markieren/Markierung entfernen"
 
-#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:309
+#: ui/gtk/help-overlay.ui:58 ui/gtk/help-overlay.ui:478
 msgctxt "shortcut window"
 msgid "Archive conversations"
 msgstr "Konversationen archivieren"
 
-#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:326
+#: ui/gtk/help-overlay.ui:65 ui/gtk/help-overlay.ui:495
 msgctxt "shortcut window"
 msgid "Move conversations"
 msgstr "Konversationen verschieben"
 
-#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:333
+#: ui/gtk/help-overlay.ui:72 ui/gtk/help-overlay.ui:502
 msgctxt "shortcut window"
 msgid "Label conversations"
 msgstr "Konversationen eine Beschriftung zuweisen"
 
-#: ui/gtk/help-overlay.ui:80
+#: ui/gtk/help-overlay.ui:79
 msgctxt "shortcut window"
 msgid "Trash conversations"
 msgstr "Konversationen in den Papierkorb verschieben"
 
-#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:340
+#: ui/gtk/help-overlay.ui:86 ui/gtk/help-overlay.ui:509
 msgctxt "shortcut window"
 msgid "Junk conversations"
 msgstr "Konversationen in den Spam-Ordner verschieben"
 
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:347
+#: ui/gtk/help-overlay.ui:94 ui/gtk/help-overlay.ui:516
 msgctxt "shortcut window"
 msgid "Delete conversations"
 msgstr "Konversationen löschen"
 
-#: ui/gtk/help-overlay.ui:104
+#: ui/gtk/help-overlay.ui:103
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "Suchen"
 
-#: ui/gtk/help-overlay.ui:108
+#: ui/gtk/help-overlay.ui:107
 msgctxt "shortcut window"
 msgid "Search for conversations"
 msgstr "Nach Konversationen suchen"
 
-#: ui/gtk/help-overlay.ui:115 ui/gtk/help-overlay.ui:354
+#: ui/gtk/help-overlay.ui:114 ui/gtk/help-overlay.ui:523
 msgctxt "shortcut window"
 msgid "Find in current conversation"
 msgstr "In aktueller Konversation suchen"
 
-#: ui/gtk/help-overlay.ui:141
+#: ui/gtk/help-overlay.ui:140
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "Rückgängig machen"
 
-#: ui/gtk/help-overlay.ui:145
+#: ui/gtk/help-overlay.ui:144
 msgctxt "shortcut window"
 msgid "Undo the last action"
 msgstr "Letzte Aktion rückgängig machen"
 
-#: ui/gtk/help-overlay.ui:152
+#: ui/gtk/help-overlay.ui:151
 msgctxt "shortcut window"
 msgid "Redo the last action"
 msgstr "Letzte Aktion wiederholen"
 
-#: ui/gtk/help-overlay.ui:161
+#: ui/gtk/help-overlay.ui:160
 msgctxt "shortcut window"
 msgid "View"
 msgstr "Betrachten"
 
-#: ui/gtk/help-overlay.ui:165
+#: ui/gtk/help-overlay.ui:164
 msgctxt "shortcut window"
 msgid "Zoom in"
 msgstr "Ansicht vergrößern"
 
-#: ui/gtk/help-overlay.ui:172
+#: ui/gtk/help-overlay.ui:171
 msgctxt "shortcut window"
 msgid "Zoom out"
 msgstr "Ansicht verkleinern"
 
-#: ui/gtk/help-overlay.ui:179
+#: ui/gtk/help-overlay.ui:178
 msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "Vergrößerung zurücksetzen"
 
-#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:404
-msgctxt "shortcut window"
-msgid "General"
-msgstr "Allgemein"
-
-#: ui/gtk/help-overlay.ui:192
-msgctxt "shortcut window"
-msgid "Show help"
-msgstr "Hilfe anzeigen"
-
-#: ui/gtk/help-overlay.ui:199
-msgctxt "shortcut window"
-msgid "Show keyboard shortcuts"
-msgstr "Tastenkombinationen anzeigen"
-
-#: ui/gtk/help-overlay.ui:206
-msgctxt "shortcut window"
-msgid "Open a new window"
-msgstr "Neues Fenster öffnen"
-
-#: ui/gtk/help-overlay.ui:213
-msgctxt "shortcut window"
-msgid "Close the current window"
-msgstr "Aktuelles Fenster schließen"
-
-#: ui/gtk/help-overlay.ui:220
-msgctxt "shortcut window"
-msgid "Quit the application"
-msgstr "Die Anwendung beenden"
-
-#: ui/gtk/help-overlay.ui:229
-msgctxt "shortcut window"
-msgid "Keyboard navigation"
-msgstr "Tastatur-Navigation"
-
-#: ui/gtk/help-overlay.ui:233
-msgctxt "shortcut window"
-msgid "Go to next/previous pane"
-msgstr "Nächste/Vorherige Leiste anzeigen"
-
-#: ui/gtk/help-overlay.ui:241
-msgctxt "shortcut window"
-msgid "Select next/previous conversation"
-msgstr "Nächste/Vorherige Konversation auswählen"
-
-#: ui/gtk/help-overlay.ui:248
-msgctxt "shortcut window"
-msgid "Focus next/previous message"
-msgstr "Nächste/Vorherige Nachricht fokussieren"
-
-#: ui/gtk/help-overlay.ui:260
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Single-key shortcuts"
-msgid "Single-key Shortcuts"
-msgstr "Einfache Tastenkürzel"
-
-#: ui/gtk/help-overlay.ui:265
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Single-key shortcuts"
-msgctxt "shortcut window"
-msgid "Single-key shortcuts (if enabled)"
-msgstr "Einfache Tastenkürzel"
-
-#: ui/gtk/help-overlay.ui:274
-msgctxt "shortcut window"
-msgid "Reply to sender "
-msgstr "Absender antworten "
-
-#: ui/gtk/help-overlay.ui:361
-msgctxt "shortcut window"
-msgid "Select next/previous conversations"
-msgstr "Nächste/Vorherige Konversationen auswählen"
-
-#: ui/gtk/help-overlay.ui:373
+#: ui/gtk/help-overlay.ui:190
 msgid "Composer Shortcuts"
 msgstr "Tastenkombinationen beim Verfassen"
 
-#: ui/gtk/help-overlay.ui:381
+#: ui/gtk/help-overlay.ui:198
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "Senden"
 
-#: ui/gtk/help-overlay.ui:388
+#: ui/gtk/help-overlay.ui:205
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "Anhang hinzufügen"
 
-#: ui/gtk/help-overlay.ui:395
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Detach composer window"
+#: ui/gtk/help-overlay.ui:212
 msgctxt "shortcut window"
 msgid "Detach the composer"
 msgstr "»Verfassen«-Fenster abkoppeln"
 
-#: ui/gtk/help-overlay.ui:408
+#: ui/gtk/help-overlay.ui:221 ui/gtk/help-overlay.ui:350
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Allgemein"
+
+#: ui/gtk/help-overlay.ui:225
 msgctxt "shortcut window"
 msgid "Close composer window"
 msgstr "»Verfassen«-Fenster schließen"
 
-#: ui/gtk/help-overlay.ui:415
+#: ui/gtk/help-overlay.ui:232
 msgctxt "shortcut window"
 msgid "Detach composer window"
 msgstr "»Verfassen«-Fenster abkoppeln"
 
-#: ui/gtk/help-overlay.ui:422
+#: ui/gtk/help-overlay.ui:239
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Bearbeitung"
 
-#: ui/gtk/help-overlay.ui:427
+#: ui/gtk/help-overlay.ui:244
 msgctxt "shortcut window"
 msgid "Move selection to the clipboard"
 msgstr "Auswahl in die Zwischenablage legen"
 
-#: ui/gtk/help-overlay.ui:434
+#: ui/gtk/help-overlay.ui:251
 msgctxt "shortcut window"
 msgid "Copy selection to clipboard"
 msgstr "Auswahl kopieren"
 
-#: ui/gtk/help-overlay.ui:441
+#: ui/gtk/help-overlay.ui:258
 msgctxt "shortcut window"
 msgid "Paste from the clipboard"
 msgstr "Zwischenablage einfügen"
 
-#: ui/gtk/help-overlay.ui:448
+#: ui/gtk/help-overlay.ui:265
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "Text einrücken"
 
-#: ui/gtk/help-overlay.ui:455
+#: ui/gtk/help-overlay.ui:272
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "Einrückung aufheben"
 
-#: ui/gtk/help-overlay.ui:464
+#: ui/gtk/help-overlay.ui:281
 msgctxt "shortcut window"
 msgid "Rich text editing"
 msgstr "Formatierter Text"
 
-#: ui/gtk/help-overlay.ui:468
+#: ui/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Paste without formatting"
 msgstr "Ohne Formatierung einfügen"
 
-#: ui/gtk/help-overlay.ui:475
+#: ui/gtk/help-overlay.ui:292
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Fetter Text"
 
-#: ui/gtk/help-overlay.ui:482
+#: ui/gtk/help-overlay.ui:299
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Kursiver Text"
 
-#: ui/gtk/help-overlay.ui:489
+#: ui/gtk/help-overlay.ui:306
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Unterstrichener Text"
 
-#: ui/gtk/help-overlay.ui:496
+#: ui/gtk/help-overlay.ui:313
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Durchgestrichener Text"
 
-#: ui/gtk/help-overlay.ui:503
+#: ui/gtk/help-overlay.ui:320
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Formatierung löschen"
 
-#: ui/gtk/help-overlay.ui:510
+#: ui/gtk/help-overlay.ui:327
 msgctxt "shortcut window"
 msgid "Insert an image"
 msgstr "Bild einfügen"
 
-#: ui/gtk/help-overlay.ui:517
+#: ui/gtk/help-overlay.ui:334
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "Einen Verweis einfügen"
 
-#: ui/main-toolbar.ui:24
-msgctxt "tooltip"
-msgid "Compose Message"
-msgstr "Nachricht verfassen"
+#: ui/gtk/help-overlay.ui:346
+msgid "Application Shortcuts"
+msgstr "Tastenkürzel"
 
-#: ui/main-toolbar.ui:62
-msgid "Toggle search bar"
-msgstr "Suchleiste anzeigen/verbergen"
+#: ui/gtk/help-overlay.ui:354
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr "Hilfe anzeigen"
 
-#: ui/main-toolbar.ui:114
-msgid "Reply"
-msgstr "Antworten"
+#: ui/gtk/help-overlay.ui:361
+msgctxt "shortcut window"
+msgid "Show keyboard shortcuts"
+msgstr "Tastenkombinationen anzeigen"
 
-#: ui/main-toolbar.ui:137
-msgid "Reply All"
-msgstr "Allen antworten"
+#: ui/gtk/help-overlay.ui:368
+msgctxt "shortcut window"
+msgid "Open a new window"
+msgstr "Neues Fenster öffnen"
 
-#: ui/main-toolbar.ui:160
-msgid "Forward"
-msgstr "Weiterleiten"
+#: ui/gtk/help-overlay.ui:375
+msgctxt "shortcut window"
+msgid "Close the current window"
+msgstr "Aktuelles Fenster schließen"
 
-#: ui/main-toolbar.ui:265
-msgid "Toggle find bar"
-msgstr "Suchleiste anzeigen/verbergen"
+#: ui/gtk/help-overlay.ui:382
+msgctxt "shortcut window"
+msgid "Quit the application"
+msgstr "Die Anwendung beenden"
 
-#: ui/main-toolbar.ui:286
-msgid "_Archive"
-msgstr "_Archivieren"
+#: ui/gtk/help-overlay.ui:391
+msgctxt "shortcut window"
+msgid "Keyboard navigation"
+msgstr "Tastatur-Navigation"
+
+#: ui/gtk/help-overlay.ui:395
+msgctxt "shortcut window"
+msgid "Select Inbox"
+msgstr "Postfach auswählen"
+
+#: ui/gtk/help-overlay.ui:402
+msgctxt "shortcut window"
+msgid "Go to next/previous pane"
+msgstr "Nächste/Vorherige Leiste anzeigen"
+
+#: ui/gtk/help-overlay.ui:410
+msgctxt "shortcut window"
+msgid "Select next/previous conversation"
+msgstr "Nächste/Vorherige Konversation auswählen"
+
+#: ui/gtk/help-overlay.ui:417
+msgctxt "shortcut window"
+msgid "Focus next/previous message"
+msgstr "Nächste/Vorherige Nachricht fokussieren"
+
+#: ui/gtk/help-overlay.ui:429
+msgid "Single-key Shortcuts"
+msgstr "Einfache Tastenkürzel"
+
+#: ui/gtk/help-overlay.ui:434
+msgctxt "shortcut window"
+msgid "Single-key shortcuts (if enabled)"
+msgstr "Einfache Tastenkürzel (falls aktiviert)"
+
+#: ui/gtk/help-overlay.ui:443
+msgctxt "shortcut window"
+msgid "Reply to sender "
+msgstr "Absender antworten "
+
+#: ui/gtk/help-overlay.ui:530
+msgctxt "shortcut window"
+msgid "Select next/previous conversations"
+msgstr "Nächste/Vorherige Konversationen auswählen"
+
+#: ui/main-toolbar.ui:93
+msgctxt "tooltip"
+msgid "Compose Message"
+msgstr "Nachricht verfassen"
+
+#: ui/main-toolbar.ui:109
+msgid "Toggle search bar"
+msgstr "Suchleiste anzeigen/verbergen"
 
 #: ui/main-toolbar-menus.ui:21
-#, fuzzy
-#| msgid "Toggle as S_pam"
 msgid "Toggle as _Junk"
 msgstr "S_pam-Markierung umschalten"
 
@@ -3816,25 +3747,73 @@ msgstr "_Tastenkombinationen"
 msgid "_About Geary"
 msgstr "_Info zu Geary"
 
-#: ui/password-dialog.glade:74
+#: ui/password-dialog.glade:66
 msgid "SMTP Credentials"
 msgstr "SMTP-Einstellungen"
 
-#: ui/password-dialog.glade:91
+#: ui/password-dialog.glade:82
 msgid "Username"
 msgstr "Benutzername"
 
-#: ui/password-dialog.glade:152
+#: ui/password-dialog.glade:140
 msgid "_Remember password"
 msgstr "_Passwort speichern"
 
-#: ui/password-dialog.glade:210
+#: ui/password-dialog.glade:195
 msgid "_Authenticate"
 msgstr "_Legitimieren"
 
-#: ui/upgrade_dialog.glade:60
-msgid "Geary update in progress…"
-msgstr "Aktualisierung von Geary wird durchgeführt …"
+#~ msgid "Position of folder list pane"
+#~ msgstr "Position der Ordnerliste"
+
+#~ msgid "Position of the folder list Paned grabber."
+#~ msgstr "Position des Teilfensters mit der Ordnerliste."
+
+#~ msgid "Position of folder list pane when horizontal"
+#~ msgstr "Position der Ordnerliste im horizontalen Modus"
+
+#~ msgid ""
+#~ "Position of the folder list Paned grabber in the horizontal orientation."
+#~ msgstr ""
+#~ "Position des Teilfensters mit der Ordnerliste in horizontaler Ausrichtung."
+
+#~ msgid "Position of folder list pane when vertical"
+#~ msgstr "Position der Ordnerliste im vertikalen Modus"
+
+#~ msgid ""
+#~ "Position of the folder list Paned grabber in the vertical orientation."
+#~ msgstr ""
+#~ "Position des Teilfensters mit der Ordnerliste in vertikaler Ausrichtung."
+
+#~ msgid "Orientation of the folder list pane"
+#~ msgstr "Ausrichtung der Ordnerliste"
+
+#~ msgid "True if the folder list Paned is in the horizontal orientation."
+#~ msgstr "Horizontale Ausrichtung des Ordnerliste-Teilfensters."
+
+#~ msgid "Position of message list pane"
+#~ msgstr "Position der Nachrichtenliste"
+
+#~ msgid "Position of the message list Paned grabber."
+#~ msgstr "Position des Teilfensters mit der Nachrichtenliste."
+
+#~ msgid "Use _three pane view"
+#~ msgstr "_Dreispaltige Ansicht verwenden"
+
+#~ msgid "%a, %b %-e, %Y at %l:%M %P"
+#~ msgstr "%a, %-e. %b %Y um %l:%M %P"
+
+#~ msgid "%a, %b %-e, %Y at %H:%M"
+#~ msgstr "%a, %-e. %b %Y um %H:%M"
+
+#~ msgid "Confirm removing: %s"
+#~ msgstr "Entfernen bestätigen: %s"
+
+#~ msgid "Remove account"
+#~ msgstr "Konto entfernen"
+
+#~ msgid "_Reply-To"
+#~ msgstr "_Antwort an"
 
 #~ msgid "Log periodic activity"
 #~ msgstr "Regelmäßige Aktivitäten protokollieren"
@@ -4156,10 +4135,6 @@ msgstr "Aktualisierung von Geary wird durchgeführt …"
 #~ msgid "Mark unread"
 #~ msgstr "Als ungelesen markieren"
 
-#~ msgctxt "shortcut window"
-#~ msgid "Additional Shortcuts"
-#~ msgstr "Weitere Tastenkombinationen"
-
 #~ msgctxt "shortcut window"
 #~ msgid "Unstar"
 #~ msgstr "Stern entfernen"