diff --git a/dev.html b/dev.html
index c5680cf94..49bcc941d 100644
--- a/dev.html
+++ b/dev.html
@@ -33,7 +33,7 @@
             'discuss@conference.conversejs.org'
         ],
         enable_smacks: true,
-        muc_respect_autojoin: false,
+        muc_respect_autojoin: true,
         message_archiving: 'always',
         debug: true
     });
diff --git a/sass/_messages.scss b/sass/_messages.scss
index c28c5846b..f43c96894 100644
--- a/sass/_messages.scss
+++ b/sass/_messages.scss
@@ -182,6 +182,8 @@
                 padding: 0;
                 width: 100%;
                 white-space: pre-wrap;
+                word-wrap: break-word;
+                word-break: break-word;
                 a {
                     word-wrap: break-word;
                     word-break: break-all;