diff --git a/po/fi.po b/po/fi.po
index a5905e7d..34145363 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n"
-"POT-Creation-Date: 2020-03-25 21:55+0000\n"
-"PO-Revision-Date: 2020-03-26 12:40+0200\n"
+"POT-Creation-Date: 2020-08-18 09:04+0000\n"
+"PO-Revision-Date: 2020-08-26 19:10+0300\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <lokalisointi-lista@googlegroups.com>\n"
 "Language: fi\n"
@@ -19,7 +19,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.3\n"
+"X-Generator: Poedit 2.4.1\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
@@ -31,10 +31,10 @@ msgstr "Lähetä tiedostoja Gearylla"
 
 #. Translators: The application name
 #: desktop/geary-autostart.desktop.in.in:3
-#: desktop/org.gnome.Geary.appdata.xml.in.in:12
+#: desktop/org.gnome.Geary.appdata.xml.in.in:11
 #: desktop/org.gnome.Geary.desktop.in.in:3
-#: src/client/accounts/accounts-editor-servers-pane.vala:555
-#: src/client/application/application-main-window.vala:592
+#: src/client/accounts/accounts-editor-servers-pane.vala:560
+#: src/client/application/application-main-window.vala:608
 msgid "Geary"
 msgstr "Geary"
 
@@ -45,7 +45,7 @@ msgstr "Sähköposti"
 
 #. Translators: The application's summary / tagline
 #: desktop/geary-autostart.desktop.in.in:5
-#: desktop/org.gnome.Geary.appdata.xml.in.in:16
+#: desktop/org.gnome.Geary.appdata.xml.in.in:15
 #: desktop/org.gnome.Geary.desktop.in.in:5
 #: src/client/application/application-client.vala:32
 msgid "Send and receive email"
@@ -57,11 +57,11 @@ msgid "Email;E-mail;Mail;"
 msgstr "Email;E-mail;Mail;Sähköposti;Maili;posti;"
 
 #. Translators: The development team's name
-#: desktop/org.gnome.Geary.appdata.xml.in.in:14
+#: desktop/org.gnome.Geary.appdata.xml.in.in:13
 msgid "Geary Development Team"
 msgstr "Geary-kehitystiimi"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:18
+#: desktop/org.gnome.Geary.appdata.xml.in.in:17
 msgid ""
 "Geary is an email application built around conversations, for the GNOME 3 "
 "desktop. It allows you to read, find and send email with a straightforward, "
@@ -71,7 +71,7 @@ msgstr ""
 "keskusteluihin. Sen avulla voit lukea, etsiä ja lähettää sähköpostia "
 "modernin käyttöliittymän kautta."
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:23
+#: desktop/org.gnome.Geary.appdata.xml.in.in:22
 msgid ""
 "Conversations allow you to read a complete discussion without having to find "
 "and click from message to message."
@@ -79,43 +79,43 @@ msgstr ""
 "Keskusteluiden avulla voit lukea koko viestiketjun ilman, että joudut "
 "napsauttamaan viestistä toiseen itse."
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:27
+#: desktop/org.gnome.Geary.appdata.xml.in.in:26
 msgid "Geary’s features include:"
 msgstr "Gearyn ominaisuuksiin kuuluu muun muassa:"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:28
 msgid "Quick email account setup"
 msgstr "Nopea sähköpostitilin asetusten teko"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:30
+#: desktop/org.gnome.Geary.appdata.xml.in.in:29
 msgid "Shows related messages together in conversations"
 msgstr "Näyttää toisiinsa liittyvät viestit yhdessä keskustelumuodossa"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:31
+#: desktop/org.gnome.Geary.appdata.xml.in.in:30
 msgid "Fast, full text and keyword search"
 msgstr "Nopea haku koko tekstin ja avainsanojen tuella"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:32
+#: desktop/org.gnome.Geary.appdata.xml.in.in:31
 msgid "Full-featured HTML and plain text message composer"
 msgstr "Monipuolinen HTML- ja raakatekstilähetys"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:33
+#: desktop/org.gnome.Geary.appdata.xml.in.in:32
 msgid "Desktop notification of new mail"
 msgstr "Työpöytäilmoitukset uusista viesteistä"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:34
+#: desktop/org.gnome.Geary.appdata.xml.in.in:33
 msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
 msgstr ""
 "Yhteensopiva GMailin, Yahoo! Mailin, Outlook.comin ja muiden IMAP-"
 "palvelinten kanssa"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in.in:48
+#: desktop/org.gnome.Geary.appdata.xml.in.in:47
 msgid "Geary displaying a conversation"
 msgstr "Geary ja viestiketju"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in.in:59
+#: desktop/org.gnome.Geary.appdata.xml.in.in:58
 msgid "Geary showing the rich text composer"
 msgstr "Geary ja viestin kirjoitusikkuna"
 
@@ -138,7 +138,7 @@ msgstr "Suurenna ikkuna"
 
 #: desktop/org.gnome.Geary.gschema.xml:9
 msgid "True if the application window is maximized, false otherwise."
-msgstr ""
+msgstr "Tosi jos sovelluksen ikkuna on suurennettu, muuten epätosi."
 
 #: desktop/org.gnome.Geary.gschema.xml:14
 msgid "Width of window"
@@ -256,20 +256,17 @@ msgid "Notify of new mail at startup"
 msgstr "Ilmoita uusista viesteistä käynnistyksen yhteydessä"
 
 #: desktop/org.gnome.Geary.gschema.xml:97
-#, fuzzy
-#| msgid "Notify of new mail at start_up"
 msgid "True to notify of new mail at startup."
-msgstr "_Ilmoita uusista viesteistä käynnistyksen yhteydessä"
+msgstr ""
+"Tosi jos uusista viesteistä halutaan ilmoitettavan käynnistyksen yhteydessä."
 
 #: desktop/org.gnome.Geary.gschema.xml:102
 msgid "Ask when opening an attachment"
 msgstr "Kysy liitettä avattaessa"
 
 #: desktop/org.gnome.Geary.gschema.xml:103
-#, fuzzy
-#| msgid "To add them as attachments"
 msgid "True to ask when opening an attachment."
-msgstr "lisätäksesi ne liitteiksi"
+msgstr "Tosi jos liitteen avaamisesta kysytään."
 
 #: desktop/org.gnome.Geary.gschema.xml:108
 msgid "Whether to compose emails in HTML"
@@ -278,6 +275,8 @@ msgstr "Muodostetaanko lähetettävät viestit HTML-muodossa"
 #: desktop/org.gnome.Geary.gschema.xml:109
 msgid "True to compose emails in HTML; false for plain text."
 msgstr ""
+"Tosi jos viestit muodostetaan HTML:nä, epätosi jos viestit muodostetaan "
+"raakatekstinä."
 
 #: desktop/org.gnome.Geary.gschema.xml:114
 msgid "Advisory strategy for full-text searching"
@@ -295,7 +294,7 @@ msgstr "Keskustelunäkymän suurennus"
 
 #: desktop/org.gnome.Geary.gschema.xml:121
 msgid "The zoom to apply on the conservation view."
-msgstr ""
+msgstr "Keskustelunäkymään toteutettava zoomaustaso."
 
 #: desktop/org.gnome.Geary.gschema.xml:126
 msgid "Size of detached composer window"
@@ -306,10 +305,8 @@ msgid "The last recorded size of the detached composer window."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:132
-#, fuzzy
-#| msgid "Error sending email"
 msgid "Undo sending email delay"
-msgstr "Virhe sähköpostia lähettäessä"
+msgstr "Sähköpostin lähettämisen kumoamisen viive"
 
 #: desktop/org.gnome.Geary.gschema.xml:133
 msgid ""
@@ -359,13 +356,13 @@ msgstr "Kaikki muut"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:195
-#: src/client/accounts/accounts-editor-servers-pane.vala:316
+#: src/client/accounts/accounts-editor-servers-pane.vala:321
 msgid "Check your receiving login and password"
 msgstr "Tarkista vastaanottamiseen käytettävä käyttäjätunnus ja salasana"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:210
-#: src/client/accounts/accounts-editor-servers-pane.vala:329
+#: src/client/accounts/accounts-editor-servers-pane.vala:334
 msgid "Check your receiving server details"
 msgstr "Tarkista vastaanottamiseen käytettävän palvelimen tiedot"
 
@@ -375,13 +372,13 @@ msgstr "Tarkista vastaanottamiseen käytettävän palvelimen tiedot"
 #. specify custom creds here
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:232
-#: src/client/accounts/accounts-editor-servers-pane.vala:350
+#: src/client/accounts/accounts-editor-servers-pane.vala:355
 msgid "Check your sending login and password"
 msgstr "Tarkista lähettämiseen käytettävä käyttäjätunnus ja salasana"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:246
-#: src/client/accounts/accounts-editor-servers-pane.vala:363
+#: src/client/accounts/accounts-editor-servers-pane.vala:368
 msgid "Check your sending server details"
 msgstr "Tarkista lähettämiseen käytettävän palvelimen tiedot"
 
@@ -437,14 +434,14 @@ msgstr "nimi@verkkotunnus.fi"
 #. Translators: Label for the user's login name for an
 #. IMAP, SMTP, etc service
 #: src/client/accounts/accounts-editor-add-pane.vala:593
-#: src/client/accounts/accounts-editor-servers-pane.vala:884
+#: src/client/accounts/accounts-editor-servers-pane.vala:889
 msgid "Login name"
 msgstr "Käyttäjätunnus"
 
 #. Translators: Label for the user's password for an IMAP,
 #. SMTP, etc service
 #: src/client/accounts/accounts-editor-add-pane.vala:607
-#: src/client/accounts/accounts-editor-servers-pane.vala:1006
+#: src/client/accounts/accounts-editor-servers-pane.vala:1011
 #: ui/password-dialog.glade:108
 msgid "Password"
 msgstr "Salasana"
@@ -454,7 +451,7 @@ msgstr "Salasana"
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's IMAP service.
 #: src/client/accounts/accounts-editor-add-pane.vala:629
-#: src/client/accounts/accounts-editor-servers-pane.vala:728
+#: src/client/accounts/accounts-editor-servers-pane.vala:733
 msgid "IMAP server"
 msgstr "IMAP-palvelin"
 
@@ -469,7 +466,7 @@ msgstr "imap.esimerkki.com"
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's SMTP service.
 #: src/client/accounts/accounts-editor-add-pane.vala:638
-#: src/client/accounts/accounts-editor-servers-pane.vala:734
+#: src/client/accounts/accounts-editor-servers-pane.vala:739
 msgid "SMTP server"
 msgstr "SMTP-palvelin"
 
@@ -614,55 +611,54 @@ msgstr[0] "%d päivän ajalta"
 msgstr[1] "%d päivän ajalta"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:255
-#: src/client/application/application-main-window.vala:2062
+#: src/client/application/application-main-window.vala:2061
 msgid "Undo"
 msgstr "Kumoa"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:264
-#: src/client/application/application-main-window.vala:2045
+#: src/client/application/application-main-window.vala:2044
 msgid "Redo"
 msgstr "Tee uudelleen"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:358
