diff --git a/mod/forum/db/install.xml b/mod/forum/db/install.xml
index 201df61d2d1..d874ed514bf 100644
--- a/mod/forum/db/install.xml
+++ b/mod/forum/db/install.xml
@@ -10,8 +10,9 @@
         <FIELD NAME="course" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="id" NEXT="type"/>
         <FIELD NAME="type" TYPE="char" LENGTH="20" NOTNULL="true" DEFAULT="general" SEQUENCE="false" ENUM="true" ENUMVALUES="'single', 'news', 'general', 'social', 'eachuser', 'teacher', 'qanda'" PREVIOUS="course" NEXT="name"/>
         <FIELD NAME="name" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="type" NEXT="intro"/>
-        <FIELD NAME="intro" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="name" NEXT="assessed"/>
-        <FIELD NAME="assessed" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="intro" NEXT="assesstimestart"/>
+        <FIELD NAME="intro" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="name" NEXT="introformat"/>
+        <FIELD NAME="introformat" TYPE="int" LENGTH="2" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" COMMENT="text format of intro field" PREVIOUS="intro" NEXT="assessed"/>
+        <FIELD NAME="assessed" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="introformat" NEXT="assesstimestart"/>
         <FIELD NAME="assesstimestart" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="assessed" NEXT="assesstimefinish"/>
         <FIELD NAME="assesstimefinish" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="assesstimestart" NEXT="scale"/>
         <FIELD NAME="scale" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="assesstimefinish" NEXT="maxbytes"/>
diff --git a/mod/forum/db/upgrade.php b/mod/forum/db/upgrade.php
index 7892b8e6a81..d95bc90a1ea 100644
--- a/mod/forum/db/upgrade.php
+++ b/mod/forum/db/upgrade.php
@@ -220,6 +220,18 @@ function xmldb_forum_upgrade($oldversion) {
         upgrade_mod_savepoint($result, 2009042002, 'forum');
     }
 
+    if ($result && $oldversion < 2009042003) {
+
+    /// Define field introformat to be added to forum
+        $table = new xmldb_table('forum');
+        $field = new xmldb_field('introformat', XMLDB_TYPE_INTEGER, '2', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0', 'intro');
+
+    /// Launch add field introformat
+        $dbman->add_field($table, $field);
+
+    /// forum savepoint reached
+        upgrade_mod_savepoint($result, 2009042003, 'forum');
+    }
 
     return $result;
 }
diff --git a/mod/forum/index.php b/mod/forum/index.php
index 0ccc9670492..7be7884d1e2 100644
--- a/mod/forum/index.php
+++ b/mod/forum/index.php
@@ -193,7 +193,7 @@
                 }
             }
 
-            $forum->intro = shorten_text(trim(format_text($forum->intro, FORMAT_HTML, $introoptions)), $CFG->forum_shortpost);
+            $forum->intro = shorten_text(trim(format_text($forum->intro, $forum->introformat, $introoptions)), $CFG->forum_shortpost);
             $forumname = format_string($forum->name, true);;
 
             if ($cm->visible) {
@@ -316,7 +316,7 @@
                 }
 
                 $introoptions->para=false;
