Also some cleanup. Work on issue #41.
This avoids unnecessary duplication of code for "avatar", "sender" etc in the general layout of messages.