diff --git a/po/sk.po b/po/sk.po
index cef034e7..279545d3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,16 +10,16 @@ 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-05-02 07:16+0000\n"
-"PO-Revision-Date: 2020-05-02 11:25+0200\n"
+"POT-Creation-Date: 2020-05-02 09:27+0000\n"
+"PO-Revision-Date: 2020-05-02 15:55+0200\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Generator: Poedit 2.3\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0\n"
+"X-Generator: Gtranslator 3.36.0\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
@@ -158,7 +158,7 @@ msgstr "Naposledy zaznamenaná výška okna aplikácie."
 
 #: desktop/org.gnome.Geary.gschema.xml:26
 msgid "Position of folder list pane"
-msgstr ""
+msgstr "Pozícia panelu so zoznamom priečinkov"
 
 #: desktop/org.gnome.Geary.gschema.xml:27
 msgid "Position of the folder list Paned grabber."
@@ -233,7 +233,7 @@ msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:82
 msgid "Languages that shall be used in the spell checker"
-msgstr ""
+msgstr "Jazyky, ktoré by mali byť použité pri kontrole pravopisu"
 
 #: desktop/org.gnome.Geary.gschema.xml:83
 msgid ""
@@ -305,16 +305,17 @@ 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 "Chyba pri odosielaní emailu"
+msgstr "Oneskorenie vrátenia späť odosielania emailu"
 
 #: desktop/org.gnome.Geary.gschema.xml:133
 msgid ""
 "The number of seconds to wait before sending an email. Set to zero or less "
 "to disable."
 msgstr ""
+"Počet sekúnd čakania pred odoslaním emailu. Nastavením na nulu alebo menšiu "
+"hodnotu, sa zakáže."
 
 #: desktop/org.gnome.Geary.gschema.xml:139
 msgid "Brief notification display time"
@@ -379,12 +380,12 @@ msgstr ""
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:261
 msgid "Check your email address and password"
-msgstr ""
+msgstr "Skontrolujte vašu emailovú adresu a heslo"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:272
 msgid "Could not connect, check your network"
-msgstr ""
+msgstr "Nepodarilo sa pripojiť, skontrolujte vašu sieť"
 
 #. Translators: In-app notification label for a
 #. generic error creating an account
@@ -430,7 +431,7 @@ msgstr "osoba@priklad.sk"
 #: src/client/accounts/accounts-editor-add-pane.vala:593
 #: src/client/accounts/accounts-editor-servers-pane.vala:884
 msgid "Login name"
-msgstr ""
+msgstr "Prihlasovacie meno"
 
 #. Translators: Label for the user's password for an IMAP,
 #. SMTP, etc service
@@ -504,7 +505,7 @@ msgstr "Meno nebolo nastavené"
 #. sender address preferences for an account.
 #: src/client/accounts/accounts-editor-edit-pane.vala:464
 msgid "Sender Name"
-msgstr ""
+msgstr "Meno odosielateľa"
 
 #: src/client/accounts/accounts-editor-edit-pane.vala:491
 msgid "Remove"
@@ -546,7 +547,7 @@ msgstr "Pridá späť adresu „%s“"
 #. is the email address edited.
 #: src/client/accounts/accounts-editor-edit-pane.vala:742
 msgid "Undo signature changes"
-msgstr ""
+msgstr "Vráti späť zmeny podpisu"
 
 #. Translators: This label describes the account
 #. preference for the length of time (weeks, months or
@@ -563,7 +564,7 @@ msgstr "Prevziať poštu"
 #: src/client/accounts/accounts-editor-edit-pane.vala:822
 #, c-format
 msgid "Change download period back to: %s"
-msgstr ""
+msgstr "Zmení interval preberania späť na: %s"
 
 #: src/client/accounts/accounts-editor-edit-pane.vala:843
 msgid "Everything"
@@ -607,10 +608,9 @@ msgstr[2] "starú %d dní"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:255
 #: src/client/application/application-main-window.vala:2053
-#, fuzzy
 #| msgid "_Undo"
 msgid "Undo"
