2 files changed, 12 insertions, 5 deletions

diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.cpp b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
index 611a04c5..256b7588 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.cpp
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
@@ -696,7 +696,14 @@ static QString prettifyDN(const char *uid)
 
 void SignedMessagePart::sigStatusToMetaData(const Signature &signature)
 {
-    mMetaData.isGoodSignature = signature.status == GPG_ERR_NO_ERROR;
+    mMetaData.isGoodSignature = signature.status.errorCode() == GPG_ERR_NO_ERROR;
+    if (!mMetaData.isGoodSignature) {
+        if (signature.status.errorCode() == GPG_ERR_NO_PUBKEY) {
+            qWarning() << "No public key to verify signature.";
+        } else {
+            qWarning() << "Is no good signature" << signature.status;
+        }
+    }
     // save extended signature status flags
     auto summary = signature.summary;
     mMetaData.keyMissing = summary & GPGME_SIGSUM_KEY_MISSING;
diff --git a/framework/src/domain/mime/partmodel.cpp b/framework/src/domain/mime/partmodel.cpp
index bbafbc7c..ca8856fd 100644
--- a/framework/src/domain/mime/partmodel.cpp
+++ b/framework/src/domain/mime/partmodel.cpp
@@ -267,12 +267,12 @@ QVariant PartModel::data(const QModelIndex &index, int role) const
 
                 if (messageIsSigned) {
                     auto sigInfo = std::unique_ptr<SignatureInfo>{signatureInfo(messagePart)};
-                    if (!sigInfo->signatureIsGood || sigInfo->keyRevoked) {
+                    if (!sigInfo->signatureIsGood) {
+                        if (sigInfo->keyMissing || sigInfo->keyExpired) {
+                            return "notsogood";
+                        }
                         return "bad";
                     }
-                    if (sigInfo->keyMissing || sigInfo->keyExpired) {
-                        return "notsogood";
-                    }
                 }
                 //All good
                 if (messageIsSigned || messageIsEncrypted) {