Wrap messages correctly
Merge pull request #2 from blob8108/wrap-em-right

Wrap messages correctly