diff --git a/apps/web/i18n.lock b/apps/web/i18n.lock
index b233ed675f..cf8ffdda8a 100644
--- a/apps/web/i18n.lock
+++ b/apps/web/i18n.lock
@@ -446,14 +446,12 @@ checksums:
     emails/forgot_password_email_text: 5100fa2fe2180ded9cb2d89b4f77d2e0
     emails/hidden_field: 3ed5c58d0ed359e558cdf7bd33606d2d
     emails/imprint: c4e5f2a1994d3cc5896b200709cc499c
-    emails/invite_accepted_email_heading: 6ff6dff269b0f1ac1b73912c9e344343
+    emails/invite_accepted_email_heading: 80763c6e4585cd57fa58e4d2d82e6500
     emails/invite_accepted_email_subject: 4f5f2a68c98dd1dd01143fcae3be5562
-    emails/invite_accepted_email_text_par1: b27eadc4779c9fa477103d136a6acab9
-    emails/invite_accepted_email_text_par2: c77209b510baf0415264fdb5ab8076a8
+    emails/invite_accepted_email_text: 48d792826ab9a97eed27599c17ec70d5
     emails/invite_email_button_label: 02099d40cd11e717c0431fa43e68272c
-    emails/invite_email_heading: 6ff6dff269b0f1ac1b73912c9e344343
-    emails/invite_email_text_par1: 70b976a3d4a5509f6d905f9f3f962ada
-    emails/invite_email_text_par2: 14da6da9fdbc21a1cb38988abac7932d
+    emails/invite_email_heading: d9f9b18e4de575980de3cde3e4ed08bf
+    emails/invite_email_text: 1499fa615105121a133440929b039a64
     emails/invite_member_email_subject: 295e329b1642339dc7cc2b49a687e1f8
     emails/new_email_verification_text: b7f00f47d04afa9e872176d9933f2d93
     emails/number_variable: d4f2bbb1965c791cf9921a5112914f3f
diff --git a/apps/web/locales/de-DE.json b/apps/web/locales/de-DE.json
index a99fe7609b..72a7fe72a8 100644
--- a/apps/web/locales/de-DE.json
+++ b/apps/web/locales/de-DE.json
@@ -475,14 +475,12 @@
     "forgot_password_email_text": "Du hast einen Link angefordert, um dein Passwort zu ändern. Du kannst dies tun, indem Du auf den untenstehenden Link klickst:",
     "hidden_field": "Verstecktes Feld",
     "imprint": "Impressum",
-    "invite_accepted_email_heading": "Hey",
+    "invite_accepted_email_heading": "Hey {inviterName}",
     "invite_accepted_email_subject": "Du hast einen neuen Organisation-Mitglied!",
-    "invite_accepted_email_text_par1": "Wollte dir nur Bescheid geben, dass",
-    "invite_accepted_email_text_par2": "deine Einladung angenommen hat. Viel Spaß bei der Zusammenarbeit!",
+    "invite_accepted_email_text": "Nur zur Info: {inviteeName} hat deine Einladung angenommen. Viel Spaß bei der Zusammenarbeit!",
     "invite_email_button_label": "Organisation beitreten",
-    "invite_email_heading": "Hey",
-    "invite_email_text_par1": "Dein Kollege",
-    "invite_email_text_par2": "hat Dich eingeladen, Formbricks zu nutzen. Um die Einladung anzunehmen, klicke bitte auf den untenstehenden Link:",
+    "invite_email_heading": "Hey {inviteeName}",
+    "invite_email_text": "Dein Kollege {inviterName} hat dich eingeladen, bei Formbricks mitzumachen. Um die Einladung anzunehmen, klicke bitte auf den Link unten:",
     "invite_member_email_subject": "Du wurdest eingeladen, Formbricks zu nutzen!",
     "new_email_verification_text": "Um Ihre neue E-Mail-Adresse zu bestätigen, klicken Sie bitte auf die Schaltfläche unten:",
     "number_variable": "Zahlenvariable",
diff --git a/apps/web/locales/en-US.json b/apps/web/locales/en-US.json
index c7547699c1..4e70aa3358 100644
--- a/apps/web/locales/en-US.json
+++ b/apps/web/locales/en-US.json
@@ -475,14 +475,12 @@
     "forgot_password_email_text": "You have requested a link to change your password. You can do this by clicking the link below:",
     "hidden_field": "Hidden field",
     "imprint": "Imprint",
