diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a1c9d0dd..d7b79cd64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 - Fixed auth(): empty $f_access [\#1329](https://github.com/torrentpier/torrentpier/pull/1329) ([belomaxorka](https://github.com/belomaxorka))
 - Fixed download counter for torrents [\#1346](https://github.com/torrentpier/torrentpier/pull/1346) ([belomaxorka](https://github.com/belomaxorka))
 - Fixed HTTP 500 while cron running in server-side [\#1321](https://github.com/torrentpier/torrentpier/pull/1321) ([belomaxorka](https://github.com/belomaxorka))
+- Some reported bugfixes [\#1378](https://github.com/torrentpier/torrentpier/pull/1378) ([belomaxorka](https://github.com/belomaxorka))
 - Some enhancements for topic_tpl [\#1356](https://github.com/torrentpier/torrentpier/pull/1356) ([belomaxorka](https://github.com/belomaxorka))
 - Don't update downloads counter if attachment not exists [\#1345](https://github.com/torrentpier/torrentpier/pull/1345) ([belomaxorka](https://github.com/belomaxorka))
 - Minor improvements [\#1306](https://github.com/torrentpier/torrentpier/pull/1306), [\#1307](https://github.com/torrentpier/torrentpier/pull/1307), [\#1308](https://github.com/torrentpier/torrentpier/pull/1308), [\#1315](https://github.com/torrentpier/torrentpier/pull/1315), [\#1328](https://github.com/torrentpier/torrentpier/pull/1328), [\#1338](https://github.com/torrentpier/torrentpier/pull/1338), [\#1353](https://github.com/torrentpier/torrentpier/pull/1353), [\#1355](https://github.com/torrentpier/torrentpier/pull/1355), [\#1358](https://github.com/torrentpier/torrentpier/pull/1358), [\#1369](https://github.com/torrentpier/torrentpier/pull/1369) ([belomaxorka](https://github.com/belomaxorka))
diff --git a/privmsg.php b/privmsg.php
index d428c0fc3..159536996 100644
--- a/privmsg.php
+++ b/privmsg.php
@@ -939,11 +939,7 @@ if ($mode == 'read') {
         //
         // Do mode specific things
         //
-        if ($mode == 'post') {
-            $page_title = $lang['POST_NEW_PM'];
-        } elseif ($mode == 'reply') {
-            $page_title = $lang['POST_REPLY_PM'];
-        } elseif ($mode == 'edit') {
+        if ($mode == 'edit') {
             $page_title = $lang['EDIT_PM'];
 
             $sql = "SELECT u.user_id
@@ -1021,12 +1017,8 @@ if ($mode == 'read') {
 
             if ($mode == 'quote') {
                 $privmsg_message = $privmsg['privmsgs_text'];
-
                 $msg_date = bb_date($privmsg['privmsgs_date']);
-
                 $privmsg_message = '[quote="' . $to_username . '"]' . $privmsg_message . '[/quote]';
-
-                $mode = 'reply';
             }
         } else {
             $privmsg_subject = $privmsg_message = $to_username = '';
@@ -1043,7 +1035,15 @@ if ($mode == 'read') {
     //
     // Start output, first preview, then errors then post form
     //
-    $page_title = $lang['SEND_PRIVATE_MESSAGE'];
+    if ($mode == 'post') {
+        $page_title = $lang['POST_NEW_PM'];
+    } elseif ($mode == 'reply') {
+        $page_title = $lang['POST_REPLY_PM'];
+    } elseif ($mode == 'quote') {
+        $page_title = $lang['POST_QUOTE_PM'];
+    } elseif ($mode == 'edit') {
+        $page_title = $lang['EDIT_PM'];
+    }
 
     if ($preview && !$error) {
         $orig_word = [];
@@ -1105,9 +1105,9 @@ if ($mode == 'read') {
         case 'post':
             $post_a = $lang['SEND_A_NEW_MESSAGE'];
             break;
+        case 'quote':
         case 'reply':
             $post_a = $lang['SEND_A_REPLY'];
-            $mode = 'post';
             break;
         case 'edit':
             $post_a = $lang['EDIT_MESSAGE'];