diff --git a/src/kmcommands.cpp b/src/kmcommands.cpp --- a/src/kmcommands.cpp +++ b/src/kmcommands.cpp @@ -1437,7 +1437,7 @@ const auto msg = item.payload(); bool wasEncrypted; auto decMsg = MailCommon::CryptoUtils::decryptMessage(msg, wasEncrypted); - if (!wasEncrypted) { + if (!decMsg || !wasEncrypted) { decMsg = msg; }