diff --git a/conf/voicemail.tpl b/conf/voicemail.tpl
index de753eb5bd..838000f19e 100644
--- a/conf/voicemail.tpl
+++ b/conf/voicemail.tpl
@@ -9,18 +9,24 @@ Content-Type: multipart/alternative;
 
 --000XXX000
 Content-Type: text/plain; charset=ISO-8859-1; Format=Flowed
-Content-Disposition: attachment
+Content-Disposition: inline
 Content-Transfer-Encoding: 7bit
 
-At ${voicemail_time} you were left a ${voicemail_message_len} second message from ${voicemail_caller_id_name} ${voicemail_caller_id_number}
-to your account ${voicemail_account}@${voicemail_domain}
+Created: ${voicemail_time}
+From: ${voicemail_caller_id_name} ${voicemail_caller_id_number}
+Duration: ${voicemail_message_len}
+Account: ${voicemail_account}@${voicemail_domain}
 
 --000XXX000
 Content-Type: text/html; charset=ISO-8859-1
-Content-Disposition: attachment
+Content-Disposition: inline
 Content-Transfer-Encoding: 7bit
 
-At ${voicemail_time} you were left a ${voicemail_message_len} second message from ${voicemail_caller_id_name} ${voicemail_caller_id_number}
-to your account ${voicemail_account} @ ${voicemail_domain} <a href=tel:${voicemail_caller_id_number}>Click to call</a>
+<font face=arial>
+<b>Message From ${voicemail_caller_id_name} ${voicemail_caller_id_number}</b><br>
+<hr noshade size=1>
+Created: ${voicemail_time}<br>
+Duration: ${voicemail_message_len}<br>
+Account: ${voicemail_account}@${voicemail_domain}<br>
 
 --000XXX000--