diff --git a/app/[locale]/privacy-policy/page.tsx b/app/[locale]/privacy-policy/page.tsx
index 912e6ef..37431b7 100644
--- a/app/[locale]/privacy-policy/page.tsx
+++ b/app/[locale]/privacy-policy/page.tsx
@@ -1,12 +1,14 @@
 import { Main } from "@/app/ui/Main";
+import { ClassNames } from "@emotion/react";
 import { getTranslations } from "next-intl/server";
+import Link from "next/link";
 
 const PrivacyPolicyPage = async () => {
     const t = await getTranslations("privacy-policy-page");
 
     const richTextFormat = {
         strong: (chunks: React.ReactNode) => <strong>{chunks}</strong>,
-        a: (chunks: React.ReactNode) => <a href="mailto:support@rezije.app">{chunks}</a>
+        emailLink: (chunks: React.ReactNode) => <Link href={`mailto:${chunks}`} className="no-underline hover:underline">{chunks}</Link>
     };
 
     return (
diff --git a/app/[locale]/terms-of-service/page.tsx b/app/[locale]/terms-of-service/page.tsx
index 1c2b21a..bb4b546 100644
--- a/app/[locale]/terms-of-service/page.tsx
+++ b/app/[locale]/terms-of-service/page.tsx
@@ -1,12 +1,14 @@
 import { Main } from "@/app/ui/Main";
 import { getTranslations } from "next-intl/server";
+import Link from "next/link";
 
 const TermsPage = async () => {
     const t = await getTranslations("terms-of-service-page");
 
     const richTextFormat = {
         strong: (chunks: React.ReactNode) => <strong>{chunks}</strong>,
-        a: (chunks: React.ReactNode) => <a href="mailto:support@rezije.app">{chunks}</a>
+        emailLink: (chunks: React.ReactNode) => <Link href={`mailto:${chunks}`} className="no-underline hover:underline">{chunks}</Link>
+
     };
 
     return (
diff --git a/messages/en.json b/messages/en.json
index a7ac279..50f91eb 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -328,7 +328,7 @@
     },
     "section-11": {
       "heading": "11. Contact Us",
-      "content": "If you have any questions about these Terms, please contact us at <a href=\"mail:support@rezije.app\">support@rezije.app</a>."
+      "content": "If you have any questions about these Terms, please contact us at <emailLink>support@rezije.app</emailLink>."
     }
   },
   "privacy-policy-page": {
@@ -373,7 +373,7 @@
     },
     "section-10": {
       "heading": "10. Contact Us",
-      "content": "If you have any questions about this Privacy Policy, please contact us at <a href=\"mail:support@rezije.app\">support@rezije.app</a>."
+      "content": "If you have any questions about this Privacy Policy, please contact us at <emailLink>support@rezije.app</emailLink>."
     },
     "section-11": {
       "heading": "11. Consent",
diff --git a/messages/hr.json b/messages/hr.json
index 7160988..388c490 100644
--- a/messages/hr.json
+++ b/messages/hr.json
@@ -325,7 +325,7 @@
     },
     "section-11": {
       "heading": "11. Kontaktirajte nas",
-      "content": "Ako imate bilo kakvih pitanja o ovim Uvjetima, molimo kontaktirajte nas na <a href=\"mail:support@rezije.app\">support@rezije.app</a>."
+      "content": "Ako imate bilo kakvih pitanja o ovim Uvjetima, molimo kontaktirajte nas na <emailLink>support@rezije.app</emailLink>."
     }
   },
   "privacy-policy-page": {
@@ -370,7 +370,7 @@
     },
     "section-10": {
       "heading": "10. Kontaktirajte nas",
-      "content": "Ako imate bilo kakvih pitanja o ovim Pravilima privatnosti, molimo kontaktirajte nas na <a href=\"mail:support@rezije.app\">support@rezije.app</a>."
+      "content": "Ako imate bilo kakvih pitanja o ovim Pravilima privatnosti, molimo kontaktirajte nas na <emailLink>support@rezije.app</emailLink>."
     },
     "section-11": {
       "heading": "11. Pristanak",