diff --git a/po/de.po b/po/de.po
index b5891999..2c0cb73a 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.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2016, 2017.
 # Wolfgang Stöggl <c72578@yahoo.de>, 2016.
 #
 msgid ""
@@ -20,8 +20,8 @@ msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=geary&keywords=I18N+L10N&component=internationalization\n"
-"POT-Creation-Date: 2016-12-26 02:58+0000\n"
-"PO-Revision-Date: 2016-12-29 12:12+0100\n"
+"POT-Creation-Date: 2017-01-31 23:08+0000\n"
+"PO-Revision-Date: 2017-02-04 19:40+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
@@ -109,7 +109,7 @@ msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
 #: ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:20
+#: ../src/client/application/geary-application.vala:21
 msgid "Mail Client"
 msgstr "Mail-Client"
 
@@ -204,67 +204,67 @@ msgstr "4 Jahre zurück"
 msgid "Everything"
 msgstr "Alles"
 
-#: ../src/client/accounts/add-edit-page.vala:282
+#: ../src/client/accounts/add-edit-page.vala:283
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../src/client/accounts/add-edit-page.vala:284
+#: ../src/client/accounts/add-edit-page.vala:285
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../src/client/accounts/add-edit-page.vala:738
+#: ../src/client/accounts/add-edit-page.vala:739
 msgid "Remem_ber passwords"
 msgstr "Passwörter _merken"
 
-#: ../src/client/accounts/add-edit-page.vala:745 ../ui/login.glade.h:7
+#: ../src/client/accounts/add-edit-page.vala:746 ../ui/login.glade.h:7
 msgid "Remem_ber password"
 msgstr "Passwort _merken"
 
-#: ../src/client/accounts/add-edit-page.vala:779
+#: ../src/client/accounts/add-edit-page.vala:780
 msgid "Unable to validate:\n"
 msgstr "Bestätigung nicht möglich:\n"
 
-#: ../src/client/accounts/add-edit-page.vala:781
+#: ../src/client/accounts/add-edit-page.vala:782
 msgid "        • Invalid account nickname.\n"
 msgstr "        • Ungültiger Konto-Nickname.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:784
+#: ../src/client/accounts/add-edit-page.vala:785
 msgid "        • Email address already added to Geary.\n"
 msgstr "        • E-Mail-Adresse wurde bereits zu Geary hinzugefügt.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:788
+#: ../src/client/accounts/add-edit-page.vala:789
 msgid "        • IMAP connection error.\n"
 msgstr "        • IMAP-Verbindungsfehler.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:791
+#: ../src/client/accounts/add-edit-page.vala:792
 msgid "        • IMAP username or password incorrect.\n"
 msgstr "        • IMAP-Benutzername oder Passwort ungültig.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:794
+#: ../src/client/accounts/add-edit-page.vala:795
 msgid "        • SMTP connection error.\n"
 msgstr "        • SMTP-Verbindungsfehler.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:797
+#: ../src/client/accounts/add-edit-page.vala:798
 msgid "        • SMTP username or password incorrect.\n"
 msgstr "        • SMTP-Benutzername oder Passwort ungültig.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:801
+#: ../src/client/accounts/add-edit-page.vala:802
 msgid "        • Connection error.\n"
 msgstr "        • Verbindungsfehler.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:805
+#: ../src/client/accounts/add-edit-page.vala:806
 msgid "        • Username or password incorrect.\n"
 msgstr "        • IMAP-Benutzername oder Passwort ungültig.\n"
 
-#: ../src/client/application/geary-application.vala:21
+#: ../src/client/application/geary-application.vala:22
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: ../src/client/application/geary-application.vala:23
+#: ../src/client/application/geary-application.vala:24
 msgid "Visit the Geary web site"
 msgstr "Geary-Webseite besuchen"
 
-#: ../src/client/application/geary-application.vala:431
+#: ../src/client/application/geary-application.vala:445
 #, c-format
 msgid "About %s"
 msgstr "Info zu %s"
@@ -272,7 +272,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:435
+#: ../src/client/application/geary-application.vala:449
 msgid "translator-credits"
 msgstr ""
 "Benjamin Steinwender <b@stbe.at>\n"
@@ -335,7 +335,7 @@ msgstr "Alle Server-Zertifikate mit TLS-Warnungen widerrufen"
 
 #: ../src/client/application/geary-args.vala:27
 msgid "Perform a graceful quit"
-msgstr ""
+msgstr "Ordnungsgemäß beenden"
 
 #: ../src/client/application/geary-args.vala:28
 msgid "Display program version"
