Avoid loading a random draft on new message

2 files changed, 6 insertions, 2 deletions

diff --git a/components/kube/contents/ui/ComposerView.qml b/components/kube/contents/ui/ComposerView.qml
index 8af5fc42..576a1590 100644
--- a/components/kube/contents/ui/ComposerView.qml
+++ b/components/kube/contents/ui/ComposerView.qml
@@ -47,6 +47,7 @@ Kube.View {
         if (message) {
             composerController.loadMessage(message, loadAsDraft)
         } else if (newMessage) {
+            composerController.clear()
             subject.forceActiveFocus()
         }
     }
@@ -54,6 +55,7 @@ Kube.View {
     function closeFirstSplitIfNecessary() {
         //Move the view forward
         if (root.currentIndex == 0) {
+            listView.currentIndex = -1
             root.incrementCurrentIndex()
         }
     }
@@ -126,7 +128,9 @@ Kube.View {
                 //END keyboard nav
 
                 onCurrentItemChanged: {
-                    root.loadMessage(currentItem.currentData.domainObject, true)
+                    if (currentItem) {
+                        root.loadMessage(currentItem.currentData.domainObject, true)
+                    }
                 }
 
                 model: Kube.MailListModel {
diff --git a/components/kube/contents/ui/Kube.qml b/components/kube/contents/ui/Kube.qml
index 92f12f6c..11c63a8a 100644
--- a/components/kube/contents/ui/Kube.qml
+++ b/components/kube/contents/ui/Kube.qml
@@ -122,7 +122,7 @@ Controls2.ApplicationWindow {
 
                 Kube.IconButton {
                     iconName: Kube.Icons.edit_inverted
-                    onClicked: kubeViews.openComposer()
+                    onClicked: kubeViews.openComposer(false)
                 }
 
                 Kube.IconButton {