diff --git a/app/Export/CSV/DocumentExport.php b/app/Export/CSV/DocumentExport.php
index 9748e5e1137f..35387e294dc2 100644
--- a/app/Export/CSV/DocumentExport.php
+++ b/app/Export/CSV/DocumentExport.php
@@ -25,7 +25,7 @@ class DocumentExport extends BaseExport
 
     private $entity_transformer;
 
-    public $date_key = 'created_at';
+    public string $date_key = 'created_at';
 
     public array $entity_keys = [
         'record_type' => 'record_type',
diff --git a/app/Export/CSV/ExpenseExport.php b/app/Export/CSV/ExpenseExport.php
index b1ac4bee85fe..704753dfc208 100644
--- a/app/Export/CSV/ExpenseExport.php
+++ b/app/Export/CSV/ExpenseExport.php
@@ -25,7 +25,7 @@ class ExpenseExport extends BaseExport
 
     private $expense_transformer;
 
-    public $date_key = 'date';
+    public string $date_key = 'date';
 
     public array $entity_keys = [
         'amount' => 'amount',
diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php
index 87772f3ab2c6..56d76a4c79d8 100644
--- a/app/Http/Controllers/EmailController.php
+++ b/app/Http/Controllers/EmailController.php
@@ -190,6 +190,12 @@ class EmailController extends BaseController
             $this->entity_transformer = RecurringInvoiceTransformer::class;
         }
 
+        if($entity_obj instanceof PurchaseOrder){
+            $this->entity_type = PurchaseOrder::class;
+            $this->entity_transformer = PurchaseOrderTransformer::class;
+        }
+
+        // @phpstan-ignore-next-line
         return $this->itemResponse($entity_obj->fresh());
     }
 
diff --git a/app/Http/Requests/Email/SendEmailRequest.php b/app/Http/Requests/Email/SendEmailRequest.php
index 9ccc6be5b080..36cd4d2e9854 100644
--- a/app/Http/Requests/Email/SendEmailRequest.php
+++ b/app/Http/Requests/Email/SendEmailRequest.php
@@ -83,7 +83,7 @@ class SendEmailRequest extends Request
         $input = $this->all();
         
         
-        if (Ninja::isHosted() && !auth()->user()->company()->account->account_sms_verified) {
+        if (Ninja::isHosted() && !auth()->user()->account->account_sms_verified) {
             $this->error_message = ctrans('texts.authorization_sms_failure');
 
             return false;
diff --git a/app/Services/Email/EmailDefaults.php b/app/Services/Email/EmailDefaults.php
index 65f77c6e61bc..3c5bab8b9bf1 100644
--- a/app/Services/Email/EmailDefaults.php
+++ b/app/Services/Email/EmailDefaults.php
@@ -259,15 +259,14 @@ class EmailDefaults
      */
     private function setAttachments(): self
     {
-        $attachments = [];
+        $documents = [];
 
         if ($this->email->email_object->settings->document_email_attachment && $this->email->company->account->hasFeature(Account::FEATURE_DOCUMENTS)) {
-            foreach ($this->email->company->documents as $document) {
-                $attachments[] = ['file' => base64_encode($document->getFile()), 'name' => $document->name];
-            }
+
+            $this->email->email_object->documents = array_merge($this->email->email_object->documents, $this->email->company->documents->pluck('id')->toArray());
         }
 
-        $this->email->email_object->attachments = array_merge($this->email->email_object->attachments, $attachments);
+        
 
         return $this;
     }