Fix and improve part 1

Fixes chat icon not appearing in conversation and archive view. Slightly
improved threading (seriously? it was so obvious?).