bug-710285-message-type-normal.diff