diff --git a/backend/src/emails/templates/accountActivation/html.pug b/backend/src/emails/templates/accountActivation/html.pug
index 67e03c986..95e11d311 100644
--- a/backend/src/emails/templates/accountActivation/html.pug
+++ b/backend/src/emails/templates/accountActivation/html.pug
@@ -1,17 +1,16 @@
 extend ../layout.pug
 
 block content
-  .wrapper.wf-section
-    .w-container(class="wrapper_head")
-      h1.headline.h1= t('emails.accountActivation.title')
-      .text-block
-        include ../includes/salutation.pug
-        p= t('emails.accountActivation.emailRegistered')
-    .content.w-container
-      h2.heading= t('emails.general.completeRegistration')
-      div(class="p_content")= t('emails.accountActivation.pleaseClickLink')
-      a.button-3.w-button(href=activationLink) #{t('emails.accountActivation.activateAccount')}
-      div(class="p_content")= t('emails.general.orCopyLink')
-      a(href=activationLink) #{activationLink}
+  .w-container(class="wrapper_head")
+    h1.headline.h1= t('emails.accountActivation.title')
+    .text-block
+      include ../includes/salutation.pug
+      p= t('emails.accountActivation.emailRegistered')
+  .content.w-container
+    h2.heading= t('emails.general.completeRegistration')
+    div(class="p_content")= t('emails.accountActivation.pleaseClickLink')
+    a.button-3.w-button(href=activationLink) #{t('emails.accountActivation.activateAccount')}
+    div(class="p_content")= t('emails.general.orCopyLink')
+    a(href=activationLink) #{activationLink}
 
-      include ../includes/requestNewLink.pug
+    include ../includes/requestNewLink.pug
diff --git a/backend/src/emails/templates/accountMultiRegistration/html.pug b/backend/src/emails/templates/accountMultiRegistration/html.pug
index bb5aa79d2..e09e1f82c 100644
--- a/backend/src/emails/templates/accountMultiRegistration/html.pug
+++ b/backend/src/emails/templates/accountMultiRegistration/html.pug
@@ -1,22 +1,21 @@
 extend ../layout.pug
 
 block content
-  .wrapper.wf-section
-    .w-container(class="wrapper_head")
-      h1.headline.h1= t('emails.accountMultiRegistration.title')
-      .text-block
-        include ../includes/salutation.pug
-        p
-          = t('emails.accountMultiRegistration.emailReused')
-          br
-          = t('emails.accountMultiRegistration.emailExists')
-    .content.w-container
-      h2.heading= t('emails.resetPassword.title')
-      div(class="p_content")= t('emails.accountMultiRegistration.onForgottenPasswordClickLink')      
-      a.button-3.w-button(href=resendLink) #{t('emails.general.reset')}
-      div(class="p_content")= t('emails.general.orCopyLink')
-      a(href=resendLink) #{resendLink}
+  .w-container(class="wrapper_head")
+    h1.headline.h1= t('emails.accountMultiRegistration.title')
+    .text-block
+      include ../includes/salutation.pug
+      p
+        = t('emails.accountMultiRegistration.emailReused')
+        br
+        = t('emails.accountMultiRegistration.emailExists')
+  .content.w-container
+    h2.heading= t('emails.resetPassword.title')
+    div(class="p_content")= t('emails.accountMultiRegistration.onForgottenPasswordClickLink')      
+    a.button-3.w-button(href=resendLink) #{t('emails.general.reset')}
+    div(class="p_content")= t('emails.general.orCopyLink')
+    a(href=resendLink) #{resendLink}
 
-      h2.heading-2= t('emails.accountMultiRegistration.contactSupport')
-      div(class="p_content")= t('emails.accountMultiRegistration.ifYouAreNotTheOne')
-      a(href='mailto:' + supportEmail)= supportEmail
+    h2.heading-2= t('emails.accountMultiRegistration.contactSupport')
+    div(class="p_content")= t('emails.accountMultiRegistration.ifYouAreNotTheOne')
+    a(href='mailto:' + supportEmail)= supportEmail
diff --git a/backend/src/emails/templates/addedContributionMessage/html.pug b/backend/src/emails/templates/addedContributionMessage/html.pug
index f7c6449c2..aa686f25c 100644
--- a/backend/src/emails/templates/addedContributionMessage/html.pug
+++ b/backend/src/emails/templates/addedContributionMessage/html.pug
@@ -1,15 +1,14 @@
 extend ../layout.pug
 
 block content
