From cd7cecca6e71317a7f0b3b6678f24e15c98d5e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Wed, 20 Dec 2023 14:55:09 +0100
Subject: [PATCH] fix message send save copy

---
 Cargo.lock                                 |  4 ++--
 Cargo.toml                                 |  2 +-
 config.sample.toml                         |  3 +++
 src/email/message/command/send.rs          | 10 +---------
 src/email/message/template/command/send.rs | 11 +----------
 5 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 574a052..cbd4f06 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1216,9 +1216,9 @@ dependencies = [
 
 [[package]]
 name = "email-lib"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da9ffadf48ca05751f693d3a81a224b61b740699ffa2dd013a0f0ffc4529a01"
+checksum = "f1f878a2c5b35497a8c0560053a30e9acccdb3ee91f399f742517c69c7616172"
 dependencies = [
  "advisory-lock",
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index 3f16833..c46adc7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,7 +50,7 @@ clap_mangen = "0.2"
 console = "0.15.2"
 dialoguer = "0.10.2"
 dirs = "4.0"
-email-lib = { version = "=0.18.1", default-features = false }
+email-lib = { version = "=0.18.2", default-features = false }
 email_address = "0.2.4"
 env_logger = "0.8"
 erased-serde = "0.3"
diff --git a/config.sample.toml b/config.sample.toml
index 114d515..78fa0a4 100644
--- a/config.sample.toml
+++ b/config.sample.toml
@@ -54,6 +54,9 @@ envelope.watch.received.notify.body = "{subject}"
 # Override the backend used for sending messages.
 message.send.backend = "smtp"
 
+# Save a copy of sent messages to the sent folder.
+message.send.save-copy = true
+
 # IMAP config
 imap.host = "localhost"
 imap.port = 3143
diff --git a/src/email/message/command/send.rs b/src/email/message/command/send.rs
index 5c06bea..9041854 100644
--- a/src/email/message/command/send.rs
+++ b/src/email/message/command/send.rs
@@ -1,6 +1,5 @@
 use anyhow::Result;
 use clap::Parser;
-use email::{flag::Flag, folder::SENT};
 use log::info;
 use std::io::{self, BufRead, IsTerminal};
 
@@ -49,13 +48,6 @@ impl MessageSendCommand {
 
         backend.send_raw_message(msg.as_bytes()).await?;
 
-        if account_config.should_save_copy_sent_message() {
-            backend
-                .add_raw_message_with_flag(SENT, msg.as_bytes(), Flag::Seen)
-                .await?;
-            printer.print("Message successfully sent and saved to the Sent folder!")
-        } else {
-            printer.print("Message successfully sent!")
-        }
+        printer.print("Message successfully sent!")
     }
 }
diff --git a/src/email/message/template/command/send.rs b/src/email/message/template/command/send.rs
index 91ae63a..0ae4ba5 100644
--- a/src/email/message/template/command/send.rs
+++ b/src/email/message/template/command/send.rs
@@ -1,6 +1,5 @@
 use anyhow::Result;
 use clap::Parser;
-use email::{flag::Flag, folder::SENT};
 use log::info;
 use mml::MmlCompilerBuilder;
 use std::io::{self, BufRead, IsTerminal};
@@ -60,14 +59,6 @@ impl TemplateSendCommand {
 
         backend.send_raw_message(&msg).await?;
 
-        if account_config.should_save_copy_sent_message() {
-            backend
-                .add_raw_message_with_flag(SENT, &msg, Flag::Seen)
-                .await?;
-
-            printer.print("Template successfully sent and saved to the Sent folder!")
-        } else {
-            printer.print("Template successfully sent!")
-        }
+        printer.print("Template successfully sent!")
     }
 }