@@ -405,7 +405,7 @@ msgid "Mark as not S_pam"
 msgstr "S_pam-Markierung entfernen"
 
 #: ../src/client/application/geary-controller.vala:76
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:449
 msgid "Mark conversation"
 msgstr "Konversation markieren"
 
@@ -422,7 +422,7 @@ msgid "Add label to conversations"
 msgstr "Konversationen eine Beschriftung zuweisen"
 
 #: ../src/client/application/geary-controller.vala:80
-#: ../src/client/application/geary-controller.vala:471
+#: ../src/client/application/geary-controller.vala:488
 msgid "Move conversation"
 msgstr "Konversation verschieben"
 
@@ -430,95 +430,95 @@ msgstr "Konversation verschieben"
 msgid "Move conversations"
 msgstr "Konversationen verschieben"
 
-#: ../src/client/application/geary-controller.vala:434
+#: ../src/client/application/geary-controller.vala:451
 msgid "_Mark as…"
 msgstr "_Markieren als …"
 
-#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/application/geary-controller.vala:457
 msgid "Mark as _Read"
 msgstr "Als _gelesen markieren"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:463
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: ../src/client/application/geary-controller.vala:452
+#: ../src/client/application/geary-controller.vala:469
 msgid "_Star"
 msgstr "_Stern"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:474
 msgid "U_nstar"
 msgstr "_Stern entfernen"
 
-#: ../src/client/application/geary-controller.vala:467
+#: ../src/client/application/geary-controller.vala:484
 msgid "Add label"
 msgstr "Beschriftung zuweisen"
 
-#: ../src/client/application/geary-controller.vala:468
+#: ../src/client/application/geary-controller.vala:485
 msgid "_Label"
 msgstr "_Beschriftung"
 
-#: ../src/client/application/geary-controller.vala:472
+#: ../src/client/application/geary-controller.vala:489
 msgid "_Move"
 msgstr "_Verschieben"
 
-#: ../src/client/application/geary-controller.vala:476
+#: ../src/client/application/geary-controller.vala:493
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Neue Nachricht verfassen (Strg+N, N)"
 
-#: ../src/client/application/geary-controller.vala:480
+#: ../src/client/application/geary-controller.vala:497
 #: ../ui/conversation-email-menus.ui.h:1
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: ../src/client/application/geary-controller.vala:481
+#: ../src/client/application/geary-controller.vala:498
 msgid "Reply (Ctrl+R, R)"
 msgstr "Antworten (Strg+R, R)"
 
-#: ../src/client/application/geary-controller.vala:485
+#: ../src/client/application/geary-controller.vala:502
 msgid "R_eply All"
 msgstr "Allen _antworten"
 
-#: ../src/client/application/geary-controller.vala:486
+#: ../src/client/application/geary-controller.vala:503
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Allen antworten (Strg+Umschalt+R, Umschalt+R)"
 
-#: ../src/client/application/geary-controller.vala:491
+#: ../src/client/application/geary-controller.vala:508
 #: ../ui/conversation-email-menus.ui.h:3
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: ../src/client/application/geary-controller.vala:492
+#: ../src/client/application/geary-controller.vala:509
 msgid "Forward (Ctrl+L, F)"
 msgstr "Weiterleiten (Strg+L, F)"
 
-#: ../src/client/application/geary-controller.vala:522
+#: ../src/client/application/geary-controller.vala:539
 msgid "Empty _Spam…"
 msgstr "_Spam leeren …"
 
-#: ../src/client/application/geary-controller.vala:526
+#: ../src/client/application/geary-controller.vala:543
 msgid "Empty _Trash…"
 msgstr "_Papierkorb leeren …"
 
 #. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:558
+#: ../src/client/application/geary-controller.vala:575
 msgid "Toggle search bar"
 msgstr "Suchleiste anzeigen/verbergen"
 
 #. No callback is connected, since we bind the toggle button to the find bar visibility
-#: ../src/client/application/geary-controller.vala:563
+#: ../src/client/application/geary-controller.vala:580
 msgid "Toggle find bar"
 msgstr "Suchleiste anzeigen/verbergen"
 
-#: ../src/client/application/geary-controller.vala:741
+#: ../src/client/application/geary-controller.vala:758
 msgid "Unable to store server trust exception"
 msgstr "Ausnahme für Serververtrauen konnte nicht gespeichert werden"
 
-#: ../src/client/application/geary-controller.vala:976
+#: ../src/client/application/geary-controller.vala:993
 msgid "Your settings are insecure"
 msgstr "Ihre Einstellungen sind unsicher"
 
-#: ../src/client/application/geary-controller.vala:977
+#: ../src/client/application/geary-controller.vala:994
 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 "
