#632 Better handling of messages in ExternalApiService