Shobiz: More work on email templates