From 63467a3c45ff07305bfca89340860b48f09c8600 Mon Sep 17 00:00:00 2001
From: Manos Pitsidianakis <el13635@mail.ntua.gr>
Date: Fri, 28 Feb 2020 09:18:31 +0200
Subject: [PATCH] Check ComponentId equality on Composer::kill()

---
 src/components/mail/compose.rs | 4 ++++
 src/components/mail/listing.rs | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/components/mail/compose.rs b/src/components/mail/compose.rs
index 910d1dbea..0fd3cbac6 100644
--- a/src/components/mail/compose.rs
+++ b/src/components/mail/compose.rs
@@ -1007,6 +1007,10 @@ impl Component for Composer {
     }
 
     fn kill(&mut self, uuid: Uuid, context: &mut Context) {
+        if self.id != uuid {
+            return;
+        }
+
         if !self.has_changes {
             context.replies.push_back(UIEvent::Action(Tab(Kill(uuid))));
             return;
diff --git a/src/components/mail/listing.rs b/src/components/mail/listing.rs
index 7ff6309a7..1e2c8474e 100644
--- a/src/components/mail/listing.rs
+++ b/src/components/mail/listing.rs
@@ -195,6 +195,7 @@ pub trait MailListingTrait: ListingTrait {
                 _ => unreachable!(),
             }
             self.row_updates().push(thread_hash);
+            self.set_dirty(true);
             drop(envelope);
         }
     }