diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/mass-translation.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/mass-translation.component.html
index ab676a00..cc9cea67 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/mass-translation.component.html
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/mass-translation.component.html
@@ -2,7 +2,7 @@
   <div
     *ngIf="!translationSimpleview || (!!translationSimpleview && !!isMe)"
     class="original"
-    [innerHTML]="message.sentMessageJson.original | linky | ucapSafeHtml"
+    [innerHTML]="message.sentMessageJson.original | ucapSafeHtml | linky"
     (contextmenu)="onContextMenuMessage($event, 'original')"
   ></div>
   <div
@@ -12,7 +12,7 @@
   >
     <span class="language">{{ message.sentMessageJson.destLocale }}</span>
     <span
-      [innerHTML]="message.sentMessageJson.translation | linky | ucapSafeHtml"
+      [innerHTML]="message.sentMessageJson.translation | ucapSafeHtml | linky"
     >
     </span>
   </div>
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/mass.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/mass.component.html
index 54a6eba0..5422db79 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/mass.component.html
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/mass.component.html
@@ -1,7 +1,7 @@
 <div class="bubble-main">
   <span
     class="content"
-    [innerHTML]="content | linefeedtohtml | linky | ucapSafeHtml"
+    [innerHTML]="content | linefeedtohtml | ucapSafeHtml | linky"
   ></span>
   <span>
     {{ message.sendDate | ucapDate: 'YYYY.MM.DD a hh:mm' }}
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/sticker.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/sticker.component.html
index 1e0dba11..4add2d59 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/sticker.component.html
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/sticker.component.html
@@ -8,7 +8,7 @@
     </li>
     <li
       *ngIf="contents"
-      [innerHTML]="contents | linefeedtohtml | linky | ucapSafeHtml"
+      [innerHTML]="contents | linefeedtohtml | ucapSafeHtml | linky"
     ></li>
   </ul>
 </div>
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/text.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/text.component.html
index e9f7a85f..84da2c7e 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/text.component.html
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/text.component.html
@@ -1,3 +1,3 @@
 <div class="bubble-main">
-  <span [innerHTML]="message.sentMessage | linky | ucapSafeHtml"></span>
+  <span [innerHTML]="message.sentMessage | ucapSafeHtml | linky"></span>
 </div>
diff --git a/projects/ucap-webmessenger-ui/src/lib/pipes/safe-html.pipe.ts b/projects/ucap-webmessenger-ui/src/lib/pipes/safe-html.pipe.ts
index 4b606a90..4e3d55cc 100644
--- a/projects/ucap-webmessenger-ui/src/lib/pipes/safe-html.pipe.ts
+++ b/projects/ucap-webmessenger-ui/src/lib/pipes/safe-html.pipe.ts
@@ -7,8 +7,9 @@ export class SafeHtmlPipe implements PipeTransform {
   constructor(private domSanitizer: DomSanitizer) {}
 
   public transform(value: string) {
-    return this.domSanitizer.bypassSecurityTrustHtml(
-      StringUtil.escapeHtml(value)
-    );
+    // return this.domSanitizer.bypassSecurityTrustHtml(
+    //   StringUtil.escapeHtml(value)
+    // );
+    return StringUtil.escapeHtml(value);
   }
 }