diff --git a/includes/mailer/shifts_mailer.php b/includes/mailer/shifts_mailer.php
index ffc1dea7..347b2887 100644
--- a/includes/mailer/shifts_mailer.php
+++ b/includes/mailer/shifts_mailer.php
@@ -6,48 +6,91 @@ function mail_shift_change($old_shift, $new_shift) {
   $old_room = Room($old_shift["RID"]);
   $new_room = Room($new_shift["RID"]);
 
+  $noticable_changes = false;
+
+  $message = _("A Shift you are registered on has changed:");
+  $message .="\n";
+
+  if($old_shift["name"] != $new_shift["name"]) {
+    $message .= sprintf(_("* Shift Name changed from %s to %s"), $old_shift["name"], $new_shift["name"]) . "\n";
+    $noticable_changes = true;
+  }
+
+  if($old_shift["start"] != $new_shift["start"]) {
+    $message .= sprintf(_("* Shift Start changed from %s to %s"),date("y-m-d H:i", $old_shift["start"]), date("y-m-d H:i", $new_shift["start"])) . "\n";
+    $noticable_changes = true;
+  }
+
+  if($old_shift["end"] != $new_shift["end"]) {
+    $message .= sprintf(_("* Shift End changed from %s to %s"),date("y-m-d H:i", $old_shift["end"]), date("y-m-d H:i", $new_shift["end"])) . "\n";
+    $noticable_changes = true;
+  }
+
+  if($old_shift["RID"] != $new_shift["RID"]) {
+    $message .= sprintf(_("* Shift Location changed from %s to %s"), $old_room["Name"], $new_room["Name"]) . "\n";
+    $noticable_changes = true;
+  }
+
+  if (!$noticable_changes) {
+    //There are no changes worth sending an E-Mail
+    return;
+  }
+
+  $message .= "\n";
+  $message .= _("The updated Shift:") . "\n";
+
+  $message .= $new_shift["name"] . "\n";
+  $message .= date("y-m-d H:i", $new_shift["start"]) . " - " . date("H:i", $new_shift["end"]) . "\n";
+  $message .= $new_room["Name"] . "\n";
+
   foreach ($users as $user) {
     if ($user["email_shiftinfo"]) {
+      engelsystem_email_to_user($user, _("[Angelsystem] Your Shift has changed"), $message);
+    }
+  }
+}
 
-      $noticable_changes = false;
+function mail_shift_delete($shift) {
 
-      $message = _("A Shift you are registered on has changed:");
-      $message .="\n";
+  $users = ShiftEntries_by_shift($shift["SID"]);
+  $room = Room($shift["RID"]);
 
-      if($old_shift["name"] != $new_shift["name"]) {
-        $message .= sprintf(_("* Shift Name changed from %s to %s"), $old_shift["name"], $new_shift["name"]) . "\n";
-        $noticable_changes = true;
-      }
+  $message = _("A Shift you are registered on was deleted:") . "\n";
 
-      if($old_shift["start"] != $new_shift["start"]) {
-        $message .= sprintf(_("* Shift Start changed from %s to %s"),date("y-m-d H:i", $old_shift["start"]), date("y-m-d H:i", $new_shift["start"])) . "\n";
-        $noticable_changes = true;
-      }
+  $message .= $shift["name"] . "\n";
+  $message .= date("y-m-d H:i", $shift["start"]) . " - " . date("H:i", $shift["end"]) . "\n";
+  $message .= $room["Name"] . "\n";
+
+  foreach ($users as $user) {
+    if ($user["email_shiftinfo"]) {
+      engelsystem_email_to_user($user, _("[Angelsystem] Your Shift was deleted"), $message);
+    }
+  }
+}
 
-      if($old_shift["end"] != $new_shift["end"]) {
-        $message .= sprintf(_("* Shift End changed from %s to %s"),date("y-m-d H:i", $old_shift["end"]), date("y-m-d H:i", $new_shift["end"])) . "\n";
-        $noticable_changes = true;
-      }
+function mail_shift_assign($user, $shift) {
+  if ($user["email_shiftinfo"]) {
+    $room = Room($shift["RID"]);
 
-      if($old_shift["RID"] != $new_shift["RID"]) {
-        $message .= sprintf(_("* Shift Location changed from %s to %s"), $old_room["Name"], $new_room["Name"]) . "\n";
-        $noticable_changes = true;
-      }
+    $message = _("You have been assigned to a Shift:") . "\n"
+    $message .= $shift["name"] . "\n";
+    $message .= date("y-m-d H:i", $shift["start"]) . " - " . date("H:i", $shift["end"]) . "\n";
+    $message .= $room["Name"] . "\n";
 
-      if (!noticable_changes) {
-        //There are no changes worth sending an E-Mail
-        return;
-      }
+    engelsystem_email_to_user($user, _("[Angelsystem] Assigned to Shift"), $message);
+  }
+}
 
-      $message .= "\n";
-      $message .= _("The updated Shift:") . "\n";
+function mail_shift_removed($user, $shift) {
+  if ($user["email_shiftinfo"]) {
+    $room = Room($shift["RID"]);
 
-      $message .= $new_shift["name"] . "\n";
-      $message .= date("y-m-d H:i", $new_shift["start"]) . " - " . date("y-m-d H:i", $new_shift["end"]) . "\n";
-      $message .= $new_room["Name"] . "\n";
+    $message = _("You have been removed from a Shift:") . "\n"
+    $message .= $shift["name"] . "\n";
+    $message .= date("y-m-d H:i", $shift["start"]) . " - " . date("H:i", $shift["end"]) . "\n";
+    $message .= $room["Name"] . "\n";
 
-      engelsystem_email_to_user($user, _("[Angelsystem] Your Shift has changed"), $message);
-    }
+    engelsystem_email_to_user($user, _("[Angelsystem] Assigned to Shift"), $message);
   }
 }