Consistent message ordering - fixes 126

Fixes #126.
It's... not the best code.