diff --git a/frontend/src/components/ChatBox/ChatBoxMessage.css b/frontend/src/components/ChatBox/ChatBoxMessage.css
index 1b9877f80..74efa013c 100644
--- a/frontend/src/components/ChatBox/ChatBoxMessage.css
+++ b/frontend/src/components/ChatBox/ChatBoxMessage.css
@@ -10,6 +10,7 @@
   -moz-hyphens: auto;
   -ms-hyphens: auto;
   hyphens: auto;
+  white-space: pre-wrap;
   word-wrap: break-word;
 }
 
@@ -47,7 +48,7 @@
 }
 
 .chat-box-message-preamble {
-    float: right;
-    margin-left: auto;
-    background-color: rgb(255, 255, 230);
+  float: right;
+  margin-left: auto;
+  background-color: rgb(255, 255, 230);
 }
diff --git a/frontend/src/components/EmailBox/SentEmail.css b/frontend/src/components/EmailBox/SentEmail.css
index d94a0aaa5..b8da89b01 100644
--- a/frontend/src/components/EmailBox/SentEmail.css
+++ b/frontend/src/components/EmailBox/SentEmail.css
@@ -6,6 +6,7 @@
   font-size: 14px;
   margin-top: 10px;
   padding: 5px;
+  white-space: pre-wrap;
 }
 
 .sent-email-divider {