New email models

Fixes #38