-#: src/client/accounts/accounts-editor-list-pane.vala:446
+#: src/client/accounts/accounts-editor-list-pane.vala:454
 #: src/client/accounts/accounts-editor-row.vala:279
 msgid "Gmail"
 msgstr "Gmail"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:362
-#: src/client/accounts/accounts-editor-list-pane.vala:450
+#: src/client/accounts/accounts-editor-list-pane.vala:458
 #: src/client/accounts/accounts-editor-row.vala:283
 msgid "Outlook.com"
 msgstr "Outlook.com"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:366
-#: src/client/accounts/accounts-editor-list-pane.vala:454
+#: src/client/accounts/accounts-editor-list-pane.vala:462
 #: 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:384
+#: src/client/accounts/accounts-editor-list-pane.vala:388
 msgid "This account has been disabled"
 msgstr "Tämä tili on poistettu käytöstä"
 
 #. 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:393
+#: src/client/accounts/accounts-editor-list-pane.vala:397
 msgid "This account has encountered a problem and is unavailable"
 msgstr "Tämä tili kohtasi ongelman, eikä ole käytettävissä"
 
-#. Translators: Label for adding a generic email account
-#: src/client/accounts/accounts-editor-list-pane.vala:443
+#: src/client/accounts/accounts-editor-list-pane.vala:466
 msgid "Other email providers"
 msgstr "Muut sähköpostipalveluntarjoajat"
 
 #. Translators: Notification shown after removing an
 #. account. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:560
+#: src/client/accounts/accounts-editor-list-pane.vala:572
 #, c-format
 msgid "Account “%s” removed"
 msgstr "Tili “%s” poistettu"
@@ -670,7 +666,7 @@ msgstr "Tili “%s” poistettu"
 #. 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:567
+#: src/client/accounts/accounts-editor-list-pane.vala:579
 #, c-format
 msgid "Account “%s” restored"
 msgstr "Tili “%s” palautettu"
@@ -683,31 +679,30 @@ msgstr "Raahaa liikuttaaksesi tätä kohdetta"
 #. Translators: Label describes the service provider
 #. hosting the email account, e.g. Gmail, Yahoo, or some
 #. other generic IMAP service.
-#: src/client/accounts/accounts-editor-row.vala:295
+#: src/client/accounts/accounts-editor-row.vala:299
 msgid "Service provider"
 msgstr "Palveluntarjoaja"
 
 #. Translators: This label describes what form of transport
 #. security (TLS, StartTLS, etc) used by an account's IMAP or SMTP
 #. service.
-#: src/client/accounts/accounts-editor-row.vala:468
+#: src/client/accounts/accounts-editor-row.vala:473
 msgid "Connection security"
 msgstr "Yhteyden salaus"
 
 #. Translators: Label used when no auth scheme is used
 #. by an account's IMAP or SMTP service.
-#: src/client/accounts/accounts-editor-row.vala:479
-#: src/client/accounts/accounts-editor-servers-pane.vala:755
-#: src/client/accounts/accounts-editor-servers-pane.vala:970
-#: src/engine/api/geary-special-folder-type.vala:58
+#: src/client/accounts/accounts-editor-row.vala:484
+#: src/client/accounts/accounts-editor-servers-pane.vala:760
+#: src/client/accounts/accounts-editor-servers-pane.vala:975
 msgid "None"
 msgstr "Ei mitään"
 
-#: src/client/accounts/accounts-editor-row.vala:486
+#: src/client/accounts/accounts-editor-row.vala:491
 msgid "StartTLS"
 msgstr "StartTLS"
 
-#: src/client/accounts/accounts-editor-row.vala:493
+#: src/client/accounts/accounts-editor-row.vala:498
 msgid "TLS"
 msgstr "TLS"
 
@@ -715,35 +710,35 @@ msgstr "TLS"
 #. credentials (none, use IMAP, custom) when adding a new
 #. account
 #. Translators: An info bar button label
-#: src/client/accounts/accounts-editor-row.vala:534
-#: src/client/application/application-main-window.vala:546
+#: src/client/accounts/accounts-editor-row.vala:539
+#: src/client/application/application-main-window.vala:554
 msgid "Login"
 msgstr "Kirjaudu"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (none) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:541
+#: src/client/accounts/accounts-editor-row.vala:546
 msgid "No login needed"
 msgstr "Kirjautumista ei vaadita"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (use IMAP) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:549
+#: src/client/accounts/accounts-editor-row.vala:554
 msgid "Use same login as receiving"
 msgstr "Käytä samoja kirjautumistietoja kuin lähettäessä"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (custom) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:557
+#: src/client/accounts/accounts-editor-row.vala:562
 msgid "Use a different login"
 msgstr "Käytä eri kirjautumistietoja"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-servers-pane.vala:377
+#: src/client/accounts/accounts-editor-servers-pane.vala:382
 #, c-format
 msgid "Account not updated: %s"
 msgstr "Tiliä ei päivitetty: %s"
@@ -751,23 +746,23 @@ msgstr "Tiliä ei päivitetty: %s"
 #. Translators: This label describes the program that
 #. created the account, e.g. an SSO service like GOA, or
 #. locally by Geary.
-#: src/client/accounts/accounts-editor-servers-pane.vala:540
+#: src/client/accounts/accounts-editor-servers-pane.vala:545
 msgid "Account source"
 msgstr "Tilin lähde"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:552
+#: src/client/accounts/accounts-editor-servers-pane.vala:557
 msgid "GNOME Online Accounts"
 msgstr "Gnomen verkkotilit"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:611
+#: src/client/accounts/accounts-editor-servers-pane.vala:616
 msgid "Save draft email on server"
 msgstr "Tallenna luonnosviestit palvelimelle"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:666
+#: src/client/accounts/accounts-editor-servers-pane.vala:671
 msgid "Save sent email on server"
 msgstr "Tallenna lähetetyt viestit palvelimelle"
 
@@ -776,12 +771,12 @@ msgstr "Tallenna lähetetyt viestit palvelimelle"
 #. Translators: Label used when an account's IMAP or
 #. SMTP service uses OAuth2. The string replacement is
 #. the service's login name.
-#: src/client/accounts/accounts-editor-servers-pane.vala:956
+#: src/client/accounts/accounts-editor-servers-pane.vala:961
 #, c-format
 msgid "%s using OAuth2"
 msgstr "%s käyttää OAuth2:ta"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:966
+#: src/client/accounts/accounts-editor-servers-pane.vala:971
 msgid "Use receiving server login"
 msgstr "Käytä vastaanottavan palvelimen kirjautumistietoja"
 
@@ -819,35 +814,35 @@ msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Tekijänoikeus 2016 Software Freedom Conservancy Inc."
 
 #: src/client/application/application-client.vala:34
-msgid "Copyright 2016-2019 Geary Development Team."
-msgstr "Tekijänoikeus 2016-2019 Geary-kehitystiimi."
+msgid "Copyright 2016-2020 Geary Development Team."
+msgstr "Tekijänoikeus 2016-2020 Geary-kehitystiimi."
 
 #: src/client/application/application-client.vala:36
 msgid "Visit the Geary web site"
 msgstr "Vieraile Gearyn verkkosivustolla"
 
 #. / Command line option
-#: src/client/application/application-client.vala:97
+#: src/client/application/application-client.vala:96
 msgid "Print debug logging"
 msgstr "Tulosta vianetsintälokitus"
 
 #. / Command line option
-#: src/client/application/application-client.vala:100
+#: src/client/application/application-client.vala:99
 msgid "Start with the main window hidden (deprecated)"
 msgstr "Käynnistä pääikkuna piilotettuna (vanhennettu)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:103
+#: src/client/application/application-client.vala:102
 msgid "Enable WebKitGTK Inspector in web views"
 msgstr ""
 
 #. / Command line option
-#: src/client/application/application-client.vala:106
+#: src/client/application/application-client.vala:105
 msgid "Log conversation monitoring"
 msgstr "Lokita keskustelujen tarkkailu"
 
 #. / Command line option
-#: src/client/application/application-client.vala:109
+#: src/client/application/application-client.vala:108
 #, fuzzy
 #| msgid "Log folder normalization"
 msgid "Log IMAP network deserialization"
@@ -855,113 +850,104 @@ msgstr "Lokita kansioiden normalisointi"
 
 #. / Command line option. "Normalization" can also be called
 #. / "synchronization".
-#: src/client/application/application-client.vala:113
+#: src/client/application/application-client.vala:112
 msgid "Log folder normalization"
 msgstr "Lokita kansioiden normalisointi"
 
 #. / Command line option
-#: src/client/application/application-client.vala:116
-msgid "Log network activity"
-msgstr "Lokita verkkotoiminta"
-
-#. / Command line option
-#: src/client/application/application-client.vala:119
-msgid "Log periodic activity"
-msgstr ""
+#: src/client/application/application-client.vala:115
+msgid "Log IMAP network activity"
+msgstr "Lokita IMAP-verkkotoiminta"
 
 #. / Command line option. The IMAP replay queue is how changes
 #. / on the server are replicated on the client.  It could
 #. / also be called the IMAP events queue.
-#: src/client/application/application-client.vala:124
+#: src/client/application/application-client.vala:120
 msgid "Log IMAP replay queue"
 msgstr ""
 
-#. / Command line option. Serialization is how commands and
-#. / responses are converted into a stream of bytes for
-#. / network transmission
-#: src/client/application/application-client.vala:129
-#, fuzzy
-#| msgid "Log folder normalization"
-msgid "Log IMAP network serialization"
-msgstr "Lokita kansioiden normalisointi"
+#. / Command line option
+#: src/client/application/application-client.vala:123
+msgid "Log SMTP network activity"
+msgstr "Lokita SMTP-verkkotoiminta"
 
 #. / Command line option
-#: src/client/application/application-client.vala:132
+#: src/client/application/application-client.vala:126
 msgid "Log database queries (generates lots of messages)"
 msgstr "Lokita tietokantaan kohdistuvat kyselyt (luo paljon viestejä)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:135
+#: src/client/application/application-client.vala:129
 msgid "Perform a graceful quit"
 msgstr "Suorita siisti lopetus"
 
-#: src/client/application/application-client.vala:137
+#: src/client/application/application-client.vala:131
 msgid "Open a new window"
 msgstr "Avaa uusi ikkuna"
 
 #. / Command line option
-#: src/client/application/application-client.vala:140
+#: src/client/application/application-client.vala:134
 msgid "Revoke all pinned TLS server certificates"
 msgstr "Kumoa kaikki kiinnitetyt TLS-palvelinvarmenteet"
 
 #. / Command line option
-#: src/client/application/application-client.vala:143
+#: src/client/application/application-client.vala:137
 msgid "Display program version"
 msgstr "Näytä sovelluksen versio"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:267
+#: src/client/application/application-client.vala:261
 msgid "Geary version"
 msgstr "Geary-versio"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:269
+#: src/client/application/application-client.vala:263
 msgid "Geary revision"
 msgstr ""
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:271
+#: src/client/application/application-client.vala:265
 msgid "GTK version"
 msgstr "GTK-versio"
 
 #. / Applciation runtime information label
