Email Record: Reworking class /