diff --git a/CHANGELOG b/CHANGELOG
index efb8026e7..f5728f4cb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix word wrapping in message-part's <PRE>s for printing (#1485787)
 - Fix incorrect word wrapping in outgoing plaintext multibyte messages (#1485714)
 - Fix double footer in HTML message with embedded images
 - Fix TNEF implementation bug (#1485773)
diff --git a/skins/default/mail.css b/skins/default/mail.css
index bb614dbd7..79ae01476 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -820,6 +820,7 @@ div.message-htmlpart a
 }
 
 div.message-part pre,
+div.message-htmlpart pre,
 div.message-part div.pre
 {
   margin: 0px;
diff --git a/skins/default/print.css b/skins/default/print.css
index fa9c38c7e..441a5de91 100644
--- a/skins/default/print.css
+++ b/skins/default/print.css
@@ -103,6 +103,8 @@ div.message-part a
   color: #0000CC;
 }
 
+div.message-part pre,
+div.message-htmlpart pre,
 div.message-part div.pre
 {
   margin: 0;