@@ -529,15 +529,15 @@ 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:978
+#: ../src/client/application/geary-controller.vala:995
 msgid "Co_ntinue"
 msgstr "_Weiter"
 
-#: ../src/client/application/geary-controller.vala:1025
+#: ../src/client/application/geary-controller.vala:1042
 msgid "Error connecting to the server"
 msgstr "Fehler bei der Verbindung mit dem Server"
 
-#: ../src/client/application/geary-controller.vala:1026
+#: ../src/client/application/geary-controller.vala:1043
 msgid ""
 "Geary encountered an error while connecting to the server.  Please try again "
 "in a few moments."
@@ -546,12 +546,12 @@ msgstr ""
 "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:1063
+#: ../src/client/application/geary-controller.vala:1080
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Fehler beim Senden der E-Mail"
 
-#: ../src/client/application/geary-controller.vala:1064
+#: ../src/client/application/geary-controller.vala:1081
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -561,12 +561,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:1068
+#: ../src/client/application/geary-controller.vala:1085
 #: ../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:1069
+#: ../src/client/application/geary-controller.vala:1086
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -574,19 +574,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:1138
+#: ../src/client/application/geary-controller.vala:1155
 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:1150
+#: ../src/client/application/geary-controller.vala:1167
 #, 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:1151
+#: ../src/client/application/geary-controller.vala:1168
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -611,20 +611,20 @@ msgstr ""
 "dazugehörigen Anhänge verloren. <b>E-Mails auf Ihrem Server werden nicht "
 "betroffen sein.</b>"
 
-#: ../src/client/application/geary-controller.vala:1153
+#: ../src/client/application/geary-controller.vala:1170
 msgid "_Rebuild"
 msgstr "_Wiederherstellen"
 
-#: ../src/client/application/geary-controller.vala:1153
+#: ../src/client/application/geary-controller.vala:1170
 msgid "E_xit"
 msgstr "B_eenden"
 
-#: ../src/client/application/geary-controller.vala:1162
+#: ../src/client/application/geary-controller.vala:1179
 #, 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:1163
+#: ../src/client/application/geary-controller.vala:1180
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -637,14 +637,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:1185
-#: ../src/client/application/geary-controller.vala:1195
-#: ../src/client/application/geary-controller.vala:1206
+#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1212
+#: ../src/client/application/geary-controller.vala:1223
 #, 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:1186
+#: ../src/client/application/geary-controller.vala:1203
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -663,7 +663,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1196
+#: ../src/client/application/geary-controller.vala:1213
 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 "
@@ -678,7 +678,7 @@ msgstr ""
 "Bitte installieren Sie die neueste Version von Geary und versuchen Sie es "
 "erneut."
 
-#: ../src/client/application/geary-controller.vala:1207
+#: ../src/client/application/geary-controller.vala:1224
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -690,15 +690,15 @@ msgstr ""
 "\n"
 "Bitte überprüfen Sie Ihre Verbindung und starten Sie Geary neu."
 
-#: ../src/client/application/geary-controller.vala:1982
+#: ../src/client/application/geary-controller.vala:1999
 msgid "Undo move (Ctrl+Z)"
 msgstr "Verschieben rückgängig machen (Strg+Z)"
 
-#: ../src/client/application/geary-controller.vala:1992
+#: ../src/client/application/geary-controller.vala:2009
 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:1993
+#: ../src/client/application/geary-controller.vala:2010
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -706,16 +706,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:1994
+#: ../src/client/application/geary-controller.vala:2011
 msgid "Don’t _ask me again"
 msgstr "Nicht _noch einmal fragen"
 
-#: ../src/client/application/geary-controller.vala:2038
+#: ../src/client/application/geary-controller.vala:2055
 #, 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:2040
+#: ../src/client/application/geary-controller.vala:2057
 #, c-format
 msgid ""
 "The file already exists in “%s”.  Replacing it will overwrite its contents."
@@ -723,66 +723,66 @@ msgstr ""
 "Die Datei existiert bereits in »%s«. Beim Ersetzen wird die Datei "
 "überschrieben."
 
-#: ../src/client/application/geary-controller.vala:2043
+#: ../src/client/application/geary-controller.vala:2060
 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:2396
+#: ../src/client/application/geary-controller.vala:2403
 msgid "Close open draft messages?"
 msgstr "Offene Nachrichtenentwürfe schließen?"
 
-#: ../src/client/application/geary-controller.vala:2518
+#: ../src/client/application/geary-controller.vala:2525
 #, 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:2519
+#: ../src/client/application/geary-controller.vala:2526
 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:2520
