Email Record: The big fix :