diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04fd5b78a..29ee67768 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # Mailspring Changelog
 
+## 1.11.0 (07/28/2023)
+
+Features:
+
+- The "Move to Folder" menu action allows you to press Tab or the "→" key to complete the name of the highlighted folder, which makes it easier to complete a path in long folder hierarchies.
+
+- Mailspring now properly identifies and formats quoted text from Yahoo and AOL email. (Thanks @nzayatz14)
+
+- On MacOS, the Mailspring icon in the dock now allows you to compose a new message from the context menu. (thanks @Naroh091)
+
+- Mailspring's menu bar icon is now red for new mail and blue for unread mail, which makes it easier to spot a new message that needs attention. (#2433, thanks @marivaldojr)
+
+Bug Fixes:
+
+- Contact sync no longer crashes when a contact has no display name (thanks @ww-daniel-mora)
+
+- The help menu now offers the standard MacOS "menu search" feature (Thanks @probablykasper)
+
+- Colons are allowed in URLs and no longer break Mailspring's link highlighting. (thanks @choptastic!)
+
+- The email preview is no longer in some cases in vertical layout (thanks @glenn2223!)
+
+- Updated Italian translations (thanks @andy00087!)
+
+Developer:
+
+- Mailspring now uses a more restrictive Content-Security-Policy that includes `object-src none; media-src mailspring:; manifest-src none;`. If your plugin packaged media such as sounds, you may need to reference them via the mailspring:// URL syntax (ala 2b75347c)
+
 ## 1.10.8 (12/29/2022)
 
 _Happy new year! Thanks for your continued support - we're celebrating five years of open-source and the 60th Mailspring release!_
diff --git a/app/build/resources/linux/mailspring.appdata.xml.in b/app/build/resources/linux/mailspring.appdata.xml.in
index a1e001317..8130adff2 100644
--- a/app/build/resources/linux/mailspring.appdata.xml.in
+++ b/app/build/resources/linux/mailspring.appdata.xml.in
@@ -33,6 +33,7 @@
   </screenshots>
 
   <releases>
+    <release version="1.11.0" date="2023-07-28" />
     <release version="1.10.8" date="2022-12-29" />
     <release version="1.10.7" date="2022-11-21" />
     <release version="1.10.6" date="2022-08-10" />
@@ -48,4 +49,4 @@
     <release version="1.8.0" date="2021-01-20" />
   </releases>
   <content_rating type="oars-1.0" />
-</component>
+</component>
\ No newline at end of file
diff --git a/app/package.json b/app/package.json
index 0f60b06f3..d7a1a7510 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mailspring",
   "productName": "Mailspring",
-  "version": "1.10.8",
+  "version": "1.11.0",
   "repository": {
     "type": "git",
     "url": "git://github.com/foundry376/mailspring.git"
diff --git a/mailsync b/mailsync
index ee58f8a61..06215f567 160000
--- a/mailsync
+++ b/mailsync
@@ -1 +1 @@
-Subproject commit ee58f8a6178bbbb3ae86be413e29141992cf2b7a
+Subproject commit 06215f5675cd34e3951e207bb0e34670c779c9d0