diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php
index 56f27cd8ec5c..2a2a7ee22a1a 100644
--- a/app/Jobs/Mail/NinjaMailerJob.php
+++ b/app/Jobs/Mail/NinjaMailerJob.php
@@ -199,16 +199,32 @@ class NinjaMailerJob implements ShouldQueue
         $sending_user = $this->nmo->settings->gmail_sending_user_id;
 
         $user = User::find($this->decodePrimaryKey($sending_user));
-        $token = $user->oauth_user_token->access_token;
-
+        
         nlog("Sending via {$user->name()}");
 
+        $token = $this->refreshOfficeToken($user);
+
+        if($token)
+        {
+            $user->oauth_user_token = $token;
+            $user->save();
+
+        }
+        else {
+
+            $this->nmo->settings->email_sending_method = 'default';
+            return $this->setMailDriver();
+        
+        }
+
         $this->nmo
              ->mailable
              ->from($user->email, $user->name())
              ->withSwiftMessage(function ($message) use($token) {
                 $message->getHeaders()->addTextHeader('GmailToken', $token);     
              });
+
+        sleep(rand(1,3));
     }
 
     private function setGmailMailer()
@@ -324,4 +340,25 @@ class NinjaMailerJob implements ShouldQueue
         
     }
 
+    private function refreshOfficeToken($user)
+    {
+        $guzzle = new \GuzzleHttp\Client(); 
+        $url = 'https://login.microsoftonline.com/common/oauth2/v2.0/token'; 
+
+        $token = json_decode($guzzle->post($url, [
+            'form_params' => [
+                'client_id' => config('ninja.o365.client_id') ,
+                'client_secret' => config('ninja.o365.client_secret') ,
+                'scope' => 'email Mail.ReadWrite Mail.Send offline_access profile User.Read openid',
+                'grant_type' => 'refresh_token',
+                'refresh_token' => $user->oauth_user_refresh_token
+            ],
+        ])->getBody()->getContents());
+
+        if($token)
+            return $token->access_token;
+
+        return false;
+    }
+
 }
\ No newline at end of file