diff --git a/privmsg.php b/privmsg.php
index c2a876a0..4d74a961 100644
--- a/privmsg.php
+++ b/privmsg.php
@@ -75,7 +75,7 @@ $template->assign_vars(array(
 //
 // Set mode for quick reply
 //
-if (empty($mode) && $bb_cfg['show_quick_reply'] && ($folder == 'inbox') && $preview)
+if ($bb_cfg['show_quick_reply'] && $folder == 'inbox' && $mode == 'read' && $preview)
 {
 	$mode = 'reply';
 }
@@ -369,6 +369,7 @@ if ($mode == 'read')
 	}
 
 	$s_hidden_fields = '<input type="hidden" name="mark[]" value="' . $privmsgs_id . '" />';
+	$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" />';
 
 	$page_title = $lang['READ_PM'];