Merge jjames's voicemail fixes (bug #2436)