diff --git a/CHANGELOG b/CHANGELOG
index 9f413c29d..4a9762140 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,7 @@ CHANGELOG Roundcube Webmail
 - Fix so the database setup description is compatible with MySQL 8 (#7340)
 - Markasjunk: Fix regression in jsevent driver (#7361)
 - Fix missing flag indication on collapsed thread in Larry and Elastic (#7366)
+- Fix default keyservers (use keys.openpgp.org), add note about CORS (#7373, #7367)
 
 RELEASE 1.4.4
 -------------
diff --git a/config/defaults.inc.php b/config/defaults.inc.php
index 5cacaca06..a74893190 100644
--- a/config/defaults.inc.php
+++ b/config/defaults.inc.php
@@ -846,8 +846,8 @@ $config['compose_responses_static'] = array(
 );
 
 // List of HKP key servers for PGP public key lookups in Enigma/Mailvelope
-// Default: array("keys.fedoraproject.org", "keybase.io")
-$config['keyservers'] = array();
+// Note: Lookup is client-side, so the server must support Cross-Origin Resource Sharing
+$config['keyservers'] = array('keys.openpgp.org');
 
 // ----------------------------------
 // ADDRESSBOOK SETTINGS