diff --git a/configs/voicemail.conf.sample b/configs/voicemail.conf.sample
index 0f26d3c516e7eadd573388fbdc0a8945cd749ce5..52a7278116e627fc7ba7a0627f2fb97ac7542581 100755
--- a/configs/voicemail.conf.sample
+++ b/configs/voicemail.conf.sample
@@ -57,8 +57,10 @@ maxlogins=3
 ;
 ; Note: The emailbody config row can be up to 512 characters due to a limitation in 
 ;       asterisk config files.
-;emailsubject=New VM (${VM_MSGNUM}) - ${VM_DUR} long in mailbox ${VM_MAILBOX} from ${VM_CALLERID} 
-;emailbody=Dear ${VM_NAME}:\n\n\tjust wanted to let you know you were just left a ${VM_DUR} long message (number ${VM_MSGNUM})\nin mailbox ${VM_MAILBOX} from ${VM_CALLERID}, on ${VM_DATE} so you might\nwant to check it when you get a chance.  Thanks!\n\n\t\t\t\t--Asterisk\n
+;emailsubject=[PBX]: New message ${VM_MSGNUM} in mailbox ${VM_MAILBOX}
+; The following definition is very close to the default, but the default shows just 
+; the CIDNAME, if it is not null, else just the CIDNUM, or "an unknown caller" if they are both null.
+;emailbody=Dear ${VM_NAME}:\n\n\tjust wanted to let you know you were just left a ${VM_DUR} long message (number ${VM_MSGNUM})\nin mailbox ${VM_MAILBOX} from ${VM_CALLERID}, on ${VM_DATE}, so you might\nwant to check it when you get a chance.  Thanks!\n\n\t\t\t\t--Asterisk\n
 
 ;
 ; You can override the default program to send e-mail if you wish, too