diff --git a/app/views/mailers/notifications/emergency_message.html.erb b/app/views/mailers/notifications/emergency_message.html.erb
index 17a3d7c89bad9d0082df5852971ae4b3e88dc180..eae4020ce83d7ebf0b0020a5a131b31c040c0c01 100644
--- a/app/views/mailers/notifications/emergency_message.html.erb
+++ b/app/views/mailers/notifications/emergency_message.html.erb
@@ -1 +1 @@
-<%= @message %>
\ No newline at end of file
+<%= sanitize @message %>
\ No newline at end of file
diff --git a/app/views/server/emergency_messages/_form.html.erb b/app/views/server/emergency_messages/_form.html.erb
index f9b8d00ad9dc6ad2f27f0c729b303340f08f0b04..7227cc00b4ec0490e048d98cd243a82086ec622b 100644
--- a/app/views/server/emergency_messages/_form.html.erb
+++ b/app/views/server/emergency_messages/_form.html.erb
@@ -12,11 +12,18 @@
     <div class="row">
       <div class="col-md-6">
         <%= f.input :subject_fr %>
-        <%= f.input :content_fr %>
+        <%= f.input :content_fr, 
+                    as: :summernote, 
+                    input_html: {
+                      data: { 'summernote-config' => 'mini' }
+                    } %>
       </div>
       <div class="col-md-6">
         <%= f.input :subject_en %>
-        <%= f.input :content_en %>
+        <%= f.input :content_en, 
+                    as: :summernote, input_html: {
+                      data: { 'summernote-config' => 'mini' }
+                    } %>
       </div>
     </div>
 
diff --git a/app/views/server/emergency_messages/show.html.erb b/app/views/server/emergency_messages/show.html.erb
index 1d98693ee9e133e514eb3cdad2c91bd4192f9aee..1555cea25954a9f277ea0ebad5f34163c7b1b387 100644
--- a/app/views/server/emergency_messages/show.html.erb
+++ b/app/views/server/emergency_messages/show.html.erb
@@ -11,7 +11,7 @@
           <% ['subject_fr', 'content_fr', 'subject_en', 'content_en'].each do |variable| %>
             <tr>
               <td><%= EmergencyMessage.human_attribute_name(variable) %></td>
-              <td class="text-end"><%= @emergency_message.public_send variable %></td>
+              <td class="text-end"><%= sanitize @emergency_message.public_send variable %></td>
             </tr>
           <% end %>
         </table>