diff --git a/app/Console/Commands/Tests/SetupDummyAccount.php b/app/Console/Commands/Tests/SetupDummyAccount.php
index e28cd9752..56ff6716a 100644
--- a/app/Console/Commands/Tests/SetupDummyAccount.php
+++ b/app/Console/Commands/Tests/SetupDummyAccount.php
@@ -31,6 +31,7 @@
 use App\Services\Company\Project\CreateProjectStatus;
 use App\Services\Company\Employee\Answer\CreateAnswer;
 use App\Services\Company\Project\AddEmployeeToProject;
+use App\Services\Company\Project\CreateProjectMessage;
 use App\Services\Company\Project\CreateProjectDecision;
 use App\Services\Company\Employee\Expense\CreateExpense;
 use App\Services\Company\Employee\Manager\AssignManager;
@@ -38,6 +39,7 @@
 use App\Services\Company\Adminland\Hardware\LendHardware;
 use App\Services\Company\Employee\Birthdate\SetBirthdate;
 use App\Services\Company\Employee\Team\AddEmployeeToTeam;
+use App\Services\Company\Project\MarkProjectMessageasRead;
 use App\Services\Company\Adminland\Hardware\CreateHardware;
 use App\Services\Company\Adminland\Position\CreatePosition;
 use App\Services\Company\Adminland\Question\CreateQuestion;
@@ -1684,6 +1686,39 @@ private function addProjects(): void
             'decided_at' => '2019-06-29',
             'deciders' => [$this->dwight->id, $this->oscar->id],
         ]);
+
+        // add messages
+        $messages = collect([
+            'Let’s change how we do business',
+            'Ryan promoted as the principal project manager',
+            'Changing the name of the project - my thoughts',
+            'Need more resources? Contact Corporate if you need help',
+        ]);
+        $content = 'Kelly tries to restart her relationship with Ryan, an effort he ignores until she (untruly) tells him she’s pregnant. He agrees to discuss the situation over dinner that night. Jim informs Pam that Dwight and Angela are secretly dating, only to discover that she has known this for quite some time. Meanwhile, Dwight attempts to make amends for the death of Angela’s cat Sprinkles by giving her a stray cat he found in his barn. Dwight’s cousin Mose named the cat Garbage because that’s what it eats. Angela rejects the gift, and Dwight attempts to dump the cat into the office of Vance Refrigeration.
+
+Creed dyes his hair jet-black (using ink cartridges) in an attempt to convince everyone that he’s much younger. After a conversation with Jan, Michael decides to formally challenge Dunder Mifflin Infinity by claiming that Ryan is being ageist. Michael brings the octogenarian co-founder of Dunder Mifflin into a meeting to make his point about old things still being useful, but shoves Dunder out after tiring of his rambling stories. Angela asks Dwight out to dinner, where she breaks up with him, saying that she can’t look into Dwight’s eyes without seeing Sprinkles’ corpse.
+
+* Alternate talking heads of different people reacting to Jim and Pam dating
+* Michael drives a rental car to the office using a GPS. Jan calls him and yells at him for allegedly eating her Grape-Nuts';
+
+        foreach ($messages as $message) {
+            $message = (new CreateProjectMessage)->execute([
+                'company_id' => $this->company->id,
+                'author_id' => $this->jim->id,
+                'project_id' => $infinity->id,
+                'title' => $message,
+                'content' => $content,
+            ]);
+
+            if (rand(1, 2) == 1) {
+                (new MarkProjectMessageasRead)->execute([
+                    'company_id' => $this->company->id,
+                    'author_id' => $this->michael->id,
+                    'project_id' => $infinity->id,
+                    'project_message_id' => $message->id,
+                ]);
+            }
+        }
     }
 
     private function addSecondaryBlankAccount(): void
diff --git a/app/Helpers/LogHelper.php b/app/Helpers/LogHelper.php
index 07bd10ecd..ddbe5383f 100644
--- a/app/Helpers/LogHelper.php
+++ b/app/Helpers/LogHelper.php
@@ -870,8 +870,32 @@ public static function processAuditLog(AuditLog $log): string
                     'project_name' => $log->object->{'project_name'},
                     'title' => $log->object->{'title'},
                 ]);
+                break;
+
+            case 'project_message_created':
+                $sentence = trans('account.log_project_message_created', [
+                    'project_id' => $log->object->{'project_id'},
+                    'project_name' => $log->object->{'project_name'},
+                    'title' => $log->object->{'title'},
+                ]);
+                break;
+
+            case 'project_message_destroyed':
+                $sentence = trans('account.log_project_message_destroyed', [
+                    'project_id' => $log->object->{'project_id'},
+                    'project_name' => $log->object->{'project_name'},
+                    'title' => $log->object->{'title'},
+                ]);
+                break;
+
+            case 'project_message_updated':
+                $sentence = trans('account.log_project_message_updated', [
+                    'project_id' => $log->object->{'project_id'},
+                    'project_name' => $log->object->{'project_name'},
+                    'title' => $log->object->{'project_message_title'},
+                ]);
+                break;
 
-                // no break
             default:
                 $sentence = '';
                 break;
diff --git a/app/Http/Controllers/Company/Project/ProjectController.php b/app/Http/Controllers/Company/Project/ProjectController.php
index d8e991d15..01b3714bc 100644
--- a/app/Http/Controllers/Company/Project/ProjectController.php
+++ b/app/Http/Controllers/Company/Project/ProjectController.php
@@ -372,41 +372,6 @@ public function clear(Request $request, int $companyId, int $projectId): JsonRes
         ], 200);
     }
 
