Locally encrypted messages no longer show as ciphertext notifications.
Minor refactoring