Modified EditMessage with new validator, fixed #26