diff --git a/htdocs/application/controllers/main.php b/htdocs/application/controllers/main.php
index cec2922..806c1ca 100755
--- a/htdocs/application/controllers/main.php
+++ b/htdocs/application/controllers/main.php
@@ -50,7 +50,7 @@ class Main extends CI_Controller
 			$data['private_set'] = $this->db_session->userdata('private');
 			$data['snipurl_set'] = $this->db_session->userdata('snipurl');
 			$data['remember_set'] = $this->db_session->userdata('remember');
-			$data['paste_set'] = $paste;
+			$data['paste_set'] = htmlspecialchars($paste);
 			$data['title_set'] = $title;
 			$data['reply'] = $reply;
 			
diff --git a/htdocs/application/models/pastes.php b/htdocs/application/models/pastes.php
index a7a9542..d5301d5 100755
--- a/htdocs/application/models/pastes.php
+++ b/htdocs/application/models/pastes.php
@@ -33,7 +33,7 @@ class Pastes extends CI_Model
 		$this->load->library('process');
 		$data['id'] = NULL;
 		$data['created'] = time();
-		$data['raw'] = htmlspecialchars($this->input->post('code'));
+		$data['raw'] = $this->input->post('code');
 		$data['lang'] = htmlspecialchars($this->input->post('lang'));
 		$data['replyto'] = $this->input->post('reply');
 		
diff --git a/htdocs/application/views/view/raw.php b/htdocs/application/views/view/raw.php
index edccfe3..da1b310 100755
--- a/htdocs/application/views/view/raw.php
+++ b/htdocs/application/views/view/raw.php
@@ -1,34 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-	<head>
-		<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-		<title><?php echo $this->config->item('site_name'); ?></title>
-		<link rel="stylesheet" href="<?php echo base_url(); ?>static/styles/raw.css" type="text/css" media="screen" title="raw stylesheet" charset="utf-8" />
-		<?php if(!empty($scripts)){ ?>
-		<?php foreach($scripts as $script){ ?>
-		<script src="<?php echo base_url(); ?>static/js/<?php echo $script; ?>" type="text/javascript"></script>
-		<?php }} ?>
-	</head>
-	<body>
-		<div id="container">
-			<?php if(isset($insert)){
-				echo $insert;
-			}?>
-			
-			<h1><?php echo $title?></h1>
-			<?php if(!$this->db_session->userdata("view_raw")){?>
-				<a href="<?php echo site_url("view/".$pid)?>">Go Back</a>
-			<?php } else { ?>
-				<a href="<?php echo base_url()?>">Go Home</a>
-			<?php }?> 
-			&mdash; <a href="<?php echo site_url("view/options")?>">Change Paste Viewing Options</a>
-			<pre>
-<?php echo $raw?>
-			</pre>
-			<?php if(!$this->db_session->userdata("view_raw")){?><a href="<?php echo site_url("view/".$pid)?>">Go Back</a><?php } else { ?><a href="<?php echo base_url()?>">Go Home</a><?php }?>		
-		</div>
-		<?php $this->load->view('defaults/stats'); ?>
-	</body>
-</html>
+<?php
+header('Content-Type:text/plain; charset=utf-8');
+echo $raw;
