aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--commands/compose/send.go3
-rw-r--r--widgets/aerc.go4
-rw-r--r--widgets/compose.go14
3 files changed, 14 insertions, 7 deletions
diff --git a/commands/compose/send.go b/commands/compose/send.go
index 96d24d9..c4bff11 100644
--- a/commands/compose/send.go
+++ b/commands/compose/send.go
@@ -36,6 +36,8 @@ func SendMessage(aerc *widgets.Aerc, args []string) error {
"No outgoing mail transport configured for this account")
}
+ aerc.Logger().Println("Sending mail")
+
uri, err := url.Parse(config.Outgoing)
if err != nil {
return errors.Wrap(err, "url.Parse(outgoing)")
@@ -152,6 +154,7 @@ func SendMessage(aerc *widgets.Aerc, args []string) error {
if err = conn.Mail(from.Address); err != nil {
return 0, errors.Wrap(err, "conn.Mail")
}
+ aerc.Logger().Printf("rcpt to: %v", rcpts)
for _, rcpt := range rcpts {
if err = conn.Rcpt(rcpt); err != nil {
return 0, errors.Wrap(err, "conn.Rcpt")
diff --git a/widgets/aerc.go b/widgets/aerc.go
index ae8319b..8aa1e2c 100644
--- a/widgets/aerc.go
+++ b/widgets/aerc.go
@@ -196,6 +196,10 @@ func (aerc *Aerc) Config() *config.AercConfig {
return aerc.conf
}
+func (aerc *Aerc) Logger() *log.Logger {
+ return aerc.logger
+}
+
func (aerc *Aerc) SelectedAccount() *AccountView {
acct, ok := aerc.accounts[aerc.tabs.Tabs[aerc.tabs.Selected].Name]
if !ok {
diff --git a/widgets/compose.go b/widgets/compose.go
index a2fa663..8fc34b4 100644
--- a/widgets/compose.go
+++ b/widgets/compose.go
@@ -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
}