From 216be7d5f2f2ec120adb3f9aa4728b01eb48f0fe Mon Sep 17 00:00:00 2001
From: Matthieu Rakotojaona <m@rako.space>
Date: Sat, 11 Nov 2023 02:01:19 +0100
Subject: [PATCH 1/2] Attach all files when forwarding in raw mode

---
 mcom | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/mcom b/mcom
index 4e834c6..e62b759 100755
--- a/mcom
+++ b/mcom
@@ -306,6 +306,19 @@ fi
 		msgid
 		museragent
 		cat "$MBLAZE/headers" 2>/dev/null
+		if [ -n "$raw" ]; then
+			prev=$(pwd)
+			attachdir=$(mktemp -d)
+			cd $attachdir
+			trap 'rm -r "$attachdir"' EXIT
+
+			mseq -r "$@" \
+				| xargs -I {} mshow -Bx {} \
+				| xargs --null realpath \
+				| sed '/^$/d; s/^/Attach: /'
+			cd $prev
+		fi
+
 		printf '\n\n'
 		if [ -z "$raw" ]; then
 			mseq -r "$@" | sed 's:^:#message/rfc822#inline :; s:$:>:'

From 8effd1244ef13739d986ac06c1806076d8d6a33b Mon Sep 17 00:00:00 2001
From: Matthieu Rakotojaona <m@rako.space>
Date: Fri, 24 Nov 2023 13:54:04 +0100
Subject: [PATCH 2/2] Don't ask for confirmation when deleting draft

---
 mcom | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mcom b/mcom
index e62b759..e52fb9a 100755
--- a/mcom
+++ b/mcom
@@ -544,7 +544,7 @@ while :; do
 		c=send
 		;;
 	d|delete)
-		rm -i "$draft"
+		rm "$draft"
 		if ! [ -f "$draft" ]; then
 			rm -f "$draftmime"
 			printf '%s\n' "mcom: deleted draft $draft"