diff --git a/po/pl.po b/po/pl.po
index ee111600..e92f7b3c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n"
-"POT-Creation-Date: 2020-01-24 20:08+0000\n"
-"PO-Revision-Date: 2020-01-26 14:40+0100\n"
+"POT-Creation-Date: 2020-02-20 18:01+0000\n"
+"PO-Revision-Date: 2020-02-23 12:15+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -40,7 +40,7 @@ msgstr "Wysyłanie plików za pomocą programu Geary"
 #: desktop/org.gnome.Geary.appdata.xml.in.in:12
 #: desktop/org.gnome.Geary.desktop.in.in:3
 #: src/client/accounts/accounts-editor-servers-pane.vala:555
-#: src/client/application/application-main-window.vala:547
+#: src/client/application/application-main-window.vala:555
 msgid "Geary"
 msgstr "Geary"
 
@@ -619,56 +619,56 @@ msgstr[0] "ostatni %d dzień"
 msgstr[1] "ostatnie %d dni"
 msgstr[2] "ostatnie %d dni"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:252
-#: src/client/application/application-main-window.vala:2043
+#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/application/application-main-window.vala:2053
 msgid "Undo"
 msgstr "Cofnij"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:261
-#: src/client/application/application-main-window.vala:2030
+#: src/client/accounts/accounts-editor-list-pane.vala:264
+#: src/client/application/application-main-window.vala:2036
 msgid "Redo"
 msgstr "Ponów"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:355
-#: src/client/accounts/accounts-editor-list-pane.vala:443
+#: src/client/accounts/accounts-editor-list-pane.vala:358
+#: src/client/accounts/accounts-editor-list-pane.vala:446
 #: src/client/accounts/accounts-editor-row.vala:279
 msgid "Gmail"
 msgstr "Gmail"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:359
-#: src/client/accounts/accounts-editor-list-pane.vala:447
+#: src/client/accounts/accounts-editor-list-pane.vala:362
+#: src/client/accounts/accounts-editor-list-pane.vala:450
 #: src/client/accounts/accounts-editor-row.vala:283
 msgid "Outlook.com"
 msgstr "Outlook.com"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:363
-#: src/client/accounts/accounts-editor-list-pane.vala:451
+#: src/client/accounts/accounts-editor-list-pane.vala:366
+#: src/client/accounts/accounts-editor-list-pane.vala:454
 #: 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:381
+#: src/client/accounts/accounts-editor-list-pane.vala:384
 msgid "This account has been disabled"
 msgstr "To konto jest wyłączone"
 
 #. 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:390
+#: src/client/accounts/accounts-editor-list-pane.vala:393
 msgid "This account has encountered a problem and is unavailable"
 msgstr "Wystąpił problem z tym kontem i jest niedostępne"
 
 #. Translators: Label for adding a generic email account
-#: src/client/accounts/accounts-editor-list-pane.vala:440
+#: src/client/accounts/accounts-editor-list-pane.vala:443
 msgid "Other email providers"
 msgstr "Inni dostawcy poczty"
 
 #. Translators: Notification shown after removing an
 #. account. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:557
+#: src/client/accounts/accounts-editor-list-pane.vala:560
 #, c-format
 msgid "Account “%s” removed"
 msgstr "Usunięto konto „%s”"
@@ -676,7 +676,7 @@ msgstr "Usunięto konto „%s”"
 #. 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:564
+#: src/client/accounts/accounts-editor-list-pane.vala:567
 #, c-format
 msgid "Account “%s” restored"
 msgstr "Przywrócono konto „%s”"
@@ -962,7 +962,7 @@ msgstr "Wydanie dystrybucji"
 msgid "Installation prefix"
 msgstr "Przedrostek instalacji"
 
-#: src/client/application/application-client.vala:566
+#: src/client/application/application-client.vala:587
 #, c-format
 msgid "About %s"
 msgstr "O programie %s"
@@ -970,7 +970,7 @@ msgstr "O programie %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:570
+#: src/client/application/application-client.vala:591
 msgid "translator-credits"
 msgstr ""
 "scrx <mattpiskorz@gmail.com>, 2012\n"
