Improve OWA messages