From b89870c81326a385279edbd3bad22a57a7ed034b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 20 Dec 2022 11:49:00 +0100
Subject: [PATCH 01/15] Implement 'COMMUNITY_SUPPORT_MAIL' in backend

- Increase backend 'CONFIG_VERSION'.
---
 backend/.env.dist           | 3 ++-
 backend/.env.template       | 1 +
 backend/src/config/index.ts | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/.env.dist b/backend/.env.dist
index c0a2a6098..861e5ebb3 100644
--- a/backend/.env.dist
+++ b/backend/.env.dist
@@ -1,4 +1,4 @@
-CONFIG_VERSION=v12.2022-11-10
+CONFIG_VERSION=v13.2022-12-20
 
 # Server
 PORT=4000
@@ -30,6 +30,7 @@ COMMUNITY_REGISTER_URL=http://localhost/register
 COMMUNITY_REDEEM_URL=http://localhost/redeem/{code}
 COMMUNITY_REDEEM_CONTRIBUTION_URL=http://localhost/redeem/CL-{code}
 COMMUNITY_DESCRIPTION=Die lokale Entwicklungsumgebung von Gradido.
+COMMUNITY_SUPPORT_MAIL=support@supportmail.com
 
 # Login Server
 LOGIN_APP_SECRET=21ffbbc616fe
diff --git a/backend/.env.template b/backend/.env.template
index 1bb2e4155..9d8696c6a 100644
--- a/backend/.env.template
+++ b/backend/.env.template
@@ -29,6 +29,7 @@ COMMUNITY_REGISTER_URL=$COMMUNITY_REGISTER_URL
 COMMUNITY_REDEEM_URL=$COMMUNITY_REDEEM_URL
 COMMUNITY_REDEEM_CONTRIBUTION_URL=$COMMUNITY_REDEEM_CONTRIBUTION_URL
 COMMUNITY_DESCRIPTION=$COMMUNITY_DESCRIPTION
+COMMUNITY_SUPPORT_MAIL=$COMMUNITY_SUPPORT_MAIL
 
 # Login Server
 LOGIN_APP_SECRET=21ffbbc616fe
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 38a4fde05..4d605857f 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -17,7 +17,7 @@ const constants = {
   LOG_LEVEL: process.env.LOG_LEVEL || 'info',
   CONFIG_VERSION: {
     DEFAULT: 'DEFAULT',
-    EXPECTED: 'v12.2022-11-10',
+    EXPECTED: 'v13.2022-12-20',
     CURRENT: '',
   },
 }
@@ -58,6 +58,7 @@ const community = {
     process.env.COMMUNITY_REDEEM_CONTRIBUTION_URL || 'http://localhost/redeem/CL-{code}',
   COMMUNITY_DESCRIPTION:
     process.env.COMMUNITY_DESCRIPTION || 'Die lokale Entwicklungsumgebung von Gradido.',
+  COMMUNITY_SUPPORT_MAIL: process.env.COMMUNITY_SUPPORT_MAIL || 'support@supportmail.com',
 }
 
 const loginServer = {

From 2b0db817939a18e492a4ddb41e890d2c8746d301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 20 Dec 2022 11:50:47 +0100
Subject: [PATCH 02/15] Rename 'SUPPORT_MAIL' to 'COMMUNITY_SUPPORT_MAIL' in
 frontend

- Increase frontend 'CONFIG_VERSION'.
---
 frontend/.env.dist                   | 6 ++----
 frontend/.env.template               | 4 +---
 frontend/src/config/index.js         | 8 ++------
 frontend/src/pages/InfoStatistic.vue | 2 +-
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/frontend/.env.dist b/frontend/.env.dist
index 4127f339a..5ce6b430d 100644
--- a/frontend/.env.dist
+++ b/frontend/.env.dist
@@ -1,4 +1,4 @@
-CONFIG_VERSION=v3.2022-09-16
+CONFIG_VERSION=v4.2022-12-20
 
 # Environment
 DEFAULT_PUBLISHER_ID=2896
@@ -12,6 +12,7 @@ COMMUNITY_NAME=Gradido Entwicklung
 COMMUNITY_URL=http://localhost/
 COMMUNITY_REGISTER_URL=http://localhost/register
 COMMUNITY_DESCRIPTION=Die lokale Entwicklungsumgebung von Gradido.
+COMMUNITY_SUPPORT_MAIL=support@supportmail.com
 
 # Meta
 META_URL=http://localhost
@@ -22,6 +23,3 @@ META_DESCRIPTION_EN="Gratitude is the currency of the new age. More and more peo
 META_KEYWORDS_DE="Grundeinkommen, Währung, Dankbarkeit, Schenk-Ökonomie, Natürliche Ökonomie des Lebens, Ökonomie, Ökologie, Potenzialentfaltung, Schenken und Danken, Kreislauf des Lebens, Geldsystem"
 META_KEYWORDS_EN="Basic Income, Currency, Gratitude, Gift Economy, Natural Economy of Life, Economy, Ecology, Potential Development, Giving and Thanking, Cycle of Life, Monetary System"
 META_AUTHOR="Bernd Hückstädt - Gradido-Akademie"
-
-# Support Mail 
-SUPPORT_MAIL=support@supportmail.com
\ No newline at end of file
diff --git a/frontend/.env.template b/frontend/.env.template
index 0b9d34b38..59e34eb80 100644
--- a/frontend/.env.template
+++ b/frontend/.env.template
@@ -12,6 +12,7 @@ COMMUNITY_NAME=$COMMUNITY_NAME
 COMMUNITY_URL=$COMMUNITY_URL
 COMMUNITY_REGISTER_URL=$COMMUNITY_REGISTER_URL
 COMMUNITY_DESCRIPTION=$COMMUNITY_DESCRIPTION
+COMMUNITY_SUPPORT_MAIL=$COMMUNITY_SUPPORT_MAIL
 
 # Meta
 META_URL=$META_URL
@@ -22,6 +23,3 @@ META_DESCRIPTION_EN=$META_DESCRIPTION_EN
 META_KEYWORDS_DE=$META_KEYWORDS_DE
 META_KEYWORDS_EN=$META_KEYWORDS_EN
 META_AUTHOR=$META_AUTHOR
-
-# Support Mail 
-SUPPORT_MAIL=$SUPPORT_MAIL
\ No newline at end of file
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 5ab5f2392..b90376672 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -8,7 +8,7 @@ const constants = {
   DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
   CONFIG_VERSION: {
     DEFAULT: 'DEFAULT',
-    EXPECTED: 'v3.2022-09-16',
+    EXPECTED: 'v4.2022-12-20',
     CURRENT: '',
   },
 }
@@ -39,6 +39,7 @@ const community = {
   COMMUNITY_REGISTER_URL: process.env.COMMUNITY_REGISTER_URL || 'http://localhost/register',
   COMMUNITY_DESCRIPTION:
     process.env.COMMUNITY_DESCRIPTION || 'Die lokale Entwicklungsumgebung von Gradido.',
+  COMMUNITY_SUPPORT_MAIL: process.env.COMMUNITY_SUPPORT_MAIL || 'support@supportmail.com',
 }
 
 const meta = {
@@ -60,10 +61,6 @@ const meta = {
   META_AUTHOR: process.env.META_AUTHOR || 'Bernd Hückstädt - Gradido-Akademie',
 }
 
-const supportmail = {
-  SUPPORT_MAIL: process.env.SUPPORT_MAIL || 'support@supportmail.com',
-}
-
 // Check config version
 constants.CONFIG_VERSION.CURRENT = process.env.CONFIG_VERSION || constants.CONFIG_VERSION.DEFAULT
 if (
@@ -83,7 +80,6 @@ const CONFIG = {
   ...endpoints,
   ...community,
   ...meta,
-  ...supportmail,
 }
 
 module.exports = CONFIG
diff --git a/frontend/src/pages/InfoStatistic.vue b/frontend/src/pages/InfoStatistic.vue
index 254a895e0..978c7fde5 100644
--- a/frontend/src/pages/InfoStatistic.vue
+++ b/frontend/src/pages/InfoStatistic.vue
@@ -89,7 +89,7 @@ export default {
       countAdminUser: null,
       itemsContributionLinks: [],
       itemsAdminUser: [],
-      supportMail: CONFIG.SUPPORT_MAIL,
+      supportMail: CONFIG.COMMUNITY_SUPPORT_MAIL,
       membersCount: '1203',
       totalUsers: null,
       totalGradidoCreated: null,

From d1f0ae7fa1b05eaf6cf9f4d955f725021f6c6bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 20 Dec 2022 11:52:11 +0100
Subject: [PATCH 03/15] Increase frontend and backend 'CONFIG_VERSION' in
 'bare_metal'

---
 deployment/bare_metal/.env.dist | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist
index 9c6bfd735..a5f6996d7 100644
--- a/deployment/bare_metal/.env.dist
+++ b/deployment/bare_metal/.env.dist
@@ -24,9 +24,10 @@ COMMUNITY_REGISTER_URL=https://stage1.gradido.net/register
 COMMUNITY_REDEEM_URL=https://stage1.gradido.net/redeem/{code}
 COMMUNITY_REDEEM_CONTRIBUTION_URL=https://stage1.gradido.net/redeem/CL-{code}
 COMMUNITY_DESCRIPTION="Gradido Development Stage1 Test Community"
+COMMUNITY_SUPPORT_MAIL=support@supportmail.com
 
 # backend
-BACKEND_CONFIG_VERSION=v12.2022-11-10
+BACKEND_CONFIG_VERSION=v13.2022-12-20
 
 JWT_EXPIRES_IN=10m
 GDT_API_URL=https://gdt.gradido.net
@@ -69,7 +70,7 @@ EVENT_PROTOCOL_DISABLED=false
 DATABASE_CONFIG_VERSION=v1.2022-03-18
 
 # frontend
-FRONTEND_CONFIG_VERSION=v3.2022-09-16
+FRONTEND_CONFIG_VERSION=v4.2022-12-20
 
 GRAPHQL_URI=https://stage1.gradido.net/graphql
 ADMIN_AUTH_URL=https://stage1.gradido.net/admin/authenticate?token={token}
@@ -85,8 +86,6 @@ META_KEYWORDS_DE="Grundeinkommen, Währung, Dankbarkeit, Schenk-Ökonomie, Natü
 META_KEYWORDS_EN="Basic Income, Currency, Gratitude, Gift Economy, Natural Economy of Life, Economy, Ecology, Potential Development, Giving and Thanking, Cycle of Life, Monetary System"
 META_AUTHOR="Bernd Hückstädt - Gradido-Akademie"
 
-SUPPORT_MAIL=support@supportmail.com
-
 # admin
 ADMIN_CONFIG_VERSION=v1.2022-03-18
 

From dd760a650b34ad308690c56d66ea0d2776de516c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 20 Dec 2022 13:59:41 +0100
Subject: [PATCH 04/15] Add imprint to 'accountMultiRegistration'

---
 backend/src/emails/sendEmailVariants.ts       |  2 ++
 .../accountMultiRegistration/html.pug         | 19 ++++++++++---------
 .../templates/greatingFormularImprint.pug     | 11 +++++++++++
 backend/src/emails/templates/hello.pug        |  1 +
 backend/src/locales/de.json                   |  6 ++++--
 backend/src/locales/en.json                   |  2 +-
 6 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 backend/src/emails/templates/greatingFormularImprint.pug
 create mode 100644 backend/src/emails/templates/hello.pug

diff --git a/backend/src/emails/sendEmailVariants.ts b/backend/src/emails/sendEmailVariants.ts
index 356f95e39..bb76ff2ee 100644
--- a/backend/src/emails/sendEmailVariants.ts
+++ b/backend/src/emails/sendEmailVariants.ts
@@ -65,6 +65,8 @@ export const sendAccountMultiRegistrationEmail = (data: {
       lastName: data.lastName,
       locale: data.language,
       resendLink: CONFIG.EMAIL_LINK_FORGOTPASSWORD,
+      supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+      communityURL: CONFIG.COMMUNITY_URL,
     },
   })
 }
diff --git a/backend/src/emails/templates/accountMultiRegistration/html.pug b/backend/src/emails/templates/accountMultiRegistration/html.pug
index b3764403b..e648df291 100644
--- a/backend/src/emails/templates/accountMultiRegistration/html.pug
+++ b/backend/src/emails/templates/accountMultiRegistration/html.pug
@@ -5,18 +5,19 @@ html(lang=locale)
   body
     h1(style='margin-bottom: 24px;')= t('emails.accountMultiRegistration.subject')
     #container.col
-      p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName })
-      p= t('emails.accountMultiRegistration.emailReused')
+      include ../hello.pug
+      p
+        = t('emails.accountMultiRegistration.emailReused')
         br