+#: ../src/client/application/geary-controller.vala:2527
 msgid "This cannot be undone."
 msgstr "Dies kann nicht rückgängig gemacht werden."
 
-#: ../src/client/application/geary-controller.vala:2521
+#: ../src/client/application/geary-controller.vala:2528
 #, c-format
 msgid "Empty %s"
 msgstr "%s leeren"
 
-#: ../src/client/application/geary-controller.vala:2538
+#: ../src/client/application/geary-controller.vala:2545
 #, c-format
 msgid "Error emptying %s"
 msgstr "Fehler beim Leeren von %s"
 
-#: ../src/client/application/geary-controller.vala:2568
+#: ../src/client/application/geary-controller.vala:2575
 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:2570
+#: ../src/client/application/geary-controller.vala:2577
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../src/client/application/geary-controller.vala:2602
+#: ../src/client/application/geary-controller.vala:2609
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Archivieren rückgängig (Strg+Z)"
 
-#: ../src/client/application/geary-controller.vala:2617
+#: ../src/client/application/geary-controller.vala:2624
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Papierkorb rückgängig (Strg+Z)"
 
-#: ../src/client/application/geary-controller.vala:2671
+#: ../src/client/application/geary-controller.vala:2678
 msgid "Undo (Ctrl+Z)"
 msgstr "Rückgängig (Strg+Z)"
 
-#: ../src/client/application/geary-controller.vala:2802
+#: ../src/client/application/geary-controller.vala:2809
 msgid "Failed to open default text editor."
 msgstr "Der Standard-Texteditor konnte nicht geöffnet werden."
 
-#: ../src/client/components/main-window.vala:341
+#: ../src/client/components/main-window.vala:389
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -863,29 +863,45 @@ msgstr "_Entfernen"
 msgid "_Keep"
 msgstr "_Behalten"
 
-#: ../src/client/composer/composer-widget.vala:146
+#: ../src/client/composer/composer-link-popover.vala:150
+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:157
+msgid "Invalid link URL"
+msgstr "Ungültige Verweisadresse"
+
+#: ../src/client/composer/composer-link-popover.vala:157
+msgid "Invalid email address"
+msgstr "Ungültige E-Mail-Adresse"
+
+#: ../src/client/composer/composer-widget.vala:154
 msgid "Saved"
 msgstr "Gespeichert"
 
-#: ../src/client/composer/composer-widget.vala:147
+#: ../src/client/composer/composer-widget.vala:155
 msgid "Saving"
 msgstr "Wird gespeichert"
 
-#: ../src/client/composer/composer-widget.vala:148
+#: ../src/client/composer/composer-widget.vala:156
 msgid "Error saving"
 msgstr "Fehler beim Speichern"
 
-#: ../src/client/composer/composer-widget.vala:149
+#: ../src/client/composer/composer-widget.vala:157
 msgid "Press Backspace to delete quote"
 msgstr "Rücktaste drücken, um die Einrückung zu entfernen"
 
-#: ../src/client/composer/composer-widget.vala:150
+#: ../src/client/composer/composer-widget.vala:158
 msgid "New Message"
 msgstr "Neue Nachricht"
 
-#. A list of keywords, separated by pipe ("|") 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:208
+#. Translators: This is list of keywords, separated by pipe ("|")
+#. 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
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -893,48 +909,28 @@ msgstr ""
 "Anhang|Anhänge|angehängt|anhängen|Wiedervorlage|Beilage|beilegen|Anlage|"
 "anbei|beigefügt|anhängend"
 
-#: ../src/client/composer/composer-widget.vala:1192
-#: ../src/client/composer/composer-widget.vala:1196
+#: ../src/client/composer/composer-widget.vala:1120
+#: ../src/client/composer/composer-widget.vala:1139
 msgid "Do you want to discard this message?"
 msgstr "Möchten Sie diese Nachricht verwerfen?"
 
-#: ../src/client/composer/composer-widget.vala:1363
+#: ../src/client/composer/composer-widget.vala:1236
 msgid "Send message with an empty subject and body?"
 msgstr "Nachricht ohne Betreff und Inhalt senden?"
 
-#: ../src/client/composer/composer-widget.vala:1365
+#: ../src/client/composer/composer-widget.vala:1238
 msgid "Send message with an empty subject?"
 msgstr "Nachricht ohne Betreff senden?"
 
-#: ../src/client/composer/composer-widget.vala:1367
+#: ../src/client/composer/composer-widget.vala:1240
 msgid "Send message with an empty body?"
 msgstr "Nachricht ohne Inhalt senden?"
 
