--- app_voicemail.c.org	Mon Dec 29 22:41:18 2003
+++ app_voicemail.c	Mon Dec 29 23:20:16 2003
@@ -88,6 +88,7 @@
 	unsigned char iobuf[BASEMAXINLINE];
 };
 
+/* Structure for linked list of users */
 struct ast_vm_user {
 	char context[80];
 	char mailbox[80];
@@ -383,6 +384,7 @@
 #endif	/* Postgres */
 
 #ifndef USESQLVM
+
 static struct ast_vm_user *find_user(struct ast_vm_user *ivm, char *context, char *mailbox)
 {
 	/* This function could be made to generate one from a database, too */
@@ -734,7 +736,7 @@
 
 			fprintf(p, "--%s\n", bound);
 		}
-		fprintf(p, "Content-Type: TEXT/PLAIN; charset=US-ASCII\n\n");
+		fprintf(p, "Content-Type: text/plain; charset=ISO-8859-1\nContent-Transfer-Encoding: 8bit\n");
 		strftime(date, sizeof(date), "%A, %B %d, %Y at %r", &tm);
 		if (emailbody) {
 			struct ast_channel *ast = ast_channel_alloc(0);
@@ -765,7 +767,7 @@
 		if (attach_user_voicemail) {
 			fprintf(p, "--%s\n", bound);
 			fprintf(p, "Content-Type: audio/x-%s; name=\"msg%04d.%s\"\n", format, msgnum, format);
-			fprintf(p, "Content-Transfer-Encoding: BASE64\n");
+			fprintf(p, "Content-Transfer-Encoding: base64\n");
 			fprintf(p, "Content-Description: Voicemail sound attachment.\n");
 			fprintf(p, "Content-Disposition: attachment; filename=\"msg%04d.%s\"\n\n", msgnum, format);