added possibility for 'extras' in message, prefixed with 'X-'