diff --git a/src/EventListener/EmailNotificationSubscriber.php b/src/EventListener/EmailNotificationSubscriber.php
index 639fc2e..f371593 100644
--- a/src/EventListener/EmailNotificationSubscriber.php
+++ b/src/EventListener/EmailNotificationSubscriber.php
@@ -79,18 +79,20 @@ class EmailNotificationSubscriber implements EventSubscriberInterface
         $assignment = $disposition->getAssignment();
         $destination = $assignment->getDestination();
 
-        $dueDate = (new \DateTimeImmutable())->modify('+5 days');
+        $today = new \DateTimeImmutable();
+        $diffInDays = $destination->getDateFrom()->diff($today)->days;
 
-        if ($destination->getDateFrom() > $dueDate) {
+        if ($diffInDays < 1 || $diffInDays > 5) {
             return;
         }
 
         $this->mailer->createAndSendEmail([
             'disposition' => $disposition,
+            'diffInDays' => $diffInDays,
         ], [
             'to' => $teamer->getCommunication()->getEmail(),
             'subject' => 'Reminder: Dein Einsatz '.$destination,
-            'template' => 'email/reminder_pre_disposition.html.twig',
+            'template' => 'email/reminder_disposition.html.twig',
         ]);
     }
 
diff --git a/src/Service/Cron/DispositionReminderService.php b/src/Service/Cron/DispositionReminderService.php
index 28645f8..55d7d3b 100644
--- a/src/Service/Cron/DispositionReminderService.php
+++ b/src/Service/Cron/DispositionReminderService.php
@@ -55,10 +55,11 @@ class DispositionReminderService
 
             $this->mailer->createAndSendEmail([
                 'disposition' => $disposition,
+                'diffInDays' => 5,
             ], [
                 'to' => $teamer->getCommunication()->getEmail(),
                 'subject' => 'Reminder: Dein Einsatz '.$destination,
-                'template' => 'email/reminder_pre_disposition.html.twig',
+                'template' => 'email/reminder_disposition.html.twig',
             ]);
         }
 
diff --git a/templates/email/reminder_pre_disposition.html.twig b/templates/email/reminder_disposition.html.twig
similarity index 91%
rename from templates/email/reminder_pre_disposition.html.twig
rename to templates/email/reminder_disposition.html.twig
index 5221cce..cf32735 100644
--- a/templates/email/reminder_pre_disposition.html.twig
+++ b/templates/email/reminder_disposition.html.twig
@@ -7,8 +7,8 @@
     </h1>
     <p>
         dein Einsatz als {{ disposition.assignment.jobProfile.name }}, {{ destination.product }} vom
-        {{ destination.dateFrom | date('d.m.Y') }} bis {{ destination.dateTo | date('d.m.Y') }} beginnt <strong>in fünf
-        Tagen</strong>.
+        {{ destination.dateFrom | date('d.m.Y') }} bis {{ destination.dateTo | date('d.m.Y') }} beginnt
+        <strong>in {{ diffInDays }} Tagen</strong>.
     </p>
     <p>
         Wir hoffen, dass du ich schon freust und wünschen dir viel Spaß und Erfolg! Finale Infos erhältst du, falls noch