cmd/sgblog-comment-add/mail.go | 14 +++-----------

diff --git a/cmd/sgblog-comment-add/mail.go b/cmd/sgblog-comment-add/mail.go
index 8d810d2366e54591b735b50a00a161e0c61e922067464d36883cd2f58489e867..92756b6fcb8852d5c1c4ee58a392403a8c729212ae5bb91becbf52dfe23c1466 100644
--- a/cmd/sgblog-comment-add/mail.go
+++ b/cmd/sgblog-comment-add/mail.go
@@ -62,18 +62,10 @@ 	if subj == "" {
 		err = errors.New("no Subject")
 		return
 	}
-	words := strings.Fields(subj)
-	for i, word := range words {
-		if strings.HasPrefix(word, "=?") && strings.HasSuffix(word, "?=") {
-			word, err = new(mime.WordDecoder).Decode(word)
-			if err != nil {
-				return
-			}
-			words[i] = word
-		}
+	subj, err = new(mime.WordDecoder).DecodeHeader(subj)
+	if err != nil {
+		return
 	}
-	subj = strings.Join(words, " ")
-
 	ct := msg.Header.Get(CT)
 	if ct == "" {
 		ct = "text/plain"