diff --git a/app/Http/Controllers/PostMarkController.php b/app/Http/Controllers/PostMarkController.php
index 253a31e72d94..cb0ef144c219 100644
--- a/app/Http/Controllers/PostMarkController.php
+++ b/app/Http/Controllers/PostMarkController.php
@@ -82,6 +82,8 @@ class PostMarkController extends BaseController
                 $this->invitation->email_error = $request->input('Details');
                 $this->invitation->save();
             }
+            else
+                return response()->json(['message' => 'Message not found']);
 
             switch ($request->input('RecordType')) 
             {
diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php
index a33eb48ca8eb..56521b827898 100644
--- a/app/Jobs/Mail/NinjaMailerJob.php
+++ b/app/Jobs/Mail/NinjaMailerJob.php
@@ -72,6 +72,18 @@ class NinjaMailerJob implements ShouldQueue
         /* Set the email driver */
         $this->setMailDriver();
 
+        if (strlen($this->nmo->settings->reply_to_email) > 1) {
+            
+            $reply_to_name = strlen($this->nmo->settings->reply_to_email) > 1 ? $this->nmo->settings->reply_to_email : $this->nmo->company->present()->name();
+            $this->nmo->mailable->replyTo($this->nmo->settings->reply_to_email, $reply_to_name);
+
+        }
+
+        if (strlen($settings->bcc_email) > 1) {
+            $this->nmo->mailable->bcc($settings->bcc_email, $settings->bcc_email);
+        }
+
+
         //send email
         try {
             nlog("trying to send");
diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php
index 62c7ed921763..8bf643e3be8a 100644
--- a/app/Mail/TemplateEmail.php
+++ b/app/Mail/TemplateEmail.php
@@ -53,10 +53,7 @@ class TemplateEmail extends Mailable
         $company = $this->client->company;
 
         $this->from(config('mail.from.address'), $this->company->present()->name());
-
-        if (strlen($settings->reply_to_email) > 1) 
-            $this->replyTo($settings->reply_to_email, $settings->reply_to_email);
-
+        
         if (strlen($settings->bcc_email) > 1) 
             $this->bcc($settings->bcc_email, $settings->bcc_email);