diff --git a/app/Helpers/Mail/GmailTransport.php b/app/Helpers/Mail/GmailTransport.php
index 64770de41e..6b3c71e0da 100644
--- a/app/Helpers/Mail/GmailTransport.php
+++ b/app/Helpers/Mail/GmailTransport.php
@@ -61,42 +61,22 @@ class GmailTransport extends Transport
         $this->gmail->cc($message->getCc());
         $this->gmail->bcc($message->getBcc());
 
-        foreach ($message->getChildren() as $child) {
-            nlog("trying to attach");
-            nlog($child->getContentType());
-            
+        foreach ($message->getChildren() as $child) 
+        {
 
-            if($child->getContentType() != 'text/plain'){
-
-                nlog($child->getHeaders());
-                
-                $this->gmail->attach(TempFile::filePath($child));
-
-            }
-
-
-        foreach ($message->getChildren() as $child) {
             nlog("trying to attach");
 
-            if($child->getContentType() != 'text/plain'){
+            if($child->getContentType() != 'text/plain')
+            {
 
-// $attachment = (new Swift_Attachment())
-//   ->setFilename($child->getHeaders()->get('Content-Type')->getParameter('name'))
-//   ->setContentType($child->getContentType())
-//   ->setBody($child->getBody());
-
-            $this->gmail->attach(new Swift_Attachment($child));
+            $this->gmail->attach(TempFile::filePath($child->getBody(), $child->getHeaders()->get('Content-Type')->getParameter('name') ));
             
             }
 
 
-        } //todo this should 'just work'
+        } 
 
 
-
-
-        } //todo this should 'just work'
-
         $this->gmail->send();
 
         $this->sendPerformed($message);
diff --git a/app/Utils/TempFile.php b/app/Utils/TempFile.php
index 97e71ecf01..3c0e2f0862 100644
--- a/app/Utils/TempFile.php
+++ b/app/Utils/TempFile.php
@@ -22,10 +22,10 @@ class TempFile
     }
 
     /* Downloads a file to temp storage and returns the path - used for mailers */
-    public static function filePath($data) :string
+    public static function filePath($data, $filename) :string
     {
 
-        $file_path = sys_get_temp_dir().'/'.sha1(microtime());
+        $file_path = sys_get_temp_dir().'/'.sha1(microtime() . '/' . $filename);
 
         file_put_contents($file_path, $data);