Use the new email mixin rather than an inline implementation of self.mail