Manually merged MessageCompose.java
Added tweaks to display decrypted content accordingly...
Added the workarounds to correctly display text-only messages. Encrypted and non-encrypted