-#: ../src/client/composer/composer-widget.vala:1369
+#: ../src/client/composer/composer-widget.vala:1244
 msgid "Send message without an attachment?"
 msgstr "Nachricht ohne Anhang senden?"
 
-#: ../src/client/composer/composer-widget.vala:1608
-#, c-format
-msgid "“%s” could not be found."
-msgstr "»%s« konnte nicht gefunden werden."
-
-#: ../src/client/composer/composer-widget.vala:1614
-#, c-format
-msgid "“%s” is a folder."
-msgstr "»%s« ist ein Ordner."
-
-#: ../src/client/composer/composer-widget.vala:1620
-#, c-format
-msgid "“%s” is an empty file."
-msgstr "»%s« ist eine leere Datei."
-
-#: ../src/client/composer/composer-widget.vala:1633
-#, 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:1640
+#: ../src/client/composer/composer-widget.vala:1497
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "»%s« ist bereits als Anhang ausgewählt worden."
@@ -944,66 +940,77 @@ 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:1648
+#: ../src/client/composer/composer-widget.vala:1505
 #: ../src/client/conversation-viewer/conversation-email.vala:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/client/composer/composer-widget.vala:1667
+#: ../src/client/composer/composer-widget.vala:1542
+#, c-format
+msgid "“%s” could not be found."
+msgstr "»%s« konnte nicht gefunden werden."
+
+#: ../src/client/composer/composer-widget.vala:1548
+#, c-format
+msgid "“%s” is a folder."
+msgstr "»%s« ist ein Ordner."
+
+#: ../src/client/composer/composer-widget.vala:1554
+#, c-format
+msgid "“%s” is an empty file."
+msgstr "»%s« ist eine leere Datei."
+
+#: ../src/client/composer/composer-widget.vala:1567
+#, 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:1575
 msgid "Cannot add attachment"
 msgstr "Anhang kann nicht hinzugefügt werden"
 
-#: ../src/client/composer/composer-widget.vala:1712
+#: ../src/client/composer/composer-widget.vala:1637
 msgid "To: "
 msgstr "An: "
 
-#: ../src/client/composer/composer-widget.vala:1715
+#: ../src/client/composer/composer-widget.vala:1640
 msgid "Cc: "
 msgstr "Cc: "
 
-#: ../src/client/composer/composer-widget.vala:1718
+#: ../src/client/composer/composer-widget.vala:1643
 msgid "Bcc: "
 msgstr "Bcc:"
 
-#: ../src/client/composer/composer-widget.vala:1721
+#: ../src/client/composer/composer-widget.vala:1646
 msgid "Reply-To: "
 msgstr "Antwort an: "
 
-#: ../src/client/composer/composer-widget.vala:1909
+#: ../src/client/composer/composer-widget.vala:1777
 msgid "Select Color"
 msgstr "Farbe auswählen"
 
-#: ../src/client/composer/composer-widget.vala:2124
-msgid "_Inspect"
-msgstr "_Untersuchen"
-
 #. 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:2305
+#: ../src/client/composer/composer-widget.vala:1977
 #, 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:2347
+#: ../src/client/composer/composer-widget.vala:2019
 msgid "_From:"
 msgstr "_Von:"
 
-#: ../src/client/composer/composer-widget.vala:2422
-#, c-format
-msgid "%s — Composer Inspector"
-msgstr "%s – Konversationsinspektor"
-
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: ../src/client/composer/composer-widget.vala:2462
+#: ../src/client/composer/composer-widget.vala:2242
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/client/composer/spell-check-popover.vala:210
+#: ../src/client/composer/spell-check-popover.vala:215
 msgid "Search for more languages"
 msgstr "Nach weiteren Sprachen suchen"
 
@@ -1020,21 +1027,16 @@ msgstr "Unbekannt"
 #. 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:361
+#: ../src/client/conversation-viewer/conversation-message.vala:327
 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:725
+#: ../src/client/conversation-viewer/conversation-message.vala:573
 msgid ", "
 msgstr ", "
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-message.vala:1233
-msgid " (Invalid?)"
-msgstr " (Ungültig?)"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:73
 msgid "No conversations selected"
 msgstr "Keine Konversationen ausgewählt"
@@ -1067,11 +1069,6 @@ msgstr ""
 "Ihre Suche hat keine Treffer ergeben, versuchen Sie es mit anderen "
 "Suchbegriffen erneut"
 
-#: ../src/client/conversation-viewer/conversation-web-view.vala:198
-#, c-format
-msgid "%s — Conversation Inspector"
-msgstr "%s – Konversationsinspektor"
-
 #: ../src/client/dialogs/attachment-dialog.vala:24
 #: ../src/client/dialogs/attachment-dialog.vala:26
 msgid "Choose a file"
