diff --git a/conf/voicemail.tpl b/conf/voicemail.tpl
index eb020f04ed..aede2b8f08 100644
--- a/conf/voicemail.tpl
+++ b/conf/voicemail.tpl
@@ -1,11 +1,11 @@
-From: FreeSWITCH mod_voicemail <${voicemail_account}@${voicemail_domain}>
+From: "${voicemail_caller_id_name}" <${voicemail_caller_id_number}@${voicemail_domain}>
To: <${voicemail_email}>
-Subject: Voicemail from ${voicemail_caller_id_name} ${voicemail_caller_id_number} ${voicemail_message_len}
+Subject: Voicemail from "${voicemail_caller_id_name}" <${voicemail_caller_id_number}> ${voicemail_message_len}
X-Priority: ${voicemail_priority}
X-Mailer: FreeSWITCH
Content-Type: multipart/alternative;
- boundary=000XXX000
+ boundary="000XXX000"
--000XXX000
Content-Type: text/plain; charset=ISO-8859-1; Format=Flowed
@@ -13,7 +13,7 @@ Content-Disposition: inline
Content-Transfer-Encoding: 7bit
Created: ${voicemail_time}
-From: ${voicemail_caller_id_name} ${voicemail_caller_id_number}
+From: "${voicemail_caller_id_name}" <${voicemail_caller_id_number}>
Duration: ${voicemail_message_len}
Account: ${voicemail_account}@${voicemail_domain}
@@ -22,11 +22,21 @@ Content-Type: text/html; charset=ISO-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 7bit
+
+
+
+Voicemail from "${voicemail_caller_id_name}" <${voicemail_caller_id_number}> ${voicemail_message_len}
+
+
+
+
-Message From ${voicemail_caller_id_name} ${voicemail_caller_id_number}
+Message From "${voicemail_caller_id_name}" ${voicemail_caller_id_number}
Created: ${voicemail_time}
Duration: ${voicemail_message_len}
Account: ${voicemail_account}@${voicemail_domain}
+
+
--000XXX000--