diff --git a/po/de.po b/po/de.po
index c8557c79..7d75dd78 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@
 # noxan <noxan@byteweaver.net>, 2013
 # rageltus <rageltus@gmail.com>, 2012
 # Benjamin Steinwender <b@stbe.at>, 2014.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2016-2017.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2016-2018.
 # Wolfgang Stöggl <c72578@yahoo.de>, 2016.
 #
 msgid ""
@@ -20,8 +20,8 @@ msgstr ""
 "Project-Id-Version: geary master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=geary&keywords=I18N+L10N&component=internationalization\n"
-"POT-Creation-Date: 2017-11-18 19:25+0000\n"
-"PO-Revision-Date: 2017-11-18 21:05+0100\n"
+"POT-Creation-Date: 2018-02-13 02:40+0000\n"
+"PO-Revision-Date: 2018-02-18 16:32+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
@@ -29,7 +29,7 @@ msgstr ""
 "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.0.3\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
@@ -140,7 +140,7 @@ msgstr "Geary zeigt den Editor für formatierten Text"
 msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 msgstr "Mail;E-Mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 
-#: desktop/org.gnome.Geary.desktop.in:20 ui/gtk/menus.ui:7
+#: desktop/org.gnome.Geary.desktop.in:21 ui/gtk/menus.ui:7
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
@@ -165,7 +165,7 @@ msgid "Maximize window"
 msgstr "Fenster maximieren"
 
 #: desktop/org.gnome.Geary.gschema.xml:21
-msgid "True if library application is maximized, false otherwise."
+msgid "True if the application window is maximized, false otherwise."
 msgstr "Legt fest, ob das Anwendungsfenster maximiert werden soll."
 
 #: desktop/org.gnome.Geary.gschema.xml:26
@@ -487,7 +487,7 @@ msgstr "Copyright 2016-2017 Geary-Entwicklerteam."
 msgid "Visit the Geary web site"
 msgstr "Geary-Webseite besuchen"
 
-#: src/client/application/geary-application.vala:424
+#: src/client/application/geary-application.vala:428
 #, c-format
 msgid "About %s"
 msgstr "Info zu %s"
@@ -495,7 +495,7 @@ 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/geary-application.vala:428
+#: src/client/application/geary-application.vala:432
 msgid "translator-credits"
 msgstr ""
 "Benjamin Steinwender <b@stbe.at>\n"
@@ -585,15 +585,15 @@ msgstr "Die Befehlszeilenargumente konnten nicht interpretiert werden: %s\n"
 msgid "Unrecognized command line option “%s”\n"
 msgstr "Unbekanntes Befehlszeilenargument »%s«\n"
 
-#: src/client/application/geary-controller.vala:616
+#: src/client/application/geary-controller.vala:627
 msgid "Unable to store server trust exception"
 msgstr "Ausnahme für Serververtrauen konnte nicht gespeichert werden"
 
-#: src/client/application/geary-controller.vala:851
+#: src/client/application/geary-controller.vala:862
 msgid "Your settings are insecure"
 msgstr "Ihre Einstellungen sind unsicher"
 
-#: src/client/application/geary-controller.vala:852
+#: src/client/application/geary-controller.vala:863
 msgid ""
 "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
 "username and password could be read by another person on the network.  Are "
@@ -604,29 +604,17 @@ msgstr ""
 "anderen Personen im selben Netzwerk gelesen werden können. Sind Sie sicher, "
 "dass Sie dies tun möchten?"
 
-#: src/client/application/geary-controller.vala:853
+#: src/client/application/geary-controller.vala:864
 msgid "Co_ntinue"
 msgstr "_Weiter"
 
-#: src/client/application/geary-controller.vala:900
-msgid "Error connecting to the server"
-msgstr "Fehler bei der Verbindung mit dem Server"
-
-#: src/client/application/geary-controller.vala:901
-msgid ""
-"Geary encountered an error while connecting to the server.  Please try again "
-"in a few moments."
-msgstr ""
-"Während des Verbindungsaufbaus zum Server ist ein Fehler aufgetreten. Bitte "
-"versuchen Sie es in einigen Momenten erneut."
-
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: src/client/application/geary-controller.vala:938
+#: src/client/application/geary-controller.vala:977
 #: src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Fehler beim Senden der E-Mail"
 
-#: src/client/application/geary-controller.vala:939
+#: src/client/application/geary-controller.vala:978
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -636,12 +624,12 @@ msgstr ""
 
 #. Displayed in the space-limited status bar when a message fails to be uploaded
 #. to Sent Mail after being sent.
-#: src/client/application/geary-controller.vala:943
+#: src/client/application/geary-controller.vala:982
 #: src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Fehler beim Speichern der gesendeten E-Mail"
 
-#: src/client/application/geary-controller.vala:944
+#: src/client/application/geary-controller.vala:983
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -649,19 +637,19 @@ msgstr ""
 "Beim Speichern einer gesendeten E-Mail trat ein Fehler auf. Die Nachricht "
 "bleibt im Postausgang, bis Sie sie löschen."
 
