diff --git a/fetcher/fetcher.go b/fetcher/fetcher.go
index a3aae35b591ee18c809cfdd4cc0f9d0d5566a058..81f0476a9d69689a24badecf3dded65a37b4e4be 100644
--- a/fetcher/fetcher.go
+++ b/fetcher/fetcher.go
@@ -298,7 +298,11 @@ func FetchMailboxEmails(account *config.Account, mailbox string, limit, offset u
 
 			matched := false
 			if isSentMailbox {
-				if strings.EqualFold(strings.TrimSpace(fromAddr), fetchEmail) {
+				var senderEmail string
+				if len(msg.Envelope.From) > 0 {
+					senderEmail = msg.Envelope.From[0].Address()
+				}
+				if strings.EqualFold(strings.TrimSpace(senderEmail), fetchEmail) {
 					matched = true
 				}
 			} else {