Correct form layout in message form (fixes #439)