From 027b8726c60d0b1c24b0a01ea558dbf1508b443e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <soywod@users.noreply.github.com>
Date: Sun, 9 May 2021 13:14:37 +0200
Subject: [PATCH] fix missing attachment arg for reply and forward cmds (#109)

---
 CHANGELOG.md   | 6 ++++++
 src/msg/cli.rs | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e314da5..9ca264a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - `\Seen` flag when moving a message
+- Attachments arg for reply and forward commands [#109]
+
+### Changed
+
+- [**BREAKING**] Short version of reply `--all` arg is now `-A` to avoid conflicts with `--attachment|-a`
 
 ### Removed
 
@@ -260,6 +265,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#95]: https://github.com/soywod/himalaya/issues/95
 [#96]: https://github.com/soywod/himalaya/issues/96
 [#100]: https://github.com/soywod/himalaya/issues/100
+[#109]: https://github.com/soywod/himalaya/issues/109
 [#121]: https://github.com/soywod/himalaya/issues/121
 [#122]: https://github.com/soywod/himalaya/issues/122
 [#123]: https://github.com/soywod/himalaya/issues/123
diff --git a/src/msg/cli.rs b/src/msg/cli.rs
index bfd034c..3c5e225 100644
--- a/src/msg/cli.rs
+++ b/src/msg/cli.rs
@@ -39,7 +39,7 @@ pub fn uid_arg<'a>() -> clap::Arg<'a, 'a> {
 fn reply_all_arg<'a>() -> clap::Arg<'a, 'a> {
     clap::Arg::with_name("reply-all")
         .help("Includes all recipients")
-        .short("a")
+        .short("A")
         .long("all")
 }
 
@@ -126,11 +126,13 @@ pub fn msg_subcmds<'a>() -> Vec<clap::App<'a, 'a>> {
             .aliases(&["rep", "re"])
             .about("Answers to a message")
             .arg(uid_arg())
-            .arg(reply_all_arg()),
+            .arg(reply_all_arg())
+            .arg(attachment_arg()),
         clap::SubCommand::with_name("forward")
             .aliases(&["fwd", "f"])
             .about("Forwards a message")
-            .arg(uid_arg()),
+            .arg(uid_arg())
+            .arg(attachment_arg()),
         clap::SubCommand::with_name("copy")
             .aliases(&["cp", "c"])
             .about("Copies a message to the targetted mailbox")