Only inline images
Action messages. Still WIP
Merge branch 'ollieh-master'