diff --git a/backend/src/emails/templates/accountActivation/html.pug b/backend/src/emails/templates/accountActivation/html.pug
index f283e941e..24d86ea56 100644
--- a/backend/src/emails/templates/accountActivation/html.pug
+++ b/backend/src/emails/templates/accountActivation/html.pug
@@ -7,14 +7,17 @@ html(lang=locale)
     #container.col
       p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName })
       p= t('emails.accountActivation.emailRegistered')
-      p= t('emails.accountActivation.pleaseClickLink')
+      p
+        = t('emails.accountActivation.pleaseClickLink')
         br
         a(href=activationLink) #{activationLink}
         br
-        span= t('emails.general.orCopyLink')
-      p= t('emails.accountActivation.duration', { hours: timeDurationObject.hours, minutes: timeDurationObject.minutes })
+        = t('emails.general.orCopyLink')
+      p
+        = t('emails.accountActivation.duration', { hours: timeDurationObject.hours, minutes: timeDurationObject.minutes })
         br
         a(href=resendLink) #{resendLink}
-      p(style='margin-top: 24px;')= t('emails.general.sincerelyYours')
+      p(style='margin-top: 24px;')
+        = t('emails.general.sincerelyYours')
         br
-        span= t('emails.general.yourGradidoTeam')
+        = t('emails.general.yourGradidoTeam')
diff --git a/backend/src/emails/templates/addedContributionMessage/html.pug b/backend/src/emails/templates/addedContributionMessage/html.pug
index 5e5d0975c..6fa89caaf 100644
--- a/backend/src/emails/templates/addedContributionMessage/html.pug
+++ b/backend/src/emails/templates/addedContributionMessage/html.pug
@@ -8,10 +8,12 @@ html(lang=locale)
       p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName })
       p= t('emails.addedContributionMessage.commonGoodContributionMessage', { senderFirstName, senderLastName, contributionMemo })
       p= t('emails.addedContributionMessage.toSeeAndAnswerMessage')
-      p= t('emails.general.linkToYourAccount')
-        span= " "
+      p
+        = t('emails.general.linkToYourAccount')
+        = " "
         a(href=overviewURL) #{overviewURL}
       p= t('emails.general.pleaseDoNotReply')
-      p(style='margin-top: 24px;')= t('emails.general.sincerelyYours')
+      p(style='margin-top: 24px;')
+        = t('emails.general.sincerelyYours')
         br
-        span= t('emails.general.yourGradidoTeam')
+        = t('emails.general.yourGradidoTeam')
diff --git a/backend/src/emails/templates/contributionConfirmed/html.pug b/backend/src/emails/templates/contributionConfirmed/html.pug
index 32626b147..dffad4224 100644
--- a/backend/src/emails/templates/contributionConfirmed/html.pug
+++ b/backend/src/emails/templates/contributionConfirmed/html.pug
@@ -8,10 +8,12 @@ html(lang=locale)
       p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName })
       p= t('emails.contributionConfirmed.commonGoodContributionConfirmed', { senderFirstName, senderLastName, contributionMemo })
       p= t('emails.general.amountGDD', { amountGDD: contributionAmount })
-      p= t('emails.general.linkToYourAccount')
-        span= " "
+      p
+        = t('emails.general.linkToYourAccount')
+        = " "
         a(href=overviewURL) #{overviewURL}
       p= t('emails.general.pleaseDoNotReply')
-      p(style='margin-top: 24px;')= t('emails.general.sincerelyYours')
+      p(style='margin-top: 24px;')
+        = t('emails.general.sincerelyYours')
         br
-        span= t('emails.general.yourGradidoTeam')
+        = t('emails.general.yourGradidoTeam')
diff --git a/backend/src/emails/templates/contributionRejected/html.pug b/backend/src/emails/templates/contributionRejected/html.pug
index 07c014f92..8c37bfcbc 100644
--- a/backend/src/emails/templates/contributionRejected/html.pug
+++ b/backend/src/emails/templates/contributionRejected/html.pug
@@ -8,10 +8,12 @@ html(lang=locale)
       p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName })
       p= t('emails.contributionRejected.commonGoodContributionRejected', { senderFirstName, senderLastName, contributionMemo })
       p= t('emails.contributionRejected.toSeeContributionsAndMessages')
