4 files changed, 14 insertions, 16 deletions
diff --git a/commands/compose/attach.go b/commands/compose/attach.go
index 6b8d72fc..148442b0 100644
--- a/commands/compose/attach.go
+++ b/commands/compose/attach.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 	"strings"
-	"time"
 
 	"git.sr.ht/~sircmpwn/aerc/commands"
 	"git.sr.ht/~sircmpwn/aerc/widgets"
@@ -35,23 +34,23 @@ func (Attach) Execute(aerc *widgets.Aerc, args []string) error {
 
 	path, err := homedir.Expand(path)
 	if err != nil {
-		aerc.PushError(" "+err.Error(), 10*time.Second)
+		aerc.PushError(" " + err.Error())
 		return err
 	}
 
 	pathinfo, err := os.Stat(path)
 	if err != nil {
-		aerc.PushError(" "+err.Error(), 10*time.Second)
+		aerc.PushError(" " + err.Error())
 		return err
 	} else if pathinfo.IsDir() {
-		aerc.PushError("Attachment must be a file, not a directory", 10*time.Second)
+		aerc.PushError("Attachment must be a file, not a directory")
 		return nil
 	}
 
 	composer, _ := aerc.SelectedTab().(*widgets.Composer)
 	composer.AddAttachment(path)
 
-	aerc.PushSuccess(fmt.Sprintf("Attached %s", pathinfo.Name()), 10*time.Second)
+	aerc.PushSuccess(fmt.Sprintf("Attached %s", pathinfo.Name()))
 
 	return nil
 }
diff --git a/commands/compose/detach.go b/commands/compose/detach.go
index 8bc0e887..b48159d0 100644
--- a/commands/compose/detach.go
+++ b/commands/compose/detach.go
@@ -3,7 +3,6 @@ package compose
 import (
 	"fmt"
 	"strings"
-	"time"
 
 	"git.sr.ht/~sircmpwn/aerc/widgets"
 )
@@ -43,7 +42,7 @@ func (Detach) Execute(aerc *widgets.Aerc, args []string) error {
 		return err
 	}
 
-	aerc.PushSuccess(fmt.Sprintf("Detached %s", path), 10*time.Second)
+	aerc.PushSuccess(fmt.Sprintf("Detached %s", path))
 
 	return nil
 }
diff --git a/commands/compose/postpone.go b/commands/compose/postpone.go
index 90b6134b..4427ff66 100644
--- a/commands/compose/postpone.go
+++ b/commands/compose/postpone.go
@@ -63,7 +63,7 @@ func (Postpone) Execute(aerc *widgets.Aerc, args []string) error {
 	go func() {
 		errStr := <-errChan
 		if errStr != "" {
-			aerc.PushError(" "+errStr, 10*time.Second)
+			aerc.PushError(" " + errStr)
 			return
 		}
 
@@ -71,7 +71,7 @@ func (Postpone) Execute(aerc *widgets.Aerc, args []string) error {
 		ctr := datacounter.NewWriterCounter(ioutil.Discard)
 		err = composer.WriteMessage(header, ctr)
 		if err != nil {
-			aerc.PushError(errors.Wrap(err, "WriteMessage").Error(), 10*time.Second)
+			aerc.PushError(errors.Wrap(err, "WriteMessage").Error())
 			composer.Close()
 			return
 		}
@@ -86,11 +86,11 @@ func (Postpone) Execute(aerc *widgets.Aerc, args []string) error {
 		}, func(msg types.WorkerMessage) {
 			switch msg := msg.(type) {
 			case *types.Done:
-				aerc.PushStatus("Message postponed.", 10*time.Second)
+				aerc.PushStatus("Message postponed.")
 				r.Close()
 				composer.Close()
 			case *types.Error:
-				aerc.PushError(" "+msg.Error.Error(), 10*time.Second)
+				aerc.PushError(" " + msg.Error.Error())
 				r.Close()
 				composer.Close()
 			}
diff --git a/commands/compose/send.go b/commands/compose/send.go
index a22be8f8..e7ace858 100644
--- a/commands/compose/send.go
+++ b/commands/compose/send.go
@@ -221,14 +221,14 @@ func (Send) Execute(aerc *widgets.Aerc, args []string) error {
 	}
 
 	go func() {
-		aerc.PushStatus("Sending...", 10*time.Second)
+		aerc.PushStatus("Sending...")
 		nbytes, err := sendAsync()
 		if err != nil {
 			aerc.SetError(" " + err.Error())
 			return
 		}
 		if config.CopyTo != "" {
-			aerc.PushStatus("Copying to "+config.CopyTo, 10*time.Second)
+			aerc.PushStatus("Copying to " + config.CopyTo)
 			worker := composer.Worker()
 			r, w := io.Pipe()
 			worker.PostAction(&types.AppendMessage{
@@ -240,12 +240,12 @@ func (Send) Execute(aerc *widgets.Aerc, args []string) error {
 			}, func(msg types.WorkerMessage) {
 				switch msg := msg.(type) {
 				case *types.Done:
-					aerc.PushStatus("Message sent.", 10*time.Second)
+					aerc.PushStatus("Message sent.")
 					r.Close()
 					composer.SetSent()
 					composer.Close()
 				case *types.Error:
-					aerc.PushError(" "+msg.Error.Error(), 10*time.Second)
+					aerc.PushError(" " + msg.Error.Error())
 					r.Close()
 					composer.Close()
 				}
@@ -254,7 +254,7 @@ func (Send) Execute(aerc *widgets.Aerc, args []string) error {
 			composer.WriteMessage(header, w)
 			w.Close()
 		} else {
-			aerc.PushStatus("Message sent.", 10*time.Second)
+			aerc.PushStatus("Message sent.")
 			composer.SetSent()
 			composer.Close()
 		}