diff --git a/indefero/src/IDF/FileUtil.php b/indefero/src/IDF/FileUtil.php
index 355efe3..db9563c 100644
--- a/indefero/src/IDF/FileUtil.php
+++ b/indefero/src/IDF/FileUtil.php
@@ -84,8 +84,10 @@ class IDF_FileUtil
             $ext = self::$map[$fileinfo[2]];
         else
             $ext = "text";
-
-        $content = '<div id="highlight"><script type="syntaxhighlighter" class="brush: ' . $ext . '">' . $content . '</script></div>';
+        if ($ext == "php" || $ext == "html" || $ext == "htm" || $ext == "js")
+            $content = '<div id="highlight"><pre class="brush: ' . $ext . '">' . str_replace("<", "&lt;", $content)  . '</pre></div>';
+        else
+            $content = '<div id="highlight"><script type="syntaxhighlighter" class="brush: ' . $ext . '">' . $content . '</script></div>';
         return  Pluf_Template::markSafe($content);
     }
 
diff --git a/indefero/www/media/idf/css/syntaxhighlight/shCore.css b/indefero/www/media/idf/css/syntaxhighlight/shCore.css
index 2bbf94b..e23e682 100644
--- a/indefero/www/media/idf/css/syntaxhighlight/shCore.css
+++ b/indefero/www/media/idf/css/syntaxhighlight/shCore.css
@@ -261,4 +261,8 @@
 
 /* Strings */
 .syntaxhighlighter .asmstring
-{ color: #b0002d; font-weight: normal !important; }
\ No newline at end of file
+{ color: #b0002d; font-weight: normal !important; }
+
+body .syntaxhighlighter .line {
+    white-space: pre-wrap !important; /* make code wrap */
+}
\ No newline at end of file