Fix plaintext messaging