diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23c1269766..4c10e31f9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,20 @@
 # Mailspring Changelog
 
-### 1.7.7 (TBD)
+### 1.7.8 (5/24/2020)
+
+**Fixes:**
+
+- Resolves a critical SMTP connection problem on Linux for Office365, manually configured Gmail, and other accounts that used the LOGIN SMTP authentication mechanism. #1996, https://github.com/cyrusimap/cyrus-sasl/pull/613
+
+- Plain text messages using a multipart MIME structure with one or more attachments now render correctly as plaintext.
+
+- "Sync Mail Now" is displayed in Preferences > Shortcuts so it's easier to map it to a custom shortcut. #1941
+
+**Developer:**
+
+- Mailspring now uses CSS properties on `mailspring-workspace` to set the height of the thread list and other key components so themes can customize them! See #2004 for details and thanks to @sergeystoma for this improvement!
+
+### 1.7.7 (5/20/2020)
 
 **Fixes:**
 
diff --git a/app/package-lock.json b/app/package-lock.json
index 09ed210fbb..df6f382541 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "mailspring",
-  "version": "1.7.7",
+  "version": "1.7.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/app/package.json b/app/package.json
index fae1fdb527..f0bbf42a1b 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mailspring",
   "productName": "Mailspring",
-  "version": "1.7.7",
+  "version": "1.7.8",
   "repository": {
     "type": "git",
     "url": "git://github.com/foundry376/mailspring.git"
diff --git a/mailsync b/mailsync
index c8c144dd08..0384ec3150 160000
--- a/mailsync
+++ b/mailsync
@@ -1 +1 @@
-Subproject commit c8c144dd0838a2b80b3a51361e5f547ff3b1f599
+Subproject commit 0384ec31502b7f4f3e55d81f6300e9835fe17632