Fixes for video and rich-content attachment support