Added the workarounds to correctly display text-only messages. Encrypted and non-encrypted