Fix huge regression when not displaying conversations
Merge remote-tracking branch 'brice/master' into cmaster
build