diff --git a/src/assets/lang/de/mail.json b/src/assets/lang/de/mail.json
index 156ddca79..a94470271 100644
--- a/src/assets/lang/de/mail.json
+++ b/src/assets/lang/de/mail.json
@@ -61,7 +61,7 @@
         "cta": "Internxt Mail holen"
     },
     "DesignedSection": {
-        "title": "Entwickelt, um alle Datenschutzbedürfnisse zu erfüllen",
+        "title": "Eine sichere E-Mail-Lösung, entwickelt für absolute Privatsphäre",
         "description": "Wir glauben, dass jeder ein Recht auf Privatsphäre hat. Deshalb wurde Internxt Mail entwickelt, um den Bedürfnissen aller gerecht zu werden, die einen sicheren E-Mail-Anbieter benötigen.",
         "scrollableSection": {
             "images": ["personal", "business", "lawyers", "medical"],
@@ -75,7 +75,7 @@
         }
     },
     "SemanticAccordion": {
-        "title": "Fragen? Wir haben Antworten",
+        "title": "¿Fragen zu Internxt Mail? Wir haben Antworten",
         "items": [
             {
                 "question": "Was ist Internxt Mail?",
diff --git a/src/assets/lang/en/mail.json b/src/assets/lang/en/mail.json
index 15afe4f82..a12d8fbe7 100644
--- a/src/assets/lang/en/mail.json
+++ b/src/assets/lang/en/mail.json
@@ -61,7 +61,7 @@
         "cta": "Get Internxt Mail"
     },
     "DesignedSection": {
-        "title": "Designed to meet all privacy needs",
+        "title": "A secure email solution designed for absolute privacy",
         "description": "We believe everyone has the right to privacy, which is why Internxt Mail is built to meet the needs of everyone who needs a secure email provider.",
         "scrollableSection": {
             "images": ["personal", "business", "lawyers", "medical"],
@@ -75,7 +75,7 @@
         }
     },
     "SemanticAccordion": {
-        "title": "Questions? We have answers",
+        "title": "Questions for Internxt Mail? We have answers",
         "items": [
             {
                 "question": "What is Internxt Mail?",
diff --git a/src/assets/lang/es/mail.json b/src/assets/lang/es/mail.json
index 2ef900577..635ae5c17 100644
--- a/src/assets/lang/es/mail.json
+++ b/src/assets/lang/es/mail.json
@@ -61,7 +61,7 @@
         "cta": "Obtén Internxt Mail"
     },
     "DesignedSection": {
-        "title": "Diseñado para satisfacer todas las necesidades de privacidad",
+        "title": "Una solución de correo electrónico segura diseñada para una privacidad absoluta",
         "description": "Creemos que todo el mundo tiene derecho a la privacidad, por lo que Internxt Mail está diseñado para satisfacer las necesidades de cualquiera que necesite un proveedor de correo electrónico seguro.",
         "scrollableSection": {
             "images": ["personal", "business", "lawyers", "medical"],
@@ -75,7 +75,7 @@
         }
     },
     "SemanticAccordion": {
-        "title": "¿Preguntas? Tenemos respuestas",
+        "title": "¿Preguntas sobre Internxt Mail? Tenemos las respuestas",
         "items": [
             {
                 "question": "¿Qué es Internxt Mail?",
diff --git a/src/assets/lang/fr/mail.json b/src/assets/lang/fr/mail.json
index 2f1bab2e9..192c5950e 100644
--- a/src/assets/lang/fr/mail.json
+++ b/src/assets/lang/fr/mail.json
@@ -61,7 +61,7 @@
         "cta": "Obtenir Internxt Mail"
     },
     "DesignedSection": {
-        "title": "Conçue pour répondre à tous les besoins de confidentialité",
+        "title": "Une solution d'email sécurisée conçue pour une confidentialité absolue",
         "description": "Nous pensons que tout le monde a droit à la vie privée, c'est pourquoi Internxt Mail est conçu pour répondre aux besoins de tous ceux qui recherchent un fournisseur de messagerie sécurisé.",
         "scrollableSection": {
             "images": ["personal", "business", "lawyers", "medical"],
@@ -75,7 +75,7 @@
         }
     },
     "SemanticAccordion": {
-        "title": "Des questions ? Nous avons des réponses",
+        "title": "Des questions sur Internxt Mail ? Nous avons les réponses",
         "items": [
             {
                 "question": "Qu'est-ce qu'Internxt Mail ?",
diff --git a/src/assets/lang/it/mail.json b/src/assets/lang/it/mail.json
index 3ee4e870c..9dda57f4c 100644
--- a/src/assets/lang/it/mail.json
+++ b/src/assets/lang/it/mail.json
@@ -61,7 +61,7 @@
         "cta": "Ottieni Internxt Mail"
     },
     "DesignedSection": {
-        "title": "Progettata per soddisfare tutte le esigenze di privacy",
+        "title": "Una soluzione email sicura progettata per la massima riservatezza",
         "description": "Crediamo che tutti abbiano diritto alla privacy, ed è per questo che Internxt Mail è creata per soddisfare le esigenze di chiunque necessiti di un provider di posta elettronica sicuro.",
         "scrollableSection": {
             "images": ["personal", "business", "lawyers", "medical"],
@@ -75,7 +75,7 @@
         }
     },
     "SemanticAccordion": {
-        "title": "Domande? Abbiamo le risposte",
+        "title": "Domande su Internxt Mail? Abbiamo le risposte",
         "items": [
             {
                 "question": "Cos'è Internxt Mail?",
diff --git a/src/assets/lang/ru/mail.json b/src/assets/lang/ru/mail.json
index ed0ad4907..bbc069ab8 100644
--- a/src/assets/lang/ru/mail.json
+++ b/src/assets/lang/ru/mail.json
@@ -61,7 +61,7 @@
         "cta": "Получить Internxt Mail"
     },
     "DesignedSection": {
-        "title": "Создано для удовлетворения любых потребностей в конфиденциальности",
+        "title": "Безопасное решение для электронной почты, созданное для абсолютной конфиденциальности",
         "description": "Мы считаем, что каждый имеет право на конфиденциальность, поэтому Internxt Mail разработана для удовлетворения нужд любого, кому требуется надежный и безопасный почтовый провайдер.",
         "scrollableSection": {
             "images": ["personal", "business", "lawyers", "medical"],
@@ -75,7 +75,7 @@
         }
     },
     "SemanticAccordion": {
-        "title": "Вопросы? У нас есть ответы",
+        "title": "Вопросы об Internxt Mail? У нас есть ответы",
         "items": [
             {
                 "question": "Что такое Internxt Mail?",
diff --git a/src/assets/lang/zh-tw/mail.json b/src/assets/lang/zh-tw/mail.json
index eb2de3098..791d16e71 100644
--- a/src/assets/lang/zh-tw/mail.json
+++ b/src/assets/lang/zh-tw/mail.json
@@ -61,7 +61,7 @@
         "cta": "獲取 Internxt Mail"
     },
     "DesignedSection": {
-        "title": "專為滿足所有隱私需求而設計",
+        "title": "專為絕對隱私設計的安全電子郵件解決方案",
         "description": "我們相信每個人都有隱私權，因此 Internxt Mail 旨在滿足每個需要安全電子郵件服務提供商的人的需求。",
         "scrollableSection": {
             "images": ["personal", "business", "lawyers", "medical"],
@@ -75,7 +75,7 @@
         }
     },
     "SemanticAccordion": {
-        "title": "有疑問？我們有答案",
+        "title": "對 Internxt Mail 有疑問？我們有答案",
         "items": [
             {
                 "question": "什麼是 Internxt Mail？",
diff --git a/src/assets/lang/zh/mail.json b/src/assets/lang/zh/mail.json
index 68435cb84..52c2bc898 100644
--- a/src/assets/lang/zh/mail.json
+++ b/src/assets/lang/zh/mail.json
@@ -61,7 +61,7 @@
         "cta": "获取 Internxt Mail"
     },
     "DesignedSection": {
-        "title": "专为满足所有隐私需求而设计",
+        "title": "专为绝对隐私设计的安全电子邮件解决方案",
         "description": "我们相信每个人都有隐私权，因此 Internxt Mail 旨在满足每个需要安全电子邮件服务提供商的人的需求。",
         "scrollableSection": {
             "images": ["personal", "business", "lawyers", "medical"],
@@ -75,7 +75,7 @@
         }
     },
     "SemanticAccordion": {
-        "title": "有疑问？我们有答案",
+        "title": "对 Internxt Mail 有疑问？我们有答案",
         "items": [
             {
                 "question": "什么是 Internxt Mail？",
diff --git a/src/components/mail/HeroSection.tsx b/src/components/mail/HeroSection.tsx
index f311bedf2..114be91d9 100644
--- a/src/components/mail/HeroSection.tsx
+++ b/src/components/mail/HeroSection.tsx
@@ -1,5 +1,4 @@
 import Link from 'next/link';
-import { HighlightText } from '../components/HighlightText';
 import { CheckCircle } from '@phosphor-icons/react';
 import Animation from '@/components/shared/Animation';
 import { ImageConfig } from '@/assets/types/mail'
@@ -62,7 +61,7 @@ export const HeroSection = ({ textContent }) => {
           <p className="flex whitespace-nowrap text-sm font-semibold text-primary lg:text-lg">{textContent.label}</p>
         </div>
         <h1 className="flex flex-col text-[30px] font-semibold leading-tight text-gray-100 lg:gap-2 lg:text-6xl">
-          <HighlightText text={textContent.title} />
+          {textContent.title}
         </h1>
         <p className="text-base font-normal leading-tight text-gray-55 lg:text-xl">{textContent.description}</p>
         <div className="flex flex-col">
diff --git a/src/components/mail/HorizontalSrollableSection.tsx b/src/components/mail/HorizontalSrollableSection.tsx
index a8d7005db..265387a56 100644
--- a/src/components/mail/HorizontalSrollableSection.tsx
+++ b/src/components/mail/HorizontalSrollableSection.tsx
@@ -140,7 +140,7 @@ export default function HorizontalScrollableSectionWithPhotosSection({
                   className="flex rounded-16 lg:hidden"
                 />
                 <div className="flex h-min w-[300px] flex-col rounded-b-16 pb-8 pt-6 lg:w-[350px]">
-                  <p className="pb-6 text-[18px] font-medium text-gray-95 lg:text-[20px]">{title}</p>
+                  <h3 className="pb-6 text-[18px] font-medium text-gray-95 lg:text-[20px]">{title}</h3>
                   <p className="flex-1 text-base font-normal leading-tight text-gray-55">{cardDescriptions[index]}</p>
                 </div>
               </div>
diff --git a/src/components/shared/FAQAccordion.tsx b/src/components/shared/FAQAccordion.tsx
index 829377e7e..f0fba8c0b 100644
--- a/src/components/shared/FAQAccordion.tsx
+++ b/src/components/shared/FAQAccordion.tsx
@@ -12,6 +12,7 @@ export default function FaqAccordion({
   needsH3,
   needsSpecialH3 = false,
   index,
+  totalItems,
 }: {
   question: string;
   answer: string[];
@@ -21,6 +22,7 @@ export default function FaqAccordion({
   needsH3?: boolean;
   needsSpecialH3?: boolean;
   index?: number;
+  totalItems?: number;
 }): JSX.Element {
   const [active, setActive] = useState(false);
 
@@ -36,8 +38,16 @@ export default function FaqAccordion({
     });
   }, []);
 
-  const QuestionTag =
-    needsSpecialH3 && typeof index === 'number' ? (index < 5 ? 'h3' : 'p') : needsH3 ? 'h3' : 'p';
+  const isSpecialParagraph = 
+    needsSpecialH3 &&
+    typeof index === 'number' &&
+    typeof totalItems === 'number' &&
+    index < totalItems - 2;
+
+  const defaultTag = needsH3 ? 'h3' : 'p';
+
+  const QuestionTag = isSpecialParagraph ? 'h3' : defaultTag;
+
   return (
     <div className="flex flex-col items-stretch justify-start">
       <button
diff --git a/src/components/shared/sections/FaqSection.tsx b/src/components/shared/sections/FaqSection.tsx
index d61fe5b76..6d7284bf2 100644
--- a/src/components/shared/sections/FaqSection.tsx
+++ b/src/components/shared/sections/FaqSection.tsx
@@ -50,6 +50,7 @@ const FAQSection = ({
                 needsH3={needsH3}
                 needsSpecialH3={needsSpecialH3}
                 index={index}
+                totalItems={textContent.faq.length}
               />
             </div>
           ))}
diff --git a/src/pages/mail.tsx b/src/pages/mail.tsx
index 85eff6a98..1bcc7f01c 100644
--- a/src/pages/mail.tsx
+++ b/src/pages/mail.tsx
@@ -44,6 +44,8 @@ const Mail = ({
             <HorizontalScrollableSection 
                 textContent={textContent.MailFeatureSection}
                 bgGradient='linear-gradient(180deg, #FFFFFF 0%, #F4F8FF 100%)'
+                needsH2
+                needsH3
             />
 
             <FloatingCtaSectionv2