-#: src/client/application/geary-controller.vala:1013
+#: src/client/application/geary-controller.vala:1056
 msgid "Labels"
 msgstr "Beschriftungen"
 
 #. give the user two options: reset the Account local store, or exit Geary.  A third
 #. could be done to leave the Account in an unopened state, but we don't currently
 #. have provisions for that.
-#: src/client/application/geary-controller.vala:1025
+#: src/client/application/geary-controller.vala:1068
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Die Datenbank für %s konnte nicht geöffnet werden"
 
-#: src/client/application/geary-controller.vala:1026
+#: src/client/application/geary-controller.vala:1069
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -686,20 +674,20 @@ msgstr ""
 "dazugehörigen Anhänge verloren. <b>E-Mails auf Ihrem Server werden nicht "
 "betroffen sein.</b>"
 
-#: src/client/application/geary-controller.vala:1028
+#: src/client/application/geary-controller.vala:1071
 msgid "_Rebuild"
 msgstr "_Wiederherstellen"
 
-#: src/client/application/geary-controller.vala:1028
+#: src/client/application/geary-controller.vala:1071
 msgid "E_xit"
 msgstr "B_eenden"
 
-#: src/client/application/geary-controller.vala:1037
+#: src/client/application/geary-controller.vala:1080
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Die Datenbank für »%s« konnte nicht wiederhergestellt werden"
 
-#: src/client/application/geary-controller.vala:1038
+#: src/client/application/geary-controller.vala:1081
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -712,14 +700,14 @@ msgstr ""
 
 #. some other problem opening the account ... as with other flow path, can't run
 #. Geary today with an account in unopened state, so have to exit
-#: src/client/application/geary-controller.vala:1060
-#: src/client/application/geary-controller.vala:1070
-#: src/client/application/geary-controller.vala:1081
+#: src/client/application/geary-controller.vala:1103
+#: src/client/application/geary-controller.vala:1113
+#: src/client/application/geary-controller.vala:1124
 #, c-format
 msgid "Unable to open local mailbox for %s"
 msgstr "Das lokale Postfach für %s konnte nicht geöffnet werden"
 
-#: src/client/application/geary-controller.vala:1061
+#: src/client/application/geary-controller.vala:1104
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -738,7 +726,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/client/application/geary-controller.vala:1071
+#: src/client/application/geary-controller.vala:1114
 msgid ""
 "The version number of the local mail database is formatted for a newer "
 "version of Geary. Unfortunately, the database cannot be “rolled back” to "
@@ -753,7 +741,7 @@ msgstr ""
 "Bitte installieren Sie die neueste Version von Geary und versuchen Sie es "
 "erneut."
 
-#: src/client/application/geary-controller.vala:1082
+#: src/client/application/geary-controller.vala:1125
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -765,15 +753,15 @@ msgstr ""
 "\n"
 "Bitte überprüfen Sie Ihre Verbindung und starten Sie Geary neu."
 
-#: src/client/application/geary-controller.vala:1869
+#: src/client/application/geary-controller.vala:1944
 msgid "Undo move (Ctrl+Z)"
 msgstr "Verschieben rückgängig machen (Strg+Z)"
 
-#: src/client/application/geary-controller.vala:1879
+#: src/client/application/geary-controller.vala:1954
 msgid "Are you sure you want to open these attachments?"
 msgstr "Möchten Sie wirklich diese Anhänge öffnen?"
 
-#: src/client/application/geary-controller.vala:1880
+#: src/client/application/geary-controller.vala:1955
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -781,16 +769,16 @@ msgstr ""
 "Anhänge können Ihr System beschädigen, wenn diese geöffnet werden. Öffnen "
 "Sie nur Dateien aus vertrauenswürdigen Quellen."
 
-#: src/client/application/geary-controller.vala:1881
+#: src/client/application/geary-controller.vala:1956
 msgid "Don’t _ask me again"
 msgstr "Nicht _noch einmal fragen"
 
-#: src/client/application/geary-controller.vala:1977
+#: src/client/application/geary-controller.vala:2052
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Die Datei »%s« existiert schon. Möchten Sie diese ersetzen?"
 
-#: src/client/application/geary-controller.vala:1979
+#: src/client/application/geary-controller.vala:2054
 #, c-format
 msgid ""
 "The file already exists in “%s”.  Replacing it will overwrite its contents."
@@ -798,62 +786,62 @@ msgstr ""
 "Die Datei existiert bereits in »%s«. Beim Ersetzen wird die Datei "
 "überschrieben."
 
-#: src/client/application/geary-controller.vala:1982
+#: src/client/application/geary-controller.vala:2057
 msgid "_Replace"
 msgstr "_Ersetzen"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: src/client/application/geary-controller.vala:2217
-msgid "Close open draft messages?"
-msgstr "Offene Nachrichtenentwürfe schließen?"
+#: src/client/application/geary-controller.vala:2297
+msgid "Close the draft message?"
+msgid_plural "Close all draft messages?"
+msgstr[0] "Nachrichtenentwurf schließen?"
+msgstr[1] "Alle Nachrichtenentwürfe schließen?"
 
