diff --git a/src/app/shared/content/content.html b/src/app/shared/content/content.html
index dbd507e..f900675 100644
--- a/src/app/shared/content/content.html
+++ b/src/app/shared/content/content.html
@@ -68,9 +68,9 @@
 
   <span class="event-content clickable" [ngClass]="{ 'event-content-big': content && content.length < 7 }">
     <ng-container *ngFor="let token of dynamicText">
-      <ng-template [ngIf]="isString(token)"> {{ token }} </ng-template>
+      <ng-template [ngIf]="isString(token)">{{ token }}</ng-template>
       <ng-template [ngIf]="!isString(token)" [ngSwitch]="token.token">
-        <ng-container *ngSwitchCase="'username'"><a class="reply-link" [routerLink]="['/p', token.word]">@{{ getDisplayName(token.word) }}</a> </ng-container>
+        <ng-container *ngSwitchCase="'username'"><a class="reply-link" [routerLink]="['/p', token.word]">@{{ getDisplayName(token.word) }}</a></ng-container>
         <ng-container *ngSwitchCase="'linebreak'"><br /></ng-container>
       </ng-template>
 
diff --git a/src/app/shared/content/content.ts b/src/app/shared/content/content.ts
index 91d9928..f3082ce 100644
--- a/src/app/shared/content/content.ts
+++ b/src/app/shared/content/content.ts
@@ -287,7 +287,9 @@ export class ContentComponent {
 
     for (let index = 0; index < lines.length; index++) {
       const line = lines[index];
-      let lineTokens = line.split(/\s+/);
+      //let lineTokens = line.split(/\s+/);
+      let lineTokens = line.split(/(\s|'s)/g);
+      
       lineTokens = lineTokens.filter((entry) => entry != '');
       lineTokens.push('<br>');
       tokens.push(...lineTokens);