diff --git a/imap.go b/imap.go
index 1e214c7..ca35005 100644
--- a/imap.go
+++ b/imap.go
@@ -10,10 +10,14 @@ import (
 	"github.com/emersion/go-imap"
 	imapclient "github.com/emersion/go-imap/client"
 	"github.com/emersion/go-message"
-	_ "github.com/emersion/go-message/charset"
+	"github.com/emersion/go-message/charset"
 	"github.com/emersion/go-message/textproto"
 )
 
+func init() {
+	imap.CharsetReader = charset.Reader
+}
+
 func (s *Server) connectIMAP() (*imapclient.Client, error) {
 	var c *imapclient.Client
 	var err error