diff --git a/static/style.css b/static/style.css
index eb56593..b9d397c 100644
--- a/static/style.css
+++ b/static/style.css
@@ -85,6 +85,10 @@ a, a:active, a:visited {
 	padding: 0px 0px 0px 0px;
 }
 
+#listing p {
+    white-space:pre-wrap;
+}
+
 .error {
 	padding: 5px;
 	color: red;
diff --git a/templates/diary.html b/templates/diary.html
index 73e0d7f..c50cc10 100644
--- a/templates/diary.html
+++ b/templates/diary.html
@@ -26,9 +26,7 @@
 					{% for e in entries %}
 						<div>
 							<div>{{ e.date }}</div>
-							<p>
-								{{ e.text }}
-							</p>
+							<p>{{ e.text }}</p>
 						</div>
 					{% endfor %}
 				</div>