3 files changed, 79 insertions, 0 deletions
diff --git a/commands/compose/detach.go b/commands/compose/detach.go
new file mode 100644
index 0000000..e700ab6
--- /dev/null
+++ b/commands/compose/detach.go
@@ -0,0 +1,55 @@
+package compose
+
+import (
+	"fmt"
+	"time"
+
+	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"github.com/gdamore/tcell"
+)
+
+type Detach struct{}
+
+func init() {
+	register(Detach{})
+}
+
+func (_ Detach) Aliases() []string {
+	return []string{"detach"}
+}
+
+func (_ Detach) Complete(aerc *widgets.Aerc, args []string) []string {
+	composer, _ := aerc.SelectedTab().(*widgets.Composer)
+
+	return composer.GetAttachments()
+}
+
+func (_ Detach) Execute(aerc *widgets.Aerc, args []string) error {
+	var path string
+	composer, _ := aerc.SelectedTab().(*widgets.Composer)
+
+	if len(args) > 2 {
+		return fmt.Errorf("Usage: :detach [path]")
+	}
+
+	if len(args) == 2 {
+		path = args[1]
+	} else {
+		// if no attachment is specified, delete the first in the list
+		atts := composer.GetAttachments()
+		if len(atts) > 0 {
+			path = atts[0]
+		} else {
+			return fmt.Errorf("No attachments to delete")
+		}
+	}
+
+	if err := composer.DeleteAttachment(path); err != nil {
+		return err
+	}
+
+	aerc.PushStatus(fmt.Sprintf("Detached %s", path), 10*time.Second).
+		Color(tcell.ColorDefault, tcell.ColorGreen)
+
+	return nil
+}
diff --git a/doc/aerc.1.scd b/doc/aerc.1.scd
index 8401d64..206e9b1 100644
--- a/doc/aerc.1.scd
+++ b/doc/aerc.1.scd
@@ -210,6 +210,10 @@ message list, the message in the message viewer, etc).
 *attach* <path>
 	Attaches the file at the given path to the email.
 
+*detach* [path]
+	Detaches the file with the given path from the composed email. If no path is
+	specified, detaches the first attachment instead.
+
 *edit*
 	(Re-) opens your text editor to edit the message in progress.
 
diff --git a/widgets/compose.go b/widgets/compose.go
index 6a41e70..3dd569d 100644
--- a/widgets/compose.go
+++ b/widgets/compose.go
@@ -434,8 +434,28 @@ func writeAttachment(path string, writer *mail.Writer) error {
 	return nil
 }
 
+func (c *Composer) GetAttachments() []string {
+	return c.attachments
+}
+
 func (c *Composer) AddAttachment(path string) {
 	c.attachments = append(c.attachments, path)
+	c.resetReview()
+}
+
+func (c *Composer) DeleteAttachment(path string) error {
+	for i, a := range c.attachments {
+		if a == path {
+			c.attachments = append(c.attachments[:i], c.attachments[i+1:]...)
+			c.resetReview()
+			return nil
+		}
+	}
+
+	return errors.New("attachment does not exist")
+}
+
+func (c *Composer) resetReview() {
 	if c.review != nil {
 		c.grid.RemoveChild(c.review)
 		c.review = newReviewMessage(c, nil)