-#: src/client/application/geary-controller.vala:2343
+#: src/client/application/geary-controller.vala:2423
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Alle E-Mails aus dem Ordner %s löschen?"
 
-#: src/client/application/geary-controller.vala:2344
+#: src/client/application/geary-controller.vala:2424
 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/geary-controller.vala:2345
+#: src/client/application/geary-controller.vala:2425
 msgid "This cannot be undone."
 msgstr "Dies kann nicht rückgängig gemacht werden."
 
-#: src/client/application/geary-controller.vala:2346
+#: src/client/application/geary-controller.vala:2426
 #, c-format
 msgid "Empty %s"
 msgstr "%s leeren"
 
-#: src/client/application/geary-controller.vala:2363
+#: src/client/application/geary-controller.vala:2443
 #, c-format
 msgid "Error emptying %s"
 msgstr "Fehler beim Leeren von %s"
 
-#: src/client/application/geary-controller.vala:2393
+#: src/client/application/geary-controller.vala:2475
 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/geary-controller.vala:2395
+#: src/client/application/geary-controller.vala:2477
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/client/application/geary-controller.vala:2427
+#: src/client/application/geary-controller.vala:2509
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Archivieren rückgängig (Strg+Z)"
 
-#: src/client/application/geary-controller.vala:2442
+#: src/client/application/geary-controller.vala:2524
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Papierkorb rückgängig (Strg+Z)"
 
-#: src/client/application/geary-controller.vala:2498
+#: src/client/application/geary-controller.vala:2580
 msgid "Undo (Ctrl+Z)"
 msgstr "Rückgängig (Strg+Z)"
 
-#: src/client/application/geary-controller.vala:2616
+#: src/client/application/geary-controller.vala:2692
 msgid "Failed to open default text editor."
 msgstr "Der Standard-Texteditor konnte nicht geöffnet werden."
 
@@ -906,11 +894,211 @@ msgstr "Konversation verschieben"
 msgid "Move conversations"
 msgstr "Konversationen verschieben"
 
