Messages bugfixes and features