diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf15da69c..07d63fff0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Changelog
 
+#### Version 19.18 (May 12, 2018)
+* Fix bugs in new tree-view for mail folders
+
 #### Version 19.17 (May 12, 2018)
 * Add new tree-view for mail folders [#431](https://github.com/qooob/authentic-theme/issues/431)
 * Add Swedish and Albanian language translation updates
diff --git a/theme.info b/theme.info
index 731a967c2..0d8577993 100644
--- a/theme.info
+++ b/theme.info
@@ -1,7 +1,7 @@
 desc=Authentic Theme
 longdesc=Webmin/Usermin/Virtualmin/Cloudmin theme based on Bootstrap and Font Awesome (https://github.com/qooob/authentic-theme)
-version=19.17
-mversion=4
+version=19.18
+mversion=1
 depends=1.880 1.740
 webmin=1
 usermin=1