Changes in message and thread logic