diff --git a/resources/views/invited/custom_message.blade.php b/resources/views/invited/custom_message.blade.php
new file mode 100644
index 000000000000..1e949cdf17be
--- /dev/null
+++ b/resources/views/invited/custom_message.blade.php
@@ -0,0 +1,5 @@
+@if ($message == strip_tags($message))
+    <div class="alert alert-warning custom-message">{!! nl2br(Utils::isNinja() ? HTMLUtils::sanitizeHTML($message) : $message) !!}</div>    
+@else
+    {!! Utils::isNinja() ? HTMLUtils::sanitizeHTML($message) : $message !!}
+@endif
diff --git a/resources/views/invited/dashboard.blade.php b/resources/views/invited/dashboard.blade.php
index 43a989bbf5b2..3a3aa56d8414 100644
--- a/resources/views/invited/dashboard.blade.php
+++ b/resources/views/invited/dashboard.blade.php
@@ -277,7 +277,7 @@
     <div class="container main-container">
 
         @if ($message = $client->customMessage(CUSTOM_MESSAGE_DASHBOARD))
-            <div class="alert alert-warning custom-message">{!! Utils::isNinja() ? HTMLUtils::sanitizeHTML($message) : $message !!}</div>
+            @include('invited.custom_message', ['message' => $message])
         @endif
 
         <div class="row" id="main-row">
diff --git a/resources/views/invited/proposal.blade.php b/resources/views/invited/proposal.blade.php
index 20b1fc5e303a..e9868cd25de4 100644
--- a/resources/views/invited/proposal.blade.php
+++ b/resources/views/invited/proposal.blade.php
@@ -25,7 +25,7 @@
 
 	<div class="container" style="padding: 20px;">
 		@if ($message = $proposal->invoice->client->customMessage($proposal->getCustomMessageType()))
-            <div class="alert alert-warning custom-message">{!! Utils::isNinja() ? HTMLUtils::sanitizeHTML($message) : $message !!}</div>
+			@include('invited.custom_message', ['message' => $message])
         @endif
 
 		<div class="pull-right">
diff --git a/resources/views/invoices/view.blade.php b/resources/views/invoices/view.blade.php
index c0bbc18c57cd..df3b9cf9b337 100644
--- a/resources/views/invoices/view.blade.php
+++ b/resources/views/invoices/view.blade.php
@@ -153,7 +153,7 @@
 	<div class="container">
 
 		@if ($message = $invoice->client->customMessage($invoice->getCustomMessageType()))
-            <div class="alert alert-warning custom-message">{!! Utils::isNinja() ? HTMLUtils::sanitizeHTML($message) : $message !!}</div>
+			@include('invited.custom_message', ['message' => $message])
         @endif
 
         @if (!empty($partialView))