diff --git a/plugins/login-gmail/index.php b/plugins/login-gmail/index.php
index 706a8e7384..3269d79970 100644
--- a/plugins/login-gmail/index.php
+++ b/plugins/login-gmail/index.php
@@ -14,8 +14,8 @@ class LoginGMailPlugin extends \RainLoop\Plugins\AbstractPlugin
 	const
 		NAME     = 'GMail OAuth2',
 		VERSION  = '2.36',
-		RELEASE  = '2024-03-27',
-		REQUIRED = '2.36.0',
+		RELEASE  = '2024-04-23',
+		REQUIRED = '2.36.1',
 		CATEGORY = 'Login',
 		DESCRIPTION = 'GMail IMAP, Sieve & SMTP login using RFC 7628 OAuth2';
 
@@ -33,13 +33,6 @@ public function Init() : void
 		$this->addHook('smtp.before-login', 'clientLogin');
 		$this->addHook('sieve.before-login', 'clientLogin');
 
-//		set_include_path(get_include_path() . PATH_SEPARATOR . __DIR__);
-		spl_autoload_register(function($classname){
-			if (str_starts_with($classname, 'OAuth2\\')) {
-				include_once __DIR__ . strtr("\\{$classname}", '\\', DIRECTORY_SEPARATOR) . '.php';
-			}
-		});
-
 		$this->addPartHook('LoginGMail', 'ServiceLoginGMail');
 
 		// Prevent Disallowed Sec-Fetch Dest: document Mode: navigate Site: cross-site User: true
diff --git a/plugins/login-gmail/OAuth2/Client.php b/snappymail/v/0.0.0/app/libraries/OAuth2/Client.php
similarity index 99%
rename from plugins/login-gmail/OAuth2/Client.php
rename to snappymail/v/0.0.0/app/libraries/OAuth2/Client.php
index 46f34c42ff..c09fa5a4dc 100644
--- a/plugins/login-gmail/OAuth2/Client.php
+++ b/snappymail/v/0.0.0/app/libraries/OAuth2/Client.php
@@ -22,7 +22,7 @@
  *
  * @author      Pierrick Charron <pierrick@webstart.fr>
  * @author      Anis Berejeb <anis.berejeb@gmail.com>
- * @version     1.3.1-dev
+ * @version     1.3.1
  */
 namespace OAuth2;
 
diff --git a/plugins/login-gmail/OAuth2/GrantType/AuthorizationCode.php b/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/AuthorizationCode.php
similarity index 100%
rename from plugins/login-gmail/OAuth2/GrantType/AuthorizationCode.php
rename to snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/AuthorizationCode.php
diff --git a/plugins/login-gmail/OAuth2/GrantType/ClientCredentials.php b/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/ClientCredentials.php
similarity index 100%
rename from plugins/login-gmail/OAuth2/GrantType/ClientCredentials.php
rename to snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/ClientCredentials.php
diff --git a/plugins/login-gmail/OAuth2/GrantType/IGrantType.php b/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/IGrantType.php
similarity index 100%
rename from plugins/login-gmail/OAuth2/GrantType/IGrantType.php
rename to snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/IGrantType.php
diff --git a/plugins/login-gmail/OAuth2/GrantType/Password.php b/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/Password.php
similarity index 100%
rename from plugins/login-gmail/OAuth2/GrantType/Password.php
rename to snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/Password.php
diff --git a/plugins/login-gmail/OAuth2/GrantType/RefreshToken.php b/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/RefreshToken.php
similarity index 100%
rename from plugins/login-gmail/OAuth2/GrantType/RefreshToken.php
rename to snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/RefreshToken.php
diff --git a/plugins/login-gmail/OAuth2/LICENSE b/snappymail/v/0.0.0/app/libraries/OAuth2/LICENSE
similarity index 100%
rename from plugins/login-gmail/OAuth2/LICENSE
rename to snappymail/v/0.0.0/app/libraries/OAuth2/LICENSE
diff --git a/plugins/login-gmail/OAuth2/README.md b/snappymail/v/0.0.0/app/libraries/OAuth2/README.md
similarity index 100%
rename from plugins/login-gmail/OAuth2/README.md
rename to snappymail/v/0.0.0/app/libraries/OAuth2/README.md