Email Record: Cupcake fix