@@ -986,30 +986,30 @@ msgstr ""
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/application-client.vala:938
+#: src/client/application/application-client.vala:937
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr "Opcja „--hidden” jest przestarzała i zostanie usunięta w przyszłości."
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/application-client.vala:971
+#: src/client/application/application-client.vala:970
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Nieznany parametr programu: „%s”"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:457
+#: src/client/application/application-controller.vala:458
 #, c-format
 msgid "A problem occurred sending email for %s"
 msgstr "Wystąpił problem podczas wysyłania wiadomości z konta %s"
 
 #. / Notification body
-#: src/client/application/application-controller.vala:461
+#: src/client/application/application-controller.vala:462
 msgid "Email will not be sent until re-connected"
 msgstr "Wiadomości nie będą wysyłane do czasu ponownego połączenia"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:567
+#: src/client/application/application-controller.vala:568
 msgid "Conversation marked"
 msgid_plural "Conversations marked"
 msgstr[0] "Oznaczono wątek"
@@ -1017,7 +1017,7 @@ msgstr[1] "Oznaczono wątki"
 msgstr[2] "Oznaczono wątki"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:573
+#: src/client/application/application-controller.vala:574
 msgid "Conversation un-marked"
 msgid_plural "Conversations un-marked"
 msgstr[0] "Usunięto oznaczenie wątku"
@@ -1027,8 +1027,8 @@ msgstr[2] "Usunięto oznaczenie wątków"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:599
-#: src/client/application/application-controller.vala:683
+#: src/client/application/application-controller.vala:600
+#: src/client/application/application-controller.vala:684
 #, c-format
 msgid "Conversation moved to %s"
 msgid_plural "Conversations moved to %s"
@@ -1041,8 +1041,8 @@ msgstr[2] "Przeniesiono wątki do „%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:607
-#: src/client/application/application-controller.vala:629
+#: src/client/application/application-controller.vala:608
+#: src/client/application/application-controller.vala:630
 #, c-format
 msgid "Conversation restored to %s"
 msgid_plural "Conversations restored to %s"
@@ -1051,7 +1051,7 @@ msgstr[1] "Przywrócono wątki do „%s”"
 msgstr[2] "Przywrócono wątki do „%s”"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:650
+#: src/client/application/application-controller.vala:651
 msgid "Conversation archived"
 msgid_plural "Conversations archived"
 msgstr[0] "Przeniesiono wątek do archiwum"
@@ -1060,7 +1060,7 @@ msgstr[2] "Przeniesiono wątki do archiwum"
 
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:706
+#: src/client/application/application-controller.vala:707
 #, c-format
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
@@ -1069,7 +1069,7 @@ msgstr[1] "Przywrócono wiadomości do „%s”"
 msgstr[2] "Przywrócono wiadomości do „%s”"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:727
+#: src/client/application/application-controller.vala:728
 msgid "Message archived"
 msgid_plural "Messages archived"
 msgstr[0] "Przeniesiono wiadomość do archiwum"
@@ -1079,7 +1079,7 @@ msgstr[2] "Przeniesiono wiadomości do archiwum"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:762
+#: src/client/application/application-controller.vala:763
 #, c-format
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
@@ -1090,7 +1090,7 @@ msgstr[2] "Przeniesiono wiadomości do „%s”"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:790
+#: src/client/application/application-controller.vala:791
 #, c-format
 msgid "Conversation labelled as %s"
 msgid_plural "Conversations labelled as %s"
@@ -1101,7 +1101,7 @@ msgstr[2] "Dodano etykietę „%s”"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:798
+#: src/client/application/application-controller.vala:799
 #, c-format
 msgid "Conversation un-labelled as %s"
 msgid_plural "Conversations un-labelled as %s"
@@ -1109,12 +1109,12 @@ msgstr[0] "Usunięto etykietę „%s”"
 msgstr[1] "Usunięto etykietę „%s”"
 msgstr[2] "Usunięto etykietę „%s”"
 
-#: src/client/application/application-controller.vala:1221
+#: src/client/application/application-controller.vala:1222
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Nie można otworzyć bazy danych dla %s"
 
-#: src/client/application/application-controller.vala:1222
+#: src/client/application/application-controller.vala:1223
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -1139,20 +1139,20 @@ msgstr ""
 "Przebudowanie bazy danych usunie wszystkie lokalne wiadomości e-mail i ich "
 "załączniki. <b>Poczta na serwerze nie zostanie usunięta.</b>"
 
