Message issue workaround

Is it okay if I check in a workaround for issue #103?

It's kinda causing me issues every time I sync up as it overwrites my local bodge.