2 files changed, 18 insertions, 13 deletions
diff --git a/commands/msg/reply.go b/commands/msg/reply.go
index 85c5d3ab..029cb42b 100644
--- a/commands/msg/reply.go
+++ b/commands/msg/reply.go
@@ -113,14 +113,15 @@ func (_ reply) Execute(aerc *widgets.Aerc, args []string) error {
 		}
 	}
 
+	defaults := map[string]string{
+		"To":          strings.Join(to, ", "),
+		"Cc":          strings.Join(cc, ", "),
+		"Subject":     subject,
+		"In-Reply-To": msg.Envelope.MessageId,
+	}
+
 	composer := widgets.NewComposer(
-		aerc.Config(), acct.AccountConfig(), acct.Worker()).
-		Defaults(map[string]string{
-			"To":          strings.Join(to, ", "),
-			"Cc":          strings.Join(cc, ", "),
-			"Subject":     subject,
-			"In-Reply-To": msg.Envelope.MessageId,
-		})
+		aerc.Config(), acct.AccountConfig(), acct.Worker(), defaults)
 
 	if args[0] == "reply" {
 		composer.FocusTerminal()
@@ -128,7 +129,7 @@ func (_ reply) Execute(aerc *widgets.Aerc, args []string) error {
 
 	addTab := func() {
 		tab := aerc.NewTab(composer, subject)
-		composer.OnSubjectChange(func(subject string) {
+		composer.OnHeaderChange("Subject", func(subject string) {
 			if subject == "" {
 				tab.Name = "New email"
 			} else {
diff --git a/commands/msg/unsubscribe.go b/commands/msg/unsubscribe.go
index 720ff43e..f18da075 100644
--- a/commands/msg/unsubscribe.go
+++ b/commands/msg/unsubscribe.go
@@ -83,15 +83,19 @@ func parseUnsubscribeMethods(header string) (methods []*url.URL) {
 func unsubscribeMailto(aerc *widgets.Aerc, u *url.URL) error {
 	widget := aerc.SelectedTab().(widgets.ProvidesMessage)
 	acct := widget.SelectedAccount()
-	composer := widgets.NewComposer(aerc.Config(), acct.AccountConfig(),
-		acct.Worker())
-	composer.Defaults(map[string]string{
+	defaults := map[string]string{
 		"To":      u.Opaque,
 		"Subject": u.Query().Get("subject"),
-	})
+	}
+	composer := widgets.NewComposer(
+		aerc.Config(),
+		acct.AccountConfig(),
+		acct.Worker(),
+		defaults,
+	)
 	composer.SetContents(strings.NewReader(u.Query().Get("body")))
 	tab := aerc.NewTab(composer, "unsubscribe")
-	composer.OnSubjectChange(func(subject string) {
+	composer.OnHeaderChange("Subject", func(subject string) {
 		if subject == "" {
 			tab.Name = "unsubscribe"
 		} else {