Email Record: The new friend fix