Small refactoring.
Increased message header size to 5.