diff --git a/pkg/message/parser.go b/pkg/message/parser.go
index 782d2887..f1ba0b4f 100644
--- a/pkg/message/parser.go
+++ b/pkg/message/parser.go
@@ -91,7 +91,6 @@ func Parse(r io.Reader, key, keyName string) (m *pmapi.Message, mimeBody, plainB
 func convertForeignEncodings(p *parser.Parser) error {
 	logrus.Debug("Converting foreign encodings")
 
-	// HELP: Is it correct to only do this to text types?
 	return p.NewWalker().
 		RegisterContentTypeHandler("text/html", func(p *parser.Part) error {
 			if err := p.ConvertToUTF8(); err != nil {
diff --git a/test/features/bridge/smtp/send/plain.feature b/test/features/bridge/smtp/send/plain.feature
index b078f251..5f8bfcf6 100644
--- a/test/features/bridge/smtp/send/plain.feature
+++ b/test/features/bridge/smtp/send/plain.feature
@@ -222,8 +222,6 @@ Feature: SMTP sending of plain messages
       }
       """
 
-	# HELP: This is strange... why do we want this behaviour?
-	@ignore
   Scenario: Message without charset and content is detected as HTML
     When SMTP client sends message
       """
@@ -254,7 +252,7 @@ Feature: SMTP sending of plain messages
           ],
           "CCList": [],
           "BCCList": [],
-          "MIMEType": "text/html"
+          "MIMEType": "text/plain"
         }
       }
       """