diff --git a/CHANGELOG.md b/CHANGELOG.md
index 771fe009c67ec11d7492738d475b63147a50e3f7..2a436170f1089891c6faf58c6c71be0cec7b7e4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,36 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## 0.6.5 – unreleased
+## 0.7.0 – 2017-08-24
 ### Added
-- Add helper view for keyboard shortcuts
+- Helper view for keyboard shortcuts
   [#91](https://github.com/nextcloud/mail/pull/91) @Gomez 
+- Generic moving of messages (drag and drop)
+- Account menu labels
+- Support for a automatically generated default account
+- Better loading/error/retry views
+- Local attachment support
+- Shortcut c to compose a new message
 
 ### Changed
-- TODO
+- php5.6 to php 7.1 are supported
+- No longer stack Aw, Wg, Fwd
+- App store now lists the app in 'Social & Communication'
+- Improved message synchronization
 
 ### Fixed
-- TODO
+- Use IDBConnection instead of removed IDb
+- Missing files in release package
+- Loading messages with undisclosed recipients
+- Problems with UTF8 encoding
+- Account color dot on Safari
+- Database column width for long passwords
+- Error when adding a new account
+- Undefined index warning
+- Do not show 'noSelect' folders
+- Selected account when composing a reply
+- Remove noreferrer from HTML messages
+- Some issues with drafts
 
 ## 0.6.4 – 2017-05-02
 ### Fixed
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 79567e157aa391d816d6a540c5e152c351524bc5..26e2e07520d50ab324ec4eca928b4ba9bd7e6b06 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<name>Mail</name>
 	<summary>IMAP web client</summary>
 	<description>Easy to use email client which connects to your mail server via IMAP and SMTP.</description>
-	<version>0.6.5</version>
+	<version>0.7.0</version>
 	<licence>agpl</licence>
 	<author>Christoph Wurst</author>
 	<author>Jan-Christoph Borchardt</author>
@@ -29,5 +29,4 @@
 			<step>OCA\Mail\Migration\FixCollectedAddresses</step>
 		</post-migration>
 	</repair-steps>
-	<ocsid>169914</ocsid>
 </info>