More informative "message truncated" text that tells users what to do to
view the full message.
resolve merge conflict
Merge pull request #534 from Atheros1/master

More informative "message truncated" text