--- loncom/interface/lonnotify.pm	2005/12/09 20:54:26	1.10
+++ loncom/interface/lonnotify.pm	2005/12/10 00:46:34	1.11
@@ -306,7 +306,9 @@ ENDONE
                     $rowColor = $rowColor2;
                 }
                 my $recipients = '';
-                my ($date,$subj,$sname,$sdom,$cdom) = split(/:/,$msgid,5);
+                my ($date,$subj,$sname,$sdom) =
+                                  &Apache::lonmsg::unpackmsgid($msgid,undef,1);
+                $subj = &Apache::lonnet::escape($subj);
                 $date = &Apache::lonlocal::locallocaltime($date);
                 foreach my $user (sort(keys(%{$dcmail{$msgid}{recipient}}))) {
                     $recipients .= $dcmail{$msgid}{recipient}{$user}.', ';
@@ -317,7 +319,9 @@ ENDONE
             }
         } else {
             foreach my $msgid (sort(keys(%dcmail))) {
-                my ($date,$subj,$sname,$sdom,$cdom) = split(/:/,$msgid,5);
+                my ($date,$subj,$sname,$sdom) =
+                                   &Apache::lonmsg::unpackmsgid($msgid,undef,1);
+                $subj = &Apache::lonnet::escape($subj);
                 if ($env{'form.sortby'} eq 'subject') {
                     push @{$Sortby{$dcmail{$msgid}{subject}}},$msgid;
                 } elsif ($env{'form.sortby'} eq 'message') {
@@ -351,8 +355,9 @@ ENDONE
                         }
                         $recipients =~ s/,\s$//;
                     }
-
-                    my ($date,$subj,$sname,$sdom,$cdom) = split(/:/,$msgid,5);
+                    my ($date,$subj,$sname,$sdom) =
+                                   &Apache::lonmsg::unpackmsgid($msgid,undef,1);
+                    $subj = &Apache::lonnet::escape($subj);
                     $date = &Apache::lonlocal::locallocaltime($date);
                     $output .=  '<tr bgcolor="'.$rowColor.'"><td><small>'.$date.'</small></td><td><small>'.&cr_to_br($dcmail{$msgid}{subject}).'</small></td><td><small>'.$sname.':'.$sdom.'</small></td><td><small>'.&cr_to_br($dcmail{$msgid}{message}).'</small></td><td><small>'.$recipients.'</small></td></tr>'."\n";
                     $rowNum ++;