Fixed regex on messages, also fixed whitespace issue