Fix Cc & Bcc handling in replies
This commit is contained in:
parent
63538978f3
commit
ceeb30abeb
3 changed files with 14 additions and 7 deletions
widgets
|
@ -228,6 +228,13 @@ func (c *Composer) PrepareHeader() (*mail.Header, []string, error) {
|
|||
}
|
||||
header.SetAddressList("From", simon_from)
|
||||
}
|
||||
// Merge in additional headers
|
||||
txthdr := mhdr.Header
|
||||
for key, value := range c.defaults {
|
||||
if !txthdr.Has(key) && value != "" {
|
||||
mhdr.SetText(key, value)
|
||||
}
|
||||
}
|
||||
if to := c.headers.to.input.String(); to != "" {
|
||||
// Dammit Simon, this branch is 3x as long as it ought to be because
|
||||
// your types aren't compatible enough with each other
|
||||
|
@ -267,13 +274,6 @@ func (c *Composer) PrepareHeader() (*mail.Header, []string, error) {
|
|||
rcpts = append(rcpts, addr.Address)
|
||||
}
|
||||
}
|
||||
// Merge in additional headers
|
||||
txthdr := mhdr.Header
|
||||
for key, value := range c.defaults {
|
||||
if !txthdr.Has(key) && value != "" {
|
||||
mhdr.SetText(key, value)
|
||||
}
|
||||
}
|
||||
return &header, rcpts, nil
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue