diff --git a/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionStream.java b/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionStream.java
index d3f0cd545..27b8958a5 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionStream.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionStream.java
@@ -79,7 +79,7 @@ private void prepareArmor() {
             String[] commentLines = options.getComment().split("\n");
             for (String commentLine : commentLines) {
             	if (!commentLine.trim().isEmpty()) {
-            		ArmorUtils.addCommentHeader(armorOutputStream, commentLine);
+            		ArmorUtils.addCommentHeader(armorOutputStream, commentLine.trim());
             	}
             }
         }