-  .wrapper.wf-section
-    .w-container(class="wrapper_head")
-      h1.headline.h1= t('emails.addedContributionMessage.title')
-      .text-block
-        include ../includes/salutation.pug
-        p= t('emails.addedContributionMessage.commonGoodContributionMessage', { senderFirstName, senderLastName, contributionMemo })
-    .content.w-container
-      h2.heading= t('emails.addedContributionMessage.readMessage')
-      div(class="p_content")= t('emails.addedContributionMessage.toSeeAndAnswerMessage')
-      a.button-3.w-button(href="https://gdd.gradido.net/community/contribution") #{t('emails.general.toAccount')}
-      
-      include ../includes/doNotReply.pug
+  .w-container(class="wrapper_head")
+    h1.headline.h1= t('emails.addedContributionMessage.title')
+    .text-block
+      include ../includes/salutation.pug
+      p= t('emails.addedContributionMessage.commonGoodContributionMessage', { senderFirstName, senderLastName, contributionMemo })
+  .content.w-container
+    h2.heading= t('emails.addedContributionMessage.readMessage')
+    div(class="p_content")= t('emails.addedContributionMessage.toSeeAndAnswerMessage')
+    a.button-3.w-button(href="https://gdd.gradido.net/community/contribution") #{t('emails.general.toAccount')}
+    
+    include ../includes/doNotReply.pug
diff --git a/backend/src/emails/templates/contributionConfirmed/html.pug b/backend/src/emails/templates/contributionConfirmed/html.pug
index cc4d778d7..eebc280d5 100644
--- a/backend/src/emails/templates/contributionConfirmed/html.pug
+++ b/backend/src/emails/templates/contributionConfirmed/html.pug
@@ -1,12 +1,11 @@
 extend ../layout.pug
 
 block content
-  .wrapper.wf-section
-    .w-container(class="wrapper_head")
-      h1.headline.h1= t('emails.contributionConfirmed.title')
-      .text-block
-        include ../includes/salutation.pug
-        p= t('emails.contributionConfirmed.commonGoodContributionConfirmed', { contributionMemo, senderFirstName, senderLastName, amountGDD: contributionAmount })
-    .content.w-container
-      include ../includes/contributionDetailsCTA.pug
-      include ../includes/doNotReply.pug
\ No newline at end of file
+  .w-container(class="wrapper_head")
+    h1.headline.h1= t('emails.contributionConfirmed.title')
+    .text-block
+      include ../includes/salutation.pug
+      p= t('emails.contributionConfirmed.commonGoodContributionConfirmed', { contributionMemo, senderFirstName, senderLastName, amountGDD: contributionAmount })
+  .content.w-container
+    include ../includes/contributionDetailsCTA.pug
+    include ../includes/doNotReply.pug
\ No newline at end of file
diff --git a/backend/src/emails/templates/contributionDeleted/html.pug b/backend/src/emails/templates/contributionDeleted/html.pug
index 1a4aab038..e22b59677 100644
--- a/backend/src/emails/templates/contributionDeleted/html.pug
+++ b/backend/src/emails/templates/contributionDeleted/html.pug
@@ -1,12 +1,11 @@
 extend ../layout.pug
 
 block content
-  .wrapper.wf-section
-    .w-container(class="wrapper_head")
-      h1.headline.h1= t('emails.contributionDeleted.title')
-      .text-block
-        include ../includes/salutation.pug
-        p= t('emails.contributionDeleted.commonGoodContributionDeleted', { contributionMemo, senderFirstName, senderLastName })
-    .content.w-container
-      include ../includes/contributionDetailsCTA.pug
-      include ../includes/doNotReply.pug
+  .w-container(class="wrapper_head")
+    h1.headline.h1= t('emails.contributionDeleted.title')
+    .text-block
+      include ../includes/salutation.pug
+      p= t('emails.contributionDeleted.commonGoodContributionDeleted', { contributionMemo, senderFirstName, senderLastName })
+  .content.w-container
+    include ../includes/contributionDetailsCTA.pug
+    include ../includes/doNotReply.pug
diff --git a/backend/src/emails/templates/contributionDenied/html.pug b/backend/src/emails/templates/contributionDenied/html.pug
index 0c082a1e0..bf43182f8 100644
--- a/backend/src/emails/templates/contributionDenied/html.pug
+++ b/backend/src/emails/templates/contributionDenied/html.pug
@@ -1,12 +1,11 @@
 extend ../layout.pug
 
 block content
