Changes:
Modified the model approach for text and media messages
Added a short icon besides avatar