diff --git a/css/glowingbear.css b/css/glowingbear.css
index 1127b31..cc671a3 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -33,7 +33,12 @@ td.prefix {
     vertical-align: middle;
     padding-right: 5px;
 }
-
+td.message {
+    word-wrap: break-word;
+}
+.text {
+    white-space: pre-wrap;
+}
 /* Lastly, apply responsive CSS fixes as necessary */
 @media (max-width: 767px) {
     #footer {
@@ -69,9 +74,6 @@ input#sendMessage {
     height: 100%; 
     min-height: 100%; 
 }
-span.text {
-    white-space: nowrap;
-}
 
 .bufferlines {
     font-family: monospace;
@@ -81,9 +83,6 @@ span.text {
     position: relative;
     padding-bottom: 55px;
 }
-.text {
-    word-wrap: break-word;
-}
 
 .navbar-fixed-bottom {
     margin: 0 5px 0 14%;