Pimp the email event a bit