-        span= t('emails.accountMultiRegistration.emailExists')
-      p= t('emails.accountMultiRegistration.onForgottenPasswordClickLink')
+        = t('emails.accountMultiRegistration.emailExists')
+      p
+        = t('emails.accountMultiRegistration.onForgottenPasswordClickLink')
         br
         a(href=resendLink) #{resendLink}
         br
-        span= t('emails.accountMultiRegistration.onForgottenPasswordCopyLink')
-      p= t('emails.accountMultiRegistration.ifYouAreNotTheOne')
+        = t('emails.accountMultiRegistration.onForgottenPasswordCopyLink')
+      p
+        = t('emails.accountMultiRegistration.ifYouAreNotTheOne')
         br
         a(href='https://gradido.net/de/contact/') https://gradido.net/de/contact/
-      p(style='margin-top: 24px;')= t('emails.general.sincerelyYours')
-        br
-        span= t('emails.general.yourGradidoTeam')
+      include ../greatingFormularImprint.pug
diff --git a/backend/src/emails/templates/greatingFormularImprint.pug b/backend/src/emails/templates/greatingFormularImprint.pug
new file mode 100644
index 000000000..678f5fd51
--- /dev/null
+++ b/backend/src/emails/templates/greatingFormularImprint.pug
@@ -0,0 +1,11 @@
+p(style='margin-top: 24px;')= t('emails.general.sincerelyYours')
+  br
+  = t('emails.general.yourGradidoTeam')
+p(style='margin-top: 24px;')= '—————'
+p(style='margin-top: 24px;')
+  each line in t('general.imprint').split(/\n/)
+    = line
+    br
+  a(href='mailto:' + supportEmail)= supportEmail
+  br
+  a(href=communityURL)= communityURL
diff --git a/backend/src/emails/templates/hello.pug b/backend/src/emails/templates/hello.pug
new file mode 100644
index 000000000..aca50a907
--- /dev/null
+++ b/backend/src/emails/templates/hello.pug
@@ -0,0 +1 @@
+p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName })
diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json
index 8aff6caa4..bf621d1ef 100644
--- a/backend/src/locales/de.json
+++ b/backend/src/locales/de.json
@@ -47,7 +47,7 @@
     },
     "transactionLinkRedeemed": {
       "hasRedeemedYourLink": "{senderFirstName} {senderLastName} ({senderEmail}) hat soeben deinen Link eingelöst.",
-      "memo": "Memo: {transactionMemo}",
+      "memo": "Nachricht: {transactionMemo}",
       "subject": "Gradido: Dein Gradido-Link wurde eingelöst"
     },
     "transactionReceived": {
@@ -56,6 +56,8 @@
     }
   },
   "general": {
-    "decimalSeparator": ","
+    "decimalSeparator": ",",
+    "imprint": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland",
+    "supportEmail": "support@gradido.net"
   }
 }
diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json
index 99217840e..4b158ca6d 100644
--- a/backend/src/locales/en.json
+++ b/backend/src/locales/en.json
@@ -47,7 +47,7 @@
     },
     "transactionLinkRedeemed": {
       "hasRedeemedYourLink": "{senderFirstName} {senderLastName} ({senderEmail}) has just redeemed your link.",
-      "memo": "Memo: {transactionMemo}",
+      "memo": "Message: {transactionMemo}",
       "subject": "Gradido: Your Gradido link has been redeemed"
     },
     "transactionReceived": {

From 70d080cf8491b0c2e46466c5393f10acdce0783f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 20 Dec 2022 14:00:47 +0100
Subject: [PATCH 05/15] Remove 'span' tag from emails

---
 .../emails/templates/accountActivation/html.pug   | 13 ++++++++-----
 .../templates/addedContributionMessage/html.pug   | 10 ++++++----
 .../templates/contributionConfirmed/html.pug      | 10 ++++++----
 .../templates/contributionRejected/html.pug       | 10 ++++++----
 .../src/emails/templates/resetPassword/html.pug   | 13 ++++++++-----
 .../templates/transactionLinkRedeemed/html.pug    | 15 +++++++++------
 .../emails/templates/transactionReceived/html.pug | 10 ++++++----
 7 files changed, 49 insertions(+), 32 deletions(-)

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')

From 9314f8e427cb4518e4a709a482b5533282dad02e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 20 Dec 2022 14:03:48 +0100
Subject: [PATCH 06/15] Replace hello line in emails by include

---
 backend/src/emails/templates/accountActivation/html.pug        | 2 +-
 backend/src/emails/templates/addedContributionMessage/html.pug | 2 +-
 backend/src/emails/templates/contributionConfirmed/html.pug    | 2 +-
 backend/src/emails/templates/contributionRejected/html.pug     | 2 +-
 backend/src/emails/templates/resetPassword/html.pug            | 2 +-
 backend/src/emails/templates/transactionLinkRedeemed/html.pug  | 2 +-
 backend/src/emails/templates/transactionReceived/html.pug      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/src/emails/templates/accountActivation/html.pug b/backend/src/emails/templates/accountActivation/html.pug
index 24d86ea56..e25737394 100644
--- a/backend/src/emails/templates/accountActivation/html.pug
+++ b/backend/src/emails/templates/accountActivation/html.pug
@@ -5,7 +5,7 @@ html(lang=locale)
   body
     h1(style='margin-bottom: 24px;')= t('emails.accountActivation.subject')
     #container.col
-      p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName })
+      include ../hello.pug
       p= t('emails.accountActivation.emailRegistered')
       p
         = t('emails.accountActivation.pleaseClickLink')
diff --git a/backend/src/emails/templates/addedContributionMessage/html.pug b/backend/src/emails/templates/addedContributionMessage/html.pug
index 6fa89caaf..7232358a4 100644
--- a/backend/src/emails/templates/addedContributionMessage/html.pug
+++ b/backend/src/emails/templates/addedContributionMessage/html.pug
@@ -5,7 +5,7 @@ html(lang=locale)
   body
     h1(style='margin-bottom: 24px;')= t('emails.addedContributionMessage.subject')
     #container.col
-      p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName })
+      include ../hello.pug
       p= t('emails.addedContributionMessage.commonGoodContributionMessage', { senderFirstName, senderLastName, contributionMemo })
       p= t('emails.addedContributionMessage.toSeeAndAnswerMessage')
       p
diff --git a/backend/src/emails/templates/contributionConfirmed/html.pug b/backend/src/emails/templates/contributionConfirmed/html.pug
index dffad4224..7a8f026ae 100644
--- a/backend/src/emails/templates/contributionConfirmed/html.pug
+++ b/backend/src/emails/templates/contributionConfirmed/html.pug
@@ -5,7 +5,7 @@ html(lang=locale)
   body
     h1(style='margin-bottom: 24px;')= t('emails.contributionConfirmed.subject')
     #container.col
-      p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName })
+      include ../hello.pug
       p= t('emails.contributionConfirmed.commonGoodContributionConfirmed', { senderFirstName, senderLastName, contributionMemo })
       p= t('emails.general.amountGDD', { amountGDD: contributionAmount })
       p
diff --git a/backend/src/emails/templates/contributionRejected/html.pug b/backend/src/emails/templates/contributionRejected/html.pug
index 8c37bfcbc..fdbbf23ec 100644
--- a/backend/src/emails/templates/contributionRejected/html.pug
+++ b/backend/src/emails/templates/contributionRejected/html.pug
@@ -5,7 +5,7 @@ html(lang=locale)
   body
     h1(style='margin-bottom: 24px;')= t('emails.contributionRejected.subject')
     #container.col
-      p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName })
+      include ../hello.pug
       p= t('emails.contributionRejected.commonGoodContributionRejected', { senderFirstName, senderLastName, contributionMemo })
       p= t('emails.contributionRejected.toSeeContributionsAndMessages')
       p
diff --git a/backend/src/emails/templates/resetPassword/html.pug b/backend/src/emails/templates/resetPassword/html.pug
index 96aabcec4..6a15eaf79 100644
--- a/backend/src/emails/templates/resetPassword/html.pug
+++ b/backend/src/emails/templates/resetPassword/html.pug
@@ -5,7 +5,7 @@ html(lang=locale)
   body
     h1(style='margin-bottom: 24px;')= t('emails.resetPassword.subject')
     #container.col
-      p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName })
+      include ../hello.pug
       p= t('emails.resetPassword.youOrSomeoneResetPassword')
       p
         = t('emails.resetPassword.pleaseClickLink')
diff --git a/backend/src/emails/templates/transactionLinkRedeemed/html.pug b/backend/src/emails/templates/transactionLinkRedeemed/html.pug
index 1bb06514f..062bc8059 100644
--- a/backend/src/emails/templates/transactionLinkRedeemed/html.pug
+++ b/backend/src/emails/templates/transactionLinkRedeemed/html.pug
@@ -5,7 +5,7 @@ html(lang=locale)
   body
     h1(style='margin-bottom: 24px;')= t('emails.transactionLinkRedeemed.subject')
     #container.col
-      p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName })
+      include ../hello.pug
       p= t('emails.transactionLinkRedeemed.hasRedeemedYourLink', { senderFirstName, senderLastName, senderEmail })
       p
         = t('emails.general.amountGDD', { amountGDD: transactionAmount })
diff --git a/backend/src/emails/templates/transactionReceived/html.pug b/backend/src/emails/templates/transactionReceived/html.pug
index 887d4b471..da17f2e97 100644
--- a/backend/src/emails/templates/transactionReceived/html.pug
+++ b/backend/src/emails/templates/transactionReceived/html.pug
@@ -5,7 +5,7 @@ html(lang=locale)
   body
     h1(style='margin-bottom: 24px;')= t('emails.transactionReceived.subject')
     #container.col
-      p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName })
+      include ../hello.pug
       p= t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName, senderEmail })
       p
         = t('emails.general.detailsYouFindOnLinkToYourAccount')

From 9da21a5cfb22b3e1086b57b61607249e91742930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 20 Dec 2022 14:06:25 +0100
Subject: [PATCH 07/15] Replace greeting formular by include and add imprint by
 this

---
 backend/src/emails/templates/accountActivation/html.pug      | 5 +----
 .../src/emails/templates/addedContributionMessage/html.pug   | 5 +----
 backend/src/emails/templates/contributionConfirmed/html.pug  | 5 +----
 backend/src/emails/templates/contributionRejected/html.pug   | 5 +----
 backend/src/emails/templates/resetPassword/html.pug          | 5 +----
 .../src/emails/templates/transactionLinkRedeemed/html.pug    | 5 +----
 backend/src/emails/templates/transactionReceived/html.pug    | 5 +----
 7 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/backend/src/emails/templates/accountActivation/html.pug b/backend/src/emails/templates/accountActivation/html.pug
index e25737394..6075fa8a8 100644
--- a/backend/src/emails/templates/accountActivation/html.pug
+++ b/backend/src/emails/templates/accountActivation/html.pug
@@ -17,7 +17,4 @@ html(lang=locale)
         = t('emails.accountActivation.duration', { hours: timeDurationObject.hours, minutes: timeDurationObject.minutes })
         br
         a(href=resendLink) #{resendLink}
-      p(style='margin-top: 24px;')
-        = t('emails.general.sincerelyYours')
-        br
-        = t('emails.general.yourGradidoTeam')
+      include ../greatingFormularImprint.pug
diff --git a/backend/src/emails/templates/addedContributionMessage/html.pug b/backend/src/emails/templates/addedContributionMessage/html.pug
index 7232358a4..e7410c0f0 100644
--- a/backend/src/emails/templates/addedContributionMessage/html.pug
+++ b/backend/src/emails/templates/addedContributionMessage/html.pug
@@ -13,7 +13,4 @@ html(lang=locale)
         = " "
         a(href=overviewURL) #{overviewURL}
       p= t('emails.general.pleaseDoNotReply')