-    "invite_accepted_email_heading": "Hey",
+    "invite_accepted_email_heading": "Hey {inviterName}",
     "invite_accepted_email_subject": "You've got a new organization member!",
-    "invite_accepted_email_text_par1": "Just letting you know that",
-    "invite_accepted_email_text_par2": "accepted your invitation. Have fun collaborating!",
+    "invite_accepted_email_text": "Just letting you know that {inviteeName} accepted your invitation. Have fun collaborating!",
     "invite_email_button_label": "Join organization",
-    "invite_email_heading": "Hey",
-    "invite_email_text_par1": "Your colleague",
-    "invite_email_text_par2": "invited you to join them at Formbricks. To accept the invitation, please click the link below:",
+    "invite_email_heading": "Hey {inviteeName}",
+    "invite_email_text": "Your colleague {inviterName} invited you to join them at Formbricks. To accept the invitation, please click the link below:",
     "invite_member_email_subject": "You're invited to collaborate on Formbricks!",
     "new_email_verification_text": "To verify your new email address, please click the button below:",
     "number_variable": "Number variable",
diff --git a/apps/web/locales/es-ES.json b/apps/web/locales/es-ES.json
index 65d57fda36..6fa4a304dc 100644
--- a/apps/web/locales/es-ES.json
+++ b/apps/web/locales/es-ES.json
@@ -475,14 +475,12 @@
     "forgot_password_email_text": "Has solicitado un enlace para cambiar tu contraseña. Puedes hacerlo haciendo clic en el enlace a continuación:",
     "hidden_field": "Campo oculto",
     "imprint": "Aviso legal",
-    "invite_accepted_email_heading": "Hola",
+    "invite_accepted_email_heading": "Hola, {inviterName}",
     "invite_accepted_email_subject": "¡Tienes un nuevo miembro en la organización!",
-    "invite_accepted_email_text_par1": "Solo para informarte que",
-    "invite_accepted_email_text_par2": "ha aceptado tu invitación. ¡Diviértete colaborando!",
+    "invite_accepted_email_text": "Te informamos que {inviteeName} ha aceptado tu invitación. ¡Que disfrutéis colaborando!",
     "invite_email_button_label": "Unirse a la organización",
-    "invite_email_heading": "Hola",
-    "invite_email_text_par1": "Tu colega",
-    "invite_email_text_par2": "te ha invitado a unirte a Formbricks. Para aceptar la invitación, por favor haz clic en el enlace a continuación:",
+    "invite_email_heading": "Hola, {inviteeName}",
+    "invite_email_text": "Tu compañero {inviterName} te ha invitado a unirte a Formbricks. Para aceptar la invitación, haz clic en el enlace que aparece a continuación:",
     "invite_member_email_subject": "¡Estás invitado a colaborar en Formbricks!",
     "new_email_verification_text": "Para verificar tu nueva dirección de correo electrónico, por favor haz clic en el botón a continuación:",
     "number_variable": "Variable numérica",
diff --git a/apps/web/locales/fr-FR.json b/apps/web/locales/fr-FR.json
index c15cb86400..98e763db43 100644
--- a/apps/web/locales/fr-FR.json
+++ b/apps/web/locales/fr-FR.json
@@ -474,15 +474,13 @@
     "forgot_password_email_subject": "Réinitialise ton mot de passe Formbricks",
     "forgot_password_email_text": "Vous avez demandé un lien pour changer votre mot de passe. Vous pouvez le faire en cliquant sur le lien ci-dessous :",
     "hidden_field": "Champ caché",
-    "imprint": "Empreinte",
-    "invite_accepted_email_heading": "Salut",
+    "imprint": "Impressum",
+    "invite_accepted_email_heading": "Salut {inviterName}",
     "invite_accepted_email_subject": "Vous avez un nouveau membre dans votre organisation !",
-    "invite_accepted_email_text_par1": "Je te fais savoir que",
-    "invite_accepted_email_text_par2": "accepté votre invitation. Amusez-vous bien à collaborer !",
+    "invite_accepted_email_text": "Juste pour te faire savoir que {inviteeName} a accepté ton invitation. Amusez-vous bien à collaborer !",
     "invite_email_button_label": "Rejoindre l'organisation",
