diff --git a/codepot/src/codepot/views/code_diff.php b/codepot/src/codepot/views/code_diff.php
index 00114d75..63c32033 100644
--- a/codepot/src/codepot/views/code_diff.php
+++ b/codepot/src/codepot/views/code_diff.php
@@ -308,7 +308,12 @@ if (FALSE) // don't want to delete code for the original diff view.
 else
 {
 	$http_user_agent = $_SERVER['HTTP_USER_AGENT']; 
-	$is_msie = (preg_match('/MSIE/i',$http_user_agent) && !preg_match('/Opera/i',$http_user_agent));
+	$is_msie = (stristr($http_user_agent, 'MSIE') != FALSE && 
+	            stristr($http_user_agent, 'Opera') == FALSE);
+	if (!$is_msie)
+	{
+		$is_msie = (preg_match ("/^Mozilla.+\(Windows.+\) like Gecko$/", $http_user_agent) != FALSE);
+	}
 
 	print '<div style="width: 100%; overflow: hidden;" id="code_diff_mainarea_result_fullview">';
 
diff --git a/codepot/src/css/common.css b/codepot/src/css/common.css
index 1631835a..9109261c 100644
--- a/codepot/src/css/common.css
+++ b/codepot/src/css/common.css
@@ -226,7 +226,7 @@ body {
 
 .content .mainarea form textarea {
 	border: 1px solid #BBCCDD;
-	font-family: monospace, consolas;
+	font-family: consolas, "Andale Mono", monospace;
 	font-size: inherit;
 }
 
@@ -274,8 +274,9 @@ body {
 .content .mainarea pre.wiki {
 	white-space: pre-wrap;
 	padding: 1em;
-	line-height: 1.5em;
-	font-size: 1.1em;
+	line-height: 1.4em;
+	//font-size: 1.1em;
+	font-family: consolas, "Andale Mono", monospace;
 }
 
 .content .mainarea tt {
@@ -369,8 +370,9 @@ body {
 	/*border: 1px solid #ccc;*/
 	background-color: #F8F8FA;
 	border: none;
-	font-size: 1.1em;
-	line-height: 1.5em;
+	//font-size: 1.1em;
+	font-family: consolas, "Andale Mono", monospace;
+	line-height: 1.4em;
 	padding: 1em;
 
 	tab-size: 5;
diff --git a/codepot/src/css/issue.css b/codepot/src/css/issue.css
index 482a5a19..18a7e5d4 100644
--- a/codepot/src/css/issue.css
+++ b/codepot/src/css/issue.css
@@ -107,7 +107,7 @@
 	display: block;
 	padding: 1px;
 	font-size: inherit;
-	font-family: monospace, consolas;
+	font-family: consolas, "Andale Mono", monospace;
 	width: 100%;
 }
 
@@ -179,7 +179,7 @@
 	display: block;
 	padding: 1px;
 	font-size: inherit;
-	font-family: monospace, consolas;
+	font-family: consolas, "Andale Mono", monospace;
 	width: 100%;
 }