diff --git a/sendmail.go b/sendmail.go
index fd5d12a..45b1a26 100644
--- a/sendmail.go
+++ b/sendmail.go
@@ -167,7 +167,6 @@ binary should be setgid that group:
 		for {
 			block, rest := pem.Decode(pemBuf)
 			if block == nil && len(rest) != 0 {
-				log.Printf("xxx, leftover data %q", rest)
 				log.Fatalf("leftover data in pem file")
 			} else if block == nil {
 				break
diff --git a/store/msgreader.go b/store/msgreader.go
index 277faab..862e0a0 100644
--- a/store/msgreader.go
+++ b/store/msgreader.go
@@ -7,7 +7,7 @@ import (
 	"os"
 )
 
-// MsgReader provides access to a message. Reads return the "msg_prefix" in the
+// MsgReader provides access to a message. Reads return the "MsgPrefix" in the
 // database (typically received headers), followed by the on-disk msg file
 // contents. MsgReader is an io.Reader, io.ReaderAt and io.Closer.
 type MsgReader struct {
diff --git a/store/train.go b/store/train.go
index d40440f..fcfa05a 100644
--- a/store/train.go
+++ b/store/train.go
@@ -24,7 +24,7 @@ var ErrNoJunkFilter = errors.New("junkfilter: not configured")
 // Do not forget to save the filter after modifying, and to always close the filter when done.
 // An empty filter is initialized on first access of the filter.
 func (a *Account) OpenJunkFilter(ctx context.Context, log mlog.Log) (*junk.Filter, *config.JunkFilter, error) {
-	conf, ok := mox.Conf.Account(a.Name)
+	conf, ok := a.Conf()
 	if !ok {
 		return nil, nil, ErrAccountUnknown
 	}