-#: src/client/components/main-window.vala:384
+#: src/client/components/main-window.vala:397
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:54
+#, c-format
+msgid "Problem connecting to incoming server for %s"
+msgstr "Fehler bei der Verbindung mit dem Eingangsserver für %s"
+
+#. Translators: String substitution is the server name
+#: src/client/components/main-window-info-bar.vala:56
+#: src/client/components/main-window-info-bar.vala:64
+#, c-format
+msgid ""
+"Could not connect to %s, check your Internet access and the server name and "
+"try again"
+msgstr ""
+"Verbindung zu %s war nicht möglich, überprüfen Sie Ihre Internetverbindung "
+"und den Servernamen und versuchen Sie es erneut"
+
+#: src/client/components/main-window-info-bar.vala:57
+#: src/client/components/main-window-info-bar.vala:66
+msgid "Retry connecting now"
+msgstr "Jetzt neu verbinden"
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:62
+#, c-format
+msgid "Problem connecting to outgoing server for %s"
+msgstr "Fehler bei der Verbindung mit dem Ausgangsserver für %s"
+
+#: src/client/components/main-window-info-bar.vala:65
+msgid "Try reconnecting now"
+msgstr "Jetzt neu verbinden"
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:71
+#, c-format
+msgid "Problem with connection to incoming server for %s"
+msgstr "Fehler bei der Verbindung mit dem Eingangsserver für %s"
+
+#. Translators: String substitution is the server name
+#: src/client/components/main-window-info-bar.vala:73
+#: src/client/components/main-window-info-bar.vala:81
+#, c-format
+msgid "Network error talking to %s, check your Internet access and try again"
+msgstr ""
+"Netzwerkfehler bei der Kommunikation mit %s, bitte überprüfen Sie Ihre "
+"Internetverbindung und versuchen Sie es erneut"
+
+#: src/client/components/main-window-info-bar.vala:74
+#: src/client/components/main-window-info-bar.vala:82
+#: src/client/components/main-window-info-bar.vala:90
+#: src/client/components/main-window-info-bar.vala:98
+#: src/client/components/main-window-info-bar.vala:119
+msgid "Try reconnecting"
+msgstr "Erneuter Verbindungsversuch"
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:79
+#, c-format
+msgid "Problem with connection to outgoing server for %s"
+msgstr "Fehler bei der Verbindung mit dem Eingangsserver für %s"
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:87
+#, c-format
+msgid "Problem communicating with incoming server for %s"
+msgstr "Problem bei der Kommunikation mit dem Eingangsserver für %s"
+
+#. Translators: String substitution is the server name
+#: src/client/components/main-window-info-bar.vala:89
+#, c-format
+msgid ""
+"Geary did not understand a message from %s or vice versa, please file a bug "
+"report"
+msgstr ""
+"Geary verstand eine Meldung von %s nicht oder umgekehrt, bitte erstellen Sie "
+"einen Fehlerbericht"
+
+#: src/client/components/main-window-info-bar.vala:94
+msgid "Problem communicating with outgoing mail server"
+msgstr "Problem bei der Kommunikation mit dem Ausgangsserver"
+
+#. Translators: First string substitution is the server
+#. name, second is the account name
+#: src/client/components/main-window-info-bar.vala:97
+#, c-format
+msgid ""
+"Could not communicate with %s for %s, check the server name and try again in "
+"a moment"
+msgstr ""
+"Kommunikation mit %s für %s war nicht möglich, überprüfen Sie den "
+"Servernamen und versuchen Sie es in Kürze erneut"
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:103
+#, c-format
+msgid "Incoming mail server password required for %s"
+msgstr "Serverpasswort für %s ist für eingehende Nachrichten erforderlich"
+
+#: src/client/components/main-window-info-bar.vala:104
+msgid "Messages cannot be received without the correct password."
+msgstr "Nachrichten können nicht ohne das korrekte Passwort abgerufen werden."
+
+#: src/client/components/main-window-info-bar.vala:105
+msgid "Retry receiving email, you will be prompted for a password"
+msgstr ""
+"Erneut versuchen, Nachrichten abzurufen, Sie werden nach einem Passwort "
+"gefragt"
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:110
+#, c-format
+msgid "Outgoing mail server password required for %s"
+msgstr "Serverpasswort für %s ist für ausgehende Nachrichten erforderlich"
+
+#: src/client/components/main-window-info-bar.vala:111
+msgid "Messages cannot be sent without the correct password."
+msgstr "Nachrichten können nicht ohne das korrekte Passwort versendet werden."
+
+#: src/client/components/main-window-info-bar.vala:112
+msgid "Retry sending queued messages, you will be prompted for a password"
+msgstr ""
+"Erneut versuchen, in der Warteschlange befindliche Nachrichten zu versenden, "
+"Sie werden nach einem Passwort gefragt"
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:117
+#, c-format
+msgid "A problem occurred checking mail for %s"
+msgstr "Ein Problem ist beim Prüfen auf neue Nachrichten für %s aufgetreten"
+
+#: src/client/components/main-window-info-bar.vala:118
+#: src/client/components/main-window-info-bar.vala:125
+msgid "Something went wrong, please file a bug report if the problem persists"
+msgstr ""
+"Etwas ging schief, bitte senden Sie einen Fehlerbericht, wenn das Problem "
+"weiterhin besteht"
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:124
+#, c-format
+msgid "A problem occurred sending mail for %s"
+msgstr "Ein Problem ist beim Senden von Nachrichten für %s aufgetreten"
+
+#: src/client/components/main-window-info-bar.vala:126
+msgid "Retry sending queued messages"
+msgstr "Versuchen, Nachrichten in der Warteschlange erneut zu senden"
+
+#: src/client/components/main-window-info-bar.vala:137
+msgid "A database problem has occurred"
+msgstr "Ein Datenbankproblem ist aufgetreten"
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:139
+#, c-format
+msgid "Messages for %s must be downloaded again."
+msgstr "Nachrichten für %s müssen erneut heruntergeladen werden."
+
+#: src/client/components/main-window-info-bar.vala:152
+msgid "Geary has encountered a problem"
+msgstr "Geary ist auf ein Problem gestoßen"
+
+#: src/client/components/main-window-info-bar.vala:153
+msgid ""
+"Please check the technical details and report the problem if it persists."
+msgstr ""
+"Bitte überprüfen Sie die technischen Details und melden Sie den Fehler, "
+"falls das Problem weiterhin besteht."
+
+#: src/client/components/main-window-info-bar.vala:161
+msgid "_Details"
+msgstr "_Details"
+
+#: src/client/components/main-window-info-bar.vala:162
+msgid "View technical details about the error"
+msgstr "Technische Details zum Fehler anzeigen"
+
+#: src/client/components/main-window-info-bar.vala:166
+msgid "_Retry"
+msgstr "_Wiederholen"
+
+#: src/client/components/main-window-info-bar.vala:253
+msgid "Details"
+msgstr "Details"
+
+#: src/client/components/main-window-info-bar.vala:266
+#: src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Schließen"
+
+#: src/client/components/main-window-info-bar.vala:270
+msgid "Copy to Clipboard"
+msgstr "In die Zwischenablage kopieren"
+
+#: src/client/components/main-window-info-bar.vala:273
+msgid ""
+"Copy technical details to clipboard for pasting into an email or bug report"
+msgstr ""
+"Technische Details zum Einfügen in eine E-Mail oder einen Fehlerbericht in "
+"die Zwischenablage einfügen"
+
 #: src/client/components/search-bar.vala:8
 #: src/client/folder-list/folder-list-search-branch.vala:38
 #: src/engine/api/geary-special-folder-type.vala:51
@@ -951,10 +1139,6 @@ msgstr "_Abbrechen"
 msgid "_About"
 msgstr "_Info"
 
-#: src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Schließen"
-
 #: src/client/components/stock.vala:24
 msgid "_Discard"
 msgstr "_Verwerfen"
@@ -1001,23 +1185,23 @@ msgstr "Ungültige Verweisadresse"
 msgid "Invalid email address"
 msgstr "Ungültige E-Mail-Adresse"
 
-#: src/client/composer/composer-widget.vala:154
+#: src/client/composer/composer-widget.vala:158
 msgid "Saved"
 msgstr "Gespeichert"
 
