diff --git a/stylesheets/futaba.css b/stylesheets/futaba.css
index 8d24d693..d30cb938 100644
--- a/stylesheets/futaba.css
+++ b/stylesheets/futaba.css
@@ -27,7 +27,7 @@ div.post.reply.highlighted {
 	background: #f0c0b0;
 	border-color: #d9bfb7;
 }
-div.post.reply p.body a {
+div.post.reply div.body a {
 	color: navy;
 }
 p.intro span.subject {
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 80042bd6..2facbdfe 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -182,7 +182,7 @@ div.delete {
 div.post.reply p {
 	margin: 0.3em 0 0 0;
 }
-div.post.reply p.body {
+div.post.reply div.body {
 	margin-left: 1.8em;
 	margin-top: 0.8em;
 	padding-right: 3em;
@@ -191,13 +191,13 @@ div.post.reply p.body {
 div.post.reply.highlighted {
 	background: #D6BAD0;
 }
-div.post.reply p.body a {
+div.post.reply div.body a {
 	color: #D00;
 }
 div.post {
 	max-width: 97%;
 }
-div.post p.body {
+div.post div.body {
 	word-wrap: break-word;
 	white-space: pre-wrap;
 }
@@ -272,10 +272,10 @@ span.spoiler {
 	color: black;
 	padding: 0px 1px;
 }
-div.post.reply p.body span.spoiler a {
+div.post.reply div.body span.spoiler a {
 	color: black;
 }
-span.spoiler:hover, div.post.reply p.body span.spoiler:hover a {
+span.spoiler:hover, div.post.reply div.body span.spoiler:hover a {
 	color: white;
 }
 div.styles {
diff --git a/stylesheets/yotsuba.css b/stylesheets/yotsuba.css
index 83718ef1..a669d9d4 100644
--- a/stylesheets/yotsuba.css
+++ b/stylesheets/yotsuba.css
@@ -19,7 +19,7 @@ div.post.reply.highlighted {
 	background: #f0c0b0;
 	border-color: #d9bfb7;
 }
-div.post.reply p.body a {
+div.post.reply div.body a {
 	color: navy;
 }
 p.intro span.subject {
diff --git a/templates/post_reply.html b/templates/post_reply.html
index 0aacd015..f50e392e 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -91,9 +91,9 @@
 	</a>
 	{% endif %}
 	{{ post.postControls }}
-	<p class="body">
+	<div class="body">
 		{% endfilter %}{% if index %}{{ post.body|truncate_body(post.link) }}{% else %}{{ post.body }}{% endif %}{% filter remove_whitespace %}
-	</p>
+	</div>
 </div>
 <br/>
 {% endfilter %}
diff --git a/templates/post_thread.html b/templates/post_thread.html
index ac5c786b..da93c5dd 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -102,9 +102,9 @@
 	{% endif %}
 	{{ post.postControls }}
 	</p>
-	<p class="body">
+	<div class="body">
 		{% endfilter %}{% if index %}{{ post.body|truncate_body(post.link) }}{% else %}{{ post.body }}{% endif %}{% filter remove_whitespace %}
-	</p>
+	</div>
 	{% if post.omitted or post.omitted_images %}
 		<span class="omitted">
 			{% if post.omitted %}