Revert "Hide avatar"

This reverts commit d4cdb4039b93868620f50d1345ea7ee7ab8151eb.

Conflicts:
	res/values/cr_strings.xml
Revert "Add font size to Message threads"

This reverts commit e7435c1d1ac3441c11f6b94fc00f28dccb5b2c73.

Conflicts:
	res/values/cr_strings.xml