diff --git a/includes/helper/email_helper.php b/includes/helper/email_helper.php
index b8ccabc4..5c7c64a8 100644
--- a/includes/helper/email_helper.php
+++ b/includes/helper/email_helper.php
@@ -1,12 +1,17 @@
 <?php
 
-function engelsystem_email_to_user($user, $title, $message) {
-  gettext_locale($user['Sprache']);
+function engelsystem_email_to_user($recipient_user, $title, $message, $not_if_its_me = false) {
+  global $user;
   
-  $message = sprintf(_("Hi %s,"), $user['Nick']) . "\n\n" . _("here is a message for you from the engelsystem:") . "\n\n" . $message . "\n\n" . _("This email is autogenerated and has not to be signed. You got this email because you are registered in the engelsystem.");
+  if ($not_if_its_me && $user['UID'] == $recipient_user['UID'])
+    return true;
+  
+  gettext_locale($recipient_user['Sprache']);
+  
+  $message = sprintf(_("Hi %s,"), $recipient_user['Nick']) . "\n\n" . _("here is a message for you from the engelsystem:") . "\n\n" . $message . "\n\n" . _("This email is autogenerated and has not to be signed. You got this email because you are registered in the engelsystem.");
   
   gettext_locale();
-  return engelsystem_email($user['email'], $title, $message);
+  return engelsystem_email($recipient_user['email'], $title, $message);
 }
 
 function engelsystem_email($address, $title, $message) {
diff --git a/includes/mailer/shifts_mailer.php b/includes/mailer/shifts_mailer.php
index cd34274f..16b0db65 100644
--- a/includes/mailer/shifts_mailer.php
+++ b/includes/mailer/shifts_mailer.php
@@ -44,7 +44,7 @@ function mail_shift_change($old_shift, $new_shift) {
   
   foreach ($users as $user)
     if ($user["email_shiftinfo"])
-      engelsystem_email_to_user($user, '[engelsystem] ' . _("Your Shift has changed"), $message);
+      engelsystem_email_to_user($user, '[engelsystem] ' . _("Your Shift has changed"), $message, true);
 }
 
 function mail_shift_delete($shift) {
@@ -59,7 +59,7 @@ function mail_shift_delete($shift) {
   
   foreach ($users as $user)
     if ($user["email_shiftinfo"])
-      engelsystem_email_to_user($user, '[engelsystem] ' . _("Your Shift was deleted"), $message);
+      engelsystem_email_to_user($user, '[engelsystem] ' . _("Your Shift was deleted"), $message, true);
 }
 
 function mail_shift_assign($user, $shift) {
@@ -71,7 +71,7 @@ function mail_shift_assign($user, $shift) {
     $message .= date("y-m-d H:i", $shift["start"]) . " - " . date("H:i", $shift["end"]) . "\n";
     $message .= $room["Name"] . "\n";
     
-    engelsystem_email_to_user($user, '[engelsystem] ' . _("Assigned to Shift"), $message);
+    engelsystem_email_to_user($user, '[engelsystem] ' . _("Assigned to Shift"), $message, true);
   }
 }
 
@@ -84,7 +84,7 @@ function mail_shift_removed($user, $shift) {
     $message .= date("y-m-d H:i", $shift["start"]) . " - " . date("H:i", $shift["end"]) . "\n";
     $message .= $room["Name"] . "\n";
     
-    engelsystem_email_to_user($user, '[engelsystem] ' . _("Removed from Shift"), $message);
+    engelsystem_email_to_user($user, '[engelsystem] ' . _("Removed from Shift"), $message, true);
   }
 }