-      p= t('emails.general.linkToYourAccount')
-        span= " "
+      p
+        = t('emails.general.linkToYourAccount')
+        = " "
         a(href=overviewURL) #{overviewURL}
       p= t('emails.general.pleaseDoNotReply')
-      p(style='margin-top: 24px;')= t('emails.general.sincerelyYours')
+      p(style='margin-top: 24px;')
+        = t('emails.general.sincerelyYours')
         br
-        span= t('emails.general.yourGradidoTeam')
+        = t('emails.general.yourGradidoTeam')
diff --git a/backend/src/emails/templates/resetPassword/html.pug b/backend/src/emails/templates/resetPassword/html.pug
index a3ced9a75..96aabcec4 100644
--- a/backend/src/emails/templates/resetPassword/html.pug
+++ b/backend/src/emails/templates/resetPassword/html.pug
@@ -7,14 +7,17 @@ html(lang=locale)
     #container.col
       p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName })
       p= t('emails.resetPassword.youOrSomeoneResetPassword')
-      p= t('emails.resetPassword.pleaseClickLink')
+      p
+        = t('emails.resetPassword.pleaseClickLink')
         br
         a(href=resetLink) #{resetLink}
         br
-        span= t('emails.general.orCopyLink')
-      p= t('emails.resetPassword.duration', { hours: timeDurationObject.hours, minutes: timeDurationObject.minutes })
+        = t('emails.general.orCopyLink')
+      p
+        = t('emails.resetPassword.duration', { hours: timeDurationObject.hours, minutes: timeDurationObject.minutes })
         br
         a(href=resendLink) #{resendLink}
-      p(style='margin-top: 24px;')= t('emails.general.sincerelyYours')
+      p(style='margin-top: 24px;')
+        = t('emails.general.sincerelyYours')
         br
-        span= t('emails.general.yourGradidoTeam')
+        = t('emails.general.yourGradidoTeam')
diff --git a/backend/src/emails/templates/transactionLinkRedeemed/html.pug b/backend/src/emails/templates/transactionLinkRedeemed/html.pug
index 321d070b4..1bb06514f 100644
--- a/backend/src/emails/templates/transactionLinkRedeemed/html.pug
+++ b/backend/src/emails/templates/transactionLinkRedeemed/html.pug
@@ -7,13 +7,16 @@ html(lang=locale)
     #container.col
       p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName })
       p= t('emails.transactionLinkRedeemed.hasRedeemedYourLink', { senderFirstName, senderLastName, senderEmail })
-      p= t('emails.general.amountGDD', { amountGDD: transactionAmount })
+      p
+        = t('emails.general.amountGDD', { amountGDD: transactionAmount })
         br
-        span= t('emails.transactionLinkRedeemed.memo', { transactionMemo })
-      p= t('emails.general.detailsYouFindOnLinkToYourAccount')
-        span= " "
+        = t('emails.transactionLinkRedeemed.memo', { transactionMemo })
+      p
+        = t('emails.general.detailsYouFindOnLinkToYourAccount')
+        = " "
         a(href=overviewURL) #{overviewURL}
       p= t('emails.general.pleaseDoNotReply')
-      p(style='margin-top: 24px;')= t('emails.general.sincerelyYours')
+      p(style='margin-top: 24px;')
+        = t('emails.general.sincerelyYours')
         br
-        span= t('emails.general.yourGradidoTeam')
+        = t('emails.general.yourGradidoTeam')
diff --git a/backend/src/emails/templates/transactionReceived/html.pug b/backend/src/emails/templates/transactionReceived/html.pug
index eaf57f975..887d4b471 100644
--- a/backend/src/emails/templates/transactionReceived/html.pug
+++ b/backend/src/emails/templates/transactionReceived/html.pug
@@ -7,10 +7,12 @@ html(lang=locale)
     #container.col
       p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName })
       p= t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName, senderEmail })
-      p= t('emails.general.detailsYouFindOnLinkToYourAccount')
-        span= " "
+      p
+        = t('emails.general.detailsYouFindOnLinkToYourAccount')
+        = " "
         a(href=overviewURL) #{overviewURL}
       p= t('emails.general.pleaseDoNotReply')
-      p(style='margin-top: 24px;')= t('emails.general.sincerelyYours')
+      p(style='margin-top: 24px;')
+        = t('emails.general.sincerelyYours')
         br
-        span= t('emails.general.yourGradidoTeam')
+        = t('emails.general.yourGradidoTeam')