diff --git a/pkg/message/build_fetch.go b/pkg/message/build_fetch.go
index 69e3e3da..8076b621 100644
--- a/pkg/message/build_fetch.go
+++ b/pkg/message/build_fetch.go
@@ -129,7 +129,7 @@ func fetchMessage(req fetchReq, attachWorkers int) (*pmapi.Message, [][]byte, er
 	attData := make([][]byte, len(msg.Attachments))
 
 	collect := func(idx int, value interface{}) error {
-		attData[idx] = value.([]byte)
+		attData[idx] = value.([]byte) //nolint[forcetypeassert] we wan't to panic here
 		return nil
 	}
 
diff --git a/pkg/message/build_rfc822_custom.go b/pkg/message/build_rfc822_custom.go
index e1526b1f..e4d40346 100644
--- a/pkg/message/build_rfc822_custom.go
+++ b/pkg/message/build_rfc822_custom.go
@@ -27,9 +27,9 @@ import (
 	"github.com/emersion/go-message"
 )
 
-// writeCustomTextPart writes an armored-PGP text part for a message body that couldn't be decrypted.
-// The following is an example of such a message.
-/*
+/* writeCustomTextPart writes an armored-PGP text part for a message body that couldn't be decrypted.
+The following is an example of such a message:
+
 Mime-Version: 1.0
 Content-Type: multipart/mixed;
  boundary=d8a04ef2e12150946d27f84fc82b9e70a5e314f91a0f2190e38c7aad623466da
@@ -60,6 +60,8 @@ La1Cc6aFtMPUShzNc3Wp3dVLM09WygEUsYZFmA==
 =00ma
 -----END PGP MESSAGE-----
 --d8a04ef2e12150946d27f84fc82b9e70a5e314f91a0f2190e38c7aad623466da--
+
+.
 */
 func writeCustomTextPart(
 	w *message.Writer,