Fixed message form makeup
Merge head