-#: src/client/composer/composer-widget.vala:155
+#: src/client/composer/composer-widget.vala:159
 msgid "Saving"
 msgstr "Wird gespeichert"
 
-#: src/client/composer/composer-widget.vala:156
+#: src/client/composer/composer-widget.vala:160
 msgid "Error saving"
 msgstr "Fehler beim Speichern"
 
-#: src/client/composer/composer-widget.vala:157
+#: src/client/composer/composer-widget.vala:161
 msgid "Press Backspace to delete quote"
 msgstr "Rücktaste drücken, um die Einrückung zu entfernen"
 
-#: src/client/composer/composer-widget.vala:158
+#: src/client/composer/composer-widget.vala:162
 msgid "New Message"
 msgstr "Neue Nachricht"
 
@@ -1025,7 +1209,7 @@ msgstr "Neue Nachricht"
 #. characters, that suggest an attachment; since this is full-word
 #. checking, include all variants of each word.  No spaces are
 #. allowed.
-#: src/client/composer/composer-widget.vala:167
+#: src/client/composer/composer-widget.vala:171
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1033,28 +1217,37 @@ msgstr ""
 "Anhang|Anhänge|angehängt|anhängen|Wiedervorlage|Beilage|beilegen|Anlage|"
 "anbei|beigefügt|anhängend"
 
-#: src/client/composer/composer-widget.vala:1131
-#: src/client/composer/composer-widget.vala:1150
-msgid "Do you want to discard this message?"
-msgstr "Möchten Sie diese Nachricht verwerfen?"
+#. 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:1130
+msgid "Do you want to keep or discard this draft message?"
+msgstr "Möchten Sie diesen Nachrichtenentwurf behalten oder verwerfen?"
 
-#: src/client/composer/composer-widget.vala:1254
+#. 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:1158
+msgid "Do you want to discard this draft message?"
+msgstr "Möchten Sie diesen Nachrichtenentwurf verwerfen?"
+
+#: src/client/composer/composer-widget.vala:1266
 msgid "Send message with an empty subject and body?"
 msgstr "Nachricht ohne Betreff und Inhalt senden?"
 
-#: src/client/composer/composer-widget.vala:1256
+#: src/client/composer/composer-widget.vala:1268
 msgid "Send message with an empty subject?"
 msgstr "Nachricht ohne Betreff senden?"
 
-#: src/client/composer/composer-widget.vala:1258
+#: src/client/composer/composer-widget.vala:1270
 msgid "Send message with an empty body?"
 msgstr "Nachricht ohne Inhalt senden?"
 
-#: src/client/composer/composer-widget.vala:1262
+#: src/client/composer/composer-widget.vala:1274
 msgid "Send message without an attachment?"
 msgstr "Nachricht ohne Anhang senden?"
 
-#: src/client/composer/composer-widget.vala:1524
+#: src/client/composer/composer-widget.vala:1536
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "»%s« ist bereits als Anhang ausgewählt worden."
@@ -1064,73 +1257,73 @@ msgstr "»%s« ist bereits als Anhang ausgewählt worden."
 #. description of the document type, the second will
 #. be a human-friendly size string. For example:
 #. Document (100.9MB)
-#: src/client/composer/composer-widget.vala:1532
+#: src/client/composer/composer-widget.vala:1544
 #: src/client/conversation-viewer/conversation-email.vala:138
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: src/client/composer/composer-widget.vala:1569
+#: src/client/composer/composer-widget.vala:1581
 #, c-format
 msgid "“%s” could not be found."
 msgstr "»%s« konnte nicht gefunden werden."
 
-#: src/client/composer/composer-widget.vala:1575
+#: src/client/composer/composer-widget.vala:1587
 #, c-format
 msgid "“%s” is a folder."
 msgstr "»%s« ist ein Ordner."
 
-#: src/client/composer/composer-widget.vala:1581
+#: src/client/composer/composer-widget.vala:1593
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "»%s« ist eine leere Datei."
 
-#: src/client/composer/composer-widget.vala:1594
+#: src/client/composer/composer-widget.vala:1606
 #, 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:1602
+#: src/client/composer/composer-widget.vala:1614
 msgid "Cannot add attachment"
 msgstr "Anhang kann nicht hinzugefügt werden"
 
-#: src/client/composer/composer-widget.vala:1654
+#: src/client/composer/composer-widget.vala:1666
 msgid "To: "
 msgstr "An: "
 
-#: src/client/composer/composer-widget.vala:1657
+#: src/client/composer/composer-widget.vala:1669
 msgid "Cc: "
 msgstr "Kopie: "
 
-#: src/client/composer/composer-widget.vala:1660
+#: src/client/composer/composer-widget.vala:1672
 msgid "Bcc: "
 msgstr "Blindkopie: "
 
-#: src/client/composer/composer-widget.vala:1663
+#: src/client/composer/composer-widget.vala:1675
 msgid "Reply-To: "
 msgstr "Antwort an: "
 
