Some more email fixes #36