diff --git a/app/DataMapper/Analytics/Mail/EmailBounce.php b/app/DataMapper/Analytics/Mail/EmailBounce.php
new file mode 100644
index 000000000000..bf86139a9dad
--- /dev/null
+++ b/app/DataMapper/Analytics/Mail/EmailBounce.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\DataMapper\Analytics;
+
+class EmailBounce
+{
+    /**
+     * The type of Sample.
+     *
+     * Monotonically incrementing counter
+     *
+     * 	- counter
+     *
+     * @var string
+     */
+    public $type = 'mixed_metric';
+
+    /**
+     * The name of the counter.
+     * @var string
+     */
+    public $name = 'job.bounce.email';
+
+    /**
+     * The datetime of the counter measurement.
+     *
+     * date("Y-m-d H:i:s")
+     *
+     * @var DateTime
+     */
+    public $datetime;
+
+    /**
+     * The Class failure name
+     * set to 0.
+     *
+     * @var string
+     */
+    public $string_metric5 = 'tag';
+
+    /**
+     * The exception string
+     * set to 0.
+     *
+     * @var string
+     */
+    public $string_metric6 = 'from';
+
+    /**
+     * Company Key
+     * @var string
+     */
+    public $string_metric7 = 'messageid';
+
+    /**
+     * The counter
+     * set to 1.
+     *
+     * @var string
+     */
+    public $int_metric1 = 1;
+
+    public function __construct($string_metric5,$string_metric6,$string_metric7) {
+        $this->string_metric5 = $string_metric5;
+        $this->string_metric6 = $string_metric6;
+        $this->string_metric7 = $string_metric7;
+    }
+}
diff --git a/app/DataMapper/Analytics/Mail/EmailSpam.php b/app/DataMapper/Analytics/Mail/EmailSpam.php
new file mode 100644
index 000000000000..75b9dc26b53b
--- /dev/null
+++ b/app/DataMapper/Analytics/Mail/EmailSpam.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\DataMapper\Analytics;
+
+class EmailSpam
+{
+    /**
+     * The type of Sample.
+     *
+     * Monotonically incrementing counter
+     *
+     * 	- counter
+     *
+     * @var string
+     */
+    public $type = 'mixed_metric';
+
+    /**
+     * The name of the counter.
+     * @var string
+     */
+    public $name = 'job.spam.email';
+
+    /**
+     * The datetime of the counter measurement.
+     *
+     * date("Y-m-d H:i:s")
+     *
+     * @var DateTime
+     */
+    public $datetime;
+
+    /**
+     * The Class failure name
+     * set to 0.
+     *
+     * @var string
+     */
+    public $string_metric5 = 'tag';
+
+    /**
+     * The exception string
+     * set to 0.
+     *
+     * @var string
+     */
+    public $string_metric6 = 'from';
+
+    /**
+     * Company Key
+     * @var string
+     */
+    public $string_metric7 = 'messageid';
+
+    /**
+     * The counter
+     * set to 1.
+     *
+     * @var string
+     */
+    public $int_metric1 = 1;
+
+    public function __construct($string_metric5,$string_metric6,$string_metric7) {
+        $this->string_metric5 = $string_metric5;
+        $this->string_metric6 = $string_metric6;
+        $this->string_metric7 = $string_metric7;
+    }
+}
diff --git a/app/Http/Controllers/PostMarkController.php b/app/Http/Controllers/PostMarkController.php
index e4f6a855d0af..2e45fa1c2ce2 100644
--- a/app/Http/Controllers/PostMarkController.php
+++ b/app/Http/Controllers/PostMarkController.php
@@ -11,6 +11,7 @@
 
 namespace App\Http\Controllers;
 
+use App\DataMapper\Analytics\EmailBounce;
 use App\Jobs\Util\SystemLogger;
 use App\Libraries\MultiDB;
 use App\Models\CreditInvitation;
@@ -19,6 +20,7 @@ use App\Models\QuoteInvitation;
 use App\Models\RecurringInvoiceInvitation;
 use App\Models\SystemLog;
 use Illuminate\Http\Request;
+use Turbo124\Beacon\Facades\LightLogs;
 
 /**
  * Class PostMarkController.
@@ -71,8 +73,7 @@ class PostMarkController extends BaseController
 
         if($request->header('X-API-SECURITY') && $request->header('X-API-SECURITY') == config('postmark.secret'))
         {
-
-            nlog($request->all());
+            // nlog($request->all());
 
             MultiDB::findAndSetDbByCompanyKey($request->input('Tag'));
             
@@ -157,6 +158,14 @@ class PostMarkController extends BaseController
         $this->invitation->email_status = 'bounced';
         $this->invitation->save();
 
+        $bounce = new EmailBounce(
+            $request->input('Tag'),
+            $request->input('From'),
+            $request->input('MessageID')
+        );
+
+        LightLogs::create($bounce)->batch();
+        
         SystemLogger::dispatch($request->all(), SystemLog::CATEGORY_MAIL, SystemLog::EVENT_MAIL_BOUNCED, SystemLog::TYPE_WEBHOOK_RESPONSE, $this->invitation->contact->client);
     }