diff --git a/gulp/res/css/style.css b/gulp/res/css/style.css
index 37bfa3b2..ca64072f 100644
--- a/gulp/res/css/style.css
+++ b/gulp/res/css/style.css
@@ -19,6 +19,11 @@ body {
 	flex-direction: column;
 }
 
+pre {
+	font-family: inherit;
+	margin: 1em 3em;
+}
+
 .code {
 	text-align: left;
 	border-left: 10px solid #B7C5D9;
@@ -176,14 +181,10 @@ object {
 	color: green;
 }
 
-blockquote a, a:hover {
+pre a, a:hover {
 	color: #d00!important;
 }
 
-blockquote {
-	white-space: pre-wrap;
-}
-
 .thread, .action-wrapper, .form-wrapper, .table-container {
 	display: flex;
 	flex-direction: column;
@@ -545,7 +546,7 @@ hr {
 		width: 100%;
 	}
 
-	blockquote {
+	pre {
 		margin: 1em;
 	}
 
diff --git a/views/mixins/catalogtile.pug b/views/mixins/catalogtile.pug
index 36379e9a..02955d44 100644
--- a/views/mixins/catalogtile.pug
+++ b/views/mixins/catalogtile.pug
@@ -25,4 +25,4 @@ mixin catalogtile(board, post, truncate)
 			span: a.no-decoration.post-subject(href=postURL) #{post.subject || 'No Subject'}
 		if post.message
 			br
-			blockquote.no-m-p.post-message !{post.message}
+			pre.no-m-p.post-message !{post.message}
diff --git a/views/mixins/post.pug b/views/mixins/post.pug
index 7286708d..283047b6 100644
--- a/views/mixins/post.pug
+++ b/views/mixins/post.pug
@@ -70,11 +70,11 @@ mixin post(post, truncate, manage=false, globalmanage=false)
 							truncatedMessage = splitPost.slice(0, 10).join('\n');
 							truncated = true;
 						}
-					blockquote.post-message !{truncatedMessage}
+					pre.post-message !{truncatedMessage}
 					if truncated
 						blockquote.left.clear-both Message too long. #[a(href=postURL) View the full text]
 				else 
-					blockquote.post-message !{post.message}
+					pre.post-message !{post.message}
 			if post.banmessage
 				blockquote.left.clear-both.banmessage USER WAS BANNED FOR THIS POST (#{post.banmessage})
 			if post.omittedposts || post.omittedimages