Merge pull request #875 from arrbee/fix-message-prettify-length-check Fix message prettify length check