diff --git a/message/index.php b/message/index.php
index a1fe38b871f..824e5619dfc 100644
--- a/message/index.php
+++ b/message/index.php
@@ -55,13 +55,13 @@ if ($tab == 'contacts') {
 <table cellspacing="2" cellpadding="2" border="0" align="center" width="95%">
 <tr>
     <th class="<?php echo ($tab == 'contacts') ? 'generaltabselected' : 'generaltab' ?>">
-        <a href="<?php echo $ME ?>?tab=contacts">contacts</a>
+        <a href="<?php echo $CFG->wwwroot.'/message/index.php' ?>?tab=contacts">contacts</a>
     </th>
     <th class="<?php echo ($tab == 'search') ? 'generaltabselected' : 'generaltab' ?>">
-        <a href="<?php echo $ME ?>?tab=search">search</a>
+        <a href="<?php echo $CFG->wwwroot.'/message/index.php' ?>?tab=search">search</a>
     </th>
     <th class="<?php echo ($tab == 'settings') ? 'generaltabselected' : 'generaltab' ?>">
-        <a href="<?php echo $ME ?>?tab=settings">settings</a>
+        <a href="<?php echo $CFG->wwwroot.'/message/index.php' ?>?tab=settings">settings</a>
     </th>
 </tr>
 <tr>
diff --git a/message/lib.php b/message/lib.php
index 88800826ee3..157eed0be48 100644
--- a/message/lib.php
+++ b/message/lib.php
@@ -205,7 +205,7 @@ function message_count_messages($messagearray, $field='', $value='') {
 
 
 function message_print_search() {
-    global $ME, $USER;
+    global $USER;
     
     if ($frm = data_submitted()) {
     
@@ -227,7 +227,7 @@ function message_print_search() {
 }
 
 function message_print_settings() {
-    global $ME, $USER;
+    global $USER;
     
     if ($frm = data_submitted()) {
         $pref = array();
@@ -242,7 +242,7 @@ function message_print_settings() {
 
         set_user_preferences($pref);
         
-        redirect($ME, get_string('settingssaved', 'message'), 1);
+        redirect('index.php', get_string('settingssaved', 'message'), 1);
     }
 
     $cbshowmessagewindow = (get_user_preferences('message_showmessagewindow', 1) == '1') ? 'checked="checked"' : '';
@@ -314,7 +314,7 @@ function message_get_contact($contactid) {
 
 
 function message_print_search_results($frm) {
-    global $ME, $USER, $CFG;
+    global $USER, $CFG;
 
     echo '<div align="center">';
 
@@ -502,7 +502,7 @@ function message_print_search_results($frm) {
     }
 
     echo '<br />';
-    print_single_button($ME, array( 'tab' => 'search'), get_string('newsearch', 'message') );
+    print_single_button('index.php', array( 'tab' => 'search'), get_string('newsearch', 'message') );
 
     echo '</div>';
 }
diff --git a/message/search.html b/message/search.html
index 033b90f152e..84fd00c57e5 100644
--- a/message/search.html
+++ b/message/search.html
@@ -1,4 +1,4 @@
-<form name="personsearch" action="<?php echo $ME ?>" method="post">
+<form name="personsearch" action="index.php" method="post">
 <input type="hidden" name="tab" value="search" />
 
 
diff --git a/message/settings.html b/message/settings.html
index 4c8dc8ecb9f..002d49ebc5c 100644
--- a/message/settings.html
+++ b/message/settings.html
@@ -1,4 +1,4 @@
-<form name="message_settings" action="<?php echo $ME ?>" method="post">
+<form name="message_settings" action="index.php" method="post">
 <input type="hidden" name="tab" value="settings" />