diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 335e6a841c3..67a910cb122 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1146,6 +1146,10 @@ function forum_print_post(&$post, $courseid, $ownpost=false, $reply=false, $link
     } else {
         echo "<td bgcolor=\"$THEME->cellheading2\" class=\"forumpostheadertopic\" width=\"100%\">";
     }
+
+    if (!empty($CFG->filterall)) {      /// Put the subject through the filters
+        $post->subject = filter_text($post->subject, $courseid);
+    }
     echo "<p>";
     echo "<font size=3><b>$post->subject</b></font><br />";
     echo "<font size=2>";
diff --git a/mod/forum/post.php b/mod/forum/post.php
index bd784010a06..9330047ff50 100644
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -20,7 +20,7 @@
             $errordestination = $SESSION->fromurl;
         }
 
-        $post->subject = strip_tags($post->subject);  // Strip all tags
+        $post->subject = strip_tags($post->subject, '<lang>');        // Strip all tags except lang
         $post->message = clean_text($post->message, $post->format);   // Clean up any bad tags
 
         $post->attachment = $_FILES["attachment"];