Updated/New Composer support for Mail

See diff for full changes