diff --git a/question/format/xml/format.php b/question/format/xml/format.php
index f7ac6b86390..f0abcd7573b 100644
--- a/question/format/xml/format.php
+++ b/question/format/xml/format.php
@@ -1437,20 +1437,20 @@ class qformat_xml extends qformat_default {
 
                 foreach ($question->options->answers as $answer) {
                     $percent = 100 * $answer->fraction;
-                    $expout .= "<answer fraction=\"{$percent}\">\n";
+                    $expout .= "    <answer fraction=\"{$percent}\">\n";
                     // The "<text/>" tags are an added feature, old files won't have them.
-                    $expout .= "    <text>{$answer->answer}</text>\n";
-                    $expout .= "    <tolerance>{$answer->tolerance}</tolerance>\n";
-                    $expout .= "    <tolerancetype>{$answer->tolerancetype}</tolerancetype>\n";
-                    $expout .= "    <correctanswerformat>" .
+                    $expout .= $this->writetext($answer->answer, 3);
+                    $expout .= "      <tolerance>{$answer->tolerance}</tolerance>\n";
+                    $expout .= "      <tolerancetype>{$answer->tolerancetype}</tolerancetype>\n";
+                    $expout .= "      <correctanswerformat>" .
                             $answer->correctanswerformat . "</correctanswerformat>\n";
-                    $expout .= "    <correctanswerlength>" .
+                    $expout .= "      <correctanswerlength>" .
                             $answer->correctanswerlength . "</correctanswerlength>\n";
-                    $expout .= "    <feedback {$this->format($answer->feedbackformat)}>\n";
-                    $expout .= $this->writetext($answer->feedback);
+                    $expout .= "      <feedback {$this->format($answer->feedbackformat)}>\n";
+                    $expout .= $this->writetext($answer->feedback, 4);
                     $expout .= $this->write_files($this->feedbackfiles[$answer->id]);
-                    $expout .= "    </feedback>\n";
-                    $expout .= "</answer>\n";
+                    $expout .= "      </feedback>\n";
+                    $expout .= "    </answer>\n";
                 }
                 if (isset($question->options->unitgradingtype)) {
                     $expout .= "    <unitgradingtype>" .