diff --git a/app/scripts/resources/scripts/app/ring_groups/index.lua b/app/scripts/resources/scripts/app/ring_groups/index.lua
index 518a0246af..62c7d74306 100644
--- a/app/scripts/resources/scripts/app/ring_groups/index.lua
+++ b/app/scripts/resources/scripts/app/ring_groups/index.lua
@@ -341,6 +341,12 @@
 						["X-FusionPBX-Email-Type"]  = 'missed';
 					}
 
+				--remove quotes from caller id name and number
+					caller_id_name = caller_id_name:gsub("'", "'");
+					caller_id_name = caller_id_name:gsub([["]], """);
+					caller_id_number = caller_id_number:gsub("'", "'");
+					caller_id_number = caller_id_number:gsub([["]], """);
+			
 				--prepare the subject
 					subject = subject:gsub("${caller_id_name}", caller_id_name);
 					subject = subject:gsub("${caller_id_number}", caller_id_number);
@@ -363,8 +369,6 @@
 					body = body:gsub(" ", " ");
 					body = body:gsub("\n", "");
 					body = body:gsub("\n", "");
-					body = body:gsub("'", "'");
-					body = body:gsub([["]], """);
 					body = trim(body);
 
 				--send the email