-if (isset($where) && isset($what)) {
- // from a search
- echo '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
- '&passed_id=' . $passed_id . '&where=' . urlencode($where) .
- '&what=' . urlencode($what). '">' . _("View message") . '</a>';
-} else {
- echo '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
- '&passed_id=' . $passed_id . '&startMessage=' . $startMessage .
- '&show_more=0">' . _("View message") . '</a>';
-}
+
+$msg_url = 'read_body.php?' . $QUERY_STRING;
+$msg_url = set_url_var($msg_url, 'ent_id', 0);
+echo '<a href="'.$msg_url.'">'. _("View message") . '</a>';
+