Voicemail VM_CIDNUM and VM_CIDNAME variables and SMDI

I am using SVN-branch-1.6.1-r178511M version of Asterisk on a production voicemail server. We have SMDI running well. The only issue I am having is the VM_ caller ID variables don’t work with the SMDI. I’ve tried setting variables in extensions.conf but that doesn’t work. Because of this the email notifications don’t include the caller id.

Anyone know of a workaround or does someone know that a newer version of asterisk would fix this?