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

This reverts commit 538e2ae1a3556b881ccfac7ea9d64b860e77fd01.
Revert "Added tweaks to display decrypted content accordingly..."

This reverts commit 9822048eafac3cf5cb270b2e3df5cad313f3a79b.
Revert "Manually merged MessageCompose.java"

This reverts commit 70ea87c82eac304274a70c0a845e5703677f7734.