reordered messages
Merge pull request #269 from rwarbelow/messages

reordered messages