Make return messages' sender field more consistent