Fixed Message Content Issue