-#: src/client/application/application-client.vala:278
+#: src/client/application/application-client.vala:272
 msgid "GLib version"
 msgstr "GLib-versio"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:285
+#: src/client/application/application-client.vala:279
 msgid "WebKitGTK version"
 msgstr "WebKitGTK-versio"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:292
+#: src/client/application/application-client.vala:286
 msgid "Desktop environment"
 msgstr "Työpöytäympäristö"
 
 #. Translators: This is the file type displayed for
 #. attachments with unknown file types.
-#: src/client/application/application-client.vala:294
+#: src/client/application/application-client.vala:288
 #: src/client/components/components-attachment-pane.vala:91
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:324
+#: src/client/application/application-client.vala:318
 msgid "Distribution name"
 msgstr "Jakelun nimi"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:329
+#: src/client/application/application-client.vala:323
 msgid "Distribution release"
 msgstr "Jakelun versio"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:337
+#: src/client/application/application-client.vala:331
 msgid "Installation prefix"
 msgstr ""
 
-#: src/client/application/application-client.vala:590
+#: src/client/application/application-client.vala:584
 #, c-format
 msgid "About %s"
 msgstr "Tietoja %ssta"
@@ -969,44 +955,44 @@ msgstr "Tietoja %ssta"
 #. 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:594
+#: src/client/application/application-client.vala:588
 msgid "translator-credits"
 msgstr "Jiri Grönroos"
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/application-client.vala:941
+#: src/client/application/application-client.vala:1066
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr ""
 "Valinta `--hidden`on vanhennettu ja se poistetaan tulevissa versioissa."
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/application-client.vala:974
+#: src/client/application/application-client.vala:1099
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Tunnistamaton ohjelma-argumentti: “%s”"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:455
+#: src/client/application/application-controller.vala:479
 #, c-format
 msgid "A problem occurred sending email for %s"
 msgstr "Viestiä vastaanottajalle %s lähettäessä ilmeni ongelma"
 
 #. / Notification body
-#: src/client/application/application-controller.vala:459
+#: src/client/application/application-controller.vala:483
 msgid "Email will not be sent until re-connected"
 msgstr "Sähköpostia ei lähetetä, ennen kuin yhteys on muodostettu uudelleen"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:565
+#: src/client/application/application-controller.vala:582
 msgid "Conversation marked"
 msgid_plural "Conversations marked"
 msgstr[0] "Keskustelu merkitty"
 msgstr[1] "Keskustelut merkitty"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:571
+#: src/client/application/application-controller.vala:588
 msgid "Conversation un-marked"
 msgid_plural "Conversations un-marked"
 msgstr[0] "Keskustelun merkintä poistettu"
@@ -1015,8 +1001,8 @@ msgstr[1] "Keskustelujen merkinnät poistettu"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:597
-#: src/client/application/application-controller.vala:681
+#: src/client/application/application-controller.vala:614
+#: src/client/application/application-controller.vala:698
 #, c-format
 msgid "Conversation moved to %s"
 msgid_plural "Conversations moved to %s"
@@ -1028,8 +1014,8 @@ msgstr[1] "Keskustelut siirretty kansioon %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:605
-#: src/client/application/application-controller.vala:627
+#: src/client/application/application-controller.vala:622
+#: src/client/application/application-controller.vala:644
 #, c-format
 msgid "Conversation restored to %s"
 msgid_plural "Conversations restored to %s"
@@ -1037,7 +1023,7 @@ msgstr[0] "Keskustelu palautettu kansioon %s"
 msgstr[1] "Keskustelut palautettu kansioon %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:648
+#: src/client/application/application-controller.vala:665
 msgid "Conversation archived"
 msgid_plural "Conversations archived"
 msgstr[0] "Keskustelu arkistoitu"
@@ -1045,7 +1031,7 @@ msgstr[1] "Keskustelut arkistoitu"
 
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:704
+#: src/client/application/application-controller.vala:721
 #, c-format
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
@@ -1053,7 +1039,7 @@ msgstr[0] "Viesti palautettu kansioon %s"
 msgstr[1] "Viestit palautettu kansioon %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:725
+#: src/client/application/application-controller.vala:742
 msgid "Message archived"
 msgid_plural "Messages archived"
 msgstr[0] "Viesti arkistoitu"
@@ -1062,7 +1048,7 @@ msgstr[1] "Viestit arkistoitu"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:760
+#: src/client/application/application-controller.vala:777
 #, c-format
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
@@ -1072,7 +1058,7 @@ msgstr[1] "Viestit siirretty kansioon %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:788
+#: src/client/application/application-controller.vala:805
 #, c-format
 msgid "Conversation labelled as %s"
 msgid_plural "Conversations labelled as %s"
@@ -1082,19 +1068,19 @@ msgstr[1] "Keskustelut merkitty tunnisteella %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:796
+#: src/client/application/application-controller.vala:813
 #, c-format
 msgid "Conversation un-labelled as %s"
 msgid_plural "Conversations un-labelled as %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Poistettu merkintä %s keskustelulta"
+msgstr[1] "Poistettu merkintä %s keskusteluilta"
 
-#: src/client/application/application-controller.vala:1217
+#: src/client/application/application-controller.vala:1297
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Kohteen %s tietokannan avaaminen epäonnistui"
 
-#: src/client/application/application-controller.vala:1218
+#: src/client/application/application-controller.vala:1298
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -1120,20 +1106,20 @@ msgstr ""
 "niiden liitteet. <b>Toimenpiteellä ei ole vaikutusta palvelimella oleviin "
 "viesteihin ja liitteisiin.</b>"
 
-#: src/client/application/application-controller.vala:1220
+#: src/client/application/application-controller.vala:1300
 msgid "_Rebuild"
 msgstr "Ra_kenna uudelleen"
 
-#: src/client/application/application-controller.vala:1220
+#: src/client/application/application-controller.vala:1300
 msgid "E_xit"
 msgstr "_Poistu"
 
-#: src/client/application/application-controller.vala:1230
+#: src/client/application/application-controller.vala:1310
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Tietokannan jälleenrakennus tilille “%s” epäonnistui"
 
-#: src/client/application/application-controller.vala:1231
+#: src/client/application/application-controller.vala:1311
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -1146,135 +1132,139 @@ 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:1461
+#: src/client/application/application-controller.vala:1478
 #, c-format
 msgid "Email sent to %s"
 msgstr "Viesti vastaanottajalle %s lähetetty"
 
 #. / 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:2557
+#: src/client/application/application-controller.vala:2509
 #, c-format
 msgid "Email to %s queued for delivery"
 msgstr "Viesti vastaanottajalle %s asetettu jonoon toimitusta varten"
 
 #. / 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:2621
+#: src/client/application/application-controller.vala:2573
 #, c-format
 msgid "Email to %s saved"
 msgstr "Viesti vastaanottajalle %s tallennettu"
 
 #. / Translators: A label for an in-app notification.
-#: src/client/application/application-controller.vala:2636
-#: src/client/application/application-controller.vala:2694
+#: src/client/application/application-controller.vala:2588
+#: src/client/application/application-controller.vala:2646
 msgid "Composer could not be restored"
 msgstr "Lähetintä ei voitu palauttaa"
 
 #. / 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:2679
+#: src/client/application/application-controller.vala:2631
 #, c-format
 msgid "Email to %s discarded"
 msgstr "Viesti vastaanottajalle %s hylätty"
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:532
+#: src/client/application/application-main-window.vala:540
 msgid "Working offline"
 msgstr "Työskennellään offline-tilassa"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:534
+#: src/client/application/application-main-window.vala:542
 msgid "You will not be able to send or receive email until re-connected."
 msgstr ""
 "Viestien vastaanottaminen tai lähettäminen ei onnistu, ennen kuin yhteys on "
 "muodostettu uudelleen."
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:541
+#: src/client/application/application-main-window.vala:549
 msgid "Login problem"
 msgstr "Kirjautumisongelma"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:543
+#: src/client/application/application-main-window.vala:551
 msgid "An account has reported an incorrect login or password."
 msgstr "Tili ilmoitti väärästä käyttäjätunnuksesta tai salasanasta."
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:549
+#: src/client/application/application-main-window.vala:558
 msgid "Retry login, you will be prompted for your password"
 msgstr "Yritä uudelleen kirjautumista, sinulta kysytään salasanaa"
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:556
+#: src/client/application/application-main-window.vala:565
 msgid "Security problem"
 msgstr "Tietoturvaongelma"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:558
-msgid "An account has reported an untrusted server.."
-msgstr "Tili on ilmoittanut ei-luotetusta palvelimesta."
+#: src/client/application/application-main-window.vala:567
+msgid "An account has reported an untrusted server."
+msgstr "Tili ilmoitti ei-luotetusta palvelimesta."
 
 #. Translators: An info bar button label
-#: src/client/application/application-main-window.vala:561
+#: src/client/application/application-main-window.vala:570
 msgid "Check"
 msgstr "Tarkista"
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:564
+#: src/client/application/application-main-window.vala:574
 msgid "Check the security details for the connection"
 msgstr "Tarkista yhteyden salaustiedot"
 
 #. / 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:597
+#: src/client/application/application-main-window.vala:617
 #, c-format
 msgid "%s — %s"
 msgstr "%s — %s"
 
-#: src/client/application/application-main-window.vala:993
+#. Translators: The name of the folder group containing
+#. folders created by people (as opposed to special-use
+#. folders)
+#: src/client/application/application-main-window.vala:996
+#: src/client/folder-list/folder-list-account-branch.vala:43
 msgid "Labels"
 msgstr "Tunnisteet"
 
+#: src/client/application/application-main-window.vala:1293
+#, c-format
+msgid "Empty all email from your %s folder?"
+msgstr "Poistetaanko kaikki viesit \"%s\"-kansiosta?"
+
+#: src/client/application/application-main-window.vala:1294
+msgid "This removes the email from Geary and your email server."
+msgstr "Tämä poistaa viestit Gearysta ja sähköpostipalvelimelta."
+
+#: src/client/application/application-main-window.vala:1295
+msgid "This cannot be undone."
+msgstr "Toimintoa ei voi perua."
+
+#: src/client/application/application-main-window.vala:1296
+#, c-format
+msgid "Empty %s"
+msgstr "Tyhjennä %s"
+
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1337
+#: src/client/application/application-main-window.vala:1353
 msgid "Do you want to permanently delete this conversation?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Haluatko poistaa tämän keskustelun pysyvästi?"
 msgstr[1] "Haluatko poistaa nämä keskustelut pysyvästi?"
 
-#: src/client/application/application-main-window.vala:1342
-#: src/client/application/application-main-window.vala:1357
+#: src/client/application/application-main-window.vala:1358
+#: src/client/application/application-main-window.vala:1373
 msgid "Delete"
 msgstr "Poista"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1352
+#: src/client/application/application-main-window.vala:1368
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Haluatko poistaa tämän viestin pysyvästi?"
 msgstr[1] "Haluatko poistaa nämä viestit pysyvästi?"
 
