diff --git a/guest_view_invoice.php b/guest_view_invoice.php
index e64a7a06..4011cb14 100644
--- a/guest_view_invoice.php
+++ b/guest_view_invoice.php
@@ -225,7 +225,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
 
                                     <tr>
                                         <td><?php echo $item_name; ?></td>
-                                        <td><div style="white-space:pre-line"><?php echo $item_description; ?></div></td>
+                                        <td><?php echo nl2br($item_description); ?></td>
                                         <td class="text-center"><?php echo $item_quantity; ?></td>
                                         <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_price, $invoice_currency_code); ?></td>
                                         <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_tax, $invoice_currency_code); ?></td>
@@ -246,7 +246,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
                     <?php if (!empty($invoice_note)) { ?>
                         <div class="card">
                             <div class="card-body">
-                                <div style="white-space:pre-line"><?php echo $invoice_note; ?></div>
+                                <?php echo nl2br($invoice_note); ?>
                             </div>
                         </div>
                     <?php } ?>
@@ -281,7 +281,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
 
             <hr class="mt-5">
 
-            <div style="white-space:pre-line; text-align: center;"><?php echo $config_invoice_footer; ?></div>
+            <div style="text-center"><?php echo nl2br($config_invoice_footer); ?></div>
         </div>
     </div>
 
diff --git a/guest_view_quote.php b/guest_view_quote.php
index 0dabc895..a0dcf575 100644
--- a/guest_view_quote.php
+++ b/guest_view_quote.php
@@ -202,7 +202,7 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie
 
                                     <tr>
                                         <td><?php echo $item_name; ?></td>
-                                        <td><div style="white-space:pre-line"><?php echo $item_description; ?></div></td>
+                                        <td><?php echo nl2br($item_description); ?></td>
                                         <td class="text-center"><?php echo $item_quantity; ?></td>
                                         <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_price, $quote_currency_code); ?></td>
                                         <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_tax, $quote_currency_code); ?></td>
@@ -227,7 +227,7 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie
                     <?php if (!empty($quote_note)) { ?>
                         <div class="card">
                             <div class="card-body">
-                                <div style="white-space:pre-line"><?php echo $quote_note; ?></div>
+                                <?php echo nl2br($quote_note); ?>
                             </div>
                         </div>
                     <?php } ?>
@@ -257,7 +257,7 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie
 
             <hr class="mt-5">
 
-            <div style="white-space:pre-line; text-align: center;"><?php echo $config_quote_footer; ?></div>
+            <div style="text-center"><?php echo nl2br($config_quote_footer); ?></div>
         </div>
     </div>
 
diff --git a/invoice.php b/invoice.php
index 66e026a4..d9bcb31c 100644
--- a/invoice.php
+++ b/invoice.php
@@ -303,7 +303,7 @@ if (isset($_GET['invoice_id'])) {
                                             <?php } ?>
                                         </td>
                                         <td><?php echo $item_name; ?></td>
-                                        <td><div style="white-space:pre-line"><?php echo $item_description; ?></div></td>
+                                        <td><?php echo nl2br($item_description); ?></td>
                                         <td class="text-center"><?php echo $item_quantity; ?></td>
                                         <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_price, $invoice_currency_code); ?></td>
                                         <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_tax, $invoice_currency_code); ?></td>
@@ -372,7 +372,7 @@ if (isset($_GET['invoice_id'])) {
                             </div>
                         </div>
                         <div class="card-body">
-                            <div style="white-space:pre-line"><?php echo $invoice_note; ?></div>
+                            <?php echo nl2br($invoice_note); ?>
                         </div>
                     </div>
                 </div>
@@ -406,7 +406,7 @@ if (isset($_GET['invoice_id'])) {
 
             <hr class="d-none d-print-block mt-5">
 
-            <center class="d-none d-print-block" style="white-space:pre-line"><?php echo htmlentities($config_invoice_footer); ?></center>
+            <div class="d-none d-print-block text-center"><?php echo nl2br(htmlentities($config_invoice_footer)); ?></div>
         </div>
     </div>
 
diff --git a/portal/ticket.php b/portal/ticket.php
index abcb8f0b..5f6fa3f8 100644
--- a/portal/ticket.php
+++ b/portal/ticket.php
@@ -81,9 +81,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
                 <button type="submit" class="btn btn-primary" name="add_ticket_comment">Reply</button>
             </form>
 
-        <?php }
-
-        elseif (empty($ticket_feedback)) { ?>
+        <?php } elseif (empty($ticket_feedback)) { ?>
 
             <h4>Rate your ticket</h4>
 
@@ -99,9 +97,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
                 </button>
             </form>
 
-        <?php }
-
-        else { ?>
+        <?php } else { ?>
 
             <h4>Rated <?php echo $ticket_feedback ?> -- Thanks for your feedback!</h4>
 
diff --git a/quote.php b/quote.php
index 2eb5e500..6ea532d8 100644
--- a/quote.php
+++ b/quote.php
@@ -293,7 +293,7 @@ if (isset($_GET['quote_id'])) {
                                             <?php } ?>
                                         </td>
                                         <td><?php echo $item_name; ?></td>
-                                        <td><div style="white-space:pre-line"><?php echo $item_description; ?></div></td>
+                                        <td><?php echo nl2br($item_description); ?></td>
                                         <td class="text-center"><?php echo $item_quantity; ?></td>
                                         <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_price, $quote_currency_code); ?></td>
                                         <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_tax, $quote_currency_code); ?></td>
@@ -362,7 +362,7 @@ if (isset($_GET['quote_id'])) {
                             </div>
                         </div>
                         <div class="card-body">
-                            <div style="white-space:pre-line"><?php echo $quote_note; ?></div>
+                            <?php echo nl2br($quote_note); ?>
                         </div>
                     </div>
                 </div>
@@ -391,7 +391,7 @@ if (isset($_GET['quote_id'])) {
 
             <hr class="d-none d-print-block mt-5">
 
-            <center class="d-none d-print-block" style="white-space:pre-line"><?php echo htmlentities($config_quote_footer); ?></center>
+            <div class="d-none d-print-block text-center"><?php echo nl2br(htmlentities($config_quote_footer)); ?></div>
         </div>
     </div>
 
diff --git a/recurring_invoice.php b/recurring_invoice.php
index f5dfad66..b778f8e2 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -232,7 +232,7 @@ if (isset($_GET['recurring_id'])) {
                                             </div>  
                                         </td>
                                         <td><?php echo $item_name; ?></td>
-                                        <td><div style="white-space:pre-line"><?php echo $item_description; ?></div></td>
+                                        <td><?php echo nl2br($item_description; ?></td>
                                         <td class="text-center"><?php echo $item_quantity; ?></td>
                                         <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_price, $recurring_currency_code); ?></td>
                                         <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_tax, $recurring_currency_code); ?></td>
@@ -299,7 +299,7 @@ if (isset($_GET['recurring_id'])) {
                             </div>
                         </div>
                         <div class="card-body">
-                            <div style="white-space:pre-line"><?php echo $recurring_note; ?></div>
+                            <?php echo nl2br($recurring_note); ?>
                         </div>
                     </div>
                 </div>