-#: src/client/composer/composer-widget.vala:1795
+#: src/client/composer/composer-widget.vala:1808
 msgid "Select Color"
 msgstr "Farbe auswählen"
 
 #. Displayed in the From dropdown to indicate an "alternate email address"
 #. for an account.  The first 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:1995
+#: src/client/composer/composer-widget.vala:2016
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s über %2$s"
 
 #. Composer label (with mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
-#: src/client/composer/composer-widget.vala:2037
+#: src/client/composer/composer-widget.vala:2062
 msgid "_From:"
 msgstr "_Von:"
 
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2262
+#: src/client/composer/composer-widget.vala:2287
 msgid "Images"
 msgstr "Bilder"
 
@@ -1194,23 +1387,27 @@ msgstr "Mir"
 msgid "Unknown"
 msgstr "Unbekannt"
 
+#: src/client/conversation-viewer/conversation-message.vala:60
+msgid "This email address may have been forged"
+msgstr "Diese E-Mail-Adresse könnte gefälscht sein"
+
 #. Preview headers
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: src/client/conversation-viewer/conversation-message.vala:325
+#: src/client/conversation-viewer/conversation-message.vala:329
 msgid "No sender"
 msgstr "Kein Absender"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the header preview for a message.
-#: src/client/conversation-viewer/conversation-message.vala:580
+#: src/client/conversation-viewer/conversation-message.vala:583
 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:701
+#: src/client/conversation-viewer/conversation-message.vala:682
 msgid "Image"
 msgstr "Bild"
 
@@ -1501,7 +1698,7 @@ msgstr "Gestern"
 msgid "%A"
 msgstr "%A"
 
-#: src/client/util/util-email.vala:30 src/engine/rfc822/rfc822-message.vala:908
+#: src/client/util/util-email.vala:30 src/engine/rfc822/rfc822-message.vala:891
 msgid "(no subject)"
 msgstr "(kein Betreff)"
 
@@ -1611,7 +1808,7 @@ msgstr "Nichts"
 #. 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-account.vala:101
+#: src/engine/imap-db/imap-db-account.vala:100
 msgctxt "Search operator"
 msgid "attachment"
 msgstr "Anhang"
@@ -1624,7 +1821,7 @@ msgstr "Anhang"
 #. 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-account.vala:110
+#: src/engine/imap-db/imap-db-account.vala:109
 msgctxt "Search operator"
 msgid "bcc"
 msgstr "Blindkopie"
@@ -1636,7 +1833,7 @@ msgstr "Blindkopie"
 #. 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-account.vala:118
+#: src/engine/imap-db/imap-db-account.vala:117
 msgctxt "Search operator"
 msgid "body"
 msgstr "Nachricht"
@@ -1649,7 +1846,7 @@ msgstr "Nachricht"
 #. 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-account.vala:127
+#: src/engine/imap-db/imap-db-account.vala:126
 msgctxt "Search operator"
 msgid "cc"
 msgstr "Kopie"
@@ -1662,7 +1859,7 @@ msgstr "Kopie"
 #. 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-account.vala:136
+#: src/engine/imap-db/imap-db-account.vala:135
 msgctxt "Search operator"
 msgid "from"
 msgstr "von"
@@ -1674,7 +1871,7 @@ msgstr "von"
 #. 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-account.vala:144
+#: src/engine/imap-db/imap-db-account.vala:143
 msgctxt "Search operator"
 msgid "is"
 msgstr "ist"
@@ -1686,7 +1883,7 @@ msgstr "ist"
 #. 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-account.vala:152
+#: src/engine/imap-db/imap-db-account.vala:151
 msgctxt "Search operator"
 msgid "subject"
 msgstr "Betreff"
@@ -1699,7 +1896,7 @@ msgstr "Betreff"
 #. 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-account.vala:161
+#: src/engine/imap-db/imap-db-account.vala:160
 msgctxt "Search operator"
 msgid "to"
 msgstr "an"
@@ -1713,7 +1910,7 @@ msgstr "an"
 #. 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-account.vala:182
+#: src/engine/imap-db/imap-db-account.vala:181
 msgctxt "Search operator value - mail addressed to the user"
 msgid "me"
 msgstr "mich"
@@ -1726,7 +1923,7 @@ msgstr "mich"
 #. 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-account.vala:194
+#: src/engine/imap-db/imap-db-account.vala:193
 msgctxt "Search operator value - mail sent by the user"
 msgid "me"
 msgstr "mir"
@@ -1738,7 +1935,7 @@ msgstr "mir"
 #. 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-account.vala:206
+#: src/engine/imap-db/imap-db-account.vala:205
 msgctxt "'is:' search operator value"
 msgid "read"
 msgstr "gelesen"
@@ -1751,7 +1948,7 @@ msgstr "gelesen"
 #. 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-account.vala:217
+#: src/engine/imap-db/imap-db-account.vala:216
 msgctxt "'is:' search operator value"
 msgid "starred"
 msgstr "markiert"
@@ -1763,7 +1960,7 @@ msgstr "markiert"
 #. 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-account.vala:227
+#: src/engine/imap-db/imap-db-account.vala:226
 msgctxt "'is:' search operator value"
 msgid "unread"
 msgstr "ungelesen"
