diff --git a/be/app/Mail/SubTaskFinishedWithHigherTrackedTime.php b/be/app/Mail/SubTaskFinishedWithHigherTrackedTime.php
index 02f1a06..3b5f08c 100644
--- a/be/app/Mail/SubTaskFinishedWithHigherTrackedTime.php
+++ b/be/app/Mail/SubTaskFinishedWithHigherTrackedTime.php
@@ -34,7 +34,8 @@ class SubTaskFinishedWithHigherTrackedTime extends Mailable
     public function envelope()
     {
         return new Envelope(
-            subject: 'Sub Task Finished With Higher Tracked Time Than Estimated'
+//            subject: 'Sub Task Finished With Higher Tracked Time Than Estimated'
+            subject: 'Čas pre Task ' . $this->subtask->mastertask->project->code . ' - ' . ($this->subtask->title) ?: $this->subtask->mastertask->title . ' bol prekročený'
         );
     }
 
diff --git a/be/app/Mail/TimeBlockFinished.php b/be/app/Mail/TimeBlockFinished.php
index 7aff3b0..f393080 100644
--- a/be/app/Mail/TimeBlockFinished.php
+++ b/be/app/Mail/TimeBlockFinished.php
@@ -34,7 +34,7 @@ class TimeBlockFinished extends Mailable
     public function envelope()
     {
         return new Envelope(
-            subject: 'Time block for subtask was finished'
+            subject: 'Naplánovaný čas pre Task ' . $this->subtask->mastertask->project->code . ' - ' . ($this->subtask->title) ?: $this->subtask->mastertask->title . ' bol ukončený'
         );
     }
 
diff --git a/be/resources/views/emails/task/sub_task_finished_with_higher_tracked_time.blade.php b/be/resources/views/emails/task/sub_task_finished_with_higher_tracked_time.blade.php
index 9ea7625..7e9c388 100644
--- a/be/resources/views/emails/task/sub_task_finished_with_higher_tracked_time.blade.php
+++ b/be/resources/views/emails/task/sub_task_finished_with_higher_tracked_time.blade.php
@@ -1,3 +1,3 @@
-Sub Task {{$subtask->mastertask->title}} finished with higher tracker time than estimated. <br><br>
-Estimated: {{$subtask->estimated_time}} <br>
-Tracked: {{$subtask->tracked_time}} <br>
+Názov Tasku: {{($subtask->title) ?: $subtask->mastertask->title}} <br>
+Odhadovaný čas: {{$subtask->estimated_time}} <br>
+Odpracovaný čas: {{$subtask->tracked_time}} <br>
diff --git a/be/resources/views/emails/task/time_block_finished.blade.php b/be/resources/views/emails/task/time_block_finished.blade.php
index f4790c0..e5c911a 100644
--- a/be/resources/views/emails/task/time_block_finished.blade.php
+++ b/be/resources/views/emails/task/time_block_finished.blade.php
@@ -1 +1,4 @@
-Timeblock for Sub Task {{$subtask->mastertask->title}} was finished.
+Job number: {{$subtask->mastertask->project->code}} <br>
+Názov Tasku: {{($subtask->title) ?: $subtask->mastertask->title}} <br>
+Deadline do: {{($subtask->deadline) ?: $subtask->mastertask->deadline}} <br>
+Odkaz na Task: {{ url( env( 'APP_URL_FE' ) . '/#/app/dashboard/tasks?subtask=' . $subtask->id) }} <br>