diff --git a/lib/classes/ticket/class.ticket.php b/lib/classes/ticket/class.ticket.php
index 631117c1..2c412e0b 100644
--- a/lib/classes/ticket/class.ticket.php
+++ b/lib/classes/ticket/class.ticket.php
@@ -291,7 +291,7 @@ class ticket
 				$mail->SetFrom($this->settings['ticket']['noreply_email'], $this->settings['ticket']['noreply_name']);
 				$mail->Subject = $mail_subject;
 				$mail->AltBody = $mail_body;
-				$mail->MsgHTML($mail_body);
+				$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
 				$mail->AddAddress($usr['email'], $usr['firstname'] . ' ' . $usr['name']);
 				$mail->Send();
 			} catch(phpmailerException $e) {
@@ -319,7 +319,7 @@ class ticket
 				$mail->SetFrom($this->settings['ticket']['noreply_email'], $this->settings['ticket']['noreply_name']);
 				$mail->Subject = $mail_subject;
 				$mail->AltBody = $mail_body;
-				$mail->MsgHTML($mail_body);
+				$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
 				$mail->AddAddress($admin['email'], $admin['name']);
 				$mail->Send();
 			} catch(phpmailerException $e) {
@@ -691,7 +691,7 @@ class ticket
 			{
 				if(strtolower($_var) == 'message')
 				{
-					return htmlspecialchars_decode(nl2br($this->t_data[$_var]));
+					return str_replace('script>', 'pre>', htmlspecialchars_decode(nl2br($this->t_data[$_var])));
 				}
 				else
 				{
diff --git a/templates/admin/ticket/archivesearch.tpl b/templates/admin/ticket/archivesearch.tpl
index cff53d62..f3e1cdfc 100644
--- a/templates/admin/ticket/archivesearch.tpl
+++ b/templates/admin/ticket/archivesearch.tpl
@@ -15,13 +15,13 @@ $header
 					<td class="field_display">{$lng['ticket']['subject']}</td>
 					<td class="field_display">{$lng['ticket']['lastreplier']}</td>
 					<td class="field_display">{$lng['ticket']['priority']}</td>
-	        		<td class="field_display_search">&nbsp;</td>
+	        			<td class="field_display_search">&nbsp;</td>
 				</tr>
 				$tickets
       		</if>
       		<if $tickets_count < 1 >
         		<tr>
-				<td class="field_display_border_left" colspan="5">{$lng['ticket']['noresults']}</td>
+				<td class="field_display_border_left" colspan="6">{$lng['ticket']['noresults']}</td>
 				</tr>
 			</if>
 		</table>