melib: Re-implement JWZ threading algorithm

2 files changed, 7 insertions, 6 deletions

diff --git a/ui/src/types/accounts.rs b/ui/src/types/accounts.rs
index d60adf18..c2e9c63f 100644
--- a/ui/src/types/accounts.rs
+++ b/ui/src/types/accounts.rs
@@ -83,10 +83,10 @@ impl Account {
         let mailbox: &mut Mailbox = self.folders[idx].as_mut().unwrap().as_mut().unwrap();
         match kind {
             RefreshEventKind::Update(old_hash, envelope) => {
-                mailbox.update(old_hash, envelope);
+                mailbox.update(old_hash, *envelope);
             }
             RefreshEventKind::Create(envelope) => {
-                let env: &Envelope = mailbox.insert(envelope);
+                let env: &Envelope = mailbox.insert(*envelope);
                 let ref_folders: Vec<Folder> = self.backend.folders();
                 return Some(Notification(
                     Some("New mail".into()),
@@ -107,7 +107,7 @@ impl Account {
                 self.workers[idx] = Some(handle);
             }
         }
-        return None;
+        None
     }
     pub fn watch(&self, r: RefreshEventConsumer) -> () {
         self.backend.watch(r).unwrap();
@@ -212,7 +212,8 @@ impl Account {
         };
         let m = self.workers[index].take().unwrap().extract();
         self.workers[index] = None;
-        Ok(self.load_mailbox(index, m))
+        self.load_mailbox(index, m);
+        Ok(())
     }
 }
 
diff --git a/ui/src/types/mod.rs b/ui/src/types/mod.rs
index 29f908e3..2efe55cc 100644
--- a/ui/src/types/mod.rs
+++ b/ui/src/types/mod.rs
@@ -57,14 +57,14 @@ pub enum ThreadEvent {
     /// User input.
     Input(Key),
     /// A watched folder has been refreshed.
-    RefreshMailbox(RefreshEvent),
+    RefreshMailbox(Box<RefreshEvent>),
     UIEvent(UIEventType),
     //Decode { _ }, // For gpg2 signature check
 }
 
 impl From<RefreshEvent> for ThreadEvent {
     fn from(event: RefreshEvent) -> Self {
-        ThreadEvent::RefreshMailbox(event)
+        ThreadEvent::RefreshMailbox(Box::new(event))
     }
 }