Index: apps/app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.151.2.10
diff -u -r1.151.2.10 app_voicemail.c
--- apps/app_voicemail.c        27 Dec 2004 22:34:25 -0000      1.151.2.10
+++ apps/app_voicemail.c        4 Jan 2005 17:44:53 -0000
@@ -1331,6 +1331,7 @@
        }
 
        if ((vmu = find_user(&svm, context, ext))) {
+               populate_defaults(vmu);
                /* Setup pre-file if appropriate */
                if (strcmp(vmu->context, "default"))
                        snprintf(ext_context, sizeof(ext_context), "%s@%s", ext, vmu->context);
@@ -1373,6 +1374,7 @@
                        ausemacro = 1;
                }
 
+               tryagain:
                /* Play the beginning intro if desired */
                if (!ast_strlen_zero(prefile)) {
                        if (ast_fileexists(prefile, NULL, NULL) > 0) {
@@ -1433,7 +1435,7 @@
                                return 0;
                        } else {
                                ast_play_and_wait(chan, "vm-sorry");
-                               return 0;
+                               goto tryagain;
                        }
                }
                if (res < 0) {