Merge pull request #423 from jdgleaver/set-message-ext