diff --git a/app/views/settings/_mail_handler.rhtml b/app/views/settings/_mail_handler.rhtml
index b5ed14ea..722ba617 100644
--- a/app/views/settings/_mail_handler.rhtml
+++ b/app/views/settings/_mail_handler.rhtml
@@ -5,6 +5,9 @@
     <%= setting_text_area :mail_handler_body_delimiters, :rows => 5 %>
     <br /><em><%= l(:text_line_separated) %></em>
   </p>
+
+  <p><%= setting_check_box :mail_handler_confirmation_on_success %></p>
+  <p><%= setting_check_box :mail_handler_confirmation_on_failure %></p>
 </div>
 
 <div class="box tabular settings">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 83b8be4a..5c167c53 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -368,6 +368,8 @@ en:
   setting_commit_logtime_activity_id: Activity for logged time
   setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
   setting_issue_startdate_is_adddate: Use current date as start date for new issues
+  setting_mail_handler_confirmation_on_success: "Send confirmation email on successful incoming email"
+  setting_mail_handler_confirmation_on_failure: "Send confirmation email on failed incoming email"
 
   permission_add_project: Create project
   permission_add_subprojects: Create subprojects
diff --git a/config/settings.yml b/config/settings.yml
index 5f708e2d..91139c14 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -178,5 +178,9 @@ default_notification_option:
   default: 'only_my_events'
 emails_header:
   default: ''
+mail_handler_confirmation_on_success:
+  default: 1
+mail_handler_confirmation_on_failure:
+  default: 1
 issue_startdate_is_adddate:
-  default: 1
\ No newline at end of file
+  default: 1