-      p(style='margin-top: 24px;')
-        = t('emails.general.sincerelyYours')
-        br
-        = t('emails.general.yourGradidoTeam')
+      include ../greatingFormularImprint.pug
diff --git a/backend/src/emails/templates/contributionConfirmed/html.pug b/backend/src/emails/templates/contributionConfirmed/html.pug
index 7a8f026ae..4ff17ffd4 100644
--- a/backend/src/emails/templates/contributionConfirmed/html.pug
+++ b/backend/src/emails/templates/contributionConfirmed/html.pug
@@ -13,7 +13,4 @@ html(lang=locale)
         = " "
         a(href=overviewURL) #{overviewURL}
       p= t('emails.general.pleaseDoNotReply')
-      p(style='margin-top: 24px;')
-        = t('emails.general.sincerelyYours')
-        br
-        = t('emails.general.yourGradidoTeam')
+      include ../greatingFormularImprint.pug
diff --git a/backend/src/emails/templates/contributionRejected/html.pug b/backend/src/emails/templates/contributionRejected/html.pug
index fdbbf23ec..531f75543 100644
--- a/backend/src/emails/templates/contributionRejected/html.pug
+++ b/backend/src/emails/templates/contributionRejected/html.pug
@@ -13,7 +13,4 @@ html(lang=locale)
         = " "
         a(href=overviewURL) #{overviewURL}
       p= t('emails.general.pleaseDoNotReply')
-      p(style='margin-top: 24px;')
-        = t('emails.general.sincerelyYours')
-        br
-        = t('emails.general.yourGradidoTeam')
+      include ../greatingFormularImprint.pug
diff --git a/backend/src/emails/templates/resetPassword/html.pug b/backend/src/emails/templates/resetPassword/html.pug
index 6a15eaf79..53ffbcd04 100644
--- a/backend/src/emails/templates/resetPassword/html.pug
+++ b/backend/src/emails/templates/resetPassword/html.pug
@@ -17,7 +17,4 @@ html(lang=locale)
         = t('emails.resetPassword.duration', { hours: timeDurationObject.hours, minutes: timeDurationObject.minutes })
         br
         a(href=resendLink) #{resendLink}
-      p(style='margin-top: 24px;')
-        = t('emails.general.sincerelyYours')
-        br
-        = t('emails.general.yourGradidoTeam')
+      include ../greatingFormularImprint.pug
diff --git a/backend/src/emails/templates/transactionLinkRedeemed/html.pug b/backend/src/emails/templates/transactionLinkRedeemed/html.pug
index 062bc8059..fb561f5c5 100644
--- a/backend/src/emails/templates/transactionLinkRedeemed/html.pug
+++ b/backend/src/emails/templates/transactionLinkRedeemed/html.pug
@@ -16,7 +16,4 @@ html(lang=locale)
         = " "
         a(href=overviewURL) #{overviewURL}
       p= t('emails.general.pleaseDoNotReply')
-      p(style='margin-top: 24px;')
-        = t('emails.general.sincerelyYours')
-        br
-        = t('emails.general.yourGradidoTeam')
+      include ../greatingFormularImprint.pug
diff --git a/backend/src/emails/templates/transactionReceived/html.pug b/backend/src/emails/templates/transactionReceived/html.pug
index da17f2e97..e9e84990f 100644
--- a/backend/src/emails/templates/transactionReceived/html.pug
+++ b/backend/src/emails/templates/transactionReceived/html.pug
@@ -12,7 +12,4 @@ html(lang=locale)
         = " "
         a(href=overviewURL) #{overviewURL}
       p= t('emails.general.pleaseDoNotReply')
-      p(style='margin-top: 24px;')
-        = t('emails.general.sincerelyYours')
-        br
-        = t('emails.general.yourGradidoTeam')
+      include ../greatingFormularImprint.pug

From 2f650ce172d52080b38c344f7aeb38c57d6bad10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 20 Dec 2022 15:03:00 +0100
Subject: [PATCH 08/15] Fix missing email imprint locale

---
 backend/src/emails/templates/greatingFormularImprint.pug | 3 ++-
 backend/src/locales/de.json                              | 3 +--
 backend/src/locales/en.json                              | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/src/emails/templates/greatingFormularImprint.pug b/backend/src/emails/templates/greatingFormularImprint.pug
index 678f5fd51..7aaae5c52 100644
--- a/backend/src/emails/templates/greatingFormularImprint.pug
+++ b/backend/src/emails/templates/greatingFormularImprint.pug
@@ -1,4 +1,5 @@
-p(style='margin-top: 24px;')= t('emails.general.sincerelyYours')
+p(style='margin-top: 24px;')
+  = t('emails.general.sincerelyYours')
   br
   = t('emails.general.yourGradidoTeam')
 p(style='margin-top: 24px;')= '—————'
diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json
index bf621d1ef..97907f36e 100644
--- a/backend/src/locales/de.json
+++ b/backend/src/locales/de.json
@@ -57,7 +57,6 @@
   },
   "general": {
     "decimalSeparator": ",",
-    "imprint": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland",
-    "supportEmail": "support@gradido.net"
+    "imprint": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland"
   }
 }
diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json
index 4b158ca6d..c4de7e05a 100644
--- a/backend/src/locales/en.json
+++ b/backend/src/locales/en.json
@@ -56,6 +56,7 @@
     }
   },
   "general": {
-    "decimalSeparator": "."
+    "decimalSeparator": ".",
+    "imprint": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland"
   }
 }

From 9b4c8fe610892f75c8c8139e083c53cd95b2a1a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 20 Dec 2022 15:03:52 +0100
Subject: [PATCH 09/15] Fix missing email parameters 'supportEmail',
 'communityURL'

---
 backend/src/emails/sendEmailVariants.test.ts | 76 ++++++++++++++++----
 backend/src/emails/sendEmailVariants.ts      | 14 ++++
 2 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts
index 262b91be2..816d1a370 100644
--- a/backend/src/emails/sendEmailVariants.test.ts
+++ b/backend/src/emails/sendEmailVariants.test.ts
@@ -70,6 +70,8 @@ describe('sendEmailVariants', () => {
             senderLastName: 'Bloxberg',
             contributionMemo: 'My contribution.',
             overviewURL: CONFIG.EMAIL_LINK_OVERVIEW,
+            supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+            communityURL: CONFIG.COMMUNITY_URL,
           },
         })
       })
@@ -106,10 +108,14 @@ describe('sendEmailVariants', () => {
           'To view and reply to the message, go to the “Community” menu in your Gradido account and click on the “My contributions to the common good” tab!',
         )
         expect(result.originalMessage.html).toContain(
-          `Link to your account:<span> </span><a href="${CONFIG.EMAIL_LINK_OVERVIEW}">${CONFIG.EMAIL_LINK_OVERVIEW}</a>`,
+          `Link to your account: <a href="${CONFIG.EMAIL_LINK_OVERVIEW}">${CONFIG.EMAIL_LINK_OVERVIEW}</a>`,
         )
         expect(result.originalMessage.html).toContain('Please do not reply to this email!')
-        expect(result.originalMessage.html).toContain('Kind regards,<br><span>your Gradido team')
+        expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
+        expect(result.originalMessage.html).toContain('—————')
+        expect(result.originalMessage.html).toContain(
+          'Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
+        )
       })
     })
   })
@@ -140,6 +146,8 @@ describe('sendEmailVariants', () => {
             activationLink: 'http://localhost/checkEmail/6627633878930542284',
             timeDurationObject: { hours: 23, minutes: 30 },
             resendLink: CONFIG.EMAIL_LINK_FORGOTPASSWORD,
+            supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+            communityURL: CONFIG.COMMUNITY_URL,
           },
         })
       })
@@ -183,7 +191,11 @@ describe('sendEmailVariants', () => {
         expect(result.originalMessage.html).toContain(
           `<a href="${CONFIG.EMAIL_LINK_FORGOTPASSWORD}">${CONFIG.EMAIL_LINK_FORGOTPASSWORD}</a>`,
         )
-        expect(result.originalMessage.html).toContain('Kind regards,<br><span>your Gradido team')
+        expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
+        expect(result.originalMessage.html).toContain('—————')
+        expect(result.originalMessage.html).toContain(
+          'Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
+        )
       })
     })
   })
@@ -210,6 +222,8 @@ describe('sendEmailVariants', () => {
             lastName: 'Lustig',
             locale: 'en',
             resendLink: CONFIG.EMAIL_LINK_FORGOTPASSWORD,
+            supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+            communityURL: CONFIG.COMMUNITY_URL,
           },
         })
       })
