Added some extra functionality to the Message class