diff --git a/src/components/attachment/attachment.scss b/src/components/attachment/attachment.scss
index 9c787e09..2ef5cf4d 100644
--- a/src/components/attachment/attachment.scss
+++ b/src/components/attachment/attachment.scss
@@ -33,7 +33,8 @@
       line-height: 1.5;
       padding: 0.5em;
       margin: 0;
-      white-space: nowrap;
+      white-space: pre-line;
+      word-break: break-word;
       text-overflow: ellipsis;
       overflow: hidden;
     }
diff --git a/src/components/media_modal/media_modal.vue b/src/components/media_modal/media_modal.vue
index 8b76aafb..802a60b3 100644
--- a/src/components/media_modal/media_modal.vue
+++ b/src/components/media_modal/media_modal.vue
@@ -189,7 +189,8 @@ $modal-view-button-icon-margin: 0.5em;
     min-height: 1em;
     max-width: 500px;
     max-height: 9.5em;
-    word-break: break-all;
+    word-break: break-word;
+    white-space: pre-line;
   }
 
   .modal-image {