diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fba635d5..439ee6a70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,44 @@
 # Mailspring Changelog
 
+### 1.5.7 (2/25/2019)
+
+Fixes:
+
+* Emails in Gmail accounts no longer "flicker" in the thread list occasionally if you mark them as read and archive them in quick succession.
+
+* Duplicate sent emails (your copy + the recipient's copy) no longer appear in Gmail when open/link tracking are enabled. Gmail IMAP changed handling of IMAP Delete + Expunge in Sent Mail earlier this month causing this bug. This also resolves issues where viewing a message you sent would trigger read receipts. #1279 #1086 #937 #1162 #1049
+
+* Mailspring no longer erases all your account passwords when signing out of your Mailspring ID on macOS due to a race condition.
+
+* Cut/copy/paste and undo/redo now work in the "Create a Mailspring ID" and "Upgrade to Pro" webviews within the app. #15219
+
+* Mailspring now requests the "internal / received" date of emails to handle providers (including home.pl) which do not return message dates when asked for mailbox headers. This fixes an important issue where all emails could appear to be from 1969.
+
+* Mailspring now renders inline images attachments within the body of the email even if they're missing an "inline" content-disposition. Previously these images would appear as attachments at the bottom of the message.
+
+* Mailspring now supports home.pl accounts which advertised support for the IMAP XLIST extension but did not appear to implement it properly.
+
+* The contact sidebar now opens LinkedIn person profiles correctly - the "/in/" segment of the URL was previously missing.
+
+* The signature editor now allows you to add a link to your LinkedIn profile.
+
+* Mailspring shows the "Snoozed" folder name correctly in cases where it's called "Mailspring.Snoozed".
+
+* Mailspring is now less aggressive about wrapping wide emails and prefers horizontal scrolling
+  for large tables, etc.
+
+* French translations have been improved (thanks to @Gaspacchio!)
+
+Performance:
+
+* Mailspring now uses DOM ResizeObservers to implement scroll bars and properly size emails as they render which is a huge performance win, especially on slower machines.
+
+* Mailspring refreshes the data backing the conversation view asynchronously when threads are removed, eliminating jank that was especially noticable if you'd scrolled down in the list and were viewing a unified mailbox.
+
+Development:
+
+* Mailspring now uses Electron 4.0.5.
+
 ### 1.5.6 (2/8/2019)
 
 Features:
diff --git a/app/package.json b/app/package.json
index 8f2ecbb70..bb58f0288 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mailspring",
   "productName": "Mailspring",
-  "version": "1.5.6",
+  "version": "1.5.7",
   "commitHash": "COMMIT_INSERTED_DURING_PACKAGING",
   "description": "The best email app for people and teams at work",
   "license": "GPL-3.0",
diff --git a/package.json b/package.json
index 56c7705c7..6d006f7d9 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "babel-preset-react": "6.x.x",
     "chalk": "1.x.x",
     "devtron": "^1.4.0",
-    "electron": "4.0.4",
+    "electron": "4.0.5",
     "electron-installer-dmg": "0.2.x",
     "electron-packager": "13.0.x",
     "electron-winstaller": "2.x.x",