2 files changed, 32 insertions, 12 deletions

diff --git a/components/kube/contents/ui/AddresseeListEditor.qml b/components/kube/contents/ui/AddresseeListEditor.qml
index adb2f785..91431b1e 100644
--- a/components/kube/contents/ui/AddresseeListEditor.qml
+++ b/components/kube/contents/ui/AddresseeListEditor.qml
@@ -52,21 +52,37 @@ FocusScope {
                 height: Kube.Units.gridUnit + Kube.Units.smallSpacing * 2 //smallSpacing for padding
                 width: parent.width
                 color: Kube.Colors.buttonColor
-                Kube.Label {
+                Row {
                     anchors {
                         top: parent.top
+                        bottom: parent.bottom
                         left: parent.left
-                        right: button.left
+                        right: removeButton.left
                         margins: Kube.Units.smallSpacing
                     }
-                    text: display
-                    elide: Text.ElideRight
+                    spacing: Kube.Units.smallSpacing
+                    Kube.Label {
+                        id: label
+                        anchors {
+                            top: parent.top
+                        }
+                        text: model.addresseeName
+                        elide: Text.ElideRight
+                    }
+                    Kube.Icon {
+                        anchors {
+                            top: parent.top
+                        }
+                        height: Kube.Units.gridUnit
+                        width: height
+                        iconName: model.keyFound ? Kube.Icons.secure: Kube.Icons.insecure
+                    }
                 }
                 Kube.IconButton {
-                    id: button
+                    id: removeButton
                     anchors {
-                        verticalCenter: parent.verticalCenter
                         right: parent.right
+                        verticalCenter: parent.verticalCenter
                         margins: Kube.Units.smallSpacing
                     }
                     height: Kube.Units.gridUnit
diff --git a/components/kube/contents/ui/ComposerView.qml b/components/kube/contents/ui/ComposerView.qml
index a4796932..29141f28 100644
--- a/components/kube/contents/ui/ComposerView.qml
+++ b/components/kube/contents/ui/ComposerView.qml
@@ -42,6 +42,8 @@ Kube.View {
         Kube.ComposerController {
             id: composerController
             htmlBody: html.checked
+            sign: signCheckbox.checked
+            encrypt: encryptCheckbox.checked
             onDone: Kube.Fabric.postMessage(Kube.Messages.componentDone, {})
         }
     ]
@@ -443,18 +445,20 @@ Kube.View {
             }
 
             RowLayout {
-                //FIXME: hide until it does something
-                visible: false
-                Kube.CheckBox {}
+                Kube.CheckBox {
+                    id: encryptCheckbox
+                    checked: composerController.encrypt
+                }
                 Kube.Label {
                     text: qsTr("encrypt")
                 }
             }
 
             RowLayout {
-                //FIXME: hide until it does something
-                visible: false
-                Kube.CheckBox {}
+                Kube.CheckBox {
+                    id: signCheckbox
+                    checked: composerController.sign
+                }
                 Kube.Label {
                     text: qsTr("sign")
                 }