-#: src/client/application/application-controller.vala:1224
+#: src/client/application/application-controller.vala:1225
 msgid "_Rebuild"
 msgstr "P_rzebuduj"
 
-#: src/client/application/application-controller.vala:1224
+#: src/client/application/application-controller.vala:1225
 msgid "E_xit"
 msgstr "Za_kończ"
 
-#: src/client/application/application-controller.vala:1234
+#: src/client/application/application-controller.vala:1235
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Nie można przebudować bazy danych dla „%s”"
 
-#: src/client/application/application-controller.vala:1235
+#: src/client/application/application-controller.vala:1236
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -1165,34 +1165,34 @@ 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:1558
+#: src/client/application/application-controller.vala:1559
 #, c-format
 msgid "Email sent to %s"
 msgstr "Wysłano wiadomość do %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:2641
+#: src/client/application/application-controller.vala:2642
 #, c-format
 msgid "Email to %s queued for delivery"
 msgstr "Wiadomość do %s została dodana do kolejki do wysłania"
 
 #. / 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:2705
+#: src/client/application/application-controller.vala:2706
 #, c-format
 msgid "Email to %s saved"
 msgstr "Zapisano wiadomość do %s"
 
 #. / Translators: A label for an in-app notification.
-#: src/client/application/application-controller.vala:2720
-#: src/client/application/application-controller.vala:2778
+#: src/client/application/application-controller.vala:2721
+#: src/client/application/application-controller.vala:2779
 msgid "Composer could not be restored"
 msgstr "Nie można przywrócić okna tworzenia wiadomości"
 
 #. / 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:2763
+#: src/client/application/application-controller.vala:2764
 #, c-format
 msgid "Email to %s discarded"
 msgstr "Odrzucono wiadomość do %s"
@@ -1200,55 +1200,55 @@ msgstr "Odrzucono wiadomość do %s"
 #. / 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:552
+#: src/client/application/application-main-window.vala:560
 #, c-format
 msgid "%s — %s"
 msgstr "%s — %s"
 
-#: src/client/application/application-main-window.vala:961
+#: src/client/application/application-main-window.vala:967
 msgid "Labels"
 msgstr "Etykiety"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1300
+#: src/client/application/application-main-window.vala:1306
 msgid "Do you want to permanently delete this conversation?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Trwale usunąć ten wątek?"
 msgstr[1] "Trwale usunąć te wątki?"
 msgstr[2] "Trwale usunąć te wątki?"
 
-#: src/client/application/application-main-window.vala:1305
-#: src/client/application/application-main-window.vala:1320
+#: src/client/application/application-main-window.vala:1311
+#: src/client/application/application-main-window.vala:1326
 msgid "Delete"
 msgstr "Usuń"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1315
+#: src/client/application/application-main-window.vala:1321
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Trwale usunąć tę wiadomość?"
 msgstr[1] "Trwale usunąć te wiadomości?"
 msgstr[2] "Trwale usunąć te wiadomości?"
 
-#: src/client/application/application-main-window.vala:1328
+#: src/client/application/application-main-window.vala:1334
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Usunąć wszystkie wiadomości z katalogu %s?"
 
-#: src/client/application/application-main-window.vala:1331
+#: src/client/application/application-main-window.vala:1337
 msgid "This removes the email from Geary and your email server."
 msgstr "Spowoduje to usunięcie wiadomości z programu Geary i serwera poczty."
 
-#: src/client/application/application-main-window.vala:1332
+#: src/client/application/application-main-window.vala:1338
 msgid "This cannot be undone."
 msgstr "Tego nie można cofnąć."
 
-#: src/client/application/application-main-window.vala:1333
+#: src/client/application/application-main-window.vala:1339
 #, c-format
 msgid "Empty %s"
 msgstr "Opróżnij %s"
 
-#: src/client/application/application-main-window.vala:1663
+#: src/client/application/application-main-window.vala:1669
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1259,7 +1259,7 @@ msgstr "%s (%d)"
 #. 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:1826
