--- loncom/interface/lonmenu.pm	2007/08/30 00:13:19	1.224
+++ loncom/interface/lonmenu.pm	2007/09/11 23:37:58	1.227
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.224 2007/08/30 00:13:19 albertel Exp $
+# $Id: lonmenu.pm,v 1.227 2007/09/11 23:37:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -573,8 +573,8 @@ ENDLINE
 $timesync
 $tablestart
 $inlinebuttons
-$newmail
 $tableend
+$newmail
 <script type="text/javascript">
 // END LON-CAPA Internal
 </script>
@@ -887,12 +887,10 @@ sub switch {
        my $text=$top.' '.$bot;
        $text=~s/\s*\-\s*//gs;
 
-       my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
-       if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
        my $pic=
-	   '<img alt="'.$text.'" src="http://'.$ENV{'HTTP_HOST'}.
-	   ':'.$lonhttpdPort.'/res/adm/pages/'.$img.'" align="'.
-	   ($nobreak==3?'right':'left').'" />';
+	   '<img alt="'.$text.'" src="'.
+	   &Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$img).
+	   '" align="'.($nobreak==3?'right':'left').'" />';
        if ($env{'browser.interface'} eq 'faketextual') {
 # Accessibility
 	   if ($nobreak==3) {