Index: apps/app_voicemail.c
===================================================================
--- apps/app_voicemail.c	(revision 130693)
+++ apps/app_voicemail.c	(working copy)
@@ -598,6 +598,7 @@
 static int skipms;
 static int maxlogins;
 static int minpassword;
+static int forcecomment = 0;
 
 /*! Poll mailboxes for changes since there is something external to
  *  app_voicemail that may change them. */
@@ -4881,6 +4885,10 @@
 #endif
 	const char *duration_str;
 
+	/* Check if we are forcing a comment to be added... */
+	if (forcecomment) {
+		cmd = '1';
+	}
 	/* Must always populate duration correctly */
 	make_file(msgfile, sizeof(msgfile), curdir, curmsg);
 	strcpy(textfile, msgfile);
@@ -9447,6 +9461,7 @@
 		ucfg = ast_config_load("users.conf", config_flags);
 	}
 
+	forcecomment = 0;
 	/* set audio control prompts */
 	strcpy(listen_control_forward_key,DEFAULT_LISTEN_CONTROL_FORWARD_KEY);
 	strcpy(listen_control_reverse_key,DEFAULT_LISTEN_CONTROL_REVERSE_KEY);
@@ -9606,6 +9621,9 @@
 		} else {
 			imapgreetings = 0;
 		}
+		if ((val = ast_variable_retrieve(cfg, "general", "forcecomment"))) {
+			forcecomment = ast_true(val);
+		}
 		if ((val = ast_variable_retrieve(cfg, "general", "greetingfolder"))) {
 			ast_copy_string(greetingfolder, val, sizeof(greetingfolder));
 		} else {
Index: configs/voicemail.conf.sample
===================================================================
--- configs/voicemail.conf.sample	(revision 130693)
+++ configs/voicemail.conf.sample	(working copy)
@@ -156,6 +156,15 @@
 ; If imapgreetings=yes, then specify which folder to store your greetings in. If
 ; you do not specify a folder, then INBOX will be used
 ;greetingsfolder=INBOX
+; Some IMAP server implementations store folders under INBOX instead of 
+; using a top level folder (ex. INBOX/Friends).  In this case, user
+; imapparentfolder to set the parent folder. For example, Cyrus IMAP does
+; NOT use INBOX as the parent.
+;imapparentfolder=INBOX
+; By setting forcecomment to "yes", forwarding a message will REQUIRE 
+; that a comment be left along with the forwarded message.  The default
+; is "no".
+;forcecomment=no
 ; 
 ; Users may be located in different timezones, or may have different 
 ; message announcements for their introductory message when they enter