more fixes about decrypted msg