Bb 1891

Ready for deploy if mail template is ok.