diff --git a/admin_tickets.php b/admin_tickets.php
index 45e082e3..7d58165e 100644
--- a/admin_tickets.php
+++ b/admin_tickets.php
@@ -140,6 +140,7 @@ if($page == 'tickets'
 						$cananswer = 1;
 					}
 
+					$row['subject'] = html_entity_decode($row['subject']);
 					if(strlen($row['subject']) > 20)
 					{
 						$row['subject'] = substr($row['subject'], 0, 17) . '...';
diff --git a/customer_tickets.php b/customer_tickets.php
index 47d0b7a6..ad90d428 100644
--- a/customer_tickets.php
+++ b/customer_tickets.php
@@ -98,6 +98,7 @@ elseif($page == 'tickets')
 					$cananswer = 0;
 				}
 
+				$row['subject'] = html_entity_decode($row['subject']);
 				if(strlen($row['subject']) > 20)
 				{
 					$row['subject'] = substr($row['subject'], 0, 17) . '...';
diff --git a/lib/classes/ticket/class.ticket.php b/lib/classes/ticket/class.ticket.php
index cc6eaa70..46ef20a7 100644
--- a/lib/classes/ticket/class.ticket.php
+++ b/lib/classes/ticket/class.ticket.php
@@ -88,7 +88,10 @@ class ticket
 
 		// initialize purifier
 		require_once dirname(dirname(__FILE__)).'/htmlpurifier/library/HTMLPurifier.auto.php';
-		$this->_purifier = new HTMLPurifier();
+		$config = HTMLPurifier_Config::createDefault();
+		$config->set('Core.Encoding', 'ISO-8859-1'); // for now
+		$config->set('HTML.Doctype', 'XHTML 1.0 Transitional');
+		$this->_purifier = new HTMLPurifier($config);
 
 		// initialize data array