-#: src/client/application/application-main-window.vala:1365
-#, c-format
-msgid "Empty all email from your %s folder?"
-msgstr "Poistetaanko kaikki viesit \"%s\"-kansiosta?"
-
-#: src/client/application/application-main-window.vala:1368
-msgid "This removes the email from Geary and your email server."
-msgstr "Tämä poistaa viestit Gearysta ja sähköpostipalvelimelta."
-
-#: src/client/application/application-main-window.vala:1369
-msgid "This cannot be undone."
-msgstr "Toimintoa ei voi perua."
-
-#: src/client/application/application-main-window.vala:1370
-#, c-format
-msgid "Empty %s"
-msgstr "Tyhjennä %s"
-
-#: src/client/application/application-main-window.vala:1700
+#: src/client/application/application-main-window.vala:1691
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1285,7 +1275,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:1839
+#: src/client/composer/composer-widget.vala:1989
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -1306,13 +1296,13 @@ msgstr ""
 msgid "Don’t _ask me again"
 msgstr "_Älä kysy uudelleen"
 
-#: src/client/components/components-inspector.vala:72
+#: src/client/components/components-inspector.vala:78
 msgid "Inspector"
 msgstr "Tutki"
 
 #. / Translators: Title for Inspector logs pane
 #. / Translators: Title for problem report dialog logs pane
-#: src/client/components/components-inspector.vala:87
+#: src/client/components/components-inspector.vala:93
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:102
 msgid "Logs"
 msgstr "Lokit"
@@ -1320,47 +1310,47 @@ msgstr "Lokit"
 #. / Translators: Title for Inspector system system information pane
 #. / Translators: Title for problem report system information
 #. / pane
-#: src/client/components/components-inspector.vala:91
+#: src/client/components/components-inspector.vala:97
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:105
 msgid "System"
 msgstr "Järjestelmä"
 
 #. Button label for saving problem report information
-#: src/client/components/components-inspector.vala:208
-#: src/client/components/components-inspector.vala:211
+#: src/client/components/components-inspector.vala:226
+#: src/client/components/components-inspector.vala:229
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:221
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:224
 #: ui/problem-details-dialog.ui:42
 msgid "Save As"
 msgstr "Tallenna nimellä"
 
-#: src/client/components/components-inspector.vala:212
+#: src/client/components/components-inspector.vala:230
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:225
 #: ui/accounts_editor_servers_pane.ui:17
 msgid "Cancel"
 msgstr "Peru"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:52
+#: src/client/components/components-preferences-window.vala:124
 msgid "_Automatically select next message"
 msgstr "_Valitse automaattisesti seuraava viesti"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:62
+#: src/client/components/components-preferences-window.vala:134
 msgid "_Display conversation preview"
 msgstr "N_äytä keskustelun esikatselu"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:72
+#: src/client/components/components-preferences-window.vala:144
 msgid "Use _three pane view"
 msgstr "Kä_ytä kolmen paneelin näkymää"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:82
+#: src/client/components/components-preferences-window.vala:154
 msgid "Use _single key email shortcuts"
 msgstr "Käytä _yhden näppäimen pikanäppäimiä"
 
-#: src/client/components/components-preferences-window.vala:84
+#: src/client/components/components-preferences-window.vala:156
 msgid ""
 "Enable keyboard shortcuts for email actions that do not require pressing "
 "<Ctrl>"
@@ -1369,22 +1359,22 @@ msgstr ""
 "näppäimen painallusta"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:95
+#: src/client/components/components-preferences-window.vala:167
 msgid "_Watch for new mail when closed"
 msgstr "_Tarkkaile uusia viestejä suljettuna"
 
 #. / Translators: Preferences tooltip
-#: src/client/components/components-preferences-window.vala:99
+#: src/client/components/components-preferences-window.vala:171
 msgid "Geary will keep running after all windows are closed"
 msgstr "Geary jatkaa käynnissä olemista kun kaikki ikkunat on suljettu"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:117
+#: src/client/components/components-preferences-window.vala:189
 msgid "Preferences"
 msgstr "Asetukset"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:179
+#: src/client/components/components-preferences-window.vala:252
 msgid "Plugins"
 msgstr "Liitännäiset"
 
@@ -1460,7 +1450,7 @@ msgstr "_Yritä uudelleen"
 #. / Translators: Search entry placeholder text
 #: src/client/components/components-search-bar.vala:12
 #: src/client/folder-list/folder-list-search-branch.vala:53
-#: src/engine/api/geary-special-folder-type.vala:51
+#: src/client/util/util-i18n.vala:298
 msgid "Search"
 msgstr "Etsi"
 
@@ -1479,27 +1469,27 @@ msgstr "Etsi tililtä %s"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but one is not provided.
-#: src/client/components/components-validator.vala:390
+#: src/client/components/components-validator.vala:394
 msgid "An email address is required"
 msgstr "Sähköpostiosoite vaaditaan"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but the address is invalid.
-#: src/client/components/components-validator.vala:394
+#: src/client/components/components-validator.vala:398
 msgid "Not a valid email address"
 msgstr "Virheellinen sähköpostiosoite"
 
 #. Translators: Tooltip used when an entry requires a valid,
 #. resolvable server name to be entered, but one is not
 #. provided.
-#: src/client/components/components-validator.vala:440
+#: src/client/components/components-validator.vala:444
 msgid "A server name is required"
 msgstr "Palvelimen nimi vaaditaan"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. server name to be entered, but it was unable to be
 #. looked-up in the DNS.
-#: src/client/components/components-validator.vala:445
+#: src/client/components/components-validator.vala:449
 msgid "Could not look up server name"
 msgstr "Palvelimen nimeä ei voitu kysellä"
 
@@ -1559,7 +1549,9 @@ msgstr "Virhe lähetettyä postia tallennettaessa"
 msgid "_OK"
 msgstr "_OK"
 
-#: src/client/components/stock.vala:19 ui/password-dialog.glade:196
+#: src/client/components/stock.vala:19
+#: src/client/plugin/mail-merge/mail-merge.vala:388
+#: ui/password-dialog.glade:196
 msgid "_Cancel"
 msgstr "_Peru"
 
@@ -1579,15 +1571,17 @@ msgstr "_Sulje"
 msgid "_Discard"
 msgstr "_Hylkää"
 
-#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:52
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:42
 msgid "_Help"
 msgstr "_Ohje"
 
-#: src/client/components/stock.vala:26 ui/components-attachment-pane-menus.ui:7
+#: src/client/components/stock.vala:26
+#: src/client/plugin/mail-merge/mail-merge.vala:387
+#: ui/components-attachment-pane-menus.ui:7
 msgid "_Open"
 msgstr "_Avaa"
 
-#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:42
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:32
 msgid "_Preferences"
 msgstr "_Asetukset"
 
@@ -1626,23 +1620,23 @@ msgid "Invalid email address"
 msgstr "Virheellinen sähköpostiosoite"
 
 #. / Translators: Title for an empty composer window
-#: src/client/composer/composer-widget.vala:30
+#: src/client/composer/composer-widget.vala:35
 msgid "New Message"
 msgstr "Uusi viesti"
 
-#: src/client/composer/composer-widget.vala:217
+#: src/client/composer/composer-widget.vala:239
 msgid "Saved"
 msgstr "Tallennettu"
 
-#: src/client/composer/composer-widget.vala:218
+#: src/client/composer/composer-widget.vala:240
 msgid "Saving"
 msgstr "Tallennetaan"
 
-#: src/client/composer/composer-widget.vala:219
+#: src/client/composer/composer-widget.vala:241
 msgid "Error saving"
 msgstr "Virhe tallentaessa"
 
-#: src/client/composer/composer-widget.vala:220
+#: src/client/composer/composer-widget.vala:242
 msgid "Press Backspace to delete quote"
 msgstr "Paina askelpalautinta poistaaksesi lainauksen"
 
@@ -1651,7 +1645,7 @@ msgstr "Paina askelpalautinta poistaaksesi lainauksen"
 #. 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:236
+#: src/client/composer/composer-widget.vala:258
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1663,90 +1657,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:843
+#: src/client/composer/composer-widget.vala:997
 msgid "Do you want to keep or discard this draft message?"
 msgstr "Haluatko säilyttää vai hylätä tämän luonnosviestin?"
 
 #. 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:869
+#: src/client/composer/composer-widget.vala:1023
 msgid "Do you want to discard this draft message?"
 msgstr "Haluatko hylätä tämän luonnosviestin?"
 
-#: src/client/composer/composer-widget.vala:1508
+#: src/client/composer/composer-widget.vala:1645
 msgid "Send message with an empty subject and body?"
 msgstr "Lähetetäänkö viesti ilman aihetta ja sisältöä?"
 
-#: src/client/composer/composer-widget.vala:1510
+#: src/client/composer/composer-widget.vala:1647
 msgid "Send message with an empty subject?"
 msgstr "Lähetetäänkö viesti ilman aihetta?"
 
-#: src/client/composer/composer-widget.vala:1512
+#: src/client/composer/composer-widget.vala:1649
 msgid "Send message with an empty body?"
 msgstr "Lähetetäänkö viesti ilman sisältöä?"
 
-#: src/client/composer/composer-widget.vala:1521
+#: src/client/composer/composer-widget.vala:1658
 msgid "Send message without an attachment?"
 msgstr "Lähetetäänkö viesti ilman liitettä?"
 
-#: src/client/composer/composer-widget.vala:1825
+#: src/client/composer/composer-widget.vala:1977
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "“%s” on jo liitetty lähetystä varten."
 
-#: src/client/composer/composer-widget.vala:1861
-#: src/client/composer/composer-widget.vala:1911
+#: src/client/composer/composer-widget.vala:2009
+#: src/client/composer/composer-widget.vala:2059
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "“%s” on tyhjä tiedosto."
 
-#: src/client/composer/composer-widget.vala:1899
+#: src/client/composer/composer-widget.vala:2047
 #, c-format
 msgid "“%s” could not be found."
 msgstr "Kohdetta “%s” ei löytynyt."
 
-#: src/client/composer/composer-widget.vala:1905
+#: src/client/composer/composer-widget.vala:2053
 #, c-format
 msgid "“%s” is a folder."
 msgstr "“%s” on kansio."
 
-#: src/client/composer/composer-widget.vala:1924
+#: src/client/composer/composer-widget.vala:2072
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "Kohteen “%s” avaus lukua varten epäonnistui."
 
-#: src/client/composer/composer-widget.vala:1932
+#: src/client/composer/composer-widget.vala:2080
 msgid "Cannot add attachment"
 msgstr "Liitteen lisäys epäonnistui"
 
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:1989
-#: src/client/conversation-viewer/conversation-email.vala:559
-#: src/client/util/util-email.vala:235 ui/conversation-message.ui:312
+#: src/client/composer/composer-widget.vala:2140
+#: src/client/conversation-viewer/conversation-email.vala:542
+#: src/client/util/util-email.vala:249 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "Vastaanottaja:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1995
-#: src/client/conversation-viewer/conversation-email.vala:564
-#: src/client/util/util-email.vala:240 ui/conversation-message.ui:357
+#: src/client/composer/composer-widget.vala:2146
+#: src/client/conversation-viewer/conversation-email.vala:547
+#: src/client/util/util-email.vala:254 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "Kopio:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:2001
-#: src/client/conversation-viewer/conversation-email.vala:569
+#: src/client/composer/composer-widget.vala:2152
+#: src/client/conversation-viewer/conversation-email.vala:552
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "Piilokopio:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:2007
+#: src/client/composer/composer-widget.vala:2158
 msgid "Reply-To: "
 msgstr "Vastausosoite: "
 