-msgstr "Vrátiť _späť"
+msgstr "Vrátiť späť"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:264
 #: src/client/application/application-main-window.vala:2036
@@ -639,21 +639,20 @@ msgstr "Yahoo"
 #. loaded but disabled by the user.
 #: src/client/accounts/accounts-editor-list-pane.vala:384
 msgid "This account has been disabled"
-msgstr ""
+msgstr "Tento účet bol zakázaný"
 
 #. 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
-#, fuzzy
 #| msgid "Geary has encountered a problem"
 msgid "This account has encountered a problem and is unavailable"
-msgstr "Aplikácia Geary narazila na problém"
+msgstr "Tento účet narazil na problém a nie je dostupný"
 
 #. Translators: Label for adding a generic email account
 #: src/client/accounts/accounts-editor-list-pane.vala:443
 msgid "Other email providers"
-msgstr ""
+msgstr "Iní poskytovatelia emailu"
 
 #. Translators: Notification shown after removing an
 #. account. The string substitution is the name of the
@@ -661,7 +660,7 @@ msgstr ""
 #: src/client/accounts/accounts-editor-list-pane.vala:560
 #, c-format
 msgid "Account “%s” removed"
-msgstr ""
+msgstr "Účet „%s“ bol odstránený"
 
 #. Translators: Notification shown after removing an account
 #. is undone. The string substitution is the name of the
@@ -669,26 +668,26 @@ msgstr ""
 #: src/client/accounts/accounts-editor-list-pane.vala:567
 #, c-format
 msgid "Account “%s” restored"
-msgstr ""
+msgstr "Účet „%s“ bol obnovený"
 
 #. Translators: Tooltip for dragging list items
 #: src/client/accounts/accounts-editor-row.vala:50
 msgid "Drag to move this item"
-msgstr ""
+msgstr "Ťahaním presuniete túto položku"
 
 #. 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
 msgid "Service provider"
-msgstr ""
+msgstr "Poskytovateľ služby"
 
 #. 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
 msgid "Connection security"
-msgstr ""
+msgstr "Zabezpečenie pripojenia"
 
 #. Translators: Label used when no auth scheme is used
 #. by an account's IMAP or SMTP service.
@@ -823,15 +822,14 @@ msgstr "Navštívte webovú stránku aplikácie Geary"
 #. / Command line option
 #: src/client/application/application-client.vala:94
 msgid "Print debug logging"
-msgstr ""
+msgstr "Vypíše ladiaci záznam"
 
 # cmd line desc
 #. / Command line option
 #: src/client/application/application-client.vala:97
-#, fuzzy
 #| msgid "Start Geary with hidden main window"
 msgid "Start with the main window hidden (deprecated)"
-msgstr "Spustí aplikáciu Geary so skrytým hlavným oknom"
+msgstr "Spustí aplikáciu Geary so skrytým hlavným oknom (zastarané)"
 
 #. / Command line option
 #: src/client/application/application-client.vala:100
@@ -983,10 +981,10 @@ msgstr ""
 #. / Command line warning, string substitution
 #. / is the given argument
 #: src/client/application/application-client.vala:970
-#, fuzzy, c-format
+#, c-format
 #| msgid "Unrecognized command line option “%s”\n"
 msgid "Unrecognised program argument: “%s”"
-msgstr "Nerozpoznaná voľba príkazového riadku „%s“\n"
+msgstr "Nerozpoznaný parameter programu: „%s“"
 
 #. / Notification title.
 #: src/client/application/application-controller.vala:458
@@ -998,7 +996,7 @@ msgstr "Vyskytol sa problém s odosielaním pošty z účtu %s"
 #. / Notification body
 #: src/client/application/application-controller.vala:462
 msgid "Email will not be sent until re-connected"
-msgstr ""
+msgstr "Email nebude odoslaný až do opätovného pripojenia"
 
 #. / Translators: Label for in-app notification
 #: src/client/application/application-controller.vala:568
@@ -1055,35 +1053,34 @@ msgstr[2] "Rozhovory boli archivované"
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
 #: src/client/application/application-controller.vala:707
