--- loncom/homework/grades.pm	2007/01/04 14:59:57	1.386
+++ loncom/homework/grades.pm	2007/01/04 21:24:39	1.388
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.386 2007/01/04 14:59:57 raeburn Exp $
+# $Id: grades.pm,v 1.388 2007/01/04 21:24:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2125,6 +2125,9 @@ sub processHandGrade {
             if ($encrypturl =~ /^yes$/i) {
                 $baseurl = &Apache::lonenc::encrypted($feedurl,1);
                 $showsymb = &Apache::lonenc::encrypted($symb,1);
+            } else {
+                $baseurl = $feedurl;
+                $showsymb = $symb;
             }
 	    if ($includemsg =~ /savemsg|newmsg\Q$ctr\E/) {
 		$subject = $env{'form.msgsub'} if ($includemsg =~ /msgsub/);
@@ -2534,7 +2537,7 @@ sub handback_files {
 		$message .= ' The returned file(s) are named: '. $file_msg;
 		$message .= " and can be found in your portfolio space.";
 		my $url = (&Apache::lonnet::decode_symb($symb))[2];
-		my $feedurl = &Apache::lonnet::declutter($url);
+		my $feedurl = &Apache::lonnet::clutter($url);
                 my $encrypturl=&Apache::lonnet::EXT('resource.0.encrypturl',
                                                     $symb,$domain,$stuname);
                 my ($baseurl,$showsymb);