diff --git a/.gitignore b/.gitignore
index ed9cd99..a6fedb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
 .tmp*
 .htaccess
 .settings/*
+*~
+*.orig
+git-create-branch-github.sh
+git-create-branch-origin.sh
+framework.config.php
+.project
diff --git a/api/Application.class.php b/api/Application.class.php
index 8557558..ef18d8e 100644
--- a/api/Application.class.php
+++ b/api/Application.class.php
@@ -662,6 +662,7 @@ class CerberusSettings {
 	const DEFAULT_SIGNATURE_POS = 'default_signature_pos'; 
 	const HELPDESK_TITLE = 'helpdesk_title'; 
 	const HELPDESK_LOGO_URL = 'helpdesk_logo_url'; 
+	const DISABLE_WORKER_EMAIL_TO_CUSTOMER = 'disable_worker_email_to_customer'; 
 	const SMTP_HOST = 'smtp_host'; 
 	const SMTP_AUTH_ENABLED = 'smtp_auth_enabled'; 
 	const SMTP_AUTH_USER = 'smtp_auth_user'; 
@@ -677,6 +678,7 @@ class CerberusSettings {
 	const AUTHORIZED_IPS = 'authorized_ips';
 	const LICENSE = 'license';
 	const ACL_ENABLED = 'acl_enabled';
+		self::DISABLE_WORKER_EMAIL_TO_CUSTOMER => 0,
 };
 
 // [TODO] This gets called a lot when it happens after the registry cache
diff --git a/api/app/Parser.php b/api/app/Parser.php
index db1a7b4..14caf01 100644
--- a/api/app/Parser.php
+++ b/api/app/Parser.php
@@ -497,11 +497,13 @@ class CerberusParser {
 						$i++;
 					} 				
 					
-	        		CerberusMail::sendTicketMessage(array(
+					$settings = CerberusSettings::getInstance();
+					CerberusMail::sendTicketMessage(array(
 						'message_id' => $msgid,
 						'content' => $message->body,
 						'files' => $attachment_files,
 						'agent_id' => $worker_address->worker_id,
+						'dont_send' => $settings->get(CerberusSettings::DISABLE_WORKER_EMAIL_TO_CUSTOMER,'0'),
 					));
 					
 	        		return $id;
diff --git a/features/cerberusweb.core/api/uri/config.php b/features/cerberusweb.core/api/uri/config.php
index aae3dd9..0471321 100644
--- a/features/cerberusweb.core/api/uri/config.php
+++ b/features/cerberusweb.core/api/uri/config.php
@@ -596,6 +596,9 @@ class ChConfigurationPage extends CerberusPageExtension  {
 		$smtp_enc = $settings->get('cerberusweb.core',CerberusSettings::SMTP_ENCRYPTION_TYPE,'None');
 		$smtp_max_sends = $settings->get('cerberusweb.core',CerberusSettings::SMTP_MAX_SENDS,'20');
 		
+		$disable_worker_email_to_customer = $settings->get('cerberusweb.core',CerberusSettings::DISABLE_WORKER_EMAIL_TO_CUSTOMER,'0');
+		$tpl->assign('disable_worker_email_to_customer', $disable_worker_email_to_customer);
+
 		$pop3_accounts = DAO_Mail::getPop3Accounts();
 		$tpl->assign('pop3_accounts', $pop3_accounts);
 		
@@ -1681,6 +1684,7 @@ class ChConfigurationPage extends CerberusPageExtension  {
 	    @$smtp_enc = DevblocksPlatform::importGPC($_REQUEST['smtp_enc'],'string','None');
 	    @$smtp_timeout = DevblocksPlatform::importGPC($_REQUEST['smtp_timeout'],'integer',30);
 	    @$smtp_max_sends = DevblocksPlatform::importGPC($_REQUEST['smtp_max_sends'],'integer',20);
+	    @$disable_worker_email_to_customer = DevblocksPlatform::importGPC($_REQUEST['disable_worker_email_to_customer'],'integer',0);
 
 	    @$smtp_auth_enabled = DevblocksPlatform::importGPC($_REQUEST['smtp_auth_enabled'],'integer', 0);
 	    if($smtp_auth_enabled) {
@@ -1698,6 +1702,7 @@ class ChConfigurationPage extends CerberusPageExtension  {
 	    $settings->set('cerberusweb.core',CerberusSettings::DEFAULT_SIGNATURE, $default_signature);
 	    $settings->set('cerberusweb.core',CerberusSettings::DEFAULT_SIGNATURE_POS, $default_signature_pos);
 	    $settings->set('cerberusweb.core',CerberusSettings::SMTP_HOST, $smtp_host);
+	    $settings->set('cerberusweb.core',CerberusSettings::DISABLE_WORKER_EMAIL_TO_CUSTOMER, $disable_worker_email_to_customer);
 	    $settings->set('cerberusweb.core',CerberusSettings::SMTP_PORT, $smtp_port);
 	    $settings->set('cerberusweb.core',CerberusSettings::SMTP_AUTH_ENABLED, $smtp_auth_enabled);
 	    $settings->set('cerberusweb.core',CerberusSettings::SMTP_AUTH_USER, $smtp_auth_user);
diff --git a/features/cerberusweb.core/strings.xml b/features/cerberusweb.core/strings.xml
index 404648f..52f524b 100644
--- a/features/cerberusweb.core/strings.xml
+++ b/features/cerberusweb.core/strings.xml
@@ -660,6 +660,9 @@
 		<tu tuid='config.mail.smtp.failed'>
 			<tuv xml:lang="en_US"><seg>SMTP Connection Failed:</seg></tuv>
 		</tu>
+		<tu tuid='config.mail.smtp.disable.email.outbound'>
+			<tuv xml:lang="en_US"><seg>Disable worker replies thought email</seg></tuv>
+		</tu>
 		
 
 		<!-- Contact orgs -->
diff --git a/features/cerberusweb.core/templates/configuration/tabs/mail/outgoing_settings.tpl b/features/cerberusweb.core/templates/configuration/tabs/mail/outgoing_settings.tpl
index 4c3966a..d6c029b 100644
--- a/features/cerberusweb.core/templates/configuration/tabs/mail/outgoing_settings.tpl
+++ b/features/cerberusweb.core/templates/configuration/tabs/mail/outgoing_settings.tpl
@@ -57,7 +57,8 @@
 				<br>
 				
 				<div id="configSmtpTest"></div>	
-				<button type="button" onclick="genericAjaxGet('configSmtpTest','c=config&a=getSmtpTest&host='+this.form.smtp_host.value+'&port='+encodeURIComponent(this.form.smtp_port.value)+'&enc='+encodeURIComponent(radioValue(this.form.smtp_enc))+'&smtp_user='+encodeURIComponent(this.form.smtp_auth_user.value)+'&smtp_pass='+encodeURIComponent(this.form.smtp_auth_pass.value));"><img src="{devblocks_url}c=resource&p=cerberusweb.core&f=images/gear.gif{/devblocks_url}" align="top"> Test SMTP</button>				
+				<button type="button" onclick="genericAjaxGet('configSmtpTest','c=config&a=getSmtpTest&host='+this.form.smtp_host.value+'&port='+encodeURIComponent(this.form.smtp_port.value)+'&enc='+encodeURIComponent(radioValue(this.form.smtp_enc))+'&smtp_user='+encodeURIComponent(this.form.smtp_auth_user.value)+'&smtp_pass='+encodeURIComponent(this.form.smtp_auth_pass.value));"><img src="{devblocks_url}c=resource&p=cerberusweb.core&f=images/gear.gif{/devblocks_url}" align="top"> Test SMTP</button>
+
 			</blockquote>
 			
 			<h3>Default Preferences</h3>
@@ -93,7 +94,9 @@
 					</select>
 					<br>
 					<br>
-				</div>
+					<label><input type="checkbox" name="disable_worker_email_to_customer" value="1" {if $settings->get('cerberusweb.core','disable_worker_email_to_customer')}checked{/if}> {$translate->_('config.mail.smtp.disable.email.outbound')|capitalize}</label><br>
+					<br>
+			</div>
 			</blockquote>
 			
 			<button type="submit"><img src="{devblocks_url}c=resource&p=cerberusweb.core&f=images/check.gif{/devblocks_url}" align="top"> {$translate->_('common.save_changes')|capitalize}</button>