-    /**
-     * Display the project messages.
-     *
-     * @param Request $request
-     * @param int $companyId
-     * @param int $projectId
-     * @return Response
-     */
-    public function messages(Request $request, int $companyId, int $projectId): Response
-    {
-        $company = InstanceHelper::getLoggedCompany();
-
-        return Inertia::render('Project/Messages', [
-            'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
-        ]);
-    }
-
-    /**
-     * Display the project messages.
-     *
-     * @param Request $request
-     * @param int $companyId
-     * @param int $projectId
-     * @param int $messageId
-     * @return Response
-     */
-    public function message(Request $request, int $companyId, int $projectId, int $messageId): Response
-    {
-        $company = InstanceHelper::getLoggedCompany();
-
-        return Inertia::render('Project/Message', [
-            'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
-        ]);
-    }
-
     /**
      * Display the create new project form.
      *
diff --git a/app/Http/Controllers/Company/Project/ProjectMessagesController.php b/app/Http/Controllers/Company/Project/ProjectMessagesController.php
new file mode 100644
index 000000000..d35c1dd22
--- /dev/null
+++ b/app/Http/Controllers/Company/Project/ProjectMessagesController.php
@@ -0,0 +1,250 @@
+<?php
+
+namespace App\Http\Controllers\Company\Project;
+
+use Inertia\Inertia;
+use Inertia\Response;
+use Illuminate\Http\Request;
+use App\Helpers\InstanceHelper;
+use App\Models\Company\Project;
+use Illuminate\Http\JsonResponse;
+use App\Helpers\NotificationHelper;
+use App\Http\Controllers\Controller;
+use App\Models\Company\ProjectMessage;
+use App\Http\ViewHelpers\Project\ProjectViewHelper;
+use App\Services\Company\Project\CreateProjectMessage;
+use App\Services\Company\Project\UpdateProjectMessage;
+use App\Services\Company\Project\DestroyProjectMessage;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use App\Services\Company\Project\MarkProjectMessageasRead;
+use App\Http\ViewHelpers\Project\ProjectMessagesViewHelper;
+
+class ProjectMessagesController extends Controller
+{
+    /**
+     * Display the list of messages in the project.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $projectId
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|Response
+     */
+    public function index(Request $request, int $companyId, int $projectId)
+    {
+        $company = InstanceHelper::getLoggedCompany();
+        $employee = InstanceHelper::getLoggedEmployee();
+
+        try {
+            $project = Project::where('company_id', $company->id)
+                ->with('employees')
+                ->findOrFail($projectId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
+
+        return Inertia::render('Project/Messages/Index', [
+            'tab' => 'messages',
+            'project' => ProjectViewHelper::info($project),
+            'messages' => ProjectMessagesViewHelper::index($project, $employee),
+            'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
+        ]);
+    }
+
+    /**
+     * Display the Create message view.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $projectId
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|Response
+     */
+    public function create(Request $request, int $companyId, int $projectId)
+    {
+        $company = InstanceHelper::getLoggedCompany();
+
+        try {
+            $project = Project::where('company_id', $company->id)
+                ->with('employees')
+                ->findOrFail($projectId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
+
+        return Inertia::render('Project/Messages/Create', [
+            'project' => ProjectViewHelper::info($project),
+            'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
+        ]);
+    }
+
+    /**
+     * Create the message.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $projectId
+     * @return JsonResponse
+     */
+    public function store(Request $request, int $companyId, int $projectId): JsonResponse
+    {
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+        $company = InstanceHelper::getLoggedCompany();
+
+        $data = [
+            'company_id' => $company->id,
+            'author_id' => $loggedEmployee->id,
+            'project_id' => $projectId,
+            'title' => $request->input('title'),
+            'content' => $request->input('content'),
+        ];
+
+        $message = (new CreateProjectMessage)->execute($data);
+
+        return response()->json([
+            'data' => $message->id,
+        ], 201);
+    }
+
+    /**
+     * Display the detail of a given message.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $projectId
+     * @param int $messageId
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|Response
+     */
+    public function show(Request $request, int $companyId, int $projectId, int $messageId)
+    {
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+
+        try {
+            $project = Project::where('company_id', $loggedCompany->id)
+                ->with('employees')
+                ->findOrFail($projectId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
+
+        try {
+            $message = ProjectMessage::where('project_id', $project->id)
+                ->with('project')
+                ->findOrFail($messageId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
+
+        (new MarkProjectMessageasRead)->execute([
+            'company_id' => $loggedCompany->id,
+            'author_id' => $loggedEmployee->id,
+            'project_id' => $project->id,
+            'project_message_id' => $message->id,
+        ]);
+
+        return Inertia::render('Project/Messages/Show', [
+            'tab' => 'messages',
+            'project' => ProjectViewHelper::info($project),
+            'message' => ProjectMessagesViewHelper::show($message),
+            'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
+        ]);
+    }
+
+    /**
+     * Display the edit message page.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $projectId
+     * @param int $messageId
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|Response
+     */
+    public function edit(Request $request, int $companyId, int $projectId, int $messageId)
+    {
+        $company = InstanceHelper::getLoggedCompany();
+
+        try {
+            $project = Project::where('company_id', $company->id)
+                ->with('employees')
+                ->findOrFail($projectId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
+
+        try {
+            $message = ProjectMessage::where('project_id', $project->id)
+                ->with('project')
+                ->findOrFail($messageId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
+
+        return Inertia::render('Project/Messages/Update', [
+            'tab' => 'messages',
+            'project' => ProjectViewHelper::info($project),
+            'message' => ProjectMessagesViewHelper::edit($message),
+            'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
+        ]);
+    }
+
+    /**
+     * Actually update the message.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $projectId
+     * @param int $projectMessageId
+     * @return JsonResponse
+     */
+    public function update(Request $request, int $companyId, int $projectId, int $projectMessageId): JsonResponse
+    {
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+        $company = InstanceHelper::getLoggedCompany();
+
+        $data = [
+            'company_id' => $company->id,
+            'author_id' => $loggedEmployee->id,
+            'project_id' => $projectId,
+            'project_message_id' => $projectMessageId,
+            'title' => $request->input('title'),
+            'content' => $request->input('content'),
+        ];
+
+        $message = (new UpdateProjectMessage)->execute($data);
+
+        return response()->json([
+            'data' => $message->id,
+        ], 201);
+    }
+
+    /**
+     * Destroy the message.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $projectId
+     * @param int $projectMessageId
+     * @return JsonResponse
+     */
+    public function destroy(Request $request, int $companyId, int $projectId, int $projectMessageId): JsonResponse
+    {
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+        $company = InstanceHelper::getLoggedCompany();
+
+        $data = [
+            'company_id' => $company->id,
+            'author_id' => $loggedEmployee->id,
+            'project_id' => $projectId,
+            'project_message_id' => $projectMessageId,
+        ];
+
+        (new DestroyProjectMessage)->execute($data);
+
+        return response()->json([
+            'data' => true,
+        ], 201);
+    }
+}
diff --git a/app/Http/ViewHelpers/Project/ProjectDecisionsViewHelper.php b/app/Http/ViewHelpers/Project/ProjectDecisionsViewHelper.php
index 9975b4d73..353aaaba7 100644
--- a/app/Http/ViewHelpers/Project/ProjectDecisionsViewHelper.php
+++ b/app/Http/ViewHelpers/Project/ProjectDecisionsViewHelper.php
@@ -24,7 +24,7 @@ public static function decisions(Project $project): Collection
 
         $decisionsCollection = collect([]);
         foreach ($decisions as $decision) {
-            $deciders = $decision->deciders()->get();
+            $deciders = $decision->deciders;
             $decidersCollection = collect([]);
             foreach ($deciders as $decider) {
                 $decidersCollection->push([
diff --git a/app/Http/ViewHelpers/Project/ProjectMessagesViewHelper.php b/app/Http/ViewHelpers/Project/ProjectMessagesViewHelper.php
new file mode 100644
index 000000000..b38acdb48
--- /dev/null
+++ b/app/Http/ViewHelpers/Project/ProjectMessagesViewHelper.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace App\Http\ViewHelpers\Project;
+
+use Carbon\Carbon;
+use App\Helpers\DateHelper;
+use Illuminate\Support\Str;
+use App\Helpers\StringHelper;
+use App\Models\Company\Project;
+use App\Models\Company\Employee;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
+use App\Models\Company\ProjectMessage;
+
+class ProjectMessagesViewHelper
+{
+    /**
+     * Array containing the information about the messages made in the project.
+     *
+     * @param Project $project
+     * @param Employee $employee
+     * @return Collection
+     */
+    public static function index(Project $project, Employee $employee): Collection
+    {
+        $company = $project->company;
+        $messages = $project->messages()
+            ->select('id', 'title', 'content', 'created_at', 'author_id')
+            ->with('author')
+            ->latest()
+            ->get();
+
+        $messageReadStatuses = DB::table('project_message_read_status')
+            ->whereIn('project_message_id', $messages->pluck('id'))
+            ->get();
+
+        $messagesCollection = collect([]);
+        foreach ($messages as $message) {
+            // check read status for each message
+            $readStatus = $messageReadStatuses->contains(function ($readStatus, $key) use ($message, $employee) {
+                return $readStatus->project_message_id == $message->id && $readStatus->employee_id == $employee->id;
+            });
+
+            $messagesCollection->push([
+                'id' => $message->id,
+                'title' => $message->title,
+                'content' => Str::words($message->content, 10, '...'),
+                'read_status' => $readStatus,
+                'written_at' => $message->created_at->diffForHumans(),
+                'url' => route('projects.messages.show', [
+                    'company' => $company,
+                    'project' => $project,
+                    'message' => $message,
+                ]),
+                'author' => $message->author ? [
+                    'id' => $message->author->id,
+                    'name' => $message->author->name,
+                    'avatar' => $message->author->avatar,
+                    'url_view' => route('employees.show', [
+                        'company' => $company,
+                        'employee' => $message->author,
+                    ]),
+                ] : null,
+            ]);
+        }
+
+        return $messagesCollection;
+    }
+
+    /**
+     * Array containing the information about a given message.
+     *
+     * @param ProjectMessage $projectMessage
+     * @return array
+     */
+    public static function show(ProjectMessage $projectMessage): array
+    {
+        // check author role in project
+        $author = $projectMessage->author;
+        $role = null;
+        if ($author) {
+            $role = DB::table('employee_project')
+                ->where('employee_id', $author->id)
+                ->where('project_id', $projectMessage->project->id)
+                ->select('role', 'created_at')
+                ->first();
+        }
+
+        return [
+            'id' => $projectMessage->id,
+            'title' => $projectMessage->title,
+            'content' => $projectMessage->content,
+            'parsed_content' => StringHelper::parse($projectMessage->content),
+            'written_at' => DateHelper::formatDate($projectMessage->created_at),
+            'written_at_human' => $projectMessage->created_at->diffForHumans(),
+            'url_edit' => route('projects.messages.edit', [
+                'company' => $projectMessage->project->company_id,
+                'project' => $projectMessage->project,
+                'message' => $projectMessage,
+            ]),
+            'author' => $projectMessage->author ? [
+                'id' => $projectMessage->author->id,
+                'name' => $projectMessage->author->name,
+                'avatar' => $projectMessage->author->avatar,
+                'role' => $role ? $role->role : null,
+                'added_at' => $role ? DateHelper::formatDate(Carbon::createFromFormat('Y-m-d H:i:s', $role->created_at)) : null,
+                'position' => (! $projectMessage->author->position) ? null : [
+                    'id' => $projectMessage->author->position->id,
+                    'title' => $projectMessage->author->position->title,
+                ],
+                'url' => route('employees.show', [
+                    'company' => $projectMessage->project->company_id,
+                    'employee' => $projectMessage->author,
+                ]),
+            ] : null,
+        ];
+    }
+
+    /**
+     * Array containing the information necessary to edit a message.
+     *
+     * @param ProjectMessage $projectMessage
+     * @return array
+     */
+    public static function edit(ProjectMessage $projectMessage): array
+    {
+        return [
+            'id' => $projectMessage->id,
+            'title' => $projectMessage->title,
+            'content' => $projectMessage->content,
+        ];
+    }
+}
diff --git a/app/Models/Company/Employee.php b/app/Models/Company/Employee.php
index 45ae1fef9..d0dfe666f 100644
--- a/app/Models/Company/Employee.php
+++ b/app/Models/Company/Employee.php
@@ -460,7 +460,7 @@ public function projectsAsLead()
     }
 
     /**
-     * Get the project decision record associated with the employee.
+     * Get the project decision records associated with the employee.
      *
      * @return HasMany
      */
@@ -469,6 +469,16 @@ public function projectDecisions()
         return $this->hasMany(ProjectDecision::class, 'author_id', 'id');
     }
 
+    /**
+     * Get the project message records associated with the employee.
+     *
+     * @return HasMany
+     */
+    public function projectMessages()
+    {
+        return $this->hasMany(ProjectMessage::class, 'author_id', 'id');
+    }
+
     /**
      * Scope a query to only include unlocked users.
      *
diff --git a/app/Models/Company/Project.php b/app/Models/Company/Project.php
index 852bc1845..1127f61e4 100644
--- a/app/Models/Company/Project.php
+++ b/app/Models/Company/Project.php
@@ -127,4 +127,14 @@ public function decisions()
     {
         return $this->hasMany(ProjectDecision::class);
     }
+
+    /**
+     * Get the project messages associated with the project.
+     *
+     * @return HasMany
+     */
+    public function messages()
+    {
+        return $this->hasMany(ProjectMessage::class);
+    }
 }
diff --git a/app/Models/Company/ProjectMessage.php b/app/Models/Company/ProjectMessage.php
new file mode 100644
index 000000000..1f6abbda2
--- /dev/null
+++ b/app/Models/Company/ProjectMessage.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Models\Company;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class ProjectMessage extends Model
+{
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'project_messages';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'project_id',
+        'author_id',
+        'title',
+        'content',
+    ];
+
+    /**
+     * Get the project decision record associated with the project decision decision.
+     *
+     * @return BelongsTo
+     */
+    public function project()
+    {
+        return $this->belongsTo(Project::class);
+    }
+
+    /**
+     * Get the employee record associated with the project decision.
+     *
+     * @return BelongsTo
+     */
+    public function author()
+    {
+        return $this->belongsTo(Employee::class, 'author_id');
+    }
+}
diff --git a/app/Services/Company/Project/CreateProjectMessage.php b/app/Services/Company/Project/CreateProjectMessage.php
new file mode 100644
index 000000000..7b33fb2a3
--- /dev/null
+++ b/app/Services/Company/Project/CreateProjectMessage.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace App\Services\Company\Project;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Services\BaseService;
+use App\Models\Company\Project;
+use App\Models\Company\ProjectMessage;
+
+class CreateProjectMessage extends BaseService
+{
+    protected array $data;
+
+    protected ProjectMessage $projectMessage;
+
+    protected Project $project;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'project_id' => 'required|integer|exists:projects,id',
+            'title' => 'required|string|max:255',
+            'content' => 'required|string|max:65535',
+        ];
+    }
+
+    /**
+     * Create a project message.
+     *
+     * @param array $data
+     * @return ProjectMessage
+     */
+    public function execute(array $data): ProjectMessage
+    {
+        $this->data = $data;
+        $this->validate();
+        $this->createMessage();
+        $this->markAsReadForThisUser();
+        $this->log();
+
+        return $this->projectMessage;
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->project = Project::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['project_id']);
+    }
+
+    private function createMessage(): void
+    {
+        $this->projectMessage = ProjectMessage::create([
+            'project_id' => $this->data['project_id'],
+            'author_id' => $this->data['author_id'],
+            'title' => $this->data['title'],
+            'content' => $this->data['content'],
+        ]);
+    }
+
+    private function markAsReadForThisUser(): void
+    {
+        (new MarkProjectMessageasRead)->execute([
+            'company_id' => $this->data['company_id'],
+            'author_id' => $this->data['author_id'],
+            'project_id' => $this->data['project_id'],
+            'project_message_id' => $this->projectMessage->id,
+        ]);
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'project_message_created',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'project_id' => $this->project->id,
+                'project_name' => $this->project->name,
+                'title' => $this->projectMessage->title,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/app/Services/Company/Project/DestroyProjectMessage.php b/app/Services/Company/Project/DestroyProjectMessage.php
new file mode 100644
index 000000000..e1b5dda03
--- /dev/null
+++ b/app/Services/Company/Project/DestroyProjectMessage.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Services\Company\Project;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Services\BaseService;
+use App\Models\Company\Project;
+use App\Models\Company\ProjectMessage;
+
+class DestroyProjectMessage extends BaseService
+{
+    protected array $data;
+
+    protected ProjectMessage $projectMessage;
+
+    protected Project $project;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'project_id' => 'required|integer|exists:projects,id',
+            'project_message_id' => 'required|integer|exists:project_messages,id',
+        ];
+    }
+
+    /**
+     * Destroy a project message.
+     *
+     * @param array $data
+     */
+    public function execute(array $data): void
+    {
+        $this->data = $data;
+        $this->validate();
+        $this->destroyMessage();
+        $this->log();
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->project = Project::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['project_id']);
+
+        $this->projectMessage = ProjectMessage::where('project_id', $this->data['project_id'])
+            ->findOrFail($this->data['project_message_id']);
+    }
+
+    private function destroyMessage(): void
+    {
+        $this->projectMessage->delete();
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'project_message_destroyed',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'project_id' => $this->project->id,
+                'project_name' => $this->project->name,
+                'title' => $this->projectMessage->title,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/app/Services/Company/Project/MarkProjectMessageasRead.php b/app/Services/Company/Project/MarkProjectMessageasRead.php
new file mode 100644
index 000000000..d88f24cc4
--- /dev/null
+++ b/app/Services/Company/Project/MarkProjectMessageasRead.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Services\Company\Project;
+
+use Carbon\Carbon;
+use App\Services\BaseService;
+use App\Models\Company\Project;
+use Illuminate\Support\Facades\DB;
+use App\Models\Company\ProjectMessage;
+
+class MarkProjectMessageasRead extends BaseService
+{
+    protected array $data;
+
+    protected ProjectMessage $projectMessage;
+
+    protected Project $project;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'project_id' => 'required|integer|exists:projects,id',
+            'project_message_id' => 'required|integer|exists:project_messages,id',
+        ];
+    }
+
+    /**
+     * Mark a project message as read.
+     *
+     * @param array $data
+     */
+    public function execute(array $data): void
+    {
+        $this->data = $data;
+        $this->validate();
+        $this->read();
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->project = Project::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['project_id']);
+
+        $this->projectMessage = ProjectMessage::where('project_id', $this->data['project_id'])
+            ->findOrFail($this->data['project_message_id']);
+    }
+
+    private function read(): void
+    {
+        $count = DB::table('project_message_read_status')
+            ->where('project_message_id', $this->projectMessage->id)
+            ->where('employee_id', $this->author->id)
+            ->count();
+
+        if ($count > 0) {
+            return;
+        }
+
+        DB::table('project_message_read_status')->insert([
+            'project_message_id' => $this->projectMessage->id,
+            'employee_id' => $this->author->id,
+            'created_at' => Carbon::now(),
+        ]);
+    }
+}
diff --git a/app/Services/Company/Project/UpdateProjectMessage.php b/app/Services/Company/Project/UpdateProjectMessage.php
new file mode 100644
index 000000000..0b771e415
--- /dev/null
+++ b/app/Services/Company/Project/UpdateProjectMessage.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Services\Company\Project;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Services\BaseService;
+use App\Models\Company\Project;
+use App\Models\Company\ProjectMessage;
+
+class UpdateProjectMessage extends BaseService
+{
+    protected array $data;
+
+    protected Project $project;
+
+    protected ProjectMessage $projectMessage;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'project_id' => 'nullable|integer|exists:projects,id',
+            'project_message_id' => 'nullable|integer|exists:project_messages,id',
+            'title' => 'required|string|max:255',
+            'content' => 'required|string|max:65535',
+        ];
+    }
+
+    /**
+     * Update the project message.
+     *
+     * @param array $data
+     * @return ProjectMessage
+     */
+    public function execute(array $data): ProjectMessage
+    {
+        $this->data = $data;
+        $this->validate();
+        $this->update();
+        $this->log();
+
+        return $this->projectMessage;
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->project = Project::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['project_id']);
+
+        $this->projectMessage = ProjectMessage::where('project_id', $this->project->id)
+            ->findOrFail($this->data['project_message_id']);
+    }
+
+    private function update(): void
+    {
+        $this->projectMessage->title = $this->data['title'];
+        $this->projectMessage->content = $this->data['content'];
+        $this->projectMessage->save();
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'project_message_updated',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'project_id' => $this->project->id,
+                'project_name' => $this->project->name,
+                'project_message_id' => $this->projectMessage->id,
+                'project_message_title' => $this->projectMessage->title,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/config/officelife.php b/config/officelife.php
index b9f5fe229..19a342305 100644
--- a/config/officelife.php
+++ b/config/officelife.php
@@ -159,5 +159,6 @@
         'employee_work_anniversaries' => 'manage/employee-management.html#work-anniversaries',
         'one_on_ones' => 'introduction.html',
         'project_decisions' => 'operate/project-management.html#project-decisions',
+        'project_messages' => 'operate/project-management.html#project-messages',
     ],
 ];
diff --git a/database/factories/CompanyFactory.php b/database/factories/CompanyFactory.php
index 73ca718be..7fa9ecc2f 100644
--- a/database/factories/CompanyFactory.php
+++ b/database/factories/CompanyFactory.php
@@ -532,3 +532,22 @@
         'decided_at' => Carbon::now(),
     ];
 });
