4 files changed, 6 insertions, 6 deletions
diff --git a/src/components/mention_link/mention_link.scss b/src/components/mention_link/mention_link.scss
index c7db7fb9..a4326296 100644
--- a/src/components/mention_link/mention_link.scss
+++ b/src/components/mention_link/mention_link.scss
@@ -5,6 +5,7 @@
   white-space: normal;
   display: inline;
   color: var(--link);
+  word-break: normal;
 
   & .new,
   & .original {
diff --git a/src/components/mention_link/mention_link.vue b/src/components/mention_link/mention_link.vue
index d8ab79fb..13786c3a 100644
--- a/src/components/mention_link/mention_link.vue
+++ b/src/components/mention_link/mention_link.vue
@@ -43,14 +43,12 @@
           class="serverName"
           :class="{ '-faded': shouldFadeDomain }"
           v-html="'@' + serverName"
-        /></span>
-        <span
+        /></span><span
           v-if="isYou && shouldShowYous"
           :class="{ '-you': shouldBoldenYou }"
-        >{{ $t('status.you') }}</span>
+        > {{ $t('status.you') }}</span>
         <!-- eslint-enable vue/no-v-html -->
-      </a>
-      <span
+      </a><span
         v-if="shouldShowTooltip"
         class="full popover-default"
         :class="[highlightType]"
diff --git a/src/components/mentions_line/mentions_line.scss b/src/components/mentions_line/mentions_line.scss
index 1a485860..9650a9a4 100644
--- a/src/components/mentions_line/mentions_line.scss
+++ b/src/components/mentions_line/mentions_line.scss
@@ -2,6 +2,7 @@
   word-break: break-all;
 
   .showMoreLess {
+    margin-left: 0.5em;
     white-space: normal;
     color: var(--link);
   }
diff --git a/src/components/status_body/status_body.scss b/src/components/status_body/status_body.scss
index 51623a26..c7732bfe 100644
--- a/src/components/status_body/status_body.scss
+++ b/src/components/status_body/status_body.scss
@@ -9,7 +9,7 @@
   & .text,
   & .summary {
     font-family: var(--postFont, sans-serif);
-    white-space: normal;
+    white-space: pre-wrap;
     overflow-wrap: break-word;
     word-wrap: break-word;
     word-break: break-word;