-  .wrapper.wf-section
-    .w-container(class="wrapper_head")
-      h1.headline.h1= t('emails.contributionDenied.title')
-      .text-block
-        include ../includes/salutation.pug
-        p= t('emails.contributionDenied.commonGoodContributionDenied', { contributionMemo, senderFirstName, senderLastName })
-    .content.w-container
-      include ../includes/contributionDetailsCTA.pug
-      include ../includes/doNotReply.pug
+  .w-container(class="wrapper_head")
+    h1.headline.h1= t('emails.contributionDenied.title')
+    .text-block
+      include ../includes/salutation.pug
+      p= t('emails.contributionDenied.commonGoodContributionDenied', { contributionMemo, senderFirstName, senderLastName })
+  .content.w-container
+    include ../includes/contributionDetailsCTA.pug
+    include ../includes/doNotReply.pug
diff --git a/backend/src/emails/templates/includes/greeting.pug b/backend/src/emails/templates/includes/greeting.pug
index 6693e23ca..9dca66228 100644
--- a/backend/src/emails/templates/includes/greeting.pug
+++ b/backend/src/emails/templates/includes/greeting.pug
@@ -1,6 +1,7 @@
 //- This sets the greeting at the end of every e-mail
-.text-block
-  p
-    = t('emails.general.sincerelyYours')
-    br
-    = t('emails.general.yourGradidoTeam')
\ No newline at end of file
+.w-container(class="wrapper_head")
+  .text-block
+    p
+      = t('emails.general.sincerelyYours')
+      br
+      = t('emails.general.yourGradidoTeam')
\ No newline at end of file
diff --git a/backend/src/emails/templates/layout.pug b/backend/src/emails/templates/layout.pug
index e0b01c577..e6fdf92ab 100644
--- a/backend/src/emails/templates/layout.pug
+++ b/backend/src/emails/templates/layout.pug
@@ -32,8 +32,8 @@ html.w-mod-js.wf-worksans-n4-active.wf-worksans-n6-active.wf-worksans-n1-active.
   body
     //- include includes/header.pug
 
-    block content
-
-    include includes/greeting.pug
+    .wrapper.wf-section
+      block content
+      include includes/greeting.pug
 
     include includes/footer.pug
diff --git a/backend/src/emails/templates/resetPassword/html.pug b/backend/src/emails/templates/resetPassword/html.pug
index f7abf0a6d..52fa737de 100644
--- a/backend/src/emails/templates/resetPassword/html.pug
+++ b/backend/src/emails/templates/resetPassword/html.pug
@@ -1,17 +1,16 @@
 extends ../layout.pug
 
 block content
-  .wrapper.wf-section
-    .w-container(class="wrapper_head")
-      h1.headline.h1= t('emails.resetPassword.title')
-      .text-block
-        include ../includes/salutation.pug
-        p= t('emails.resetPassword.youOrSomeoneResetPassword')
-    .content.w-container
-      h2.heading= t('emails.resetPassword.title')
-      div(class="p_content")= t('emails.resetPassword.pleaseClickLink')
-      a.button-3.w-button(href=resetLink) #{t('emails.general.reset')}
-      div(class="p_content")= t('emails.general.orCopyLink')
-      a(href=resetLink) #{resetLink}
+  .w-container(class="wrapper_head")
+    h1.headline.h1= t('emails.resetPassword.title')
+    .text-block
+      include ../includes/salutation.pug
+      p= t('emails.resetPassword.youOrSomeoneResetPassword')
+  .content.w-container
+    h2.heading= t('emails.resetPassword.title')
+    div(class="p_content")= t('emails.resetPassword.pleaseClickLink')
+    a.button-3.w-button(href=resetLink) #{t('emails.general.reset')}
+    div(class="p_content")= t('emails.general.orCopyLink')
+    a(href=resetLink) #{resetLink}
 
