diff --git a/resources/install/scripts/app/voicemail/resources/functions/send_email.lua b/resources/install/scripts/app/voicemail/resources/functions/send_email.lua
index b72350b1a0..0480f8c9dd 100644
--- a/resources/install/scripts/app/voicemail/resources/functions/send_email.lua
+++ b/resources/install/scripts/app/voicemail/resources/functions/send_email.lua
@@ -156,20 +156,11 @@
 					file = voicemail_dir.."/"..id.."/msg_"..uuid.."."..vm_message_ext;
 
 				--send the email
-					if (voicemail_file == "attach") then
-						freeswitch.email(voicemail_mail_to,
-							voicemail_mail_to,
-							"To: "..voicemail_mail_to.."\nFrom: "..voicemail_mail_to.."\nX-Headers: "..headers.."\nSubject: "..subject,
-							body,
-							file
-							);
-					else
-						freeswitch.email(voicemail_mail_to,
-							voicemail_mail_to,
-							"To: "..voicemail_mail_to.."\nFrom: "..voicemail_mail_to.."\nX-Headers: "..headers.."\nSubject: "..subject,
-							body
-							);
-					end
+					send_mail(headers,
+						voicemail_mail_to,
+						{subject, body},
+						(voicemail_file == "attach") and file
+					);
 			end
 
 		--whether to keep the voicemail message and details local after email