Resolve "Improve the composition of the email client" Closes #221 and #260 See merge request inject/frontend!193