diff --git a/DiscordChatExporter.Core/Resources/ExportService/DarkTheme.css b/DiscordChatExporter.Core/Resources/ExportService/DarkTheme.css
index 74c3ace9..e873b185 100644
--- a/DiscordChatExporter.Core/Resources/ExportService/DarkTheme.css
+++ b/DiscordChatExporter.Core/Resources/ExportService/DarkTheme.css
@@ -95,6 +95,7 @@ img.msg-avatar {
 div.msg-right {
     flex: 1;
     margin-left: 20px;
+    min-width: 50%;
 }
 
 span.msg-user {
@@ -117,7 +118,7 @@ span.msg-edited {
 div.msg-content {
     font-size: .9375em;
     padding-top: 5px;
-    word-break: break-all;
+    word-wrap: break-word;
 }
 
 div.msg-attachment {
diff --git a/DiscordChatExporter.Core/Resources/ExportService/LightTheme.css b/DiscordChatExporter.Core/Resources/ExportService/LightTheme.css
index 89876bbe..3d2f81d7 100644
--- a/DiscordChatExporter.Core/Resources/ExportService/LightTheme.css
+++ b/DiscordChatExporter.Core/Resources/ExportService/LightTheme.css
@@ -95,6 +95,7 @@ img.msg-avatar {
 div.msg-right {
     flex: 1;
     margin-left: 20px;
+    min-width: 50%;
 }
 
 span.msg-user {
@@ -117,7 +118,7 @@ span.msg-edited {
 div.msg-content {
     font-size: .9375em;
     padding-top: 5px;
-    word-break: break-all;
+    word-wrap: break-word;
 }
 
 div.msg-attachment {