Prevent original message buffer from being modified
Merge pull request #389 from smfreegard/master

Prevent original message buffer from being modified