Show verified status with media icon

issue #1915
Merge remote-tracking branch 'upstream/master' into feature_inline_media
Merge pull request #365 from devrandom/feature_inline_media

Feature inline media