+
+$factory->define(App\Models\Company\ProjectMessage::class, function () {
+    $companyId = factory(App\Models\Company\Company::class)->create()->id;
+
+    return [
+        'project_id' => function () use ($companyId) {
+            return factory(App\Models\Company\Project::class)->create([
+                'company_id' => $companyId,
+            ])->id;
+        },
+        'author_id' => function () use ($companyId) {
+            return factory(App\Models\Company\Employee::class)->create([
+                'company_id' => $companyId,
+            ])->id;
+        },
+        'title' => 'This is a title',
+        'content' => 'This is a description',
+    ];
+});
diff --git a/database/migrations/2020_10_20_195724_create_project_messages_table.php b/database/migrations/2020_10_20_195724_create_project_messages_table.php
new file mode 100644
index 000000000..f7fb0db89
--- /dev/null
+++ b/database/migrations/2020_10_20_195724_create_project_messages_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateProjectMessagesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        // necessary for SQLlite
+        Schema::enableForeignKeyConstraints();
+
+        Schema::create('project_messages', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('project_id');
+            $table->unsignedBigInteger('author_id')->nullable();
+            $table->string('title');
+            $table->text('content');
+            $table->timestamps();
+            $table->foreign('project_id')->references('id')->on('projects')->onDelete('cascade');
+            $table->foreign('author_id')->references('id')->on('employees')->onDelete('set null');
+        });
+
+        Schema::create('project_message_read_status', function (Blueprint $table) {
+            $table->unsignedBigInteger('project_message_id');
+            $table->unsignedBigInteger('employee_id');
+            $table->timestamps();
+            $table->foreign('project_message_id')->references('id')->on('project_messages')->onDelete('cascade');
+            $table->foreign('employee_id')->references('id')->on('employees')->onDelete('cascade');
+        });
+    }
+}
diff --git a/package.json b/package.json
index df9e0395b..289ee1d84 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "devDependencies": {
         "@babel/plugin-syntax-dynamic-import": "^7.2.0",
         "cross-env": "^7.0",
-        "cypress": "^5.3.0",
+        "cypress": "5.5.0",
         "eslint": "^7.11.0",
         "eslint-config-standard": "^14.1.1",
         "eslint-plugin-cypress": "^2.11.2",
diff --git a/public/img/streamline-icon-morning-news-1@140x140.png b/public/img/streamline-icon-morning-news-1@140x140.png
new file mode 100644
index 000000000..63df9da71
Binary files /dev/null and b/public/img/streamline-icon-morning-news-1@140x140.png differ
diff --git a/resources/js/Pages/Project/Decisions/Index.vue b/resources/js/Pages/Project/Decisions/Index.vue
index b8d943d5b..2e2a4a03b 100644
--- a/resources/js/Pages/Project/Decisions/Index.vue
+++ b/resources/js/Pages/Project/Decisions/Index.vue
@@ -72,7 +72,7 @@
       <div class="mw6 center br3 mb5 relative z-1">
         <p class="db fw5 mb2 flex justify-between items-center">
           <span>
-            🗞 {{ $t('project.decision_index_title') }}
+            <span class="mr1">🗞</span> {{ $t('project.decision_index_title') }}
 
             <help :url="$page.props.help_links.project_decisions" :top="'3px'" />
           </span>
diff --git a/resources/js/Pages/Project/Members/Index.vue b/resources/js/Pages/Project/Members/Index.vue
index fb651869f..ceae2ec11 100644
--- a/resources/js/Pages/Project/Members/Index.vue
+++ b/resources/js/Pages/Project/Members/Index.vue
@@ -223,7 +223,7 @@
             <!-- blank member lists -->
             <div v-if="localMembers.length == 0" class="bg-white box pa3 tc" data-cy="members-blank-state">
               <h3 class="fw4 f5">
-                {{ $t('project.members_index_blank_role') }}
+                {{ $t('project.members_index_blank') }}
               </h3>
               <img loading="lazy" src="/img/streamline-icon-cyclist-1-4@140x140.png" width="140" height="140" alt="people hanging out"
                    class="di-ns dn top-1 left-1"
@@ -290,7 +290,6 @@ export default {
   },
 
   created() {
-    this.localProject = this.project;
     this.localMembers = this.members.members;
     this.localRoles = this.members.roles;
   },
diff --git a/resources/js/Pages/Project/Message.vue b/resources/js/Pages/Project/Message.vue
deleted file mode 100644
index 63dfc9434..000000000
--- a/resources/js/Pages/Project/Message.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<style lang="scss" scoped>
-.avatar {
-  left: 1px;
-  top: 5px;
-  width: 35px;
-}
-
-.comment-avatar {
-  width: 50px;
-}
-
-.team-member {
-  padding-left: 44px;
-
-  .avatar {
-    top: 2px;
-  }
-}
-</style>
-
-<template>
-  <layout title="Home" :notifications="notifications">
-    <div class="ph2 ph5-ns">
-      <!-- BREADCRUMB -->
-      <div class="mt4-l mt1 mw6 br3 center breadcrumb relative z-0 f6 pb2">
-        <ul class="list ph0 tc-l tl">
-          <li class="di">
-            <inertia-link :href="'/' + $page.props.auth.company.id + '/dashboard'">{{ $t('app.breadcrumb_dashboard') }}</inertia-link>
-          </li>
-          <li class="di">
-            ...
-          </li>
-          <li class="di">
-            <inertia-link :href="'/' + $page.props.auth.company.id + '/teams/ships'">Messages</inertia-link>
-          </li>
-          <li class="di">
-            Message details
-          </li>
-        </ul>
-      </div>
-
-      <!-- BODY -->
-      <div class="mw8 center br3 mb5 relative cf">
-        <!-- LEFT COLUMN -->
-        <div class="fl w-70-l w-100">
-          <div class="bg-white box mb4 pa3">
-            <h3 class="mt0 mb0 fw5">
-              Message title
-            </h3>
-            <p class="mb2 f7 gray">Written on Jan 02, 2020</p>
-            <p class="lh-copy bb bb-gray pb3"> Open enrollment for our Flex Spending Account begins next month, so if you want to enroll or re-enroll, you have to do so within that month.</p>
-
-            <div class="bb bb-gray pb3">
-              <p class="fw6">Comments</p>
-              <div class="relative mb4">
-                <img loading="lazy" src="https://api.adorable.io/avatars/200/d5f148f9-f029-4c71-9fd7-1c9d3f1ef0ac.png" alt="avatar" class="br-100 absolute comment-avatar" />
-                <div class="pl5">
-                  <ul class="f7 list pl0 gray">
-                    <li class="di mr1"><a href="">Regis Freyd</a></li>
-                    <li class="di mr1">Sun, 4 Oct at 11:35am</li>
-                    <li class="di mr1"><a href="">Edit</a></li>
-                    <li class="di"><a href="">Delete</a></li>
-                  </ul>
-                  <p class="lh-copy">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor.</p>
-                </div>
-              </div>
-              <div class="relative">
-                <img loading="lazy" src="https://api.adorable.io/avatars/200/d5f148f9-f029-4c71-9fd7-1c9d3f1ef0ac.png" alt="avatar" class="br-100 absolute comment-avatar" />
-                <div class="pl5">
-                  <ul class="f7 list pl0 gray">
-                    <li class="di mr1"><a href="">Regis Freyd</a></li>
-                    <li class="di mr1">Sun, 4 Oct at 11:35am</li>
-                    <li class="di mr1"><a href="">Edit</a></li>
-                    <li class="di"><a href="">Delete</a></li>
-                  </ul>
-                  <p class="lh-copy">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor.</p>
-                </div>
-              </div>
-            </div>
-
-            <!-- add a comment -->
-            <p class="fw6">Comments</p>
-            <form action="">
-              <!-- Content -->
-              <text-area v-model="form.comment"
-                         :label="$t('account.company_news_new_content')"
-                         :datacy="'news-content-textarea'"
-                         :required="true"
-                         :rows="10"
-                         :help="$t('account.company_news_new_content_help')"
-              />
-
-              <!-- Actions -->
-              <div class="mt2 mb0">
-                <div class="flex-ns">
-                  <loading-button :classes="'btn add w-auto-ns w-100 mb2 pv2 ph3 mr2'" :state="loadingState" :text="$t('app.publish')" :cypress-selector="'submit-add-news-button'" />
-                  <div>
-                    <inertia-link :href="'/' + $page.props.auth.company.id + '/account/news'" class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3">
-                      {{ $t('app.cancel') }}
-                    </inertia-link>
-                  </div>
-                </div>
-              </div>
-            </form>
-          </div>
-        </div>
-
-        <!-- RIGHT COLUMN -->
-        <div class="fl w-30-l w-100 pl4-l">
-          <div class="bg-white box mb4 pa3">
-            <!-- written by -->
-            <h3 class="ttc f7 gray mt0 mb2 fw4 ttu">
-              Written by
-            </h3>
-            <div class="bb bb-gray pb3 mb3">
-              <span class="pl3 db relative team-member">
-                <img loading="lazy" src="https://api.adorable.io/avatars/200/1499e9ea-b9a2-4d60-8bf6-a9bdf4cacbbc.png" alt="avatar" class="br-100 absolute avatar" />
-                <inertia-link class="mb2">Scott</inertia-link>
-                <span class="title db f7 mt1">
-                  Manager
-                </span>
-              </span>
-            </div>
-
-            <!-- written by -->
-            <h3 class="ttc f7 gray mt0 mb2 fw4 ttu">
-              Seen by
-            </h3>
-            <p class="mb0 mt1">34 team members (85%)</p>
-          </div>
-        </div>
-      </div>
-    </div>
-  </layout>
-</template>
-
-<script>
-import Layout from '@/Shared/Layout';
-import TextArea from '@/Shared/TextArea';
-
-export default {
-  components: {
-    Layout,
-    TextArea,
-  },
-
-  props: {
-    notifications: {
-      type: Array,
-      default: null,
-    },
-  },
-
-  data() {
-    return {
-      form: {
-        comment: null,
-        errors: [],
-      },
-    };
-  },
-};
-
-</script>
diff --git a/resources/js/Pages/Project/Messages.vue b/resources/js/Pages/Project/Messages.vue
deleted file mode 100644
index 8a097db4f..000000000
--- a/resources/js/Pages/Project/Messages.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<style lang="scss" scoped>
-.avatar {
-  left: 1px;
-  top: 5px;
-  width: 35px;
-}
-</style>
-
-<template>
-  <layout title="Home" :notifications="notifications">
-    <div class="ph2 ph5-ns">
-      <!-- BREADCRUMB -->
-      <div class="mt4-l mt1 mb4 mw6 br3 center breadcrumb relative z-0 f6 pb2">
-        <ul class="list ph0 tc-l tl">
-          <li class="di">
-            <inertia-link :href="'/' + $page.props.auth.company.id + '/dashboard'">{{ $t('app.breadcrumb_dashboard') }}</inertia-link>
-          </li>
-          <li class="di">
-            <inertia-link :href="'/' + $page.props.auth.company.id + '/projects'">Project list</inertia-link>
-          </li>
-          <li class="di">
-            Project name
-          </li>
-        </ul>
-      </div>
-
-      <!-- BODY -->
-      <div class="mw8 center br3 mb5 relative z-1">
-        <!-- Menu -->
-        <div class="center br3 mb5 tc">
-          <div class="cf dib btn-group">
-            <inertia-link :href="'/' + $page.props.auth.company.id + '/projects/1'" class="f6 fl ph3 pv2 dib pointer no-underline">
-              Project summary
-            </inertia-link>
-            <inertia-link :href="'/' + $page.props.auth.company.id + '/projects/1/messages'" class="f6 fl ph3 pv2 dib pointer no-underline">
-              Messages
-            </inertia-link>
-            <inertia-link :href="'/' + $page.props.auth.company.id + '/dashboard/team'" class="f6 fl ph3 pv2 dib pointer" data-cy="dashboard-team-tab">
-              Tasks
-            </inertia-link>
-            <inertia-link :href="'/' + $page.props.auth.company.id + '/dashboard/team'" class="f6 fl ph3 pv2 dib pointer" data-cy="dashboard-team-tab">
-              Calendar
-            </inertia-link>
-            <inertia-link :href="'/' + $page.props.auth.company.id + '/dashboard/team'" class="f6 fl ph3 pv2 dib pointer" data-cy="dashboard-team-tab">
-              Members
-            </inertia-link>
-            <inertia-link :href="'/' + $page.props.auth.company.id + '/dashboard/team'" class="f6 fl ph3 pv2 dib pointer" data-cy="dashboard-team-tab">
-              Finance
-            </inertia-link>
-            <inertia-link :href="'/' + $page.props.auth.company.id + '/dashboard/team'" class="f6 fl ph3 pv2 dib pointer" data-cy="dashboard-team-tab">
-              Files
-            </inertia-link>
-          </div>
-        </div>
-
-        <div class="cf mw7 center br3 mb3 bg-white box relative pa3">
-          <ul class="list pl0 ma0">
-            <li class="mb4">
-              <h3 class="mt0 mb2 fw4">This is a long message title</h3>
-              <ul class="list pl0 ma0">
-                <li class="di mr2">
-                  <small-name-and-avatar
-                    :name="'regis'"
-                    :avatar="'https://api.adorable.io/avatars/200/1499e9ea-b9a2-4d60-8bf6-a9bdf4cacbbc.png'"
-                    :classes="'gray'"
-                    :size="'18px'"
-                    :top="'2px'"
-                    :margin-between-name-avatar="'25px'"
-                  />
-                </li>
-                <li class="di f7 gray">Jan 03, 2020</li>
-                <li class="di f7 gray"><a href="">3 comments</a></li>
-              </ul>
-            </li>
-            <li>
-              <h3 class="mt0 mb2 fw4">This is a long message title</h3>
-              <ul class="list pl0 ma0">
-                <li class="di mr2">
-                  <small-name-and-avatar
-                    :name="'regis'"
-                    :avatar="'https://api.adorable.io/avatars/200/1499e9ea-b9a2-4d60-8bf6-a9bdf4cacbbc.png'"
-                    :classes="'gray'"
-                    :size="'18px'"
-                    :top="'0px'"
-                    :margin-between-name-avatar="'25px'"
-                  />
-                </li>
-                <li class="di f7 gray">Jan 03, 2020</li>
-                <li class="di f7 gray"><a href="">3 comments</a></li>
-              </ul>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div>
-  </layout>
-</template>
-
-<script>
-import Layout from '@/Shared/Layout';
-import SmallNameAndAvatar from '@/Shared/SmallNameAndAvatar';
-
-export default {
-  components: {
-    Layout,
-    SmallNameAndAvatar,
-  },
-
-  props: {
-    notifications: {
-      type: Array,
-      default: null,
-    },
-  },
-};
-
-</script>
diff --git a/resources/js/Pages/Project/Messages/Create.vue b/resources/js/Pages/Project/Messages/Create.vue
new file mode 100644
index 000000000..0463dfa18
--- /dev/null
+++ b/resources/js/Pages/Project/Messages/Create.vue
@@ -0,0 +1,138 @@
+<style lang="scss" scoped>
+.ball-pulse {
+  right: 8px;
+  top: 37px;
+  position: absolute;
+}
+</style>
+
+<template>
+  <layout title="Home" :notifications="notifications">
+    <div class="ph2 ph0-ns">
+      <!-- BREADCRUMB -->
+      <div class="mt4-l mt1 mw6 br3 bg-white box center breadcrumb relative z-0 f6 pb2">
+        <ul class="list ph0 tc-l tl">
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/dashboard'">{{ $t('app.breadcrumb_dashboard') }}</inertia-link>
+          </li>
+          <li class="di">
+            ...
+          </li>
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/projects/' + project.id + '/messages'">{{ project.name }}</inertia-link>
+          </li>
+          <li class="di">
+            {{ $t('app.breadcrumb_project_create_message') }}
+          </li>
+        </ul>
+      </div>
+
+      <!-- BODY -->
+      <div class="mw7 center br3 mb5 bg-white box relative z-1">
+        <div class="pa3 measure center">
+          <h2 class="tc normal mb4 lh-copy">
+            {{ $t('project.message_create_title') }}
+
+            <help :url="$page.props.help_links.project_messages" :top="'1px'" />
+          </h2>
+
+          <form @submit.prevent="submit">
+            <errors :errors="form.errors" />
+
+            <!-- Title -->
+            <text-input :id="'title'"
+                        v-model="form.title"
+                        :name="'title'"
+                        :datacy="'message-title-input'"
+                        :errors="$page.props.errors.title"
+                        :label="$t('project.message_create_title_message')"
+                        :help="$t('project.message_create_title_message_help')"
+                        :required="true"
+            />
+
+            <!-- Content -->
+            <text-area v-model="form.content"
+                       :label="$t('project.message_create_title_content')"
+                       :datacy="'message-content-textarea'"
+                       :required="true"
+                       :rows="10"
+                       :help="$t('project.message_create_title_content_help')"
+            />
+
+            <!-- Actions -->
+            <div class="mv4">
+              <div class="flex-ns justify-between">
+                <div>
+                  <inertia-link :href="'/' + $page.props.auth.company.id + '/projects/' + project.id + '/messages'" class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3">
+                    {{ $t('app.cancel') }}
+                  </inertia-link>
+                </div>
+                <loading-button :classes="'btn add w-auto-ns w-100 mb2 pv2 ph3'" :state="loadingState" :text="$t('app.publish')" :cypress-selector="'submit-add-message-button'" />
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+  </layout>
+</template>
+
+<script>
+import TextInput from '@/Shared/TextInput';
+import TextArea from '@/Shared/TextArea';
+import Errors from '@/Shared/Errors';
+import LoadingButton from '@/Shared/LoadingButton';
+import Layout from '@/Shared/Layout';
+import Help from '@/Shared/Help';
+
+export default {
+  components: {
+    Layout,
+    TextInput,
+    TextArea,
+    Errors,
+    LoadingButton,
+    Help
+  },
+
+  props: {
+    project: {
+      type: Object,
+      default: null,
+    },
+    notifications: {
+      type: Array,
+      default: null,
+    },
+  },
+
+  data() {
+    return {
+      form: {
+        title: null,
+        content: null,
+        errors: [],
+      },
+      loadingState: '',
+      errorTemplate: Error,
+    };
+  },
+
+  methods: {
+    submit() {
+      this.loadingState = 'loading';
+
+      axios.post(`/${this.$page.props.auth.company.id}/projects/${this.project.id}/messages`, this.form)
+        .then(response => {
+          localStorage.success = this.$t('project.message_create_success');
+          this.$inertia.visit(`/${this.$page.props.auth.company.id}/projects/${this.project.id}/messages/${response.data.data}`);
+        })
+        .catch(error => {
+          this.loadingState = null;
+          this.form.errors = _.flatten(_.toArray(error.response.data));
+        });
+    },
+  }
+};
+
+</script>
diff --git a/resources/js/Pages/Project/Messages/Index.vue b/resources/js/Pages/Project/Messages/Index.vue
new file mode 100644
index 000000000..6110a25aa
--- /dev/null
+++ b/resources/js/Pages/Project/Messages/Index.vue
@@ -0,0 +1,162 @@
+<style lang="scss" scoped>
+.list-no-line-bottom {
+  li:last-child {
+    border-bottom: 0;
+    border-bottom-left-radius: 3px;
+    border-bottom-right-radius: 3px;
+  }
+}
+
+.dot {
+  height: 11px;
+  width: 11px;
+  top: 0px;
+  background-color: #5a45ff;
+}
+
+.read {
+  .message {
+    color: #b3b3b3;
+    font-weight: 400;
+  }
+}
+
+.author {
+  width: 200px;
+}
+</style>
+
+<template>
+  <layout title="Home" :notifications="notifications">
+    <div class="ph2 ph5-ns">
+      <!-- BREADCRUMB -->
+      <div class="mt4-l mt1 mb4 mw6 br3 center breadcrumb relative z-0 f6 pb2">
+        <ul class="list ph0 tc-l tl">
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/dashboard'">{{ $t('app.breadcrumb_dashboard') }}</inertia-link>
+          </li>
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/projects'">{{ $t('app.breadcrumb_project_list') }}</inertia-link>
+          </li>
+          <li class="di">
+            {{ $t('app.breadcrumb_project_detail') }}
+          </li>
+        </ul>
+      </div>
+
+      <!-- BODY -->
+      <div class="mw8 center br3 mb5 relative z-1">
+        <!-- Menu -->
+        <project-menu :project="project" :tab="tab" />
+      </div>
+
+      <div class="mw7 center br3 mb5 relative z-1">
+        <p class="db fw5 mb2 flex justify-between items-center">
+          <span>
+            <span class="mr1">📨</span> {{ $t('project.message_title') }}
+
+            <help :url="$page.props.help_links.project_messages" :top="'3px'" />
+          </span>
+          <inertia-link :href="'/' + $page.props.auth.company.id + '/projects/' + project.id + '/messages/create'" class="btn f5" data-cy="add-message">{{ $t('project.message_cta') }}</inertia-link>
+        </p>
+
+        <!-- list of messages -->
+        <div v-if="messages.length > 0" class="bg-white box">
+          <ul class="list pl0 mv0 list-no-line-bottom">
+            <li v-for="message in messages" :key="message.id" :class="message.read_status ? 'read' : ''" class="bb bb-gray pa3 relative flex justify-between items-center">
+              <div class="ma0 fw5 message">
+                <p class="mt0 mb2 fw5">
+                  <span v-if="!message.read_status" class="dib relative mr1 br-100 dot"></span>
+                  <inertia-link :href="message.url" class="lh-copy">{{ message.title }}</inertia-link>
+                </p>
+                <p class="mt0 mb0 f6 gray"><span class="mr1 f7 gray">{{ message.written_at }}</span> {{ message.content }}</p>
+              </div>
+
+              <div v-if="message.author" class="author tr">
+                <small-name-and-avatar
+                  :name="message.author.name"
+                  :avatar="message.author.avatar"
+                  :classes="'f4 fw4'"
+                  :top="'0px'"
+                  :margin-between-name-avatar="'29px'"
+                />
+              </div>
+            </li>
+          </ul>
+        </div>
+
+        <!-- blank state -->
+        <div v-else data-cy="messages-blank-state" class="bg-white box pa3 tc">
+          <img loading="lazy" src="/img/streamline-icon-morning-news-1@140x140.png" width="140" height="140" alt="meeting"
+               class=""
+          />
+          <p class="lh-copy measure center">{{ $t('project.message_blank') }}</p>
+        </div>
+      </div>
+    </div>
+  </layout>
+</template>
+
+<script>
+import Layout from '@/Shared/Layout';
+import ProjectMenu from '@/Pages/Project/Partials/ProjectMenu';
+import SmallNameAndAvatar from '@/Shared/SmallNameAndAvatar';
+import Help from '@/Shared/Help';
+
+export default {
+  components: {
+    Layout,
+    ProjectMenu,
+    SmallNameAndAvatar,
+    Help,
+  },
+
+  props: {
+    notifications: {
+      type: Array,
+      default: null,
+    },
+    project: {
+      type: Object,
+      default: null,
+    },
+    messages: {
+      type: Array,
+      default: null,
+    },
+    tab: {
+      type: String,
+      default: 'summary',
+    },
+  },
+
+  data() {
+    return {
+      loadingState: '',
+      addMode: false,
+      decisionToDelete: 0,
+      deleteActionConfirmation: false,
+      showDeciders: false,
+      potentialMembers: [],
+      processingSearch: false,
+      form: {
+        title: null,
+        searchTerm: null,
+        employees: [],
+        errors: [],
+      },
+    };
+  },
+
+  mounted() {
+    if (localStorage.success) {
+      flash(localStorage.success, 'success');
+      localStorage.removeItem('success');
+    }
+  },
+
+  methods: {
+  }
+};
+
+</script>
diff --git a/resources/js/Pages/Project/Messages/Show.vue b/resources/js/Pages/Project/Messages/Show.vue
new file mode 100644
index 000000000..fae10b0d8
--- /dev/null
+++ b/resources/js/Pages/Project/Messages/Show.vue
@@ -0,0 +1,205 @@
+<style lang="scss" scoped>
+.avatar {
+  left: 1px;
+  top: 5px;
+  width: 35px;
+}
+
+.comment-avatar {
+  width: 50px;
+}
+
+.team-member {
+  padding-left: 44px;
+
+  .avatar {
+    top: 2px;
+  }
+}
+
+.icon-date {
+  width: 15px;
+  top: 2px;
+}
+
+.icon-role {
+  width: 15px;
+  top: 2px;
+}
+</style>
+
+<template>
+  <layout title="Home" :notifications="notifications">
+    <div class="ph2 ph5-ns">
+      <!-- BREADCRUMB -->
+      <div class="mt4-l mt1 mb4 mw6 br3 center breadcrumb relative z-0 f6 pb2">
+        <ul class="list ph0 tc-l tl">
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/dashboard'">{{ $t('app.breadcrumb_dashboard') }}</inertia-link>
+          </li>
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/projects'">{{ $t('app.breadcrumb_project_list') }}</inertia-link>
+          </li>
+          <li class="di">
+            {{ $t('app.breadcrumb_project_detail') }}
+          </li>
+        </ul>
+      </div>
+
+      <!-- BODY -->
+      <div class="mw8 center br3 mb5 relative z-1">
+        <!-- Menu -->
+        <project-menu :project="project" :tab="tab" />
+      </div>
+
+      <!-- BODY -->
+      <div class="mw8 center br3 mb5 relative cf">
+        <h2 class="mt0 mb3 fw5" data-cy="project-title">
+          {{ message.title }}
+        </h2>
+
+        <!-- LEFT COLUMN -->
+        <div class="fl w-70-l w-100">
+          <div class="bg-white box mb4">
+            <div class="pa3 pb3" data-cy="project-content">
+              <div class="parsed-content" v-html="message.parsed_content"></div>
+            </div>
+          </div>
+        </div>
+
+        <!-- RIGHT COLUMN -->
+        <div class="fl w-30-l w-100 pl4-l">
+          <!-- written by -->
+          <h3 v-if="message.author" class="ttc f7 gray mt0 mb2 fw4">
+            {{ $t('project.message_show_written_by') }}
+          </h3>
+
+          <div v-if="message.author" class="flex items-center mb4">
+            <div class="mr3">
+              <img :src="message.author.avatar" alt="avatar" height="64" width="64" class="br-100" />
+            </div>
+
+            <div>
+              <inertia-link :href="message.author.url" class="mb2 dib">{{ message.author.name }}</inertia-link>
+
+              <span v-if="message.author.role" class="db f7 mb2 relative">
+                <!-- icon role -->
+                <svg class="relative icon-role gray" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+                  <path fill-rule="evenodd" d="M10 2a1 1 0 00-1 1v1a1 1 0 002 0V3a1 1 0 00-1-1zM4 4h3a3 3 0 006 0h3a2 2 0 012 2v9a2 2 0 01-2 2H4a2 2 0 01-2-2V6a2 2 0 012-2zm2.5 7a1.5 1.5 0 100-3 1.5 1.5 0 000 3zm2.45 4a2.5 2.5 0 10-4.9 0h4.9zM12 9a1 1 0 100 2h3a1 1 0 100-2h-3zm-1 4a1 1 0 011-1h2a1 1 0 110 2h-2a1 1 0 01-1-1z" clip-rule="evenodd" />
+                </svg>
+                <span class="mr2">
+                  {{ message.author.role }}
+                </span>
+
+                <!-- icon date -->
+                <span>
+                  <svg class="relative icon-date gray" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+                    <path fill-rule="evenodd" d="M6 2a1 1 0 00-1 1v1H4a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1V3a1 1 0 10-2 0v1H7V3a1 1 0 00-1-1zm0 5a1 1 0 000 2h8a1 1 0 100-2H6z" clip-rule="evenodd" />
+                  </svg>
+                </span>
+                <span class="gray">
+                  {{ $t('project.members_index_role', { date: message.author.added_at }) }}
+                </span>
+              </span>
+              <span v-if="message.author.position && message.author.role" class="db f7 gray">
+                {{ $t('project.members_index_position_with_role', { role: message.author.position.title }) }}
+              </span>
+              <span v-if="message.author.position && !message.author.role" class="db f7 gray">
+                {{ $t('project.members_index_position', { role: message.author.position.title }) }}
+              </span>
+            </div>
+          </div>
+
+          <!-- written on -->
+          <h3 class="ttc f7 gray mt0 mb2 fw4">
+            {{ $t('project.message_show_written_on') }}
+          </h3>
+          <p class="mt0 mb4">{{ message.written_at }} <span class="f6 gray">({{ message.written_at_human }})</span></p>
+
+          <!-- actions -->
+          <h3 class="ttc f7 gray mt0 mb2 fw4">
+            {{ $t('project.message_show_actions') }}
+          </h3>
+          <ul class="list pl0 ma0">
+            <!-- edit -->
+            <li class="mb2"><inertia-link :href="message.url_edit" data-cy="project-edit" class="f6 gray">{{ $t('project.message_show_edit') }}</inertia-link></li>
+
+            <!-- delete -->
+            <li v-if="!removalConfirmation"><a href="#" data-cy="project-delete" class="f6 gray" @click.prevent="removalConfirmation = true">{{ $t('project.message_show_destroy') }}</a></li>
+            <li v-if="removalConfirmation" class="pv2 f6">
+              {{ $t('app.sure') }}
+              <a data-cy="confirm-project-deletion" class="c-delete mr1 pointer" @click.prevent="destroy()">
+                {{ $t('app.yes') }}
+              </a>
+              <a data-cy="cancel-project-deletion" class="pointer" @click.prevent="removalConfirmation = false">
+                {{ $t('app.no') }}
+              </a>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </layout>
+</template>
+
+<script>
+import Layout from '@/Shared/Layout';
+import ProjectMenu from '@/Pages/Project/Partials/ProjectMenu';
+
+export default {
+  components: {
+    Layout,
+    ProjectMenu,
+  },
+
+  props: {
+    notifications: {
+      type: Array,
+      default: null,
+    },
+    project: {
+      type: Object,
+      default: null,
+    },
+    message: {
+      type: Object,
+      default: null,
+    },
+    tab: {
+      type: String,
+      default: 'summary',
+    },
+  },
+
+  data() {
+    return {
+      removalConfirmation: false,
+      form: {
+        comment: null,
+        errors: [],
+      },
+    };
+  },
+
+  mounted() {
+    if (localStorage.success) {
+      flash(localStorage.success, 'success');
+      localStorage.removeItem('success');
+    }
+  },
+
+  methods: {
+    destroy() {
+      axios.delete(`/${this.$page.props.auth.company.id}/projects/${this.project.id}/messages/${this.message.id}`)
+        .then(response => {
+          localStorage.success = this.$t('project.message_destroy_success');
+          this.$inertia.visit(`/${this.$page.props.auth.company.id}/projects/${this.project.id}/messages/`);
+        })
+        .catch(error => {
+          this.form.errors = _.flatten(_.toArray(error.response.data));
+        });
+    },
+  }
+};
+
+</script>
diff --git a/resources/js/Pages/Project/Messages/Update.vue b/resources/js/Pages/Project/Messages/Update.vue
new file mode 100644
index 000000000..53f25b075
--- /dev/null
+++ b/resources/js/Pages/Project/Messages/Update.vue
@@ -0,0 +1,147 @@
+<style lang="scss" scoped>
+.ball-pulse {
+  right: 8px;
+  top: 37px;
+  position: absolute;
+}
+</style>
+
+<template>
+  <layout title="Home" :notifications="notifications">
+    <div class="ph2 ph0-ns">
+      <!-- BREADCRUMB -->
+      <div class="mt4-l mt1 mw6 br3 bg-white box center breadcrumb relative z-0 f6 pb2">
+        <ul class="list ph0 tc-l tl">
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/dashboard'">{{ $t('app.breadcrumb_dashboard') }}</inertia-link>
+          </li>
+          <li class="di">
+            ...
+          </li>
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/projects/' + project.id + '/messages/' + message.id">Message</inertia-link>
+          </li>
+          <li class="di">
+            {{ $t('app.breadcrumb_project_edit_message') }}
+          </li>
+        </ul>
+      </div>
+
+      <!-- BODY -->
+      <div class="mw7 center br3 mb5 bg-white box relative z-1">
+        <div class="pa3 measure center">
+          <h2 class="tc normal mb4 lh-copy">
+            {{ $t('project.message_edit_title_message') }}
+
+            <help :url="$page.props.help_links.project_messages" :top="'1px'" />
+          </h2>
+
+          <form @submit.prevent="submit">
+            <errors :errors="form.errors" />
+
+            <!-- Title -->
+            <text-input :id="'title'"
+                        v-model="form.title"
+                        :name="'title'"
+                        :datacy="'message-title-input'"
+                        :errors="$page.props.errors.title"
+                        :label="$t('project.message_create_title_message')"
+                        :help="$t('project.message_create_title_message_help')"
+                        :required="true"
+            />
+
+            <!-- Content -->
+            <text-area v-model="form.content"
+                       :label="$t('project.message_create_title_content')"
+                       :datacy="'message-content-textarea'"
+                       :required="true"
+                       :rows="10"
+                       :help="$t('project.message_create_title_content_help')"
+            />
+
+            <!-- Actions -->
+            <div class="mv4">
+              <div class="flex-ns justify-between">
+                <div>
+                  <inertia-link :href="'/' + $page.props.auth.company.id + '/projects/' + project.id + '/messages/' + message.id" class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3">
+                    {{ $t('app.cancel') }}
+                  </inertia-link>
+                </div>
+                <loading-button :classes="'btn add w-auto-ns w-100 mb2 pv2 ph3'" :state="loadingState" :text="$t('app.publish')" :cypress-selector="'submit-update-message-button'" />
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+  </layout>
+</template>
+
+<script>
+import TextInput from '@/Shared/TextInput';
+import TextArea from '@/Shared/TextArea';
+import Errors from '@/Shared/Errors';
+import LoadingButton from '@/Shared/LoadingButton';
+import Layout from '@/Shared/Layout';
+import Help from '@/Shared/Help';
+
+export default {
+  components: {
+    Layout,
+    TextInput,
+    TextArea,
+    Errors,
+    LoadingButton,
+    Help
+  },
+
+  props: {
+    project: {
+      type: Object,
+      default: null,
+    },
+    message: {
+      type: Object,
+      default: null,
+    },
+    notifications: {
+      type: Array,
+      default: null,
+    },
+  },
+
+  data() {
+    return {
+      form: {
+        title: null,
+        content: null,
+        errors: [],
+      },
+      loadingState: '',
+      errorTemplate: Error,
+    };
+  },
+
+  created() {
+    this.form.title = this.message.title;
+    this.form.content = this.message.content;
+  },
+
+  methods: {
+    submit() {
+      this.loadingState = 'loading';
+
+      axios.put(`/${this.$page.props.auth.company.id}/projects/${this.project.id}/messages/${this.message.id}`, this.form)
+        .then(response => {
+          localStorage.success = this.$t('project.message_update_success');
+          this.$inertia.visit(`/${this.$page.props.auth.company.id}/projects/${this.project.id}/messages/${this.message.id}`);
+        })
+        .catch(error => {
+          this.loadingState = null;
+          this.form.errors = _.flatten(_.toArray(error.response.data));
+        });
+    },
+  }
+};
+
+</script>
diff --git a/resources/js/Pages/Project/Partials/ProjectMenu.vue b/resources/js/Pages/Project/Partials/ProjectMenu.vue
index c0dd68762..4b3aa3a93 100644
--- a/resources/js/Pages/Project/Partials/ProjectMenu.vue
+++ b/resources/js/Pages/Project/Partials/ProjectMenu.vue
@@ -22,7 +22,7 @@
     <div class="bg-white box pa3 mb4 flex justify-between">
       <!-- name + summary -->
       <div class="pl3">
-        <h2 class="mt0 mb2 relative fw4" data-cy="project-name">
+        <h2 :class="project.summary ? 'mb2': 'mb0'" class="mt0 relative fw4" data-cy="project-name">
           {{ project.name }} <span v-if="project.code" class="ml2 ttu f7 project-code code br3 pa1 relative fw4">
             {{ project.code }}
           </span>
@@ -31,7 +31,7 @@
       </div>
 
       <!-- avatars -->
-      <div class="">
+      <div v-if="project.members.length > 0">
         <p class="mt0 mb2 f7 gray">Project members</p>
         <div class="flex items-center relative tr">
           <img v-for="member in project.members" :key="member.id" :src="member.avatar" alt="avatar" class="br-100 small-avatar"
diff --git a/resources/lang/en/account.php b/resources/lang/en/account.php
index 28316e056..fe2436ba1 100644
--- a/resources/lang/en/account.php
+++ b/resources/lang/en/account.php
@@ -259,6 +259,9 @@
     'log_project_team_lead_cleared' => 'Removed :employee_name as the project lead of the project called :project_name.',
     'log_project_decision_created' => 'Added a decision called :title in the project called :project_name.',
     'log_project_decision_destroyed' => 'Deleted a decision called :title in the project called :project_name.',
+    'log_project_message_created' => 'Added a message called :title in the project called :project_name.',
+    'log_project_message_destroyed' => 'Deleted a message called :title in the project called :project_name.',
+    'log_project_message_updated' => 'Updated a message called :title in the project called :project_name.',
 
     // employee logs
     'employee_log_employee_created' => 'Created this employee entry.',
diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php
index 06bdd2ee4..a0b6ce435 100644
--- a/resources/lang/en/app.php
+++ b/resources/lang/en/app.php
@@ -95,6 +95,8 @@
     'breadcrumb_project_create' => 'Add a new project',
     'breadcrumb_project_edit' => 'Edit project',
     'breadcrumb_project_delete' => 'Delete project',
+    'breadcrumb_project_create_message' => 'Add a new message',
+    'breadcrumb_project_edit_message' => 'Edit message',
     'breadcrumb_dashboard_one_on_one' => 'One on One',
     'breadcrumb_team_list' => 'All teams',
     'breadcrumb_team_show_team_news' => 'Team news',
diff --git a/resources/lang/en/project.php b/resources/lang/en/project.php
index 0617e6dfb..e991d3227 100644
--- a/resources/lang/en/project.php
+++ b/resources/lang/en/project.php
@@ -74,7 +74,7 @@
     'members_index_add_role_no_role' => 'No role',
     'members_index_add_role_create_new_one' => 'Or create a new role',
     'members_index_count' => 'This project has {count} members.',
-    'members_index_blank' => 'Projects are more fun when employees are assigned to them.',
+    'members_index_blank' => 'Projects are more fun when employees are working on them.',
     'members_index_blank_role' => 'No role created yet',
     'members_index_add_success' => 'The member has been added.',
     'members_index_remove_success' => 'The member has been removed.',
@@ -91,4 +91,22 @@
     'decision_index_add_success' => 'The decision has been recorded.',
     'decision_index_destroy_success' => 'The decision has been forgotten.',
     'decision_index_title' => 'Decisions in the project',
+
+    'message_title' => 'Messages',
+    'message_blank' => 'Messages are essential to make announcements, give feedback, ask questions and have a central point of documentation in the project.',
+    'message_cta' => 'Write a message',
+    'message_show_written_by' => 'Written by',
+    'message_show_written_on' => 'Written on',
+    'message_show_actions' => 'Actions',
+    'message_show_edit' => 'Edit message',
+    'message_show_destroy' => 'Delete message',
+    'message_create_success' => 'The message has been created.',
+    'message_update_success' => 'The message has been updated.',
+    'message_destroy_success' => 'The message has been deleted.',
+    'message_create_title' => 'Add a new message',
+    'message_create_title_message' => 'Title of the message',
+    'message_create_title_message_help' => 'Keep it informative and to the point.',
+    'message_create_title_content' =>'Content of the message',
+    'message_create_title_content_help' => 'Everyone in the company will be able to read this message.',
+    'message_edit_title_message' => 'Edit message',
 ];