-#: src/client/composer/composer-widget.vala:2259
+#: src/client/composer/composer-widget.vala:2410
 msgid "Select Color"
 msgstr "Valitse väri"
 
@@ -1755,20 +1749,14 @@ msgstr "Valitse väri"
 #. 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:2445
+#: src/client/composer/composer-widget.vala:2599
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s välityksellä %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:2501
-msgid "_From:"
-msgstr "_Lähettäjä:"
-
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2806
+#: src/client/composer/composer-widget.vala:2959
 msgid "Images"
 msgstr "Kuvat"
 
@@ -1785,51 +1773,51 @@ msgid "Search for more languages"
 msgstr "Etsi lisää kieliä"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:335
+#: src/client/conversation-list/conversation-list-view.vala:339
 msgid "Move conversation to _Trash"
 msgid_plural "Move conversations to _Trash"
 msgstr[0] "Siirrä keskustelu _roskakoriin"
 msgstr[1] "Siirrä keskustelut _roskakoriin"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:347
+#: src/client/conversation-list/conversation-list-view.vala:351
 msgid "_Delete conversation"
 msgid_plural "_Delete conversations"
 msgstr[0] "_Poista keskustelu"
 msgstr[1] "_Poista keskustelut"
 
-#: src/client/conversation-list/conversation-list-view.vala:360
+#: src/client/conversation-list/conversation-list-view.vala:364
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Merkitse _luetuksi"
 
-#: src/client/conversation-list/conversation-list-view.vala:368
+#: src/client/conversation-list/conversation-list-view.vala:372
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Merkitse l_ukemattomaksi"
 
-#: src/client/conversation-list/conversation-list-view.vala:376
+#: src/client/conversation-list/conversation-list-view.vala:380
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "_Poista tähti"
 
-#: src/client/conversation-list/conversation-list-view.vala:383
+#: src/client/conversation-list/conversation-list-view.vala:387
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "_Merkitse tähdellä"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:392
+#: src/client/conversation-list/conversation-list-view.vala:396
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: src/client/conversation-list/conversation-list-view.vala:398
+#: src/client/conversation-list/conversation-list-view.vala:402
 msgid "R_eply All"
 msgstr "_Vastaa kaikille"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:404
+#: src/client/conversation-list/conversation-list-view.vala:408
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Lähetä edelleen"
@@ -1839,20 +1827,20 @@ msgid "Me"
 msgstr "Minä"
 
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:554
-#: src/client/util/util-email.vala:226
+#: src/client/conversation-viewer/conversation-email.vala:537
+#: src/client/util/util-email.vala:240
 msgid "From:"
 msgstr "Lähettäjä:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:574
-#: src/client/util/util-email.vala:231
+#: src/client/conversation-viewer/conversation-email.vala:557
+#: src/client/util/util-email.vala:245
 msgid "Date:"
 msgstr "Päiväys:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:584
-#: src/client/util/util-email.vala:229
+#: src/client/conversation-viewer/conversation-email.vala:567
+#: src/client/util/util-email.vala:243
 msgid "Subject:"
 msgstr "Aihe:"
 
@@ -1880,23 +1868,43 @@ msgstr "%d lisää…"
 #. 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:530
+#: src/client/conversation-viewer/conversation-message.vala:529
 msgid "No sender"
 msgstr "Ei lähettäjää"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:923
+#: src/client/conversation-viewer/conversation-message.vala:920
 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:1043
+#: src/client/conversation-viewer/conversation-message.vala:1040
 msgid "Image"
 msgstr "Kuva"
 
+#. Translators: Info bar status message
+#: src/client/conversation-viewer/conversation-message.vala:1305
+msgid "Remote images not shown"
+msgstr "Etäkuvia ei näytetä"
+
+#. Translators: Info bar description
+#: src/client/conversation-viewer/conversation-message.vala:1307
+msgid "Only show remote images from senders you trust."
+msgstr "Näytä etäkuvat vain lähettäjiltä, joihin luotat."
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1311
+msgid "Show"
+msgstr "Näytä"
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1315
+msgid "Always show from sender"
+msgstr "Näytä aina lähettäjältä"
+
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
 #: src/client/conversation-viewer/conversation-viewer.vala:83
@@ -2040,26 +2048,32 @@ msgstr "Yksityiskohdat"
 msgid "Geary requires your email password to continue"
 msgstr "Geary vaatii sähköpostisalasanasi jatkamista varten"
 
-#. Label displaying total number of email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:32
+#. Translators: Label displaying total number of email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:42
 #, c-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] "%d viesti"
 msgstr[1] "%d viestiä"
 
-#. / Label displaying number of unread email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:39
+#. Translators: Label displaying number of unread email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:52
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d lukematon"
 msgstr[1] "%d lukematonta"
 
-#. / This string represents the divider between two messages: "n messages" and "n unread",
-#. / shown in the folder list as a tooltip.  Please use your languages conventions for
-#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: src/client/folder-list/folder-list-folder-entry.vala:45
+#. Translators: This string represents the divider between two
+#. messages: "n messages" and "n unread", shown in the folder
+#. list as a tooltip.  Please use your languages conventions
+#. for combining the two, i.e. a comma (",") for English; "6
+#. messages, 3 unread"
+#: src/client/folder-list/folder-list-folder-entry.vala:60
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
@@ -2075,12 +2089,18 @@ msgid_plural "%d results"
 msgstr[0] "%d tulos"
 msgstr[1] "%d tulosta"
 
+#. Translators: This is an internal plugin so this name does not need
+#. to be tanslated
+#: src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in:6
+msgid "Desktop Notifications"
+msgstr "Työpöytäilmoitukset"
+
 #. / Notification body when a message as been received
 #. / and other unread messages have not been
 #. / seen. First string substitution is the message
 #. / subject and the second is the number of unseen
 #. / messages
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:126
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:138
 #, c-format
 msgid ""
 "%s\n"
@@ -2099,7 +2119,7 @@ msgstr[1] ""
 #. / received at the same time and other unseen messages
 #. / exist. String substitution is the number of new
 #. / messages that have arrived.
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:145
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:157
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@@ -2112,7 +2132,7 @@ msgstr[1] "%d uutta viestiä"
 #. / above with the number of new messages that have
 #. / arrived, number substitution is the total number
 #. / of unseen messages.
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:155
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:167
 #, c-format
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
@@ -2121,17 +2141,194 @@ msgstr[1] "%s, %d uutta viestiä yhteensä"
 
 #. / Notification title when new messages have been
 #. / received
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:272
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:282
 msgid "New message"
 msgid_plural "New messages"
 msgstr[0] "Uusi viesti"
 msgstr[1] "Uusia viestejä"
 
-#: src/client/plugin/messaging-menu/messaging-menu.vala:70
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:4
+msgid "Email Templates"
+msgstr "Sähköpostin mallipohjat"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:5
+msgid "Create reusable templates for sending email"
+msgstr "Luo uudelleenkäytettäviä mallipohjia viestien lähettämiseen"
+
+#. Translators: Templates folder name alternatives. 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/client/plugin/email-templates/email-templates.vala:29
+#: src/client/plugin/mail-merge/mail-merge.vala:29
+#| msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgid "Templates | Template Mail | Template Email | Template E-Mail"
+msgstr "Mallipohjat | Mallit | Sähköpostin pohja | Viestipohjat"
+
+#. Translators: The name of the folder used to
+#. store email templates
+#: src/client/plugin/email-templates/email-templates.vala:201
+msgid "Templates"
+msgstr "Mallipohjat"
+
+#. Translators: Info bar button label for creating a
+#. new email template
+#: src/client/plugin/email-templates/email-templates.vala:282
+msgid "New"
+msgstr "Uusi"
+
+#. Translators: Infobar status label for an email template
+#: src/client/plugin/email-templates/email-templates.vala:293
+msgid "Message template"
+msgstr "Viestin mallipohja"
+
+#. Translators: Info bar button label for sending an
+#. email template
+#: src/client/plugin/email-templates/email-templates.vala:297
+msgid "Send"
+msgstr "Lähetä"
+
+#. Translators: Info bar button label for editing an
+#. existing email template
+#. Translators: Info bar button label for editing a draft
+#. email
+#: src/client/plugin/email-templates/email-templates.vala:305
+#: src/client/plugin/mail-merge/mail-merge.vala:332
+#: src/client/plugin/special-folders/special-folders.vala:187
+msgid "Edit"
+msgstr "Muokkaa"
+
+#. Translators: This is an internal plugin so this name does not need
+#. to be tanslated
+#: src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in:6
+msgid "Folder Highlight"
+msgstr "Kansion korostus"
+
+#. / Translators: Menu item label for invoking mail
+#. / merge in composer
+#. / Translators: File chooser title after invoking mail
+#. / merge in composer
+#. Translators: The name of the folder used to
+#. display merged email
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:5
+#: src/client/plugin/mail-merge/mail-merge.vala:284
+#: src/client/plugin/mail-merge/mail-merge.vala:385
+#: src/client/plugin/mail-merge/mail-merge.vala:484
+msgid "Mail Merge"
+msgstr "Sähköpostin yhdistäminen"
+
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:6
+msgid "Fill in and send email templates using a spreadsheet"
+msgstr "Täytä ja lähetä sähköpostin mallipohjia taulukkoa käyttäen"
+
+#. Translators: Info bar label for starting sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:118
+msgid "Start"
+msgstr "Käynnistä"
+
+#. Translators: Info bar label for pausing sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:130
+msgid "Pause"
+msgstr "Keskeytä"
+
+#. Translators: Info bar description for the mail merge
+#. folder. The first string substitution the number of email
+#. already sent, the second is the total number to send.
+#: src/client/plugin/mail-merge/mail-merge.vala:239
+#, c-format
+msgid "Sent %u of %u"
+msgstr "Lähetetty %u/%u"
+
+#. Translators: Infobar status label for an email mail merge
+#. template
+#: src/client/plugin/mail-merge/mail-merge.vala:320
+msgid "Mail merge template"
+msgstr "Sähköpostin yhdistämisen mallipohja"
+
+#. Translators: Info bar button label for performing a
+#. mail-merge on an email template
+#: src/client/plugin/mail-merge/mail-merge.vala:324
+msgid "Merge"
+msgstr "Yhdistä"
+
+#. / Translators: Action bar menu button label for
+#. / mail-merge plugin
+#: src/client/plugin/mail-merge/mail-merge.vala:373
+msgid "Insert field"
+msgstr "Lisää kenttä"
+
+#. / Translators: File chooser filer label
+#: src/client/plugin/mail-merge/mail-merge.vala:392
+msgid "Comma separated values (CSV)"
+msgstr "Pilkuin erotetut arvot (CSV)"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
+msgid "Messaging Menu"
+msgstr "Viestintävalikko"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:5
+msgid "Displays Unity Messaging Menu notifications for new email"
+msgstr "Näytä Unity-viestintävalikon ilmoitukset uusista viesteistä"
+
+#: src/client/plugin/messaging-menu/messaging-menu.vala:79
 #, c-format
 msgid "%s — New Messages"
 msgstr "%s — Uusia viestejä"
 