+#: src/client/composer/composer-widget.vala:1834
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -1583,16 +1583,16 @@ msgstr "_Zapisz"
 msgid "_Keep"
 msgstr "Za_chowaj"
 
-#: src/client/composer/composer-link-popover.vala:149
+#: src/client/composer/composer-link-popover.vala:139
 msgid "Link URL is not correctly formatted, e.g. http://example.com"
 msgstr ""
 "Adres URL odnośnika nie jest poprawnie sformatowany, np. http://example.com"
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid link URL"
 msgstr "Nieprawidłowy adres URL odnośnika"
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid email address"
 msgstr "Nieprawidłowy adres e-mail"
 
@@ -1601,19 +1601,19 @@ msgstr "Nieprawidłowy adres e-mail"
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
-#: src/client/composer/composer-widget.vala:214
+#: src/client/composer/composer-widget.vala:217
 msgid "Saved"
 msgstr "Zapisano"
 
-#: src/client/composer/composer-widget.vala:215
+#: src/client/composer/composer-widget.vala:218
 msgid "Saving"
 msgstr "Zapisywanie"
 
-#: src/client/composer/composer-widget.vala:216
+#: src/client/composer/composer-widget.vala:219
 msgid "Error saving"
 msgstr "Błąd podczas zapisywania"
 
-#: src/client/composer/composer-widget.vala:217
+#: src/client/composer/composer-widget.vala:220
 msgid "Press Backspace to delete quote"
 msgstr "Naciśnięcie klawisza Backspace usunie cytat"
 
@@ -1622,7 +1622,7 @@ msgstr "Naciśnięcie klawisza Backspace usunie cytat"
 #. 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:233
+#: src/client/composer/composer-widget.vala:236
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1634,90 +1634,90 @@ msgstr ""
 #. 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:832
+#: src/client/composer/composer-widget.vala:843
 msgid "Do you want to keep or discard this draft message?"
 msgstr "Zachować lub odrzucić ten szkic?"
 
 #. 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:858
+#: src/client/composer/composer-widget.vala:869
 msgid "Do you want to discard this draft message?"
 msgstr "Odrzucić ten szkic?"
 
-#: src/client/composer/composer-widget.vala:1492
+#: src/client/composer/composer-widget.vala:1503
 msgid "Send message with an empty subject and body?"
 msgstr "Wysłać wiadomość niezawierającą tematu i treści?"
 
-#: src/client/composer/composer-widget.vala:1494
+#: src/client/composer/composer-widget.vala:1505
 msgid "Send message with an empty subject?"
 msgstr "Wysłać wiadomość niezawierającą tematu?"
 
-#: src/client/composer/composer-widget.vala:1496
+#: src/client/composer/composer-widget.vala:1507
 msgid "Send message with an empty body?"
 msgstr "Wysłać wiadomość niezawierającą treści?"
 
-#: src/client/composer/composer-widget.vala:1505
+#: src/client/composer/composer-widget.vala:1516
 msgid "Send message without an attachment?"
 msgstr "Wysłać wiadomość niezawierającą załączników?"
 
-#: src/client/composer/composer-widget.vala:1818
+#: src/client/composer/composer-widget.vala:1820
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "Do wiadomości już załączono „%s”."
 
-#: src/client/composer/composer-widget.vala:1848
-#: src/client/composer/composer-widget.vala:1898
+#: src/client/composer/composer-widget.vala:1856
+#: src/client/composer/composer-widget.vala:1906
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "„%s” jest pustym plikiem."
 
-#: src/client/composer/composer-widget.vala:1886
+#: src/client/composer/composer-widget.vala:1894
 #, c-format
 msgid "“%s” could not be found."
 msgstr "Nie można odnaleźć „%s”."
 
-#: src/client/composer/composer-widget.vala:1892
+#: src/client/composer/composer-widget.vala:1900
 #, c-format
 msgid "“%s” is a folder."
 msgstr "„%s” jest katalogiem."
 
-#: src/client/composer/composer-widget.vala:1911
+#: src/client/composer/composer-widget.vala:1919
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "Nie można otworzyć „%s” do odczytania."
 
