--- app_queue.c	2007-03-28 17:55:56.371915940 +0200
+++ app_queue.new.c	2007-03-28 18:00:19.205766602 +0200
@@ -1203,7 +1203,12 @@
 		/* No luck, join at the end of the queue */
 		if (!inserted)
 			insert_entry(q, prev, qe, &pos);
-		ast_copy_string(qe->moh, q->moh, sizeof(qe->moh));
+
+		if (pbx_builtin_getvar_helper(qe->chan, "mohclass"))
+			ast_copy_string(qe->moh, pbx_builtin_getvar_helper(qe->chan, "mohclass"),sizeof(qe->moh) );
+		else
+			ast_copy_string(qe->moh, q->moh, sizeof(qe->moh));
+
 		ast_copy_string(qe->announce, q->announce, sizeof(qe->announce));
 		ast_copy_string(qe->context, q->context, sizeof(qe->context));
 		q->count++;