Backport "Hide avatar" from CM10.1

Hide the avatar in the conversations list screen
for a more descriptive feel. Can be enhanced to
messages screen later.

PS 2 : Reoder Settings a bit

Originally author: mnm9994u
Backported from CM10.1 by: Daveee10