diff --git a/app/Mail/SupportMessageSent.php b/app/Mail/SupportMessageSent.php
index db5c7f6bb2c4..0f0cf099d7c5 100644
--- a/app/Mail/SupportMessageSent.php
+++ b/app/Mail/SupportMessageSent.php
@@ -52,15 +52,19 @@ class SupportMessageSent extends Mailable
 
         $account = auth()->user()->account;
 
-        $plan = $account->plan ?: 'Forever Free';
+        $priority = '';
+        $plan = $account->plan ?: '';
+
+        if(strlen($plan) >1)
+            $priority = '[PRIORITY] ';
 
         $company = auth()->user()->company();
         $user = auth()->user();
 
         if(Ninja::isHosted())
-            $subject = "Hosted {$user->present()->name} - [{$plan} - {$company->db}]";
+            $subject = "{$priority}Hosted-{$company->db} :: Customer Support - [{$plan}]";
         else
-            $subject = "Self Host {$user->present()->name} - [{$plan} - {$company->db}]";
+            $subject = "{$priority}Self Hosted :: Customer Support - [{$plan}]";
 
         return $this->from(config('mail.from.address'), $user->present()->name()) 
                 ->replyTo($user->email, $user->present()->name())