-    "invite_email_heading": "Salut",
-    "invite_email_text_par1": "Votre collègue",
-    "invite_email_text_par2": "vous a invité à les rejoindre sur Formbricks. Pour accepter l'invitation, veuillez cliquer sur le lien ci-dessous :",
+    "invite_email_heading": "Salut {inviteeName}",
+    "invite_email_text": "Ton collègue {inviterName} t'a invité à le rejoindre sur Formbricks. Pour accepter l'invitation, clique sur le lien ci-dessous :",
     "invite_member_email_subject": "Vous avez été invité à collaborer sur Formbricks !",
     "new_email_verification_text": "Pour confirmer votre nouvelle adresse e-mail, veuillez cliquer sur le bouton ci-dessous :",
     "number_variable": "Variable numérique",
diff --git a/apps/web/locales/ja-JP.json b/apps/web/locales/ja-JP.json
index 9088dc16c0..eb0876978e 100644
--- a/apps/web/locales/ja-JP.json
+++ b/apps/web/locales/ja-JP.json
@@ -475,14 +475,12 @@
     "forgot_password_email_text": "パスワード変更のリンクがリクエストされました。以下のリンクをクリックして変更できます。",
     "hidden_field": "非表示フィールド",
     "imprint": "企業情報",
-    "invite_accepted_email_heading": "こんにちは",
+    "invite_accepted_email_heading": "{inviterName}さん",
     "invite_accepted_email_subject": "新しい組織メンバーが加わりました！",
-    "invite_accepted_email_text_par1": "お知らせですが、",
-    "invite_accepted_email_text_par2": "があなたの招待を承認しました。コラボレーションを楽しんでください！",
+    "invite_accepted_email_text": "{inviteeName}さんがあなたの招待を承認しました。コラボレーションをお楽しみください！",
     "invite_email_button_label": "組織に参加",
-    "invite_email_heading": "こんにちは",
-    "invite_email_text_par1": "あなたの同僚の",
-    "invite_email_text_par2": "が、Formbricksへの参加をあなたに招待しました。招待を承認するには、以下のリンクをクリックしてください。",
+    "invite_email_heading": "{inviteeName}さん",
+    "invite_email_text": "同僚の{inviterName}さんがFormbricksへの参加を招待しています。招待を承認するには、以下のリンクをクリックしてください：",
     "invite_member_email_subject": "Formbricksでのコラボレーションに招待されました！",
     "new_email_verification_text": "新しいメールアドレスを認証するには、以下のボタンをクリックしてください。",
     "number_variable": "数値変数",
diff --git a/apps/web/locales/nl-NL.json b/apps/web/locales/nl-NL.json
index f68774699f..28fa2a7444 100644
--- a/apps/web/locales/nl-NL.json
+++ b/apps/web/locales/nl-NL.json
@@ -475,14 +475,12 @@
     "forgot_password_email_text": "U heeft een link aangevraagd om uw wachtwoord te wijzigen. Dit kunt u doen door op onderstaande link te klikken:",
     "hidden_field": "Verborgen veld",
     "imprint": "Afdruk",
-    "invite_accepted_email_heading": "Hoi",
+    "invite_accepted_email_heading": "Hé {inviterName}",
     "invite_accepted_email_subject": "Je hebt een nieuw organisatielid!",
-    "invite_accepted_email_text_par1": "Laat het je gewoon weten",
-    "invite_accepted_email_text_par2": "heeft uw uitnodiging geaccepteerd. Veel plezier met samenwerken!",
+    "invite_accepted_email_text": "We wilden je even laten weten dat {inviteeName} je uitnodiging heeft geaccepteerd. Veel plezier met samenwerken!",
     "invite_email_button_label": "Sluit je aan bij de organisatie",
-    "invite_email_heading": "Hoi",
-    "invite_email_text_par1": "Jouw collega",
-    "invite_email_text_par2": "nodigde je uit om je bij Formbricks aan te sluiten. Om de uitnodiging te accepteren, klikt u op de onderstaande link:",
+    "invite_email_heading": "Hé {inviteeName}",
+    "invite_email_text": "Je collega {inviterName} heeft je uitgenodigd om samen te werken bij Formbricks. Klik op onderstaande link om de uitnodiging te accepteren:",
     "invite_member_email_subject": "Je bent uitgenodigd om samen te werken aan Formbricks!",
     "new_email_verification_text": "Om uw nieuwe e-mailadres te verifiëren, klikt u op de onderstaande knop:",
     "number_variable": "Numerieke variabele",
