From ecbb144ee4419b6644f726429da24c2a7cf615e6 Mon Sep 17 00:00:00 2001
From: Navjot <navjot.g@cisinlabs.com>
Date: Fri, 23 Aug 2019 15:56:35 +0530
Subject: [PATCH] fixed issues

---
 src/bitmessagekivy/main.kv   | 2 +-
 src/bitmessagekivy/mpybit.py | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/bitmessagekivy/main.kv b/src/bitmessagekivy/main.kv
index 29dc2691..08847957 100644
--- a/src/bitmessagekivy/main.kv
+++ b/src/bitmessagekivy/main.kv
@@ -828,7 +828,7 @@ NavigationLayout:
                 MDRaisedButton:
                     size_hint: 1, None
                     height: dp(40)
-                    on_press: root.inbox_reply() if root.page_type == 'inbox' else root.copy_sent_mail() if root.page_type == 'sent' else root.write_msg()
+                    on_press: root.inbox_reply() if root.page_type == 'inbox' else root.copy_sent_mail() if root.page_type == 'sent' else root.write_msg(app)
                     MDLabel:
                         font_style: 'Title'
                         text: 'Reply' if root.page_type == 'inbox' else 'Copy' if root.page_type == 'sent' else 'Write'
diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py
index 11f65e78..a0983585 100644
--- a/src/bitmessagekivy/mpybit.py
+++ b/src/bitmessagekivy/mpybit.py
@@ -494,7 +494,8 @@ class DropDownWidget(BoxLayout):
                                 state.send_draft_mail))
                         self.parent.parent.screens[15].clear_widgets()
                         self.parent.parent.screens[15].add_widget(Draft())
-                        state.detailPageType = 'draft'
+                        state.detailPageType = ''
+                        state.send_draft_mail = None
                     else:
                         from addresses import addBMIfNotPresent
                         toAddress = addBMIfNotPresent(toAddress)
@@ -1139,6 +1140,7 @@ class NavigateApp(App):
         composer_obj.btn.text = 'Select'
         composer_obj.txt_input.text = ''
         composer_obj.subject.text = ''
+        composer_obj.body.text = ''
 
     def back_press(self):
         """Method used for going back from composer to previous page."""
@@ -1150,6 +1152,7 @@ class NavigateApp(App):
         self.root.ids.scr_mngr.transition.direction = 'right'
         self.root.ids.scr_mngr.transition.bind(on_complete=self.reset)
         self.add_search_bar()
+        state.detailPageType = ''
 
     @staticmethod
     def on_stop():
@@ -1457,7 +1460,7 @@ class MailDetail(Screen):
         """Method used for copying sent mail to the composer."""
         pass
 
-    def write_msg(self):
+    def write_msg(self, navApp):
         """Method used to write on draft mail."""
         state.send_draft_mail = state.sentMailTime
         composer_ids = \
@@ -1469,6 +1472,7 @@ class MailDetail(Screen):
             if self.subject == '(no subject)' else self.subject.lower()
         composer_ids.body.text = self.message
         self.parent.parent.current = 'create'
+        navApp.clear_composer()
 
 
 class MyaddDetailPopup(Popup):