Issue #70 - preparations for templated emails