More work on new messages