diff --git a/apps/web/locales/pt-BR.json b/apps/web/locales/pt-BR.json
index 65898d67ee..4a64cd7a9e 100644
--- a/apps/web/locales/pt-BR.json
+++ b/apps/web/locales/pt-BR.json
@@ -474,15 +474,13 @@
     "forgot_password_email_subject": "Redefinir sua senha Formbricks",
     "forgot_password_email_text": "Você pediu um link pra trocar sua senha. Você pode fazer isso clicando no link abaixo:",
     "hidden_field": "Campo oculto",
-    "imprint": "impressão",
-    "invite_accepted_email_heading": "E aí",
+    "imprint": "Impressum",
+    "invite_accepted_email_heading": "Olá, {inviterName}",
     "invite_accepted_email_subject": "Você tem um novo membro na sua organização!",
-    "invite_accepted_email_text_par1": "Só pra te avisar que",
-    "invite_accepted_email_text_par2": "aceitou seu convite. Divirta-se colaborando!",
+    "invite_accepted_email_text": "Só para você saber que {inviteeName} aceitou seu convite. Divirta-se colaborando!",
     "invite_email_button_label": "Entrar na organização",
-    "invite_email_heading": "E aí",
-    "invite_email_text_par1": "Seu colega",
-    "invite_email_text_par2": "te convidou para se juntar a eles na Formbricks. Para aceitar o convite, por favor clique no link abaixo:",
+    "invite_email_heading": "Olá, {inviteeName}",
+    "invite_email_text": "Seu colega {inviterName} convidou você para se juntar a ele no Formbricks. Para aceitar o convite, clique no link abaixo:",
     "invite_member_email_subject": "Você foi convidado a colaborar no Formbricks!",
     "new_email_verification_text": "Para verificar seu novo endereço de e-mail, clique no botão abaixo:",
     "number_variable": "Variável numérica",
diff --git a/apps/web/locales/pt-PT.json b/apps/web/locales/pt-PT.json
index c5f30c805b..83f92cbbea 100644
--- a/apps/web/locales/pt-PT.json
+++ b/apps/web/locales/pt-PT.json
@@ -475,14 +475,12 @@
     "forgot_password_email_text": "Solicitou um link para alterar a sua palavra-passe. Pode fazê-lo clicando no link abaixo:",
     "hidden_field": "Campo oculto",
     "imprint": "Impressão",
-    "invite_accepted_email_heading": "Olá",
+    "invite_accepted_email_heading": "Olá {inviterName}",
     "invite_accepted_email_subject": "Tem um novo membro na organização!",
-    "invite_accepted_email_text_par1": "Só para te informar que",
-    "invite_accepted_email_text_par2": "aceitou o seu convite. Divirta-se a colaborar!",
+    "invite_accepted_email_text": "Só para informar que {inviteeName} aceitou o teu convite. Divirtam-se a colaborar!",
     "invite_email_button_label": "Junte-se à organização",
-    "invite_email_heading": "Olá",
-    "invite_email_text_par1": "O seu colega",
-    "invite_email_text_par2": "convidou-o a juntar-se a eles no Formbricks. Para aceitar o convite, por favor clique no link abaixo:",
+    "invite_email_heading": "Olá {inviteeName}",
+    "invite_email_text": "O teu colega {inviterName} convidou-te para te juntares a ele no Formbricks. Para aceitar o convite, clica na ligação abaixo:",
     "invite_member_email_subject": "Está convidado a colaborar no Formbricks!",
     "new_email_verification_text": "Para verificar o seu novo endereço de email, por favor clique no botão abaixo:",
     "number_variable": "Variável numérica",
diff --git a/apps/web/locales/ro-RO.json b/apps/web/locales/ro-RO.json
index eabdc4ef13..dbdb894c45 100644
--- a/apps/web/locales/ro-RO.json
+++ b/apps/web/locales/ro-RO.json
@@ -475,14 +475,12 @@
     "forgot_password_email_text": "Ați solicitat un link pentru a vă schimba parola. Puteți face acest lucru făcând clic pe linkul de mai jos:",
     "hidden_field": "Câmp ascuns",
     "imprint": "Amprentă",
