Index: apps/app_voicemail.c
===================================================================
--- apps/app_voicemail.c	(revision 19890)
+++ apps/app_voicemail.c	(working copy)
@@ -237,6 +237,7 @@
 	char dialout[80];
 	char uniqueid[20];		/*!< Unique integer identifier */
 	char exit[80];
+	char attachfmt[20];		/*!< Attachment format */
 	unsigned int flags;		/*!< VM_ flags */	
 	int saydurationm;
 	int maxmsg;			/*!< Maximum number of msgs per folder for this mailbox */
@@ -451,7 +452,9 @@
 {
 	int x;
 	if (!strcasecmp(var, "attach")) {
-		ast_set2_flag(vmu, ast_true(value), VM_ATTACH);	
+		ast_set2_flag(vmu, ast_true(value), VM_ATTACH);
+	} else if (!strcasecmp(var, "attachfmt")) {
+		ast_copy_string(vmu->attachfmt, value, sizeof(vmu->attachfmt));
 	} else if (!strcasecmp(var, "serveremail")) {
 		ast_copy_string(vmu->serveremail, value, sizeof(vmu->serveremail));
 	} else if (!strcasecmp(var, "language")) {
@@ -3309,6 +3312,10 @@
 	make_file(fn, sizeof(fn), todir, msgnum);
 	snprintf(ext_context, sizeof(ext_context), "%s@%s", vmu->mailbox, vmu->context);
 
+	if (!ast_strlen_zero(vmu->attachfmt)) {
+		fmt = vmu->attachfmt;
+	}
+
 	/* Attach only the first format */
 	if ((fmt = ast_strdupa(fmt))) {
 		stringp = fmt;
Index: configs/voicemail.conf.sample
===================================================================
--- configs/voicemail.conf.sample	(revision 19890)
+++ configs/voicemail.conf.sample	(working copy)
@@ -162,6 +162,11 @@
 ; 
 ; tz=central 		; Timezone from zonemessages above.  Irrelevant if envelope=no.
 ; attach=yes 		; Attach the voicemail to the notification email *NOT* the pager email
+; attachfmt=wav49	; Which format to attach to the email.  Normally this is the
+			; first format specified in the format parameter above, but this
+			; option lets you customize the format sent to particular mailboxes.
+			; Useful if Windows users want wav49, but Linux users want gsm.
+			; [per-mailbox only]
 ; saycid=yes 		; Say the caller id information before the message. If not described, 
 			;     or set to no, it will be in the envelope
 ; cidinternalcontexts=intern	; Internal Context for Name Playback instead of