diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php
index 1b274fca2353..215949837570 100644
--- a/app/Mail/Engine/PaymentEmailEngine.php
+++ b/app/Mail/Engine/PaymentEmailEngine.php
@@ -388,6 +388,13 @@ class PaymentEmailEngine extends BaseEmailEngine
      */
     private function buildViewButton(string $link, string $text): string
     {
+
+
+    if ($this->settings->email_style == 'plain') {
+        return '<a href="'. $link .'" target="_blank">'. $text .'</a>';
+    }
+
+
         return '
 <div>
 <!--[if (gte mso 9)|(IE)]>
diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php
index 6d8dd1ffaac8..70334976837b 100644
--- a/app/Mail/TemplateEmail.php
+++ b/app/Mail/TemplateEmail.php
@@ -116,7 +116,7 @@ class TemplateEmail extends Mailable
             }//remove whitespace if any has been inserted.
         }
 
-        $this->subject($this->build_email->getSubject())
+        $this->subject(str_replace("<br>", "", $this->build_email->getSubject()))
             ->text('email.template.text', [
                 'text_body' => $this->build_email->getTextBody(),
                 'whitelabel' => $this->client->user->account->isPaid() ? true : false,
diff --git a/app/Services/Email/EmailMailable.php b/app/Services/Email/EmailMailable.php
index 8cbb990e36c5..50ae63181bd2 100644
--- a/app/Services/Email/EmailMailable.php
+++ b/app/Services/Email/EmailMailable.php
@@ -41,7 +41,7 @@ class EmailMailable extends Mailable
     public function envelope()
     {
         return new Envelope(
-            subject: $this->email_object->subject,
+            subject: str_replace("<br>","",$this->email_object->subject),
             tags: [$this->email_object->company_key],
             replyTo: $this->email_object->reply_to,
             from: $this->email_object->from,
diff --git a/app/Utils/VendorHtmlEngine.php b/app/Utils/VendorHtmlEngine.php
index aab9b9fb3302..87072df5b703 100644
--- a/app/Utils/VendorHtmlEngine.php
+++ b/app/Utils/VendorHtmlEngine.php
@@ -808,6 +808,13 @@ html {
      */
     private function buildViewButton(string $link, string $text): string
     {
+
+
+if ($this->settings->email_style == 'plain') {
+    return '<a href="'. $link .'" target="_blank">'. $text .'</a>';
+}
+
+
         return '
 <div>
 <!--[if (gte mso 9)|(IE)]>