Some dead code removed
Initial implementation for message thread online updating
Merge remote-tracking branch 'origin/master'