From a5fe1e358ecb535f9f88f348831d82757dd62ae9 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 12 Nov 2020 11:21:06 -0500
Subject: [PATCH] Carry Message-ID forward through compose process

---
 plugins/base/public/compose.html | 1 +
 plugins/base/routes.go           | 2 +-
 themes/alps/compose.html         | 3 ++-
 themes/sourcehut/compose.html    | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/base/public/compose.html b/plugins/base/public/compose.html
index df1e360..6bc2c7a 100644
--- a/plugins/base/public/compose.html
+++ b/plugins/base/public/compose.html
@@ -9,6 +9,7 @@
 <h2>Compose new message</h2>
 
 <form method="post" action="" enctype="multipart/form-data">
+  <input type="hidden" name="message_id" value="{{.Message.MessageID}}">
   <input type="hidden" name="in_reply_to" value="{{.Message.InReplyTo}}">
 
   <label for="from">From:</label>
diff --git a/plugins/base/routes.go b/plugins/base/routes.go
index 2ef10ff..fa8f35b 100644
--- a/plugins/base/routes.go
+++ b/plugins/base/routes.go
@@ -526,7 +526,6 @@ func submitCompose(ctx *alps.Context, msg *OutgoingMessage, options *composeOpti
 		if task.Result() == nil {
 			// Remove from outbox
 			err := ctx.Session.DoIMAP(func(c *imapclient.Client) error {
-				ctx.Logger().Printf("DoIMAP")
 				if err := ensureMailboxSelected(c, "Outbox"); err != nil {
 					return err
 				}
@@ -617,6 +616,7 @@ func handleCompose(ctx *alps.Context, msg *OutgoingMessage, options *composeOpti
 		msg.Subject = ctx.FormValue("subject")
 		msg.Text = ctx.FormValue("text")
 		msg.InReplyTo = ctx.FormValue("in_reply_to")
+		msg.MessageID = ctx.FormValue("message_id")
 
 		form, err := ctx.MultipartForm()
 		if err != nil {
diff --git a/themes/alps/compose.html b/themes/alps/compose.html
index 5874748..ebadaad 100644
--- a/themes/alps/compose.html
+++ b/themes/alps/compose.html
@@ -9,7 +9,8 @@
     <main class="create-update">
 
       <form method="post" enctype="multipart/form-data">
-        <input type="hidden" name="in_reply_to" value="{{.Message.InReplyTo}}">
+        <input type="hidden" name="message_id" value="{{.Message.InReplyTo}}">
+        <input type="hidden" name="in_reply_to" value="{{.Message.MessageID}}">
 
         <div class="headers no-js">
           <label>From</label>
diff --git a/themes/sourcehut/compose.html b/themes/sourcehut/compose.html
index 8f73538..39abc02 100644
--- a/themes/sourcehut/compose.html
+++ b/themes/sourcehut/compose.html
@@ -18,6 +18,7 @@
 </div>
 <div class="container">
   <form method="post" class="col-md-12" enctype="multipart/form-data">
+    <input type="hidden" name="message_id" value="{{.Message.MessageID}}">
     <input type="hidden" name="in_reply_to" value="{{.Message.InReplyTo}}">
     <div class="row">
       <div class="form-group col-md-6">