diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 704b745..dd2014b 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -17,7 +17,7 @@ import { TerminalComponent } from './terminal/terminal.component';
 import { AppRoutingModule } from './app-routing.module';
 import { TestmessengerComponent } from './testmessenger/testmessenger.component';
 import { DeploymentNotificationService } from './services/deployment-notification.service';
-import { SafePipe } from './pipes/safe.pipe';
+import { SafePipe, SafeHtmlPipe } from './pipes/safe.pipe';
 import { ConsoleComponent } from './console/console.component';
 import { MonacoEditorModule } from 'ngx-monaco-editor';
 import {
@@ -41,6 +41,7 @@ import { LoaderComponent } from './loader/loader.component';
     DashboardComponent,
     TestmessengerComponent,
     SafePipe,
+    SafeHtmlPipe,
     ConsoleComponent,
     LoaderComponent
   ],
diff --git a/src/app/messages/messages.component.html b/src/app/messages/messages.component.html
index 9704cf0..a6d3f56 100644
--- a/src/app/messages/messages.component.html
+++ b/src/app/messages/messages.component.html
@@ -8,7 +8,7 @@
       <div class="tao-grid-center-left originator">{{message.originator}}</div>
       <div class="timestamp tao-grid-center-right">{{message.timestamp | date:'HH:mm:ss'}}</div>
     </div>
-    <div class="tfw-grid-message-body" [innerHtml]="message.message"></div>
+    <div class="tfw-grid-message-body" [innerHtml]="message.message | safeHtml"></div>
   </div>
   <div *ngIf="showTypingIndicator" 
         class="tfw-grid-message jumping-circle-container"
diff --git a/src/app/pipes/safe.pipe.ts b/src/app/pipes/safe.pipe.ts
index 28f18bd..90c80a4 100644
--- a/src/app/pipes/safe.pipe.ts
+++ b/src/app/pipes/safe.pipe.ts
@@ -11,3 +11,14 @@ export class SafePipe implements PipeTransform {
     return this.sanitizer.bypassSecurityTrustResourceUrl(value);
   }
 }
+
+@Pipe({
+  name: 'safeHtml'
+})
+export class SafeHtmlPipe implements PipeTransform  {
+  constructor(private sanitized: DomSanitizer) {}
+
+  transform(value) {
+    return this.sanitized.bypassSecurityTrustHtml(value);
+  }
+}