diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index f67782673..2898e8f44 100644
--- a/.docker/release/files/usr/local/include/application.ini
+++ b/.docker/release/files/usr/local/include/application.ini
@@ -292,5 +292,5 @@ dev_email = ""
 dev_password = ""
 
 [version]
-current = "2.7.3"
+current = "2.8.0"
 saved = "Mon, 23 Aug 2021 07:55:13 +0000"
diff --git a/.gitignore b/.gitignore
index 088e6c54e..a5eb65382 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,12 @@
 /include.php
 .idea/
 .env
+/test
+/public_html
+/vendors/knockout/spec
+/vendors/openpgp-2.6.2/test/
+/vendors/openpgp-3.1.3/
+/vendors/openpgp-4/
+/vendors/vanillaqr.js/
+/integrations/nextcloud/rainloop
+/integrations/owncloud/rainloop
diff --git a/README.md b/README.md
index 93845af62..2492b9ea9 100644
--- a/README.md
+++ b/README.md
@@ -45,18 +45,18 @@ This fork of RainLoop has the following changes:
 * Admin uses password_hash/password_verify
 * Auth failed attempts written to syslog
 * Added Fail2ban instructions
-* ES2015
+* ES2018
 * PHP 7.3+ required
 * PHP mbstring extension required
 * PHP replaced pclZip with PharData and ZipArchive
-* PHP yaml extension else use the old Spyc
+* Dark mode
 * Added option to remove background/font colors from messages for real "dark mode"
 * Removed BackwardCapability (class \RainLoop\Account)
 * Removed ChangePassword (re-implemented as plugin)
-* Removed OAuth support
 * Removed POP3 support
 * Removed background video support
 * Removed Sentry (Application Monitoring and Error Tracking Software)
+* Removed Spyc yaml
 * Replaced gulp-uglify with gulp-terser
 * CRLF => LF line endings
 * Embed boot.js and boot.css into index.html
