Support the removal of drafts.

2 files changed, 27 insertions, 1 deletions

diff --git a/components/kube/contents/ui/ComposerView.qml b/components/kube/contents/ui/ComposerView.qml
index 7bc3b061..cfc0e392 100644
--- a/components/kube/contents/ui/ComposerView.qml
+++ b/components/kube/contents/ui/ComposerView.qml
@@ -167,6 +167,8 @@ Kube.View {
 
                             PropertyChanges {target: background; color: Kube.Colors.highlightColor; opacity: 0.6}
                             PropertyChanges {target: subject; color: Kube.Colors.highlightedTextColor}
+                            PropertyChanges {target: date; visible: false}
+                            PropertyChanges {target: buttons; visible: true}
                         }
                         ]
 
@@ -218,6 +220,29 @@ Kube.View {
                                 font.pointSize: 9
                             }
                         }
+                        Row {
+                            id: buttons
+
+                            property bool containsMouse: deleteButton.hovered
+
+                            anchors {
+                                right: parent.right
+                                bottom: parent.bottom
+                                margins: Kube.Units.smallSpacing
+                            }
+
+                            visible: false
+                            spacing: Kube.Units.smallSpacing
+                            opacity: 0.7
+
+                            Kube.IconButton {
+                                id: deleteButton
+                                iconName: Kube.Icons.moveToTrash
+                                visible: enabled
+                                enabled: !!model.mail
+                                onClicked: Kube.Fabric.postMessage(Kube.Messages.moveToTrash, {"mail": model.mail})
+                            }
+                        }
                     }
                 }
             }
diff --git a/framework/src/domain/maillistmodel.cpp b/framework/src/domain/maillistmodel.cpp
index 97c37384..fa0dda04 100644
--- a/framework/src/domain/maillistmodel.cpp
+++ b/framework/src/domain/maillistmodel.cpp
@@ -310,8 +310,9 @@ void MailListModel::setShowDrafts(bool)
 {
     using namespace Sink::ApplicationDomain;
     Sink::Query query;
-    // query.setFlags(Sink::Query::LiveQuery | Sink::Query::UpdateStatus);
+    query.setFlags(Sink::Query::LiveQuery);
     query.filter<Mail::Draft>(true);
+    query.filter<Mail::Trash>(false);
     query.request<Mail::Subject>();
     query.request<Mail::Sender>();
     query.request<Mail::To>();