Index: apps/app_voicemail.c
===================================================================
--- apps/app_voicemail.c	(revision 281872)
+++ apps/app_voicemail.c	(working copy)
@@ -323,6 +323,7 @@
 static char imapfolder[64];
 static char imapparentfolder[64] = "\0";
 static char greetingfolder[64];
+static char greetingsfolder[64];
 static char authuser[32];
 static char authpassword[42];
 static int imapversion = 1;
@@ -2290,7 +2291,12 @@
 	if (box == NEW_FOLDER || box == OLD_FOLDER)
 		snprintf(spec, len, "%s%s", tmp, use_folder? imapfolder: "INBOX");
 	else if (box == GREETINGS_FOLDER)
-		snprintf(spec, len, "%s%s", tmp, greetingfolder);
+		/* We can use either greetingsfolder (plural) or greetingfolder */
+		if (!ast_strlen_zero(greetingsfolder)) {
+			snprintf(spec, len, "%s%s", tmp, greetingfolder);
+		} else {
+			snprintf(spec, len, "%s%s", tmp, greetingfolder);
+		}
 	else {	/* Other folders such as Friends, Family, etc... */
 		if (!ast_strlen_zero(imapparentfolder)) {
 			/* imapparentfolder would typically be set to INBOX */
@@ -10859,6 +10865,9 @@
 		}
 		if ((val = ast_variable_retrieve(cfg, "general", "greetingfolder"))) {
 			ast_copy_string(greetingfolder, val, sizeof(greetingfolder));
+		} else if ((val = ast_variable_retrieve(cfg, "general", "greetingsfolder"))) {
+			/* Also support greetingsfolder as documented in voicemail.conf.sample */
+			ast_copy_string(greetingsfolder, val, sizeof(greetingsfolder));
 		} else {
 			ast_copy_string(greetingfolder, imapfolder, sizeof(greetingfolder));
 		}