diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 5a1b128f..2fa5a9d9 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -56,6 +56,7 @@ class MyController < ApplicationController
       @user.attributes = params[:user]
       @user.mail_notification = (params[:notification_option] == 'all')
       @user.pref.attributes = params[:pref]
+      @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
       if @user.save
         @user.pref.save
         @user.notified_project_ids = (params[:notification_option] == 'selected' ? params[:notified_project_ids] : [])
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index c17e2aa1..aa372120 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -121,6 +121,14 @@ class Mailer < ActionMailer::Base
     default_url_options[:protocol] = Setting.protocol
   end
   
+  # Overrides the create_mail method to remove the current user from the recipients and cc
+  # if he doesn't want to receive notifications about what he does
+  def create_mail
+    recipients.delete(User.current.mail) if recipients && User.current.pref[:no_self_notified]
+    cc.delete(User.current.mail) if cc && User.current.pref[:no_self_notified]
+    super
+  end
+  
   # Renders a message with the corresponding layout
   def render_message(method_name, body)
     layout = method_name.match(%r{text\.html\.(rhtml|rxml)}) ? 'layout.text.html.rhtml' : 'layout.text.plain.rhtml'
diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml
index 198ef8ff..e65f78a4 100644
--- a/app/views/my/account.rhtml
+++ b/app/views/my/account.rhtml
@@ -32,6 +32,7 @@
 <% end %></p>
 <p><em><%= l(:text_user_mail_option) %></em></p>
 <% end %>
+<p><label><%= check_box_tag 'no_self_notified', 1, @user.pref[:no_self_notified] %> I don't want to be notified of changes that I make myself.</label></p>
 </div>
 </div>
 <% end %>