-#, fuzzy, c-format
+#, c-format
 #| msgid "Message not saved"
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
-msgstr[0] "Správa nebola uložená"
-msgstr[1] "Správa nebola uložená"
-msgstr[2] "Správa nebola uložená"
+msgstr[0] "Správa bola obnovená do priečinka %s"
+msgstr[1] "Správy boli obnovené do priečinka %s"
+msgstr[2] "Správy boli obnovené do priečinka %s"
 
 #. / Translators: Label for in-app notification.
 #: src/client/application/application-controller.vala:728
-#, fuzzy
 #| msgid "Message not saved"
 msgid "Message archived"
 msgid_plural "Messages archived"
-msgstr[0] "Správa nebola uložená"
-msgstr[1] "Správa nebola uložená"
-msgstr[2] "Správa nebola uložená"
+msgstr[0] "Správa bola archivovaná"
+msgstr[1] "Správy boli archivované"
+msgstr[2] "Správy boli archivované"
 
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
 #: src/client/application/application-controller.vala:763
-#, fuzzy, c-format
+#, c-format
 #| msgid "Message not saved"
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
-msgstr[0] "Správa nebola uložená"
-msgstr[1] "Správa nebola uložená"
-msgstr[2] "Správa nebola uložená"
+msgstr[0] "Správa bola presunutá do priečinka %s"
+msgstr[1] "Správy boli presunuté do priečinka %s"
+msgstr[2] "Správy boli presunuté do priečinka %s"
 
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
@@ -1173,27 +1170,27 @@ msgstr ""
 #: src/client/application/application-controller.vala:2656
 #, c-format
 msgid "Email to %s queued for delivery"
-msgstr ""
+msgstr "Email pre %s bol zaradený do fronty na doručenie"
 
 #. / 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:2720
 #, c-format
 msgid "Email to %s saved"
-msgstr ""
+msgstr "Email pre %s bol uložený"
 
 #. / Translators: A label for an in-app notification.
 #: src/client/application/application-controller.vala:2735
 #: src/client/application/application-controller.vala:2793
 msgid "Composer could not be restored"
-msgstr ""
+msgstr "Nepodarilo sa obnoviť tvorcu správ"
 
 #. / 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:2778
 #, c-format
 msgid "Email to %s discarded"
-msgstr ""
+msgstr "Email pre %s bol zahodený"
 
 #. / Translators: Main window title, first string
 #. / substitution being the currently selected folder name,
@@ -1281,17 +1278,16 @@ msgid "Don’t _ask me again"
 msgstr "Nepýtať s_a znovu"
 
 #: src/client/components/components-inspector.vala:72
-#, fuzzy
 #| msgid "_Inspect"
 msgid "Inspector"
-msgstr "_Preskúmať"
+msgstr "Inšpektor"
 
 #. / Translators: Title for Inspector logs pane
 #. / Translators: Title for problem report dialog logs pane
 #: src/client/components/components-inspector.vala:87
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:102
 msgid "Logs"
-msgstr ""
+msgstr "Záznamy"
 
 #. / Translators: Title for Inspector system system information pane
 #. / Translators: Title for problem report system information
@@ -1299,7 +1295,7 @@ msgstr ""
 #: src/client/components/components-inspector.vala:91
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:105
 msgid "System"
-msgstr ""
+msgstr "Systém"
 
 #. Button label for saving problem report information
 #: src/client/components/components-inspector.vala:208
@@ -1307,10 +1303,9 @@ msgstr ""
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:221
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:224
 #: ui/problem-details-dialog.ui:42
-#, fuzzy
 #| msgid "_Save As..."
 msgid "Save As"
-msgstr "_Uložiť ako…"
+msgstr "Uložiť ako"
 
 #: src/client/components/components-inspector.vala:212
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:225
@@ -1363,10 +1358,9 @@ msgstr "Vyhľadať"
 
 #. / Translators: Search entry tooltip
 #: src/client/components/components-search-bar.vala:32
-#, fuzzy
 #| msgid "Search all mail in account for keywords (Ctrl+S)"
 msgid "Search all mail in account for keywords"
