diff --git a/include/class.forms.php b/include/class.forms.php
index 2bbb04a66559d7264816968e2ce023b9b271e083..10322eae1a52f5eb4e2b2aad59f85387ed93af40 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -586,7 +586,7 @@ class TextareaField extends FormField {
         if ($config['html'])
             return Format::safe_html($value);
         else
-            return Format::htmlchars($value);
+            return nl2br(Format::htmlchars($value));
     }
 }