diff --git a/mod/choice/lib.php b/mod/choice/lib.php
index 07fccbc1f6a..51f1c1bf684 100644
--- a/mod/choice/lib.php
+++ b/mod/choice/lib.php
@@ -193,7 +193,7 @@ function choice_get_choice($choiceid) {
     if ($choice = get_record("choice", "id", $choiceid)) {
         if ($options = get_records("choice_options", "choiceid", $choiceid, "id")) {
             foreach ($options as $option) {                         
-                $choice->option[$option->id] = $option->text;     
+                $choice->option[$option->id] = $option->text; 
             }        
             return $choice;
         }
diff --git a/mod/choice/view.php b/mod/choice/view.php
index b0d02a30e18..42f19d66002 100644
--- a/mod/choice/view.php
+++ b/mod/choice/view.php
@@ -118,7 +118,7 @@
                 foreach ($choice->option as $optionid => $text) {
                     if ($text) {                                                 
                         echo "<td align=\"center\">";
-                        echo "<input type=\"radio\" name=\"answer\" value=\"".$optionid."\" ".$answerchecked[$optionid]." alt=\"$text\" />";                
+                        echo "<input type=\"radio\" name=\"answer\" value=\"".$optionid."\" ".$answerchecked[$optionid]." alt=\"".strip_tags(format_text($text))."\" />";                
                         echo format_text($text);
                         echo "</td>";
                     }
@@ -132,8 +132,8 @@
                 foreach ($choice->option as $optionid => $text) {
                     if ($text) {                                                                 
                         echo "<tr><td align=\"left\">";              
-                        echo "<input type=\"radio\" name=\"answer\" value=\"".$optionid."\" ".$answerchecked[$optionid]." alt=\"$text\" />".
-                              format_text($text, FORMAT_PLAIN);                            
+                        echo "<input type=\"radio\" name=\"answer\" value=\"".$optionid."\" ".$answerchecked[$optionid]." alt=\"".strip_tags(format_text($text))."\" />".
+                              format_text($text);                            
                         echo "</td>";
                         echo "</tr>";
                     }