More improvement on the theme
* Still need to fix padding / margin for received messages