Fix verify message structure to conform to spec

Spec says that `request_origin` and `contents` should be inside the message.message object but it was outside. This fixes that.

plus various trailing whitespace issues apparently :smile: