MSINM-84: More work on message editor