diff --git a/src/components/popups/unpinMessage.ts b/src/components/popups/unpinMessage.ts
index edbab051..0e997f9d 100644
--- a/src/components/popups/unpinMessage.ts
+++ b/src/components/popups/unpinMessage.ts
@@ -2,6 +2,7 @@ import appMessagesManager from "../../lib/appManagers/appMessagesManager";
 import { PopupButton } from ".";
 import PopupPeer from "./peer";
 import appPeersManager from "../../lib/appManagers/appPeersManager";
+import rootScope from "../../lib/rootScope";
 
 export default class PopupPinMessage {
   constructor(peerId: number, mid: number, unpin?: true, onConfirm?: () => void) {
@@ -68,15 +69,22 @@ export default class PopupPinMessage {
       } else {
         description = 'Would you like to pin this message?';
 
-        buttons.push({
-          text: 'PIN JUST FOR ME',
-          callback: () => callback(true)
-        });
-
-        buttons.push({
-          text: 'PIN FOR ME AND ' + firstName,
-          callback: () => callback()
-        });
+        if(peerId === rootScope.myId) {
+          buttons.push({
+            text: 'PIN',
+            callback: () => callback()
+          });
+        } else {
+          buttons.push({
+            text: 'PIN JUST FOR ME',
+            callback: () => callback(true)
+          });
+  
+          buttons.push({
+            text: 'PIN FOR ME AND ' + firstName,
+            callback: () => callback()
+          });
+        }
       }
     }
 
diff --git a/src/lib/appManagers/appMessagesManager.ts b/src/lib/appManagers/appMessagesManager.ts
index b5fbb7e0..fed0b141 100644
--- a/src/lib/appManagers/appMessagesManager.ts
+++ b/src/lib/appManagers/appMessagesManager.ts
@@ -1822,13 +1822,13 @@ export class AppMessagesManager {
     });
   }
 
-  public updatePinnedMessage(peerId: number, id: number, unpin?: true, silent?: true, oneSide?: true) {
+  public updatePinnedMessage(peerId: number, mid: number, unpin?: true, silent?: true, oneSide?: true) {
     return apiManager.invokeApi('messages.updatePinnedMessage', {
       peer: appPeersManager.getInputPeerById(peerId),
       unpin,
       silent,
       pm_oneside: oneSide,
-      id
+      id: this.getLocalMessageId(mid)
     }).then(updates => {
       this.log('pinned updates:', updates);
       apiUpdatesManager.processUpdateMessage(updates);