2 files changed, 20 insertions, 1 deletions

diff --git a/framework/domain/messageparser.h b/framework/domain/messageparser.h
index 036cff7d..aeeed93c 100644
--- a/framework/domain/messageparser.h
+++ b/framework/domain/messageparser.h
@@ -113,7 +113,9 @@ public:
         ContentsRole,
         ContentRole,
         IsEmbededRole,
-        SecurityLevelRole
+        SecurityLevelRole,
+        EncryptionErrorType,
+        EncryptionErrorString
     };
 
     QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
diff --git a/framework/domain/messageparser_new.cpp b/framework/domain/messageparser_new.cpp
index 8afd5956..b95a6472 100644
--- a/framework/domain/messageparser_new.cpp
+++ b/framework/domain/messageparser_new.cpp
@@ -306,6 +306,8 @@ QHash<int, QByteArray> NewModel::roleNames() const
     roles[ContentRole] = "content";
     roles[IsEmbededRole] = "embeded";
     roles[SecurityLevelRole] = "securityLevel";
+    roles[EncryptionErrorType] = "errorType";
+    roles[EncryptionErrorString] = "errorString";
     return roles;
 }
 
@@ -374,6 +376,21 @@ QVariant NewModel::data(const QModelIndex &index, int role) const
                 return QStringLiteral("GREEN");
             case IsEmbededRole:
                 return data(index.parent(), IsEmbededRole);
+            case EncryptionErrorType:
+                {
+                    switch(encryption->errorType()) {
+                    case Encryption::NoError:
+                        return QString();
+                    case Encryption::PassphraseError:
+                        return QStringLiteral("PassphraseError");
+                    case Encryption::KeyMissing:
+                        return QStringLiteral("KeyMissing");
+                    default:
+                        return QStringLiteral("UnknownError");
+                    }
+                }
+            case EncryptionErrorString:
+                return encryption->errorString();
             }
         } else if (_data->userType() ==  qMetaTypeId<Part *>()) {
             const auto part = _data->value<Part *>();