diff --git a/po/fi.po b/po/fi.po
index cc472575..c76b52a3 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=geary&keywords=I18N+L10N&component=internationalization\n"
-"POT-Creation-Date: 2016-09-05 02:15+0000\n"
-"PO-Revision-Date: 2016-09-05 20:36+0300\n"
+"POT-Creation-Date: 2016-10-02 08:16+0000\n"
+"PO-Revision-Date: 2016-10-02 21:01+0300\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <lokalisointi-lista@googlegroups.com>\n"
 "Language: fi\n"
@@ -71,7 +71,6 @@ msgid "Full-featured HTML and plain text message composer"
 msgstr "Monipuolinen HTML- ja raakatekstilähetys"
 
 #: ../desktop/geary.appdata.xml.in.h:10
-#| msgid "Show _notifications for new mail"
 msgid "Desktop notification of new mail"
 msgstr "Työpöytäilmoitukset uusista viesteistä"
 
@@ -82,26 +81,24 @@ msgstr ""
 "palvelinten kanssa"
 
 #: ../desktop/geary.desktop.in.h:2
-#| msgid "Gmail"
 msgid "Email"
 msgstr "Sähköposti"
 
 #: ../desktop/geary.desktop.in.h:3
-#| msgid "Geary Mail"
 msgid "Geary Email"
 msgstr "Geary-sähköposti"
 
-#. semicolons, end line with a semicolon.
+#. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
 #: ../desktop/geary.desktop.in.h:6
 msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 msgstr "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;sähköposti;"
 
-#: ../desktop/geary.desktop.in.h:7
+#: ../desktop/geary.desktop.in.h:7 ../ui/gtk/menus.ui.h:1
 msgid "Compose Message"
 msgstr "Lähetä viesti"
 
 #: ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
+#: ../src/client/application/geary-application.vala:17
 msgid "Mail Client"
 msgstr "Sähköpostisovellus"
 
@@ -207,7 +204,7 @@ msgstr "Esikatsele"
 msgid "Remem_ber passwords"
 msgstr "M_uista salasanat"
 
-#: ../src/client/accounts/add-edit-page.vala:745 ../ui/login.glade.h:6
+#: ../src/client/accounts/add-edit-page.vala:745 ../ui/login.glade.h:7
 msgid "Remem_ber password"
 msgstr "_Muista salasana"
 
@@ -247,14 +244,26 @@ msgstr "        &#8226; Yhteysvirhe.\n"
 msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Käyttäjätunnus tai salasana on väärin.\n"
 
-#: ../src/client/application/geary-application.vala:19
+#: ../src/client/application/geary-application.vala:18
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Tekijänoikeus 2016 Software Freedom Conservancy Inc."
 
-#: ../src/client/application/geary-application.vala:21
+#: ../src/client/application/geary-application.vala:20
 msgid "Visit the Geary web site"
 msgstr "Vieraile Gearyn verkkosivustolla"
 
+#: ../src/client/application/geary-application.vala:395
+#, c-format
+msgid "About %s"
+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/geary-application.vala:399
+msgid "translator-credits"
+msgstr "Jiri Grönroos"
+
 #: ../src/client/application/geary-args.vala:10
 msgid "Start Geary with hidden main window"
 msgstr "Käynnistä Geary pääikkuna piilotettuna"
@@ -309,217 +318,196 @@ msgid "Revoke all server certificates with TLS warnings"
 msgstr "Kumoa kaikki palvelinvarmenteet, joissa on TLS-varoituksia"
 
 #: ../src/client/application/geary-args.vala:27
+msgid "Perform a graceful quit"
+msgstr "Suorita siisti lopetus"
+
+#: ../src/client/application/geary-args.vala:28
 msgid "Display program version"
 msgstr "Näytä sovelluksen versio"
 
 #. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
+#: ../src/client/application/geary-args.vala:53
 #, c-format
 msgid "Use %s to open a new composer window"
 msgstr "Käytä %s uuden lähetysikkunan avaamista varten"
 
-#: ../src/client/application/geary-args.vala:52
+#: ../src/client/application/geary-args.vala:54
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Kommentoi, ehdota uusia ideoita ja ilmoita vioista:"
 
 #. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
+#: ../src/client/application/geary-args.vala:61
 #, c-format
 msgid "Failed to parse command line options: %s\n"
 msgstr "Komentorivivalintojen jäsennys epäonnistui: %s\n"
 
-#: ../src/client/application/geary-args.vala:70
+#: ../src/client/application/geary-args.vala:72
 #, c-format
 msgid "Unrecognized command line option \"%s\"\n"
 msgstr "Tunnistamaton komentorivivalinta \"%s\"\n"
 
-#: ../src/client/application/geary-controller.vala:60
+#: ../src/client/application/geary-controller.vala:55
 msgid "Delete conversation"
 msgstr "Poista keskustelu"
 
