Feature/emails by id not object