Mail working and model references reverted to old