2 files changed, 13 insertions, 0 deletions

diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts
index ebad43650..fe5668881 100644
--- a/server/lib/emailer.ts
+++ b/server/lib/emailer.ts
@@ -141,6 +141,12 @@ class Emailer {
 
     const email = new Email({
       send: true,
+      htmlToText: {
+        selectors: [
+          { selector: 'img', format: 'skip' },
+          { selector: 'a', options: { ignoreHref: true } }
+        ]
+      },
       message: {
         from: `"${fromDisplayName}" <${CONFIG.SMTP.FROM_ADDRESS}>`
       },
diff --git a/server/tests/api/server/contact-form.ts b/server/tests/api/server/contact-form.ts
index f3facb04a..4f01f6fd5 100644
--- a/server/tests/api/server/contact-form.ts
+++ b/server/tests/api/server/contact-form.ts
@@ -61,6 +61,13 @@ describe('Test contact form', function () {
     expect(email['text']).contains('my super message')
   })
 
+  it('Should not have duplicated email adress in text message', async function () {
+    const text = emails[0]['text'] as string
+
+    const matches = text.match(/toto@example.com/g)
+    expect(matches).to.have.lengthOf(1)
+  })
+
   it('Should not be able to send another contact form because of the anti spam checker', async function () {
     this.timeout(10000)