[PR #1229] [MERGED] Email fixes #7861

New Issue

Closed

opened 2026-04-16 12:09:14 -05:00 by GiteaMirror · 0 comments

GiteaMirror commented 2026-04-16 12:09:14 -05:00

Owner

Copy Link

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/1229
Author: @BlackDex
Created: 11/18/2020
Status: ✅ Merged
Merged: 11/18/2020
Merged by: @dani-garcia

Base: master ← Head: email-fixes

---

📝 Commits (3)

• 58a9285 Updated admin settings page.
• 3fed323 Fixed plain/text email format
• 6faaeaa Updated email processing.

📊 Changes

20 files changed (+237 additions, -148 deletions)

View changed files

📝 .env.template (+19 -3)
📝 Cargo.lock (+42 -30)
📝 Cargo.toml (+1 -1)
📝 src/config.rs (+18 -12)
📝 src/mail.rs (+22 -9)
📝 src/main.rs (+10 -0)
📝 src/static/templates/admin/settings.hbs (+41 -6)
📝 src/static/templates/email/change_email.hbs (+6 -4)
📝 src/static/templates/email/delete_account.hbs (+8 -10)
📝 src/static/templates/email/invite_accepted.hbs (+5 -6)
📝 src/static/templates/email/invite_confirmed.hbs (+5 -6)
📝 src/static/templates/email/new_device_logged_in.hbs (+8 -10)
📝 src/static/templates/email/pw_hint_none.hbs (+4 -1)
📝 src/static/templates/email/pw_hint_some.hbs (+6 -3)
📝 src/static/templates/email/send_org_invite.hbs (+10 -10)
📝 src/static/templates/email/smtp_test.hbs (+6 -6)
📝 src/static/templates/email/twofactor_email.hbs (+5 -6)
📝 src/static/templates/email/verify_email.hbs (+7 -9)
📝 src/static/templates/email/welcome.hbs (+6 -6)
📝 src/static/templates/email/welcome_must_verify.hbs (+8 -10)

📄 Description

Updated email processing.

• Added an option to enable smtp debugging via SMTP_DEBUG. This will trigger a trace of the smtp commands sent/received to/from the mail server. Useful when troubleshooting.
• Added two options to ignore invalid certificates which either do not match at all, or only doesn't match the hostname. ( fixes #1077 )
• Added Message-ID Header, which triggered spamfilters when absent. ( fixes #1207 )
• Updated lettre to the latest alpha.4 version.

Fixed plain/text email format

plain/text emails should not contain html elements like

etc..
This triggers some spamfilters and increases the spam score.

Also added the github link into the text only emails since this also triggers spamfilters to increase the score since the url/link count is different between the multipart messages.

Tested by using https://www.mail-tester.com/ to validate the spamscore. (Including the missing Message-ID Header mentioned above)

Updated admin settings page.

• Added check if settings are changed but not saved when sending test email.
• Added some styling to emphasize some risks settings.
• Fixed alignment of elements when the label has multiple lines.

---

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/dani-garcia/vaultwarden/pull/1229 **Author:** [@BlackDex](https://github.com/BlackDex) **Created:** 11/18/2020 **Status:** ✅ Merged **Merged:** 11/18/2020 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `master` ← **Head:** `email-fixes` --- ### 📝 Commits (3) - [`58a9285`](https://github.com/dani-garcia/vaultwarden/commit/58a928547d2f9ef99817f475da5cf65e461d98ea) Updated admin settings page. - [`3fed323`](https://github.com/dani-garcia/vaultwarden/commit/3fed323385356c429e4e40030bd316047d27f5a1) Fixed plain/text email format - [`6faaeaa`](https://github.com/dani-garcia/vaultwarden/commit/6faaeaae6649ddfa9a1b4b424a27e6792b1f90b3) Updated email processing. ### 📊 Changes **20 files changed** (+237 additions, -148 deletions) <details> <summary>View changed files</summary> 📝 `.env.template` (+19 -3) 📝 `Cargo.lock` (+42 -30) 📝 `Cargo.toml` (+1 -1) 📝 `src/config.rs` (+18 -12) 📝 `src/mail.rs` (+22 -9) 📝 `src/main.rs` (+10 -0) 📝 `src/static/templates/admin/settings.hbs` (+41 -6) 📝 `src/static/templates/email/change_email.hbs` (+6 -4) 📝 `src/static/templates/email/delete_account.hbs` (+8 -10) 📝 `src/static/templates/email/invite_accepted.hbs` (+5 -6) 📝 `src/static/templates/email/invite_confirmed.hbs` (+5 -6) 📝 `src/static/templates/email/new_device_logged_in.hbs` (+8 -10) 📝 `src/static/templates/email/pw_hint_none.hbs` (+4 -1) 📝 `src/static/templates/email/pw_hint_some.hbs` (+6 -3) 📝 `src/static/templates/email/send_org_invite.hbs` (+10 -10) 📝 `src/static/templates/email/smtp_test.hbs` (+6 -6) 📝 `src/static/templates/email/twofactor_email.hbs` (+5 -6) 📝 `src/static/templates/email/verify_email.hbs` (+7 -9) 📝 `src/static/templates/email/welcome.hbs` (+6 -6) 📝 `src/static/templates/email/welcome_must_verify.hbs` (+8 -10) </details> ### 📄 Description ### Updated email processing. - Added an option to enable smtp debugging via SMTP_DEBUG. This will trigger a trace of the smtp commands sent/received to/from the mail server. Useful when troubleshooting. - Added two options to ignore invalid certificates which either do not match at all, or only doesn't match the hostname. ( fixes #1077 ) - Added Message-ID Header, which triggered spamfilters when absent. ( fixes #1207 ) - Updated lettre to the latest alpha.4 version. ### Fixed plain/text email format plain/text emails should not contain html elements like <p> <a> etc.. This triggers some spamfilters and increases the spam score. Also added the github link into the text only emails since this also triggers spamfilters to increase the score since the url/link count is different between the multipart messages. Tested by using https://www.mail-tester.com/ to validate the spamscore. (Including the missing Message-ID Header mentioned above) ### Updated admin settings page. - Added check if settings are changed but not saved when sending test email. - Added some styling to emphasize some risks settings. - Fixed alignment of elements when the label has multiple lines. --- _{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

GiteaMirror added the pull-request label 2026-04-16 12:09:14 -05:00

GiteaMirror closed this issue 2026-04-16 12:09:15 -05:00

Sign in to join this conversation.

No Branch/Tag Specified

Branches Tags

main

revert-7033-patch-1

cached-config-operations

test_dylint

1.36.0

1.35.8

1.35.7

1.35.6

1.35.5

1.35.4

1.35.3

1.35.2

1.35.1

1.35.0

1.34.3

1.34.2

1.34.1

1.34.0

1.33.2

1.33.1

1.33.0

1.32.7

1.32.6

1.32.5

1.32.4

1.32.3

1.32.2

1.32.1

1.32.0

1.31.0

1.30.5

1.30.4

1.30.3

1.30.2

1.30.1

1.30.0

1.29.2

1.29.1

1.29.0

1.28.1

1.28.0

1.27.0

1.26.0

1.25.2

1.25.1

1.25.0

1.24.0

1.23.1

1.23.0

1.22.2

1.22.1

1.22.0

1.21.0

1.20.0

1.19.0

1.18.0

1.17.0

1.16.3

1.16.2

1.16.1

1.16.0

1.15.1

1.15.0

1.14.2

1.14.1

1.14

1.13.1

1.13.0

1.12.0

1.11.0

1.10.0

1.9.1

1.9.0

1.8.0

1.7.0

1.6.1

1.6.0

1.5.0

1.4.0

1.3.0

1.2.0

1.1.0

1.0.0

0.13.0

0.12.0

0.11.0

0.10.0

0.9.0

Labels

Clear labels

better for forum

bug

documentation

duplicate

enhancement

future Vault

good first issue

help wanted

low priority

notes

pull-request

Mirrored from GitHub Pull Request

question

SSO

Third party

troubleshooting

wontfix

No Label pull-request

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

GiteaMirror ninjasurge

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/vaultwarden#7861