diff --git a/ArchiveState.go b/ArchiveState.go
index 22af35a..c050af8 100644
--- a/ArchiveState.go
+++ b/ArchiveState.go
@@ -95,7 +95,7 @@ func (this *ArchiveState) renderView(w http.ResponseWriter) {
 
 	output := ""
 	for i := startLine; i < endLine; i += 1 {
-		output += html.EscapeString(lines[i]) + "<br>\n"
+		output += html.EscapeString(lines[i]) + "\n"
 	}
 
 	this.renderTemplate(w, []byte(output))
@@ -327,15 +327,15 @@ func (this *ArchiveState) renderTemplateHead(w http.ResponseWriter) {
 			
 		</div>
 
-		<div class="layout-body" id="chatarea">
-	`))
+		<div class="layout-body" id="chatarea">`,
+	))
 
 	// Header ends
 }
 
 func (this *ArchiveState) renderTemplateFoot(w http.ResponseWriter) {
-	w.Write([]byte(`
-		</div>
+	w.Write([]byte(`</div>
+		
 		<script type="text/javascript" src="/archive.js?nonce=` + fmt.Sprintf("%d", this.svr.startup.Unix()) + `"></script>
 	</body>
 </html>
diff --git a/static/style.css b/static/style.css
index c72e234..645f68b 100644
--- a/static/style.css
+++ b/static/style.css
@@ -61,6 +61,7 @@ select {
 
 #chatarea {
 	word-break:break-word;
+	white-space: pre;
 }
 
 .timestamp {