Simplify how emails are handled