diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 69d85eecc216..fd5ee50c9573 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -67,6 +67,7 @@ class ReportController extends BaseController
         }
 
         $reportTypes = [
+            'activity',
             'aging',
             'client',
             'expense',
diff --git a/app/Ninja/Reports/ActivityReport.php b/app/Ninja/Reports/ActivityReport.php
new file mode 100644
index 000000000000..70c6145db27d
--- /dev/null
+++ b/app/Ninja/Reports/ActivityReport.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Ninja\Reports;
+
+use App\Models\Activity;
+use Auth;
+
+class ActivityReport extends AbstractReport
+{
+    public $columns = [
+        'date',
+        'client',
+        'user',
+        'activity',
+    ];
+
+    public function run()
+    {
+        $account = Auth::user()->account;
+
+        $startDate = $this->startDate->format('Y-m-d');
+        $endDate = $this->endDate->format('Y-m-d');
+
+        $activities = Activity::scope()
+            ->with('client.contacts', 'user', 'invoice', 'payment', 'credit', 'task', 'expense', 'account')
+            ->whereRaw("DATE(created_at) >= \"{$startDate}\" and DATE(created_at) <= \"$endDate\"");
+
+        foreach ($activities->get() as $activity) {
+            $client = $activity->client;
+            $this->data[] = [
+                $activity->present()->createdAt,
+                $client ? ($this->isExport ? $client->getDisplayName() : $client->present()->link) : '',
+                $activity->present()->user,
+                $activity->getMessage(),
+            ];
+        }
+
+
+    }
+}
diff --git a/resources/views/emails/user_message_html.blade.php b/resources/views/emails/user_message_html.blade.php
new file mode 100644
index 000000000000..e0783124af8c
--- /dev/null
+++ b/resources/views/emails/user_message_html.blade.php
@@ -0,0 +1,34 @@
+@extends('emails.master_user')
+
+@section('body')
+    <div>
+        {{ trans('texts.email_salutation', ['name' => $userName]) }}
+    </div>
+    &nbsp;
+    <div>
+        {!! $primaryMessage !!}
+    </div>
+    @if (! empty($secondaryMessage))
+        &nbsp;
+        <div>
+            {!! $secondaryMessage !!}
+        </div>
+    @endif
+    @if (! empty($invoiceLink))
+        &nbsp;
+        <div>
+            <center>
+                @include('partials.email_button', [
+                    'link' => $invoiceLink,
+                    'field' => "view_invoice",
+                    'color' => '#0b4d78',
+                ])
+            </center>
+        </div>
+    @endif
+    &nbsp;
+    <div>
+        {{ trans('texts.email_signature') }} <br/>
+        {{ trans('texts.email_from') }}
+    </div>
+@stop
diff --git a/resources/views/emails/user_message_text.blade.php b/resources/views/emails/user_message_text.blade.php
new file mode 100644
index 000000000000..8b37fdfa9c18
--- /dev/null
+++ b/resources/views/emails/user_message_text.blade.php
@@ -0,0 +1,15 @@
+{!! trans('texts.email_salutation', ['name' => $userName]) !!}
+
+{!! strip_tags($primaryMessage) !!}
+
+@if (! empty($secondaryMessage))
+    {!! strip_tags($secondaryMessage) !!}
+
+@endif
+
+@if (! empty($invoiceLink))
+    {!! $invoiceLink !!}
+@endif
+
+{!! trans('texts.email_signature') !!}
+{!! trans('texts.email_from') !!}