diff --git a/includes/install/scripts/email.lua b/includes/install/scripts/email.lua
index 61a7b09d0d..f8cd56617b 100644
--- a/includes/install/scripts/email.lua
+++ b/includes/install/scripts/email.lua
@@ -48,6 +48,12 @@
 	--convert_cmd = argv[6];
 	--convert_ext = argv[7];
 
+--replace the &#39 with a single quote
+	body = body:gsub("'", "'");
+
+--replace the &#34 with double quote
+	body = body:gsub(""", [["]]);
+
 --send the email
 	if (file == nil) then
 		freeswitch.email("",