purifies the message system
Merge pull request #130 from way2muchnoise/1.7-update

purifies the message system