-    "invite_accepted_email_heading": "Salut",
+    "invite_accepted_email_heading": "Salut, {inviterName}",
     "invite_accepted_email_subject": "Ai un nou membru în organizație!",
-    "invite_accepted_email_text_par1": "Doar te anunț că",
-    "invite_accepted_email_text_par2": "a acceptat invitația ta. Distracție plăcută colaborând!",
+    "invite_accepted_email_text": "Vrem doar să te anunțăm că {inviteeName} a acceptat invitația ta. Spor la colaborare!",
     "invite_email_button_label": "Alătură-te organizației",
-    "invite_email_heading": "Hei",
-    "invite_email_text_par1": "Colegul tău",
-    "invite_email_text_par2": "te-a invitat să li te alături la Formbricks. Pentru a accepta invitația, te rugăm să dai click pe linkul de mai jos:",
+    "invite_email_heading": "Salut, {inviteeName}",
+    "invite_email_text": "Colegul tău, {inviterName}, te-a invitat să i te alături pe Formbricks. Pentru a accepta invitația, te rugăm să dai click pe linkul de mai jos:",
     "invite_member_email_subject": "Ești invitat să colaborezi pe Formbricks!",
     "new_email_verification_text": "Pentru a verifica noua dumneavoastră adresă de email, vă rugăm să faceți clic pe butonul de mai jos:",
     "number_variable": "Variabilă numerică",
diff --git a/apps/web/locales/sv-SE.json b/apps/web/locales/sv-SE.json
index b32a9c86ee..afa08fc3d9 100644
--- a/apps/web/locales/sv-SE.json
+++ b/apps/web/locales/sv-SE.json
@@ -475,14 +475,12 @@
     "forgot_password_email_text": "Du har begärt en länk för att ändra ditt lösenord. Du kan göra detta genom att klicka på länken nedan:",
     "hidden_field": "Dolt fält",
     "imprint": "Impressum",
-    "invite_accepted_email_heading": "Hej",
+    "invite_accepted_email_heading": "Hej {inviterName}",
     "invite_accepted_email_subject": "Du har fått en ny organisationsmedlem!",
-    "invite_accepted_email_text_par1": "Vi vill bara meddela dig att",
-    "invite_accepted_email_text_par2": "accepterade din inbjudan. Ha kul med samarbetet!",
+    "invite_accepted_email_text": "Vi vill bara meddela att {inviteeName} har accepterat din inbjudan. Ha det så kul med samarbetet!",
     "invite_email_button_label": "Gå med i organisation",
-    "invite_email_heading": "Hej",
-    "invite_email_text_par1": "Din kollega",
-    "invite_email_text_par2": "bjöd in dig att gå med dem på Formbricks. För att acceptera inbjudan, vänligen klicka på länken nedan:",
+    "invite_email_heading": "Hej {inviteeName}",
+    "invite_email_text": "Din kollega {inviterName} har bjudit in dig att gå med dem på Formbricks. För att acceptera inbjudan, klicka på länken nedan:",
     "invite_member_email_subject": "Du är inbjuden att samarbeta på Formbricks!",
     "new_email_verification_text": "För att verifiera din nya e-postadress, vänligen klicka på knappen nedan:",
     "number_variable": "Nummervariabel",
diff --git a/apps/web/locales/zh-Hans-CN.json b/apps/web/locales/zh-Hans-CN.json
index b03f6c9f42..236720cb8e 100644
--- a/apps/web/locales/zh-Hans-CN.json
+++ b/apps/web/locales/zh-Hans-CN.json
@@ -475,14 +475,12 @@
     "forgot_password_email_text": "您 已 请求 一个 链接 来 更改 您的 密码。 您 可以 点击 下方 链接 完成 这个 操作：",
     "hidden_field": "隐藏字段",
     "imprint": "印记",
-    "invite_accepted_email_heading": "嗨",
+    "invite_accepted_email_heading": "你好，{inviterName}",
     "invite_accepted_email_subject": "你 有 一个 新 成员 进入 组织 了！",
-    "invite_accepted_email_text_par1": "只是 告诉 你",
-    "invite_accepted_email_text_par2": "接受了 你的 邀请。 合作 愉快！",
+    "invite_accepted_email_text": "{inviteeName} 已接受了你的邀请。祝你们合作愉快！",
     "invite_email_button_label": "加入 组织",
