diff --git a/include/class.api.php b/include/class.api.php
index 1b78b5aec7d006da5518cd48b9958f66bf28ce1a..76fb481dec6cc5b81a0ffb3a3295c73916179da9 100644
--- a/include/class.api.php
+++ b/include/class.api.php
@@ -340,6 +340,10 @@ class ApiXmlDataParser extends XmlDataParser {
         }
         unset($value);
 
+        if(isset($current['message']) && $current['message'])
+            $current['message'] = sprintf('<div style="white-space:pre-wrap">%s</div>',
+                    Format::htmlchars($current['message']));
+
         return $current;
     }
 }
@@ -394,6 +398,11 @@ class ApiJsonDataParser extends JsonDataParser {
                 $value = $this->fixup($value);
             }
         }
+
+        if(isset($current['message']) && $current['message'])
+            $current['message'] = sprintf('<div style="white-space:pre-wrap">%s</div>',
+                    Format::htmlchars($current['message']));
+
         return $current;
     }
 }