3 files changed, 13 insertions, 0 deletions

diff --git a/framework/qml/AttachmentDelegate.qml b/framework/qml/AttachmentDelegate.qml
index 3c308e65..4469cbdd 100644
--- a/framework/qml/AttachmentDelegate.qml
+++ b/framework/qml/AttachmentDelegate.qml
@@ -23,10 +23,12 @@ Item {
     id: root
 
     property string name
+    property string type
     property string icon
     property alias actionIcon: actionButton.iconName
     signal clicked;
     signal execute;
+    signal publicKeyImport;
 
     width: content.width + Kube.Units.smallSpacing * 1.5
     height: content.height + Kube.Units.smallSpacing
@@ -70,6 +72,14 @@ Item {
             color: Kube.Colors.backgroundColor
         }
         Kube.IconButton {
+            visible: root.type == "application/pgp-keys"
+            iconName: Kube.Icons.key_import_inverted
+            height: Kube.Units.gridUnit
+            width: height
+            onClicked: root.publicKeyImport()
+            padding: 0
+        }
+        Kube.IconButton {
             id: actionButton
             height: Kube.Units.gridUnit
             width: height
diff --git a/framework/qml/Icons.qml b/framework/qml/Icons.qml
index 2afe840e..4dfae3d7 100644
--- a/framework/qml/Icons.qml
+++ b/framework/qml/Icons.qml
@@ -63,6 +63,7 @@ Item {
     property string secure: "document-encrypt"
     property string insecure: "document-decrypt"
     property string signed: "document-sign"
+    property string key_import_inverted: "view-certificate-import-inverted"
 
     property string addNew: "list-add"
     property string remove: "kube-list-remove-inverted"
diff --git a/framework/qml/MailViewer.qml b/framework/qml/MailViewer.qml
index 565adedd..e9ffd108 100644
--- a/framework/qml/MailViewer.qml
+++ b/framework/qml/MailViewer.qml
@@ -283,6 +283,7 @@ Rectangle {
 
             delegate: AttachmentDelegate {
                 name: model.name
+                type: model.type
                 icon: model.iconName
 
                 clip: true
@@ -290,6 +291,7 @@ Rectangle {
                 actionIcon: Kube.Icons.save_inverted
                 onExecute: messageParser.attachments.saveAttachmentToDisk(messageParser.attachments.index(index, 0))
                 onClicked: messageParser.attachments.openAttachment(messageParser.attachments.index(index, 0))
+                onPublicKeyImport: messageParser.attachments.importPublicKey(messageParser.attachments.index(index, 0))
             }
         }
     }