+#. Translators: This is an internal plugin so this name does not need
+#. to be tanslated.
+#: src/client/plugin/notification-badge/notification-badge.plugin.desktop.in:6
+msgid "Notification Badge"
+msgstr "Ilmoitusponnahdukset"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
+msgid "Sent Sound"
+msgstr "Lähetyksen ääni"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:5
+msgid "Plays the desktop sent-mail sound when an email is sent"
+msgstr ""
+"Toistaa työpöydän \"sähköposti lähetetty\"-äänen, kun viesti on lähetetty"
+
+#. Translators: This is an internal plugin so this name does not need
+#. to be tanslated.
+#: src/client/plugin/special-folders/special-folders.plugin.desktop.in:6
+msgid "Special Folders"
+msgstr "Erikoiskansiot"
+
+#. Translators: Info bar button label for emptying
+#. trash/spam folders
+#: src/client/plugin/special-folders/special-folders.vala:167
+msgid "Empty"
+msgstr "Tyhjennä"
+
+#. Translators: Info bar status message for a draft email
+#: src/client/plugin/special-folders/special-folders.vala:179
+msgid "Draft message"
+msgstr "Luonnosviesti"
+
+#. Translators: Info bar status description for a draft
+#. email
+#: src/client/plugin/special-folders/special-folders.vala:182
+msgid "This message has not yet been sent."
+msgstr "Tätä viestiä ei ole vielä lähetetty."
+
+#. Translators: Info bar status message for an sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:198
+msgid "Message not saved"
+msgstr "Viestiä ei tallennettu"
+
+#. Translators: Info bar status description for a sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:201
+msgid "This message was sent, but has not been saved to your account."
+msgstr ""
+"Tämä viesti lähetettiin onnistuneesti, mutta sen tallennus tilillesi "
+"epäonnistui."
+
 #. / Datetime format for 12-hour time, i.e. 8:31 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: src/client/util/util-date.vala:69
@@ -2200,32 +2397,37 @@ msgstr "Eilen"
 msgid "%A"
 msgstr "%A"
 
-#. / 12 hours format for datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:216
+#. / 12 hours format for datetime that a message being replied
+#. / to was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:218
 msgid "%a, %b %-e, %Y at %l:%M %P"
 msgstr "%a, %b %-e, %Y klo %l:%M %P"
 
-#. / 24 hours format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:220
+#. / 24 hours format for the datetime that a message being
+#. / replied to was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:224
 msgid "%a, %b %-e, %Y at %H:%M"
 msgstr "%a, %e. %b %Y klo %X"
 
-#. / Format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:224
+#. / Format for the datetime that a message being replied to
+#. / was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:230
 msgid "%a, %b %-e, %Y at %X"
 msgstr "%a, %e. %b %Y klo %X"
 
-#: src/client/util/util-email.vala:38
+#. Translators: Label used when an email has a missing or
+#. an empty subject
+#: src/client/util/util-email.vala:50
 msgid "(No subject)"
 msgstr "(Ei aihetta)"
 
 #. / Translators: This is shown for displaying a list of email
 #. / recipients that happens to be empty, i.e. contains no
 #. / email addresses.
-#: src/client/util/util-email.vala:134
+#: src/client/util/util-email.vala:148
 msgid "(No recipients)"
 msgstr "(Ei vastaanottajia)"
 
@@ -2234,7 +2436,7 @@ msgstr "(Ei vastaanottajia)"
 #. / addresses. The first (string) substitution is
 #. / address of the first, the second substitution is
 #. / the number of n - 1 remaining recipients.
-#: src/client/util/util-email.vala:146
+#: src/client/util/util-email.vala:160
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
@@ -2244,26 +2446,26 @@ msgstr[1] "%s ja %d muuta"
 #. / The quoted header for a message being replied to.
 #. / %1$s will be substituted for the date, and %2$s will be substituted for
 #. / the original sender.
-#: src/client/util/util-email.vala:179
+#: src/client/util/util-email.vala:193
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr "%1$s %2$s kirjoitti:"
 
 #. / The quoted header for a message being replied to (in case the date is not known).
 #. / %s will be replaced by the original sender.
-#: src/client/util/util-email.vala:186
+#: src/client/util/util-email.vala:200
 #, c-format
 msgid "%s wrote:"
 msgstr "%s kirjoitti:"
 
 #. / The quoted header for a message being replied to (in case the sender is not known).
 #. / %s will be replaced by the original date
-#: src/client/util/util-email.vala:192
+#: src/client/util/util-email.vala:206
 #, c-format
 msgid "On %s:"
 msgstr "%s:"
 
-#: src/client/util/util-email.vala:221
+#: src/client/util/util-email.vala:235
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Edelleenlähetetty viesti ----------"
 
@@ -2291,43 +2493,43 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "kt"
 
-#: src/engine/api/geary-special-folder-type.vala:24
+#: src/client/util/util-i18n.vala:271
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#: src/engine/api/geary-special-folder-type.vala:27
+#: src/client/util/util-i18n.vala:274
 msgid "Drafts"
 msgstr "Luonnokset"
 
-#: src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
+#: src/client/util/util-i18n.vala:277
+msgid "Sent"
 msgstr "Lähetetyt"
 
-#: src/engine/api/geary-special-folder-type.vala:33
+#: src/client/util/util-i18n.vala:280
 msgid "Starred"
 msgstr "Tähdelliset"
 
-#: src/engine/api/geary-special-folder-type.vala:36
+#: src/client/util/util-i18n.vala:283
 msgid "Important"
 msgstr "Tärkeä"
 
-#: src/engine/api/geary-special-folder-type.vala:39
+#: src/client/util/util-i18n.vala:286
 msgid "All Mail"
 msgstr "Kaikki"
 
-#: src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
+#: src/client/util/util-i18n.vala:289
+msgid "Junk"
 msgstr "Roskaposti"
 
-#: src/engine/api/geary-special-folder-type.vala:45
+#: src/client/util/util-i18n.vala:292
 msgid "Trash"
 msgstr "Roskakori"
 
-#: src/engine/api/geary-special-folder-type.vala:48
+#: src/client/util/util-i18n.vala:295
 msgid "Outbox"
 msgstr "Lähetetyt"
 
-#: src/engine/api/geary-special-folder-type.vala:54
+#: src/client/util/util-i18n.vala:301
 msgid "Archive"
 msgstr "Arkisto"
 
@@ -2503,7 +2705,7 @@ msgstr "lukematon"
 #. 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:882
+#: src/engine/imap-engine/imap-engine-generic-account.vala:996
 msgid "Drafts | Draft"
 msgstr "Luonnokset | Luonnos | Drafts | Draft"
 
@@ -2511,22 +2713,22 @@ msgstr "Luonnokset | Luonnos | Drafts | Draft"
 #. 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:891
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1005
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "Lähetetyt | Sent | Sent Mail | Sent Email | Sent E-Mail"
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:896
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1010
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Lähetetyt"
 
 #. List of general possible folder names to match for the
-#. 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:906
+#. Junk/Spam mailbox. Separate names using a vertical bar
+#. and put the most common localized name to the front for
+#. the default. English names do not need to be included.
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1020
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2538,13 +2740,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:916
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1030
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Roskakori | 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:921
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1035
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Poistetut"
@@ -2553,21 +2755,21 @@ msgstr "Poistetut"
 #. 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:931
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1045
 msgid "Archive | Archives"
 msgstr "Arkisto | Arkistot | Archive | Archives"
 
-#: src/engine/rfc822/rfc822-message.vala:462
+#: src/engine/rfc822/rfc822-message.vala:528
 #, c-format
 msgid "Could not determine mime type for “%s”."
 msgstr "Kohteen “%s” MIME-tyyppia ei voitu selvittää."
 
-#: src/engine/rfc822/rfc822-message.vala:473
+#: src/engine/rfc822/rfc822-message.vala:539
 #, c-format
 msgid "Could not determine content type for mime type “%s” on “%s”."
 msgstr ""
 
-#: src/engine/rfc822/rfc822-message.vala:1004
+#: src/engine/rfc822/rfc822-message.vala:1013
 msgid "(no subject)"
 msgstr "(ei aihetta)"
 
@@ -2576,14 +2778,14 @@ msgid "Add an account"
 msgstr "Lisää tili"
 
 #: ui/accounts_editor_add_pane.ui:53
-msgid "Create"
-msgstr "Luo"
+msgid "_Create"
+msgstr "_Luo"
 
-#: ui/accounts_editor_add_pane.ui:130 ui/accounts_editor_servers_pane.ui:125
+#: ui/accounts_editor_add_pane.ui:131 ui/accounts_editor_servers_pane.ui:125
 msgid "Receiving"
 msgstr "Vastaanottaminen"
 
-#: ui/accounts_editor_add_pane.ui:178 ui/accounts_editor_servers_pane.ui:165
+#: ui/accounts_editor_add_pane.ui:179 ui/accounts_editor_servers_pane.ui:165
 msgid "Sending"
 msgstr "Lähettäminen"
 
@@ -2748,168 +2950,168 @@ msgid "_Inspect…"
 msgstr "T_utki…"
 
 #. Geary account mail will be sent from
-#: ui/composer-widget.ui:60
-msgid "From"
-msgstr "Lähettäjä"
+#: ui/composer-widget.ui:61
+msgid "_From"
+msgstr "_Lähettäjä"
 
 #. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:130
+#: ui/composer-widget.ui:131
 msgid "_To"
 msgstr "_Vastaanottaja"
 
-#: ui/composer-widget.ui:158
+#: ui/composer-widget.ui:159
 msgid "Show Cc, Bcc, and Reply-To fields"
 msgstr "Näytä Kopio- (CC), Piilokopio- (BCC) ja Vastausosoite-kentät"
 
-#: ui/composer-widget.ui:219
+#: ui/composer-widget.ui:220
 msgid "_Cc"
 msgstr "_Kopio"
 
-#: ui/composer-widget.ui:267
+#: ui/composer-widget.ui:268
 msgid "_Bcc"
 msgstr "_Piilokopio"
 
-#: ui/composer-widget.ui:315
+#: ui/composer-widget.ui:316
 msgid "_Reply-To"
 msgstr "Vasta_usosoite"
 
-#: ui/composer-widget.ui:372
+#: ui/composer-widget.ui:373
 msgid "_Subject"
 msgstr "_Aihe"
 
-#: ui/composer-widget.ui:445
+#: ui/composer-widget.ui:446
 msgid "Drop files here"
 msgstr "Pudota tiedostot tähän"
 