@@ -257,7 +271,11 @@ describe('sendEmailVariants', () => {
         expect(result.originalMessage.html).toContain(
           'If you are not the one who tried to register again, please contact our support:',
         )
-        expect(result.originalMessage.html).toContain('Kind regards,<br><span>your Gradido team')
+        expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
+        expect(result.originalMessage.html).toContain('—————')
+        expect(result.originalMessage.html).toContain(
+          'Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
+        )
       })
     })
   })
@@ -292,6 +310,8 @@ describe('sendEmailVariants', () => {
             contributionMemo: 'My contribution.',
             contributionAmount: '23.54',
             overviewURL: CONFIG.EMAIL_LINK_OVERVIEW,
+            supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+            communityURL: CONFIG.COMMUNITY_URL,
           },
         })
       })
@@ -326,10 +346,14 @@ describe('sendEmailVariants', () => {
         )
         expect(result.originalMessage.html).toContain('Amount: 23.54 GDD')
         expect(result.originalMessage.html).toContain(
-          `Link to your account:<span> </span><a href="${CONFIG.EMAIL_LINK_OVERVIEW}">${CONFIG.EMAIL_LINK_OVERVIEW}</a>`,
+          `Link to your account: <a href="${CONFIG.EMAIL_LINK_OVERVIEW}">${CONFIG.EMAIL_LINK_OVERVIEW}</a>`,
         )
         expect(result.originalMessage.html).toContain('Please do not reply to this email!')
-        expect(result.originalMessage.html).toContain('Kind regards,<br><span>your Gradido team')
+        expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
+        expect(result.originalMessage.html).toContain('—————')
+        expect(result.originalMessage.html).toContain(
+          'Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
+        )
       })
     })
   })
@@ -362,6 +386,8 @@ describe('sendEmailVariants', () => {
             senderLastName: 'Bloxberg',
             contributionMemo: 'My contribution.',
             overviewURL: CONFIG.EMAIL_LINK_OVERVIEW,
+            supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+            communityURL: CONFIG.COMMUNITY_URL,
           },
         })
       })
@@ -398,10 +424,14 @@ describe('sendEmailVariants', () => {
           'To see your common good contributions and related messages, go to the “Community” menu in your Gradido account and click on the “My contributions to the common good” tab!',
         )
         expect(result.originalMessage.html).toContain(
-          `Link to your account:<span> </span><a href="${CONFIG.EMAIL_LINK_OVERVIEW}">${CONFIG.EMAIL_LINK_OVERVIEW}</a>`,
+          `Link to your account: <a href="${CONFIG.EMAIL_LINK_OVERVIEW}">${CONFIG.EMAIL_LINK_OVERVIEW}</a>`,
         )
         expect(result.originalMessage.html).toContain('Please do not reply to this email!')
-        expect(result.originalMessage.html).toContain('Kind regards,<br><span>your Gradido team')
+        expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
+        expect(result.originalMessage.html).toContain('—————')
+        expect(result.originalMessage.html).toContain(
+          'Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
+        )
       })
     })
   })
@@ -432,6 +462,8 @@ describe('sendEmailVariants', () => {
             resetLink: 'http://localhost/reset-password/3762660021544901417',
             timeDurationObject: { hours: 23, minutes: 30 },
             resendLink: CONFIG.EMAIL_LINK_FORGOTPASSWORD,
+            supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+            communityURL: CONFIG.COMMUNITY_URL,
           },
         })
       })
@@ -473,7 +505,11 @@ describe('sendEmailVariants', () => {
         expect(result.originalMessage.html).toContain(
           `<a href="${CONFIG.EMAIL_LINK_FORGOTPASSWORD}">${CONFIG.EMAIL_LINK_FORGOTPASSWORD}</a>`,
         )
-        expect(result.originalMessage.html).toContain('Kind regards,<br><span>your Gradido team')
+        expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
+        expect(result.originalMessage.html).toContain('—————')
+        expect(result.originalMessage.html).toContain(
+          'Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
+        )
       })
     })
   })
@@ -510,6 +546,8 @@ describe('sendEmailVariants', () => {
             transactionMemo: 'You deserve it! 🙏🏼',
             transactionAmount: '17.65',
             overviewURL: CONFIG.EMAIL_LINK_OVERVIEW,
+            supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+            communityURL: CONFIG.COMMUNITY_URL,
           },
         })
       })
@@ -543,12 +581,16 @@ describe('sendEmailVariants', () => {
           'Bibi Bloxberg (bibi@bloxberg.de) has just redeemed your link.',
         )
         expect(result.originalMessage.html).toContain('Amount: 17.65 GDD')
-        expect(result.originalMessage.html).toContain('Memo: You deserve it! 🙏🏼')
+        expect(result.originalMessage.html).toContain('Message: You deserve it! 🙏🏼')
         expect(result.originalMessage.html).toContain(
-          `You can find transaction details in your Gradido account:<span> </span><a href="${CONFIG.EMAIL_LINK_OVERVIEW}">${CONFIG.EMAIL_LINK_OVERVIEW}</a>`,
+          `You can find transaction details in your Gradido account: <a href="${CONFIG.EMAIL_LINK_OVERVIEW}">${CONFIG.EMAIL_LINK_OVERVIEW}</a>`,
         )
         expect(result.originalMessage.html).toContain('Please do not reply to this email!')
-        expect(result.originalMessage.html).toContain('Kind regards,<br><span>your Gradido team')
+        expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
+        expect(result.originalMessage.html).toContain('—————')
+        expect(result.originalMessage.html).toContain(
+          'Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
+        )
       })
     })
   })
@@ -583,6 +625,8 @@ describe('sendEmailVariants', () => {
             senderEmail: 'bibi@bloxberg.de',
             transactionAmount: '37.40',
             overviewURL: CONFIG.EMAIL_LINK_OVERVIEW,
+            supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+            communityURL: CONFIG.COMMUNITY_URL,
           },
         })
       })
@@ -614,10 +658,14 @@ describe('sendEmailVariants', () => {
           'You have just received 37.40 GDD from Bibi Bloxberg (bibi@bloxberg.de).',
         )
         expect(result.originalMessage.html).toContain(
-          `You can find transaction details in your Gradido account:<span> </span><a href="${CONFIG.EMAIL_LINK_OVERVIEW}">${CONFIG.EMAIL_LINK_OVERVIEW}</a>`,
+          `You can find transaction details in your Gradido account: <a href="${CONFIG.EMAIL_LINK_OVERVIEW}">${CONFIG.EMAIL_LINK_OVERVIEW}</a>`,
         )
         expect(result.originalMessage.html).toContain('Please do not reply to this email!')
-        expect(result.originalMessage.html).toContain('Kind regards,<br><span>your Gradido team')
+        expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
+        expect(result.originalMessage.html).toContain('—————')
+        expect(result.originalMessage.html).toContain(
+          'Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
+        )
       })
     })
   })
diff --git a/backend/src/emails/sendEmailVariants.ts b/backend/src/emails/sendEmailVariants.ts
index bb76ff2ee..cb1376510 100644
--- a/backend/src/emails/sendEmailVariants.ts
+++ b/backend/src/emails/sendEmailVariants.ts
@@ -25,6 +25,8 @@ export const sendAddedContributionMessageEmail = (data: {
       senderLastName: data.senderLastName,
       contributionMemo: data.contributionMemo,
       overviewURL: CONFIG.EMAIL_LINK_OVERVIEW,
+      supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+      communityURL: CONFIG.COMMUNITY_URL,
     },
   })
 }
@@ -47,6 +49,8 @@ export const sendAccountActivationEmail = (data: {
       activationLink: data.activationLink,
       timeDurationObject: data.timeDurationObject,
       resendLink: CONFIG.EMAIL_LINK_FORGOTPASSWORD,
+      supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+      communityURL: CONFIG.COMMUNITY_URL,
     },
   })
 }
@@ -93,6 +97,8 @@ export const sendContributionConfirmedEmail = (data: {
       contributionMemo: data.contributionMemo,
       contributionAmount: decimalSeparatorByLanguage(data.contributionAmount, data.language),
       overviewURL: CONFIG.EMAIL_LINK_OVERVIEW,
+      supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+      communityURL: CONFIG.COMMUNITY_URL,
     },
   })
 }
