diff --git a/widgets/compose.go b/widgets/compose.go
index 8830d9d..6a342d4 100644
--- a/widgets/compose.go
+++ b/widgets/compose.go
@@ -952,6 +952,10 @@ func (he *headerEditor) storeValue() {
 	val := he.input.String()
 	switch strings.ToLower(he.name) {
 	case "to", "from", "cc", "bcc":
+		if strings.TrimSpace(val) == "" {
+			// Don't set empty address list headers
+			return
+		}
 		list, err := mail.ParseAddressList(val)
 		if err == nil {
 			he.header.SetAddressList(he.name, list)