diff --git a/widgets/compose.go b/widgets/compose.go
index da2bde3..2516c48 100644
--- a/widgets/compose.go
+++ b/widgets/compose.go
@@ -974,7 +974,8 @@ func (he *headerEditor) storeValue() {
 	switch strings.ToLower(he.name) {
 	case "to", "from", "cc", "bcc":
 		if strings.TrimSpace(val) == "" {
-			// Don't set empty address list headers
+			// if header is empty, delete it
+			he.header.Del(he.name)
 			return
 		}
 		list, err := mail.ParseAddressList(val)