Email templates has been improved #18178215690454