-                $forum->intro = shorten_text(trim(format_text($forum->intro, FORMAT_HTML, $introoptions)), $CFG->forum_shortpost);
+                $forum->intro = shorten_text(trim(format_text($forum->intro, $forum->introformat, $introoptions)), $CFG->forum_shortpost);
 
                 if ($cm->sectionnum != $currentsection) {
                     $printsection = $cm->sectionnum;
diff --git a/mod/forum/mod_form.php b/mod/forum/mod_form.php
index cb8f21c9515..3e16366f6aa 100644
--- a/mod/forum/mod_form.php
+++ b/mod/forum/mod_form.php
@@ -32,7 +32,7 @@ class mod_forum_mod_form extends moodleform_mod {
         $mform->addRule('intro', get_string('required'), 'required', null, 'client');
         $mform->setHelpButton('intro', array('writing', 'questions', 'richtext2'), false, 'editorhelpbutton');
 
-        $mform->addElement('format', 'format', get_string('format'));
+        $mform->addElement('format', 'introformat', get_string('format'));
 
         $options = array();
         $options[0] = get_string('no');
diff --git a/mod/forum/post.php b/mod/forum/post.php
index cea697d9aa8..486a620a37f 100644
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -804,7 +804,8 @@
     } else {
         $forum->intro = trim($forum->intro);
         if (!empty($forum->intro)) {
-            print_box(format_text($forum->intro), 'generalbox', 'intro');
+            $options = (object)array('noclean'=>true);
+            print_box(format_text($forum->intro, $forum->introformat, $options), 'generalbox', 'intro');
         }
     }
 
diff --git a/mod/forum/version.php b/mod/forum/version.php
index 9f661283ec7..4207a942707 100644
--- a/mod/forum/version.php
+++ b/mod/forum/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2009042002;
+$module->version  = 2009042003;
 $module->requires = 2009041700;  // Requires this Moodle version
 $module->cron     = 60;
 
diff --git a/mod/forum/view.php b/mod/forum/view.php
index 0d5d42bcc30..04ab3bf3070 100644
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -234,7 +234,8 @@
             if (!empty($forum->intro)) {
                 $options = new stdclass;
                 $options->para = false;
-                print_box(format_text($forum->intro, FORMAT_MOODLE, $options), 'generalbox', 'intro');
+                $options->noclean = true;
+                print_box(format_text($forum->intro, $forum->introformat, $options), 'generalbox', 'intro');
             }
             echo '<p class="mdl-align">';
             if (forum_user_can_post_discussion($forum, null, -1, $cm)) {
@@ -262,7 +263,8 @@
             if (!empty($forum->intro)) {
                 $options = new stdclass;
                 $options->para = false;
-                print_box(format_text($forum->intro, FORMAT_MOODLE, $options), 'generalbox', 'intro');
+                $options->noclean = true;
+                print_box(format_text($forum->intro, $forum->introformat, $options), 'generalbox', 'intro');
             }
             echo '<br />';
             if (!empty($showall)) {
diff --git a/mod/glossary/db/install.xml b/mod/glossary/db/install.xml
index 5989bf58cc9..ee25a196ba7 100644
--- a/mod/glossary/db/install.xml
+++ b/mod/glossary/db/install.xml
@@ -9,8 +9,9 @@
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" ENUM="false" NEXT="course"/>
         <FIELD NAME="course" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="id" NEXT="name"/>
         <FIELD NAME="name" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="course" NEXT="intro"/>
-        <FIELD NAME="intro" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="name" NEXT="allowduplicatedentries"/>
-        <FIELD NAME="allowduplicatedentries" TYPE="int" LENGTH="2" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="intro" NEXT="displayformat"/>
+        <FIELD NAME="intro" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="name" NEXT="introformat"/>
+        <FIELD NAME="introformat" TYPE="int" LENGTH="2" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="intro" NEXT="allowduplicatedentries"/>
+        <FIELD NAME="allowduplicatedentries" TYPE="int" LENGTH="2" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="introformat" NEXT="displayformat"/>
         <FIELD NAME="displayformat" TYPE="char" LENGTH="50" NOTNULL="true" DEFAULT="dictionary" SEQUENCE="false" ENUM="false" PREVIOUS="allowduplicatedentries" NEXT="mainglossary"/>
         <FIELD NAME="mainglossary" TYPE="int" LENGTH="2" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="displayformat" NEXT="showspecial"/>
         <FIELD NAME="showspecial" TYPE="int" LENGTH="2" NOTNULL="true" UNSIGNED="true" DEFAULT="1" SEQUENCE="false" ENUM="false" PREVIOUS="mainglossary" NEXT="showalphabet"/>
diff --git a/mod/glossary/db/upgrade.php b/mod/glossary/db/upgrade.php
index 40a90569097..9f241233896 100644
--- a/mod/glossary/db/upgrade.php
+++ b/mod/glossary/db/upgrade.php
@@ -190,6 +190,21 @@ function xmldb_glossary_upgrade($oldversion) {
         upgrade_mod_savepoint($result, 2009042005, 'glossary');
     }
 
+    if ($result && $oldversion < 2009042006) {
+
+    /// Define field introformat to be added to glossary
+        $table = new xmldb_table('glossary');
+        $field = new xmldb_field('introformat', XMLDB_TYPE_INTEGER, '2', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0', 'intro');
+
+    /// Conditionally launch add field introformat
+        if (!$dbman->field_exists($table, $field)) {
+            $dbman->add_field($table, $field);
+        }
+
+    /// glossary savepoint reached
+        upgrade_mod_savepoint($result, 2009042006, 'glossary');
+    }
+
     return $result;
 }
 
diff --git a/mod/glossary/version.php b/mod/glossary/version.php
index 90f4c0d8bf7..4a051799720 100644
--- a/mod/glossary/version.php
+++ b/mod/glossary/version.php
@@ -5,7 +5,7 @@
 ///  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 /////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2009042005;
+$module->version  = 2009042006;
 $module->requires = 2009041700;  // Requires this Moodle version
 $module->cron     = 0;           // Period for cron to check this module (secs)
 
diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 72861cb790a..58367404ed3 100644
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -325,7 +325,8 @@
     if ( $glossary->intro && $showcommonelements ) {
         $options = new stdclass;
         $options->para = false;
-        print_box(format_text($glossary->intro, FORMAT_MOODLE, $options), 'generalbox', 'intro');
+        $options->noclean = true;
+        print_box(format_text($glossary->intro, $glossary->introformat, $options), 'generalbox', 'intro');
     }
 
 /// Search box