diff --git a/Changelog.md b/Changelog.md
index 61358c5c..eb8e7ae6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 
 ### Added
 * GODT-682 Persistent anonymous API cookies for Import-Export.
+* GODT-357 Use go-message to make a better message parser.
 
 ### Changed
 * GODT-511 User agent format changed.
@@ -68,8 +69,6 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
     * Structure for transfer rules in QML
 * GODT-213 Convert panics from message parser to error.
 
-* GODT-357 Use go-message to make a better message parser.
-
 ### Fixed
 * GODT-655 Fix date picker with automatic Windows DST
 * GODT-454 Fix send on closed channel when receiving unencrypted send confirmation from GUI.
diff --git a/pkg/message/parser.go b/pkg/message/parser.go
index b4cf4098..10be4cc5 100644
--- a/pkg/message/parser.go
+++ b/pkg/message/parser.go
@@ -36,7 +36,7 @@ import (
 )
 
 func Parse(r io.Reader, key, keyName string) (m *pmapi.Message, mimeBody, plainBody string, attReaders []io.Reader, err error) {
-	logrus.Debug("Parsing message")
+	logrus.Trace("Parsing message")
 
 	p, err := parser.New(r)
 	if err != nil {
@@ -89,7 +89,7 @@ func Parse(r io.Reader, key, keyName string) (m *pmapi.Message, mimeBody, plainB
 }
 
 func convertForeignEncodings(p *parser.Parser) error {
-	logrus.Debug("Converting foreign encodings")
+	logrus.Trace("Converting foreign encodings")
 
 	return p.NewWalker().
 		RegisterContentTypeHandler("text/html", func(p *parser.Part) error {
diff --git a/pkg/message/parser/part.go b/pkg/message/parser/part.go
index 6b500565..52e22dcf 100644
--- a/pkg/message/parser/part.go
+++ b/pkg/message/parser/part.go
@@ -70,7 +70,7 @@ func (p *Part) AddChild(child *Part) {
 }
 
 func (p *Part) ConvertToUTF8() error {
-	logrus.Debug("Converting part to utf-8")
+	logrus.Trace("Converting part to utf-8")
 
 	t, params, err := p.Header.ContentType()
 	if err != nil {
@@ -130,24 +130,24 @@ func (p *Part) ConvertMetaCharset() error {
 
 func selectSuitableDecoder(p *Part, t string, params map[string]string) *encoding.Decoder {
 	if charset, ok := params["charset"]; ok {
-		logrus.WithField("charset", charset).Debug("The part has a specified charset")
+		logrus.WithField("charset", charset).Trace("The part has a specified charset")
 
 		if decoder, err := pmmime.SelectDecoder(charset); err == nil {
-			logrus.Debug("The charset is known; decoder has been selected")
+			logrus.Trace("The charset is known; decoder has been selected")
 			return decoder
 		}
 
-		logrus.Debug("The charset is unknown; no decoder could be selected")
+		logrus.Warn("The charset is unknown; no decoder could be selected")
 	}
 
 	if utf8.Valid(p.Body) {
-		logrus.Debug("The part is already valid utf-8, returning noop encoder")
+		logrus.Trace("The part is already valid utf-8, returning noop encoder")
 		return encoding.Nop.NewDecoder()
 	}
 
 	encoding, name, _ := charset.DetermineEncoding(p.Body, t)
 
-	logrus.WithField("name", name).Debug("Determined encoding by reading body")
+	logrus.WithField("name", name).Warn("Determined encoding by reading body")
 
 	return encoding.NewDecoder()
 }