-#: ../src/client/application/geary-controller.vala:61
+#: ../src/client/application/geary-controller.vala:56
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Poista keskustelu (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:57
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Poista keskustelut (Shift+Delete)"
 
 #. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:66
+#: ../src/client/application/geary-controller.vala:61
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Siirrä keskustelu roskakoriin (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:67
+#: ../src/client/application/geary-controller.vala:62
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Siirrä keskustelut roskakoriin (Delete, Backspace)"
 
 #. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:71
+#: ../src/client/application/geary-controller.vala:66
 msgid "_Archive"
 msgstr "_Arkistoi"
 
-#: ../src/client/application/geary-controller.vala:72
+#: ../src/client/application/geary-controller.vala:67
 msgid "Archive conversation (A)"
 msgstr "Arkistoi keskustelu (A)"
 
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:68
 msgid "Archive conversations (A)"
 msgstr "Arkistoi keskustelut (A)"
 
-#: ../src/client/application/geary-controller.vala:76
+#: ../src/client/application/geary-controller.vala:71
 msgid "Mark as S_pam"
 msgstr "Me_rkitse roskapostiksi"
 
-#: ../src/client/application/geary-controller.vala:77
+#: ../src/client/application/geary-controller.vala:72
 msgid "Mark as not S_pam"
 msgstr "Poista _roskapostimerkintä"
 
-#: ../src/client/application/geary-controller.vala:79
-#: ../src/client/application/geary-controller.vala:403
+#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:395
 msgid "Mark conversation"
 msgstr "Merkitse keskustelu"
 
-#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:75
 msgid "Mark conversations"
 msgstr "Merkitse keskustelut"
 
-#: ../src/client/application/geary-controller.vala:81
+#: ../src/client/application/geary-controller.vala:76
 msgid "Add label to conversation"
 msgstr "Lisää tunniste keskusteluun"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:77
 msgid "Add label to conversations"
 msgstr "Lisää tunniste keskusteluihin"
 
-#: ../src/client/application/geary-controller.vala:83
-#: ../src/client/application/geary-controller.vala:442
+#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:434
 msgid "Move conversation"
 msgstr "Siirrä keskustelu"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:79
 msgid "Move conversations"
 msgstr "Siirrä keskustelut"
 
-#: ../src/client/application/geary-controller.vala:383
-#: ../ui/app_menu.interface.h:1
-msgid "A_ccounts"
-msgstr "_Tilit"
-
-#: ../src/client/application/geary-controller.vala:388
-#: ../src/client/components/stock.vala:27 ../ui/app_menu.interface.h:2
-msgid "_Preferences"
-msgstr "_Asetukset"
-
-#: ../src/client/application/geary-controller.vala:392
-#: ../src/client/components/stock.vala:25 ../ui/app_menu.interface.h:3
-msgid "_Help"
-msgstr "_Ohje"
-
-#: ../src/client/application/geary-controller.vala:396
-#: ../src/client/components/stock.vala:21 ../ui/app_menu.interface.h:4
-msgid "_About"
-msgstr "_Tietoja"
-
-#: ../src/client/application/geary-controller.vala:400
-#: ../src/client/components/stock.vala:29 ../ui/app_menu.interface.h:5
-msgid "_Quit"
-msgstr "_Lopeta"
-
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:397
 msgid "_Mark as..."
 msgstr "_Merkitse..."
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:403
 msgid "Mark as _Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:409
 msgid "Mark as _Unread"
 msgstr "Merkitse l_ukemattomaksi"
 
-#: ../src/client/application/geary-controller.vala:423
+#: ../src/client/application/geary-controller.vala:415
 msgid "_Star"
 msgstr "_Merkitse tähdellä"
 
-#: ../src/client/application/geary-controller.vala:428
+#: ../src/client/application/geary-controller.vala:420
 msgid "U_nstar"
 msgstr "_Poista tähti"
 
-#: ../src/client/application/geary-controller.vala:438
+#: ../src/client/application/geary-controller.vala:430
 msgid "Add label"
 msgstr "Lisää tunniste"
 
-#: ../src/client/application/geary-controller.vala:439
+#: ../src/client/application/geary-controller.vala:431
 msgid "_Label"
 msgstr "_Tunniste"
 
-#: ../src/client/application/geary-controller.vala:443
+#: ../src/client/application/geary-controller.vala:435
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../src/client/application/geary-controller.vala:447
+#: ../src/client/application/geary-controller.vala:439
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Kirjoita uusi viesti (Ctrl+N, N)"
 
 #. Reply to a message.
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:443
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1896
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../src/client/application/geary-controller.vala:452
+#: ../src/client/application/geary-controller.vala:444
 msgid "Reply (Ctrl+R, R)"
 msgstr "Vastaa (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:448
 msgid "R_eply All"
 msgstr "_Vastaa kaikille"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:449
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Vastaa kaikille (Ctrl+Shift+R, Shift+R)"
 
 #. Forward a message.
-#: ../src/client/application/geary-controller.vala:462
+#: ../src/client/application/geary-controller.vala:454
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1906
 msgid "_Forward"
 msgstr "_Lähetä edelleen"
 
-#: ../src/client/application/geary-controller.vala:463
+#: ../src/client/application/geary-controller.vala:455
 msgid "Forward (Ctrl+L, F)"
 msgstr "Lähetä edelleen (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:502
+#: ../src/client/application/geary-controller.vala:494
 msgid "Empty"
 msgstr "Tyhjennä"
 
-#: ../src/client/application/geary-controller.vala:503
+#: ../src/client/application/geary-controller.vala:495
 msgid "Empty Spam or Trash folders"
 msgstr "Tyhjennä roskaposti- tai roskakorikansiot"
 
-#: ../src/client/application/geary-controller.vala:507
+#: ../src/client/application/geary-controller.vala:499
 msgid "Empty _Spam…"
 msgstr "Tyhjennä ro_skapostikansio…"
 
-#: ../src/client/application/geary-controller.vala:511
+#: ../src/client/application/geary-controller.vala:503
 msgid "Empty _Trash…"
 msgstr "Tyhjennä _roskakorikansio…"
 
 #. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:540
+#: ../src/client/application/geary-controller.vala:532
 msgid "Toggle search bar"
 msgstr "Hakupalkki päälle/pois"
 
-#: ../src/client/application/geary-controller.vala:735
+#: ../src/client/application/geary-controller.vala:710
 msgid "Unable to store server trust exception"
 msgstr "Palvelimen luottamuspoikkeuksen varastointi epäonnistui"
 
-#: ../src/client/application/geary-controller.vala:972
+#: ../src/client/application/geary-controller.vala:947
 msgid "Your settings are insecure"
 msgstr "Asetuksesi eivät ole turvalliset"
 
-#: ../src/client/application/geary-controller.vala:973
+#: ../src/client/application/geary-controller.vala:948
 msgid ""
 "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
 "username and password could be read by another person on the network.  Are "
@@ -529,17 +517,17 @@ msgstr ""
 "SSL:ää tai TLS:ää. Tämä tarkoittaa, että käyttäjätunnuksesi ja salasanasi on "
 "mahdollista lukea verkkoliikenteestä. Haluatko varmasti sallia tämän?"
 
-#: ../src/client/application/geary-controller.vala:974
+#: ../src/client/application/geary-controller.vala:949
 msgid "Co_ntinue"
 msgstr "_Jatka"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1052
+#: ../src/client/application/geary-controller.vala:1027
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Virhe sähköpostia lähettäessä"
 
-#: ../src/client/application/geary-controller.vala:1053
+#: ../src/client/application/geary-controller.vala:1028
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -549,12 +537,12 @@ msgstr ""
 
 #. Displayed in the space-limited status bar when a message fails to be uploaded
 #. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1057
+#: ../src/client/application/geary-controller.vala:1032
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Virhe lähetettyä postia tallennettaessa"
 
-#: ../src/client/application/geary-controller.vala:1058
+#: ../src/client/application/geary-controller.vala:1033
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -563,19 +551,19 @@ msgstr ""
 "kansioon.  Tämä viesti säilyy Lähtevät-kansiossa niin kauan, kunnes poistat "
 "sen."
 
-#: ../src/client/application/geary-controller.vala:1127
+#: ../src/client/application/geary-controller.vala:1102
 msgid "Labels"
 msgstr "Tunnisteet"
 
 #. give the user two options: reset the Account local store, or exit Geary.  A third
 #. could be done to leave the Account in an unopened state, but we don't currently
 #. have provisions for that.
-#: ../src/client/application/geary-controller.vala:1139
+#: ../src/client/application/geary-controller.vala:1114
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Kohteen %s tietokannan avaaminen epäonnistui"
 
-#: ../src/client/application/geary-controller.vala:1140
+#: ../src/client/application/geary-controller.vala:1115
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -601,20 +589,20 @@ msgstr ""
 "niiden liitteet. <b>Toimenpiteellä ei ole vaikutusta palvelimella oleviin "
 "viesteihin ja liitteisiin.</b>"
 
-#: ../src/client/application/geary-controller.vala:1142
+#: ../src/client/application/geary-controller.vala:1117
 msgid "_Rebuild"
 msgstr "Ra_kenna uudelleen"
 
-#: ../src/client/application/geary-controller.vala:1142
+#: ../src/client/application/geary-controller.vala:1117
 msgid "E_xit"
 msgstr "_Poistu"
 
-#: ../src/client/application/geary-controller.vala:1151
+#: ../src/client/application/geary-controller.vala:1126
 #, c-format
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Tietokannan jälleenrakennus tilille \"%s\" epäonnistui"
 
-#: ../src/client/application/geary-controller.vala:1152
+#: ../src/client/application/geary-controller.vala:1127
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -627,14 +615,14 @@ msgstr ""
 
 #. some other problem opening the account ... as with other flow path, can't run
 #. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1174
-#: ../src/client/application/geary-controller.vala:1184
-#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1149
+#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1170
 #, c-format
 msgid "Unable to open local mailbox for %s"
 msgstr "Paikallisen postilaatikon avaaminen tilillä %s epäonnistui"
 
-#: ../src/client/application/geary-controller.vala:1175
+#: ../src/client/application/geary-controller.vala:1150
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -653,7 +641,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1160
 msgid ""
 "The version number of the local mail database is formatted for a newer "
 "version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
@@ -667,7 +655,7 @@ msgstr ""
 "\n"
 "Asenna uusin version Gearysta ja yritä uudelleen."
 
-#: ../src/client/application/geary-controller.vala:1196
+#: ../src/client/application/geary-controller.vala:1171
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -679,27 +667,16 @@ msgstr ""
 "\n"
 "Tarkista yhteyden tila ja käynnistä Geary uudelleen."
 
-#: ../src/client/application/geary-controller.vala:1708
-#, c-format
-msgid "About %s"
-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/geary-controller.vala:1711
-msgid "translator-credits"
-msgstr "Jiri Grönroos"
-
-#: ../src/client/application/geary-controller.vala:1968
+#: ../src/client/application/geary-controller.vala:1882
 msgid "Undo move (Ctrl+Z)"
 msgstr "Kumoa siirtäminen (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:1978
+#: ../src/client/application/geary-controller.vala:1892
 #, c-format
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Haluatko varmasti avata kohteen \"%s\"?"
 
-#: ../src/client/application/geary-controller.vala:1979
+#: ../src/client/application/geary-controller.vala:1893
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -707,16 +684,16 @@ msgstr ""
 "Liitetiedostot saattavat sisältää haitallista sisältöä.  Avaa liitteet "
 "ainoastaan, jos luotat niiden lähettäjään."
 
-#: ../src/client/application/geary-controller.vala:1980
+#: ../src/client/application/geary-controller.vala:1894
 msgid "Don't _ask me again"
 msgstr "_Älä kysy uudelleen"
 
-#: ../src/client/application/geary-controller.vala:1998
+#: ../src/client/application/geary-controller.vala:1912
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Tiedosto nimellä \"%s\" on jo olemassa.  Haluatko korvata sen?"
 
-#: ../src/client/application/geary-controller.vala:2000
+#: ../src/client/application/geary-controller.vala:1914
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
@@ -724,58 +701,58 @@ msgstr ""
 "Tiedosto on jo olemassa kohteessa \"%s\".  Tiedoston korvaaminen korvaa "
 "nykyisen tiedoston sisällön."
 
-#: ../src/client/application/geary-controller.vala:2003
+#: ../src/client/application/geary-controller.vala:1917
 msgid "_Replace"
 msgstr "_Korvaa"
 
 #. Find out what to do with the inline composers.
 #. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2301
+#: ../src/client/application/geary-controller.vala:2237
 msgid "Close open draft messages?"
 msgstr "Suljetaanko luonnosviesti?"
 
-#: ../src/client/application/geary-controller.vala:2431
+#: ../src/client/application/geary-controller.vala:2367
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Poistetaanko kaikki viesit \"%s\"-kansiosta?"
 
-#: ../src/client/application/geary-controller.vala:2432
+#: ../src/client/application/geary-controller.vala:2368
 msgid "This removes the email from Geary and your email server."
 msgstr "Tämä poistaa viestit Gearysta ja sähköpostipalvelimelta."
 
-#: ../src/client/application/geary-controller.vala:2433
+#: ../src/client/application/geary-controller.vala:2369
 msgid "This cannot be undone."
 msgstr "Toimintoa ei voi perua."
 
-#: ../src/client/application/geary-controller.vala:2434
+#: ../src/client/application/geary-controller.vala:2370
 #, c-format
 msgid "Empty %s"
 msgstr "Tyhjennä %s"
 
-#: ../src/client/application/geary-controller.vala:2451
+#: ../src/client/application/geary-controller.vala:2387
 #, c-format
 msgid "Error emptying %s"
 msgstr "Virhe tyhjennettäessä kohdetta %s"
 
-#: ../src/client/application/geary-controller.vala:2481
+#: ../src/client/application/geary-controller.vala:2417
 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/geary-controller.vala:2483
+#: ../src/client/application/geary-controller.vala:2419
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/client/application/geary-controller.vala:2514
+#: ../src/client/application/geary-controller.vala:2450
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Kumoa arkistointi (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2529
+#: ../src/client/application/geary-controller.vala:2465
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Kumoa roskakoriin siirto (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2582
+#: ../src/client/application/geary-controller.vala:2518
 msgid "Undo (Ctrl+Z)"
 msgstr "Kumoa (Ctrl+Z)"
 
@@ -838,6 +815,10 @@ msgstr "_OK"
 msgid "_Cancel"
 msgstr "_Peru"
 
+#: ../src/client/components/stock.vala:21 ../ui/gtk/menus.ui.h:5
+msgid "_About"
+msgstr "_Tietoja"
+
 #: ../src/client/components/stock.vala:23
 msgid "_Close"
 msgstr "_Sulje"
@@ -846,51 +827,57 @@ msgstr "_Sulje"
 msgid "_Discard"
 msgstr "_Hylkää"
 
+#: ../src/client/components/stock.vala:25 ../ui/gtk/menus.ui.h:4
+msgid "_Help"
+msgstr "_Ohje"
+
 #: ../src/client/components/stock.vala:26
 msgid "_Open"
 msgstr "_Avaa"
 
+#: ../src/client/components/stock.vala:27 ../ui/gtk/menus.ui.h:3
+msgid "_Preferences"
+msgstr "_Asetukset"
+
 #: ../src/client/components/stock.vala:28
 msgid "_Print..."
 msgstr "_Tulosta..."
 
+#: ../src/client/components/stock.vala:29 ../ui/gtk/menus.ui.h:6
+msgid "_Quit"
+msgstr "_Lopeta"
+
 #: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
 msgid "_Remove"
 msgstr "_Poista"
 
-#. Select all.
 #: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1358
-msgid "Select _All"
-msgstr "Valitse _kaikki"
-
-#: ../src/client/components/stock.vala:33
 msgid "_Keep"
 msgstr "Säil_ytä"
 
-#: ../src/client/composer/composer-widget.vala:71
+#: ../src/client/composer/composer-widget.vala:135
 msgid "Saved"
 msgstr "Tallennettu"
 
-#: ../src/client/composer/composer-widget.vala:72
+#: ../src/client/composer/composer-widget.vala:136
 msgid "Saving"
 msgstr "Tallennetaan"
 
-#: ../src/client/composer/composer-widget.vala:73
+#: ../src/client/composer/composer-widget.vala:137
 msgid "Error saving"
 msgstr "Virhe tallentaessa"
 
-#: ../src/client/composer/composer-widget.vala:74
+#: ../src/client/composer/composer-widget.vala:138
 msgid "Press Backspace to delete quote"
 msgstr "Paina askelpalautinta poistaaksesi lainauksen"
 
-#: ../src/client/composer/composer-widget.vala:75
+#: ../src/client/composer/composer-widget.vala:139
 msgid "New Message"
 msgstr "Uusi viesti"
 
 #. A list of keywords, separated by pipe ("|") characters, that suggest an attachment; since
 #. this is full-word checking, include all variants of each word.  No spaces are allowed.
-#: ../src/client/composer/composer-widget.vala:136
+#: ../src/client/composer/composer-widget.vala:200
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -899,96 +886,108 @@ msgstr ""
 "enclosing|encloses|enclosure|enclosures|liite|liitetiedosto|liitteen|"
 "liitetiedostot|liitän"
 
-#: ../src/client/composer/composer-widget.vala:1108
-#: ../src/client/composer/composer-widget.vala:1112
+#: ../src/client/composer/composer-widget.vala:1149
+#: ../src/client/composer/composer-widget.vala:1153
 msgid "Do you want to discard this message?"
 msgstr "Haluatko hylätä tämän viestin?"
 
-#: ../src/client/composer/composer-widget.vala:1268
+#: ../src/client/composer/composer-widget.vala:1308
 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:1270
+#: ../src/client/composer/composer-widget.vala:1310
 msgid "Send message with an empty subject?"
 msgstr "Lähetetäänkö viesti ilman aihetta?"
 
-#: ../src/client/composer/composer-widget.vala:1272
+#: ../src/client/composer/composer-widget.vala:1312
 msgid "Send message with an empty body?"
 msgstr "Lähetetäänkö viesti ilman sisältöä?"
 
-#: ../src/client/composer/composer-widget.vala:1274
+#: ../src/client/composer/composer-widget.vala:1314
 msgid "Send message without an attachment?"
 msgstr "Lähetetäänkö viesti ilman liitettä?"
 
-#: ../src/client/composer/composer-widget.vala:1530
+#: ../src/client/composer/composer-widget.vala:1537
 msgid "Cannot add attachment"
 msgstr "Liitteen lisäys epäonnistui"
 
-#: ../src/client/composer/composer-widget.vala:1541
+#: ../src/client/composer/composer-widget.vala:1548
 #, c-format
 msgid "\"%s\" could not be found."
 msgstr "Kohdetta \"%s\" ei löytynyt."
 
-#: ../src/client/composer/composer-widget.vala:1548
+#: ../src/client/composer/composer-widget.vala:1555
 #, c-format
 msgid "\"%s\" is a folder."
 msgstr "\"%s\" on kansio."
 
-#: ../src/client/composer/composer-widget.vala:1555
+#: ../src/client/composer/composer-widget.vala:1562
 #, c-format
 msgid "\"%s\" is an empty file."
 msgstr "\"%s\" on tyhjä tiedosto."
 
-#: ../src/client/composer/composer-widget.vala:1569
+#: ../src/client/composer/composer-widget.vala:1576
 #, c-format
 msgid "\"%s\" could not be opened for reading."
 msgstr "Kohteen \"%s\" avaus lukua varten epäonnistui."
 
-#: ../src/client/composer/composer-widget.vala:1576
+#: ../src/client/composer/composer-widget.vala:1583
 #, c-format
 msgid "\"%s\" already attached for delivery."
 msgstr "\"%s\" on jo liitetty lähetystä varten."
 
 #. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
+#: ../src/client/composer/composer-widget.vala:1592
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/client/composer/composer-widget.vala:1646
+#: ../src/client/composer/composer-widget.vala:1650
 msgid "To: "
 msgstr "Vastaanottaja:"
 
-#: ../src/client/composer/composer-widget.vala:1649
+#: ../src/client/composer/composer-widget.vala:1653
 msgid "Cc: "
 msgstr "Kopio:"
 
-#: ../src/client/composer/composer-widget.vala:1652
+#: ../src/client/composer/composer-widget.vala:1656
 msgid "Bcc: "
 msgstr "Piilokopio:"
 
-#: ../src/client/composer/composer-widget.vala:1655
+#: ../src/client/composer/composer-widget.vala:1659
 msgid "Reply-To: "
 msgstr "Vastausosoite:"
 
-#: ../src/client/composer/composer-widget.vala:1888
+#: ../src/client/composer/composer-widget.vala:1847
 msgid "Select Color"
 msgstr "Valitse väri"
 
+#. Inspect.
+#: ../src/client/composer/composer-widget.vala:2076
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1364
+msgid "_Inspect"
+msgstr "T_utki"
+
 #. Displayed in the From dropdown to indicate an "alternate email address"
 #. for an account.  The first printf argument will be the alternate email
 #. address, and the second will be the account's primary email address.
-#: ../src/client/composer/composer-widget.vala:2335
+#: ../src/client/composer/composer-widget.vala:2257
 #, 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:2377
+#: ../src/client/composer/composer-widget.vala:2299
 msgid "_From:"
 msgstr "_Lähettäjä:"
 
+#: ../src/client/composer/composer-widget.vala:2373
+#, fuzzy, c-format
+#| msgid "%s - Conversation Inspector"
+msgid "%s - Composer Inspector"
+msgstr "%s - Keskustelun tutkija"
+
 #: ../src/client/composer/spell-check-popover.vala:210
 msgid "Search for more languages"
 msgstr "Etsi lisää kieliä"
@@ -1072,7 +1071,7 @@ msgstr ""
 
 #. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1331
-#: ../ui/composer.glade.h:4
+#: ../ui/composer-menus.ui.h:13
 msgid "_Copy"
 msgstr "_Kopioi"
 
@@ -1083,7 +1082,7 @@ msgstr "Kopioi _sähköpostiosoite"
 
 #. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1344
-#: ../ui/composer.glade.h:17
+#: ../ui/composer-menus.ui.h:14
 msgid "Copy _Link"
 msgstr "Kopioi _linkki"
 
@@ -1092,10 +1091,11 @@ msgstr "Kopioi _linkki"
 msgid "Select _Message"
 msgstr "_Valitse viesti"
 
-#. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1364
-msgid "_Inspect"
-msgstr "T_utki"
+#. Select all.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1358
+#: ../ui/composer-menus.ui.h:17
+msgid "Select _All"
+msgstr "Valitse _kaikki"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1595
 msgid "This link appears to go to"
@@ -1163,7 +1163,7 @@ msgstr "ei mitään"
 msgid "Failed to open default text editor."
 msgstr "Oletustekstimuokkaimen avaus epäonnistui."
 
-#: ../src/client/conversation-viewer/conversation-web-view.vala:319
+#: ../src/client/conversation-viewer/conversation-web-view.vala:329
 #, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s - Keskustelun tutkija"
@@ -1508,7 +1508,7 @@ msgstr "Lähetetyt"
 msgid "Archive"
 msgstr "Arkisto"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
+#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:29
 msgid "None"
 msgstr "Ei mitään"
 
@@ -1866,251 +1866,166 @@ msgstr "Luota _tähän palvelimeen"
 msgid "_Don't Trust This Server"
 msgstr "_Älä luota tähän palvelimeen"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Kumoa"
+#: ../ui/composer-headerbar.ui.h:1
+msgid "Detach (Ctrl+D)"
+msgstr "Irrota (Ctrl+D)"
 
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Tee uudelleen"
+#: ../ui/composer-headerbar.ui.h:2
+msgid "Attach File (Ctrl+T)"
+msgstr "Liitä tiedosto (Ctrl+T)"
 
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_Leikkaa"
+#: ../ui/composer-headerbar.ui.h:3
+msgid "Include Original Attachments"
+msgstr "Sisällytä alkuperäiset liitteet"
 
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "L_iitä"
+#: ../ui/composer-headerbar.ui.h:4
+msgid "Send (Ctrl+Enter)"
+msgstr "Lähetä (Ctrl+Enter)"
 
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Vasemmalle"
+#: ../ui/composer-headerbar.ui.h:5
+msgid "_Send"
+msgstr "_Lähetä"
 
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Oikealle"
+#: ../ui/composer-headerbar.ui.h:6
+#| msgctxt "Label"
+#| msgid "Close and Discard"
+msgid "Close and Discard"
+msgstr "Sulje ja hylkää"
 
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Keskelle"
+#: ../ui/composer-headerbar.ui.h:7
+#| msgctxt "Label"
+#| msgid "Close and Save"
+msgid "Close and Save"
+msgstr "Sulje ja tallenna"
 
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Tasaa"
+#: ../ui/composer-menus.ui.h:1
+msgid "S_ans Serif"
+msgstr "_Päätteetön"
 
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Linkki (Ctrl+L)"
+#: ../ui/composer-menus.ui.h:2
+msgid "S_erif"
+msgstr "P_äätteellinen"
 
-#: ../ui/composer.glade.h:11
+#: ../ui/composer-menus.ui.h:3
+msgid "_Fixed Width"
+msgstr "_Tasalevyinen"
+
+#: ../ui/composer-menus.ui.h:4
+msgid "_Small"
+msgstr "_Pieni"
+
+#: ../ui/composer-menus.ui.h:5
+msgid "_Medium"
+msgstr "Ta_vallinen"
+
+#: ../ui/composer-menus.ui.h:6
+msgid "Lar_ge"
+msgstr "_Suuri"
+
+#: ../ui/composer-menus.ui.h:7
 msgid "C_olor"
 msgstr "Vä_ri"
 
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Lisää valintoja"
+#: ../ui/composer-menus.ui.h:8
+msgid "_Rich Text"
+msgstr "Muotoilu - _RTF"
 
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Lainaa tekstiä (Ctrl+])"
+#: ../ui/composer-menus.ui.h:9
+msgid "Show Extended Fields"
+msgstr "Näytä laajennetut kentät"
 
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Poista tekstin lainaus (Ctrl+[)"
+#: ../ui/composer-menus.ui.h:10
+msgid "_Undo"
+msgstr "_Kumoa"
 
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Poista muotoilu (Ctrl+Space)"
+#: ../ui/composer-menus.ui.h:11
+msgid "_Redo"
+msgstr "_Tee uudelleen"
 
-#: ../ui/composer.glade.h:16
+#: ../ui/composer-menus.ui.h:12
+msgid "Cu_t"
+msgstr "_Leikkaa"
+
+#: ../ui/composer-menus.ui.h:15
+msgid "_Paste"
+msgstr "L_iitä"
+
+#: ../ui/composer-menus.ui.h:16
 msgctxt "Clipboard paste with rich text"
 msgid "Paste _With Formatting"
 msgstr "Lii_tä muotoilujen kera"
 
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Lihavoitu (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Kursivoitu (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Alleviivattu (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Yliviivattu (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "Muotoilu - _RTF"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Näytä laajennetut kentät"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "Sulje ja tallenna"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "Sulje ja tallenna"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "Sulje ja tallenna"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "Sulje ja hylkää"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "Sulje ja hylkää"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "Sulje ja hylkää"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "_Suuri"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Suuri"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "Ta_vallinen"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Normaali"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_Pieni"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Pieni"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "_Päätteetön"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Päätteetön"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "P_äätteellinen"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "Päätteellinen"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "_Tasalevyinen"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "Tasalevyinen"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "Irrota"
-
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "Irrota (Ctrl+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Lähetä"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "Lähetä"
-
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "Lähetä (Ctrl+Enter)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "Liit_ä tiedosto"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "Liitä tiedosto"
-
-#: ../ui/composer.glade.h:49
-msgid "Attach File (Ctrl+T)"
-msgstr "Liitä tiedosto (Ctrl+T)"
-
-#: ../ui/composer.glade.h:50
-msgid "_Include Original Attachments"
-msgstr "_Sisällytä alkuperäiset liitteet"
-
-#: ../ui/composer.glade.h:51
-msgid "Include Original Attachments"
-msgstr "Sisällytä alkuperäiset liitteet"
-
-#: ../ui/composer.glade.h:52
-msgid "Select spell checking language"
-msgstr "Valitse oikoluvun kieli"
-
-#: ../ui/composer.glade.h:53
-msgid "Spelling language"
-msgstr "Oikoluvun kieli"
-
 #. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:55
+#: ../ui/composer-widget.ui.h:2
 msgid "_To"
 msgstr "_Vastaanottaja"
 
-#: ../ui/composer.glade.h:56
+#: ../ui/composer-widget.ui.h:3
 msgid "_Cc"
 msgstr "_Kopio"
 
-#: ../ui/composer.glade.h:57
+#: ../ui/composer-widget.ui.h:4
 msgid "_Subject"
 msgstr "_Aihe"
 
-#: ../ui/composer.glade.h:58
+#: ../ui/composer-widget.ui.h:5
 msgid "_Bcc"
 msgstr "_Piilokopio"
 
-#: ../ui/composer.glade.h:59
+#: ../ui/composer-widget.ui.h:6
 msgid "_Reply-To"
 msgstr "Vasta_usosoite"
 
 #. Geary account mail will be sent from
-#: ../ui/composer.glade.h:61
+#: ../ui/composer-widget.ui.h:8
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../ui/composer.glade.h:62
+#: ../ui/composer-widget.ui.h:9
 msgid "Drop files here"
 msgstr "Pudota tiedostot tähän"
 
-#: ../ui/composer.glade.h:63
+#: ../ui/composer-widget.ui.h:10
 msgid "To add them as attachments"
 msgstr "lisätäksesi ne liitteiksi"
 
+#: ../ui/composer-widget.ui.h:11
+msgid "Bold (Ctrl+B)"
+msgstr "Lihavoitu (Ctrl+B)"
+
+#: ../ui/composer-widget.ui.h:12
+msgid "Italic (Ctrl+I)"
+msgstr "Kursivoitu (Ctrl+I)"
+
+#: ../ui/composer-widget.ui.h:13
+msgid "Underline (Ctrl+U)"
+msgstr "Alleviivattu (Ctrl+U)"
+
+#: ../ui/composer-widget.ui.h:14
+msgid "Strikethrough (Ctrl+K)"
+msgstr "Yliviivattu (Ctrl+K)"
+
+#: ../ui/composer-widget.ui.h:15
+msgid "Quote text  (Ctrl+])"
+msgstr "Lainaa tekstiä (Ctrl+])"
+
+#: ../ui/composer-widget.ui.h:16
+#| msgid "Unquote text (Ctrl+[)"
+msgid "Unquote text  (Ctrl+[)"
+msgstr "Poista tekstin lainaus (Ctrl+[)"
+
+#: ../ui/composer-widget.ui.h:17
+msgid "Link (Ctrl+L)"
+msgstr "Linkki (Ctrl+L)"
+
+#: ../ui/composer-widget.ui.h:18
+msgid "Remove formatting (Ctrl+Space)"
+msgstr "Poista muotoilu (Ctrl+Space)"
+
+#: ../ui/composer-widget.ui.h:19
+msgid "Select spell checking language"
+msgstr "Valitse oikoluvun kieli"
+
 #: ../ui/edit_alternate_emails.glade.h:1
 msgid "Remove email address"
 msgstr "Poista sähköpostiosoite"
@@ -2148,135 +2063,151 @@ msgstr "_Huomioi kirjainkoko"
 msgid "label"
 msgstr "nimike"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
+#: ../ui/gtk/menus.ui.h:2
+msgid "A_ccounts"
+msgstr "_Tilit"
+
+#: ../ui/login.glade.h:1
+msgid "email@example.com"
+msgstr "osoite@esimerkki.com"
+
+#: ../ui/login.glade.h:2 ../ui/password-dialog.glade.h:3
 msgid "Password"
 msgstr "Salasana"
 
-#: ../ui/login.glade.h:2
+#: ../ui/login.glade.h:3
 msgid "E_mail address"
 msgstr "_Sähköpostiosoite"
 
-#: ../ui/login.glade.h:3
+#: ../ui/login.glade.h:4
 msgid "_Password"
 msgstr "_Salasana"
 
-#: ../ui/login.glade.h:4
+#: ../ui/login.glade.h:5
 msgid "S_ervice"
 msgstr "_Palvelu"
 
-#: ../ui/login.glade.h:5
+#: ../ui/login.glade.h:6
 msgid "N_ame"
 msgstr "_Nimi"
 
-#: ../ui/login.glade.h:7
+#: ../ui/login.glade.h:8
 msgid "N_ickname"
 msgstr "Ni_mimerkki"
 
-#: ../ui/login.glade.h:8
+#: ../ui/login.glade.h:9
 msgid "Work, Home, etc."
 msgstr "Koti, työ tms."
 
-#: ../ui/login.glade.h:9
+#: ../ui/login.glade.h:10
 msgid "_Save sent mail"
 msgstr "_Tallenna lähetetyt viestit"
 
-#: ../ui/login.glade.h:10
+#: ../ui/login.glade.h:11
 msgid "Addi_tional email addresses…"
 msgstr "Lisäosoitteet…"
 
-#: ../ui/login.glade.h:11
+#: ../ui/login.glade.h:12
 msgid "IMAP settings"
 msgstr "IMAP-asetukset"
 
-#: ../ui/login.glade.h:12
+#: ../ui/login.glade.h:13
 msgid "Se_rver"
 msgstr "P_alvelin"
 
-#: ../ui/login.glade.h:13
+#: ../ui/login.glade.h:14
+msgid "imap.example.com"
+msgstr "imap.esimerkki.com"
+
+#: ../ui/login.glade.h:15
 msgid "P_ort"
 msgstr "P_ortti"
 
-#: ../ui/login.glade.h:14
+#: ../ui/login.glade.h:16
+msgid "smtp.example.com"
+msgstr "smtp.esimerkki.com"
+
+#: ../ui/login.glade.h:17
 msgid "Ser_ver"
 msgstr "Pal_velin"
 
-#: ../ui/login.glade.h:15
+#: ../ui/login.glade.h:18
 msgid "Por_t"
 msgstr "Portt_i"
 
-#: ../ui/login.glade.h:16
+#: ../ui/login.glade.h:19
 msgid "SMTP settings"
 msgstr "SMTP-asetukset"
 
-#: ../ui/login.glade.h:17
+#: ../ui/login.glade.h:20
 msgid "User_name"
 msgstr "_Käyttäjätunnus"
 
-#: ../ui/login.glade.h:18
+#: ../ui/login.glade.h:21
 msgid "Pass_word"
 msgstr "_Salasana"
 
-#: ../ui/login.glade.h:19
+#: ../ui/login.glade.h:22
 msgid "SMTP username"
 msgstr "SMTP-käyttäjätunnus"
 
-#: ../ui/login.glade.h:20
+#: ../ui/login.glade.h:23
 msgid "SMTP password"
 msgstr "SMTP-salasana"
 
-#: ../ui/login.glade.h:21
+#: ../ui/login.glade.h:24
 msgid "_Username"
 msgstr "K_äyttäjätunnus"
 
-#: ../ui/login.glade.h:22
+#: ../ui/login.glade.h:25
 msgid "IMAP username"
 msgstr "IMAP-käyttäjätunnus"
 
-#: ../ui/login.glade.h:23
+#: ../ui/login.glade.h:26
 msgid "IMAP password"
 msgstr "IMAP-salasana"
 
-#: ../ui/login.glade.h:24
+#: ../ui/login.glade.h:27
 msgid "Encr_yption"
 msgstr "Sala_us"
 
-#: ../ui/login.glade.h:25
+#: ../ui/login.glade.h:28
 msgid "Encrypt_ion"
 msgstr "Salau_s"
 
-#: ../ui/login.glade.h:27
+#: ../ui/login.glade.h:30
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
-#: ../ui/login.glade.h:28
+#: ../ui/login.glade.h:31
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../ui/login.glade.h:29
+#: ../ui/login.glade.h:32
 msgid "No authentication re_quired"
 msgstr "Tunnistautumista ei _vaadita"
 
-#: ../ui/login.glade.h:30
+#: ../ui/login.glade.h:33
 msgid "Use IMAP cre_dentials"
 msgstr "Kä_ytä IMAP-tunnuksia"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
+#: ../ui/login.glade.h:34 ../ui/preferences.glade.h:5
 msgid "Composer"
 msgstr "Lähettäminen"
 
-#: ../ui/login.glade.h:32
+#: ../ui/login.glade.h:35
 msgid "Save dra_fts on server"
 msgstr "Tall_enna luonnokset palvelimelle"
 
-#: ../ui/login.glade.h:33
+#: ../ui/login.glade.h:36
 msgid "Si_gn emails (HTML allowed):"
 msgstr "_Allekirjoita viestit (HTML sallittu):"
 
-#: ../ui/login.glade.h:34
+#: ../ui/login.glade.h:37
 msgid "Storage"
 msgstr "Varastointi"
 
-#: ../ui/login.glade.h:35
+#: ../ui/login.glade.h:38
 msgid "_Download mail"
 msgstr "_Lataa sähköposti"
 
@@ -2368,6 +2299,73 @@ msgstr "Sähköpostiosoite:"
 msgid "Geary update in progress…"
 msgstr "Gearyn päivitys on meneillään…"
 
+#~ msgid "_Left"
+#~ msgstr "_Vasemmalle"
+
+#~ msgid "_Right"
+#~ msgstr "_Oikealle"
+
+#~ msgid "_Center"
+#~ msgstr "_Keskelle"
+
+#~ msgid "_Justify"
+#~ msgstr "_Tasaa"
+
+#~ msgid "More options"
+#~ msgstr "Lisää valintoja"
+
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "Sulje ja tallenna"
+
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "Sulje ja tallenna"
+
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Sulje ja hylkää"
+
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "Sulje ja hylkää"
+
+#~ msgid "Large"
+#~ msgstr "Suuri"
+
+#~ msgid "Medium"
+#~ msgstr "Normaali"
+
+#~ msgid "Small"
+#~ msgstr "Pieni"
+
+#~ msgid "Sans Serif"
+#~ msgstr "Päätteetön"
+
+#~ msgid "Serif"
+#~ msgstr "Päätteellinen"
+
+#~ msgid "Fixed Width"
+#~ msgstr "Tasalevyinen"
+
+#~ msgid "Detach"
+#~ msgstr "Irrota"
+
+#~ msgid "Send"
+#~ msgstr "Lähetä"
+
+#~ msgid "_Attach File"
+#~ msgstr "Liit_ä tiedosto"
+
+#~ msgid "Attach File"
+#~ msgstr "Liitä tiedosto"
+
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Sisällytä alkuperäiset liitteet"
+
+#~ msgid "Spelling language"
+#~ msgstr "Oikoluvun kieli"
+
 #~ msgid "Application Menu"
 #~ msgstr "Sovellusvalikko"