@@ -1772,7 +1969,7 @@ msgstr "ungelesen"
 #. 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:623
+#: src/engine/imap-engine/imap-engine-generic-account.vala:921
 msgid "Drafts | Draft"
 msgstr "Entwürfe | Entwurf"
 
@@ -1780,7 +1977,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:632
+#: src/engine/imap-engine/imap-engine-generic-account.vala:930
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 "Gesendet | Gesendete E-Mail | Gesendete E-Mails | Sent | Sent Mail | Sent "
@@ -1788,7 +1985,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:637
+#: src/engine/imap-engine/imap-engine-generic-account.vala:935
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Gesendete Objekte"
@@ -1797,7 +1994,7 @@ msgstr "Gesendete Objekte"
 #. 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:647
+#: src/engine/imap-engine/imap-engine-generic-account.vala:945
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -1809,13 +2006,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:657
+#: src/engine/imap-engine/imap-engine-generic-account.vala:955
 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:662
+#: src/engine/imap-engine/imap-engine-generic-account.vala:960
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Gelöschte Objekte"
@@ -1824,7 +2021,7 @@ 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:672
+#: src/engine/imap-engine/imap-engine-generic-account.vala:970
 msgid "Archive | Archives"
 msgstr "Archiv | Archive | Archive | Archives"
 
@@ -1933,31 +2130,31 @@ msgstr "Diesem Server _vertrauen"
 msgid "_Don’t Trust This Server"
 msgstr "Diesem Server _nicht vertrauen"
 
-#: ui/composer-headerbar.ui:26 ui/composer-headerbar.ui:138
+#: ui/composer-headerbar.ui:17 ui/composer-headerbar.ui:173
 msgid "Detach (Ctrl+D)"
 msgstr "Loslösen (Strg+D)"
 
-#: ui/composer-headerbar.ui:51 ui/composer-headerbar.ui:75
+#: ui/composer-headerbar.ui:56 ui/composer-headerbar.ui:82
 msgid "Attach File (Ctrl+T)"
 msgstr "Datei anhängen (Strg+T)"
 
-#: ui/composer-headerbar.ui:92
+#: ui/composer-headerbar.ui:106
 msgid "Include Original Attachments"
 msgstr "Ursprüngliche Anhänge übernehmen"
 
-#: ui/composer-headerbar.ui:162
-msgid "Send (Ctrl+Enter)"
-msgstr "Senden (Strg+Eingabetaste)"
-
-#: ui/composer-headerbar.ui:163
+#: ui/composer-headerbar.ui:201
 msgid "_Send"
 msgstr "_Senden"
 
-#: ui/composer-headerbar.ui:186
+#: ui/composer-headerbar.ui:206
+msgid "Send (Ctrl+Enter)"
+msgstr "Senden (Strg+Eingabetaste)"
+
+#: ui/composer-headerbar.ui:229
 msgid "Discard and Close"
 msgstr "Verwerfen und schließen"
 
-#: ui/composer-headerbar.ui:203
+#: ui/composer-headerbar.ui:253
 msgid "Save and Close"
 msgstr "Speichern und schließen"
 
@@ -2054,84 +2251,92 @@ msgid "_Inspect…"
 msgstr "_Untersuchen …"
 
 #. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:55
+#: ui/composer-widget.ui:56
 msgid "_To"
 msgstr "_An"
 
-#: ui/composer-widget.ui:74
+#: ui/composer-widget.ui:75
 msgid "_Cc"
 msgstr "_Kopie"
 
-#: ui/composer-widget.ui:129
+#: ui/composer-widget.ui:130
 msgid "_Subject"
 msgstr "_Betreff"
 
-#: ui/composer-widget.ui:148
+#: ui/composer-widget.ui:149
 msgid "_Bcc"
 msgstr "_Blindkopie"
 
-#: ui/composer-widget.ui:178
+#: ui/composer-widget.ui:179
 msgid "_Reply-To"
 msgstr "_Antwort an"
 
 #. Geary account mail will be sent from
-#: ui/composer-widget.ui:207
+#: ui/composer-widget.ui:208
 msgid "From"
 msgstr "Von"
 
-#: ui/composer-widget.ui:292
+#: ui/composer-widget.ui:293
 msgid "Drop files here"
 msgstr "Dateien hier ablegen"
 
-#: ui/composer-widget.ui:308
+#: ui/composer-widget.ui:309
 msgid "To add them as attachments"
 msgstr "Als Anhang einfügen"
 
-#: ui/composer-widget.ui:347
+#: ui/composer-widget.ui:348
 msgid "Undo last edit (Ctrl+Z)"
 msgstr "Letzte Bearbeitung rückgängig (Strg+Z)"
 
-#: ui/composer-widget.ui:371
+#: ui/composer-widget.ui:372
 msgid "Redo last edit  (Ctrl+Shift+Z)"
 msgstr "Letzte Bearbeitung wiederholen (Umschalt+Strg+Z)"
 
-#: ui/composer-widget.ui:409
+#: ui/composer-widget.ui:410
 msgid "Bold (Ctrl+B)"
 msgstr "Fett (Strg+B)"
 
