From 812c75978814e96acc30aeb007069429e9e2cc69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B6=E5=A3=AB=E6=B6=B5?= <630892807@qq.com>
Date: Wed, 13 May 2020 22:13:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E4=BB=B6=E4=BA=BA?=
 =?UTF-8?q?=E5=92=8C=E6=94=B6=E4=BB=B6=E4=BA=BA=E7=BC=96=E7=A0=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/imap.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/imap.go b/tools/imap.go
index e3eb0cb..c16b7b5 100644
--- a/tools/imap.go
+++ b/tools/imap.go
@@ -192,10 +192,13 @@ func GetMessage(server string, email string, password string,folder string,id ui
 		mailitem.Date=date.String()
 	}
 	var f string
+	dec:=GetDecoder()
+
 	if from, err := header.AddressList("From"); err == nil {
 		log.Println("From:", from)
 		for _,address:=range from{
-			f+=" "+address.String()
+			temp,_:=dec.DecodeHeader(address.String())
+			f+=" "+temp
 		}
 	}
 	mailitem.From=f
@@ -203,11 +206,11 @@ func GetMessage(server string, email string, password string,folder string,id ui
 	if to, err := header.AddressList("To"); err == nil {
 		log.Println("To:", to)
 		for _,address:=range to{
-			t+=" "+address.String()
+			temp,_:=dec.DecodeHeader(address.String())
+			t+=" "+temp
 		}
 	}
 	mailitem.To=t
-	dec:=GetDecoder()
 	if subject, err := header.Subject(); err == nil {
 		s,err:=dec.Decode(subject)
 		if err!=nil{