diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php
index b7e692d3726d..0939a79a294c 100644
--- a/app/Http/Controllers/EmailController.php
+++ b/app/Http/Controllers/EmailController.php
@@ -14,7 +14,6 @@ namespace App\Http\Controllers;
 use App\Events\Credit\CreditWasEmailed;
 use App\Events\Quote\QuoteWasEmailed;
 use App\Http\Requests\Email\SendEmailRequest;
-use App\Jobs\Entity\EmailEntity;
 use App\Jobs\PurchaseOrder\PurchaseOrderEmail;
 use App\Models\Credit;
 use App\Models\Invoice;
@@ -30,7 +29,6 @@ use App\Transformers\QuoteTransformer;
 use App\Transformers\RecurringInvoiceTransformer;
 use App\Utils\Ninja;
 use App\Utils\Traits\MakesHash;
-use Illuminate\Http\Response;
 use Illuminate\Mail\Mailables\Address;
 
 class EmailController extends BaseController
diff --git a/app/Services/Email/EmailDefaults.php b/app/Services/Email/EmailDefaults.php
index 071541ad9dda..65a104b88fdc 100644
--- a/app/Services/Email/EmailDefaults.php
+++ b/app/Services/Email/EmailDefaults.php
@@ -180,8 +180,11 @@ class EmailDefaults
             $this->email->email_object->body = EmailTemplateDefaults::getDefaultTemplate($this->email->email_object->email_template_body, $this->locale);
         }
 
-        $this->email->email_object->text_body = strip_tags($this->email->email_object->body);
-
+        $breaks = ["<br />","<br>","<br/>"];
+        $this->email->email_object->text_body = str_ireplace($breaks, "\r\n", $this->email->email_object->body);
+        $this->email->email_object->text_body = strip_tags($this->email->email_object->text_body);
+        $this->email->email_object->text_body = str_replace('$view_button', '$view_url', $this->email->email_object->text_body);
+        
         if ($this->template == 'email.template.custom') {
             $this->email->email_object->body = (str_replace('$body', $this->email->email_object->body, str_replace(["\r","\n"], "", $this->email->email_object->settings->email_style_custom)));
         }
@@ -226,7 +229,10 @@ class EmailDefaults
      */
     public function setVariables(): self
     {
+
         $this->email->email_object->body = strtr($this->email->email_object->body, $this->email->email_object->variables);
+        
+        $this->email->email_object->text_body = strtr($this->email->email_object->text_body, $this->email->email_object->variables);
 
         $this->email->email_object->subject = strtr($this->email->email_object->subject, $this->email->email_object->variables);