5 files changed, 15 insertions, 0 deletions
diff --git a/worker/imap/fetch.go b/worker/imap/fetch.go
index 364fe575..2b816f45 100644
--- a/worker/imap/fetch.go
+++ b/worker/imap/fetch.go
@@ -10,6 +10,7 @@ import (
 	"github.com/emersion/go-message/mail"
 	"github.com/emersion/go-message/textproto"
 
+	"git.sr.ht/~rjarry/aerc/logging"
 	"git.sr.ht/~rjarry/aerc/models"
 	"git.sr.ht/~rjarry/aerc/worker/types"
 )
@@ -169,6 +170,8 @@ func (imapw *IMAPWorker) handleFetchMessages(
 	done := make(chan error)
 
 	go func() {
+		defer logging.PanicHandler()
+
 		var reterr error
 		for _msg := range messages {
 			imapw.seqMap[_msg.SeqNum-1] = _msg.Uid
diff --git a/worker/imap/flags.go b/worker/imap/flags.go
index cc8a8cee..22c23dd8 100644
--- a/worker/imap/flags.go
+++ b/worker/imap/flags.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/emersion/go-imap"
 
+	"git.sr.ht/~rjarry/aerc/logging"
 	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
@@ -22,6 +23,8 @@ func (imapw *IMAPWorker) handleDeleteMessages(msg *types.DeleteMessages) {
 	ch := make(chan uint32)
 	done := make(chan interface{})
 	go func() {
+		defer logging.PanicHandler()
+
 		for seqNum := range ch {
 			i := seqNum - 1
 			deleted = append(deleted, imapw.seqMap[i])
diff --git a/worker/imap/list.go b/worker/imap/list.go
index 25c247a2..026aa9a7 100644
--- a/worker/imap/list.go
+++ b/worker/imap/list.go
@@ -3,6 +3,7 @@ package imap
 import (
 	"github.com/emersion/go-imap"
 
+	"git.sr.ht/~rjarry/aerc/logging"
 	"git.sr.ht/~rjarry/aerc/models"
 	"git.sr.ht/~rjarry/aerc/worker/types"
 )
@@ -13,6 +14,8 @@ func (imapw *IMAPWorker) handleListDirectories(msg *types.ListDirectories) {
 	done := make(chan interface{})
 
 	go func() {
+		defer logging.PanicHandler()
+
 		for mbox := range mailboxes {
 			if !canOpen(mbox) {
 				// no need to pass this to handlers if it can't be opened
diff --git a/worker/imap/worker.go b/worker/imap/worker.go
index 6bc850cb..2036ee19 100644
--- a/worker/imap/worker.go
+++ b/worker/imap/worker.go
@@ -17,6 +17,7 @@ import (
 	"golang.org/x/oauth2"
 
 	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/logging"
 	"git.sr.ht/~rjarry/aerc/models"
 	"git.sr.ht/~rjarry/aerc/worker/handlers"
 	"git.sr.ht/~rjarry/aerc/worker/types"
@@ -83,6 +84,8 @@ func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error {
 		if w.client != nil && w.client.State() == imap.SelectedState {
 			w.idleStop = make(chan struct{})
 			go func() {
+				defer logging.PanicHandler()
+
 				w.idleDone <- w.client.Idle(w.idleStop, &client.IdleOptions{LogoutTimeout: 0, PollInterval: 0})
 			}()
 		}
diff --git a/worker/notmuch/worker.go b/worker/notmuch/worker.go
index 36ed2c8f..4091ea43 100644
--- a/worker/notmuch/worker.go
+++ b/worker/notmuch/worker.go
@@ -16,6 +16,7 @@ import (
 
 	"git.sr.ht/~rjarry/aerc/config"
 	"git.sr.ht/~rjarry/aerc/lib/uidstore"
+	"git.sr.ht/~rjarry/aerc/logging"
 	"git.sr.ht/~rjarry/aerc/models"
 	"git.sr.ht/~rjarry/aerc/worker/handlers"
 	"git.sr.ht/~rjarry/aerc/worker/lib"
@@ -180,6 +181,8 @@ func (w *worker) handleConnect(msg *types.Connect) error {
 	w.done(msg)
 	w.emitLabelList()
 	go func() {
+		defer logging.PanicHandler()
+
 		for {
 			w.nmEvents <- &updateDirCounts{}
 			time.Sleep(backgroundRefreshDelay)