diff --git a/conf/voicemail.tpl b/conf/voicemail.tpl
index 8061f0b1e3..de753eb5bd 100644
--- a/conf/voicemail.tpl
+++ b/conf/voicemail.tpl
@@ -4,8 +4,23 @@ Subject: ${voicemail_message_len} sec Voicemail from ${voicemail_caller_id_name}
 X-Priority: ${voicemail_priority}
 X-Mailer: FreeSWITCH
 
+Content-Type: multipart/alternative; 
+	boundary=000XXX000
+
+--000XXX000
+Content-Type: text/plain; charset=ISO-8859-1; Format=Flowed
+Content-Disposition: attachment
+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}
 
+--000XXX000
+Content-Type: text/html; charset=ISO-8859-1
+Content-Disposition: attachment
+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>
 
+--000XXX000--
diff --git a/src/switch_utils.c b/src/switch_utils.c
index 69bf362e67..ca1ae36d91 100644
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -205,6 +205,7 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to, const char *fr
 
 			snprintf(buf, B64BUFFLEN,
 					 "\n\n--%s\nContent-Type: %s; name=\"%s\"\n"
+					 "Content-ID: <ATTACHED@freeswitch.org>\n"
 					 "Content-Transfer-Encoding: base64\n"
 					 "Content-Description: Sound attachment.\n"
 					 "Content-Disposition: attachment; filename=\"%s\"\n\n",