diff --git a/qml/components/MessageListViewItem.qml b/qml/components/MessageListViewItem.qml
index a2c4341..61c7cb4 100644
--- a/qml/components/MessageListViewItem.qml
+++ b/qml/components/MessageListViewItem.qml
@@ -97,16 +97,6 @@ ListItem {
         }
         sourceComponent: Component {
             ContextMenu {
-                Repeater {
-                    model: (extraContentLoader.item && ("extraContextMenuItems" in extraContentLoader.item)) ?
-                        extraContentLoader.item.extraContextMenuItems : 0
-                    delegate: MenuItem {
-                        visible: modelData.visible
-                        text: modelData.name
-                        onClicked: modelData.action()
-                    }
-                }
-
                 MenuItem {
                     visible: messageListItem.canReplyToMessage
                     onClicked: messageListItem.replyToMessage()
@@ -127,32 +117,13 @@ ListItem {
                     onClicked: {
                         messageOptionsDrawer.myMessage = myMessage;
                         messageOptionsDrawer.userInformation = userInformation;
+                        messageOptionsDrawer.sourceItem = messageListItem
+                        messageOptionsDrawer.additionalItemsModel = (extraContentLoader.item && ("extraContextMenuItems" in extraContentLoader.item)) ? extraContentLoader.item.extraContextMenuItems : 0;
                         messageListItem.highlighted = true;
                         messageOptionsDrawer.open = true;
                     }
                     text: qsTr("More Options...")
                 }
-                MenuItem {
-                    onClicked: {
-                        if (myMessage.is_pinned) {
-                            Remorse.popupAction(page, qsTr("Message unpinned"), function() { tdLibWrapper.unpinMessage(page.chatInformation.id, messageId);
-                                                                                             pinnedMessageItem.requestCloseMessage(); } );
-                        } else {
-                            tdLibWrapper.pinMessage(page.chatInformation.id, messageId);
-                        }
-                    }
-                    text: myMessage.is_pinned ? qsTr("Unpin Message") : qsTr("Pin Message")
-                    visible: canPinMessages()
-                }
-                MenuItem {
-                    onClicked: {
-                        var chatId = page.chatInformation.id;
-                        var messageId = messageListItem.messageId;
-                        Remorse.itemAction(messageListItem, qsTr("Message deleted"), function() { tdLibWrapper.deleteMessages(chatId, [ messageId]);  })
-                    }
-                    text: qsTr("Delete Message")
-                    visible: myMessage.can_be_deleted_for_all_users || (myMessage.can_be_deleted_only_for_self && myMessage.chat_id === page.myUserId)
-                }
             }
         }
     }