-#: ui/composer-widget.ui:461
+#: ui/composer-widget.ui:462
 msgid "To add them as attachments"
 msgstr "lisätäksesi ne liitteiksi"
 
-#: ui/composer-widget.ui:602
+#: ui/composer-widget.ui:615
 msgid "Bold text"
 msgstr "Lihavoitu teksti"
 
-#: ui/composer-widget.ui:626
+#: ui/composer-widget.ui:639
 msgid "Italic text"
 msgstr "Kursivoitu teksti"
 
-#: ui/composer-widget.ui:650
+#: ui/composer-widget.ui:663
 msgid "Underline text"
 msgstr "Alleviivattu teksti"
 
-#: ui/composer-widget.ui:674
+#: ui/composer-widget.ui:687
 msgid "Strikethrough text"
 msgstr "Yliviivattu teksti"
 
-#: ui/composer-widget.ui:707
+#: ui/composer-widget.ui:720
 msgid "Insert bulleted list"
 msgstr "Lisää numeroimaton luettelo"
 
-#: ui/composer-widget.ui:731
+#: ui/composer-widget.ui:744
 msgid "Insert numbered list"
 msgstr "Lisää numeroitu luettelo"
 
-#: ui/composer-widget.ui:764
+#: ui/composer-widget.ui:777
 msgid "Indent or quote text"
 msgstr "Sisennä tai lainaa tekstiä"
 
-#: ui/composer-widget.ui:788
+#: ui/composer-widget.ui:801
 msgid "Un-indent or unquote text"
 msgstr "Poista tekstin sisennys tai lainaus"
 
-#: ui/composer-widget.ui:817
+#: ui/composer-widget.ui:830
 msgid "Remove text formatting"
 msgstr "Poista tekstin muotoilu"
 
-#: ui/composer-widget.ui:836
+#: ui/composer-widget.ui:849
 msgid "Change font type"
 msgstr "Muuta fontin tyyppi"
 
-#: ui/composer-widget.ui:851
+#: ui/composer-widget.ui:864
 msgid "Sans Serif"
 msgstr "Päätteetön"
 
-#: ui/composer-widget.ui:862
+#: ui/composer-widget.ui:875
 msgid "Serif"
 msgstr "Päätteellinen"
 
-#: ui/composer-widget.ui:873
+#: ui/composer-widget.ui:886
 msgid "Fixed Width"
 msgstr "Tasalevyinen"
 
-#: ui/composer-widget.ui:899
+#: ui/composer-widget.ui:912
 msgid "Change font color"
 msgstr "Muuta fontin väri"
 
-#: ui/composer-widget.ui:914
+#: ui/composer-widget.ui:927
 msgid "Change font size"
 msgstr "Muuta fontin koko"
 
-#: ui/composer-widget.ui:949
+#: ui/composer-widget.ui:962
 msgid "Insert or update text link"
 msgstr "Lisää tai päivitä tekstilinkki"
 
-#: ui/composer-widget.ui:973
+#: ui/composer-widget.ui:986
 msgid "Insert an image"
 msgstr "Lisää kuva"
 
-#: ui/composer-widget.ui:1015
+#: ui/composer-widget.ui:1028
 msgid "Undo last edit"
 msgstr "Kumoa viimeisin muokkaus"
 
-#: ui/composer-widget.ui:1039
+#: ui/composer-widget.ui:1052
 msgid "Redo last edit"
 msgstr "Tee uudelleen viimeisin muokkaus"
 
-#: ui/composer-widget.ui:1068 ui/composer-widget.ui:1093
+#: ui/composer-widget.ui:1081 ui/composer-widget.ui:1106
 msgid "Attach a file"
 msgstr "Liitä tiedosto"
 
-#: ui/composer-widget.ui:1117
+#: ui/composer-widget.ui:1130
 msgid "Add original attachments"
 msgstr "Liitä alkuperäiset liitteet"
 
-#: ui/composer-widget.ui:1162
+#: ui/composer-widget.ui:1175
 msgid "More options"
 msgstr "Lisää valintoja"
 
-#: ui/composer-widget.ui:1182
+#: ui/composer-widget.ui:1195
 msgid "Show formatting toolbar"
 msgstr "Näytä muotoilupalkki"
 
-#: ui/composer-widget.ui:1200
+#: ui/composer-widget.ui:1213
 msgid "Select spell checking languages"
 msgstr "Valitse oikoluvun kielet"
 
-#: ui/composer-widget.ui:1263
+#: ui/composer-widget.ui:1273
 msgid "S_ans Serif"
 msgstr "_Päätteetön"
 
-#: ui/composer-widget.ui:1268
+#: ui/composer-widget.ui:1278
 msgid "S_erif"
 msgstr "P_äätteellinen"
 
-#: ui/composer-widget.ui:1273
+#: ui/composer-widget.ui:1283
 msgid "_Fixed Width"
 msgstr "_Tasalevyinen"
 
-#: ui/composer-widget.ui:1283
+#: ui/composer-widget.ui:1293
 msgid "_Small"
 msgstr "_Pieni"
 
-#: ui/composer-widget.ui:1288
+#: ui/composer-widget.ui:1298
 msgid "_Medium"
 msgstr "Ta_vallinen"
 
-#: ui/composer-widget.ui:1293
+#: ui/composer-widget.ui:1303
 msgid "Lar_ge"
 msgstr "_Suuri"
 
-#: ui/composer-widget.ui:1303
+#: ui/composer-widget.ui:1313
 msgid "_Rich Text"
 msgstr "Muotoilu - _RTF"
 
-#: ui/composer-widget.ui:1308
+#: ui/composer-widget.ui:1318
 msgid "_Plain Text"
 msgstr "_Raakateksti"
 
@@ -2932,42 +3134,52 @@ msgstr "_Tallenna kaikki"
 #: ui/components-inspector-error-view.ui:33
 msgid ""
 "If the problem is serious or persists, please save and send these details to "
-"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\">mailing list</a> "
-"or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug"
-"\">new bug report</a>."
+"one of the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\">contact "
+"channels</a> or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/"
+"ReportingABug\">new bug report</a>."
 msgstr ""
 "Jos ongelma on vakava tai se toistuu, tallenna ja lähetä virheen "
 "yksityiskohtaiset tiedot <a href=\"https://wiki.gnome.org/Apps/Geary/Contact"
-"\">postituslistalle</a> tai liitä tiedot <a href=\"https://wiki.gnome.org/"
-"Apps/Geary/ReportingABug\">uuteen vikailmoitukseen</a>."
+"\">meille</a> tai liitä tiedot <a href=\"https://wiki.gnome.org/Apps/Geary/"
+"ReportingABug\">uuteen vikailmoitukseen</a>."
 
 #: ui/components-inspector-error-view.ui:49
 msgid "Details:"
 msgstr "Tiedot:"
 
-#. Tooltip for inspector button
-#: ui/components-inspector.ui:20
-msgid "Toggle appending new log entries"
-msgstr ""
-
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:37 ui/problem-details-dialog.ui:19
+#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:19
 msgid "Search for matching log entries"
 msgstr "Etsi vastaavia lokimerkintöjä"
 
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:35
+msgid "Toggle appending new log entries"
+msgstr ""
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:55
+msgid "Add a marker entry to the log"
+msgstr "Lisää merkintätietue lokiin"
+
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:63 ui/problem-details-dialog.ui:46
+#: ui/components-inspector.ui:81 ui/problem-details-dialog.ui:46
 msgid "Save logs entries and details"
 msgstr "Tallenna lokitietueet ja yksityiskohdat"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:84 ui/problem-details-dialog.ui:62
+#: ui/components-inspector.ui:101 ui/problem-details-dialog.ui:62
 msgid "Copy to clipboard"
 msgstr "Kopioi leikepöydälle"
 
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:121
+msgid "Clears all log entries"
+msgstr "Tyhjennä kaikki lokimerkinnät"
+
 #: ui/conversation-contact-popover.ui:146
 msgid "New Conversation…"
 msgstr "Uusi keskustelu…"
@@ -3026,28 +3238,6 @@ msgstr "Merkitse tämä viesti tähdellä"
 msgid "Mark this message as not starred"
 msgstr "Poista tähti tältä viestiltä"
 
-#: ui/conversation-email.ui:124
-msgid "Edit Draft"
-msgstr "Muokkaa luonnosta"
-
-#: ui/conversation-email.ui:151
-msgid "Draft message"
-msgstr "Luonnosviesti"
-
-#: ui/conversation-email.ui:167
-msgid "This message has not yet been sent."
-msgstr "Tätä viestiä ei ole vielä lähetetty."
-
-#: ui/conversation-email.ui:213
-msgid "Message not saved"
-msgstr "Viestiä ei tallennettu"
-
-#: ui/conversation-email.ui:229
-msgid "This message was sent, but has not been saved to your account."
-msgstr ""
-"Tämä viesti lähetettiin onnistuneesti, mutta sen tallennus tilillesi "
-"epäonnistui."
-
 #. Translators: Menu item to reply to a specific message.
 #: ui/conversation-email-menus.ui:15
 msgid "Reply to _All"
@@ -3137,7 +3327,7 @@ msgstr "Lähettäjä <email>"
 
 #: ui/conversation-message.ui:79 ui/conversation-message.ui:178
 msgid "1/1/1970\t"
-msgstr ""
+msgstr "1/1/1970\t"
 
 #: ui/conversation-message.ui:102
 msgid "Preview body text."
@@ -3155,22 +3345,6 @@ msgstr "Vastausosoite:"
 msgid "Subject"
 msgstr "Aihe"
 
-#: ui/conversation-message.ui:501
-msgid "Show Images"
-msgstr "Näytä kuvat"
-
-#: ui/conversation-message.ui:514
-msgid "Always Show From Sender"
-msgstr "Näytä aina lähettäjältä"
-
-#: ui/conversation-message.ui:542
-msgid "Remote images not shown"
-msgstr "Etäkuvia ei näytetä"
-
-#: ui/conversation-message.ui:559
-msgid "Only show remote images from senders you trust."
-msgstr "Näytä etäkuvat vain lähettäjiltä, joihin luotat."
-
 #: ui/conversation-viewer.ui:60
 msgid "Find in conversation"
 msgstr "Etsi keskustelusta"
@@ -3207,7 +3381,7 @@ msgstr "nimike"
 msgid "Conversation Shortcuts"
 msgstr "Keskustelun pikanäppäimet"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:355
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:377
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "Toiminnot"
@@ -3222,37 +3396,37 @@ msgctxt "shortcut window"
 msgid "Reply to sender"
 msgstr "Vastaa lähettäjälle"
 
-#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:269
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:281
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "Vastaa kaikille"
 
-#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:276
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:288
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "Lähetä edelleen"
 
-#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:283
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:295
 msgctxt "shortcut window"
 msgid "Un-mark/mark read"
 msgstr "Merkitse lukemattomaksi/luetuksi"
 
-#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:290
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:302
 msgctxt "shortcut window"
 msgid "Mark/un-mark starred"
 msgstr "Merkitse viesti tähdellä tai poista tähti"
 
-#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:297
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:309
 msgctxt "shortcut window"
 msgid "Archive conversations"
 msgstr "Arkistoi keskustelut"
 
