Some fix in message.java