changed Message control for a far less buggy one ;)