-#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:304
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:326
 msgctxt "shortcut window"
 msgid "Move conversations"
 msgstr "Siirrä keskustelut"
 
-#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:311
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:333
 msgctxt "shortcut window"
 msgid "Label conversations"
 msgstr "Merkitse keskustelut tunnisteilla"
@@ -3262,12 +3436,12 @@ msgctxt "shortcut window"
 msgid "Trash conversations"
 msgstr "Siirrä keskustelut roskakoriin"
 
-#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:318
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:340
 msgctxt "shortcut window"
 msgid "Junk conversations"
 msgstr "Merkitse keskustelut roskaksi"
 
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:325
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:347
 msgctxt "shortcut window"
 msgid "Delete conversations"
 msgstr "Poista keskustelut"
@@ -3282,7 +3456,7 @@ msgctxt "shortcut window"
 msgid "Search for conversations"
 msgstr "Etsi keskusteluja"
 
-#: ui/gtk/help-overlay.ui:115
+#: ui/gtk/help-overlay.ui:115 ui/gtk/help-overlay.ui:354
 msgctxt "shortcut window"
 msgid "Find in current conversation"
 msgstr "Etsi nykyisestä keskustelusta"
@@ -3322,7 +3496,7 @@ msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "Palauta mittakaava"
 
-#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:375
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:404
 msgctxt "shortcut window"
 msgid "General"
 msgstr "Yleiset"
@@ -3372,121 +3546,125 @@ msgctxt "shortcut window"
 msgid "Focus next/previous message"
 msgstr "Kohdista edelliseen/seuraavaan viestiin"
 
-#: ui/gtk/help-overlay.ui:258
-msgctxt "shortcut window"
-msgid "Single-key shortcuts"
+#: ui/gtk/help-overlay.ui:260
+msgid "Single-key Shortcuts"
 msgstr "Yhden näppäimen pikanäppäimet"
 
-#: ui/gtk/help-overlay.ui:262
+#: ui/gtk/help-overlay.ui:265
+msgctxt "shortcut window"
+msgid "Single-key shortcuts (if enabled)"
+msgstr "Yhden näppäimen pikanäppäimet (jos käytössä)"
+
+#: ui/gtk/help-overlay.ui:274
 msgctxt "shortcut window"
 msgid "Reply to sender "
 msgstr "Vastaa lähettäjälle "
 
-#: ui/gtk/help-overlay.ui:332
-msgctxt "shortcut window"
-msgid "Find in current conversations"
-msgstr "Etsi nykyisistä keskusteluista"
-
-#: ui/gtk/help-overlay.ui:339
+#: ui/gtk/help-overlay.ui:361
 msgctxt "shortcut window"
 msgid "Select next/previous conversations"
 msgstr "Valitse edelliset/seuraavat keskustelut"
 
-#: ui/gtk/help-overlay.ui:351
+#: ui/gtk/help-overlay.ui:373
 msgid "Composer Shortcuts"
 msgstr "Lähettämisen pikanäppäimet"
 
-#: ui/gtk/help-overlay.ui:359
+#: ui/gtk/help-overlay.ui:381
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "Lähetä"
 
-#: ui/gtk/help-overlay.ui:366
+#: ui/gtk/help-overlay.ui:388
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "Lisää liite"
 
-#: ui/gtk/help-overlay.ui:379
+#: ui/gtk/help-overlay.ui:395
+msgctxt "shortcut window"
+msgid "Detach the composer"
+msgstr "Irrota lähetysikkuna"
+
+#: ui/gtk/help-overlay.ui:408
 msgctxt "shortcut window"
 msgid "Close composer window"
 msgstr "Sulje lähetysikkuna"
 
-#: ui/gtk/help-overlay.ui:386
+#: ui/gtk/help-overlay.ui:415
 msgctxt "shortcut window"
 msgid "Detach composer window"
 msgstr "Irrota lähetysikkuna"
 
-#: ui/gtk/help-overlay.ui:393
+#: ui/gtk/help-overlay.ui:422
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Muokkaus"
 
-#: ui/gtk/help-overlay.ui:398
+#: ui/gtk/help-overlay.ui:427
 msgctxt "shortcut window"
 msgid "Move selection to the clipboard"
 msgstr "Siirrä valinta leikepöydälle"
 
-#: ui/gtk/help-overlay.ui:405
+#: ui/gtk/help-overlay.ui:434
 msgctxt "shortcut window"
 msgid "Copy selection to clipboard"
 msgstr "Kopioi valinta leikepöydälle"
 
-#: ui/gtk/help-overlay.ui:412
+#: ui/gtk/help-overlay.ui:441
 msgctxt "shortcut window"
 msgid "Paste from the clipboard"
 msgstr "Liitä leikepöydältä"
 
-#: ui/gtk/help-overlay.ui:419
+#: ui/gtk/help-overlay.ui:448
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "Lainaa tekstiä"
 
-#: ui/gtk/help-overlay.ui:426
+#: ui/gtk/help-overlay.ui:455
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "Poista tekstin lainaus"
 
-#: ui/gtk/help-overlay.ui:435
+#: ui/gtk/help-overlay.ui:464
 msgctxt "shortcut window"
 msgid "Rich text editing"
 msgstr "Monipuolinen muotoilutila"
 
-#: ui/gtk/help-overlay.ui:439
+#: ui/gtk/help-overlay.ui:468
 msgctxt "shortcut window"
 msgid "Paste without formatting"
 msgstr "Liitä ilman muotoilua"
 
-#: ui/gtk/help-overlay.ui:446
+#: ui/gtk/help-overlay.ui:475
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Lihavoitu teksti"
 
-#: ui/gtk/help-overlay.ui:453
+#: ui/gtk/help-overlay.ui:482
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Kursivoitu teksti"
 
-#: ui/gtk/help-overlay.ui:460
+#: ui/gtk/help-overlay.ui:489
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Alleviivattu teksti"
 
-#: ui/gtk/help-overlay.ui:467
+#: ui/gtk/help-overlay.ui:496
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Yliviivattu teksti"
 
-#: ui/gtk/help-overlay.ui:474
+#: ui/gtk/help-overlay.ui:503
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Poista muotoilu"
 
-#: ui/gtk/help-overlay.ui:481
+#: ui/gtk/help-overlay.ui:510
 msgctxt "shortcut window"
 msgid "Insert an image"
 msgstr "Lisää kuva"
 
-#: ui/gtk/help-overlay.ui:488
+#: ui/gtk/help-overlay.ui:517
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "Lisää linkki"
@@ -3521,26 +3699,18 @@ msgid "_Archive"
 msgstr "_Arkistoi"
 
 #: ui/main-toolbar-menus.ui:21
-msgid "Toggle as S_pam"
-msgstr "Merkitse _roskapostiksi tai poista roskaposteista"
+msgid "Toggle as _Junk"
+msgstr "_Roskaposti kyllä/ei"
 
 #: ui/main-toolbar-menus.ui:28
-msgid "Empty _Spam…"
-msgstr "Tyhjennä ro_skapostikansio…"
-
-#: ui/main-toolbar-menus.ui:32
-msgid "Empty _Trash…"
-msgstr "Tyhjennä _roskakorikansio…"
-
-#: ui/main-toolbar-menus.ui:38
 msgid "_Accounts"
 msgstr "_Tilit"
 
-#: ui/main-toolbar-menus.ui:46
+#: ui/main-toolbar-menus.ui:36
 msgid "_Keyboard Shortcuts"
 msgstr "_Pikanäppäimet"
 
-#: ui/main-toolbar-menus.ui:57
+#: ui/main-toolbar-menus.ui:47
 msgid "_About Geary"
 msgstr "_Tietoja - Geary"
 
@@ -3564,6 +3734,36 @@ msgstr "_Tunnistaudu"
 msgid "Geary update in progress…"
 msgstr "Gearyn päivitys on meneillään…"
 
+#, fuzzy
+#~| msgid "Log folder normalization"
+#~ msgid "Log IMAP network serialization"
+#~ msgstr "Lokita kansioiden normalisointi"
+
+#~ msgid "Sent Mail"
+#~ msgstr "Lähetetyt"
+
+#~ msgid "Spam"
+#~ msgstr "Roskaposti"
+
+#~ msgid "From"
+#~ msgstr "Lähettäjä"
+
+#~ msgid "Edit Draft"
+#~ msgstr "Muokkaa luonnosta"
+
+#~ msgid "Show Images"
+#~ msgstr "Näytä kuvat"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Find in current conversations"
+#~ msgstr "Etsi nykyisistä keskusteluista"
+
+#~ msgid "Empty _Spam…"
+#~ msgstr "Tyhjennä ro_skapostikansio…"
+
+#~ msgid "Empty _Trash…"
+#~ msgstr "Tyhjennä _roskakorikansio…"
+
 #~ msgid ""
 #~ "Your computer does not appear to be connected to the Internet.\n"
 #~ "You will not be able to send or receive email until it is re-connected."
@@ -3589,9 +3789,6 @@ msgstr "Gearyn päivitys on meneillään…"
 #~ msgid "Enable notification sounds"
 #~ msgstr "Käytä ilmoitusääniä"
 
-#~ msgid "Show notifications for new mail"
-#~ msgstr "Näytä ilmoitus uusista viesteistä"
-
 #, fuzzy
 #~| msgid "%d message"
 #~| msgid_plural "%d messages"
@@ -3739,9 +3936,6 @@ msgstr "Gearyn päivitys on meneillään…"
 #~ msgid "Reading"
 #~ msgstr "Lukeminen"
 
-#~ msgid "Notifications"
-#~ msgstr "Ilmoitukset"
-
 #~ msgid "_Play notification sounds"
 #~ msgstr "_Toista ilmoitusäänet"
 
@@ -3912,10 +4106,6 @@ msgstr "Gearyn päivitys on meneillään…"
 #~ msgid "Additional Shortcuts"
 #~ msgstr "Muut pikanäppäimet"
 
-#~ msgctxt "shortcut window"
-#~ msgid "Star"
-#~ msgstr "Merkitse tähdellä"
-
 #~ msgctxt "shortcut window"
 #~ msgid "Unstar"
 #~ msgstr "Poista tähti"
@@ -4308,9 +4498,6 @@ msgstr "Gearyn päivitys on meneillään…"
 #~ msgid "Geary will run in the background and notify of new mail"
 #~ msgstr "Geary toimii taustalla ja ilmoittaa uusista viesteistä"
 
-#~ msgid "Empty"
-#~ msgstr "Tyhjennä"
-
 #~ msgid "%i match"
 #~ msgid_plural "%i matches"
 #~ msgstr[0] "%i tulos"
@@ -4321,9 +4508,6 @@ msgstr "Gearyn päivitys on meneillään…"
 #~ msgstr[0] "%i tulos (yhteensä)"
 #~ msgstr[1] "%i tulosta (yhteensä)"
 
-#~ msgid "not found"
-#~ msgstr "ei löytynyt"
-
 #, fuzzy
 #~| msgid "%s - Conversation Inspector"
 #~ msgid "%s - Composer Inspector"