Merge "Fixing decryption messaging"