diff --git a/htdocs/application/models/pastes.php b/htdocs/application/models/pastes.php
index 9f8bdd3..6679fc6 100644
--- a/htdocs/application/models/pastes.php
+++ b/htdocs/application/models/pastes.php
@@ -635,6 +635,8 @@ class Pastes extends CI_Model
 	function _format_diff($text) 
 	{
 		$text = str_replace("\t", '        ', $text);
+		$text = str_replace("<br />", '<br/>', $text);
+		$text = str_replace(" ", '&nbsp;', $text);
 		$text = '<div class="text" style="font-family:monospace; font: normal normal 1em/1.2em monospace;">' . $text . '</div>';
 		return $text;
 	}