@@ -117,6 +123,8 @@ export const sendContributionRejectedEmail = (data: {
       senderLastName: data.senderLastName,
       contributionMemo: data.contributionMemo,
       overviewURL: CONFIG.EMAIL_LINK_OVERVIEW,
+      supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+      communityURL: CONFIG.COMMUNITY_URL,
     },
   })
 }
@@ -139,6 +147,8 @@ export const sendResetPasswordEmail = (data: {
       resetLink: data.resetLink,
       timeDurationObject: data.timeDurationObject,
       resendLink: CONFIG.EMAIL_LINK_FORGOTPASSWORD,
+      supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+      communityURL: CONFIG.COMMUNITY_URL,
     },
   })
 }
@@ -167,6 +177,8 @@ export const sendTransactionLinkRedeemedEmail = (data: {
       transactionMemo: data.transactionMemo,
       transactionAmount: decimalSeparatorByLanguage(data.transactionAmount, data.language),
       overviewURL: CONFIG.EMAIL_LINK_OVERVIEW,
+      supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+      communityURL: CONFIG.COMMUNITY_URL,
     },
   })
 }
@@ -193,6 +205,8 @@ export const sendTransactionReceivedEmail = (data: {
       senderEmail: data.senderEmail,
       transactionAmount: decimalSeparatorByLanguage(data.transactionAmount, data.language),
       overviewURL: CONFIG.EMAIL_LINK_OVERVIEW,
+      supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+      communityURL: CONFIG.COMMUNITY_URL,
     },
   })
 }

From cd6a6df1239d6bff78640734d374a09095a93b09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 20 Dec 2022 15:36:47 +0100
Subject: [PATCH 10/15] Implement sender name and amount in subject of email
 'transactionReceived'

---
 backend/src/emails/sendEmailVariants.test.ts           | 10 ++++++----
 .../src/emails/templates/transactionReceived/html.pug  |  4 ++--
 .../emails/templates/transactionReceived/subject.pug   |  2 +-
 backend/src/locales/de.json                            |  2 +-
 backend/src/locales/en.json                            |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts
index 816d1a370..117367540 100644
--- a/backend/src/emails/sendEmailVariants.test.ts
+++ b/backend/src/emails/sendEmailVariants.test.ts
@@ -642,17 +642,19 @@ describe('sendEmailVariants', () => {
             to: 'Peter Lustig <peter@lustig.de>',
             from: 'Gradido (do not answer) <info@gradido.net>',
             attachments: [],
-            subject: 'Gradido: You have received Gradidos',
+            subject: 'Gradido: Bibi Bloxberg has sent you 37.40 Gradidos',
             html: expect.any(String),
-            text: expect.stringContaining('GRADIDO: YOU HAVE RECEIVED GRADIDOS'),
+            text: expect.stringContaining('GRADIDO: BIBI BLOXBERG HAS SENT YOU 37.40 GRADIDOS'),
           }),
         })
         expect(result.originalMessage.html).toContain('<!DOCTYPE html>')
         expect(result.originalMessage.html).toContain('<html lang="en">')
         expect(result.originalMessage.html).toContain(
-          '<title>Gradido: You have received Gradidos</title>',
+          '<title>Gradido: Bibi Bloxberg has sent you 37.40 Gradidos</title>',
+        )
+        expect(result.originalMessage.html).toContain(
+          '>Gradido: Bibi Bloxberg has sent you 37.40 Gradidos</h1>',
         )
-        expect(result.originalMessage.html).toContain('>Gradido: You have received Gradidos</h1>')
         expect(result.originalMessage.html).toContain('Hello Peter Lustig')
         expect(result.originalMessage.html).toContain(
           'You have just received 37.40 GDD from Bibi Bloxberg (bibi@bloxberg.de).',
diff --git a/backend/src/emails/templates/transactionReceived/html.pug b/backend/src/emails/templates/transactionReceived/html.pug
index e9e84990f..e6807f539 100644
--- a/backend/src/emails/templates/transactionReceived/html.pug
+++ b/backend/src/emails/templates/transactionReceived/html.pug
@@ -1,9 +1,9 @@
 doctype html
 html(lang=locale)
   head
-    title= t('emails.transactionReceived.subject')
+    title= t('emails.transactionReceived.subject', { senderFirstName, senderLastName, transactionAmount })
   body
-    h1(style='margin-bottom: 24px;')= t('emails.transactionReceived.subject')
+    h1(style='margin-bottom: 24px;')= t('emails.transactionReceived.subject', { senderFirstName, senderLastName, transactionAmount })
     #container.col
       include ../hello.pug
       p= t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName, senderEmail })
