diff --git a/composer.json b/composer.json
index 93063657bb..582a064f7a 100644
--- a/composer.json
+++ b/composer.json
@@ -54,6 +54,10 @@
 			"type": "vcs",
 			"url": "https://github.com/egroupware/Compress"
 		},
+		{
+			"type": "vcs",
+			"url": "https://github.com/egroupware/Imap_Client"
+		},
 		{
 			"type": "vcs",
 			"url": "https://github.com/IMSGlobal/lti-1-3-php-library"
@@ -93,6 +97,7 @@
 		"egroupware/crypt": "^2.7.13",
 		"egroupware/guzzlestream": "dev-master",
 		"egroupware/icalendar": "^2.1.9",
+		"egroupware/imap-client": "2.30.4",
 		"egroupware/magicsuggest": "^2.1",
 		"egroupware/news_admin": "self.version",
 		"egroupware/openid": "self.version",
@@ -109,7 +114,6 @@
 		"npm-asset/as-jqplot": "1.0.*",
 		"npm-asset/gridster": "0.5.*",
 		"oomphinc/composer-installers-extender": "^1.1",
-		"pear-pear.horde.org/horde_imap_client": "^2.30.3",
 		"pear-pear.horde.org/horde_mail": "^2.1.2",
 		"pear-pear.horde.org/horde_managesieve": "^1.0.2",
 		"pear-pear.horde.org/horde_mapi": "^1.0.9",
diff --git a/composer.lock b/composer.lock
index 14487ac361..afed282afd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c413807814d716c0662b69272da98ba2",
+    "content-hash": "5a9ac5a19bb28961cbb8215f95ea72b9",
     "packages": [
         {
             "name": "adldap2/adldap2",
@@ -207,7 +207,7 @@
             "version": "v2.3.4",
             "source": {
                 "type": "git",
-                "url": "git@github.com:fengyuanchen/cropper.git",
+                "url": "https://github.com/fengyuanchen/cropper.git",
                 "reference": "30c58b29ee21010e17e58ebab165fbd84285c685"
             },
             "dist": {
@@ -305,7 +305,7 @@
             "version": "1.12.4",
             "source": {
                 "type": "git",
-                "url": "git@github.com:jquery/jquery-dist.git",
+                "url": "https://github.com/jquery/jquery-dist.git",
                 "reference": "5e89585e0121e72ff47de177c5ef604f3089a53d"
             },
             "dist": {
@@ -1211,16 +1211,16 @@
         },
         {
             "name": "egroupware/imap-client",
-            "version": "2.30.2",
+            "version": "2.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/EGroupware/Imap_Client.git",
-                "reference": "8d80312313188082733e45e6d674ecfe15b7eb8e"
+                "reference": "f7dd50133871e34a5a7560ac08626ee11e9ccc3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/EGroupware/Imap_Client/zipball/8d80312313188082733e45e6d674ecfe15b7eb8e",
-                "reference": "8d80312313188082733e45e6d674ecfe15b7eb8e",
+                "url": "https://api.github.com/repos/EGroupware/Imap_Client/zipball/f7dd50133871e34a5a7560ac08626ee11e9ccc3e",
+                "reference": "f7dd50133871e34a5a7560ac08626ee11e9ccc3e",
                 "shasum": ""
             },
             "require": {
@@ -1261,7 +1261,6 @@
                     "Horde_Imap_Client": "lib/"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "LGPL-2.1"
             ],
@@ -1274,6 +1273,9 @@
             ],
             "description": "IMAP client library",
             "homepage": "https://www.horde.org/libraries/Horde_Imap_Client",
+            "support": {
+                "source": "https://github.com/EGroupware/Imap_Client/tree/2.30.4"
+            },
             "time": "2019-09-29T00:00:00+00:00"
         },
         {