-}
-if ($right_frame == 'right_main.php') {
- $urlMailbox = urlencode($mailbox);
- $right_frame_url =
- "right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage";
-} elseif ($right_frame == 'options.php') {
- $right_frame_url = 'options.php';
-} elseif ($right_frame == 'folders.php') {
- $right_frame_url = 'folders.php';
-} elseif ($right_frame == 'compose.php') {
- $right_frame_url = 'compose.php?' . $mailto;
-} else if ($right_frame == '') {
- $right_frame_url = 'right_main.php';
+}
+
+if ( strpos($right_frame,'?') ) {
+ $right_frame_file = substr($right_frame,0,strpos($right_frame,'?'));