correct TbMessage Model Fields