compose: copy to composing account's sent folder

The composing account may be different than the currently selected account if the user has moved between different tabs since beginning the message. Fixes: faa879f ("hooks: add mail-added hook") Reported-by: Vitaly Ovchinnikov <[email protected]> Signed-off-by: Jason Cox <[email protected]> Acked-by: Robin Jarry <[email protected]> Tested-by: Vitaly Ovchinnikov <[email protected]>
rjarry · Nov 22, 2023 · 48b9589 · 48b9589
1 parent 4120de1
commit 48b9589
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/commands/compose/send.go b/commands/compose/send.go
@@ -228,7 +228,8 @@ func send(composer *app.Composer, ctx sendCtx,
 		}
 		if ctx.copyto != "" && ctx.scheme != "jmap" {
 			app.PushStatus("Copying to "+ctx.copyto, 10*time.Second)
-			errch := copyToSent(ctx.copyto, copyBuf.Len(), &copyBuf)
+			errch := copyToSent(ctx.copyto, copyBuf.Len(), &copyBuf,
+				composer)
 			err = <-errch
 			if err != nil {
 				errmsg := fmt.Sprintf(
@@ -557,9 +558,9 @@ func newJmapSender(
 	return writer, err
 }
 
-func copyToSent(dest string, n int, msg io.Reader) <-chan error {
+func copyToSent(dest string, n int, msg io.Reader, composer *app.Composer) <-chan error {
 	errCh := make(chan error, 1)
-	acct := app.SelectedAccount()
+	acct := composer.Account()
 	if acct == nil {
 		errCh <- errors.New("No account selected")
 		return errCh