-#: src/client/composer/composer-widget.vala:1919
+#: src/client/composer/composer-widget.vala:1927
 msgid "Cannot add attachment"
 msgstr "Nie można dodać załącznika"
 
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:1976
+#: src/client/composer/composer-widget.vala:1984
 #: src/client/conversation-viewer/conversation-email.vala:559
 #: src/client/util/util-email.vala:235 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "Do:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1982
+#: src/client/composer/composer-widget.vala:1990
 #: src/client/conversation-viewer/conversation-email.vala:564
 #: src/client/util/util-email.vala:240 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "DW:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:1988
+#: src/client/composer/composer-widget.vala:1996
 #: src/client/conversation-viewer/conversation-email.vala:569
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "UDW:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:1994
+#: src/client/composer/composer-widget.vala:2002
 msgid "Reply-To: "
 msgstr "Odpowiedź do: "
 
-#: src/client/composer/composer-widget.vala:2247
+#: src/client/composer/composer-widget.vala:2254
 msgid "Select Color"
 msgstr "Wybór koloru"
 
@@ -1726,32 +1726,32 @@ msgstr "Wybór koloru"
 #. 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:2442
+#: src/client/composer/composer-widget.vala:2440
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s przez %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:2498
+#: src/client/composer/composer-widget.vala:2496
 msgid "_From:"
 msgstr "_Od:"
 
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2804
+#: src/client/composer/composer-widget.vala:2801
 msgid "Images"
 msgstr "Obrazy"
 
-#: src/client/composer/spell-check-popover.vala:109
+#: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "Usuwa ten język z listy preferowanych"
 
-#: src/client/composer/spell-check-popover.vala:113
+#: src/client/composer/spell-check-popover.vala:129
 msgid "Add this language to the preferred list"
 msgstr "Dodaje ten język do listy preferowanych"
 
-#: src/client/composer/spell-check-popover.vala:200
+#: src/client/composer/spell-check-popover.vala:225
 msgid "Search for more languages"
 msgstr "Więcej języków"
 
@@ -1837,44 +1837,44 @@ msgstr "Ten adres e-mail może być fałszywy"
 #. 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:465
+#: src/client/conversation-viewer/conversation-message.vala:439
 msgid "No sender"
 msgstr "Brak nadawcy"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:959
+#: src/client/conversation-viewer/conversation-message.vala:831
 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:1081
+#: src/client/conversation-viewer/conversation-message.vala:951
 msgid "Image"
 msgstr "Obraz"
 
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:91
+#: src/client/conversation-viewer/conversation-viewer.vala:83
 msgid "No conversations selected"
 msgstr "Brak zaznaczonych wątków"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:95
+#: src/client/conversation-viewer/conversation-viewer.vala:87
 msgid "Selecting a conversation from the list will display it here"
 msgstr "Zaznaczenie wątku z listy spowoduje jego wyświetlenie w tym miejscu"
 
 #. Translators: Title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:104
+#: src/client/conversation-viewer/conversation-viewer.vala:96
 msgid "Multiple conversations selected"
 msgstr "Zaznaczono wiele wątków"
 
 #. Translators: Sub-title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:108
+#: src/client/conversation-viewer/conversation-viewer.vala:100
 msgid "Choosing an action will apply to all selected conversations"
 msgstr ""
 "Wybranie działania spowoduje jego zastosowanie do wszystkich zaznaczonych "
@@ -1884,20 +1884,20 @@ msgstr ""
 #. 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:117
-#: src/client/conversation-viewer/conversation-viewer.vala:130
+#: src/client/conversation-viewer/conversation-viewer.vala:109
+#: src/client/conversation-viewer/conversation-viewer.vala:122
 msgid "No conversations found"
 msgstr "Nie odnaleziono żadnych wątków"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have exist in a folder.
-#: src/client/conversation-viewer/conversation-viewer.vala:121
+#: src/client/conversation-viewer/conversation-viewer.vala:113
 msgid "This folder does not contain any conversations"
 msgstr "Ten katalog nie zawiera żadnych wątków"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:134
+#: src/client/conversation-viewer/conversation-viewer.vala:126
 msgid "Your search returned no results, try refining your search terms"
 msgstr "Wyszukiwanie nie zwróciło wyników, proszę spróbować innych słów"
 