-      include ../includes/requestNewLink.pug
+    include ../includes/requestNewLink.pug
diff --git a/backend/src/emails/templates/transactionLinkRedeemed/html.pug b/backend/src/emails/templates/transactionLinkRedeemed/html.pug
index 46e112b54..f0e55e552 100644
--- a/backend/src/emails/templates/transactionLinkRedeemed/html.pug
+++ b/backend/src/emails/templates/transactionLinkRedeemed/html.pug
@@ -1,19 +1,18 @@
 extend ../layout.pug
 
 block content
-  .wrapper.wf-section
-    .w-container(class="wrapper_head")
-      h1.headline.h1=  t('emails.transactionLinkRedeemed.title', { senderFirstName, senderLastName })
-      .text-block
-        include ../includes/salutation.pug
-        p= t('emails.transactionLinkRedeemed.hasRedeemedYourLink', { senderFirstName, senderLastName, senderEmail })
-    .content.w-container
-      h2.heading= t('emails.general.transactionDetails')
-      div(class="p_content")= t('emails.general.amountGDD', { amountGDD: transactionAmount })
-        br
-        = t('emails.transactionLinkRedeemed.memo', { transactionMemo })
-        br
-        = t('emails.general.detailsYouFindOnLinkToYourAccount')
-      a.button-3.w-button(href="https://gdd.gradido.net/transactions") #{t('emails.general.toAccount')}
+  .w-container(class="wrapper_head")
+    h1.headline.h1=  t('emails.transactionLinkRedeemed.title', { senderFirstName, senderLastName })
+    .text-block
+      include ../includes/salutation.pug
+      p= t('emails.transactionLinkRedeemed.hasRedeemedYourLink', { senderFirstName, senderLastName, senderEmail })
+  .content.w-container
+    h2.heading= t('emails.general.transactionDetails')
+    div(class="p_content")= t('emails.general.amountGDD', { amountGDD: transactionAmount })
+      br
+      = t('emails.transactionLinkRedeemed.memo', { transactionMemo })
+      br
+      = t('emails.general.detailsYouFindOnLinkToYourAccount')
+    a.button-3.w-button(href="https://gdd.gradido.net/transactions") #{t('emails.general.toAccount')}
 
-      include ../includes/doNotReply.pug
+    include ../includes/doNotReply.pug
diff --git a/backend/src/emails/templates/transactionReceived/html.pug b/backend/src/emails/templates/transactionReceived/html.pug
index fcffdf2ee..b98bec34f 100644
--- a/backend/src/emails/templates/transactionReceived/html.pug
+++ b/backend/src/emails/templates/transactionReceived/html.pug
@@ -1,16 +1,15 @@
 extend ../layout.pug
 
 block content
-  .wrapper.wf-section
-    .w-container(class="wrapper_head")
-      h1.headline.h1= t('emails.transactionReceived.title', { senderFirstName, senderLastName, transactionAmount })
-      .text-block
-        include ../includes/salutation.pug
-        p= t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName, senderEmail })
-    .content.w-container
-      h2.heading= t('emails.general.transactionDetails')
-      div(class="p_content")= t('emails.general.detailsYouFindOnLinkToYourAccount')
-      a.button-3.w-button(href="https://gdd.gradido.net/transactions") #{t('emails.general.toAccount')}
+  .w-container(class="wrapper_head")
+    h1.headline.h1= t('emails.transactionReceived.title', { senderFirstName, senderLastName, transactionAmount })
+    .text-block
+      include ../includes/salutation.pug
+      p= t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName, senderEmail })
+  .content.w-container
+    h2.heading= t('emails.general.transactionDetails')
+    div(class="p_content")= t('emails.general.detailsYouFindOnLinkToYourAccount')
+    a.button-3.w-button(href="https://gdd.gradido.net/transactions") #{t('emails.general.toAccount')}
 
-      include ../includes/doNotReply.pug
+    include ../includes/doNotReply.pug