diff --git a/app/email_queue/app_config.php b/app/email_queue/app_config.php
index 7a41e2064c..77ec5ebc1a 100644
--- a/app/email_queue/app_config.php
+++ b/app/email_queue/app_config.php
@@ -44,6 +44,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Limit the number of attempts before the email is set to failed.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "27c6f91a-7362-4028-95d1-bf05539fdf3b";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "email_queue";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "save_response";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Save the SMTP send response. Use this for debugging SMTP response.";
+		$y++;
 		//$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a9eb5a16-e018-4a83-975e-eee2ed31f923";
 		//$apps[$x]['default_settings'][$y]['default_setting_category'] = "email_queue";
 		//$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "retry_interval";
@@ -268,3 +276,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
 ?>
+
diff --git a/app/email_queue/resources/jobs/email_send.php b/app/email_queue/resources/jobs/email_send.php
index 848f1e24c5..c7e7af88c4 100644
--- a/app/email_queue/resources/jobs/email_send.php
+++ b/app/email_queue/resources/jobs/email_send.php
@@ -145,9 +145,10 @@
 //get the email queue settings
 	$setting = new settings(["domain_uuid" => $domain_uuid]);
 
-//get the call center settings
+//get the email settings
 	$retry_limit = $setting->get('email_queue', 'retry_limit');
 	$transcribe_enabled = $setting->get('voicemail', 'transcribe_enabled');
+	$save_response = $setting->get('email_queue', 'save_response');
 
 //set defaults
 	if (empty($email_retry_count)) {
@@ -180,7 +181,6 @@
 		//$voicemail_description = $row["voicemail_description"];
 		//$voicemail_name_base64 = $row["voicemail_name_base64"];
 		//$voicemail_tutorial = $row["voicemail_tutorial"];
-		
 	}
 	unset($parameters);
 
@@ -222,7 +222,7 @@
 			}
 
 			if (isset($transcribe_enabled) && $transcribe_enabled === 'true' && isset($voicemail_transcription_enabled) && $voicemail_transcription_enabled === 'true') {
-				//debug message  
+				//debug message
 				echo "transcribe enabled: true\n";
 
 				//transcribe the attachment
@@ -336,20 +336,17 @@
 		//set the email status to sent
 		$sql = "update v_email_queue ";
 		$sql .= "set email_status = 'sent', ";
-		//$sql .= "set email_status = 'waiting' "; //debug
 		if (isset($transcribe_message)) {
 			$sql .= "email_transcription = :email_transcription, ";
+			$parameters['email_transcription'] = $transcribe_message;
+		}
+		if (isset($save_response) && $save_response == 'true') {
+			$sql .= "email_response = :email_response, ";
+			$parameters['email_response'] = $email_settings."\n".$email_response;
 		}
-		$sql .= "email_response = :email_response, ";
 		$sql .= "update_date = now() ";
 		$sql .= "where email_queue_uuid = :email_queue_uuid; ";
 		$parameters['email_queue_uuid'] = $email_queue_uuid;
-		$parameters['email_response'] = $email_settings."\n".$email_response;
-		if (isset($transcribe_message)) {
-			$parameters['email_transcription'] = $transcribe_message;
-		}
-		//echo $sql."\n";
-		//print_r($parameters);
 		$database = new database;
 		$database->execute($sql, $parameters);
 		unset($parameters);