@@ -1330,7 +1327,7 @@ msgid "%A"
 msgstr "%A"
 
 #: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:910
+#: ../src/engine/rfc822/rfc822-message.vala:908
 msgid "(no subject)"
 msgstr "(kein Betreff)"
 
@@ -1684,37 +1681,37 @@ msgstr "%s schrieb:"
 msgid "On %s:"
 msgstr "Am %s:"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:284
+#: ../src/engine/rfc822/rfc822-utils.vala:278
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Weitergeleitete Nachricht ----------"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:288
+#: ../src/engine/rfc822/rfc822-utils.vala:282
 #, c-format
 msgid "From: %s\n"
 msgstr "Von: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:289
+#: ../src/engine/rfc822/rfc822-utils.vala:283
 #, c-format
 msgid "Subject: %s\n"
 msgstr "Betreff: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:290
+#: ../src/engine/rfc822/rfc822-utils.vala:284
 #, c-format
 msgid "Date: %s\n"
 msgstr "Datum: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:293
+#: ../src/engine/rfc822/rfc822-utils.vala:287
 #, c-format
 msgid "To: %s\n"
 msgstr "An: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:296
+#: ../src/engine/rfc822/rfc822-utils.vala:290
 #, c-format
 msgid "Cc: %s\n"
 msgstr "Cc: %s\n"
 
 #. / Placeholder filename for attachments with no filename.
-#: ../src/engine/rfc822/rfc822-utils.vala:441
+#: ../src/engine/rfc822/rfc822-utils.vala:432
 msgid "none"
 msgstr "keine"
 
@@ -1794,6 +1791,28 @@ msgstr "Verwerfen und schließen"
 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.h:2
+msgid "Insert the new link with this URL"
+msgstr "Den neuen Verweis mit dieser Adresse einfügen"
+
+#: ../ui/composer-link-popover.ui.h:3
+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.h:5
+msgid "Update this link’s URL"
+msgstr "Die Adresse dieses Verweises aktualisieren"
+
+#: ../ui/composer-link-popover.ui.h:6
+msgid "Delete this link"
+msgstr "Diesen Verweis löschen"
+
+#: ../ui/composer-link-popover.ui.h:7
+msgid "Open this link"
+msgstr "Diesen Verweis öffnen"
+
 #: ../ui/composer-menus.ui.h:1
 msgid "S_ans Serif"
 msgstr "S_ans Serif"
@@ -1847,22 +1866,22 @@ msgid "_Copy"
 msgstr "_Kopieren"
 
 #: ../ui/composer-menus.ui.h:14
-msgid "Copy _Link"
-msgstr "_Link kopieren"
-
-#: ../ui/composer-menus.ui.h:15
 msgid "_Paste"
 msgstr "_Einfügen"
 
-#: ../ui/composer-menus.ui.h:16
+#: ../ui/composer-menus.ui.h:15
 msgctxt "Clipboard paste with rich text"
 msgid "Paste _With Formatting"
 msgstr "Mit _Formatierung einfügen"
 
-#: ../ui/composer-menus.ui.h:17
+#: ../ui/composer-menus.ui.h:16
 msgid "Select _All"
 msgstr "Alles _auswählen"
 
+#: ../ui/composer-menus.ui.h:17 ../ui/conversation-message-menus.ui.h:9
+msgid "_Inspect…"
+msgstr "_Untersuchen …"
+
 #. Address(es) e-mail is to be sent to
 #: ../ui/composer-widget.ui.h:2
 msgid "_To"
@@ -1898,44 +1917,52 @@ msgid "To add them as attachments"
 msgstr "Als Anhang einfügen"
 
 #: ../ui/composer-widget.ui.h:11
+msgid "Undo last edit (Ctrl+Z)"
+msgstr "Letzte Bearbeitung rückgängig (Strg+Z)"
+
+#: ../ui/composer-widget.ui.h:12
+msgid "Redo last edit  (Ctrl+Shift+Z)"
+msgstr "Letzte Bearbeitung wiederholen (Umschalt+Strg+Z)"
+
+#: ../ui/composer-widget.ui.h:13
 msgid "Bold (Ctrl+B)"
 msgstr "Fett (Strg+B)"
 
-#: ../ui/composer-widget.ui.h:12
+#: ../ui/composer-widget.ui.h:14
 msgid "Italic (Ctrl+I)"
 msgstr "Kursiv (Strg+I)"
 
