Added support for message > picture