incorporate received= escaping fixes