diff --git a/src/snek/static/base.css b/src/snek/static/base.css
index 9cbd146..8389618 100644
--- a/src/snek/static/base.css
+++ b/src/snek/static/base.css
@@ -138,12 +138,24 @@ a {
   color: #f05a28;
   margin-bottom: 3px;
 }
-
+* {
+word-break: break-word;
+  overflow-wrap: break-word;
+    hyphens: auto;
+}
+.highlight pre {
+    white-space: pre-wrap;
+    word-break: break-word;
+    overflow-wrap: break-word;
+    hyphens: auto;
+  }
 .chat-messages .message .message-content .text {
   margin-bottom: 5px;
   color: #e6e6e6;
   word-break: break-word;
   overflow-wrap: break-word;
+hyphens: auto;
+ 
 }
 
 .message-content {
diff --git a/src/snek/templates/message.html b/src/snek/templates/message.html
index 8c43c49..2773f0a 100644
--- a/src/snek/templates/message.html
+++ b/src/snek/templates/message.html
@@ -1 +1 @@
-<div style="max-width:100%;" data-uid="{{uid}}" data-color="{{color}}" data-channel_uid="{{channel_uid}}" data-user_nick="{{user_nick}}" data-created_at="{{created_at}}" data-user_uid="{{user_uid}}" data-message="{{message}}" class="message"><div class="avatar" style="background-color: {{color}}; color: black;">{{user_nick[0]}}</div><div class="message-content"><div class="author" style="color: {{color}};">{{user_nick}}</div><div class="text">{% autoescape false %}{% emoji %}{% linkify %}{% markdown %}{% autoescape false %}{{ message }}{%raw %} {% endraw%}{%endautoescape%}{% endmarkdown %}{% endlinkify %}{% endemoji %}{% endautoescape %}</div><div class="time no-select" data-created_at="{{created_at}}"></div></div></div>
+<div style="max-width:100%;" data-uid="{{uid}}" data-color="{{color}}" data-channel_uid="{{channel_uid}}" data-user_nick="{{user_nick}}" data-created_at="{{created_at}}" data-user_uid="{{user_uid}}" class="message"><div class="avatar" style="background-color: {{color}}; color: black;">{{user_nick[0]}}</div><div class="message-content"><div class="author" style="color: {{color}};">{{user_nick}}</div><div class="text">{% autoescape false %}{% emoji %}{% linkify %}{% markdown %}{% autoescape false %}{{ message }}{%raw %} {% endraw%}{%endautoescape%}{% endmarkdown %}{% endlinkify %}{% endemoji %}{% endautoescape %}</div><div class="time no-select" data-created_at="{{created_at}}"></div></div></div>