messages, updates for 24.4