diff --git a/po/sk.po b/po/sk.po
index 0d6b2e05..7757d7f6 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,8 +10,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=general\n"
-"POT-Creation-Date: 2015-03-11 14:50+0000\n"
-"PO-Revision-Date: 2015-03-11 16:14+0100\n"
+"POT-Creation-Date: 2015-03-12 05:57+0000\n"
+"PO-Revision-Date: 2015-03-12 10:00+0100\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/geary/language/"
 "sk/)\n"
@@ -272,187 +272,192 @@ msgstr "Zlyhalo analyzovanie volieb príkazového riadka: %s\n"
 msgid "Unrecognized command line option \"%s\"\n"
 msgstr "Nerozpoznaná voľba príkazového riadku „%s“\n"
 
-#: ../src/client/application/geary-controller.vala:61
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Odstráni rozhovor (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Odstráni rozhovory (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:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Presunie rozhovory do Koša (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:67
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Presunie rozhovory do Koša (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:72
 msgid "_Archive"
 msgstr "_Archivovať"
 
-#: ../src/client/application/geary-controller.vala:72
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Archivuje rozhovor (A)"
 
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Archivuje rozhovory (A)"
 
-#: ../src/client/application/geary-controller.vala:76
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Označiť ako nev_yžiadanú poštu"
 
-#: ../src/client/application/geary-controller.vala:77
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Označiť ako _vyžiadanú poštu"
 
-#: ../src/client/application/geary-controller.vala:79
-#: ../src/client/application/geary-controller.vala:367
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:368
 msgid "Mark conversation"
 msgstr "Označí rozhovor"
 
-#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Označí rozhovory"
 
-#: ../src/client/application/geary-controller.vala:81
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Pridá menovku rozhovoru"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Pridá menovku rozhovorom"
 
-#: ../src/client/application/geary-controller.vala:83
-#: ../src/client/application/geary-controller.vala:406
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:407
 msgid "Move conversation"
 msgstr "Presunie rozhovor"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Presunie rozhovory"
 
-#: ../src/client/application/geary-controller.vala:343
+#: ../src/client/application/geary-controller.vala:344
 msgid "A_ccounts"
 msgstr "Úč_ty"
 
-#: ../src/client/application/geary-controller.vala:348
+#: ../src/client/application/geary-controller.vala:349
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "N_astavenia"
 
-#: ../src/client/application/geary-controller.vala:352
+#: ../src/client/application/geary-controller.vala:353
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "Po_mocník"
 
-#: ../src/client/application/geary-controller.vala:356
+#: ../src/client/application/geary-controller.vala:357
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_O programe"
 
-#: ../src/client/application/geary-controller.vala:360
+#: ../src/client/application/geary-controller.vala:361
 msgid "_Donate"
 msgstr "_Prispieť"
 
-#: ../src/client/application/geary-controller.vala:364
+#: ../src/client/application/geary-controller.vala:365
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Ukončiť"
 
-#: ../src/client/application/geary-controller.vala:369
+#: ../src/client/application/geary-controller.vala:370
 msgid "_Mark as..."
 msgstr "_Označiť ako…"
 
-#: ../src/client/application/geary-controller.vala:375
+#: ../src/client/application/geary-controller.vala:376
 msgid "Mark as _Read"
 msgstr "Označiť ako _prečítané"
 
-#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/application/geary-controller.vala:382
 msgid "Mark as _Unread"
 msgstr "Označiť ako _neprečítané"
 
-#: ../src/client/application/geary-controller.vala:387
+#: ../src/client/application/geary-controller.vala:388
 msgid "_Star"
 msgstr "Označiť _hviezdičkou"
 
-#: ../src/client/application/geary-controller.vala:392
+#: ../src/client/application/geary-controller.vala:393
 msgid "U_nstar"
 msgstr "Odz_načiť hviezdičku"
 
-#: ../src/client/application/geary-controller.vala:402
+#: ../src/client/application/geary-controller.vala:403
 msgid "Add label"
 msgstr "Pridá menovku"
 
-#: ../src/client/application/geary-controller.vala:403
+#: ../src/client/application/geary-controller.vala:404
 msgid "_Label"
 msgstr "_Menovka"
 
-#: ../src/client/application/geary-controller.vala:407
+#: ../src/client/application/geary-controller.vala:408
 msgid "_Move"
 msgstr "_Presunúť"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:412
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Vytvorí novú správu (Ctrl+N, N)"
 
 #. Reply to a message.
-#: ../src/client/application/geary-controller.vala:415
+#: ../src/client/application/geary-controller.vala:416
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Odpovedať"
 
-#: ../src/client/application/geary-controller.vala:416
+#: ../src/client/application/geary-controller.vala:417
 msgid "Reply (Ctrl+R, R)"
 msgstr "Odpovie (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:420
+#: ../src/client/application/geary-controller.vala:421
 msgid "R_eply All"
 msgstr "Odpov_edať všetkým"
 
-#: ../src/client/application/geary-controller.vala:421
+#: ../src/client/application/geary-controller.vala:422
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Odpovie všetkým (Ctrl+Shift+R, Shift+R)"
 
 #. Forward a message.
-#: ../src/client/application/geary-controller.vala:426
+#: ../src/client/application/geary-controller.vala:427
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Preposlať"
 
-#: ../src/client/application/geary-controller.vala:427
+#: ../src/client/application/geary-controller.vala:428
 msgid "Forward (Ctrl+L, F)"
 msgstr "Prepošle (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:465
+#: ../src/client/application/geary-controller.vala:466
 msgid "Empty"
 msgstr "Vyprázdniť"
 
-#: ../src/client/application/geary-controller.vala:466
+#: ../src/client/application/geary-controller.vala:467
 msgid "Empty Spam or Trash folders"
 msgstr "Vyprázdni priečinky Nevyžiadaná pošta alebo Kôš"
 
-#: ../src/client/application/geary-controller.vala:470
+#: ../src/client/application/geary-controller.vala:471
 msgid "Empty _Spam…"
 msgstr "Vyprázdniť _Nevyžiadanú poštu…"
 
-#: ../src/client/application/geary-controller.vala:474
+#: ../src/client/application/geary-controller.vala:475
 msgid "Empty _Trash…"
 msgstr "Vyprázdniť _Kôš…"
 
-#: ../src/client/application/geary-controller.vala:716
+#. No callback is connected, since we bind the toggle button to the search bar visibility
+#: ../src/client/application/geary-controller.vala:508
+msgid "Toggle search bar"
+msgstr "Prepnúť panel vyhľadávania"
+
+#: ../src/client/application/geary-controller.vala:722
 msgid "Unable to store server trust exception"
 msgstr "Nepodarilo sa uložiť výnimku dôveryhodnosti servera"
 
-#: ../src/client/application/geary-controller.vala:953
+#: ../src/client/application/geary-controller.vala:959
 msgid "Your settings are insecure"
 msgstr "Vaše nastavenie nie sú bezpečné"
 
-#: ../src/client/application/geary-controller.vala:954
+#: ../src/client/application/geary-controller.vala:960
 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 "
@@ -462,17 +467,17 @@ msgstr ""
 "TLS.  To znamená, že vaše meno používateľa a heslo može byť prečítané inou "
 "osobou v sieti.  Naozaj chcete toto vykonať?"
 
-#: ../src/client/application/geary-controller.vala:955
+#: ../src/client/application/geary-controller.vala:961
 msgid "Co_ntinue"
 msgstr "Po_kračovať"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1033
+#: ../src/client/application/geary-controller.vala:1039
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Chyba pri odosielaní emailu"
 
-#: ../src/client/application/geary-controller.vala:1034
+#: ../src/client/application/geary-controller.vala:1040
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -483,12 +488,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:1038
+#: ../src/client/application/geary-controller.vala:1044
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Chyba pri ukladaní odoslanej pošty"
 
-#: ../src/client/application/geary-controller.vala:1039
+#: ../src/client/application/geary-controller.vala:1045
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -497,19 +502,19 @@ msgstr ""
 "„Odoslaná pošta“. Správa zostane vo vašom priečinku „Pošta na odoslanie“, "
 "pokiaľ ju neodstránite."
 
-#: ../src/client/application/geary-controller.vala:1108
+#: ../src/client/application/geary-controller.vala:1114
 msgid "Labels"
 msgstr "Menovky"
 
 #. 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:1120
+#: ../src/client/application/geary-controller.vala:1126
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Nepodarilo sa otvoriť databázu pre %s"
 
-#: ../src/client/application/geary-controller.vala:1121
+#: ../src/client/application/geary-controller.vala:1127
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -534,20 +539,20 @@ msgstr ""
 "Znovu zostavenie databázy zničí všetku miestnu poštu a jej prílohy. <b>Pošta "
 "na serveri nebude ovplyvnená.</b>"
 
-#: ../src/client/application/geary-controller.vala:1123
+#: ../src/client/application/geary-controller.vala:1129
 msgid "_Rebuild"
 msgstr "_Znovu zostaviť"
 
-#: ../src/client/application/geary-controller.vala:1123
+#: ../src/client/application/geary-controller.vala:1129
 msgid "E_xit"
 msgstr "_Ukončiť"
 
-#: ../src/client/application/geary-controller.vala:1132
+#: ../src/client/application/geary-controller.vala:1138
 #, c-format
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Nepodarilo sa znovu zostaviť databázu účtu „%s“"
 
-#: ../src/client/application/geary-controller.vala:1133
+#: ../src/client/application/geary-controller.vala:1139
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -560,14 +565,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:1155
-#: ../src/client/application/geary-controller.vala:1165
-#: ../src/client/application/geary-controller.vala:1176
+#: ../src/client/application/geary-controller.vala:1161
+#: ../src/client/application/geary-controller.vala:1171
+#: ../src/client/application/geary-controller.vala:1182
 #, c-format
 msgid "Unable to open local mailbox for %s"
 msgstr "Nepodarilo sa otvoriť miestnu poštovú schránku účtu %s"
 
-#: ../src/client/application/geary-controller.vala:1156
+#: ../src/client/application/geary-controller.vala:1162
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -586,7 +591,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1166
+#: ../src/client/application/geary-controller.vala:1172
 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 "
@@ -595,7 +600,7 @@ msgid ""
 "Please install the latest version of Geary and try again."
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1177
+#: ../src/client/application/geary-controller.vala:1183
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -607,27 +612,27 @@ msgstr ""
 "\n"
 "Prosím, skontrolujte vaše sieťové pripojenie a znovu spustite program Geary."
 
-#: ../src/client/application/geary-controller.vala:1685
+#: ../src/client/application/geary-controller.vala:1691
 #, c-format
 msgid "About %s"
 msgstr "O %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada.taro@example.com>
-#: ../src/client/application/geary-controller.vala:1688
+#: ../src/client/application/geary-controller.vala:1694
 msgid "translator-credits"
 msgstr "Dušan Kazik <prescott66@gmail.com>"
 
-#: ../src/client/application/geary-controller.vala:1954
+#: ../src/client/application/geary-controller.vala:1960
 msgid "Undo move (Ctrl+Z)"
 msgstr "Vráti späť presunutie (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:1964
+#: ../src/client/application/geary-controller.vala:1970
 #, c-format
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Naozaj chcete otvoriť „%s“?"
 
-#: ../src/client/application/geary-controller.vala:1965
+#: ../src/client/application/geary-controller.vala:1971
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -635,75 +640,75 @@ msgstr ""
 "Prílohy môžu po otvorení poškodiť váš systém.  Otvárajte iba súbory z "
 "dôveryhodných zdrojov."
 
-#: ../src/client/application/geary-controller.vala:1966
+#: ../src/client/application/geary-controller.vala:1972
 msgid "Don't _ask me again"
 msgstr "Nepýtať s_a znovu"
 
-#: ../src/client/application/geary-controller.vala:1984
+#: ../src/client/application/geary-controller.vala:1990
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Súbor s názvom „%s“ už existuje.  Chcete ho nahradiť?"
 
-#: ../src/client/application/geary-controller.vala:1986
+#: ../src/client/application/geary-controller.vala:1992
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "Súbor v „%s“ už existuje.  Nahradením sa prepíše jeho obsah."
 
-#: ../src/client/application/geary-controller.vala:1989
+#: ../src/client/application/geary-controller.vala:1995
 msgid "_Replace"
 msgstr "_Nahradiť"
 
 #. Find out what to do with the inline composers.
 #. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2287
+#: ../src/client/application/geary-controller.vala:2293
 msgid "Close open draft messages?"
 msgstr "Zavrieť otvorené koncepty správ?"
 
-#: ../src/client/application/geary-controller.vala:2417
+#: ../src/client/application/geary-controller.vala:2423
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Vyprázdniť všetky emaily z vášho priečinka %s?"
 
-#: ../src/client/application/geary-controller.vala:2418
+#: ../src/client/application/geary-controller.vala:2424
 msgid "This removes the email from Geary and your email server."
 msgstr ""
 "Týmto sa odstránia všetky emaily z programu Geary a vášho emailového servera."
 
-#: ../src/client/application/geary-controller.vala:2419
+#: ../src/client/application/geary-controller.vala:2425
 msgid "This cannot be undone."
 msgstr "Táto akcia sa nebude dať vrátiť späť."
 
-#: ../src/client/application/geary-controller.vala:2420
+#: ../src/client/application/geary-controller.vala:2426
 #, c-format
 msgid "Empty %s"
 msgstr "Vyprázdniť priečinok %s"
 
-#: ../src/client/application/geary-controller.vala:2437
+#: ../src/client/application/geary-controller.vala:2443
 #, c-format
 msgid "Error emptying %s"
 msgstr "Chyba pri vyprázdňovaní priečinka %s"
 
-#: ../src/client/application/geary-controller.vala:2467
+#: ../src/client/application/geary-controller.vala:2473
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Chcete natrvalo odstrániť túto správu?"
 msgstr[1] "Chcete natrvalo odstrániť tieto správy?"
 msgstr[2] "Chcete natrvalo odstrániť tieto správy?"
 
-#: ../src/client/application/geary-controller.vala:2469
+#: ../src/client/application/geary-controller.vala:2475
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: ../src/client/application/geary-controller.vala:2500
+#: ../src/client/application/geary-controller.vala:2506
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Vráti späť archiváciu (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2515
+#: ../src/client/application/geary-controller.vala:2521
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Vráti späť kôš (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2568
+#: ../src/client/application/geary-controller.vala:2574
 msgid "Undo (Ctrl+Z)"
 msgstr "Vráti späť (Ctrl+Z)"
 
@@ -727,33 +732,45 @@ msgstr[2] "%i zhôd (zalomených)"
 msgid "not found"
 msgstr "nenájdené"
 
-#: ../src/client/components/main-toolbar.vala:11
+#: ../src/client/components/main-toolbar.vala:218
+msgid "No conversations selected"
+msgstr "Žiadne vybrané rozhovory"
+
+#: ../src/client/components/main-toolbar.vala:233
+#, c-format
+msgid "%u conversation selected"
+msgid_plural "%u conversations selected"
+msgstr[0] "%u vybraný rozhovor"
+msgstr[1] "%u vybrané rozhovory"
+msgstr[2] "%u vybraných rozhovorov"
+
+#: ../src/client/components/main-window.vala:419
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: ../src/client/components/search-bar.vala:10
 #: ../src/client/folder-list/folder-list-search-branch.vala:38
 #: ../src/engine/api/geary-special-folder-type.vala:51
 msgid "Search"
 msgstr "Vyhľadať"
 
-#. Search bar.
-#: ../src/client/components/main-toolbar.vala:81
+#. Search entry.
+#: ../src/client/components/search-bar.vala:25
 msgid "Search all mail in account for keywords (Ctrl+S)"
 msgstr "Cyhľadá kľúčové slová vo všetkých správach poštového účtu (Ctrl+S)"
 
-#: ../src/client/components/main-toolbar.vala:200
+#: ../src/client/components/search-bar.vala:118
 #, c-format
 msgid "Indexing %s account"
 msgstr "Indexuje sa účet %s"
 
-#: ../src/client/components/main-toolbar.vala:211
+#: ../src/client/components/search-bar.vala:129
 #: ../src/client/folder-list/folder-list-search-branch.vala:39
 #, c-format
 msgid "Search %s account"
 msgstr ""
 
-#: ../src/client/components/main-window.vala:401
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
 #: ../src/client/components/status-bar.vala:26
 msgid "Sending..."
@@ -800,25 +817,29 @@ msgstr "Vybr_ať všetko"
 msgid "_Keep"
 msgstr "_Ponechať"
 
-#: ../src/client/composer/composer-widget.vala:70
+#: ../src/client/composer/composer-widget.vala:72
 msgid "Saved"
 msgstr "Uložené"
 
-#: ../src/client/composer/composer-widget.vala:71
+#: ../src/client/composer/composer-widget.vala:73
 msgid "Saving"
 msgstr "Ukladá sa"
 
-#: ../src/client/composer/composer-widget.vala:72
+#: ../src/client/composer/composer-widget.vala:74
 msgid "Error saving"
 msgstr "Chyba pri ukladaní"
 
-#: ../src/client/composer/composer-widget.vala:73
+#: ../src/client/composer/composer-widget.vala:75
 msgid "Press Backspace to delete quote"
 msgstr "Stlačte kláves Backspace na odstránenie citácie"
 
+#: ../src/client/composer/composer-widget.vala:76
+msgid "New Message"
+msgstr "Nová správa"
+
 #. 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:134
+#: ../src/client/composer/composer-widget.vala:137
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -827,110 +848,96 @@ msgstr ""
 "priloženým|priložených|priloženého|prikladám|prikladanú|prikladané|"
 "prikladaný|prikladaným|prikladanému"
 
-#: ../src/client/composer/composer-widget.vala:1089
-#: ../src/client/composer/composer-widget.vala:1093
+#: ../src/client/composer/composer-widget.vala:1101
+#: ../src/client/composer/composer-widget.vala:1105
 msgid "Do you want to discard this message?"
 msgstr "Chcete zahodiť túto správu?"
 
-#: ../src/client/composer/composer-widget.vala:1226
+#: ../src/client/composer/composer-widget.vala:1261
 msgid "Send message with an empty subject and body?"
 msgstr "Odoslať správu bez predmetu a s prázdnym telom?"
 
-#: ../src/client/composer/composer-widget.vala:1228
+#: ../src/client/composer/composer-widget.vala:1263
 msgid "Send message with an empty subject?"
 msgstr "Odoslať správu bez predmetu?"
 
-#: ../src/client/composer/composer-widget.vala:1230
+#: ../src/client/composer/composer-widget.vala:1265
 msgid "Send message with an empty body?"
 msgstr "Odoslať správu s prázdnym telom?"
 
-#: ../src/client/composer/composer-widget.vala:1232
+#: ../src/client/composer/composer-widget.vala:1267
 msgid "Send message without an attachment?"
 msgstr "Odoslať správu bez prílohy?"
 
-#: ../src/client/composer/composer-widget.vala:1494
+#: ../src/client/composer/composer-widget.vala:1529
 msgid "Cannot add attachment"
 msgstr "Nedá sa pridať príloha"
 
-#: ../src/client/composer/composer-widget.vala:1505
+#: ../src/client/composer/composer-widget.vala:1540
 #, c-format
 msgid "\"%s\" could not be found."
 msgstr "„%s“ sa nepodarilo nájsť."
 
-#: ../src/client/composer/composer-widget.vala:1512
+#: ../src/client/composer/composer-widget.vala:1547
 #, c-format
 msgid "\"%s\" is a folder."
 msgstr "„%s“ je priečinok."
 
-#: ../src/client/composer/composer-widget.vala:1519
+#: ../src/client/composer/composer-widget.vala:1554
 #, c-format
 msgid "\"%s\" is an empty file."
 msgstr "„%s“ je prázdny súbor."
 
-#: ../src/client/composer/composer-widget.vala:1533
+#: ../src/client/composer/composer-widget.vala:1568
 #, c-format
 msgid "\"%s\" could not be opened for reading."
 msgstr "„%s“ sa nepodarilo otvoriť na čítanie."
 
-#: ../src/client/composer/composer-widget.vala:1540
+#: ../src/client/composer/composer-widget.vala:1575
 #, c-format
 msgid "\"%s\" already attached for delivery."
 msgstr "„%s“ je už priložený na doručenie."
 
 #. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1549
+#: ../src/client/composer/composer-widget.vala:1584
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/client/composer/composer-widget.vala:1609
+#: ../src/client/composer/composer-widget.vala:1644
 msgid "To: "
 msgstr "Pre: "
 
-#: ../src/client/composer/composer-widget.vala:1612
+#: ../src/client/composer/composer-widget.vala:1647
 msgid "Cc: "
 msgstr "Kópia: "
 
-#: ../src/client/composer/composer-widget.vala:1615
+#: ../src/client/composer/composer-widget.vala:1650
 msgid "Bcc: "
 msgstr "Skrytá kópia: "
 
-#: ../src/client/composer/composer-widget.vala:1618
+#: ../src/client/composer/composer-widget.vala:1653
 msgid "Reply-To: "
 msgstr "Komu odpovedať: "
 
-#: ../src/client/composer/composer-widget.vala:1851
+#: ../src/client/composer/composer-widget.vala:1886
 msgid "Select Color"
 msgstr "Výber farby"
 
 #. 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:2286
+#: ../src/client/composer/composer-widget.vala:2321
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s prostredníctvom účtu %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:2328
+#: ../src/client/composer/composer-widget.vala:2363
 msgid "_From:"
 msgstr "Od:"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Window for sending messages.
-#: ../src/client/composer/composer-window.vala:10
-msgid "New Message"
-msgstr "Nová správa"
-
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Ja"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Žiadne vybrané rozhovory."
@@ -1367,6 +1374,10 @@ msgstr "%A"
 msgid "(no subject)"
 msgstr "(žiadny predmet)"
 
+#: ../src/client/util/util-email.vala:87
+msgid "Me"
+msgstr "Ja"
+
 #: ../src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "bajtov"
@@ -1737,121 +1748,131 @@ msgstr "_Formátovaný text"
 msgid "Show Extended Fields"
 msgstr "Zobrazí rozšírené polia"
 
+# DK: https://bugzilla.gnome.org/show_bug.cgi?id=746076
 #: ../ui/composer.glade.h:24
+msgid "Close and Save"
+msgstr "Zavrieť a uložiť"
+
+# DK: https://bugzilla.gnome.org/show_bug.cgi?id=746076
+#: ../ui/composer.glade.h:25
+msgid "Close and Discard"
+msgstr "Zavrieť a zahodiť"
+
+#: ../ui/composer.glade.h:26
 msgid "Lar_ge"
 msgstr "_Veľké"
 
-#: ../ui/composer.glade.h:25
+#: ../ui/composer.glade.h:27
 msgid "Large"
 msgstr "Veľké"
 
-#: ../ui/composer.glade.h:26
+#: ../ui/composer.glade.h:28
 msgid "_Medium"
 msgstr "_Stredné"
 
-#: ../ui/composer.glade.h:27
+#: ../ui/composer.glade.h:29
 msgid "Medium"
 msgstr "Stredné"
 
-#: ../ui/composer.glade.h:28
+#: ../ui/composer.glade.h:30
 msgid "_Small"
 msgstr "_Malé"
 
-#: ../ui/composer.glade.h:29
+#: ../ui/composer.glade.h:31
 msgid "Small"
 msgstr "Malé"
 
-#: ../ui/composer.glade.h:30
+#: ../ui/composer.glade.h:32
 msgid "S_ans Serif"
 msgstr "S_ans Serif"
 
-#: ../ui/composer.glade.h:31
+#: ../ui/composer.glade.h:33
 msgid "Sans Serif"
 msgstr "Sans Serif"
 
-#: ../ui/composer.glade.h:32
+#: ../ui/composer.glade.h:34
 msgid "S_erif"
 msgstr "S_erif"
 
-#: ../ui/composer.glade.h:33
+#: ../ui/composer.glade.h:35
 msgid "Serif"
 msgstr "Serif"
 
-#: ../ui/composer.glade.h:34
+#: ../ui/composer.glade.h:36
 msgid "_Fixed Width"
 msgstr "_Pevná šírka"
 
-#: ../ui/composer.glade.h:35
+#: ../ui/composer.glade.h:37
 msgid "Fixed Width"
 msgstr "Pevná šírka"
 
-#: ../ui/composer.glade.h:36
+#: ../ui/composer.glade.h:38
 msgid "Detach"
 msgstr "Odpojí"
 
-#: ../ui/composer.glade.h:37
+#: ../ui/composer.glade.h:39
 msgid "Detach (Ctrl+D)"
 msgstr "Odpojí (Ctrl+D)"
 
-#: ../ui/composer.glade.h:38
+#: ../ui/composer.glade.h:40
 msgid "_Send"
 msgstr "_Odoslať"
 
-#: ../ui/composer.glade.h:39
+#: ../ui/composer.glade.h:41
 msgid "Send"
 msgstr "Odoslať"
 
-#: ../ui/composer.glade.h:40
+#: ../ui/composer.glade.h:42
 msgid "Send (Ctrl+Enter)"
 msgstr "Odošle (Ctrl+Enter)"
 
-#: ../ui/composer.glade.h:41
+#: ../ui/composer.glade.h:43
 msgid "_Attach File"
 msgstr "_Priložiť súbor"
 
-#: ../ui/composer.glade.h:42
+#: ../ui/composer.glade.h:44
 msgid "Attach File"
 msgstr "Priloží súbor"
 
-#: ../ui/composer.glade.h:43
+#: ../ui/composer.glade.h:45
 msgid "_Include Original Attachments"
 msgstr "Zahrnúť _pôvodné prílohy"
 
-#: ../ui/composer.glade.h:44
+#: ../ui/composer.glade.h:46
 msgid "Include Original Attachments"
 msgstr "zahrnie pôvodné prílohy"
 
 #. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:46
+#: ../ui/composer.glade.h:48
 msgid "_To"
 msgstr "_Pre"
 
-#: ../ui/composer.glade.h:47
+#: ../ui/composer.glade.h:49
 msgid "_Cc"
 msgstr "_Kópia"
 
-#: ../ui/composer.glade.h:48
+#: ../ui/composer.glade.h:50
 msgid "_Subject"
 msgstr "P_redmet"
 
-#: ../ui/composer.glade.h:49
+#: ../ui/composer.glade.h:51
 msgid "_Bcc"
 msgstr "_Skrytá kópia"
 
-#: ../ui/composer.glade.h:50
+#: ../ui/composer.glade.h:52
 msgid "_Reply-To"
 msgstr "_Komu odpovedať"
 
 #. Geary account mail will be sent from
-#: ../ui/composer.glade.h:52
+#: ../ui/composer.glade.h:54
 msgid "From"
 msgstr "Od"
 
-#: ../ui/composer.glade.h:53
+#: ../ui/composer.glade.h:55
 msgid "Drop files here"
 msgstr "Sem pustite súbory"
 
-#: ../ui/composer.glade.h:54
+#: ../ui/composer.glade.h:56
 msgid "To add them as attachments"
 msgstr "Na ich pridanie do prílohy"