--- loncom/interface/lonnavmaps.pm	2006/12/24 22:13:19	1.395
+++ loncom/interface/lonnavmaps.pm	2007/01/05 06:43:34	1.396
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.395 2006/12/24 22:13:19 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.396 2007/01/05 06:43:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1916,6 +1916,10 @@ sub generate_email_discuss_status {
 	if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
             my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,
                 $symb,$error) = &Apache::lonmsg::unpackmsgid($msgid);
+            &Apache::lonenc::check_decrypt(\$symb); 
+            if (($fromcid ne '') && ($fromcid ne $cid)) {
+                next;
+            }
             if (defined($symb)) {
                 if (defined($error) && $error == 1) {
                     $error{$symb}.=','.$msgid;