From cc27639fca0dcb3a5ff9fceef8666dbbf047adaa Mon Sep 17 00:00:00 2001
From: Manos Pitsidianakis <manos@pitsidianak.is>
Date: Fri, 19 May 2023 09:21:11 +0300
Subject: [PATCH] melib/email/compose: use Envelope attachments when editing
 and don't add already existing headers

---
 melib/src/email/compose.rs | 40 +++++++++++++++++++++++++-------------
 src/conf.rs                |  6 ++++--
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/melib/src/email/compose.rs b/melib/src/email/compose.rs
index c89d41ad..80c85ac2 100644
--- a/melib/src/email/compose.rs
+++ b/melib/src/email/compose.rs
@@ -111,7 +111,9 @@ impl Draft {
             ret.headers.insert(k.try_into()?, v.into());
         }
 
-        ret.body = envelope.body_bytes(bytes).text();
+        let body = envelope.body_bytes(bytes);
+        ret.body = body.text();
+        ret.attachments = body.attachments().into_iter().map(Into::into).collect();
 
         Ok(ret)
     }
@@ -292,8 +294,13 @@ impl Draft {
 
     pub fn finalise(mut self) -> Result<String> {
         let mut ret = String::new();
+        let has_from: bool = self.headers.contains_key("From");
+        let has_msg_id: bool = self.headers.contains_key("Message-ID");
+        let has_mime: bool = self.headers.contains_key("MIME-Version");
+        let has_ctype: bool = self.headers.contains_key("Content-Type");
+        let has_cte: bool = self.headers.contains_key("Content-Transfer-Encoding");
 
-        if self.headers.contains_key("From") && !self.headers.contains_key("Message-ID") {
+        if has_from && !has_msg_id {
             if let Ok((_, addr)) = super::parser::address::mailbox(self.headers["From"].as_bytes())
             {
                 if let Some(fqdn) = addr.get_fqdn() {
@@ -311,19 +318,26 @@ impl Draft {
                 ret.push_str(&format!("{}: {}\r\n", k, mime::encode_header(v)));
             }
         }
-        ret.push_str("MIME-Version: 1.0\r\n");
+        if !has_mime {
+            ret.push_str("MIME-Version: 1.0\r\n");
+        }
 
         if self.attachments.is_empty() {
-            let content_type: ContentType = Default::default();
-            let content_transfer_encoding: ContentTransferEncoding = ContentTransferEncoding::_8Bit;
-            ret.push_str(&format!(
-                "Content-Type: {}; charset=\"utf-8\"\r\n",
-                content_type
-            ));
-            ret.push_str(&format!(
-                "Content-Transfer-Encoding: {}\r\n",
-                content_transfer_encoding
-            ));
+            if !has_ctype {
+                let content_type: ContentType = Default::default();
+                let content_transfer_encoding: ContentTransferEncoding =
+                    ContentTransferEncoding::_8Bit;
+                ret.push_str(&format!(
+                    "Content-Type: {}; charset=\"utf-8\"\r\n",
+                    content_type
+                ));
+                if !has_cte {
+                    ret.push_str(&format!(
+                        "Content-Transfer-Encoding: {}\r\n",
+                        content_transfer_encoding
+                    ));
+                }
+            }
             ret.push_str("\r\n");
             for line in self.body.lines() {
                 ret.push_str(line);
diff --git a/src/conf.rs b/src/conf.rs
index d217b271..b06f678a 100644
--- a/src/conf.rs
+++ b/src/conf.rs
@@ -356,9 +356,11 @@ changequote(`"', `"')dnl
         {
             Ok(handle) => handle,
             Err(error) => match error.kind() {
-                io::ErrorKind::NotFound => return Err("`m4` executable not found. Please install.".into()),
+                io::ErrorKind::NotFound => {
+                    return Err("`m4` executable not found. Please install.".into())
+                }
                 _ => return Err(error.into()),
-            }
+            },
         };
 
         let mut stdin = handle.stdin.take().unwrap();