@@ -76,6 +76,14 @@ This fork of RainLoop has the following changes:
 * Prevent Google FLoC
 * Added [Fetch Metadata Request Headers](https://www.w3.org/TR/fetch-metadata/) checks
 * Reduced excessive DOM size
+* Support [Kolab groupware](https://kolab.org/)
+* Support IMAP RFC 2971 ID extension
+* Support IMAP RFC 5258 LIST-EXTENDED
+* Support IMAP RFC 5464 METADATA
+* Support IMAP RFC 5819 LIST-STATUS
+* Support IMAP RFC 7628 SASL OAUTHBEARER aka XOAUTH2
+* Support IMAP4rev2 RFC 9051
+
 
 ### Supported browsers
 
@@ -96,10 +104,9 @@ The result is faster and smaller download code (good for mobile networks).
 * Added dev/prototype.js for some additional features
 * boot.js without webpack overhead
 * Modified Jua.js to be without jQuery
-* Replaced ProgressJS with simple native dropin
 * Replaced Autolinker with simple https/email detection
 * Replaced ifvisible.js with simple drop-in replacement
-* Replaced momentToNode with proper HTML5 <time>
+* Replaced momentToNode with proper HTML5 `<time>`
 * Replaced resize listeners with ResizeObserver
 * Replaced bootstrap.js with native drop-in replacement
 * Replaced dev/Common/ClientStorageDriver/* with Web Storage Objects polyfill
@@ -123,29 +130,30 @@ The result is faster and smaller download code (good for mobile networks).
 * Removed momentjs (use Intl)
 * Removed opentip (use CSS)
 * Removed non-community (aka Prem/Premium/License) code
+* Removed ProgressJS
 
 
 RainLoop 1.15 vs SnappyMail
 
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
-|admin.js        	|2.158.025	|   86.179	|
-|app.js          	|4.215.733	|  435.073	|
+|admin.js        	|2.158.025	|   86.479	|
+|app.js          	|4.215.733	|  437.944	|
 |boot.js         	|  672.433	|    2.707	|
-|libs.js         	|  647.679	|  211.161	|
+|libs.js         	|  647.679	|  209.976	|
 |polyfills.js    	|  325.908	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.019.778	|  735.405	|
+|TOTAL           	|8.019.778	|  737.391	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
-|admin.min.js    	|  255.514	|   43.957	| 73.899	| 13.590	| 60.674  	| 12.174	|
-|app.min.js      	|  516.000	|  222.447	|140.430	| 66.271	|110.657  	| 56.274	|
+|admin.min.js    	|  255.514	|   44.124	| 73.899	| 13.633	| 60.674  	| 12.211	|
+|app.min.js      	|  516.000	|  223.756	|140.430	| 66.834	|110.657  	| 56.666	|
 |boot.min.js     	|   66.456	|    1.621	| 22.553	|    983	| 20.043  	|    805	|
-|libs.min.js     	|  574.626	|  101.006	|177.280	| 36.780	|151.855  	| 32.955	|
+|libs.min.js     	|  574.626	|  100.487	|177.280	| 36.620	|151.855  	| 32.835	|
 |polyfills.min.js	|   32.608	|        0	| 11.315	|      0	| 10.072  	|      0	|
-|TOTAL           	|1.445.204	|  369.031	|425.477	|117.624	|353.301  	|102.208	|
-|TOTAL (no admin)	|1.189.690	|  325.074	|351.061	|104.034	|292.627  	| 90.034	|
+|TOTAL           	|1.445.204	|  369.988	|425.477	|118.070	|353.301  	|102.517	|
+|TOTAL (no admin)	|1.189.690	|  325.864	|351.061	|104.437	|292.627  	| 90.306	|
 
 For a user its around 68% smaller and faster than traditional RainLoop.
 
@@ -184,12 +192,12 @@ For a user its around 68% smaller and faster than traditional RainLoop.
 
 |css/*       	|RainLoop	|Snappy   	|RL gzip	|SM gzip	|SM brotli	|
 |------------	|-------:	|------:	|------:	|------:	|--------:	|
-|app.css     	| 340.334	| 92.117	| 46.959	| 17.079	| 14.790	|
-|app.min.css 	| 274.791	| 74.827	| 39.618	| 15.259	| 13.473	|
+|app.css     	| 340.334	| 91.472	| 46.959	| 16.995	| 14.717	|
+|app.min.css 	| 274.791	| 74.268	| 39.618	| 15.159	| 13.419	|
 |boot.css    	|       	|  1.326	|       	|    664	|    545	|
 |boot.min.css	|       	|  1.071	|       	|    590	|    474	|
-|admin.css    	|       	| 39.492	|       	|  8.354	|  7.308	|
-|admin.min.css	|       	| 31.114	|       	|  7.324	|  6.506	|
+|admin.css    	|       	| 39.417	|       	|  8.337	|  7.293	|
+|admin.min.css	|       	| 31.051	|       	|  7.306	|  6.487	|
 
 
 ### Squire vs CKEditor
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index ff7fecc6c..9b8c0547a 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.7.3</upstream>.
+This app packages SnappyMail <upstream>2.8.0</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 0cc791fba..63f69be92 100644
--- a/integrations/cloudron/Dockerfile
+++ b/integrations/cloudron/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir -p /app/code
 WORKDIR /app/code
 
 # If you change the extraction below, be sure to test on scaleway
-VERSION=2.7.3
+VERSION=2.8.0
 RUN wget https://github.com/the-djmaze/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \
     unzip /tmp/snappymail.zip -d /app/code && \
     rm /tmp/snappymail.zip && \
diff --git a/integrations/nextcloud/snappymail/VERSION b/integrations/nextcloud/snappymail/VERSION
index e2bdf6e45..6533b6687 100755
--- a/integrations/nextcloud/snappymail/VERSION
+++ b/integrations/nextcloud/snappymail/VERSION
@@ -1 +1 @@
-2.7.3
\ No newline at end of file
+2.8.0
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index 0597048c8..a50f294f9 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -4,7 +4,7 @@
 	<name>SnappyMail</name>
 	<summary>SnappyMail Webmail</summary>
 	<description>Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, "Additionnal settings" and you will see a "SnappyMail webmail" section. There, click on the link to go to the SnappyMail admin panel. The default user/password is admin/12345. This version is based on SnappyMail 2.6.0 (2021-07).</description>
-	<version>2.7.3</version>
+	<version>2.8.0</version>
 	<licence>agpl</licence>
 	<author>SnappyMail Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
   <namespace>SnappyMail</namespace>
diff --git a/integrations/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl
index 25c69ffc0..562636ed2 100644
--- a/integrations/virtualmin/snappymail.pl
+++ b/integrations/virtualmin/snappymail.pl
@@ -20,7 +20,7 @@ return "SnappyMail Webmail is a browser-based multilingual IMAP client with an a
 # script_snappymail_versions()
 sub script_snappymail_versions
 {
-return ( "2.7.3" );
+return ( "2.8.0" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 762ed160d..4d8eb3873 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "title": "SnappyMail",
   "description": "Simple, modern & fast web-based email client",
   "private": true,
-  "version": "2.7.3",
+  "version": "2.8.0",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",