@@ -2708,27 +2708,31 @@ msgid "Save and Close"
 msgstr "Zapisuje i zamyka"
 
 #. Note that this button and the Update button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:41
+#: ui/composer-link-popover.ui:42
 msgid "Insert the new link with this URL"
 msgstr "Wstawia nowy odnośnik o tym adresie URL"
 
-#: ui/composer-link-popover.ui:52
+#: ui/composer-link-popover.ui:43
+msgid "Add"
+msgstr "Dodaj"
+
+#: ui/composer-link-popover.ui:47
 msgid "Link URL"
 msgstr "Adres URL odnośnika"
 
 #. Note that this button and the Insert button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:66
+#: ui/composer-link-popover.ui:61
 msgid "Update this link’s URL"
 msgstr "Aktualizuje adres URL tego odnośnika"
 
-#: ui/composer-link-popover.ui:86
+#: ui/composer-link-popover.ui:62
+msgid "Update"
+msgstr "Zaktualizuj"
+
+#: ui/composer-link-popover.ui:75
 msgid "Delete this link"
 msgstr "Usuwa ten odnośnik"
 
-#: ui/composer-link-popover.ui:106
-msgid "Open this link"
-msgstr "Otwiera ten odnośnik"
-
 #: ui/composer-menus.ui:8
 msgid "_Undo"
 msgstr "Cof_nij"
@@ -2887,8 +2891,8 @@ msgid "Add original attachments"
 msgstr "Dodaje oryginalne załączniki"
 
 #: ui/composer-widget.ui:1162
-msgid "Enable or disable rich text mode"
-msgstr "Włącza lub wyłącza tryb tekstu sformatowanego"
+msgid "More options"
+msgstr "Więcej opcji"
 
 #: ui/composer-widget.ui:1182
 msgid "Show formatting toolbar"
@@ -2898,35 +2902,35 @@ msgstr "Wyświetla pasek narzędziowy formatowania"
 msgid "Select spell checking languages"
 msgstr "Wybiera język sprawdzania pisowni"
 
-#: ui/composer-widget.ui:1264
+#: ui/composer-widget.ui:1263
 msgid "S_ans Serif"
 msgstr "_Bezszeryfowa"
 
-#: ui/composer-widget.ui:1269
+#: ui/composer-widget.ui:1268
 msgid "S_erif"
 msgstr "Sz_eryfowa"
 
-#: ui/composer-widget.ui:1274
+#: ui/composer-widget.ui:1273
 msgid "_Fixed Width"
 msgstr "S_tała szerokość"
 
-#: ui/composer-widget.ui:1284
+#: ui/composer-widget.ui:1283
 msgid "_Small"
 msgstr "_Mały"
 
-#: ui/composer-widget.ui:1289
+#: ui/composer-widget.ui:1288
 msgid "_Medium"
 msgstr "Ś_redni"
 
-#: ui/composer-widget.ui:1294
+#: ui/composer-widget.ui:1293
 msgid "Lar_ge"
 msgstr "_Duży"
 
-#: ui/composer-widget.ui:1304
+#: ui/composer-widget.ui:1303
 msgid "_Rich Text"
 msgstr "Tekst _sformatowany"
 
-#: ui/composer-widget.ui:1309
+#: ui/composer-widget.ui:1308
 msgid "_Plain Text"
 msgstr "_Zwykły tekst"
 
@@ -3169,19 +3173,19 @@ msgstr "Odpowiedź do:"
 msgid "Subject"
 msgstr "Temat"
 
-#: ui/conversation-message.ui:502
+#: ui/conversation-message.ui:501
 msgid "Show Images"
 msgstr "Wyświetl obrazy"
 
-#: ui/conversation-message.ui:515
+#: ui/conversation-message.ui:514
 msgid "Always Show From Sender"
 msgstr "Zawsze wyświetlaj od nadawcy"
 
-#: ui/conversation-message.ui:543
+#: ui/conversation-message.ui:542
 msgid "Remote images not shown"
 msgstr "Zdalne obrazy nie są wyświetlane"
 
-#: ui/conversation-message.ui:560
+#: ui/conversation-message.ui:559
 msgid "Only show remote images from senders you trust."
 msgstr "Wyświetlanie zdalnych obrazów tylko od zaufanych nadawców."