6576-Update_with_upstream_6.503

Description

Fix update with upstream v6.503 merge conflict

Screenshots

Technical details

Tests

Check mail basic functionality works or not

Issues

• e/backlog#6576 (closed)

10 commandments of code reviews

👪 ❤ https://gitlab.e.foundation/internal/wiki/-/wikis/development/code-review