-msgstr "Cyhľadá kľúčové slová vo všetkých správach poštového účtu (Ctrl+S)"
+msgstr "Vyhľadá kľúčové slová v celej pošte účtu"
 
 #. / Translators: Search entry placeholder, string
 #. / replacement is the name of an account
@@ -1379,10 +1373,9 @@ msgstr "Prehľadať účet %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
-#, fuzzy
 #| msgid "Invalid email address"
 msgid "An email address is required"
-msgstr "Neplatná emailová adresa"
+msgstr "Vyžaduje sa emailová adresa"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but the address is invalid.
@@ -1395,32 +1388,30 @@ msgstr "Nie je platnou emailovou adresou"
 #. provided.
 #: src/client/components/components-validator.vala:440
 msgid "A server name is required"
-msgstr ""
+msgstr "Vyžaduje sa názov serveru"
 
 #. 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
 msgid "Could not look up server name"
-msgstr ""
+msgstr "Nepodarilo sa nájsť názov serveru"
 
 #: src/client/components/main-toolbar.vala:116
-#, fuzzy
 #| msgid "Mark conversation"
 msgid "Mark conversation"
 msgid_plural "Mark conversations"
 msgstr[0] "Označí rozhovor"
-msgstr[1] "Označí rozhovor"
-msgstr[2] "Označí rozhovor"
+msgstr[1] "Označí rozhovory"
+msgstr[2] "Označí rozhovory"
 
 #: src/client/components/main-toolbar.vala:121
-#, fuzzy
 #| msgid "Add label to conversation"
 msgid "Add label to conversation"
 msgid_plural "Add label to conversations"
 msgstr[0] "Pridá menovku rozhovoru"
-msgstr[1] "Pridá menovku rozhovoru"
-msgstr[2] "Pridá menovku rozhovoru"
+msgstr[1] "Pridá menovku rozhovorom"
+msgstr[2] "Pridá menovku rozhovorom"
 
 #: src/client/components/main-toolbar.vala:126
 msgid "Move conversation"
@@ -2166,24 +2157,18 @@ 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
-#, fuzzy
-#| msgid "%a, %b %-e, %Y at %-l:%M %p"
 msgid "%a, %b %-e, %Y at %l:%M %P"
 msgstr "%A, %-e. %B %Y o %H:%M"
 
 #. / 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
-#, fuzzy
-#| msgid "%a, %b %-e, %Y at %-l:%M %p"
 msgid "%a, %b %-e, %Y at %H:%M"
 msgstr "%A, %-e. %B %Y o %H:%M"
 
 #. / 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
-#, fuzzy
-#| msgid "%a, %b %-e, %Y at %-l:%M %p"
 msgid "%a, %b %-e, %Y at %X"
 msgstr "%A, %-e. %B %Y o %H:%M"
 
@@ -2884,7 +2869,7 @@ msgstr "Odstráni formátovanie textu"
 
 #: ui/composer-widget.ui:836
 msgid "Change font type"
-msgstr ""
+msgstr "Zmení typ písma"
 
 #: ui/composer-widget.ui:851
 msgid "Sans Serif"
@@ -2900,18 +2885,17 @@ msgstr "Pevná šírka"
 
 #: ui/composer-widget.ui:899
 msgid "Change font color"
-msgstr ""
+msgstr "Zmení farbu písma"
 
 #: ui/composer-widget.ui:914
 msgid "Change font size"
-msgstr ""
+msgstr "Zmení veľkosť písma"
 
 # tooltip
 #: ui/composer-widget.ui:949
-#, fuzzy
 #| msgid "Insert or update selection link (Ctrl+L)"
 msgid "Insert or update text link"
-msgstr "Vloží alebo aktualizuje odkaz výberu (Ctrl+L)"
+msgstr "Vloží alebo aktualizuje textový odkaz"
 
 # tooltip
 #: ui/composer-widget.ui:973
@@ -2933,10 +2917,9 @@ msgid "Attach a file"
 msgstr "Priloží súbor"
 
 #: ui/composer-widget.ui:1117
-#, fuzzy
 #| msgid "Include Original Attachments"
 msgid "Add original attachments"