-#: ../ui/composer-widget.ui.h:13
+#: ../ui/composer-widget.ui.h:15
 msgid "Underline (Ctrl+U)"
 msgstr "Unterstrichen (Strg+U)"
 
-#: ../ui/composer-widget.ui.h:14
+#: ../ui/composer-widget.ui.h:16
 msgid "Strikethrough (Ctrl+K)"
 msgstr "Durchgestrichen (Strg+K)"
 
-#: ../ui/composer-widget.ui.h:15
+#: ../ui/composer-widget.ui.h:17
 msgid "Quote text  (Ctrl+])"
 msgstr "Text einrücken (Strg+])"
 
-#: ../ui/composer-widget.ui.h:16
+#: ../ui/composer-widget.ui.h:18
 msgid "Unquote text  (Ctrl+[)"
 msgstr "Einrückung aufheben (Strg+[)"
 
-#: ../ui/composer-widget.ui.h:17
-msgid "Link (Ctrl+L)"
-msgstr "Verweis (Strg+L)"
-
-#: ../ui/composer-widget.ui.h:18
-msgid "Image (Ctrl+G)"
-msgstr "Bild (Strg+G)"
-
 #: ../ui/composer-widget.ui.h:19
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Formatierung löschen (Strg+Leertaste)"
+msgid "Insert or update selection link (Ctrl+L)"
+msgstr "Verweis in Auswahl einfügen oder aktualisieren (Strg+L)"
 
 #: ../ui/composer-widget.ui.h:20
-msgid "Select spell checking language"
-msgstr "Sprache für Rechtschreibprüfung auswählen"
+msgid "Insert an image (Ctrl+G)"
+msgstr "Bild einfügen (Strg+G)"
+
+#: ../ui/composer-widget.ui.h:21
+msgid "Remove selection formatting (Ctrl+Space)"
+msgstr "Formatierung der Auswahl löschen (Strg+Leertaste)"
+
+#: ../ui/composer-widget.ui.h:22
+msgid "Select spell checking languages"
+msgstr "Sprachen für Rechtschreibprüfung auswählen"
 
 #: ../ui/conversation-email.ui.h:1
 msgid "Save all attachments"
@@ -2016,6 +2043,34 @@ msgstr "_Quelltext anzeigen"
 msgid "_Save All"
 msgstr "A_lle speichern"
 
+#: ../ui/conversation-message-menus.ui.h:1
+msgid "_Open Link"
+msgstr "_Verweis öffnen"
+
+#: ../ui/conversation-message-menus.ui.h:2
+msgid "Copy Link _Address"
+msgstr "Verweis_adresse kopieren"
+
+#: ../ui/conversation-message-menus.ui.h:3
+msgid "Send New _Message…"
+msgstr "Neue _Nachricht senden …"
+
+#: ../ui/conversation-message-menus.ui.h:4
+msgid "Copy Email _Address"
+msgstr "_E-Mail-Adresse kopieren"
+
+#: ../ui/conversation-message-menus.ui.h:5
+msgid "Save _Image As…"
+msgstr "_Bild speichern unter …"
+
+#: ../ui/conversation-message-menus.ui.h:6
+msgid "_Select All"
+msgstr "Alles _auswählen"
+
+#: ../ui/conversation-message-menus.ui.h:8
+msgid "Search for messages from"
+msgstr "Nach Nachrichten suchen von"
+
 #: ../ui/conversation-message.ui.h:1
 msgid "From <email>"
 msgstr "Von <email>"
@@ -2070,44 +2125,26 @@ msgid "Only show remote images from senders you trust."
 msgstr "Externe Bilder nur von Absendern anzeigen, denen Sie vertrauen."
 
 #: ../ui/conversation-message.ui.h:14
-msgid "This link appears to go to:"
-msgstr "Dieser Verweis scheint zu folgender Seite zu führen:"
-
-#: ../ui/conversation-message.ui.h:15
 msgid "But actually goes to:"
 msgstr "aber führt tatsächlich zu:"
 
-#: ../ui/conversation-message-menus.ui.h:1
-msgid "_Open Link"
-msgstr "_Verweis öffnen"
+#: ../ui/conversation-message.ui.h:15
+msgid "The link appears to go to:"
+msgstr "Dieser Verweis scheint zu folgender Seite zu führen:"
 
-#: ../ui/conversation-message-menus.ui.h:2
-msgid "Copy Link _Address"
-msgstr "Verweis_adresse kopieren"
+#: ../ui/conversation-message.ui.h:16
+msgid "Deceptive link found"
+msgstr "Trügerischer Verweis gefunden"
 