diff --git a/qml/pages/ChatPage.qml b/qml/pages/ChatPage.qml
index 477d0e2..a91f5dd 100644
--- a/qml/pages/ChatPage.qml
+++ b/qml/pages/ChatPage.qml
@@ -686,54 +686,31 @@ Page {
 
         property var myMessage: ({})
         property var userInformation: ({})
+        property var additionalItemsModel: 0
+        property var sourceItem
 
         signal closeRequested();
 
+        function closeDrawer() {
+            messageOptionsDrawer.closeRequested();
+            messageOptionsDrawer.open = false;
+        }
+
         anchors.fill: parent
-        dock: chatPage.isPortrait ? Dock.Top : Dock.Right
+        dock: chatPage.isPortrait ? Dock.Bottom : Dock.Right
+        backgroundSize: dock == Dock.Left || dock == Dock.Right ? width / 2 : height / 3
 
-        background: SilicaListView {
+        background: Column {
             anchors.fill: parent
-            model: ListModel {
-                id: myListModel
-                property var actions: {
-                    "copyToClipboard": function() { Clipboard.text = Functions.getMessageText(messageOptionsDrawer.myMessage, true, messageOptionsDrawer.userInformation.id, true) },
-                    "pinMessage": function() {
-                        if (messageOptionsDrawer.myMessage.is_pinned) {
-                            Remorse.popupAction(page, qsTr("Message unpinned"), function() { tdLibWrapper.unpinMessage(chatPage.chatInformation.id, messageOptionsDrawer.myMessage.id);
-                                                                                             pinnedMessageItem.requestCloseMessage(); } );
-                        } else {
-                            tdLibWrapper.pinMessage(chatPage.chatInformation.id, messageOptionsDrawer.myMessage.id);
-                        }
-                    }
-                }
-                property var conditions: {
-                    "copyToClipboard": function() { return true; },
-                    "pinMessage": function() { return canPinMessages(); }
-                }
-
-                property var texts: {
-                    "copyToClipboard": function() { return qsTr("Copy Message to Clipboard"); },
-                    "pinMessage": function() { return messageOptionsDrawer.myMessage.is_pinned ? qsTr("Unpin Message") : qsTr("Pin Message"); }
-                }
-
-                ListElement {
-                    elementActionName: "copyToClipboard"
-                }
-
-                ListElement {
-                    elementActionName: "pinMessage"
-                }
-            }
-
-            header: Row {
-                width: parent.width - ( 4 * Theme.horizontalPageMargin)
+            Row {
+                id: drawerHeaderRow
+                width: parent.width - ( 2 * Theme.horizontalPageMargin)
                 height: messageOptionsLabel.height + Theme.paddingLarge + ( chatPage.isPortrait ? ( 2 * Theme.paddingSmall ) : 0 )
                 anchors.horizontalCenter: parent.horizontalCenter
                 spacing: Theme.paddingMedium
                 Label {
                     id: messageOptionsLabel
-                    text: qsTr("Message Options")
+                    text: qsTr("Additional Options")
                     color: Theme.highlightColor
                     font.pixelSize: Theme.fontSizeLarge
                     width: parent.width - closeMessageOptionsButton.width - Theme.paddingMedium
@@ -746,28 +723,93 @@ Page {
                     icon.source: "image://theme/icon-m-clear"
                     anchors.verticalCenter: parent.verticalCenter
                     onClicked: {
-                        messageOptionsDrawer.closeRequested();
-                        messageOptionsDrawer.open = false;
+                        messageOptionsDrawer.closeDrawer();
                     }
                 }
             }
 
-            delegate: ListItem {
+            Flickable {
+                id: drawerFlickable
                 width: parent.width
-                visible: myListModel.actions[conditions]()
-                onClicked: {
-                    myListModel.actions[elementActionName]();
-                }
-                Label {
-                    width: parent.width - ( 2 * Theme.horizontalPageMargin )
-                    text: myListModel.texts[elementActionName]();
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    horizontalAlignment: Text.AlignHCenter
-                }
-            }
+                height: parent.height - drawerHeaderRow.height
+                contentHeight: drawerContentColumn.height
+                clip: true
+                Column {
+                    id: drawerContentColumn
+                    width: parent.width
+                    Repeater {
+                        model: messageOptionsDrawer.additionalItemsModel
+                        delegate: BackgroundItem {
+                            width: parent.width
+                            visible: modelData.visible
+                            onClicked: {
+                                modelData.action();
+                                messageOptionsDrawer.closeDrawer();
+                            }
+                            Label {
+                                width: parent.width - ( 2 * Theme.horizontalPageMargin )
+                                text: modelData.name
+                                anchors.verticalCenter: parent.verticalCenter
+                                anchors.horizontalCenter: parent.horizontalCenter
+                                horizontalAlignment: Text.AlignHCenter
+                            }
+                        }
+                    }
+                    BackgroundItem {
+                        width: parent.width
+                        onClicked: {
+                            Clipboard.text = Functions.getMessageText(messageOptionsDrawer.myMessage, true, messageOptionsDrawer.userInformation.id, true);
+                            messageOptionsDrawer.closeDrawer();
+                        }
+                        Label {
+                            width: parent.width - ( 2 * Theme.horizontalPageMargin )
+                            text: qsTr("Copy Message to Clipboard")
+                            anchors.verticalCenter: parent.verticalCenter
+                            anchors.horizontalCenter: parent.horizontalCenter
+                            horizontalAlignment: Text.AlignHCenter
+                        }
+                    }
+                    BackgroundItem {
+                        width: parent.width
+                        visible: canPinMessages()
+                        onClicked: {
+                            if (messageOptionsDrawer.myMessage.is_pinned) {
+                                Remorse.popupAction(page, qsTr("Message unpinned"), function() { tdLibWrapper.unpinMessage(chatPage.chatInformation.id, messageOptionsDrawer.myMessage.id);
+                                                                                                 pinnedMessageItem.requestCloseMessage(); } );
+                            } else {
+                                tdLibWrapper.pinMessage(chatPage.chatInformation.id, messageOptionsDrawer.myMessage.id);
+                            }
+                            messageOptionsDrawer.closeDrawer();
+                        }
+                        Label {
+                            width: parent.width - ( 2 * Theme.horizontalPageMargin )
+                            text: messageOptionsDrawer.myMessage.is_pinned ? qsTr("Unpin Message") : qsTr("Pin Message")
+                            anchors.verticalCenter: parent.verticalCenter
+                            anchors.horizontalCenter: parent.horizontalCenter
+                            horizontalAlignment: Text.AlignHCenter
+                        }
+                    }
+                    BackgroundItem {
+                        width: parent.width
+                        visible: messageOptionsDrawer.myMessage.can_be_deleted_for_all_users || (messageOptionsDrawer.myMessage.can_be_deleted_only_for_self && messageOptionsDrawer.myMessage.chat_id === chatPage.myUserId)
+                        onClicked: {
+                            var chatId = page.chatInformation.id;
+                            var messageId = messageOptionsDrawer.myMessage.id;
+                            Remorse.itemAction(messageOptionsDrawer.sourceItem, qsTr("Message deleted"), function() { tdLibWrapper.deleteMessages(chatId, [ messageId ]); });
+                            messageOptionsDrawer.closeDrawer();
+                        }
+                        Label {
+                            width: parent.width - ( 2 * Theme.horizontalPageMargin )
+                            text: qsTr("Delete Message")
+                            anchors.verticalCenter: parent.verticalCenter
+                            anchors.horizontalCenter: parent.horizontalCenter
+                            horizontalAlignment: Text.AlignHCenter
+                        }
+                    }
 
-            VerticalScrollDecorator {}
+                }
+                VerticalScrollDecorator {}
+            }
         }
 
         SilicaFlickable {
diff --git a/translations/harbour-fernschreiber-de.ts b/translations/harbour-fernschreiber-de.ts
index f15679a..61604bc 100644
--- a/translations/harbour-fernschreiber-de.ts
+++ b/translations/harbour-fernschreiber-de.ts
@@ -437,11 +437,31 @@
     </message>
     <message>
         <source>Copy Message to Clipboard</source>
-        <translation type="unfinished">Nachricht in die Zwischenablage kopieren</translation>
+        <translation>Nachricht in die Zwischenablage kopieren</translation>
     </message>
     <message>
-        <source>Message Options</source>
-        <translation type="unfinished"></translation>
+        <source>Message unpinned</source>
+        <translation>Nachricht losgeheftet</translation>
+    </message>
+    <message>
+        <source>Unpin Message</source>
+        <translation>Nachricht losheften</translation>
+    </message>
+    <message>
+        <source>Pin Message</source>
+        <translation>Nachricht anheften</translation>
+    </message>
+    <message>
+        <source>Additional Options</source>
+        <translation>Zusätzliche Optionen</translation>
+    </message>
+    <message>
+        <source>Message deleted</source>
+        <translation>Nachricht gelöscht</translation>
+    </message>
+    <message>
+        <source>Delete Message</source>
+        <translation>Nachricht löschen</translation>
     </message>
 </context>
 <context>
@@ -963,18 +983,6 @@
         <source>Edit Message</source>
         <translation>Nachricht bearbeiten</translation>
     </message>
-    <message>
-        <source>Copy Message to Clipboard</source>
-        <translation>Nachricht in die Zwischenablage kopieren</translation>
-    </message>
-    <message>
-        <source>Message deleted</source>
-        <translation>Nachricht gelöscht</translation>
-    </message>
-    <message>
-        <source>Delete Message</source>
-        <translation>Nachricht löschen</translation>
-    </message>
     <message>
         <source>You</source>
         <translation>Sie</translation>
@@ -987,21 +995,9 @@
         <source>Select Message</source>
         <translation>Nachricht auswählen</translation>
     </message>
-    <message>
-        <source>Pin Message</source>
-        <translation>Nachricht anheften</translation>
-    </message>
-    <message>
-        <source>Message unpinned</source>
-        <translation>Nachricht losgeheftet</translation>
-    </message>
-    <message>
-        <source>Unpin Message</source>
-        <translation>Nachricht losheften</translation>
-    </message>
     <message>
         <source>More Options...</source>
-        <translation type="unfinished"></translation>
+        <translation>Mehr Optionen...</translation>
     </message>
 </context>
 <context>
diff --git a/translations/harbour-fernschreiber-en.ts b/translations/harbour-fernschreiber-en.ts
index 4785223..5c1938c 100644
--- a/translations/harbour-fernschreiber-en.ts
+++ b/translations/harbour-fernschreiber-en.ts
@@ -437,11 +437,31 @@
     </message>
     <message>
         <source>Copy Message to Clipboard</source>
-        <translation type="unfinished">Copy Message to Clipboard</translation>
+        <translation>Copy Message to Clipboard</translation>
     </message>
     <message>
-        <source>Message Options</source>
-        <translation type="unfinished"></translation>
+        <source>Message unpinned</source>
+        <translation>Message unpinned</translation>
+    </message>
+    <message>
+        <source>Unpin Message</source>
+        <translation>Unpin Message</translation>
+    </message>
+    <message>
+        <source>Pin Message</source>
+        <translation>Pin Message</translation>
+    </message>
+    <message>
+        <source>Additional Options</source>
+        <translation>Additional Options</translation>
+    </message>
+    <message>
+        <source>Message deleted</source>
+        <translation>Message deleted</translation>
+    </message>
+    <message>
+        <source>Delete Message</source>
+        <translation>Delete Message</translation>
     </message>
 </context>
 <context>
@@ -965,18 +985,6 @@ messages</numerusform>
         <source>Edit Message</source>
         <translation>Edit Message</translation>
     </message>
-    <message>
-        <source>Copy Message to Clipboard</source>
-        <translation>Copy Message to Clipboard</translation>
-    </message>
-    <message>
-        <source>Message deleted</source>
-        <translation>Message deleted</translation>
-    </message>
-    <message>
-        <source>Delete Message</source>
-        <translation>Delete Message</translation>
-    </message>
     <message>
         <source>You</source>
         <translation>You</translation>
@@ -989,21 +997,9 @@ messages</numerusform>
         <source>Select Message</source>
         <translation>Select Message</translation>
     </message>
-    <message>
-        <source>Pin Message</source>
-        <translation>Pin Message</translation>
-    </message>
-    <message>
-        <source>Message unpinned</source>
-        <translation>Message unpinned</translation>
-    </message>
-    <message>
-        <source>Unpin Message</source>
-        <translation>Unpin Message</translation>
-    </message>
     <message>
         <source>More Options...</source>
-        <translation type="unfinished"></translation>
+        <translation>More Options...</translation>
     </message>
 </context>
 <context>
diff --git a/translations/harbour-fernschreiber-es.ts b/translations/harbour-fernschreiber-es.ts
index aa9b741..fd979a2 100644
--- a/translations/harbour-fernschreiber-es.ts
+++ b/translations/harbour-fernschreiber-es.ts
@@ -440,9 +440,29 @@
         <translation type="unfinished">Copiar</translation>
     </message>
     <message>
-        <source>Message Options</source>
+        <source>Message unpinned</source>
+        <translation type="unfinished">Mensaje desanclado</translation>
+    </message>
+    <message>
+        <source>Unpin Message</source>
+        <translation type="unfinished">Desanclar mensaje</translation>
+    </message>
+    <message>
+        <source>Pin Message</source>
+        <translation type="unfinished">Anclar mensaje </translation>
+    </message>
+    <message>
+        <source>Additional Options</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Message deleted</source>
+        <translation type="unfinished">Mensaje borrado</translation>
+    </message>
+    <message>
+        <source>Delete Message</source>
+        <translation type="unfinished">Borrar</translation>
+    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -963,18 +983,6 @@
         <source>Edit Message</source>
         <translation>Editar</translation>
     </message>
-    <message>
-        <source>Copy Message to Clipboard</source>
-        <translation>Copiar</translation>
-    </message>
-    <message>
-        <source>Message deleted</source>
-        <translation>Mensaje borrado</translation>
-    </message>
-    <message>
-        <source>Delete Message</source>
-        <translation>Borrar</translation>
-    </message>
     <message>
         <source>You</source>
         <translation>Usted</translation>
@@ -987,18 +995,6 @@
         <source>Select Message</source>
         <translation>Seleccionar</translation>
     </message>
-    <message>
-        <source>Pin Message</source>
-        <translation>Anclar mensaje </translation>
-    </message>
-    <message>
-        <source>Message unpinned</source>
-        <translation>Mensaje desanclado</translation>
-    </message>
-    <message>
-        <source>Unpin Message</source>
-        <translation>Desanclar mensaje</translation>
-    </message>
     <message>
         <source>More Options...</source>
         <translation type="unfinished"></translation>
diff --git a/translations/harbour-fernschreiber-fi.ts b/translations/harbour-fernschreiber-fi.ts
index 093bc77..a9a4acd 100644
--- a/translations/harbour-fernschreiber-fi.ts
+++ b/translations/harbour-fernschreiber-fi.ts
@@ -440,9 +440,29 @@
         <translation type="unfinished">Kopioi viesti leikepöydälle</translation>
     </message>
     <message>
-        <source>Message Options</source>
+        <source>Message unpinned</source>
+        <translation type="unfinished">Viestin kiinnitys poistettu</translation>
+    </message>
+    <message>
+        <source>Unpin Message</source>
+        <translation type="unfinished">Poista viestin kiinnitys</translation>
+    </message>
+    <message>
+        <source>Pin Message</source>
+        <translation type="unfinished">Kiinnitä viesti</translation>
+    </message>
+    <message>
+        <source>Additional Options</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Message deleted</source>
+        <translation type="unfinished">Viesti poistettu</translation>
+    </message>
+    <message>
+        <source>Delete Message</source>
+        <translation type="unfinished">Poista viesti</translation>
+    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -964,18 +984,6 @@
         <source>Edit Message</source>
         <translation>Muokkaa viestiä</translation>
     </message>
-    <message>
-        <source>Copy Message to Clipboard</source>
-        <translation>Kopioi viesti leikepöydälle</translation>
-    </message>
-    <message>
-        <source>Message deleted</source>
-        <translation>Viesti poistettu</translation>
-    </message>
-    <message>
-        <source>Delete Message</source>
-        <translation>Poista viesti</translation>
-    </message>
     <message>
         <source>You</source>
         <translation>Sinä</translation>
@@ -988,18 +996,6 @@
         <source>Select Message</source>
         <translation>Valitse viesti</translation>
     </message>
-    <message>
-        <source>Pin Message</source>
-        <translation>Kiinnitä viesti</translation>
-    </message>
-    <message>
-        <source>Message unpinned</source>
-        <translation>Viestin kiinnitys poistettu</translation>
-    </message>
-    <message>
-        <source>Unpin Message</source>
-        <translation>Poista viestin kiinnitys</translation>
-    </message>
     <message>
         <source>More Options...</source>
         <translation type="unfinished"></translation>
diff --git a/translations/harbour-fernschreiber-hu.ts b/translations/harbour-fernschreiber-hu.ts
index 31173e4..4617ee6 100644
--- a/translations/harbour-fernschreiber-hu.ts
+++ b/translations/harbour-fernschreiber-hu.ts
@@ -430,9 +430,29 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Message Options</source>
+        <source>Message unpinned</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unpin Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pin Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Additional Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message deleted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Message</source>
+        <translation type="unfinished">Üzenet törlése</translation>
+    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -949,18 +969,6 @@
         <source>Edit Message</source>
         <translation type="unfinished">Üzenet szerkesztése</translation>
     </message>
-    <message>
-        <source>Copy Message to Clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Message deleted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Message</source>
-        <translation type="unfinished">Üzenet törlése</translation>
-    </message>
     <message>
         <source>You</source>
         <translation type="unfinished">Te</translation>
@@ -973,18 +981,6 @@
         <source>Select Message</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Pin Message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Message unpinned</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unpin Message</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>More Options...</source>
         <translation type="unfinished"></translation>
diff --git a/translations/harbour-fernschreiber-it.ts b/translations/harbour-fernschreiber-it.ts
index 366d1a7..23b9379 100644
--- a/translations/harbour-fernschreiber-it.ts
+++ b/translations/harbour-fernschreiber-it.ts
@@ -440,9 +440,29 @@
         <translation type="unfinished">Copia messaggio nella clipboard</translation>
     </message>
     <message>
-        <source>Message Options</source>
+        <source>Message unpinned</source>
+        <translation type="unfinished">Messaggio non più in evidenza</translation>
+    </message>
+    <message>
+        <source>Unpin Message</source>
+        <translation type="unfinished">Togli messaggio in evidenza</translation>
+    </message>
+    <message>
+        <source>Pin Message</source>
+        <translation type="unfinished">Metti messaggio in evidenza</translation>
+    </message>
+    <message>
+        <source>Additional Options</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Message deleted</source>
+        <translation type="unfinished">Messaggio cancellato</translation>
+    </message>
+    <message>
+        <source>Delete Message</source>
+        <translation type="unfinished">Cancella messaggio</translation>
+    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -963,18 +983,6 @@
         <source>Edit Message</source>
         <translation>Modifica messaggio</translation>
     </message>
-    <message>
-        <source>Copy Message to Clipboard</source>
-        <translation>Copia messaggio nella clipboard</translation>
-    </message>
-    <message>
-        <source>Message deleted</source>
-        <translation>Messaggio cancellato</translation>
-    </message>
-    <message>
-        <source>Delete Message</source>
-        <translation>Cancella messaggio</translation>
-    </message>
     <message>
         <source>You</source>
         <translation>Tu</translation>
@@ -987,18 +995,6 @@
         <source>Select Message</source>
         <translation>Seleziona messaggio</translation>
     </message>
-    <message>
-        <source>Pin Message</source>
-        <translation>Metti messaggio in evidenza</translation>
-    </message>
-    <message>
-        <source>Message unpinned</source>
-        <translation>Messaggio non più in evidenza</translation>
-    </message>
-    <message>
-        <source>Unpin Message</source>
-        <translation>Togli messaggio in evidenza</translation>
-    </message>
     <message>
         <source>More Options...</source>
         <translation type="unfinished"></translation>
diff --git a/translations/harbour-fernschreiber-pl.ts b/translations/harbour-fernschreiber-pl.ts
index f0acce1..4869f04 100644
--- a/translations/harbour-fernschreiber-pl.ts
+++ b/translations/harbour-fernschreiber-pl.ts
@@ -450,9 +450,29 @@
         <translation type="unfinished">Skopiuj wiadomość do schowka</translation>
     </message>
     <message>
-        <source>Message Options</source>
+        <source>Message unpinned</source>
+        <translation type="unfinished">Wiadomość opięta</translation>
+    </message>
+    <message>
+        <source>Unpin Message</source>
+        <translation type="unfinished">Odepnij wiadomość</translation>
+    </message>
+    <message>
+        <source>Pin Message</source>
+        <translation type="unfinished">Przypnij wiadomość</translation>
+    </message>
+    <message>
+        <source>Additional Options</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Message deleted</source>
+        <translation type="unfinished">Wiadomość usunięta</translation>
+    </message>
+    <message>
+        <source>Delete Message</source>
+        <translation type="unfinished">Usuń wiadomość</translation>
+    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -977,18 +997,6 @@
         <source>Edit Message</source>
         <translation>Edytuj widomość</translation>
     </message>
-    <message>
-        <source>Copy Message to Clipboard</source>
-        <translation>Skopiuj wiadomość do schowka</translation>
-    </message>
-    <message>
-        <source>Message deleted</source>
-        <translation>Wiadomość usunięta</translation>
-    </message>
-    <message>
-        <source>Delete Message</source>
-        <translation>Usuń wiadomość</translation>
-    </message>
     <message>
         <source>You</source>
         <translation>Ty</translation>
@@ -1001,18 +1009,6 @@
         <source>Select Message</source>
         <translation>Wybierz wiadomość</translation>
     </message>
-    <message>
-        <source>Pin Message</source>
-        <translation>Przypnij wiadomość</translation>
-    </message>
-    <message>
-        <source>Message unpinned</source>
-        <translation>Wiadomość odpięta</translation>
-    </message>
-    <message>
-        <source>Unpin Message</source>
-        <translation>Odepnij wiadomość</translation>
-    </message>
     <message>
         <source>More Options...</source>
         <translation type="unfinished"></translation>
diff --git a/translations/harbour-fernschreiber-ru.ts b/translations/harbour-fernschreiber-ru.ts
index 84182ef..0c0b046 100644
--- a/translations/harbour-fernschreiber-ru.ts
+++ b/translations/harbour-fernschreiber-ru.ts
@@ -450,9 +450,29 @@
         <translation type="unfinished">Скопировать в буфер обмена</translation>
     </message>
     <message>
-        <source>Message Options</source>
+        <source>Message unpinned</source>
+        <translation type="unfinished">Сообщение откреплено</translation>
+    </message>
+    <message>
+        <source>Unpin Message</source>
+        <translation type="unfinished">Открепить сообщение</translation>
+    </message>
+    <message>
+        <source>Pin Message</source>
+        <translation type="unfinished">Закрепить сообщение</translation>
+    </message>
+    <message>
+        <source>Additional Options</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Message deleted</source>
+        <translation type="unfinished">Сообщение удалено</translation>
+    </message>
+    <message>
+        <source>Delete Message</source>
+        <translation type="unfinished">Удалить</translation>
+    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -980,18 +1000,6 @@
         <source>Edit Message</source>
         <translation>Редактировать</translation>
     </message>
-    <message>
-        <source>Copy Message to Clipboard</source>
-        <translation>Скопировать в буфер обмена</translation>
-    </message>
-    <message>
-        <source>Message deleted</source>
-        <translation>Сообщение удалено</translation>
-    </message>
-    <message>
-        <source>Delete Message</source>
-        <translation>Удалить</translation>
-    </message>
     <message>
         <source>You</source>
         <translation>Вы</translation>
@@ -1004,18 +1012,6 @@
         <source>Select Message</source>
         <translation>Выбрать сообщение</translation>
     </message>
-    <message>
-        <source>Pin Message</source>
-        <translation>Закрепить сообщение</translation>
-    </message>
-    <message>
-        <source>Message unpinned</source>
-        <translation>Сообщение откреплено</translation>
-    </message>
-    <message>
-        <source>Unpin Message</source>
-        <translation>Открепить сообщение</translation>
-    </message>
     <message>
         <source>More Options...</source>
         <translation type="unfinished"></translation>
diff --git a/translations/harbour-fernschreiber-sk.ts b/translations/harbour-fernschreiber-sk.ts
index 56cf8f9..ce27ea6 100644
--- a/translations/harbour-fernschreiber-sk.ts
+++ b/translations/harbour-fernschreiber-sk.ts
@@ -450,9 +450,29 @@
         <translation type="unfinished">Kopírovať správu do schránky</translation>
     </message>
     <message>
-        <source>Message Options</source>
+        <source>Message unpinned</source>
+        <translation type="unfinished">Správa bola odopnutá</translation>
+    </message>
+    <message>
+        <source>Unpin Message</source>
+        <translation type="unfinished">Odopnúť správu</translation>
+    </message>
+    <message>
+        <source>Pin Message</source>
+        <translation type="unfinished">Pripnúť správu</translation>
+    </message>
+    <message>
+        <source>Additional Options</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Message deleted</source>
+        <translation type="unfinished">Správa bola odstránená</translation>
+    </message>
+    <message>
+        <source>Delete Message</source>
+        <translation type="unfinished">Odstrániť správu</translation>
+    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -977,18 +997,6 @@
         <source>Edit Message</source>
         <translation>Upraviť správu</translation>
     </message>
-    <message>
-        <source>Copy Message to Clipboard</source>
-        <translation>Kopírovať správu do schránky</translation>
-    </message>
-    <message>
-        <source>Message deleted</source>
-        <translation>Správa bola odstránená</translation>
-    </message>
-    <message>
-        <source>Delete Message</source>
-        <translation>Odstrániť správu</translation>
-    </message>
     <message>
         <source>You</source>
         <translation>Ja</translation>
@@ -1001,18 +1009,6 @@
         <source>Select Message</source>
         <translation>Vybrať správu</translation>
     </message>
-    <message>
-        <source>Pin Message</source>
-        <translation>Pripnúť správu</translation>
-    </message>
-    <message>
-        <source>Message unpinned</source>
-        <translation>Správa bola odopnutá</translation>
-    </message>
-    <message>
-        <source>Unpin Message</source>
-        <translation>Odopnúť správu</translation>
-    </message>
     <message>
         <source>More Options...</source>
         <translation type="unfinished"></translation>
diff --git a/translations/harbour-fernschreiber-sv.ts b/translations/harbour-fernschreiber-sv.ts
index 910c4b9..16911ce 100644
--- a/translations/harbour-fernschreiber-sv.ts
+++ b/translations/harbour-fernschreiber-sv.ts
@@ -440,9 +440,29 @@
         <translation type="unfinished">Kopiera meddelandet till urklipp</translation>
     </message>
     <message>
-        <source>Message Options</source>
+        <source>Message unpinned</source>
+        <translation type="unfinished">Meddelandet lösgjort</translation>
+    </message>
+    <message>
+        <source>Unpin Message</source>
+        <translation type="unfinished">Lösgör meddelandet</translation>
+    </message>
+    <message>
+        <source>Pin Message</source>
+        <translation type="unfinished">Fäst meddelandet</translation>
+    </message>
+    <message>
+        <source>Additional Options</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Message deleted</source>
+        <translation type="unfinished">Mededelande borttaget</translation>
+    </message>
+    <message>
+        <source>Delete Message</source>
+        <translation type="unfinished">Ta bort meddelandet</translation>
+    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -963,18 +983,6 @@
         <source>Edit Message</source>
         <translation>Redigera meddelandet</translation>
     </message>
-    <message>
-        <source>Copy Message to Clipboard</source>
-        <translation>Kopiera meddelandet till urklipp</translation>
-    </message>
-    <message>
-        <source>Message deleted</source>
-        <translation>Mededelande borttaget</translation>
-    </message>
-    <message>
-        <source>Delete Message</source>
-        <translation>Ta bort meddelandet</translation>
-    </message>
     <message>
         <source>You</source>
         <translation>Du</translation>
@@ -987,18 +995,6 @@
         <source>Select Message</source>
         <translation>Markera meddelanden</translation>
     </message>
-    <message>
-        <source>Pin Message</source>
-        <translation>Fäst meddelandet</translation>
-    </message>
-    <message>
-        <source>Message unpinned</source>
-        <translation>Meddelandet lösgjort</translation>
-    </message>
-    <message>
-        <source>Unpin Message</source>
-        <translation>Lösgör meddelandet</translation>
-    </message>
     <message>
         <source>More Options...</source>
         <translation type="unfinished"></translation>
diff --git a/translations/harbour-fernschreiber-zh_CN.ts b/translations/harbour-fernschreiber-zh_CN.ts
index 127afe2..eac8e4e 100644
--- a/translations/harbour-fernschreiber-zh_CN.ts
+++ b/translations/harbour-fernschreiber-zh_CN.ts
@@ -430,9 +430,29 @@
         <translation type="unfinished">复制消息到剪切板</translation>
     </message>
     <message>
-        <source>Message Options</source>
+        <source>Message unpinned</source>
+        <translation type="unfinished">已取消置顶消息</translation>
+    </message>
+    <message>
+        <source>Unpin Message</source>
+        <translation type="unfinished">取消置顶</translation>
+    </message>
+    <message>
+        <source>Pin Message</source>
+        <translation type="unfinished">置顶消息</translation>
+    </message>
+    <message>
+        <source>Additional Options</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Message deleted</source>
+        <translation type="unfinished">已删除消息</translation>
+    </message>
+    <message>
+        <source>Delete Message</source>
+        <translation type="unfinished">删除消息</translation>
+    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -950,18 +970,6 @@
         <source>Edit Message</source>
         <translation>编辑消息</translation>
     </message>
-    <message>
-        <source>Copy Message to Clipboard</source>
-        <translation>复制消息到剪切板</translation>
-    </message>
-    <message>
-        <source>Message deleted</source>
-        <translation>已删除消息</translation>
-    </message>
-    <message>
-        <source>Delete Message</source>
-        <translation>删除消息</translation>
-    </message>
     <message>
         <source>You</source>
         <translation>你</translation>
@@ -974,18 +982,6 @@
         <source>Select Message</source>
         <translation>选择消息</translation>
     </message>
-    <message>
-        <source>Pin Message</source>
-        <translation>置顶消息</translation>
-    </message>
-    <message>
-        <source>Message unpinned</source>
-        <translation>已取消消息置顶</translation>
-    </message>
-    <message>
-        <source>Unpin Message</source>
-        <translation>取消置顶</translation>
-    </message>
     <message>
         <source>More Options...</source>
         <translation type="unfinished"></translation>
diff --git a/translations/harbour-fernschreiber.ts b/translations/harbour-fernschreiber.ts
index 7160831..985cbc1 100644
--- a/translations/harbour-fernschreiber.ts
+++ b/translations/harbour-fernschreiber.ts
@@ -440,9 +440,29 @@
         <translation type="unfinished">Copy Message to Clipboard</translation>
     </message>
     <message>
-        <source>Message Options</source>
+        <source>Message unpinned</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unpin Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pin Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Additional Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message deleted</source>
+        <translation type="unfinished">Message deleted</translation>
+    </message>
+    <message>
+        <source>Delete Message</source>
+        <translation type="unfinished">Delete Message</translation>
+    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -963,18 +983,6 @@
         <source>Edit Message</source>
         <translation>Edit Message</translation>
     </message>
-    <message>
-        <source>Copy Message to Clipboard</source>
-        <translation>Copy Message to Clipboard</translation>
-    </message>
-    <message>
-        <source>Message deleted</source>
-        <translation>Message deleted</translation>
-    </message>
-    <message>
-        <source>Delete Message</source>
-        <translation>Delete Message</translation>
-    </message>
     <message>
         <source>You</source>
         <translation>You</translation>
@@ -987,18 +995,6 @@
         <source>Select Message</source>
         <translation>Select Message</translation>
     </message>
-    <message>
-        <source>Pin Message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Message unpinned</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unpin Message</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>More Options...</source>
         <translation type="unfinished"></translation>