diff --git a/app/Http/Controllers/ContractAdminController.php b/app/Http/Controllers/ContractAdminController.php
index 67b1a3538..a3b96ffdb 100644
--- a/app/Http/Controllers/ContractAdminController.php
+++ b/app/Http/Controllers/ContractAdminController.php
@@ -145,25 +145,19 @@ class ContractAdminController extends Controller
         while($mail->SendMail($bid['character_id'], 'character', $subject, $body)) {
             $tries++;
             if($tries == 5) {
-                //Update the contract to mark it as finished
-                Contract::where(['contract_id' => $request->contract_id])->update([
-                    'finished' => true,
-                ]);
-
-                //Create the accepted contract entry into the table
-                $accepted = new AcceptedBid;
-                $accepted->contract_id = $contract['contract_id'];
-                $accepted->bid_id = $bid['id'];
-                $accepted->bid_amount = $bid['bid_amount'];
-                $accepted->notes = $bid['notes'];
-                $accepted->save();
+                TidyContract($contract, $bid);
 
                 return redirect('/contracts/admin/display')->with('error', 'Could not deliver mail.  Please manually send the mail to the winner.');
             }
         }
+        
+        TidyContract($contract, $bid);
+        
+        return redirect('/contracts/admin/display')->with('success', 'Contract finalized.  Mail took ' . $tries . ' attempt to send to the winner.');
+    }
 
-        //Update the contract to mark it as finished
-        Contract::where(['contract_id' => $request->contract_id])->update([
+    private function TidyContract($contract, $bid) {
+        Contract::where(['contract_id' => $contract['contract_id']])->update([
             'finished' => true,
         ]);
 
@@ -174,8 +168,5 @@ class ContractAdminController extends Controller
         $accepted->bid_amount = $bid['bid_amount'];
         $accepted->notes = $bid['notes'];
         $accepted->save();
-        
-        return redirect('/contracts/admin/display')->with('success', 'Contract finalized.  Mail took ' . $tries . ' to send to the winner.');
-
     }
 }
diff --git a/resources/views/contracts/admin/displayend.blade.php b/resources/views/contracts/admin/displayend.blade.php
index e4d2a888a..2a10d4952 100644
--- a/resources/views/contracts/admin/displayend.blade.php
+++ b/resources/views/contracts/admin/displayend.blade.php
@@ -47,7 +47,7 @@
                                 <td>{{ $bid['bid_amount'] }}</td>
                                 <td>{{ $bid['character_name'] }}</td>
                                 <td>{{ $bid['corporation_name'] }}</td>
-                                <td>{{ $bid['notes'] }}</td>
+                                <td><pre>{{ $bid['notes'] }}</pre></td>
                                 <td>{{ Form::radio('accept', $bid['id'], false, ['class' => 'form-control']) }}</td>
                             </tr>
                         @endforeach
diff --git a/resources/views/contracts/includes/all.blade.php b/resources/views/contracts/includes/all.blade.php
index 306b9059b..3fe84d998 100644
--- a/resources/views/contracts/includes/all.blade.php
+++ b/resources/views/contracts/includes/all.blade.php
@@ -22,7 +22,9 @@
                     </div>
                     <span class="border-dark">
                         <div class="container">
-                            {{ $contract['body'] }}
+                            <pre>
+                                {{ $contract['body'] }}
+                            </pre>
                         </div>
                     </span>
                     <hr>
diff --git a/resources/views/contracts/includes/private.blade.php b/resources/views/contracts/includes/private.blade.php
index 92ca9e312..7b7cfd79b 100644
--- a/resources/views/contracts/includes/private.blade.php
+++ b/resources/views/contracts/includes/private.blade.php
@@ -22,7 +22,9 @@
                     </div>
                     <hr>
                     <div class="container">
-                        {{ $contract['body'] }}
+                        <pre>
+                            {{ $contract['body'] }}
+                        </pre>
                     </div>
                     <hr>
                     <div class="container">
diff --git a/resources/views/contracts/includes/public.blade.php b/resources/views/contracts/includes/public.blade.php
index fd21fe2c2..f54d3f33a 100644
--- a/resources/views/contracts/includes/public.blade.php
+++ b/resources/views/contracts/includes/public.blade.php
@@ -24,7 +24,9 @@
                     </div>
                     <hr>
                     <div class="container">
-                        {{ $contract['body'] }}
+                        <pre>
+                            {{ $contract['body'] }}
+                        </pre>
                     </div>
                     <hr>
                     <div class="container">