From dc1a5e19c097cf5b9fa5a14141c3a83b12fb2bc6 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 20 Jul 2018 01:14:50 +0200
Subject: [PATCH] Improve message_id handling

---
 home-manager/packages/rust-scripts/src/mail.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/home-manager/packages/rust-scripts/src/mail.rs b/home-manager/packages/rust-scripts/src/mail.rs
index 949a24ad..c269bdf7 100644
--- a/home-manager/packages/rust-scripts/src/mail.rs
+++ b/home-manager/packages/rust-scripts/src/mail.rs
@@ -86,7 +86,9 @@ fn print_headers(mail: &mut MailEntry) -> Result<String> {
 fn get_message_id(mail: &mut MailEntry) -> Result<String> {
     for header in mail.headers()? {
         if header.get_key()?.to_lowercase().as_str() == "message-id" {
-            return Ok(header.get_value()?);
+            let message_id = header.get_value()?;
+            let message_id = message_id.trim().trim_matches(|x| x == '<' || x == '>');
+            return Ok(message_id.into());
         }
     }
     bail!("Parsed mail without Message-ID: {},", mail.id())
@@ -242,7 +244,6 @@ fn create_task(mail: &mut MailEntry) -> Result<Task> {
     let from = MAIL_REGEX.replace(&from, "");
     let from = from.trim_matches(|x: char| x.is_whitespace() || x == '"');
     let message_id = get_message_id(mail)?;
-    let message_id = message_id.trim().trim_matches(|x| x == '<' || x == '>');
     let mut t = TaskBuilder::default()
         .description(format!("Mail: {}: {}", from, subject))
         .build()