-msgstr "Zahrnie pôvodné prílohy"
+msgstr "Pridá pôvodné prílohy"
 
 #: ui/composer-widget.ui:1162
 msgid "More options"
@@ -2944,7 +2927,7 @@ msgstr "Viac volieb"
 
 #: ui/composer-widget.ui:1182
 msgid "Show formatting toolbar"
-msgstr ""
+msgstr "Zobrazí lištu nástrojov s formátovaním"
 
 # tooltip
 #: ui/composer-widget.ui:1200
@@ -3051,7 +3034,6 @@ msgid "Copy to clipboard"
 msgstr "Skopíruje to schránky"
 
 #: ui/conversation-contact-popover.ui:146
-#| msgid "Move conversation"
 msgid "New Conversation…"
 msgstr "Nový rozhovor…"
 
@@ -3061,10 +3043,9 @@ msgstr "Skopírovať emailovú adresu"
 
 # tooltip
 #: ui/conversation-contact-popover.ui:182
-#, fuzzy
 #| msgid "Save and Close"
 msgid "Save in Contacts…"
-msgstr "Uloží a zavrie"
+msgstr "Uložiť do kontaktov…"
 
 #: ui/conversation-contact-popover.ui:195
 msgid "Show Conversations"
@@ -3205,7 +3186,6 @@ msgid "Copy Link _Address"
 msgstr "Skopírovať _adresu odkazu"
 
 #: ui/conversation-message-menus.ui:17
-#| msgid "Move conversation"
 msgid "_New Conversation…"
 msgstr "_Nový rozhovor…"
 
@@ -3325,12 +3305,11 @@ msgid "Forward"
 msgstr "Preposlanie"
 
 #: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:283
-#, fuzzy
 #| msgctxt "shortcut window"
 #| msgid "Mark read"
 msgctxt "shortcut window"
 msgid "Un-mark/mark read"
-msgstr "Označenie ako prečítané"
+msgstr "Označenie ako prečítané/neprečítané"
 
 #: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:290
 msgctxt "shortcut window"
@@ -3348,26 +3327,23 @@ msgid "Move conversations"
 msgstr "Presun rozhovorov"
 
 #: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:311
-#, fuzzy
 #| msgctxt "shortcut window"
 #| msgid "Label the conversation"
 msgctxt "shortcut window"
 msgid "Label conversations"
-msgstr "Pridanie menovky rozhovoru"
+msgstr "Pridanie menovky rozhovorom"
 
 #: ui/gtk/help-overlay.ui:80
-#, fuzzy
 #| msgid "Mark conversations"
 msgctxt "shortcut window"
 msgid "Trash conversations"
-msgstr "Označí rozhovory"
+msgstr "Presunutie rozhovorov do Koša"
 
 #: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:318
-#, fuzzy
 #| msgid "Mark conversations"
 msgctxt "shortcut window"
 msgid "Junk conversations"
-msgstr "Označí rozhovory"
+msgstr "Presunutie rozhovorov do Nevyžiadanej pošty"
 
 #: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:325
 msgctxt "shortcut window"
@@ -3380,11 +3356,10 @@ msgid "Search"
 msgstr "Vyhľadávanie"
 
 #: ui/gtk/help-overlay.ui:108
-#, fuzzy
 #| msgid "Mark conversations"
 msgctxt "shortcut window"
 msgid "Search for conversations"
-msgstr "Označí rozhovory"
+msgstr "Vyhľadanie rozhovorov"
 
 #: ui/gtk/help-overlay.ui:115
 msgctxt "shortcut window"
@@ -3392,11 +3367,10 @@ msgid "Find in current conversation"
 msgstr "Nájdenie v aktuálnom rozhovore"
 
 #: ui/gtk/help-overlay.ui:141
-#, fuzzy
 #| msgid "_Undo"
 msgctxt "shortcut window"
 msgid "Undo"
-msgstr "Vrátiť _späť"
+msgstr "Vrátenie späť"
 
 #: ui/gtk/help-overlay.ui:145
 msgctxt "shortcut window"