diff --git a/inc/display.php b/inc/display.php
index f107462e..a1bfd2f5 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -22,9 +22,9 @@
 		public function __construct($id, $thread, $subject, $email, $name, $trip, $body, $time, $thumb, $thumbx, $thumby, $file, $filex, $filey, $filesize, $filename) {
 			$this->id = $id;
 			$this->thread = $thread;
-			$this->subject = $subject;
+			$this->subject = utf8tohtml($subject);
 			$this->email = $email;
-			$this->name = $name;
+			$this->name = utf8tohtml($name);
 			$this->trip = $trip;
 			$this->body = $body;
 			$this->time = $time;
@@ -68,9 +68,9 @@
 		public $omitted = 0;
 		public function __construct($id, $subject, $email, $name, $trip, $body, $time, $thumb, $thumbx, $thumby, $file, $filex, $filey, $filesize, $filename) {
 			$this->id = $id;
-			$this->subject = $subject;
+			$this->subject = utf8tohtml($subject);
 			$this->email = $email;
-			$this->name = $name;
+			$this->name = utf8tohtml($name);
 			$this->trip = $trip;
 			$this->body = $body;
 			$this->time = $time;
diff --git a/post.php b/post.php
index 4fc5ce98..9ba09fc1 100644
--- a/post.php
+++ b/post.php
@@ -67,7 +67,7 @@
 		}
 		
 		$post['name'] = (!empty($_POST['name'])?$_POST['name']:'Anonymous');
-		$post['subject'] = utf8tohtml($_POST['subject']);
+		$post['subject'] = $_POST['subject'];
 		$post['email'] = utf8tohtml($_POST['email']);
 		$post['body'] = $_POST['body'];
 		$post['password'] = $_POST['password'];
@@ -78,7 +78,7 @@
 			error(ERR_FILSIZE);
 		
 		$trip = generate_tripcode($post['name']);
-		$post['name'] = utf8tohtml($trip[0]);
+		$post['name'] = $trip[0];
 		$post['trip'] = (isset($trip[1])?$trip[1]:'');
 		
 		if($post['email'] == 'noko') {