fixed all messages bug