diff --git a/mod/choice/lib.php b/mod/choice/lib.php
index 3f0a96a1e14..55acee6e8ea 100644
--- a/mod/choice/lib.php
+++ b/mod/choice/lib.php
@@ -28,7 +28,7 @@ $CHOICE_DISPLAY = array (CHOICE_DISPLAY_HORIZONTAL   => get_string('displayhoriz
 
 function choice_user_outline($course, $user, $mod, $choice) {
     if ($answer = get_record('choice_answers', 'choiceid', $choice->id, 'userid', $user->id)) {
-        $result->info = "'".choice_get_option_text($choice, $answer->optionid)."'";
+        $result->info = "'".format_string(choice_get_option_text($choice, $answer->optionid))."'";
         $result->time = $answer->timemodified;
         return $result;
     }
@@ -38,9 +38,9 @@ function choice_user_outline($course, $user, $mod, $choice) {
 
 function choice_user_complete($course, $user, $mod, $choice) {
     if ($answer = get_record('choice_answers', "choiceid", $choice->id, "userid", $user->id)) {
-        $result->info = "'".choice_get_option_text($choice, $answer->optionid)."'";
+        $result->info = "'".format_string(choice_get_option_text($choice, $answer->optionid))."'";
         $result->time = $answer->timemodified;
-        echo get_string("answered", "choice").": $result->info , last updated ".userdate($result->time);
+        echo get_string("answered", "choice").": $result->info. ".get_string("updated", '', userdate($result->time));
     } else {
         print_string("notanswered", "choice");
     }