diff --git a/backend/src/emails/templates/transactionReceived/subject.pug b/backend/src/emails/templates/transactionReceived/subject.pug
index 630752b02..872806ebc 100644
--- a/backend/src/emails/templates/transactionReceived/subject.pug
+++ b/backend/src/emails/templates/transactionReceived/subject.pug
@@ -1 +1 @@
-= t('emails.transactionReceived.subject')
+= t('emails.transactionReceived.subject', { senderFirstName, senderLastName, transactionAmount })
diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json
index 97907f36e..75ae49167 100644
--- a/backend/src/locales/de.json
+++ b/backend/src/locales/de.json
@@ -52,7 +52,7 @@
     },
     "transactionReceived": {
       "haveReceivedAmountGDDFrom": "du hast soeben {transactionAmount} GDD von {senderFirstName} {senderLastName} ({senderEmail}) erhalten.",
-      "subject": "Gradido: Du hast Gradidos erhalten"
+      "subject": "Gradido: {senderFirstName} {senderLastName} hat dir {transactionAmount} Gradidos gesendet"
     }
   },
   "general": {
diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json
index c4de7e05a..e11f5200f 100644
--- a/backend/src/locales/en.json
+++ b/backend/src/locales/en.json
@@ -52,7 +52,7 @@
     },
     "transactionReceived": {
       "haveReceivedAmountGDDFrom": "You have just received {transactionAmount} GDD from {senderFirstName} {senderLastName} ({senderEmail}).",
-      "subject": "Gradido: You have received Gradidos"
+      "subject": "Gradido: {senderFirstName} {senderLastName} has sent you {transactionAmount} Gradidos"
     }
   },
   "general": {

From 53a4d469d97d015f1ff0da4b53153cc763b51121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 20 Dec 2022 15:41:08 +0100
Subject: [PATCH 11/15] Remove text part 'by entering your email address' from
 two emails

---
 backend/src/emails/sendEmailVariants.test.ts | 4 ++--
 backend/src/locales/de.json                  | 4 ++--
 backend/src/locales/en.json                  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts
index 117367540..3a9a24e3e 100644
--- a/backend/src/emails/sendEmailVariants.test.ts
+++ b/backend/src/emails/sendEmailVariants.test.ts
@@ -186,7 +186,7 @@ describe('sendEmailVariants', () => {
           'or copy the link above into your browser window.',
         )
         expect(result.originalMessage.html).toContain(
-          'The link has a validity of 23 hours and 30 minutes. If the validity of the link has already expired, you can have a new link sent to you here by entering your email address:',
+          'The link has a validity of 23 hours and 30 minutes. If the validity of the link has already expired, you can have a new link sent to you here:',
         )
         expect(result.originalMessage.html).toContain(
           `<a href="${CONFIG.EMAIL_LINK_FORGOTPASSWORD}">${CONFIG.EMAIL_LINK_FORGOTPASSWORD}</a>`,
@@ -500,7 +500,7 @@ describe('sendEmailVariants', () => {
           'or copy the link above into your browser window.',
         )
         expect(result.originalMessage.html).toContain(
-          'The link has a validity of 23 hours and 30 minutes. If the validity of the link has already expired, you can have a new link sent to you here by entering your email address:',
+          'The link has a validity of 23 hours and 30 minutes. If the validity of the link has already expired, you can have a new link sent to you here:',
         )
         expect(result.originalMessage.html).toContain(
           `<a href="${CONFIG.EMAIL_LINK_FORGOTPASSWORD}">${CONFIG.EMAIL_LINK_FORGOTPASSWORD}</a>`,
diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json
index 75ae49167..6ebd1703b 100644
--- a/backend/src/locales/de.json
+++ b/backend/src/locales/de.json
@@ -6,7 +6,7 @@
       "toSeeAndAnswerMessage": "Um die Nachricht zu sehen und darauf zu antworten, gehe in deinem Gradido-Konto ins Menü „Gemeinschaft“ auf den Tab „Meine Beiträge zum Gemeinwohl“!"
     },
     "accountActivation": {
-      "duration": "Der Link hat eine Gültigkeit von {hours} Stunden und {minutes} Minuten. Sollte die Gültigkeit des Links bereits abgelaufen sein, kannst du dir hier einen neuen Link schicken lassen, in dem du deine E-Mail-Adresse eingibst:",
+      "duration": "Der Link hat eine Gültigkeit von {hours} Stunden und {minutes} Minuten. Sollte die Gültigkeit des Links bereits abgelaufen sein, kannst du dir hier einen neuen Link schicken lassen:",
       "emailRegistered": "deine E-Mail-Adresse wurde soeben bei Gradido registriert.",
       "pleaseClickLink": "Klicke bitte auf diesen Link, um die Registrierung abzuschließen und dein Gradido-Konto zu aktivieren:",
       "subject": "Gradido: E-Mail Überprüfung"
@@ -40,7 +40,7 @@
       "yourGradidoTeam": "dein Gradido-Team"
     },
     "resetPassword": {
-      "duration": "Der Link hat eine Gültigkeit von {hours} Stunden und {minutes} Minuten. Sollte die Gültigkeit des Links bereits abgelaufen sein, kannst du dir hier einen neuen Link schicken lassen, in dem du deine E-Mail-Adresse eingibst:",
+      "duration": "Der Link hat eine Gültigkeit von {hours} Stunden und {minutes} Minuten. Sollte die Gültigkeit des Links bereits abgelaufen sein, kannst du dir hier einen neuen Link schicken lassen:",
       "pleaseClickLink": "Wenn du es warst, klicke bitte auf den Link:",
       "subject": "Gradido: Passwort zurücksetzen",
       "youOrSomeoneResetPassword": "du, oder jemand anderes, hast für dieses Konto ein Zurücksetzen des Passworts angefordert."
diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json
index e11f5200f..946d46919 100644
--- a/backend/src/locales/en.json
+++ b/backend/src/locales/en.json
@@ -6,7 +6,7 @@
       "toSeeAndAnswerMessage": "To view and reply to the message, go to the “Community” menu in your Gradido account and click on the “My contributions to the common good” tab!"
     },
     "accountActivation": {
-      "duration": "The link has a validity of {hours} hours and {minutes} minutes. If the validity of the link has already expired, you can have a new link sent to you here by entering your email address:",
+      "duration": "The link has a validity of {hours} hours and {minutes} minutes. If the validity of the link has already expired, you can have a new link sent to you here:",
       "emailRegistered": "Your email address has just been registered with Gradido.",
       "pleaseClickLink": "Please click on this link to complete the registration and activate your Gradido account:",
       "subject": "Gradido: Email Verification"
@@ -40,7 +40,7 @@
       "yourGradidoTeam": "your Gradido team"
     },
     "resetPassword": {
-      "duration": "The link has a validity of {hours} hours and {minutes} minutes. If the validity of the link has already expired, you can have a new link sent to you here by entering your email address:",
+      "duration": "The link has a validity of {hours} hours and {minutes} minutes. If the validity of the link has already expired, you can have a new link sent to you here:",
       "pleaseClickLink": "If it was you, please click on the link:",
       "subject": "Gradido: Reset password",
       "youOrSomeoneResetPassword": "You, or someone else, requested a password reset for this account."

From a30b2b0752f668d75b9429221702e32fefcd0e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 20 Dec 2022 16:18:20 +0100
Subject: [PATCH 12/15] Change German sentence spelling and Gradido plural in
 email subject

---
 backend/src/emails/sendEmailVariants.test.ts           | 10 +++++-----
 .../emails/templates/accountMultiRegistration/html.pug |  2 +-
 backend/src/locales/de.json                            |  4 ++--
 backend/src/locales/en.json                            |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts
index 3a9a24e3e..e111137f9 100644
--- a/backend/src/emails/sendEmailVariants.test.ts
+++ b/backend/src/emails/sendEmailVariants.test.ts
@@ -269,7 +269,7 @@ describe('sendEmailVariants', () => {
           'or copy the link above into your browser window.',
         )
         expect(result.originalMessage.html).toContain(
-          'If you are not the one who tried to register again, please contact our support:',
+          'If you are not the one who tried to register again, please contact our support:<br><a href="mailto:support@supportmail.com">support@supportmail.com</a>',
         )
         expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
         expect(result.originalMessage.html).toContain('—————')
@@ -642,18 +642,18 @@ describe('sendEmailVariants', () => {
             to: 'Peter Lustig <peter@lustig.de>',
             from: 'Gradido (do not answer) <info@gradido.net>',
             attachments: [],
-            subject: 'Gradido: Bibi Bloxberg has sent you 37.40 Gradidos',
+            subject: 'Gradido: Bibi Bloxberg has sent you 37.40 Gradido',
             html: expect.any(String),
-            text: expect.stringContaining('GRADIDO: BIBI BLOXBERG HAS SENT YOU 37.40 GRADIDOS'),
+            text: expect.stringContaining('GRADIDO: BIBI BLOXBERG HAS SENT YOU 37.40 GRADIDO'),
           }),
         })
         expect(result.originalMessage.html).toContain('<!DOCTYPE html>')
         expect(result.originalMessage.html).toContain('<html lang="en">')
         expect(result.originalMessage.html).toContain(
-          '<title>Gradido: Bibi Bloxberg has sent you 37.40 Gradidos</title>',
+          '<title>Gradido: Bibi Bloxberg has sent you 37.40 Gradido</title>',
         )
         expect(result.originalMessage.html).toContain(
-          '>Gradido: Bibi Bloxberg has sent you 37.40 Gradidos</h1>',
+          '>Gradido: Bibi Bloxberg has sent you 37.40 Gradido</h1>',
         )
         expect(result.originalMessage.html).toContain('Hello Peter Lustig')
         expect(result.originalMessage.html).toContain(
diff --git a/backend/src/emails/templates/accountMultiRegistration/html.pug b/backend/src/emails/templates/accountMultiRegistration/html.pug
index e648df291..f8570422c 100644
--- a/backend/src/emails/templates/accountMultiRegistration/html.pug
+++ b/backend/src/emails/templates/accountMultiRegistration/html.pug
@@ -19,5 +19,5 @@ html(lang=locale)
       p
         = t('emails.accountMultiRegistration.ifYouAreNotTheOne')
         br
-        a(href='https://gradido.net/de/contact/') https://gradido.net/de/contact/
+        a(href='mailto:' + supportEmail)= supportEmail
       include ../greatingFormularImprint.pug
diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json
index 6ebd1703b..0886e10e6 100644
--- a/backend/src/locales/de.json
+++ b/backend/src/locales/de.json
@@ -14,7 +14,7 @@
     "accountMultiRegistration": {
       "emailExists": "Es existiert jedoch zu deiner E-Mail-Adresse schon ein Konto.",
       "emailReused": "deine E-Mail-Adresse wurde soeben erneut benutzt, um bei Gradido ein Konto zu registrieren.",
-      "ifYouAreNotTheOne": "Wenn du nicht derjenige bist, der sich versucht hat erneut zu registrieren, wende dich bitte an unseren support:",
+      "ifYouAreNotTheOne": "Wenn du nicht derjenige bist, der versucht hat sich erneut zu registrieren, wende dich bitte an unseren support:",
       "onForgottenPasswordClickLink": "Klicke bitte auf den folgenden Link, falls du dein Passwort vergessen haben solltest:",
       "onForgottenPasswordCopyLink": "oder kopiere den obigen Link in dein Browserfenster.",
       "subject": "Gradido: Erneuter Registrierungsversuch mit deiner E-Mail"
@@ -52,7 +52,7 @@
     },
     "transactionReceived": {
       "haveReceivedAmountGDDFrom": "du hast soeben {transactionAmount} GDD von {senderFirstName} {senderLastName} ({senderEmail}) erhalten.",
-      "subject": "Gradido: {senderFirstName} {senderLastName} hat dir {transactionAmount} Gradidos gesendet"
+      "subject": "Gradido: {senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet"
     }
   },
   "general": {
diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json
index 946d46919..c4aaf315f 100644
--- a/backend/src/locales/en.json
+++ b/backend/src/locales/en.json
@@ -52,7 +52,7 @@
     },
     "transactionReceived": {
       "haveReceivedAmountGDDFrom": "You have just received {transactionAmount} GDD from {senderFirstName} {senderLastName} ({senderEmail}).",
-      "subject": "Gradido: {senderFirstName} {senderLastName} has sent you {transactionAmount} Gradidos"
+      "subject": "Gradido: {senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido"
     }
   },
   "general": {

From aa19a4a3b417de9c32e7b2926392f4e3611bd841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 22 Dec 2022 11:11:51 +0100
Subject: [PATCH 13/15] Add imprint logo to emails

- Remove big space under 'Hello XXX' line.
---
 backend/src/emails/templates/greatingFormularImprint.pug | 4 ++++
 backend/src/emails/templates/hello.pug                   | 2 +-
 backend/src/locales/de.json                              | 4 +++-
 backend/src/locales/en.json                              | 4 +++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/backend/src/emails/templates/greatingFormularImprint.pug b/backend/src/emails/templates/greatingFormularImprint.pug
index 7aaae5c52..d7d8c3a14 100644
--- a/backend/src/emails/templates/greatingFormularImprint.pug
+++ b/backend/src/emails/templates/greatingFormularImprint.pug
@@ -4,6 +4,10 @@ p(style='margin-top: 24px;')
   = t('emails.general.yourGradidoTeam')
 p(style='margin-top: 24px;')= '—————'
 p(style='margin-top: 24px;')
+  if t('general.imprintImageURL').length > 0
+    div(style='position: relative; left: -22px;')
+      img(src=t('general.imprintImageURL'), width='200', alt=t('general.imprintImageAlt'))
+    br
   each line in t('general.imprint').split(/\n/)
     = line
     br
diff --git a/backend/src/emails/templates/hello.pug b/backend/src/emails/templates/hello.pug
index aca50a907..3e2591951 100644
--- a/backend/src/emails/templates/hello.pug
+++ b/backend/src/emails/templates/hello.pug
@@ -1 +1 @@
-p(style='margin-bottom: 24px;')= t('emails.general.helloName', { firstName, lastName })
+p= t('emails.general.helloName', { firstName, lastName })
diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json
index 0886e10e6..2a90e41d4 100644
--- a/backend/src/locales/de.json
+++ b/backend/src/locales/de.json
@@ -57,6 +57,8 @@
   },
   "general": {
     "decimalSeparator": ",",
-    "imprint": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland"
+    "imprint": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland",
+    "imprintImageAlt": "Gradido-Akademie Logo",
+    "imprintImageURL": "https://gdd.gradido.net/img/brand/green.png"
   }
 }
diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json
index c4aaf315f..3b25f8ae4 100644
--- a/backend/src/locales/en.json
+++ b/backend/src/locales/en.json
@@ -57,6 +57,8 @@
   },
   "general": {
     "decimalSeparator": ".",
-    "imprint": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland"
+    "imprint": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland",
+    "imprintImageAlt": "Gradido-Akademie Logo",
+    "imprintImageURL": "https://gdd.gradido.net/img/brand/green.png"
   }
 }

