[FEATURE]

Layout for emails

Fixes: #59599
Merge remote-tracking branch 'origin/develop' into develop