diff --git a/.evolution-data-server.metadata b/.evolution-data-server.metadata
new file mode 100644
index 0000000..28a3f86
--- /dev/null
+++ b/.evolution-data-server.metadata
@@ -0,0 +1 @@
+0c5875d6617a7e3a4614494fe2359a8ebb321c4b evolution-data-server-3.40.4.tar.xz
diff --git a/0007-oauth2-enable-html5-features.patch b/0007-oauth2-enable-html5-features.patch
new file mode 100644
index 0000000..cad3ef8
--- /dev/null
+++ b/0007-oauth2-enable-html5-features.patch
@@ -0,0 +1,33 @@
+diff -up evolution-data-server-3.40.4/src/libedataserverui/e-credentials-prompter-impl-oauth2.c.7 evolution-data-server-3.40.4/src/libedataserverui/e-credentials-prompter-impl-oauth2.c
+--- evolution-data-server-3.40.4/src/libedataserverui/e-credentials-prompter-impl-oauth2.c.7	2021-08-13 11:44:41.000000000 +0200
++++ evolution-data-server-3.40.4/src/libedataserverui/e-credentials-prompter-impl-oauth2.c	2024-01-11 15:28:03.245950925 +0100
+@@ -573,6 +573,7 @@ e_credentials_prompter_impl_oauth2_show_
+ 	GtkScrolledWindow *scrolled_window;
+ 	GtkWindow *dialog_parent;
+ 	ECredentialsPrompter *prompter;
++	WebKitCookieManager *cookie_manager;
+ 	WebKitSettings *webkit_settings;
+ 	WebKitWebContext *web_context;
+ 	gchar *title, *uri;
+@@ -725,9 +726,9 @@ e_credentials_prompter_impl_oauth2_show_
+ 	webkit_settings = webkit_settings_new_with_settings (
+ 		"auto-load-images", TRUE,
+ 		"default-charset", "utf-8",
+-		"enable-html5-database", FALSE,
+ 		"enable-dns-prefetching", FALSE,
+-		"enable-html5-local-storage", FALSE,
++		"enable-html5-database", TRUE,
++		"enable-html5-local-storage", TRUE,
+ 		"enable-offline-web-application-cache", FALSE,
+ 		"enable-page-cache", FALSE,
+ 		"enable-plugins", FALSE,
+@@ -737,6 +738,9 @@ e_credentials_prompter_impl_oauth2_show_
+ 	web_context = webkit_web_context_new ();
+ 	webkit_web_context_set_sandbox_enabled (web_context, TRUE);
+ 
++	cookie_manager = webkit_web_context_get_cookie_manager (web_context);
++	webkit_cookie_manager_set_accept_policy (cookie_manager, WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS);
++
+ 	widget = g_object_new (WEBKIT_TYPE_WEB_VIEW,
+ 			"settings", webkit_settings,
+ 			"web-context", web_context,
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 9c5c0be..77540e8 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -54,7 +54,7 @@
 
 Name: evolution-data-server
 Version: 3.40.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Backend data server for Evolution
 License: LGPLv2+
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -66,6 +66,7 @@ Patch03: evolution-data-server-3.40.4-google-contacts-to-carddav.patch
 Patch04: evolution-data-server-3.40.4-google-oauth2.patch
 Patch05: evolution-data-server-3.40.4-caldav-crash.patch
 Patch06: evolution-data-server-3.40.4-no-libedataserverui-in-alarm-notify.patch
+Patch07: 0007-oauth2-enable-html5-features.patch
 
 Provides: evolution-webcal = %{version}
 Obsoletes: evolution-webcal < 2.24.0
@@ -510,6 +511,9 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
 %{_datadir}/installed-tests
 
 %changelog
+* Thu Jan 11 2024 Milan Crha <mcrha@redhat.com> - 3.40.4-9
+- Resolves: RHEL-21361 (OAuth2: Enable HTML5 database and local storage features for web view)
+
 * Wed Oct 11 2023 Milan Crha <mcrha@redhat.com> - 3.40.4-8
 - Resolves: RHEL-12405 (Move WebKitGTK parts in Evolution Data Server into optional subpackage)
 - Add requirement on ui subpackage into ui-devel subpackage