diff --git a/htdocs/application/models/pastes.php b/htdocs/application/models/pastes.php
index 4c98985..cfe2423 100755
--- a/htdocs/application/models/pastes.php
+++ b/htdocs/application/models/pastes.php
@@ -254,7 +254,7 @@ class Pastes extends CI_Model
 			$this->db->select('title, name, created, pid, snipurl');
 			$this->db->where('replyto', $data['pid']);
 			$this->db->order_by('id', 'desc');
-			$this->db->limit(10);
+			$this->db->limit(100);
 			$query = $this->db->get('pastes');
 			
 			if ($query->num_rows() > 0) 
diff --git a/htdocs/application/views/defaults/paste_form.php b/htdocs/application/views/defaults/paste_form.php
index 1d40219..b15cac5 100644
--- a/htdocs/application/views/defaults/paste_form.php
+++ b/htdocs/application/views/defaults/paste_form.php
@@ -45,6 +45,13 @@
 		<div class="item">
 			<label for="paste">Your paste
 				<span class="instruction">Paste your paste here</span>
+<?php
+if($this->uri->segment(1) == 'view'
+    && isset($codemirror_languages[$lang_set])
+    && gettype($codemirror_languages[$lang_set]) == 'array'){
+    ?><span class="instruction"><a href="#" id="enable_codemirror">Enable syntax highlighting</a></span><?php
+}
+?>
 			</label>
 			
 			<textarea id="code" name="code" cols="40" rows="20" tabindex="4"><?php if(isset($paste_set)){ echo $paste_set; }?></textarea>
diff --git a/htdocs/static/js/codemirror_exec.js b/htdocs/static/js/codemirror_exec.js
index 18839e6..1a738cb 100644
--- a/htdocs/static/js/codemirror_exec.js
+++ b/htdocs/static/js/codemirror_exec.js
@@ -9,5 +9,10 @@ CM.init = function() {
 };
 
 $(document).ready(function() {
-	CM.init();
+	$enable_codemirror = $('#enable_codemirror');
+	$enable_codemirror.click(function() {
+		CM.init();
+		$enable_codemirror.remove();
+		return false;
+	});
 });