[message] fix XoopsX/legacy#60
Merge branch 'master' into 2.3