-#: ../ui/conversation-message-menus.ui.h:3
-msgid "Send New _Message…"
-msgstr "Neue _Nachricht senden …"
+#: ../ui/conversation-message.ui.h:17
+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-menus.ui.h:4
-msgid "Copy Email _Address"
-msgstr "_E-Mail-Adresse kopieren"
-
-#: ../ui/conversation-message-menus.ui.h:5
-msgid "Save _Image As…"
-msgstr "_Bild speichern unter …"
-
-#: ../ui/conversation-message-menus.ui.h:6
-msgid "_Select All"
-msgstr "Alles _auswählen"
-
-#: ../ui/conversation-message-menus.ui.h:8
-msgid "Search for messages from"
-msgstr "Nach Nachrichten suchen von"
-
-#: ../ui/conversation-message-menus.ui.h:9
-msgid "_Inspect…"
-msgstr "_Untersuchen …"
+#: ../ui/conversation-message.ui.h:18
+msgid "If unsure, contact the sender and ask before continuing."
+msgstr ""
+"Falls Sie unsicher sind, kontaktieren Sie den Absender und fragen Sie, bevor "
+"Sie fortfahren."
 
 #: ../ui/conversation-viewer.ui.h:1
 msgid "Find in conversation"
@@ -2522,7 +2559,7 @@ msgstr "Keine Authentifizierung nötig"
 msgid "Use IMAP cre_dentials"
 msgstr "_IMAP-Zugangsinformationen verwenden"
 
-#: ../ui/login.glade.h:34 ../ui/preferences.glade.h:5
+#: ../ui/login.glade.h:34
 msgid "Composer"
 msgstr "Verfassen"
 
@@ -2562,47 +2599,43 @@ msgstr "_Passwort speichern"
 msgid "_Authenticate"
 msgstr "_Legitimieren"
 
-#: ../ui/preferences.glade.h:1
+#: ../ui/preferences-dialog.ui.h:1
 msgid "Reading"
 msgstr "Lesen"
 
-#: ../ui/preferences.glade.h:2
+#: ../ui/preferences-dialog.ui.h:2
 msgid "_Automatically select next message"
 msgstr "Automatisch die nächste Nachricht _wählen"
 
-#: ../ui/preferences.glade.h:3
+#: ../ui/preferences-dialog.ui.h:3
 msgid "_Display conversation preview"
 msgstr "Konversations_vorschau anzeigen"
 
-#: ../ui/preferences.glade.h:4
+#: ../ui/preferences-dialog.ui.h:4
 msgid "Use _three pane view"
 msgstr "_Dreispaltige Ansicht verwenden"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "_Rechtschreibprüfung aktivieren"
-
-#: ../ui/preferences.glade.h:7
+#: ../ui/preferences-dialog.ui.h:5
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ../ui/preferences.glade.h:8
+#: ../ui/preferences-dialog.ui.h:6
 msgid "_Play notification sounds"
 msgstr "_Benachrichtigungstöne abspielen"
 
-#: ../ui/preferences.glade.h:9
+#: ../ui/preferences-dialog.ui.h:7
 msgid "Show _notifications for new mail"
 msgstr "Benachrichtigung bei _neuen E-Mails anzeigen"
 
-#: ../ui/preferences.glade.h:10
+#: ../ui/preferences-dialog.ui.h:8
 msgid "Always _watch for new mail"
 msgstr "_Ständig nach neuen E-Mails prüfen"
 
-#: ../ui/preferences.glade.h:11
+#: ../ui/preferences-dialog.ui.h:9
 msgid "Geary will run in the background and notify of new mail"
 msgstr "Geary im Hintergrund ausführen und bei neuen E-Mails benachrichtigen"
 
-#: ../ui/preferences.glade.h:12
+#: ../ui/preferences-dialog.ui.h:10
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -2635,6 +2668,27 @@ msgstr "E-Mail-Adresse:"
 msgid "Geary update in progress…"
 msgstr "Aktualisierung von Geary wird durchgeführt …"
 
+#~ msgid "_Inspect"
+#~ msgstr "_Untersuchen"
+
+#~ msgid "%s — Composer Inspector"
+#~ msgstr "%s – Konversationsinspektor"
+
+#~ msgid " (Invalid?)"
+#~ msgstr " (Ungültig?)"
+
+#~ msgid "%s — Conversation Inspector"
+#~ msgstr "%s – Konversationsinspektor"
+
+#~ msgid "Copy _Link"
+#~ msgstr "_Link kopieren"
+
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Verweis (Strg+L)"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "_Rechtschreibprüfung aktivieren"
+
 #~ msgid "Empty"
 #~ msgstr "Leeren"