--- loncom/interface/lonmsgdisplay.pm	2006/12/18 00:16:27	1.53
+++ loncom/interface/lonmsgdisplay.pm	2006/12/18 23:09:37	1.54
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.53 2006/12/18 00:16:27 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.54 2006/12/18 23:09:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -178,7 +178,7 @@ sub folderlist {
     my %userfolders;
 
     foreach my $key (keys(%gotfolders)) {
-        $key =~ s/(['"])/\$1/g;
+        $key =~ s/(['"])/\$1/g; #' stupid emacs
         $userfolders{$key} = $key;
     }
     my @userorder = sort(keys(%userfolders));
@@ -960,8 +960,7 @@ sub disfolder {
 
 </script>
 ENDDISHEADER
-    my %gotfolders = &Apache::lonmsg::get_user_folders();
-    my %userfolders;
+
     my $fsqs='&folder='.$folder;
     my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);
     my $totalnumber=$#temp+1;
@@ -1108,16 +1107,17 @@ ENDDISHEADER
         $r->print('    <option value="markedunread">'.&mt('Mark Unread').'</option>'."\n");
     }
     $r->print('   <option value="markedforward">'.&mt('Forward').'</option>'."\n");
+
+    my %gotfolders = &Apache::lonmsg::get_user_folders();
     if (keys(%gotfolders) > 0) {
         $r->print('   <option value="markedmove">'.&mt('Move to Folder ->').
                   '</option>');
     }
     $r->print("\n".'</select></td>'."\n");
-    foreach my $key (keys(%gotfolders)) {
-        $userfolders{$key} = $key;
-    }
+
     if (keys(%gotfolders) > 0) {
         $r->print('<td align="center"><b>'.&mt('Destination folder').'<b><br />');
+	my %userfolders;
         foreach my $key (keys(%gotfolders)) {
             $userfolders{$key} = $key;
         }