-    "invite_email_heading": "嗨",
-    "invite_email_text_par1": "您的 同事",
-    "invite_email_text_par2": "邀请您加入他们在 Formbricks 。要接受邀请，请点击下面的链接：",
+    "invite_email_heading": "你好，{inviteeName}",
+    "invite_email_text": "你的同事 {inviterName} 邀请你加入 Formbricks。要接受邀请，请点击下方链接：",
     "invite_member_email_subject": "您 被 邀请 来 协作 于 Formbricks！",
     "new_email_verification_text": "要 验证 您 的 新 邮箱 地址 ，请 点击 下方 的 按钮 ：",
     "number_variable": "数字变量",
diff --git a/apps/web/locales/zh-Hant-TW.json b/apps/web/locales/zh-Hant-TW.json
index f66eb890aa..74a6e8cdfd 100644
--- a/apps/web/locales/zh-Hant-TW.json
+++ b/apps/web/locales/zh-Hant-TW.json
@@ -475,14 +475,12 @@
     "forgot_password_email_text": "您已請求變更密碼的連結。您可以點擊以下連結來執行此操作：",
     "hidden_field": "隱藏欄位",
     "imprint": "版本訊息",
-    "invite_accepted_email_heading": "嗨",
+    "invite_accepted_email_heading": "嗨，{inviterName}",
     "invite_accepted_email_subject": "您有一位新的組織成員！",
-    "invite_accepted_email_text_par1": "通知您，",
-    "invite_accepted_email_text_par2": "接受了您的邀請。合作愉快！",
+    "invite_accepted_email_text": "通知你，{inviteeName} 已經接受了你的邀請。祝你們合作愉快！",
     "invite_email_button_label": "加入組織",
-    "invite_email_heading": "嗨",
-    "invite_email_text_par1": "您的同事",
-    "invite_email_text_par2": "邀請您加入 Formbricks。若要接受邀請，請點擊以下連結：",
+    "invite_email_heading": "嗨，{inviteeName}",
+    "invite_email_text": "你的同事 {inviterName} 邀請你加入他們在 Formbricks。請點擊下方連結以接受邀請：",
     "invite_member_email_subject": "您被邀請協作 Formbricks！",
     "new_email_verification_text": "要驗證您的新電子郵件地址，請點擊下面的按鈕：",
     "number_variable": "數字變數",
