Message Class Fixed

Message class maintained same in both client and server