replace the current, text-only inline handling
Created attachment 350880 [details] Patch
Created attachment 352587 [details] Patch
Created attachment 352646 [details] Patch