diff --git a/main/inc/lib/agenda.lib.php b/main/inc/lib/agenda.lib.php
index a65c354920..ccf9e8aaae 100644
--- a/main/inc/lib/agenda.lib.php
+++ b/main/inc/lib/agenda.lib.php
@@ -135,8 +135,9 @@ class Agenda
         $start = api_get_utc_datetime($start);
         $end = api_get_utc_datetime($end);
         $allDay = isset($allDay) && $allDay == 'true' ? 1 : 0;
-
         $id = null;
+        $content = nl2br($content);
+
         switch ($this->type) {
             case 'personal':
                 $attributes = array(
@@ -1743,6 +1744,10 @@ class Agenda
             $url = api_get_self().'?action='.$action.'&id='.$id.'&type='.$this->type;
         }
 
+        if (isset($params['content'])) {
+            $params['content'] = nl2br($params['content']);
+        }
+
         $form = new FormValidator(
             'add_event',
             'post',