--- loncom/lond	2005/12/09 20:54:23	1.302
+++ loncom/lond	2005/12/10 00:46:23	1.304
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.302 2005/12/09 20:54:23 raeburn Exp $
+# $Id: lond,v 1.304 2005/12/10 00:46:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,7 +59,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.302 $'; #' stupid emacs
+my $VERSION='$Revision: 1.304 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -3594,12 +3594,9 @@ sub dump_dcmail_handler {
     if ($hashref) {
         while (my ($key,$value) = each(%$hashref)) {
             my $match = 1;
-            $key = &unescape($key);
-            my ($timestamp,$subj,$uname,$udom) = split(/:/,&unescape($key),5);
-            $timestamp = &unescape($timestamp);
+            my ($timestamp,$subj,$uname,$udom) = 
+		split(/:/,&unescape(&unescape($key)),5); # yes, twice really
             $subj = &unescape($subj);
-            $uname = &unescape($uname);
-            $udom = &unescape($udom);
             unless ($startfilter eq '.' || !defined($startfilter)) {
                 if ($timestamp < $startfilter) {
                     $match = 0;