diff --git a/apps/web/modules/email/components/preview-email-template.tsx b/apps/web/modules/email/components/preview-email-template.tsx
index 1b2e8d843f..159910d208 100644
--- a/apps/web/modules/email/components/preview-email-template.tsx
+++ b/apps/web/modules/email/components/preview-email-template.tsx
@@ -183,7 +183,7 @@ export async function PreviewEmailTemplate({
           {ctaElement.buttonExternal && ctaElement.ctaButtonLabel && ctaElement.buttonUrl && (
             <Container className="mx-0 mt-4 flex max-w-none items-center justify-end">
               <EmailButton
-                className="text-question-color flex items-center rounded-md border-0 bg-transparent px-3 py-3 text-base font-medium leading-4 no-underline shadow-none"
+                className="text-question-color flex items-center rounded-md border-0 bg-transparent px-3 py-3 text-base leading-4 font-medium no-underline shadow-none"
                 href={ctaElement.buttonUrl}>
                 <Text className="inline">
                   {getLocalizedValue(ctaElement.ctaButtonLabel, defaultLanguageCode)}{" "}
@@ -306,13 +306,13 @@ export async function PreviewEmailTemplate({
             {firstQuestion.choices.map((choice) =>
               firstQuestion.allowMulti ? (
                 <Img
-                  className="rounded-custom mb-3 mr-3 inline-block h-[150px] w-[250px]"
+                  className="rounded-custom mr-3 mb-3 inline-block h-[150px] w-[250px]"
                   key={choice.id}
                   src={choice.imageUrl}
                 />
               ) : (
                 <Link
-                  className="rounded-custom mb-3 mr-3 inline-block h-[150px] w-[250px]"
+                  className="rounded-custom mr-3 mb-3 inline-block h-[150px] w-[250px]"
                   href={`${urlWithPrefilling}${firstQuestion.id}=${choice.id}`}
                   key={choice.id}
                   target="_blank">
@@ -360,11 +360,11 @@ export async function PreviewEmailTemplate({
           <Container className="mx-0">
             <Section className="w-full table-auto">
               <Row>
-                <Column className="w-40 break-words px-4 py-2" />
+                <Column className="w-40 px-4 py-2 break-words" />
                 {firstQuestion.columns.map((column) => {
                   return (
                     <Column
-                      className="text-question-color max-w-40 break-words px-4 py-2 text-center"
+                      className="text-question-color max-w-40 px-4 py-2 text-center break-words"
                       key={column.id}>
                       {getLocalizedValue(column.label, "default")}
                     </Column>
@@ -376,7 +376,7 @@ export async function PreviewEmailTemplate({
                   <Row
                     className={`${rowIndex % 2 === 0 ? "bg-input-color" : ""} rounded-custom`}
                     key={row.id}>
-                    <Column className="w-40 break-words px-4 py-2">
+                    <Column className="w-40 px-4 py-2 break-words">
                       {getLocalizedValue(row.label, "default")}
                     </Column>
                     {firstQuestion.columns.map((column) => {
diff --git a/packages/email/emails/invite/invite-accepted-email.tsx b/packages/email/emails/invite/invite-accepted-email.tsx
index 17730faa88..1180ddac9b 100644
--- a/packages/email/emails/invite/invite-accepted-email.tsx
+++ b/packages/email/emails/invite/invite-accepted-email.tsx
@@ -21,13 +21,8 @@ export function InviteAcceptedEmail({
   return (
     <EmailTemplate t={t} {...legalProps}>
       <Container>
-        <Heading>
-          {t("emails.invite_accepted_email_heading", { inviterName })} {inviterName}
-        </Heading>
-        <Text className="text-sm">
-          {t("emails.invite_accepted_email_text_par1", { inviteeName })} {inviteeName}{" "}
-          {t("emails.invite_accepted_email_text_par2")}
-        </Text>
+        <Heading>{t("emails.invite_accepted_email_heading", { inviterName })}</Heading>
+        <Text className="text-sm">{t("emails.invite_accepted_email_text", { inviteeName })}</Text>
         <EmailFooter t={t} />
       </Container>
     </EmailTemplate>
diff --git a/packages/email/emails/invite/invite-email.tsx b/packages/email/emails/invite/invite-email.tsx
index ce1e439968..323e6de85f 100644
--- a/packages/email/emails/invite/invite-email.tsx
+++ b/packages/email/emails/invite/invite-email.tsx
@@ -24,13 +24,8 @@ export function InviteEmail({
   return (
     <EmailTemplate t={t} {...legalProps}>
       <Container>
-        <Heading>
-          {t("emails.invite_email_heading", { inviteeName })} {inviteeName}
-        </Heading>
-        <Text className="text-sm">
-          {t("emails.invite_email_text_par1", { inviterName })} {inviterName}{" "}
-          {t("emails.invite_email_text_par2")}
-        </Text>
+        <Heading>{t("emails.invite_email_heading", { inviteeName })}</Heading>
+        <Text className="text-sm">{t("emails.invite_email_text", { inviterName })}</Text>
         <EmailButton href={verifyLink} label={t("emails.invite_email_button_label")} />
         <EmailFooter t={t} />
       </Container>
diff --git a/packages/email/src/components/email-element-header.tsx b/packages/email/src/components/email-element-header.tsx
index 486bc248fd..1ba1436734 100644
--- a/packages/email/src/components/email-element-header.tsx
+++ b/packages/email/src/components/email-element-header.tsx
@@ -10,11 +10,11 @@ interface ElementHeaderProps {
 export function ElementHeader({ headline, subheader, className }: ElementHeaderProps): React.JSX.Element {
   return (
     <>
-      <Container className={cn("text-question-color m-0 block text-base font-semibold leading-6", className)}>
+      <Container className={cn("text-question-color m-0 block text-base leading-6 font-semibold", className)}>
         <div dangerouslySetInnerHTML={{ __html: headline }} />
       </Container>
       {subheader && (
-        <Container className="text-question-color m-0 mt-2 block p-0 text-sm font-normal leading-6">
+        <Container className="text-question-color m-0 mt-2 block p-0 text-sm leading-6 font-normal">
           <div dangerouslySetInnerHTML={{ __html: subheader }} />
         </Container>
       )}