diff --git a/app/Mail/SupportMessageSent.php b/app/Mail/SupportMessageSent.php
index e8301dfd1d56..7fde45a34e7d 100644
--- a/app/Mail/SupportMessageSent.php
+++ b/app/Mail/SupportMessageSent.php
@@ -52,12 +52,15 @@ class SupportMessageSent extends Mailable
 
         $account = auth()->user()->account;
 
-        $plan = $account->plan ?: 'Self Hosted';
+        $plan = $account->plan ?: 'Free Self Hosted';
 
         $company = auth()->user()->company();
         $user = auth()->user();
 
-        $subject = "Customer MSG {$user->present()->name} - [{$plan} - DB:{$company->db}]";
+        if(Ninja::isHosted())
+            $subject = "Hosted {$user->present()->name} - [{$plan} - DB:{$company->db}]";
+        else
+            $subject = "Self Host {$user->present()->name} - [{$plan} - DB:{$company->db}]";
 
         return $this->from(config('mail.from.address'), config('mail.from.name')) 
                 ->replyTo($user->email, $user->present()->name())