diff --git a/app/assets/javascripts/filters/filters.coffee b/app/assets/javascripts/filters/filters.coffee
index 9b6334d91..3d6ef0be3 100644
--- a/app/assets/javascripts/filters/filters.coffee
+++ b/app/assets/javascripts/filters/filters.coffee
@@ -98,10 +98,25 @@ Application.Filters.filter "humanize", [ ->
     Humanize.truncate(element, param, null)
 ]
 
+##
+# This filter will convert ASCII carriage-return character to the HTML break-line tag
+##
 Application.Filters.filter "breakFilter", [ ->
   (text) ->
     if text != undefined
-      text.replace(/\n/g, '<br />')
+      text.replace(/\n+/g, '<br />')
+]
+
+##
+# This filter will take a HTML text as input and will return it without the html tags
+##
+Application.Filters.filter "simpleText", [ ->
+  (text) ->
+    if text != undefined
+      text = text.replace(/<br\s*\/?>/g, '\n')
+      text.replace(/<\/?\w+[^>]*>/g, '')
+    else
+      ""
 ]
 
 Application.Filters.filter "toTrusted", [ "$sce", ($sce) ->
diff --git a/app/assets/templates/admin/trainings/_form.html.erb b/app/assets/templates/admin/trainings/_form.html.erb
index b4715c238..b10ad2647 100644
--- a/app/assets/templates/admin/trainings/_form.html.erb
+++ b/app/assets/templates/admin/trainings/_form.html.erb
@@ -57,16 +57,10 @@
 
 
     <div class="form-group m-b-xl" ng-class="{'has-error': trainingForm['training[description]'].$dirty && trainingForm['training[description]'].$invalid}">
-      <label for="description" class="col-sm-2 control-label">{{ 'description' | translate }} *</label>
+      <label for="training_description" class="col-sm-2 control-label">{{ 'description' | translate }} *</label>
       <div class="col-sm-10">
-        <textarea ng-model="training.description"
-                  class="form-control"
-                  rows="12"
-                  id="training_description"
-                  placeholder=""
-                  name="training[description]"
-                  required>
-        </textarea>
+        <input type="hidden" name="training[description]" ng-value="training.description" />
+        <summernote ng-model="training.description" id="training_description" placeholder="" config="summernoteOpts" name="training[description]" required></summernote>
         <span class="help-block" ng-show="trainingForm['training[description]'].$dirty && trainingForm['training[description]'].$error.required" translate>{{ 'description_is_required' }}</span>
       </div>
     </div>
diff --git a/app/assets/templates/trainings/index.html.erb b/app/assets/templates/trainings/index.html.erb
index 4766a9f20..4d8923fc5 100644
--- a/app/assets/templates/trainings/index.html.erb
+++ b/app/assets/templates/trainings/index.html.erb
@@ -30,7 +30,9 @@
         </div>
         <div class="panel-body" style="heigth:170px;">
           <h1 class="m-b">{{training.name}}</h1>
-          <p ng-show="training.description">{{training.description | humanize : 140 }}</p>
+          <div ng-if="training.description">
+            <p ng-bind-html="training.description | simpleText | humanize : 140 | breakFilter"></p>
+          </div>
         </div>
         <div class="panel-footer no-padder">