Ask @lightsofapollo to review this modification in the 'email' app.