-#: ui/composer-widget.ui:433
+#: ui/composer-widget.ui:434
 msgid "Italic (Ctrl+I)"
 msgstr "Kursiv (Strg+I)"
 
-#: ui/composer-widget.ui:457
+#: ui/composer-widget.ui:458
 msgid "Underline (Ctrl+U)"
 msgstr "Unterstrichen (Strg+U)"
 
-#: ui/composer-widget.ui:481
+#: ui/composer-widget.ui:482
 msgid "Strikethrough (Ctrl+K)"
 msgstr "Durchgestrichen (Strg+K)"
 
-#: ui/composer-widget.ui:519
+#: ui/composer-widget.ui:520
+msgid "Insert unordered list"
+msgstr "Ungeordnete Liste einfügen"
+
+#: ui/composer-widget.ui:544
+msgid "Insert ordered list"
+msgstr "Geordnete Liste einfügen"
+
+#: ui/composer-widget.ui:582
 msgid "Quote text  (Ctrl+])"
 msgstr "Text einrücken (Strg+])"
 
-#: ui/composer-widget.ui:543
+#: ui/composer-widget.ui:606
 msgid "Unquote text  (Ctrl+[)"
 msgstr "Einrückung aufheben (Strg+[)"
 
-#: ui/composer-widget.ui:581
+#: ui/composer-widget.ui:644
 msgid "Insert or update selection link (Ctrl+L)"
 msgstr "Verweis in Auswahl einfügen oder aktualisieren (Strg+L)"
 
-#: ui/composer-widget.ui:605
+#: ui/composer-widget.ui:668
 msgid "Insert an image (Ctrl+G)"
 msgstr "Bild einfügen (Strg+G)"
 
-#: ui/composer-widget.ui:639
+#: ui/composer-widget.ui:702
 msgid "Remove selection formatting (Ctrl+Space)"
 msgstr "Formatierung der Auswahl löschen (Strg+Leertaste)"
 
-#: ui/composer-widget.ui:663
+#: ui/composer-widget.ui:726
 msgid "Select spell checking languages"
 msgstr "Sprachen für Rechtschreibprüfung auswählen"
 
@@ -2746,31 +2951,31 @@ msgstr "Speicher"
 msgid "_Download mail"
 msgstr "_Mail herunterladen"
 
-#: ui/main-toolbar.ui:50
+#: ui/main-toolbar.ui:51
 msgid "Toggle search bar"
 msgstr "Suchleiste anzeigen/verbergen"
 
-#: ui/main-toolbar.ui:70
+#: ui/main-toolbar.ui:72
 msgid "Empty Spam or Trash folders"
 msgstr "Spam oder Papierkorb leeren"
 
-#: ui/main-toolbar.ui:109
+#: ui/main-toolbar.ui:112
 msgid "Reply"
 msgstr "Antworten"
 
-#: ui/main-toolbar.ui:131
+#: ui/main-toolbar.ui:135
 msgid "Reply All"
 msgstr "Allen antworten"
 
-#: ui/main-toolbar.ui:153
+#: ui/main-toolbar.ui:158
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: ui/main-toolbar.ui:255
+#: ui/main-toolbar.ui:264
 msgid "Toggle find bar"
 msgstr "Suchleiste anzeigen/verbergen"
 
-#: ui/main-toolbar.ui:295
+#: ui/main-toolbar.ui:306
 msgid "_Archive"
 msgstr "_Archivieren"
 
@@ -2790,6 +2995,22 @@ msgstr "Als S_pam markieren"
 msgid "Mark as not S_pam"
 msgstr "S_pam-Markierung entfernen"
 
+#: ui/main-window-info-bar.ui:97
+msgid ""
+"If the problem is serious or persists, please copy and send these details to "
+"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\">mailing list</a> "
+"or file 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>."
+
+#: ui/main-window-info-bar.ui:113
+msgid "Details:"
+msgstr "Details:"
+
 #: ui/password-dialog.glade:74
 msgid "SMTP Credentials"
 msgstr "SMTP-Einstellungen"
@@ -2835,12 +3056,12 @@ msgid "Show _notifications for new mail"
 msgstr "Benachrichtigung bei _neuen E-Mails anzeigen"
 
 #: ui/preferences-dialog.ui:164
-msgid "Always _watch for new mail"
+msgid "_Watch for new mail when closed"
 msgstr "_Ständig nach neuen E-Mails prüfen"
 
 #: ui/preferences-dialog.ui:168
-msgid "Geary will run in the background and notify of new mail"
-msgstr "Geary im Hintergrund ausführen und bei neuen E-Mails benachrichtigen"
+msgid "Geary will keep running after all windows are closed"
+msgstr "Geary wird weiter ausgeführt, nachdem alle Fenster geschlossen wurden"
 
 #: ui/preferences-dialog.ui:195
 msgid "Preferences"
@@ -2865,7 +3086,7 @@ msgstr ""
 
 #: ui/remove_confirm.glade:80
 msgid "Nickname:"
-msgstr "Nickname:"
+msgstr "Spitzname:"
 
 #: ui/remove_confirm.glade:94
 msgid "Email address:"