Follow up on r42980. Register message and fix alignment.