From 254e0410f5c07e5a43402f1acf91093024591f85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 22 Dec 2022 11:22:39 +0100
Subject: [PATCH 14/15] Fix tests for emails

---
 backend/src/emails/sendEmailVariants.test.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts
index e111137f9..9396c2b13 100644
--- a/backend/src/emails/sendEmailVariants.test.ts
+++ b/backend/src/emails/sendEmailVariants.test.ts
@@ -114,7 +114,7 @@ describe('sendEmailVariants', () => {
         expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
         expect(result.originalMessage.html).toContain('—————')
         expect(result.originalMessage.html).toContain(
-          'Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
+          '<div style="position: relative; left: -22px;"><img src="https://gdd.gradido.net/img/brand/green.png" width="200" alt="Gradido-Akademie Logo"></div><br>Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
         )
       })
     })
@@ -194,7 +194,7 @@ describe('sendEmailVariants', () => {
         expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
         expect(result.originalMessage.html).toContain('—————')
         expect(result.originalMessage.html).toContain(
-          'Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
+          '<div style="position: relative; left: -22px;"><img src="https://gdd.gradido.net/img/brand/green.png" width="200" alt="Gradido-Akademie Logo"></div><br>Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
         )
       })
     })
@@ -274,7 +274,7 @@ describe('sendEmailVariants', () => {
         expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
         expect(result.originalMessage.html).toContain('—————')
         expect(result.originalMessage.html).toContain(
-          'Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
+          '<div style="position: relative; left: -22px;"><img src="https://gdd.gradido.net/img/brand/green.png" width="200" alt="Gradido-Akademie Logo"></div><br>Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
         )
       })
     })
@@ -352,7 +352,7 @@ describe('sendEmailVariants', () => {
         expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
         expect(result.originalMessage.html).toContain('—————')
         expect(result.originalMessage.html).toContain(
-          'Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
+          '<div style="position: relative; left: -22px;"><img src="https://gdd.gradido.net/img/brand/green.png" width="200" alt="Gradido-Akademie Logo"></div><br>Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
         )
       })
     })
@@ -430,7 +430,7 @@ describe('sendEmailVariants', () => {
         expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
         expect(result.originalMessage.html).toContain('—————')
         expect(result.originalMessage.html).toContain(
-          'Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
+          '<div style="position: relative; left: -22px;"><img src="https://gdd.gradido.net/img/brand/green.png" width="200" alt="Gradido-Akademie Logo"></div><br>Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
         )
       })
     })
@@ -508,7 +508,7 @@ describe('sendEmailVariants', () => {
         expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
         expect(result.originalMessage.html).toContain('—————')
         expect(result.originalMessage.html).toContain(
-          'Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
+          '<div style="position: relative; left: -22px;"><img src="https://gdd.gradido.net/img/brand/green.png" width="200" alt="Gradido-Akademie Logo"></div><br>Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
         )
       })
     })
@@ -589,7 +589,7 @@ describe('sendEmailVariants', () => {
         expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
         expect(result.originalMessage.html).toContain('—————')
         expect(result.originalMessage.html).toContain(
-          'Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
+          '<div style="position: relative; left: -22px;"><img src="https://gdd.gradido.net/img/brand/green.png" width="200" alt="Gradido-Akademie Logo"></div><br>Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
         )
       })
     })
@@ -666,7 +666,7 @@ describe('sendEmailVariants', () => {
         expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
         expect(result.originalMessage.html).toContain('—————')
         expect(result.originalMessage.html).toContain(
-          'Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
+          '<div style="position: relative; left: -22px;"><img src="https://gdd.gradido.net/img/brand/green.png" width="200" alt="Gradido-Akademie Logo"></div><br>Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
         )
       })
     })

From a60bbc20477b9a31e1d305836151a236195e78bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 22 Dec 2022 13:54:27 +0100
Subject: [PATCH 15/15] Update backend/src/locales/de.json

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 backend/src/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json
index 2a90e41d4..2e6796794 100644
--- a/backend/src/locales/de.json
+++ b/backend/src/locales/de.json
@@ -14,7 +14,7 @@
     "accountMultiRegistration": {
       "emailExists": "Es existiert jedoch zu deiner E-Mail-Adresse schon ein Konto.",
       "emailReused": "deine E-Mail-Adresse wurde soeben erneut benutzt, um bei Gradido ein Konto zu registrieren.",
-      "ifYouAreNotTheOne": "Wenn du nicht derjenige bist, der versucht hat sich erneut zu registrieren, wende dich bitte an unseren support:",
+      "ifYouAreNotTheOne": "Wenn du nicht derjenige bist, der versucht hat sich erneut zu registrieren, wende dich bitte an unseren Support:",
       "onForgottenPasswordClickLink": "Klicke bitte auf den folgenden Link, falls du dein Passwort vergessen haben solltest:",
       "onForgottenPasswordCopyLink": "oder kopiere den obigen Link in dein Browserfenster.",
       "subject": "Gradido: Erneuter Registrierungsversuch mit deiner E-Mail"