diff --git a/resources/ticket.scss b/resources/ticket.scss
index 255322ee0..9645e89eb 100644
--- a/resources/ticket.scss
+++ b/resources/ticket.scss
@@ -205,6 +205,11 @@ div.ticket-title {
     }
 }
 
+.ticket-body {
+    word-wrap: break-word;
+    word-break: break-word;
+}
+
 .new-message .detail {
     padding: 8px 10px;
 }
diff --git a/templates/ticket/message.html b/templates/ticket/message.html
index 7c4c65923..bdde438f2 100644
--- a/templates/ticket/message.html
+++ b/templates/ticket/message.html
@@ -19,7 +19,7 @@
                 {% endif %}
             </span>
         </div>
-        <div class="content content-description">
+        <div class="content content-description ticket-body">
             {{ message.body|markdown('ticket', MATH_ENGINE)|reference|str|safe }}
         </div>
     </div>