diff --git a/app/Helpers/Mail/Office365MailTransport.php b/app/Helpers/Mail/Office365MailTransport.php
index d359e38d8b..0130b59c18 100644
--- a/app/Helpers/Mail/Office365MailTransport.php
+++ b/app/Helpers/Mail/Office365MailTransport.php
@@ -34,19 +34,19 @@ class Office365MailTransport extends AbstractTransport
 
         $graph = new Graph();
         $token = $symfony_message->getHeaders()->get('GmailToken')->getValue();
-        $message->getHeaders()->remove('GmailToken');
+        $symfony_message->getHeaders()->remove('GmailToken');
 
         $graph->setAccessToken($token);
 
             try {
-                $graphMessage = $graph->createRequest('POST', '/users/'.$this->getFrom().'/sendmail')
+                $graphMessage = $graph->createRequest('POST', '/users/'.$symfony_message->getFrom()[0]->getAddress().'/sendmail')
                     ->attachBody(base64_encode($message->toString()))
                     ->addHeaders(['Content-Type' => 'text/plain'])
                     ->setReturnType(\Microsoft\Graph\Model\Message::class)
                     ->execute();
             } catch (\Exception $e) {
                 sleep(5);
-                $graphMessage = $graph->createRequest('POST', '/users/'.$this->getFrom().'/sendmail')
+                $graphMessage = $graph->createRequest('POST', '/users/'.$symfony_message->getFrom()[0]->getAddress().'/sendmail')
                     ->attachBody(base64_encode($message->toString()))
                     ->addHeaders(['Content-Type' => 'text/plain'])
                     ->setReturnType(\Microsoft\Graph\Model\Message::class)
@@ -55,11 +55,6 @@ class Office365MailTransport extends AbstractTransport
         
     }
 
-    private function getFrom()
-    {
-        return 'turbo124@outlook.com.au';
-    }
-
     private function base64_encode($data)
     {
         return rtrim(strtr(base64_encode($data), ['+' => '-', '/' => '_']), '=');