diff --git a/routes/web.php b/routes/web.php
index d657be539..c31145671 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -213,9 +213,6 @@
             Route::post('{project}/links', 'Company\\Project\\ProjectController@createLink');
             Route::delete('{project}/links/{link}', 'Company\\Project\\ProjectController@destroyLink');
 
-            Route::get('{project}/messages', 'Company\\Project\\ProjectController@messages');
-            Route::get('{project}/messages/{message}', 'Company\\Project\\ProjectController@message');
-
             Route::get('{project}/status', 'Company\\Project\\ProjectController@createStatus');
             Route::put('{project}/status', 'Company\\Project\\ProjectController@postStatus');
 
@@ -230,6 +227,9 @@
             Route::get('{project}/members/search', 'Company\\Project\\ProjectMembersController@search');
             Route::post('{project}/members/store', 'Company\\Project\\ProjectMembersController@store');
             Route::post('{project}/members/remove', 'Company\\Project\\ProjectMembersController@remove');
+
+            // project messages
+            Route::resource('{project}/messages', 'Company\\Project\\ProjectMessagesController', ['as' => 'projects']);
         });
 
         Route::prefix('company')->group(function () {
diff --git a/tests/Features/integration/project/delete_project_spec.js b/tests/Features/integration/project/delete_project_spec.js
index ac07c2eb1..0456db745 100644
--- a/tests/Features/integration/project/delete_project_spec.js
+++ b/tests/Features/integration/project/delete_project_spec.js
@@ -11,7 +11,7 @@ describe('Project - project deletion', function () {
     cy.get('[data-cy=project-delete]').click();
     cy.get('[data-cy=submit-delete-project-button]').click();
     cy.url().should('include', '/1/projects');
-    cy.wait(200);
+    cy.visit('/1/projects');
   });
 
   it('should delete a project as hr', function () {
@@ -28,7 +28,7 @@ describe('Project - project deletion', function () {
     cy.get('[data-cy=project-delete]').click();
     cy.get('[data-cy=submit-delete-project-button]').click();
     cy.url().should('include', '/1/projects');
-    cy.wait(200);
+    cy.visit('/1/projects');
   });
 
   it('should delete a project as normal user', function () {
@@ -46,5 +46,6 @@ describe('Project - project deletion', function () {
     cy.get('[data-cy=project-delete]').click();
     cy.get('[data-cy=submit-delete-project-button]').click();
     cy.url().should('include', '/1/projects');
+    cy.visit('/1/projects');
   });
 });
diff --git a/tests/Features/integration/project/manage_project_messages_spec.js b/tests/Features/integration/project/manage_project_messages_spec.js
new file mode 100644
index 000000000..07da83e5e
--- /dev/null
+++ b/tests/Features/integration/project/manage_project_messages_spec.js
@@ -0,0 +1,116 @@
+describe('Project - messages', function () {
+  it('should let an employee add a message as administrator', function () {
+    cy.loginLegacy();
+
+    cy.createCompany();
+
+    cy.createProject(1, 'project 1');
+
+    // write a message
+    cy.visit('/1/projects/1/messages');
+    cy.get('[data-cy=messages-blank-state]').should('exist');
+
+    cy.get('[data-cy=add-message]').click();
+    cy.get('[data-cy=message-title-input]').type('message title');
+    cy.get('[data-cy=message-content-textarea]').type('message content');
+    cy.get('[data-cy=submit-add-message-button]').click();
+
+    cy.get('[data-cy=project-title]').contains('message title');
+    cy.get('[data-cy=project-content]').contains('message content');
+    cy.hasAuditLog('Added a message called message title', '/1/projects/1/messages/1');
+
+    // edit the message
+    cy.get('[data-cy=project-edit]').click();
+    cy.get('[data-cy=message-title-input]').clear();
+    cy.get('[data-cy=message-title-input]').type('message title');
+    cy.get('[data-cy=message-content-textarea]').clear();
+    cy.get('[data-cy=message-content-textarea]').type('message content');
+    cy.get('[data-cy=submit-update-message-button]').click();
+
+    // delete the message
+    cy.get('[data-cy=project-delete]').click();
+    cy.get('[data-cy=cancel-project-deletion]').click();
+    cy.get('[data-cy=project-delete]').click();
+    cy.get('[data-cy=confirm-project-deletion]').click();
+
+    cy.url().should('include', '/messages');
+    cy.visit('/1/projects');
+  });
+
+  it('should let an employee add a message as HR', function () {
+    cy.loginLegacy();
+
+    cy.createCompany();
+
+    cy.changePermission(1, 200);
+
+    cy.createProject(1, 'project 1');
+
+    // write a message
+    cy.visit('/1/projects/1/messages');
+    cy.get('[data-cy=messages-blank-state]').should('exist');
+
+    cy.get('[data-cy=add-message]').click();
+    cy.get('[data-cy=message-title-input]').type('message title');
+    cy.get('[data-cy=message-content-textarea]').type('message content');
+    cy.get('[data-cy=submit-add-message-button]').click();
+
+    cy.get('[data-cy=project-title]').contains('message title');
+    cy.get('[data-cy=project-content]').contains('message content');
+
+    // edit the message
+    cy.get('[data-cy=project-edit]').click();
+    cy.get('[data-cy=message-title-input]').clear();
+    cy.get('[data-cy=message-title-input]').type('message title');
+    cy.get('[data-cy=message-content-textarea]').clear();
+    cy.get('[data-cy=message-content-textarea]').type('message content');
+    cy.get('[data-cy=submit-update-message-button]').click();
+
+    // delete the message
+    cy.get('[data-cy=project-delete]').click();
+    cy.get('[data-cy=cancel-project-deletion]').click();
+    cy.get('[data-cy=project-delete]').click();
+    cy.get('[data-cy=confirm-project-deletion]').click();
+
+    cy.url().should('include', '/messages');
+    cy.visit('/1/projects');
+  });
+
+  it('should let an employee add a message a project as normal user', function () {
+    cy.loginLegacy();
+
+    cy.createCompany();
+
+    cy.changePermission(1, 300);
+
+    cy.createProject(1, 'project 1');
+
+    // write a message
+    cy.visit('/1/projects/1/messages');
+    cy.get('[data-cy=messages-blank-state]').should('exist');
+
+    cy.get('[data-cy=add-message]').click();
+    cy.get('[data-cy=message-title-input]').type('message title');
+    cy.get('[data-cy=message-content-textarea]').type('message content');
+    cy.get('[data-cy=submit-add-message-button]').click();
+
+    cy.get('[data-cy=project-title]').contains('message title');
+    cy.get('[data-cy=project-content]').contains('message content');
+
+    // edit the message
+    cy.get('[data-cy=project-edit]').click();
+    cy.get('[data-cy=message-title-input]').clear();
+    cy.get('[data-cy=message-title-input]').type('message title');
+    cy.get('[data-cy=message-content-textarea]').clear();
+    cy.get('[data-cy=message-content-textarea]').type('message content');
+    cy.get('[data-cy=submit-update-message-button]').click();
+
+    // delete the message
+    cy.get('[data-cy=project-delete]').click();
+    cy.get('[data-cy=cancel-project-deletion]').click();
+    cy.get('[data-cy=project-delete]').click();
+    cy.get('[data-cy=confirm-project-deletion]').click();
+
+    cy.url().should('include', '/messages');
+  });
+});
diff --git a/tests/Unit/Models/Company/ProjectMessageTest.php b/tests/Unit/Models/Company/ProjectMessageTest.php
new file mode 100644
index 000000000..30e26268c
--- /dev/null
+++ b/tests/Unit/Models/Company/ProjectMessageTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Tests\Unit\Models\Company;
+
+use Tests\TestCase;
+use App\Models\Company\ProjectDecision;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+
+class ProjectMessageTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_belongs_to_a_project(): void
+    {
+        $decision = factory(ProjectDecision::class)->create([]);
+        $this->assertTrue($decision->project()->exists());
+    }
+
+    /** @test */
+    public function it_belongs_to_a_employee(): void
+    {
+        $decision = factory(ProjectDecision::class)->create([]);
+        $this->assertTrue($decision->author()->exists());
+    }
+}
diff --git a/tests/Unit/Models/Company/ProjectTest.php b/tests/Unit/Models/Company/ProjectTest.php
index 5ea4cb97c..3702ad224 100644
--- a/tests/Unit/Models/Company/ProjectTest.php
+++ b/tests/Unit/Models/Company/ProjectTest.php
@@ -8,6 +8,7 @@
 use App\Models\Company\Employee;
 use App\Models\Company\ProjectLink;
 use App\Models\Company\ProjectStatus;
+use App\Models\Company\ProjectMessage;
 use App\Models\Company\ProjectDecision;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
@@ -100,4 +101,15 @@ public function it_has_many_decisions(): void
 
         $this->assertTrue($project->decisions()->exists());
     }
+
+    /** @test */
+    public function it_has_many_messages(): void
+    {
+        $project = factory(Project::class)->create();
+        factory(ProjectMessage::class, 2)->create([
+            'project_id' => $project->id,
+        ]);
+
+        $this->assertTrue($project->messages()->exists());
+    }
 }
diff --git a/tests/Unit/Services/Company/Project/CreateProjectMessageTest.php b/tests/Unit/Services/Company/Project/CreateProjectMessageTest.php
new file mode 100644
index 000000000..b06abbb87
--- /dev/null
+++ b/tests/Unit/Services/Company/Project/CreateProjectMessageTest.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Project;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Project;
+use App\Models\Company\Employee;
+use Illuminate\Support\Facades\Queue;
+use App\Models\Company\ProjectMessage;
+use Illuminate\Validation\ValidationException;
+use App\Services\Company\Project\CreateProjectStatus;
+use App\Services\Company\Project\CreateProjectMessage;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class CreateProjectMessageTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_adds_a_message_to_a_project_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $project = factory(Project::class)->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $project);
+    }
+
+    /** @test */
+    public function it_adds_a_message_to_a_project_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $project = factory(Project::class)->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $project);
+    }
+
+    /** @test */
+    public function it_adds_a_message_to_a_project_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $project = factory(Project::class)->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $project);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $request = [
+            'first_name' => 'Dwight',
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new CreateProjectStatus)->execute($request);
+    }
+
+    /** @test */
+    public function it_fails_if_the_project_is_not_in_the_company(): void
+    {
+        $michael = $this->createAdministrator();
+        $project = factory(Project::class)->create();
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $project);
+    }
+
+    private function executeService(Employee $michael, Project $project): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $michael->company_id,
+            'author_id' => $michael->id,
+            'project_id' => $project->id,
+            'title' => 'email',
+            'content' => 'content',
+        ];
+
+        $projectMessage = (new CreateProjectMessage)->execute($request);
+
+        $this->assertDatabaseHas('project_messages', [
+            'id' => $projectMessage->id,
+            'project_id' => $project->id,
+            'title' => 'email',
+            'content' => 'content',
+        ]);
+
+        $this->assertDatabaseHas('project_message_read_status', [
+            'project_message_id' => $projectMessage->id,
+            'employee_id' => $michael->id,
+        ]);
+
+        $this->assertInstanceOf(
+            ProjectMessage::class,
+            $projectMessage
+        );
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $project, $projectMessage) {
+            return $job->auditLog['action'] === 'project_message_created' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'project_id' => $project->id,
+                    'project_name' => $project->name,
+                    'title' => $projectMessage->title,
+                ]);
+        });
+    }
+}
diff --git a/tests/Unit/Services/Company/Project/DestroyProjectMessageTest.php b/tests/Unit/Services/Company/Project/DestroyProjectMessageTest.php
new file mode 100644
index 000000000..aa101a280
--- /dev/null
+++ b/tests/Unit/Services/Company/Project/DestroyProjectMessageTest.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Project;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Project;
+use App\Models\Company\Employee;
+use Illuminate\Support\Facades\Queue;
+use App\Models\Company\ProjectMessage;
+use Illuminate\Validation\ValidationException;
+use App\Services\Company\Project\DestroyProjectMessage;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use App\Services\Company\Project\DestroyProjectDecision;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class DestroyProjectMessageTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_destroys_a_message_from_a_project_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $project = factory(Project::class)->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $projectMessage = factory(ProjectMessage::class)->create([
+            'project_id' => $project->id,
+        ]);
+        $this->executeService($michael, $project, $projectMessage);
+    }
+
+    /** @test */
+    public function it_destroys_a_message_from_a_project_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $project = factory(Project::class)->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $projectMessage = factory(ProjectMessage::class)->create([
+            'project_id' => $project->id,
+        ]);
+        $this->executeService($michael, $project, $projectMessage);
+    }
+
+    /** @test */
+    public function it_destroys_a_message_from_a_project_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $project = factory(Project::class)->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $projectMessage = factory(ProjectMessage::class)->create([
+            'project_id' => $project->id,
+        ]);
+        $this->executeService($michael, $project, $projectMessage);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $request = [
+            'first_name' => 'Dwight',
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new DestroyProjectDecision)->execute($request);
+    }
+
+    /** @test */
+    public function it_fails_if_the_project_is_not_in_the_company(): void
+    {
+        $michael = $this->createAdministrator();
+        $project = factory(Project::class)->create();
+        $projectMessage = factory(ProjectMessage::class)->create([
+            'project_id' => $project->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $project, $projectMessage);
+    }
+
+    /** @test */
+    public function it_fails_if_the_project_message_is_not_part_of_the_project(): void
+    {
+        $michael = $this->createAdministrator();
+        $project = factory(Project::class)->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $projectMessage = factory(ProjectMessage::class)->create([]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $project, $projectMessage);
+    }
+
+    private function executeService(Employee $michael, Project $project, ProjectMessage $message): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $michael->company_id,
+            'author_id' => $michael->id,
+            'project_id' => $project->id,
+            'project_message_id' => $message->id,
+        ];
+
+        (new DestroyProjectMessage)->execute($request);
+
+        $this->assertDatabaseMissing('project_messages', [
+            'id' => $message->id,
+        ]);
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $project, $message) {
+            return $job->auditLog['action'] === 'project_message_destroyed' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'project_id' => $project->id,
+                    'project_name' => $project->name,
+                    'title' => $message->title,
+                ]);
+        });
+    }
+}
diff --git a/tests/Unit/Services/Company/Project/MarkProjectMessageasReadTest.php b/tests/Unit/Services/Company/Project/MarkProjectMessageasReadTest.php
new file mode 100644
index 000000000..49f394416
--- /dev/null
+++ b/tests/Unit/Services/Company/Project/MarkProjectMessageasReadTest.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Project;
+
+use Tests\TestCase;
+use App\Models\Company\Project;
+use App\Models\Company\Employee;
+use Illuminate\Support\Facades\Queue;
+use App\Models\Company\ProjectMessage;
+use Illuminate\Validation\ValidationException;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use App\Services\Company\Project\DestroyProjectDecision;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use App\Services\Company\Project\MarkProjectMessageasRead;
+
+class MarkProjectMessageasReadTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_reads_a_message_from_a_project_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $project = factory(Project::class)->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $projectMessage = factory(ProjectMessage::class)->create([
+            'project_id' => $project->id,
+        ]);
+        $this->executeService($michael, $project, $projectMessage);
+    }
+
+    /** @test */
+    public function it_reads_a_message_from_a_project_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $project = factory(Project::class)->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $projectMessage = factory(ProjectMessage::class)->create([
+            'project_id' => $project->id,
+        ]);
+        $this->executeService($michael, $project, $projectMessage);
+    }
+
+    /** @test */
+    public function it_reads_a_message_from_a_project_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $project = factory(Project::class)->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $projectMessage = factory(ProjectMessage::class)->create([
+            'project_id' => $project->id,
+        ]);
+        $this->executeService($michael, $project, $projectMessage);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $request = [
+            'first_name' => 'Dwight',
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new DestroyProjectDecision)->execute($request);
+    }
+
+    /** @test */
+    public function it_fails_if_the_project_is_not_in_the_company(): void
+    {
+        $michael = $this->createAdministrator();
+        $project = factory(Project::class)->create();
+        $projectMessage = factory(ProjectMessage::class)->create([
+            'project_id' => $project->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $project, $projectMessage);
+    }
+
+    /** @test */
+    public function it_fails_if_the_project_message_is_not_part_of_the_project(): void
+    {
+        $michael = $this->createAdministrator();
+        $project = factory(Project::class)->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $projectMessage = factory(ProjectMessage::class)->create([]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $project, $projectMessage);
+    }
+
+    private function executeService(Employee $michael, Project $project, ProjectMessage $message): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $michael->company_id,
+            'author_id' => $michael->id,
+            'project_id' => $project->id,
+            'project_message_id' => $message->id,
+        ];
+
+        (new MarkProjectMessageasRead)->execute($request);
+
+        $this->assertDatabaseHas('project_message_read_status', [
+            'project_message_id' => $message->id,
+            'employee_id' => $michael->id,
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Company/Project/UpdateProjectMessageTest.php b/tests/Unit/Services/Company/Project/UpdateProjectMessageTest.php
new file mode 100644
index 000000000..d1f2078ab
--- /dev/null
+++ b/tests/Unit/Services/Company/Project/UpdateProjectMessageTest.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Project;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Project;
+use App\Models\Company\Employee;
+use Illuminate\Support\Facades\Queue;
+use App\Models\Company\ProjectMessage;
+use Illuminate\Validation\ValidationException;
+use App\Services\Company\Project\UpdateProjectMessage;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class UpdateProjectMessageTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_updates_the_project_message_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $project = factory(Project::class)->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $projectMessage = factory(ProjectMessage::class)->create([
+            'project_id' => $project->id,
+        ]);
+        $this->executeService($michael, $project, $projectMessage);
+    }
+
+    /** @test */
+    public function it_updates_the_project_message_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $project = factory(Project::class)->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $projectMessage = factory(ProjectMessage::class)->create([
+            'project_id' => $project->id,
+        ]);
+        $this->executeService($michael, $project, $projectMessage);
+    }
+
+    /** @test */
+    public function it_updates_the_project_message_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $project = factory(Project::class)->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $projectMessage = factory(ProjectMessage::class)->create([
+            'project_id' => $project->id,
+        ]);
+        $this->executeService($michael, $project, $projectMessage);
+    }
+
+    /** @test */
+    public function it_fails_if_project_is_not_part_of_the_company(): void
+    {
+        $michael = factory(Employee::class)->create([]);
+        $project = factory(Project::class)->create();
+
+        $projectMessage = factory(ProjectMessage::class)->create([
+            'project_id' => $project->id,
+        ]);
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $project, $projectMessage);
+    }
+
+    /** @test */
+    public function it_fails_if_project_message_is_not_part_of_the_project(): void
+    {
+        $michael = factory(Employee::class)->create([]);
+        $project = factory(Project::class)->create();
+        $projectMessage = factory(ProjectMessage::class)->create([]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $project, $projectMessage);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $michael = factory(Employee::class)->create([]);
+
+        $request = [
+            'company_id' => $michael->company_id,
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new UpdateProjectMessage)->execute($request);
+    }
+
+    private function executeService(Employee $michael, Project $project, ProjectMessage $message): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $michael->company_id,
+            'author_id' => $michael->id,
+            'project_id' => $project->id,
+            'project_message_id' => $message->id,
+            'title' => 'Update',
+            'content' => 'Content',
+        ];
+
+        $message = (new UpdateProjectMessage)->execute($request);
+
+        $this->assertDatabaseHas('project_messages', [
+            'id' => $message->id,
+            'title' => 'Update',
+            'content' => 'Content',
+        ]);
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $project, $message) {
+            return $job->auditLog['action'] === 'project_message_updated' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'project_id' => $project->id,
+                    'project_name' => $project->name,
+                    'project_message_id' => $message->id,
+                    'project_message_title' => $message->title,
+                ]);
+        });
+    }
+}
diff --git a/tests/Unit/ViewHelpers/Project/ProjectMessagesViewHelperTest.php b/tests/Unit/ViewHelpers/Project/ProjectMessagesViewHelperTest.php
new file mode 100644
index 000000000..bb0be7e1b
--- /dev/null
+++ b/tests/Unit/ViewHelpers/Project/ProjectMessagesViewHelperTest.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace Tests\Unit\ViewHelpers\Project;
+
+use Carbon\Carbon;
+use Tests\TestCase;
+use App\Helpers\DateHelper;
+use App\Helpers\StringHelper;
+use App\Models\Company\Project;
+use Illuminate\Support\Facades\DB;
+use App\Models\Company\ProjectMessage;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use App\Http\ViewHelpers\Project\ProjectMessagesViewHelper;
+
+class ProjectMessagesViewHelperTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_gets_a_collection_of_messages(): void
+    {
+        $michael = $this->createAdministrator();
+        $jim = $this->createAnotherEmployee($michael);
+        $project = factory(Project::class)->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $projectMessageA = factory(ProjectMessage::class)->create([
+            'project_id' => $project->id,
+            'author_id' => $michael->id,
+        ]);
+        $projectMessageB = factory(ProjectMessage::class)->create([
+            'project_id' => $project->id,
+            'author_id' => null,
+        ]);
+
+        DB::table('project_message_read_status')->insert([
+            'project_message_id' => $projectMessageA->id,
+            'employee_id' => $michael->id,
+            'created_at' => Carbon::now(),
+        ]);
+
+        $collection = ProjectMessagesViewHelper::index($project, $michael);
+        $this->assertEquals(
+            [
+                0 => [
+                    'id' => $projectMessageA->id,
+                    'title' => $projectMessageA->title,
+                    'content' => 'This is a description',
+                    'read_status' => true,
+                    'written_at' => $projectMessageA->created_at->diffForHumans(),
+                    'url' => env('APP_URL').'/'.$michael->company_id.'/projects/'.$project->id.'/messages/'.$projectMessageA->id,
+                    'author' => [
+                        'id' => $michael->id,
+                        'name' => $michael->name,
+                        'avatar' => $michael->avatar,
+                        'url_view' => env('APP_URL').'/'.$michael->company_id.'/employees/'.$michael->id,
+                    ],
+                ],
+                1 => [
+                    'id' => $projectMessageB->id,
+                    'title' => $projectMessageB->title,
+                    'content' => 'This is a description',
+                    'read_status' => false,
+                    'written_at' => $projectMessageB->created_at->diffForHumans(),
+                    'url' => env('APP_URL').'/'.$michael->company_id.'/projects/'.$project->id.'/messages/'.$projectMessageB->id,
+                    'author' => null,
+                ],
+            ],
+            $collection->toArray()
+        );
+    }
+
+    /** @test */
+    public function it_gets_an_array_containing_all_the_information_about_a_given_message(): void
+    {
+        $michael = $this->createAdministrator();
+        $project = factory(Project::class)->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $projectMessage = factory(ProjectMessage::class)->create([
+            'project_id' => $project->id,
+            'author_id' => $michael->id,
+        ]);
+
+        $array = ProjectMessagesViewHelper::show($projectMessage);
+        $this->assertEquals(
+            [
+                'id' => $projectMessage->id,
+                'title' => $projectMessage->title,
+                'content' => $projectMessage->content,
+                'parsed_content' => StringHelper::parse($projectMessage->content),
+                'written_at' => DateHelper::formatDate($projectMessage->created_at),
+                'written_at_human' => $projectMessage->created_at->diffForHumans(),
+                'url_edit' => route('projects.messages.edit', [
+                    'company' => $projectMessage->project->company_id,
+                    'project' => $projectMessage->project,
+                    'message' => $projectMessage,
+                ]),
+                'author' => [
+                    'id' => $michael->id,
+                    'name' => $michael->name,
+                    'avatar' => $michael->avatar,
+                    'role' => null,
+                    'added_at' => null,
+                    'position' => [
+                        'id' => $michael->position->id,
+                        'title' => $michael->position->title,
+                    ],
+                    'url' => env('APP_URL').'/'.$michael->company_id.'/employees/'.$michael->id,
+                ],
+            ],
+            $array
+        );
+    }
+}
diff --git a/yarn.lock b/yarn.lock
index a18dc7e0d..cb6a96895 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2784,10 +2784,10 @@ cyclist@^1.0.1:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
-cypress@^5.3.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-5.4.0.tgz#8833a76e91129add601f823d43c53eb512d162c5"
-  integrity sha512-BJR+u3DRSYMqaBS1a3l1rbh5AkMRHugbxcYYzkl+xYlO6dzcJVE8uAhghzVI/hxijCyBg1iuSe4TRp/g1PUg8Q==
+cypress@5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-5.5.0.tgz#1da0355794a43247f8a80cb7f505e83e1cf847cb"
+  integrity sha512-UHEiTca8AUTevbT2pWkHQlxoHtXmbq+h6Eiu/Mz8DqpNkF98zjTBLv/HFiKJUU5rQzp9EwSWtms33p5TWCJ8tQ==
   dependencies:
     "@cypress/listr-verbose-renderer" "^0.4.1"
     "@cypress/request" "^2.88.5"
@@ -2819,10 +2819,10 @@ cypress@^5.3.0:
     minimist "^1.2.5"
     moment "^2.27.0"
     ospath "^1.2.2"
-    pretty-bytes "^5.3.0"
+    pretty-bytes "^5.4.1"
     ramda "~0.26.1"
     request-progress "^3.0.0"
-    supports-color "^7.1.0"
+    supports-color "^7.2.0"
     tmp "~0.2.1"
     untildify "^4.0.0"
     url "^0.11.0"
@@ -7392,7 +7392,7 @@ prettier@^2.1.2:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5"
   integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==
 
-pretty-bytes@^5.3.0:
+pretty-bytes@^5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.4.1.tgz#cd89f79bbcef21e3d21eb0da68ffe93f803e884b"
   integrity sha512-s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA==
@@ -8858,7 +8858,7 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0, supports-color@^7.1.0:
+supports-color@^7.0.0, supports-color@^7.1.0, supports-color@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==