Merge pull request #430 from Wunderfitz/feature/settings-page-accordion

settings page accordion

harbour-fernschreiber.pro

@@ -108,6 +108,14 @@ DISTFILES += qml/harbour-fernschreiber.qml \
     qml/components/messageContent/MessageVideo.qml \
     qml/components/messageContent/MessageVoiceNote.qml \
     qml/components/messageContent/WebPagePreview.qml \
+    qml/components/settingsPage/Accordion.qml \
+    qml/components/settingsPage/AccordionItem.qml \
+    qml/components/settingsPage/ResponsiveGrid.qml \
+    qml/components/settingsPage/SettingsAppearance.qml \
+    qml/components/settingsPage/SettingsBehavior.qml \
+    qml/components/settingsPage/SettingsPrivacy.qml \
+    qml/components/settingsPage/SettingsStorage.qml \
+    qml/components/settingsPage/SettingsUserProfile.qml \
     qml/js/debug.js \
     qml/js/functions.js \
     qml/pages/ActiveSessionsPage.qml \

qml/components/settingsPage/Accordion.qml

@@ -0,0 +1,42 @@
+/*
+    Copyright (C) 2021 Sebastian J. Wolf and other contributors
+
+    This file is part of Fernschreiber.
+
+    Fernschreiber is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Fernschreiber is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Fernschreiber. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import QtQuick 2.6
+import Sailfish.Silica 1.0
+
+
+Column {
+    width: parent.width
+    property SilicaFlickable flickable
+    property bool animate: false
+    signal setActiveArea(string activeAreaTitle)
+    function scrollUpFlickable(amount) {
+        if(flickable) {
+            flickableAnimation.to = Math.max(0, flickable.contentY - amount);
+            flickableAnimation.start()
+        }
+    }
+
+    NumberAnimation {
+        id: flickableAnimation
+        target: flickable
+        property: "contentY"
+        duration: 200
+    }
+}

qml/components/settingsPage/AccordionItem.qml

@@ -0,0 +1,106 @@
+/*
+    Copyright (C) 2021 Sebastian J. Wolf and other contributors
+
+    This file is part of Fernschreiber.
+
+    Fernschreiber is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Fernschreiber is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Fernschreiber. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import QtQuick 2.6
+import Sailfish.Silica 1.0
+
+Item {
+    id: area
+    width: parent.width
+    height: button.height + content.height
+    property alias icon: image
+    property alias text: label.text
+    property alias asynchronous: content.asynchronous
+    property bool expanded: false
+    default property alias els: content.sourceComponent
+    states: [
+        State {
+            when: area.expanded
+            PropertyChanges { target: image; rotation: -90 }
+            PropertyChanges { target: content; height: content.implicitHeight + Theme.paddingLarge; opacity: 1.0 }
+        }
+    ]
+    transitions: Transition {
+        to: "*"
+        enabled: area.parent.animate
+        NumberAnimation { target: content; properties: "height, opacity"; duration: 200}
+    }
+    Connections {
+        target: area.parent
+        onSetActiveArea: {
+            var expand = (activeAreaTitle === area.text);
+            if(area.expanded && !expand && area.parent.scrollUpFlickable) {
+                area.parent.scrollUpFlickable(content.implicitHeight + Theme.paddingLarge);
+            }
+
+            area.expanded = expand;
+        }
+    }
+    BackgroundItem {
+        id: button
+        height: Theme.itemSizeMedium
+        onClicked: {
+            area.parent.animate = true;
+            area.parent.setActiveArea(area.expanded ? -1 : area.text)
+        }
+        Rectangle {
+            anchors.fill: parent
+            gradient: Gradient {
+                GradientStop { position: 0.0; color: Theme.rgba(Theme.highlightBackgroundColor, 0.15) }
+                GradientStop { position: 1.0; color: "transparent" }
+            }
+        }
+        Label {
+            id: label
+            anchors {
+                left: parent.left
+                right: image.left
+                verticalCenter: parent.verticalCenter
+                leftMargin: Theme.horizontalPageMargin + Theme.paddingLarge
+                rightMargin: Theme.paddingMedium
+            }
+            horizontalAlignment: Text.AlignRight
+            truncationMode: TruncationMode.Fade
+            font.pixelSize: Theme.fontSizeSmall
+            color: button.highlighted ? Theme.highlightColor : Theme.primaryColor
+            textFormat: Text.PlainText
+        }
+        HighlightImage {
+            id: image
+            anchors {
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+                rightMargin: Theme.horizontalPageMargin
+            }
+            width: visible ? Theme.iconSizeMedium : 0
+            highlighted: parent.highlighted
+            source: "image://theme/icon-m-right"
+            rotation: 90
+        }
+    }
+    Loader {
+        id: content
+        width: parent.width
+        height: 0
+        opacity: 0
+        anchors.top: button.bottom
+        asynchronous: true
+        clip: true
+    }
+}

qml/components/settingsPage/ResponsiveGrid.qml

@@ -0,0 +1,27 @@
+/*
+    Copyright (C) 2021 Sebastian J. Wolf and other contributors
+
+    This file is part of Fernschreiber.
+
+    Fernschreiber is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Fernschreiber is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Fernschreiber. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import QtQuick 2.6
+import Sailfish.Silica 1.0
+
+Grid {
+    width: parent.width - ( 2 * x )
+    columns: (appWindow.deviceOrientation & Orientation.LandscapeMask) || Screen.sizeCategory === Screen.Large || Screen.sizeCategory === Screen.ExtraLarge ? 2 : 1
+    readonly property real columnWidth: width/columns
+}

qml/components/settingsPage/SettingsAppearance.qml

@@ -0,0 +1,64 @@
+/*
+    Copyright (C) 2021 Sebastian J. Wolf and other contributors
+
+    This file is part of Fernschreiber.
+
+    Fernschreiber is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Fernschreiber is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Fernschreiber. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import QtQuick 2.6
+import Sailfish.Silica 1.0
+
+AccordionItem {
+    text: qsTr("Appearance")
+    Component {
+        ResponsiveGrid {
+            bottomPadding: Theme.paddingMedium
+            TextSwitch {
+                id: stickersAsEmojisTextSwitch
+                width: parent.columnWidth
+                checked: appSettings.showStickersAsEmojis
+                text: qsTr("Show stickers as emojis")
+                description: qsTr("Only display emojis instead of the actual stickers")
+                automaticCheck: false
+                onClicked: {
+                    appSettings.showStickersAsEmojis = !checked
+                }
+            }
+
+            TextSwitch {
+                width: parent.columnWidth
+                checked: appSettings.showStickersAsImages
+                text: qsTr("Show stickers as images")
+                description: qsTr("Show background for stickers and align them centrally like images")
+                automaticCheck: false
+                onClicked: {
+                    appSettings.showStickersAsImages = !checked
+                }
+                enabled: !stickersAsEmojisTextSwitch.checked
+            }
+
+            TextSwitch {
+                width: parent.columnWidth
+                checked: appSettings.animateStickers
+                text: qsTr("Animate stickers")
+                automaticCheck: false
+                onClicked: {
+                    appSettings.animateStickers = !checked
+                }
+                enabled: !stickersAsEmojisTextSwitch.checked
+            }
+        }
+    }
+}

qml/components/settingsPage/SettingsBehavior.qml

@@ -0,0 +1,170 @@
+/*
+    Copyright (C) 2021 Sebastian J. Wolf and other contributors
+
+    This file is part of Fernschreiber.
+
+    Fernschreiber is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Fernschreiber is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Fernschreiber. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import QtQuick 2.6
+import Sailfish.Silica 1.0
+import WerkWolf.Fernschreiber 1.0
+
+AccordionItem {
+    text: qsTr("Behavior")
+    Component {
+        ResponsiveGrid {
+            bottomPadding: Theme.paddingMedium
+            TextSwitch {
+                width: parent.columnWidth
+                checked: appSettings.sendByEnter
+                text: qsTr("Send message by enter")
+                description: qsTr("Send your message by pressing the enter key")
+                automaticCheck: false
+                onClicked: {
+                    appSettings.sendByEnter = !checked
+                }
+            }
+
+            TextSwitch {
+                width: parent.columnWidth
+                checked: appSettings.focusTextAreaOnChatOpen
+                text: qsTr("Focus text input on chat open")
+                description: qsTr("Focus the text input area when entering a chat")
+                automaticCheck: false
+                onClicked: {
+                    appSettings.focusTextAreaOnChatOpen = !checked
+                }
+            }
+
+            TextSwitch {
+                width: parent.columnWidth
+                checked: appSettings.focusTextAreaAfterSend
+                text: qsTr("Focus text input area after send")
+                description: qsTr("Focus the text input area after sending a message")
+                automaticCheck: false
+                onClicked: {
+                    appSettings.focusTextAreaAfterSend = !checked
+                }
+            }
+
+            TextSwitch {
+                width: parent.columnWidth
+                checked: appSettings.delayMessageRead
+                text: qsTr("Delay before marking messages as read")
+                description: qsTr("Fernschreiber will wait a bit before messages are marked as read")
+                automaticCheck: false
+                onClicked: {
+                    appSettings.delayMessageRead = !checked
+                }
+            }
+
+            TextSwitch {
+                width: parent.columnWidth
+                checked: appSettings.useOpenWith
+                text: qsTr("Open-with menu integration")
+                description: qsTr("Integrate Fernschreiber into open-with menu of Sailfish OS")
+                automaticCheck: false
+                onClicked: {
+                    appSettings.useOpenWith = !checked
+                }
+            }
+
+            ComboBox {
+                id: feedbackComboBox
+                width: parent.columnWidth
+                label: qsTr("Notification feedback")
+                description: qsTr("Use non-graphical feedback (sound, vibration) for notifications")
+                menu: ContextMenu {
+                    id: feedbackMenu
+                    x: 0
+                    width: feedbackComboBox.width
+
+                    MenuItem {
+                        readonly property int value: AppSettings.NotificationFeedbackAll
+                        text: qsTr("All events")
+                        onClicked: {
+                            appSettings.notificationFeedback = value
+                        }
+                    }
+                    MenuItem {
+                        readonly property int value: AppSettings.NotificationFeedbackNew
+                        text: qsTr("Only new events")
+                        onClicked: {
+                            appSettings.notificationFeedback = value
+                        }
+                    }
+                    MenuItem {
+                        readonly property int value: AppSettings.NotificationFeedbackNone
+                        text: qsTr("None")
+                        onClicked: {
+                            appSettings.notificationFeedback = value
+                        }
+                    }
+                }
+
+                Component.onCompleted: updateFeedbackSelection()
+
+                function updateFeedbackSelection() {
+                    var menuItems = feedbackMenu.children
+                    var n = menuItems.length
+                    for (var i=0; i<n; i++) {
+                        if (menuItems[i].value === appSettings.notificationFeedback) {
+                            currentIndex = i
+                            return
+                        }
+                    }
+                }
+
+                Connections {
+                    target: appSettings
+                    onNotificationFeedbackChanged: {
+                        feedbackComboBox.updateFeedbackSelection()
+                    }
+                }
+            }
+
+            TextSwitch {
+                width: parent.columnWidth
+                checked: appSettings.notificationTurnsDisplayOn && enabled
+                text: qsTr("Notification turns on the display")
+                enabled: appSettings.notificationFeedback !== AppSettings.NotificationFeedbackNone
+                height: enabled ? implicitHeight: 0
+                clip: height < implicitHeight
+                visible: height > 0
+                automaticCheck: false
+                onClicked: {
+                    appSettings.notificationTurnsDisplayOn = !checked
+                }
+                Behavior on height { SmoothedAnimation { duration: 200 } }
+            }
+
+            TextSwitch {
+                width: parent.columnWidth
+                checked: appSettings.notificationSoundsEnabled && enabled
+                text: qsTr("Enable notification sounds")
+                description: qsTr("When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.")
+                enabled: appSettings.notificationFeedback !== AppSettings.NotificationFeedbackNone
+                height: enabled ? implicitHeight: 0
+                clip: height < implicitHeight
+                visible: height > 0
+                automaticCheck: false
+                onClicked: {
+                    appSettings.notificationSoundsEnabled = !checked
+                }
+                Behavior on height { SmoothedAnimation { duration: 200 } }
+            }
+        }
+    }
+}

qml/components/settingsPage/SettingsPrivacy.qml

@@ -0,0 +1,266 @@
+/*
+    Copyright (C) 2021 Sebastian J. Wolf and other contributors
+
+    This file is part of Fernschreiber.
+
+    Fernschreiber is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Fernschreiber is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Fernschreiber. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import QtQuick 2.6
+import Sailfish.Silica 1.0
+import WerkWolf.Fernschreiber 1.0
+
+AccordionItem {
+    text: qsTr("Privacy")
+    Component {
+        Column {
+            bottomPadding: Theme.paddingMedium
+            Connections {
+                target: tdLibWrapper
+                onUserPrivacySettingUpdated: {
+                    Debug.log("Received updated privacy setting: " + setting + ":" + rule);
+                    switch (setting) {
+                    case TelegramAPI.SettingAllowChatInvites:
+                        allowChatInvitesComboBox.currentIndex = rule;
+                        break;
+                    case TelegramAPI.SettingAllowFindingByPhoneNumber:
+                        allowFindingByPhoneNumberComboBox.currentIndex = rule;
+                        break;
+                    case TelegramAPI.SettingShowLinkInForwardedMessages:
+                        showLinkInForwardedMessagesComboBox.currentIndex = rule;
+                        break;
+                    case TelegramAPI.SettingShowPhoneNumber:
+                        showPhoneNumberComboBox.currentIndex = rule;
+                        break;
+                    case TelegramAPI.SettingShowProfilePhoto:
+                        showProfilePhotoComboBox.currentIndex = rule;
+                        break;
+                    case TelegramAPI.SettingShowStatus:
+                        showStatusComboBox.currentIndex = rule;
+                        break;
+                    }
+                }
+            }
+            ResponsiveGrid {
+                ComboBox {
+                    id: allowChatInvitesComboBox
+                    width: parent.columnWidth
+                    label: qsTr("Allow chat invites")
+                    description: qsTr("Privacy setting for managing whether you can be invited to chats.")
+                    menu: ContextMenu {
+                        x: 0
+                        width: allowChatInvitesComboBox.width
+
+                        MenuItem {
+                            text: qsTr("Yes")
+                            onClicked: {
+                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingAllowChatInvites, TelegramAPI.RuleAllowAll);
+                            }
+                        }
+                        MenuItem {
+                            text: qsTr("Your contacts only")
+                            onClicked: {
+                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingAllowChatInvites, TelegramAPI.RuleAllowContacts);
+                            }
+                        }
+                        MenuItem {
+                            text: qsTr("No")
+                            onClicked: {
+                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingAllowChatInvites, TelegramAPI.RuleRestrictAll);
+                            }
+                        }
+                    }
+
+                    Component.onCompleted: {
+                        currentIndex = tdLibWrapper.getUserPrivacySettingRule(TelegramAPI.SettingAllowChatInvites);
+                    }
+                }
+
+                ComboBox {
+                    id: allowFindingByPhoneNumberComboBox
+                    width: parent.columnWidth
+                    label: qsTr("Allow finding by phone number")
+                    description: qsTr("Privacy setting for managing whether you can be found by your phone number.")
+                    menu: ContextMenu {
+                        x: 0
+                        width: allowFindingByPhoneNumberComboBox.width
+
+                        MenuItem {
+                            text: qsTr("Yes")
+                            onClicked: {
+                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingAllowFindingByPhoneNumber, TelegramAPI.RuleAllowAll);
+                            }
+                        }
+                        MenuItem {
+                            text: qsTr("Your contacts only")
+                            onClicked: {
+                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingAllowFindingByPhoneNumber, TelegramAPI.RuleAllowContacts);
+                            }
+                        }
+                    }
+
+                    Component.onCompleted: {
+                        currentIndex = tdLibWrapper.getUserPrivacySettingRule(TelegramAPI.SettingAllowFindingByPhoneNumber);
+                    }
+                }
+
+                ComboBox {
+                    id: showLinkInForwardedMessagesComboBox
+                    width: parent.columnWidth
+                    label: qsTr("Show link in forwarded messages")
+                    description: qsTr("Privacy setting for managing whether a link to your account is included in forwarded messages.")
+                    menu: ContextMenu {
+                        x: 0
+                        width: showLinkInForwardedMessagesComboBox.width
+
+                        MenuItem {
+                            text: qsTr("Yes")
+                            onClicked: {
+                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowLinkInForwardedMessages, TelegramAPI.RuleAllowAll);
+                            }
+                        }
+                        MenuItem {
+                            text: qsTr("Your contacts only")
+                            onClicked: {
+                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowLinkInForwardedMessages, TelegramAPI.RuleAllowContacts);
+                            }
+                        }
+                        MenuItem {
+                            text: qsTr("No")
+                            onClicked: {
+                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowLinkInForwardedMessages, TelegramAPI.RuleRestrictAll);
+                            }
+                        }
+                    }
+
+                    Component.onCompleted: {
+                        currentIndex = tdLibWrapper.getUserPrivacySettingRule(TelegramAPI.SettingShowLinkInForwardedMessages);
+                    }
+                }
+
+                ComboBox {
+                    id: showPhoneNumberComboBox
+                    width: parent.columnWidth
+                    label: qsTr("Show phone number")
+                    description: qsTr("Privacy setting for managing whether your phone number is visible.")
+                    menu: ContextMenu {
+                        x: 0
+                        width: showPhoneNumberComboBox.width
+
+                        MenuItem {
+                            text: qsTr("Yes")
+                            onClicked: {
+                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowPhoneNumber, TelegramAPI.RuleAllowAll);
+                            }
+                        }
+                        MenuItem {
+                            text: qsTr("Your contacts only")
+                            onClicked: {
+                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowPhoneNumber, TelegramAPI.RuleAllowContacts);
+                            }
+                        }
+                        MenuItem {
+                            text: qsTr("No")
+                            onClicked: {
+                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowPhoneNumber, TelegramAPI.RuleRestrictAll);
+                            }
+                        }
+                    }
+
+                    Component.onCompleted: {
+                        currentIndex = tdLibWrapper.getUserPrivacySettingRule(TelegramAPI.SettingShowPhoneNumber);
+                    }
+                }
+
+                ComboBox {
+                    id: showProfilePhotoComboBox
+                    width: parent.columnWidth
+                    label: qsTr("Show profile photo")
+                    description: qsTr("Privacy setting for managing whether your profile photo is visible.")
+                    menu: ContextMenu {
+                        x: 0
+                        width: showProfilePhotoComboBox.width
+
+                        MenuItem {
+                            text: qsTr("Yes")
+                            onClicked: {
+                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowProfilePhoto, TelegramAPI.RuleAllowAll);
+                            }
+                        }
+                        MenuItem {
+                            text: qsTr("Your contacts only")
+                            onClicked: {
+                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowProfilePhoto, TelegramAPI.RuleAllowContacts);
+                            }
+                        }
+                        MenuItem {
+                            text: qsTr("No")
+                            onClicked: {
+                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowProfilePhoto, TelegramAPI.RuleRestrictAll);
+                            }
+                        }
+                    }
+
+                    Component.onCompleted: {
+                        currentIndex = tdLibWrapper.getUserPrivacySettingRule(TelegramAPI.SettingShowProfilePhoto);
+                    }
+                }
+
+                ComboBox {
+                    id: showStatusComboBox
+                    width: parent.columnWidth
+                    label: qsTr("Show status")
+                    description: qsTr("Privacy setting for managing whether your online status is visible.")
+                    menu: ContextMenu {
+                        x: 0
+                        width: showStatusComboBox.width
+
+                        MenuItem {
+                            text: qsTr("Yes")
+                            onClicked: {
+                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowStatus, TelegramAPI.RuleAllowAll);
+                            }
+                        }
+                        MenuItem {
+                            text: qsTr("Your contacts only")
+                            onClicked: {
+                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowStatus, TelegramAPI.RuleAllowContacts);
+                            }
+                        }
+                        MenuItem {
+                            text: qsTr("No")
+                            onClicked: {
+                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowStatus, TelegramAPI.RuleRestrictAll);
+                            }
+                        }
+                    }
+
+                    Component.onCompleted: {
+                        currentIndex = tdLibWrapper.getUserPrivacySettingRule(TelegramAPI.SettingShowStatus);
+                    }
+                }
+            }
+
+            TextSwitch {
+                checked: appSettings.allowInlineBotLocationAccess
+                text: qsTr("Allow sending Location to inline bots")
+                description: qsTr("Some inline bots request location data when using them")
+                automaticCheck: false
+                onClicked: {
+                    appSettings.allowInlineBotLocationAccess = !checked
+                }
+            }
+        }
+    }
+}

qml/components/settingsPage/SettingsStorage.qml

@@ -0,0 +1,51 @@
+/*
+    Copyright (C) 2021 Sebastian J. Wolf and other contributors
+
+    This file is part of Fernschreiber.
+
+    Fernschreiber is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Fernschreiber is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Fernschreiber. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import QtQuick 2.6
+import Sailfish.Silica 1.0
+import WerkWolf.Fernschreiber 1.0
+
+AccordionItem {
+    text: qsTr("Storage")
+    Component {
+        ResponsiveGrid {
+            bottomPadding: Theme.paddingMedium
+            TextSwitch {
+                width: parent.columnWidth
+                checked: appSettings.onlineOnlyMode
+                text: qsTr("Enable online-only mode")
+                description: qsTr("Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.")
+                automaticCheck: false
+                onClicked: {
+                    appSettings.onlineOnlyMode = !checked
+                }
+            }
+
+            TextSwitch {
+                width: parent.columnWidth
+                checked: appSettings.storageOptimizer
+                text: qsTr("Enable storage optimizer")
+                automaticCheck: false
+                onClicked: {
+                    appSettings.storageOptimizer = !checked
+                }
+            }
+        }
+    }
+}

qml/components/settingsPage/SettingsUserProfile.qml

@@ -0,0 +1,261 @@
+/*
+    Copyright (C) 2021 Sebastian J. Wolf and other contributors
+
+    This file is part of Fernschreiber.
+
+    Fernschreiber is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Fernschreiber is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Fernschreiber. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import QtQuick 2.6
+import Sailfish.Silica 1.0
+import Sailfish.Pickers 1.0
+import WerkWolf.Fernschreiber 1.0
+import "../"
+import "../../pages/"
+import "../../js/functions.js" as Functions
+
+AccordionItem {
+    text: qsTr("User Profile")
+    Component {
+        Column {
+            id: accordionContent
+            bottomPadding: Theme.paddingMedium
+
+            readonly property var userInformation: tdLibWrapper.getUserInformation()
+            property bool uploadInProgress: false
+
+            Component.onCompleted: {
+                tdLibWrapper.getUserProfilePhotos(userInformation.id, 100, 0);
+            }
+
+            Connections {
+                target: tdLibWrapper
+                onOwnUserUpdated: {
+                    firstNameEditArea.text = userInformation.first_name;
+                    lastNameEditArea.text = userInformation.last_name;
+                    userNameEditArea.text = userInformation.username;
+                }
+                onUserProfilePhotosReceived: {
+                    if (extra === userInformation.id.toString()) {
+                        imageContainer.thumbnailModel = photos;
+                    }
+                }
+                onFileUpdated: {
+                    if (uploadInProgress) {
+                        profilePictureButtonColumn.visible = !fileInformation.remote.is_uploading_active;
+                        uploadInProgress = fileInformation.remote.is_uploading_active;
+                        if (!fileInformation.remote.is_uploading_active) {
+                            uploadInProgress = false;
+                            tdLibWrapper.getUserProfilePhotos(userInformation.id, 100, 0);
+                        }
+                    }
+                }
+                onOkReceived: {
+                    if (request === "deleteProfilePhoto") {
+                        tdLibWrapper.getUserProfilePhotos(userInformation.id, 100, 0);
+                    }
+                    if (request === "setProfilePhoto") {
+                        tdLibWrapper.getUserProfilePhotos(userInformation.id, 100, 0);
+                        profilePictureButtonColumn.visible = true;
+                        uploadInProgress = false;
+                    }
+                }
+            }
+
+            ResponsiveGrid {
+                x: Theme.horizontalPageMargin
+
+                InformationEditArea {
+                    id: firstNameEditArea
+                    visible: true
+                    canEdit: true
+                    headerText: qsTr("First Name", "first name of the logged-in profile - header")
+                    text: userInformation.first_name
+                    width: parent.columnWidth
+                    headerLeftAligned: true
+
+                    onSaveButtonClicked: {
+                        if(!editItem.errorHighlight) {
+                            tdLibWrapper.setName(textValue, lastNameEditArea.text);
+                        } else {
+                            isEditing = true;
+                        }
+                    }
+
+                    onTextEdited: {
+                        if(textValue.length > 0 && textValue.length < 65) {
+                            editItem.errorHighlight = false;
+                            editItem.label = "";
+                            editItem.placeholderText = "";
+                        } else {
+                            editItem.label = qsTr("Enter 1-64 characters");
+                            editItem.placeholderText = editItem.label;
+                            editItem.errorHighlight = true;
+                        }
+                    }
+                }
+
+                InformationEditArea {
+                    id: lastNameEditArea
+                    visible: true
+                    canEdit: true
+                    headerText: qsTr("Last Name", "last name of the logged-in profile - header")
+                    text: userInformation.last_name
+                    width: parent.columnWidth
+                    headerLeftAligned: true
+
+                    onSaveButtonClicked: {
+                        if(!editItem.errorHighlight) {
+                            tdLibWrapper.setName(firstNameEditArea.text, textValue);
+                        } else {
+                            isEditing = true;
+                        }
+                    }
+
+                    onTextEdited: {
+                        if(textValue.length >= 0 && textValue.length < 65) {
+                            editItem.errorHighlight = false;
+                            editItem.label = "";
+                            editItem.placeholderText = "";
+                        } else {
+                            editItem.label = qsTr("Enter 0-64 characters");
+                            editItem.placeholderText = editItem.label;
+                            editItem.errorHighlight = true;
+                        }
+                    }
+                }
+
+                InformationEditArea {
+                    id: userNameEditArea
+                    visible: true
+                    canEdit: true
+                    headerText: qsTr("Username", "user name of the logged-in profile - header")
+                    text: userInformation.username
+                    width: parent.columnWidth
+                    headerLeftAligned: true
+
+                    onSaveButtonClicked: {
+                        tdLibWrapper.setUsername(textValue);
+                    }
+                }
+
+            }
+
+            SectionHeader {
+                horizontalAlignment: Text.AlignLeft
+                text: qsTr("Profile Pictures")
+            }
+
+            Row {
+                width: parent.width - ( 2 * Theme.horizontalPageMargin )
+                spacing: Theme.paddingMedium
+
+                Item {
+                    id: imageContainer
+                    anchors.verticalCenter: parent.verticalCenter
+                    width: parent.width / 2
+                    height: profilePictureLoader.height
+                    property var thumbnailModel: ({})
+                    property bool thumbnailVisible: true
+                    property bool thumbnailActive: thumbnailModel.length > 0
+                    property int thumbnailRadius: imageContainer.width / 2
+
+                    Loader {
+                        id: profilePictureLoader
+                        active: imageContainer.thumbnailActive
+                        asynchronous: true
+                        width: Theme.itemSizeExtraLarge
+                        height: Theme.itemSizeExtraLarge
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        source: "../ProfilePictureList.qml"
+                    }
+
+                    ProfileThumbnail {
+                        id: chatPictureReplacement
+                        visible: !profilePictureLoader.active
+                        replacementStringHint: Functions.getUserName(accordionContent.userInformation)
+                        radius: imageContainer.thumbnailRadius
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        width: Theme.itemSizeExtraLarge
+                        height: Theme.itemSizeExtraLarge
+                    }
+                }
+
+                Column {
+                    id: profilePictureButtonColumn
+                    spacing: Theme.paddingSmall
+                    width: parent.width / 2
+
+                    Button {
+                        id: addProfilePictureButton
+                        text: qsTr("Add Picture")
+                        anchors {
+                            horizontalCenter: parent.horizontalCenter
+                        }
+                        onClicked: {
+                            pageStack.push(imagePickerPage);
+                        }
+                    }
+
+                    Button {
+                        id: removeProfilePictureButton
+                        text: qsTr("Delete Picture")
+                        anchors {
+                            horizontalCenter: parent.horizontalCenter
+                        }
+                        onClicked: {
+                            var pictureIdForDeletion = imageContainer.thumbnailModel[profilePictureLoader.item.currentPictureIndex].id;
+                            Remorse.popupAction(settingsPage, qsTr("Deleting profile picture"), function() { tdLibWrapper.deleteProfilePhoto(pictureIdForDeletion) });
+                        }
+                    }
+                }
+
+                Column {
+                    id: uploadStatusColumn
+                    visible: !profilePictureButtonColumn.visible
+                    spacing: Theme.paddingMedium
+                    width: parent.width / 2
+
+                    Text {
+                        id: uploadingText
+                        font.pixelSize: Theme.fontSizeSmall
+                        text: qsTr("Uploading...")
+                        horizontalAlignment: Text.AlignHCenter
+                        color: Theme.secondaryColor
+                        width: parent.width
+                    }
+
+                    BusyIndicator {
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        running: uploadStatusColumn.visible
+                        size: BusyIndicatorSize.Medium
+                    }
+
+                }
+
+            }
+
+            Component {
+                id: imagePickerPage
+                ImagePickerPage {
+                    onSelectedContentPropertiesChanged: {
+                        profilePictureButtonColumn.visible = false;
+                        uploadInProgress = true;
+                        tdLibWrapper.setProfilePhoto(selectedContentProperties.filePath);
+                    }
+                }
+            }
+        }
+    }
+}

qml/pages/OverviewPage.qml

@@ -37,7 +37,7 @@ Page {
     property bool chatListCreated: false;
 
     // link handler:
-    property string urlToOpen: null;
+    property string urlToOpen;
     property var chatToOpen: null; //null or [chatId, messageId]
 
     onStatusChanged: {
@@ -137,7 +137,7 @@ Page {
         if(chatListCreated && urlToOpen && urlToOpen.length > 1) {
             Debug.log("[OverviewPage] Opening URL: ", urlToOpen);
             Functions.handleLink(urlToOpen);
-            urlToOpen = null;
+            urlToOpen = "";
         }
     }
 

qml/pages/SettingsPage.qml

@@ -21,6 +21,7 @@ import Sailfish.Silica 1.0
 import Sailfish.Pickers 1.0
 import WerkWolf.Fernschreiber 1.0
 import "../components"
+import "../components/settingsPage"
 import "../js/functions.js" as Functions
 import "../js/debug.js" as Debug
 
@@ -28,50 +29,6 @@ Page {
     id: settingsPage
     allowedOrientations: Orientation.All
 
-    readonly property bool landscapeLayout: settingsPage.isLandscape
-    readonly property var userInformation: tdLibWrapper.getUserInformation()
-    property bool uploadInProgress: false
-
-    onStatusChanged: {
-        if (status === PageStatus.Active) {
-            tdLibWrapper.getUserProfilePhotos(userInformation.id, 100, 0);
-        }
-    }
-
-    Connections {
-        target: tdLibWrapper
-        onOwnUserUpdated: {
-            firstNameEditArea.text = userInformation.first_name;
-            lastNameEditArea.text = userInformation.last_name;
-            userNameEditArea.text = userInformation.username;
-        }
-        onUserProfilePhotosReceived: {
-            if (extra === userInformation.id.toString()) {
-                imageContainer.thumbnailModel = photos;
-            }
-        }
-        onFileUpdated: {
-            if (uploadInProgress) {
-                profilePictureButtonColumn.visible = !fileInformation.remote.is_uploading_active;
-                uploadInProgress = fileInformation.remote.is_uploading_active;
-                if (!fileInformation.remote.is_uploading_active) {
-                    uploadInProgress = false;
-                    tdLibWrapper.getUserProfilePhotos(userInformation.id, 100, 0);
-                }
-            }
-        }
-        onOkReceived: {
-            if (request === "deleteProfilePhoto") {
-                tdLibWrapper.getUserProfilePhotos(userInformation.id, 100, 0);
-            }
-            if (request === "setProfilePhoto") {
-                tdLibWrapper.getUserProfilePhotos(userInformation.id, 100, 0);
-                profilePictureButtonColumn.visible = true;
-                uploadInProgress = false;
-            }
-        }
-    }
-
     SilicaFlickable {
         id: settingsContainer
         contentHeight: column.height
@@ -80,686 +37,19 @@ Page {
         Column {
             id: column
             width: settingsPage.width
+            bottomPadding: Theme.paddingLarge
 
             PageHeader {
                 title: qsTr("Settings")
             }
 
-            SectionHeader {
-                text: qsTr("User Profile")
-            }
-
-            Grid {
-                width: parent.width - ( 2 * Theme.horizontalPageMargin )
-                columns: landscapeLayout ? 2 : 1
-                columnSpacing: Theme.paddingLarge
-                anchors.horizontalCenter: parent.horizontalCenter
-
-                readonly property real columnWidth: width/columns
-
-                InformationEditArea {
-                    id: firstNameEditArea
-                    visible: true
-                    canEdit: true
-                    headerText: qsTr("First Name", "first name of the logged-in profile - header")
-                    text: userInformation.first_name
-                    width: parent.columnWidth
-                    headerLeftAligned: true
-
-                    onSaveButtonClicked: {
-                        if(!editItem.errorHighlight) {
-                            tdLibWrapper.setName(textValue, lastNameEditArea.text);
-                        } else {
-                            isEditing = true;
-                        }
-                    }
-
-                    onTextEdited: {
-                        if(textValue.length > 0 && textValue.length < 65) {
-                            editItem.errorHighlight = false;
-                            editItem.label = "";
-                            editItem.placeholderText = "";
-                        } else {
-                            editItem.label = qsTr("Enter 1-64 characters");
-                            editItem.placeholderText = editItem.label;
-                            editItem.errorHighlight = true;
-                        }
-                    }
-                }
-
-                InformationEditArea {
-                    id: lastNameEditArea
-                    visible: true
-                    canEdit: true
-                    headerText: qsTr("Last Name", "last name of the logged-in profile - header")
-                    text: userInformation.last_name
-                    width: parent.columnWidth
-                    headerLeftAligned: true
-
-                    onSaveButtonClicked: {
-                        if(!editItem.errorHighlight) {
-                            tdLibWrapper.setName(firstNameEditArea.text, textValue);
-                        } else {
-                            isEditing = true;
-                        }
-                    }
-
-                    onTextEdited: {
-                        if(textValue.length >= 0 && textValue.length < 65) {
-                            editItem.errorHighlight = false;
-                            editItem.label = "";
-                            editItem.placeholderText = "";
-                        } else {
-                            editItem.label = qsTr("Enter 0-64 characters");
-                            editItem.placeholderText = editItem.label;
-                            editItem.errorHighlight = true;
-                        }
-                    }
-                }
-
-                InformationEditArea {
-                    id: userNameEditArea
-                    visible: true
-                    canEdit: true
-                    headerText: qsTr("Username", "user name of the logged-in profile - header")
-                    text: userInformation.username
-                    width: parent.columnWidth
-                    headerLeftAligned: true
-
-                    onSaveButtonClicked: {
-                        tdLibWrapper.setUsername(textValue);
-                    }
-                }
-
-            }
-
-            SectionHeader {
-                horizontalAlignment: Text.AlignLeft
-                text: qsTr("Profile Pictures")
-            }
-
-            Row {
-                width: parent.width - ( 2 * Theme.horizontalPageMargin )
-                spacing: Theme.paddingMedium
-
-                Item {
-                    id: imageContainer
-                    anchors.verticalCenter: parent.verticalCenter
-                    width: parent.width / 2
-                    height: profilePictureLoader.height
-                    property var thumbnailModel: ({})
-                    property bool thumbnailVisible: true
-                    property bool thumbnailActive: thumbnailModel.length > 0
-                    property int thumbnailRadius: imageContainer.width / 2
-
-                    Loader {
-                        id: profilePictureLoader
-                        active: imageContainer.thumbnailActive
-                        asynchronous: true
-                        width: Theme.itemSizeExtraLarge
-                        height: Theme.itemSizeExtraLarge
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        source: "../components/ProfilePictureList.qml"
-                    }
-
-                    ProfileThumbnail {
-                        id: chatPictureReplacement
-                        visible: !profilePictureLoader.active
-                        replacementStringHint: Functions.getUserName(settingsPage.userInformation)
-                        radius: imageContainer.thumbnailRadius
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        width: Theme.itemSizeExtraLarge
-                        height: Theme.itemSizeExtraLarge
-                    }
-                }
-
-                Column {
-                    id: profilePictureButtonColumn
-                    spacing: Theme.paddingSmall
-                    width: parent.width / 2
-
-                    Button {
-                        id: addProfilePictureButton
-                        text: qsTr("Add Picture")
-                        anchors {
-                            horizontalCenter: parent.horizontalCenter
-                        }
-                        onClicked: {
-                            pageStack.push(imagePickerPage);
-                        }
-                    }
-
-                    Button {
-                        id: removeProfilePictureButton
-                        text: qsTr("Delete Picture")
-                        anchors {
-                            horizontalCenter: parent.horizontalCenter
-                        }
-                        onClicked: {
-                            var pictureIdForDeletion = imageContainer.thumbnailModel[profilePictureLoader.item.currentPictureIndex].id;
-                            Remorse.popupAction(settingsPage, qsTr("Deleting profile picture"), function() { tdLibWrapper.deleteProfilePhoto(pictureIdForDeletion) });
-                        }
-                    }
-                }
-
-                Column {
-                    id: uploadStatusColumn
-                    visible: !profilePictureButtonColumn.visible
-                    spacing: Theme.paddingMedium
-                    width: parent.width / 2
-
-                    Text {
-                        id: uploadingText
-                        font.pixelSize: Theme.fontSizeSmall
-                        text: qsTr("Uploading...")
-                        horizontalAlignment: Text.AlignHCenter
-                        color: Theme.secondaryColor
-                        width: parent.width
-                    }
-
-                    BusyIndicator {
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        running: uploadStatusColumn.visible
-                        size: BusyIndicatorSize.Medium
-                    }
-
-                }
-
-            }
-
-            Component {
-                id: imagePickerPage
-                ImagePickerPage {
-                    onSelectedContentPropertiesChanged: {
-                        profilePictureButtonColumn.visible = false;
-                        uploadInProgress = true;
-                        tdLibWrapper.setProfilePhoto(selectedContentProperties.filePath);
-                    }
-                }
-           }
-
-            SectionHeader {
-                horizontalAlignment: Text.AlignLeft
-                text: qsTr("Privacy")
-            }
-
-            Grid {
-                width: parent.width
-                columns: landscapeLayout ? 2 : 1
-                anchors.horizontalCenter: parent.horizontalCenter
-
-                readonly property real columnWidth: width/columns
-
-                Connections {
-                    target: tdLibWrapper
-                    onUserPrivacySettingUpdated: {
-                        Debug.log("Received updated privacy setting: " + setting + ":" + rule);
-                        switch (setting) {
-                        case TelegramAPI.SettingAllowChatInvites:
-                            allowChatInvitesComboBox.currentIndex = rule;
-                            break;
-                        case TelegramAPI.SettingAllowFindingByPhoneNumber:
-                            allowFindingByPhoneNumberComboBox.currentIndex = rule;
-                            break;
-                        case TelegramAPI.SettingShowLinkInForwardedMessages:
-                            showLinkInForwardedMessagesComboBox.currentIndex = rule;
-                            break;
-                        case TelegramAPI.SettingShowPhoneNumber:
-                            showPhoneNumberComboBox.currentIndex = rule;
-                            break;
-                        case TelegramAPI.SettingShowProfilePhoto:
-                            showProfilePhotoComboBox.currentIndex = rule;
-                            break;
-                        case TelegramAPI.SettingShowStatus:
-                            showStatusComboBox.currentIndex = rule;
-                            break;
-                        }
-                    }
-                }
-
-                ComboBox {
-                    id: allowChatInvitesComboBox
-                    width: parent.columnWidth
-                    label: qsTr("Allow chat invites")
-                    description: qsTr("Privacy setting for managing whether you can be invited to chats.")
-                    menu: ContextMenu {
-                        x: 0
-                        width: allowChatInvitesComboBox.width
-
-                        MenuItem {
-                            text: qsTr("Yes")
-                            onClicked: {
-                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingAllowChatInvites, TelegramAPI.RuleAllowAll);
-                            }
-                        }
-                        MenuItem {
-                            text: qsTr("Your contacts only")
-                            onClicked: {
-                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingAllowChatInvites, TelegramAPI.RuleAllowContacts);
-                            }
-                        }
-                        MenuItem {
-                            text: qsTr("No")
-                            onClicked: {
-                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingAllowChatInvites, TelegramAPI.RuleRestrictAll);
-                            }
-                        }
-                    }
-
-                    Component.onCompleted: {
-                        currentIndex = tdLibWrapper.getUserPrivacySettingRule(TelegramAPI.SettingAllowChatInvites);
-                    }
-                }
-
-                ComboBox {
-                    id: allowFindingByPhoneNumberComboBox
-                    width: parent.columnWidth
-                    label: qsTr("Allow finding by phone number")
-                    description: qsTr("Privacy setting for managing whether you can be found by your phone number.")
-                    menu: ContextMenu {
-                        x: 0
-                        width: allowFindingByPhoneNumberComboBox.width
-
-                        MenuItem {
-                            text: qsTr("Yes")
-                            onClicked: {
-                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingAllowFindingByPhoneNumber, TelegramAPI.RuleAllowAll);
-                            }
-                        }
-                        MenuItem {
-                            text: qsTr("Your contacts only")
-                            onClicked: {
-                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingAllowFindingByPhoneNumber, TelegramAPI.RuleAllowContacts);
-                            }
-                        }
-                    }
-
-                    Component.onCompleted: {
-                        currentIndex = tdLibWrapper.getUserPrivacySettingRule(TelegramAPI.SettingAllowFindingByPhoneNumber);
-                    }
-                }
-
-                ComboBox {
-                    id: showLinkInForwardedMessagesComboBox
-                    width: parent.columnWidth
-                    label: qsTr("Show link in forwarded messages")
-                    description: qsTr("Privacy setting for managing whether a link to your account is included in forwarded messages.")
-                    menu: ContextMenu {
-                        x: 0
-                        width: showLinkInForwardedMessagesComboBox.width
-
-                        MenuItem {
-                            text: qsTr("Yes")
-                            onClicked: {
-                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowLinkInForwardedMessages, TelegramAPI.RuleAllowAll);
-                            }
-                        }
-                        MenuItem {
-                            text: qsTr("Your contacts only")
-                            onClicked: {
-                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowLinkInForwardedMessages, TelegramAPI.RuleAllowContacts);
-                            }
-                        }
-                        MenuItem {
-                            text: qsTr("No")
-                            onClicked: {
-                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowLinkInForwardedMessages, TelegramAPI.RuleRestrictAll);
-                            }
-                        }
-                    }
-
-                    Component.onCompleted: {
-                        currentIndex = tdLibWrapper.getUserPrivacySettingRule(TelegramAPI.SettingShowLinkInForwardedMessages);
-                    }
-                }
-
-                ComboBox {
-                    id: showPhoneNumberComboBox
-                    width: parent.columnWidth
-                    label: qsTr("Show phone number")
-                    description: qsTr("Privacy setting for managing whether your phone number is visible.")
-                    menu: ContextMenu {
-                        x: 0
-                        width: showPhoneNumberComboBox.width
-
-                        MenuItem {
-                            text: qsTr("Yes")
-                            onClicked: {
-                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowPhoneNumber, TelegramAPI.RuleAllowAll);
-                            }
-                        }
-                        MenuItem {
-                            text: qsTr("Your contacts only")
-                            onClicked: {
-                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowPhoneNumber, TelegramAPI.RuleAllowContacts);
-                            }
-                        }
-                        MenuItem {
-                            text: qsTr("No")
-                            onClicked: {
-                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowPhoneNumber, TelegramAPI.RuleRestrictAll);
-                            }
-                        }
-                    }
-
-                    Component.onCompleted: {
-                        currentIndex = tdLibWrapper.getUserPrivacySettingRule(TelegramAPI.SettingShowPhoneNumber);
-                    }
-                }
-
-                ComboBox {
-                    id: showProfilePhotoComboBox
-                    width: parent.columnWidth
-                    label: qsTr("Show profile photo")
-                    description: qsTr("Privacy setting for managing whether your profile photo is visible.")
-                    menu: ContextMenu {
-                        x: 0
-                        width: showProfilePhotoComboBox.width
-
-                        MenuItem {
-                            text: qsTr("Yes")
-                            onClicked: {
-                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowProfilePhoto, TelegramAPI.RuleAllowAll);
-                            }
-                        }
-                        MenuItem {
-                            text: qsTr("Your contacts only")
-                            onClicked: {
-                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowProfilePhoto, TelegramAPI.RuleAllowContacts);
-                            }
-                        }
-                        MenuItem {
-                            text: qsTr("No")
-                            onClicked: {
-                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowProfilePhoto, TelegramAPI.RuleRestrictAll);
-                            }
-                        }
-                    }
-
-                    Component.onCompleted: {
-                        currentIndex = tdLibWrapper.getUserPrivacySettingRule(TelegramAPI.SettingShowProfilePhoto);
-                    }
-                }
-
-                ComboBox {
-                    id: showStatusComboBox
-                    width: parent.columnWidth
-                    label: qsTr("Show status")
-                    description: qsTr("Privacy setting for managing whether your online status is visible.")
-                    menu: ContextMenu {
-                        x: 0
-                        width: showStatusComboBox.width
-
-                        MenuItem {
-                            text: qsTr("Yes")
-                            onClicked: {
-                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowStatus, TelegramAPI.RuleAllowAll);
-                            }
-                        }
-                        MenuItem {
-                            text: qsTr("Your contacts only")
-                            onClicked: {
-                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowStatus, TelegramAPI.RuleAllowContacts);
-                            }
-                        }
-                        MenuItem {
-                            text: qsTr("No")
-                            onClicked: {
-                                tdLibWrapper.setUserPrivacySettingRule(TelegramAPI.SettingShowStatus, TelegramAPI.RuleRestrictAll);
-                            }
-                        }
-                    }
-
-                    Component.onCompleted: {
-                        currentIndex = tdLibWrapper.getUserPrivacySettingRule(TelegramAPI.SettingShowStatus);
-                    }
-                }
-
-            }
-
-            TextSwitch {
-                checked: appSettings.allowInlineBotLocationAccess
-                text: qsTr("Allow sending Location to inline bots")
-                description: qsTr("Some inline bots request location data when using them")
-                automaticCheck: false
-                onClicked: {
-                    appSettings.allowInlineBotLocationAccess = !checked
-                }
-            }
-
-            SectionHeader {
-                text: qsTr("Behavior")
-            }
-
-            Grid {
-                width: parent.width
-                columns: landscapeLayout ? 2 : 1
-
-                readonly property real columnWidth: width/columns
-
-                TextSwitch {
-                    width: parent.columnWidth
-                    checked: appSettings.sendByEnter
-                    text: qsTr("Send message by enter")
-                    description: qsTr("Send your message by pressing the enter key")
-                    automaticCheck: false
-                    onClicked: {
-                        appSettings.sendByEnter = !checked
-                    }
-                }
-
-                TextSwitch {
-                    width: parent.columnWidth
-                    checked: appSettings.focusTextAreaOnChatOpen
-                    text: qsTr("Focus text input on chat open")
-                    description: qsTr("Focus the text input area when entering a chat")
-                    automaticCheck: false
-                    onClicked: {
-                        appSettings.focusTextAreaOnChatOpen = !checked
-                    }
-                }
-
-                TextSwitch {
-                    width: parent.columnWidth
-                    checked: appSettings.focusTextAreaAfterSend
-                    text: qsTr("Focus text input area after send")
-                    description: qsTr("Focus the text input area after sending a message")
-                    automaticCheck: false
-                    onClicked: {
-                        appSettings.focusTextAreaAfterSend = !checked
-                    }
-                }
-
-                TextSwitch {
-                    width: parent.columnWidth
-                    checked: appSettings.delayMessageRead
-                    text: qsTr("Delay before marking messages as read")
-                    description: qsTr("Fernschreiber will wait a bit before messages are marked as read")
-                    automaticCheck: false
-                    onClicked: {
-                        appSettings.delayMessageRead = !checked
-                    }
-                }
-
-                TextSwitch {
-                    width: parent.columnWidth
-                    checked: appSettings.useOpenWith
-                    text: qsTr("Open-with menu integration")
-                    description: qsTr("Integrate Fernschreiber into open-with menu of Sailfish OS")
-                    automaticCheck: false
-                    onClicked: {
-                        appSettings.useOpenWith = !checked
-                    }
-                }
-
-                ComboBox {
-                    id: feedbackComboBox
-                    width: parent.columnWidth
-                    label: qsTr("Notification feedback")
-                    description: qsTr("Use non-graphical feedback (sound, vibration) for notifications")
-                    menu: ContextMenu {
-                        id: feedbackMenu
-                        x: 0
-                        width: feedbackComboBox.width
-
-                        MenuItem {
-                            readonly property int value: AppSettings.NotificationFeedbackAll
-                            text: qsTr("All events")
-                            onClicked: {
-                                appSettings.notificationFeedback = value
-                            }
-                        }
-                        MenuItem {
-                            readonly property int value: AppSettings.NotificationFeedbackNew
-                            text: qsTr("Only new events")
-                            onClicked: {
-                                appSettings.notificationFeedback = value
-                            }
-                        }
-                        MenuItem {
-                            readonly property int value: AppSettings.NotificationFeedbackNone
-                            text: qsTr("None")
-                            onClicked: {
-                                appSettings.notificationFeedback = value
-                            }
-                        }
-                    }
-
-                    Component.onCompleted: updateFeedbackSelection()
-
-                    function updateFeedbackSelection() {
-                        var menuItems = feedbackMenu.children
-                        var n = menuItems.length
-                        for (var i=0; i<n; i++) {
-                            if (menuItems[i].value === appSettings.notificationFeedback) {
-                                currentIndex = i
-                                return
-                            }
-                        }
-                    }
-
-                    Connections {
-                        target: appSettings
-                        onNotificationFeedbackChanged: {
-                            feedbackComboBox.updateFeedbackSelection()
-                        }
-                    }
-                }
-
-                TextSwitch {
-                    width: parent.columnWidth
-                    checked: appSettings.notificationTurnsDisplayOn && enabled
-                    text: qsTr("Notification turns on the display")
-                    enabled: appSettings.notificationFeedback !== AppSettings.NotificationFeedbackNone
-                    height: enabled ? implicitHeight: 0
-                    clip: height < implicitHeight
-                    visible: height > 0
-                    automaticCheck: false
-                    onClicked: {
-                        appSettings.notificationTurnsDisplayOn = !checked
-                    }
-                    Behavior on height { SmoothedAnimation { duration: 200 } }
-                }
-
-                TextSwitch {
-                    width: parent.columnWidth
-                    checked: appSettings.notificationSoundsEnabled && enabled
-                    text: qsTr("Enable notification sounds")
-                    description: qsTr("When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.")
-                    enabled: appSettings.notificationFeedback !== AppSettings.NotificationFeedbackNone
-                    height: enabled ? implicitHeight: 0
-                    clip: height < implicitHeight
-                    visible: height > 0
-                    automaticCheck: false
-                    onClicked: {
-                        appSettings.notificationSoundsEnabled = !checked
-                    }
-                    Behavior on height { SmoothedAnimation { duration: 200 } }
-                }
-
-            }
-
-            SectionHeader {
-                text: qsTr("Appearance")
-            }
-
-            Grid {
-                width: parent.width
-                columns: landscapeLayout ? 2 : 1
-
-                readonly property real columnWidth: width/columns
-
-                TextSwitch {
-                    id: stickersAsEmojisTextSwitch
-                    width: parent.columnWidth
-                    checked: appSettings.showStickersAsEmojis
-                    text: qsTr("Show stickers as emojis")
-                    description: qsTr("Only display emojis instead of the actual stickers")
-                    automaticCheck: false
-                    onClicked: {
-                        appSettings.showStickersAsEmojis = !checked
-                    }
-                }
-
-                TextSwitch {
-                    width: parent.columnWidth
-                    checked: appSettings.showStickersAsImages
-                    text: qsTr("Show stickers as images")
-                    description: qsTr("Show background for stickers and align them centrally like images")
-                    automaticCheck: false
-                    onClicked: {
-                        appSettings.showStickersAsImages = !checked
-                    }
-                    enabled: !stickersAsEmojisTextSwitch.checked
-                }
-
-                TextSwitch {
-                    width: parent.columnWidth
-                    checked: appSettings.animateStickers
-                    text: qsTr("Animate stickers")
-                    automaticCheck: false
-                    onClicked: {
-                        appSettings.animateStickers = !checked
-                    }
-                    enabled: !stickersAsEmojisTextSwitch.checked
-                }
-            }
-
-            SectionHeader {
-                text: qsTr("Storage")
-            }
-
-            Grid {
-                width: parent.width
-                columns: landscapeLayout ? 2 : 1
-
-                readonly property real columnWidth: width/columns
-
-                TextSwitch {
-                    width: parent.columnWidth
-                    checked: appSettings.onlineOnlyMode
-                    text: qsTr("Enable online-only mode")
-                    description: qsTr("Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.")
-                    automaticCheck: false
-                    onClicked: {
-                        appSettings.onlineOnlyMode = !checked
-                    }
-                }
-
-                TextSwitch {
-                    width: parent.columnWidth
-                    checked: appSettings.storageOptimizer
-                    text: qsTr("Enable storage optimizer")
-                    automaticCheck: false
-                    onClicked: {
-                        appSettings.storageOptimizer = !checked
-                    }
-                }
-            }
-
-            Item {
-                width: 1
-                height: Theme.paddingLarge // Some space at the bottom
+            Accordion {
+                flickable: settingsContainer
+                SettingsUserProfile { expanded: true; asynchronous: false }
+                SettingsPrivacy {}
+                SettingsBehavior {}
+                SettingsAppearance {}
+                SettingsStorage {}
             }
         }
 

translations/harbour-fernschreiber-de.ts

@@ -309,7 +309,7 @@
     </message>
     <message>
         <source>No message in this chat.</source>
-        <translation>Keine Nachricht in diesem Chat</translation>
+        <translation>Keine Nachricht in diesem Chat.</translation>
     </message>
     <message>
         <source>Mark chat as unread</source>
@@ -1501,11 +1501,34 @@
     </message>
 </context>
 <context>
-    <name>SettingsPage</name>
+    <name>SettingsAppearance</name>
     <message>
-        <source>Settings</source>
-        <translation>Einstellungen</translation>
+        <source>Appearance</source>
+        <translation>Erscheinungsbild</translation>
     </message>
+    <message>
+        <source>Show stickers as emojis</source>
+        <translation>Sticker als Emojis anzeigen</translation>
+    </message>
+    <message>
+        <source>Only display emojis instead of the actual stickers</source>
+        <translation>Nur Emojis anstelle der eigentlichen Sticker anzeigen</translation>
+    </message>
+    <message>
+        <source>Show stickers as images</source>
+        <translation>Sticker als Bilder anzeigen</translation>
+    </message>
+    <message>
+        <source>Show background for stickers and align them centrally like images</source>
+        <translation>Hintergrund für Sticker anzeigen und sie wie Bilder mittig platzieren</translation>
+    </message>
+    <message>
+        <source>Animate stickers</source>
+        <translation>Sticker animieren</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsBehavior</name>
     <message>
         <source>Behavior</source>
         <translation>Verhalten</translation>
@@ -1519,21 +1542,45 @@
         <translation>Senden Sie Ihre Nachricht, indem Sie die Enter-Taste drücken</translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation>Erscheinungsbild</translation>
+        <source>Focus text input on chat open</source>
+        <translation>Texteingabe fokussieren beim Öffnen eines Chats</translation>
     </message>
     <message>
-        <source>Show stickers as images</source>
-        <translation>Sticker als Bilder anzeigen</translation>
+        <source>Focus the text input area when entering a chat</source>
+        <translation>Texteingabe fokussieren, wenn ein Chat betreten wird</translation>
     </message>
     <message>
-        <source>Show background for stickers and align them centrally like images</source>
-        <translation>Hintergrund für Sticker anzeigen und sie wie Bilder mittig platzieren</translation>
+        <source>Focus text input area after send</source>
+        <translation>Texteingabe nach Senden fokussieren</translation>
+    </message>
+    <message>
+        <source>Focus the text input area after sending a message</source>
+        <translation>Fokussiert die Texteingabe nach Senden einer Nachricht</translation>
+    </message>
+    <message>
+        <source>Delay before marking messages as read</source>
+        <translation>Verzögerung bevor Nachrichten als gelesen markiert werden</translation>
+    </message>
+    <message>
+        <source>Fernschreiber will wait a bit before messages are marked as read</source>
+        <translation>Fernschreiber wird ein bisschen warten, bevor Nachrichten als gelesen markiert werden</translation>
+    </message>
+    <message>
+        <source>Open-with menu integration</source>
+        <translation>Integration im Öffnen-Mit-Menü</translation>
+    </message>
+    <message>
+        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
+        <translation>Fernschreiber ins Öffnen-Mit-Menü von Sailfish OS integrieren</translation>
     </message>
     <message>
         <source>Notification feedback</source>
         <translation>Rückmeldung bei Hinweisen</translation>
     </message>
+    <message>
+        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
+        <translation>Nicht-grafische Rückmeldungen (Klänge, Vibration) bei Hinweisen nutzen</translation>
+    </message>
     <message>
         <source>All events</source>
         <translation>Alle Ereignisse</translation>
@@ -1546,89 +1593,32 @@
         <source>None</source>
         <translation>Keine</translation>
     </message>
-    <message>
-        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
-        <translation>Nicht-grafische Rückmeldungen (Klänge, Vibration) bei Hinweisen nutzen</translation>
-    </message>
-    <message>
-        <source>Open-with menu integration</source>
-        <translation>Integration im Öffnen-Mit-Menü</translation>
-    </message>
-    <message>
-        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
-        <translation>Fernschreiber ins Öffnen-Mit-Menü von Sailfish OS integrieren</translation>
-    </message>
-    <message>
-        <source>Animate stickers</source>
-        <translation>Sticker animieren</translation>
-    </message>
     <message>
         <source>Notification turns on the display</source>
         <translation>Hinweis schaltet den Bildschirm an</translation>
     </message>
     <message>
-        <source>Storage</source>
-        <translation>Speicher</translation>
+        <source>Enable notification sounds</source>
+        <translation>Hinweistöne einschalten</translation>
     </message>
     <message>
-        <source>Enable storage optimizer</source>
-        <translation>Speicheroptimierer einschalten</translation>
+        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
+        <translation>Wenn Töne eingeschaltet sind, wird Fernschreiber den aktuellen Sailfish OS-Hinweiston für Chats verwenden, der in den Systemeinstellungen konfiguriert werden kann.</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPage</name>
     <message>
-        <source>Focus text input area after send</source>
-        <translation>Texteingabe nach Senden fokussieren</translation>
-    </message>
-    <message>
-        <source>Focus the text input area after sending a message</source>
-        <translation>Fokussiert die Texteingabe nach Senden einer Nachricht</translation>
-    </message>
-    <message>
-        <source>Enable online-only mode</source>
-        <translation>Nur-Online-Modus einschalten</translation>
-    </message>
-    <message>
-        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
-        <translation>Schaltet das Offline-Caching aus. Bestimmte Features können in diesem Modus eingeschränkt sein oder fehlen. Änderungen erfordern einen Neustart von Fernschreiber, um in Kraft zu treten.</translation>
+        <source>Settings</source>
+        <translation>Einstellungen</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPrivacy</name>
     <message>
         <source>Privacy</source>
         <translation>Privatsphäre</translation>
     </message>
-    <message>
-        <source>Allow sending Location to inline bots</source>
-        <translation>Erlaubt Standortsendung an Inline-Bots</translation>
-    </message>
-    <message>
-        <source>Some inline bots request location data when using them</source>
-        <translation>Einige Inline-Bots fragen bei Nutzung Standortdaten an</translation>
-    </message>
-    <message>
-        <source>User Profile</source>
-        <translation>Nutzungsprofil</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <comment>first name of the logged-in profile - header</comment>
-        <translation>Vorname</translation>
-    </message>
-    <message>
-        <source>Enter 1-64 characters</source>
-        <translation>Geben Sie 1-64 Zeichen ein</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <comment>last name of the logged-in profile - header</comment>
-        <translation>Nachname</translation>
-    </message>
-    <message>
-        <source>Enter 0-64 characters</source>
-        <translation>Geben Sie 0-64 Zeichen ein</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <comment>user name of the logged-in profile - header</comment>
-        <translation>Benutzername</translation>
-    </message>
     <message>
         <source>Allow chat invites</source>
         <translation>Chateinladungen erlauben</translation>
@@ -1690,56 +1680,81 @@
         <translation>Privatsphären-Einstellung zur Regelung, ob Ihr Onlinestatus sichtbar ist.</translation>
     </message>
     <message>
-        <source>Add Picture</source>
-        <translation>Bild hinzufügen</translation>
+        <source>Allow sending Location to inline bots</source>
+        <translation>Erlaubt Standortsendung an Inline-Bots</translation>
+    </message>
+    <message>
+        <source>Some inline bots request location data when using them</source>
+        <translation>Einige Inline-Bots fragen bei Nutzung Standortdaten an</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsStorage</name>
+    <message>
+        <source>Storage</source>
+        <translation>Speicher</translation>
+    </message>
+    <message>
+        <source>Enable online-only mode</source>
+        <translation>Nur-Online-Modus einschalten</translation>
+    </message>
+    <message>
+        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
+        <translation>Schaltet das Offline-Caching aus. Bestimmte Features können in diesem Modus eingeschränkt sein oder fehlen. Änderungen erfordern einen Neustart von Fernschreiber, um in Kraft zu treten.</translation>
+    </message>
+    <message>
+        <source>Enable storage optimizer</source>
+        <translation>Speicheroptimierer einschalten</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsUserProfile</name>
+    <message>
+        <source>User Profile</source>
+        <translation>Nutzungsprofil</translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <comment>first name of the logged-in profile - header</comment>
+        <translation>Vorname</translation>
+    </message>
+    <message>
+        <source>Enter 1-64 characters</source>
+        <translation>Geben Sie 1-64 Zeichen ein</translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <comment>last name of the logged-in profile - header</comment>
+        <translation>Nachname</translation>
+    </message>
+    <message>
+        <source>Enter 0-64 characters</source>
+        <translation>Geben Sie 0-64 Zeichen ein</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <comment>user name of the logged-in profile - header</comment>
+        <translation>Benutzername</translation>
     </message>
     <message>
         <source>Profile Pictures</source>
         <translation>Profilbilder</translation>
     </message>
     <message>
-        <source>Delete Picture</source>
-        <translation>Bild löschen</translation>
+        <source>Add Picture</source>
+        <translation>Bild hinzufügen</translation>
     </message>
     <message>
-        <source>Uploading...</source>
-        <translation>Lade hoch...</translation>
+        <source>Delete Picture</source>
+        <translation>Bild löschen</translation>
     </message>
     <message>
         <source>Deleting profile picture</source>
         <translation>Lösche Profilbild</translation>
     </message>
     <message>
-        <source>Enable notification sounds</source>
-        <translation>Hinweistöne einschalten</translation>
-    </message>
-    <message>
-        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
-        <translation>Wenn Töne eingeschaltet sind, wird Fernschreiber den aktuellen Sailfish OS-Hinweiston für Chats verwenden, der in den Systemeinstellungen konfiguriert werden kann.</translation>
-    </message>
-    <message>
-        <source>Delay before marking messages as read</source>
-        <translation>Verzögerung bevor Nachrichten als gelesen markiert werden</translation>
-    </message>
-    <message>
-        <source>Fernschreiber will wait a bit before messages are marked as read</source>
-        <translation>Fernschreiber wird ein bisschen warten, bevor Nachrichten als gelesen markiert werden</translation>
-    </message>
-    <message>
-        <source>Focus the text input area when entering a chat</source>
-        <translation>Texteingabe fokussieren, wenn ein Chat betreten wird</translation>
-    </message>
-    <message>
-        <source>Focus text input on chat open</source>
-        <translation>Texteingabe fokussieren beim Öffnen eines Chats</translation>
-    </message>
-    <message>
-        <source>Show stickers as emojis</source>
-        <translation>Sticker als Emojis anzeigen</translation>
-    </message>
-    <message>
-        <source>Only display emojis instead of the actual stickers</source>
-        <translation>Nur Emojis anstelle der eigentlichen Sticker anzeigen</translation>
+        <source>Uploading...</source>
+        <translation>Lade hoch...</translation>
     </message>
 </context>
 <context>

translations/harbour-fernschreiber-en.ts

@@ -1503,11 +1503,34 @@ messages</numerusform>
     </message>
 </context>
 <context>
-    <name>SettingsPage</name>
+    <name>SettingsAppearance</name>
     <message>
-        <source>Settings</source>
-        <translation>Settings</translation>
+        <source>Appearance</source>
+        <translation>Appearance</translation>
     </message>
+    <message>
+        <source>Show stickers as emojis</source>
+        <translation>Show stickers as emojis</translation>
+    </message>
+    <message>
+        <source>Only display emojis instead of the actual stickers</source>
+        <translation>Only display emojis instead of the actual stickers</translation>
+    </message>
+    <message>
+        <source>Show stickers as images</source>
+        <translation>Show stickers as images</translation>
+    </message>
+    <message>
+        <source>Show background for stickers and align them centrally like images</source>
+        <translation>Show background for stickers and align them centrally like images</translation>
+    </message>
+    <message>
+        <source>Animate stickers</source>
+        <translation>Animate stickers</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsBehavior</name>
     <message>
         <source>Behavior</source>
         <translation>Behavior</translation>
@@ -1521,21 +1544,45 @@ messages</numerusform>
         <translation>Send your message by pressing the enter key</translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation>Appearance</translation>
+        <source>Focus text input on chat open</source>
+        <translation>Focus text input on chat open</translation>
     </message>
     <message>
-        <source>Show stickers as images</source>
-        <translation>Show stickers as images</translation>
+        <source>Focus the text input area when entering a chat</source>
+        <translation>Focus the text input area when entering a chat</translation>
     </message>
     <message>
-        <source>Show background for stickers and align them centrally like images</source>
-        <translation>Show background for stickers and align them centrally like images</translation>
+        <source>Focus text input area after send</source>
+        <translation>Focus text input area after send</translation>
+    </message>
+    <message>
+        <source>Focus the text input area after sending a message</source>
+        <translation>Focus the text input area after sending a message</translation>
+    </message>
+    <message>
+        <source>Delay before marking messages as read</source>
+        <translation>Delay before marking messages as read</translation>
+    </message>
+    <message>
+        <source>Fernschreiber will wait a bit before messages are marked as read</source>
+        <translation>Fernschreiber will wait a bit before messages are marked as read</translation>
+    </message>
+    <message>
+        <source>Open-with menu integration</source>
+        <translation>Open-with menu integration</translation>
+    </message>
+    <message>
+        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
+        <translation>Integrate Fernschreiber into open-with menu of Sailfish OS</translation>
     </message>
     <message>
         <source>Notification feedback</source>
         <translation>Notification feedback</translation>
     </message>
+    <message>
+        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
+        <translation>Use non-graphical feedback (sound, vibration) for notifications</translation>
+    </message>
     <message>
         <source>All events</source>
         <translation>All events</translation>
@@ -1548,89 +1595,32 @@ messages</numerusform>
         <source>None</source>
         <translation>None</translation>
     </message>
-    <message>
-        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
-        <translation>Use non-graphical feedback (sound, vibration) for notifications</translation>
-    </message>
-    <message>
-        <source>Open-with menu integration</source>
-        <translation>Open-with menu integration</translation>
-    </message>
-    <message>
-        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
-        <translation>Integrate Fernschreiber into open-with menu of Sailfish OS</translation>
-    </message>
-    <message>
-        <source>Animate stickers</source>
-        <translation>Animate stickers</translation>
-    </message>
     <message>
         <source>Notification turns on the display</source>
         <translation>Notification turns on the display</translation>
     </message>
     <message>
-        <source>Storage</source>
-        <translation>Storage</translation>
+        <source>Enable notification sounds</source>
+        <translation>Enable notification sounds</translation>
     </message>
     <message>
-        <source>Enable storage optimizer</source>
-        <translation>Enable storage optimizer</translation>
+        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
+        <translation>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPage</name>
     <message>
-        <source>Focus text input area after send</source>
-        <translation>Focus text input area after send</translation>
-    </message>
-    <message>
-        <source>Focus the text input area after sending a message</source>
-        <translation>Focus the text input area after sending a message</translation>
-    </message>
-    <message>
-        <source>Enable online-only mode</source>
-        <translation>Enable online-only mode</translation>
-    </message>
-    <message>
-        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
-        <translation>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</translation>
+        <source>Settings</source>
+        <translation>Settings</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPrivacy</name>
     <message>
         <source>Privacy</source>
         <translation>Privacy</translation>
     </message>
-    <message>
-        <source>Allow sending Location to inline bots</source>
-        <translation>Allow sending Location to inline bots</translation>
-    </message>
-    <message>
-        <source>Some inline bots request location data when using them</source>
-        <translation>Some inline bots request location data when using them</translation>
-    </message>
-    <message>
-        <source>User Profile</source>
-        <translation>User Profile</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <comment>first name of the logged-in profile - header</comment>
-        <translation>First Name</translation>
-    </message>
-    <message>
-        <source>Enter 1-64 characters</source>
-        <translation>Enter 1-64 characters</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <comment>last name of the logged-in profile - header</comment>
-        <translation>Last Name</translation>
-    </message>
-    <message>
-        <source>Enter 0-64 characters</source>
-        <translation>Enter 0-64 characters</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <comment>user name of the logged-in profile - header</comment>
-        <translation>Username</translation>
-    </message>
     <message>
         <source>Allow chat invites</source>
         <translation>Allow chat invites</translation>
@@ -1692,56 +1682,81 @@ messages</numerusform>
         <translation>Privacy setting for managing whether your online status is visible.</translation>
     </message>
     <message>
-        <source>Add Picture</source>
-        <translation>Add Picture</translation>
+        <source>Allow sending Location to inline bots</source>
+        <translation>Allow sending Location to inline bots</translation>
+    </message>
+    <message>
+        <source>Some inline bots request location data when using them</source>
+        <translation>Some inline bots request location data when using them</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsStorage</name>
+    <message>
+        <source>Storage</source>
+        <translation>Storage</translation>
+    </message>
+    <message>
+        <source>Enable online-only mode</source>
+        <translation>Enable online-only mode</translation>
+    </message>
+    <message>
+        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
+        <translation>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</translation>
+    </message>
+    <message>
+        <source>Enable storage optimizer</source>
+        <translation>Enable storage optimizer</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsUserProfile</name>
+    <message>
+        <source>User Profile</source>
+        <translation>User Profile</translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <comment>first name of the logged-in profile - header</comment>
+        <translation>First Name</translation>
+    </message>
+    <message>
+        <source>Enter 1-64 characters</source>
+        <translation>Enter 1-64 characters</translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <comment>last name of the logged-in profile - header</comment>
+        <translation>Last Name</translation>
+    </message>
+    <message>
+        <source>Enter 0-64 characters</source>
+        <translation>Enter 0-64 characters</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <comment>user name of the logged-in profile - header</comment>
+        <translation>Username</translation>
     </message>
     <message>
         <source>Profile Pictures</source>
         <translation>Profile Pictures</translation>
     </message>
     <message>
-        <source>Delete Picture</source>
-        <translation>Delete Picture</translation>
+        <source>Add Picture</source>
+        <translation>Add Picture</translation>
     </message>
     <message>
-        <source>Uploading...</source>
-        <translation>Uploading...</translation>
+        <source>Delete Picture</source>
+        <translation>Delete Picture</translation>
     </message>
     <message>
         <source>Deleting profile picture</source>
         <translation>Deleting profile picture</translation>
     </message>
     <message>
-        <source>Enable notification sounds</source>
-        <translation>Enable notification sounds</translation>
-    </message>
-    <message>
-        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
-        <translation>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</translation>
-    </message>
-    <message>
-        <source>Delay before marking messages as read</source>
-        <translation>Delay before marking messages as read</translation>
-    </message>
-    <message>
-        <source>Fernschreiber will wait a bit before messages are marked as read</source>
-        <translation>Fernschreiber will wait a bit before messages are marked as read</translation>
-    </message>
-    <message>
-        <source>Focus the text input area when entering a chat</source>
-        <translation>Focus the text input area when entering a chat</translation>
-    </message>
-    <message>
-        <source>Focus text input on chat open</source>
-        <translation>Focus text input on chat open</translation>
-    </message>
-    <message>
-        <source>Show stickers as emojis</source>
-        <translation>Show stickers as emojis</translation>
-    </message>
-    <message>
-        <source>Only display emojis instead of the actual stickers</source>
-        <translation>Only display emojis instead of the actual stickers</translation>
+        <source>Uploading...</source>
+        <translation>Uploading...</translation>
     </message>
 </context>
 <context>

translations/harbour-fernschreiber-es.ts

@@ -1501,11 +1501,34 @@
     </message>
 </context>
 <context>
-    <name>SettingsPage</name>
+    <name>SettingsAppearance</name>
     <message>
-        <source>Settings</source>
-        <translation>Ajustes</translation>
+        <source>Appearance</source>
+        <translation>Apariencia</translation>
     </message>
+    <message>
+        <source>Show stickers as emojis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only display emojis instead of the actual stickers</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Show stickers as images</source>
+        <translation>Mostrar pegatinas como imágenes</translation>
+    </message>
+    <message>
+        <source>Show background for stickers and align them centrally like images</source>
+        <translation>Muestra un fondo para pegatinas y las alinea como imágenes</translation>
+    </message>
+    <message>
+        <source>Animate stickers</source>
+        <translation>Mostrar pegatinas animadas</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsBehavior</name>
     <message>
         <source>Behavior</source>
         <translation>Comportamiento</translation>
@@ -1519,21 +1542,45 @@
         <translation>Envía el mensajes pulsando la tecla Entrar</translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation>Apariencia</translation>
+        <source>Focus text input on chat open</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show stickers as images</source>
-        <translation>Mostrar pegatinas como imágenes</translation>
+        <source>Focus the text input area when entering a chat</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show background for stickers and align them centrally like images</source>
-        <translation>Muestra un fondo para pegatinas y las alinea como imágenes</translation>
+        <source>Focus text input area after send</source>
+        <translation>Enfocar área de entrada de texto</translation>
+    </message>
+    <message>
+        <source>Focus the text input area after sending a message</source>
+        <translation>Enfoca el área de entrada de texto después de enviar un mensaje</translation>
+    </message>
+    <message>
+        <source>Delay before marking messages as read</source>
+        <translation>Marcar mensajes como leídos</translation>
+    </message>
+    <message>
+        <source>Fernschreiber will wait a bit before messages are marked as read</source>
+        <translation>Si esta habilitado, la apl espera un segundo hasta que un mensaje que está en la pantalla se marque como leído. Si deshabilitas esta función, los mensajes se marcarán inmediatamente como leído una vez que esté en la pantalla sin desplazarse al mensaje</translation>
+    </message>
+    <message>
+        <source>Open-with menu integration</source>
+        <translation>Integrar la opción Abrir-con</translation>
+    </message>
+    <message>
+        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
+        <translation>Fernschreiber usa la opción abrir-con de Sailfish SO</translation>
     </message>
     <message>
         <source>Notification feedback</source>
         <translation>Notificar en</translation>
     </message>
+    <message>
+        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
+        <translation>Usa comentarios no gráficos (sonido, vibración) para las notificaciones</translation>
+    </message>
     <message>
         <source>All events</source>
         <translation>Eventos</translation>
@@ -1546,89 +1593,32 @@
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
-    <message>
-        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
-        <translation>Usa comentarios no gráficos (sonido, vibración) para las notificaciones</translation>
-    </message>
-    <message>
-        <source>Open-with menu integration</source>
-        <translation>Integrar la opción Abrir-con</translation>
-    </message>
-    <message>
-        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
-        <translation>Fernschreiber usa la opción abrir-con de Sailfish SO</translation>
-    </message>
-    <message>
-        <source>Animate stickers</source>
-        <translation>Mostrar pegatinas animadas</translation>
-    </message>
     <message>
         <source>Notification turns on the display</source>
         <translation>Mostrar notificación por pantalla</translation>
     </message>
     <message>
-        <source>Storage</source>
-        <translation>Almacenamiento</translation>
+        <source>Enable notification sounds</source>
+        <translation>Habilitar sonidos de notificación</translation>
     </message>
     <message>
-        <source>Enable storage optimizer</source>
-        <translation>Optimizador de almacenamiento</translation>
+        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
+        <translation>Cuando los sonidos están habilitados, Fernschreiber utilizará el sonido de notificación actual de Sailfish OS para los grupos, que se puede configurar en la configuración del sistema.</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPage</name>
     <message>
-        <source>Focus text input area after send</source>
-        <translation>Enfocar área de entrada de texto</translation>
-    </message>
-    <message>
-        <source>Focus the text input area after sending a message</source>
-        <translation>Enfoca el área de entrada de texto después de enviar un mensaje</translation>
-    </message>
-    <message>
-        <source>Enable online-only mode</source>
-        <translation>Modo solo en línea</translation>
-    </message>
-    <message>
-        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
-        <translation>Deshabilita el almacenamiento en caché sin conexión. Algunas funciones pueden estar limitadas o ausentes en este modo. Se requiere reiniciar Fernschreiber para su efecto.</translation>
+        <source>Settings</source>
+        <translation>Ajustes</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPrivacy</name>
     <message>
         <source>Privacy</source>
         <translation>Privacidad</translation>
     </message>
-    <message>
-        <source>Allow sending Location to inline bots</source>
-        <translation>Enviar ubicación a bots en línea</translation>
-    </message>
-    <message>
-        <source>Some inline bots request location data when using them</source>
-        <translation>Algunos bots en línea solicitan datos de ubicación cuando los usan</translation>
-    </message>
-    <message>
-        <source>User Profile</source>
-        <translation>Perfil de usuario</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <comment>first name of the logged-in profile - header</comment>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <source>Enter 1-64 characters</source>
-        <translation>Marcar caracteres 1-128 {1-64 ?}</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <comment>last name of the logged-in profile - header</comment>
-        <translation>Apellido</translation>
-    </message>
-    <message>
-        <source>Enter 0-64 characters</source>
-        <translation>Marcar caracteres 1-128 {0-64 ?}</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <comment>user name of the logged-in profile - header</comment>
-        <translation>Usuario </translation>
-    </message>
     <message>
         <source>Allow chat invites</source>
         <translation>Permitir invitaciones de grupo</translation>
@@ -1690,56 +1680,81 @@
         <translation>Configuración de privacidad para administrar si el estado en línea es visible.</translation>
     </message>
     <message>
-        <source>Add Picture</source>
-        <translation>Agregar imagen</translation>
+        <source>Allow sending Location to inline bots</source>
+        <translation>Enviar ubicación a bots en línea</translation>
+    </message>
+    <message>
+        <source>Some inline bots request location data when using them</source>
+        <translation>Algunos bots en línea solicitan datos de ubicación cuando los usan</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsStorage</name>
+    <message>
+        <source>Storage</source>
+        <translation>Almacenamiento</translation>
+    </message>
+    <message>
+        <source>Enable online-only mode</source>
+        <translation>Modo solo en línea</translation>
+    </message>
+    <message>
+        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
+        <translation>Deshabilita el almacenamiento en caché sin conexión. Algunas funciones pueden estar limitadas o ausentes en este modo. Se requiere reiniciar Fernschreiber para su efecto.</translation>
+    </message>
+    <message>
+        <source>Enable storage optimizer</source>
+        <translation>Optimizador de almacenamiento</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsUserProfile</name>
+    <message>
+        <source>User Profile</source>
+        <translation>Perfil de usuario</translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <comment>first name of the logged-in profile - header</comment>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <source>Enter 1-64 characters</source>
+        <translation>Marcar caracteres 1-128 {1-64 ?}</translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <comment>last name of the logged-in profile - header</comment>
+        <translation>Apellido</translation>
+    </message>
+    <message>
+        <source>Enter 0-64 characters</source>
+        <translation>Marcar caracteres 1-128 {0-64 ?}</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <comment>user name of the logged-in profile - header</comment>
+        <translation>Usuario</translation>
     </message>
     <message>
         <source>Profile Pictures</source>
         <translation>Perfil de imagen</translation>
     </message>
     <message>
-        <source>Delete Picture</source>
-        <translation>Borrar imagen</translation>
+        <source>Add Picture</source>
+        <translation>Agregar imagen</translation>
     </message>
     <message>
-        <source>Uploading...</source>
-        <translation>Subiendo...</translation>
+        <source>Delete Picture</source>
+        <translation>Borrar imagen</translation>
     </message>
     <message>
         <source>Deleting profile picture</source>
         <translation>Borrando la imagen de perfil</translation>
     </message>
     <message>
-        <source>Enable notification sounds</source>
-        <translation>Habilitar sonidos de notificación</translation>
-    </message>
-    <message>
-        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
-        <translation>Cuando los sonidos están habilitados, Fernschreiber utilizará el sonido de notificación actual de Sailfish OS para los grupos, que se puede configurar en la configuración del sistema. </translation>
-    </message>
-    <message>
-        <source>Delay before marking messages as read</source>
-        <translation>Marcar mensajes como leídos</translation>
-    </message>
-    <message>
-        <source>Fernschreiber will wait a bit before messages are marked as read</source>
-        <translation>Si esta habilitado, la apl espera un segundo hasta que un mensaje que está en la pantalla se marque como leído. Si deshabilitas esta función, los mensajes se marcarán inmediatamente como leído una vez que esté en la pantalla sin desplazarse al mensaje</translation>
-    </message>
-    <message>
-        <source>Focus the text input area when entering a chat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Focus text input on chat open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show stickers as emojis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Only display emojis instead of the actual stickers</source>
-        <translation type="unfinished"></translation>
+        <source>Uploading...</source>
+        <translation>Subiendo...</translation>
     </message>
 </context>
 <context>

translations/harbour-fernschreiber-fi.ts

@@ -1502,11 +1502,34 @@
     </message>
 </context>
 <context>
-    <name>SettingsPage</name>
+    <name>SettingsAppearance</name>
     <message>
-        <source>Settings</source>
-        <translation>Asetukset</translation>
+        <source>Appearance</source>
+        <translation>Ulkoasu</translation>
     </message>
+    <message>
+        <source>Show stickers as emojis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only display emojis instead of the actual stickers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show stickers as images</source>
+        <translation>Näytä tarrat kuvina</translation>
+    </message>
+    <message>
+        <source>Show background for stickers and align them centrally like images</source>
+        <translation>Näytä tarroissa tausta ja keskitä ne kuten kuvat</translation>
+    </message>
+    <message>
+        <source>Animate stickers</source>
+        <translation>Animoi tarrat</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsBehavior</name>
     <message>
         <source>Behavior</source>
         <translation>Toiminta</translation>
@@ -1520,21 +1543,45 @@
         <translation>Lähetä viestisi painamalla rivinvaihtonäppäintä (enter)</translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation>Ulkoasu</translation>
+        <source>Focus text input on chat open</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show stickers as images</source>
-        <translation>Näytä tarrat kuvina</translation>
+        <source>Focus the text input area when entering a chat</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show background for stickers and align them centrally like images</source>
-        <translation>Näytä tarroissa tausta ja keskitä ne kuten kuvat</translation>
+        <source>Focus text input area after send</source>
+        <translation>Kohdista tekstinsyöttökenttä lähetyksen jälkeen</translation>
+    </message>
+    <message>
+        <source>Focus the text input area after sending a message</source>
+        <translation>Kohdista tekstinsyöttökenttä viestin lähetyksen jälkeen</translation>
+    </message>
+    <message>
+        <source>Delay before marking messages as read</source>
+        <translation>Viive viestien merkitsemisessä luetuksi</translation>
+    </message>
+    <message>
+        <source>Fernschreiber will wait a bit before messages are marked as read</source>
+        <translation>Fernschreiber odottaa hetken ennen kuin viestit merkitään luetuiksi</translation>
+    </message>
+    <message>
+        <source>Open-with menu integration</source>
+        <translation>Avaa sovelluksessa ‑integraatio</translation>
+    </message>
+    <message>
+        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
+        <translation>Sisällytä Fernschreiber Sailfish OS:n avaa sovelluksella ‑valikkoon</translation>
     </message>
     <message>
         <source>Notification feedback</source>
         <translation>Ilmoitusten palaute</translation>
     </message>
+    <message>
+        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
+        <translation>Käytä ei-graafista palautetta (ääni, värinä) ilmoituksille</translation>
+    </message>
     <message>
         <source>All events</source>
         <translation>Kaikki tapahtumat</translation>
@@ -1547,89 +1594,32 @@
         <source>None</source>
         <translation>Ei mitään</translation>
     </message>
-    <message>
-        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
-        <translation>Käytä ei-graafista palautetta (ääni, värinä) ilmoituksille</translation>
-    </message>
-    <message>
-        <source>Open-with menu integration</source>
-        <translation>Avaa sovelluksessa ‑integraatio</translation>
-    </message>
-    <message>
-        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
-        <translation>Sisällytä Fernschreiber Sailfish OS:n avaa sovelluksella ‑valikkoon</translation>
-    </message>
-    <message>
-        <source>Animate stickers</source>
-        <translation>Animoi tarrat</translation>
-    </message>
     <message>
         <source>Notification turns on the display</source>
         <translation>Ilmoitus kytkee näytön päälle</translation>
     </message>
     <message>
-        <source>Storage</source>
-        <translation>Tallennustila</translation>
+        <source>Enable notification sounds</source>
+        <translation>Käytä äänimerkkejä</translation>
     </message>
     <message>
-        <source>Enable storage optimizer</source>
-        <translation>Käytä tallennustilan optimointia</translation>
+        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
+        <translation>Kun äänet ovat käytössä, Fernschreiber käyttää Sailfish OS:n ilmoitusääniä keskusteluille, jotia voit muuttaa järjestelmäasetuksista.</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPage</name>
     <message>
-        <source>Focus text input area after send</source>
-        <translation>Kohdista tekstinsyöttökenttä lähetyksen jälkeen</translation>
-    </message>
-    <message>
-        <source>Focus the text input area after sending a message</source>
-        <translation>Kohdista tekstinsyöttökenttä viestin lähetyksen jälkeen</translation>
-    </message>
-    <message>
-        <source>Enable online-only mode</source>
-        <translation>Älä käytä välimuistia</translation>
-    </message>
-    <message>
-        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
-        <translation>Estää tietojen tallennuksen välimuistiin. Jotkin sovelluksen ominaisuudet voivat olla rajoitettuja tai poistettu käytöstä tässä tilassa. Muutos vaatii Fernschreiberin uudelleenkäynnistyksen.</translation>
+        <source>Settings</source>
+        <translation>Asetukset</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPrivacy</name>
     <message>
         <source>Privacy</source>
         <translation>Yksityisyys</translation>
     </message>
-    <message>
-        <source>Allow sending Location to inline bots</source>
-        <translation>Salli sijainnin lähettäminen upotetuille boteille</translation>
-    </message>
-    <message>
-        <source>Some inline bots request location data when using them</source>
-        <translation>Jotkin viestinsyöttöriville upotetut botit pyytävät sijaintitietoja niitä käytettäessä</translation>
-    </message>
-    <message>
-        <source>User Profile</source>
-        <translation>Käyttäjäprofiili</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <comment>first name of the logged-in profile - header</comment>
-        <translation>Etunimi</translation>
-    </message>
-    <message>
-        <source>Enter 1-64 characters</source>
-        <translation>Syötä 1-64 merkkiä</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <comment>last name of the logged-in profile - header</comment>
-        <translation>Sukunimi</translation>
-    </message>
-    <message>
-        <source>Enter 0-64 characters</source>
-        <translation>Syötä 1-64 merkkiä</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <comment>user name of the logged-in profile - header</comment>
-        <translation>Käyttäjätunnus</translation>
-    </message>
     <message>
         <source>Allow chat invites</source>
         <translation>Salli keskustelukutsut</translation>
@@ -1688,59 +1678,84 @@
     </message>
     <message>
         <source>Privacy setting for managing whether your online status is visible.</source>
-        <translation>Yksityisyysasetus joka määrittää näytetäänkö muille käyttäjille kun olet online-tilassa</translation>
+        <translation>Yksityisyysasetus joka määrittää näytetäänkö muille käyttäjille kun olet online-tilassa.</translation>
     </message>
     <message>
-        <source>Add Picture</source>
-        <translation>Lisää kuva</translation>
+        <source>Allow sending Location to inline bots</source>
+        <translation>Salli sijainnin lähettäminen upotetuille boteille</translation>
+    </message>
+    <message>
+        <source>Some inline bots request location data when using them</source>
+        <translation>Jotkin viestinsyöttöriville upotetut botit pyytävät sijaintitietoja niitä käytettäessä</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsStorage</name>
+    <message>
+        <source>Storage</source>
+        <translation>Tallennustila</translation>
+    </message>
+    <message>
+        <source>Enable online-only mode</source>
+        <translation>Älä käytä välimuistia</translation>
+    </message>
+    <message>
+        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
+        <translation>Estää tietojen tallennuksen välimuistiin. Jotkin sovelluksen ominaisuudet voivat olla rajoitettuja tai poistettu käytöstä tässä tilassa. Muutos vaatii Fernschreiberin uudelleenkäynnistyksen.</translation>
+    </message>
+    <message>
+        <source>Enable storage optimizer</source>
+        <translation>Käytä tallennustilan optimointia</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsUserProfile</name>
+    <message>
+        <source>User Profile</source>
+        <translation>Käyttäjäprofiili</translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <comment>first name of the logged-in profile - header</comment>
+        <translation>Etunimi</translation>
+    </message>
+    <message>
+        <source>Enter 1-64 characters</source>
+        <translation>Syötä 1-64 merkkiä</translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <comment>last name of the logged-in profile - header</comment>
+        <translation>Sukunimi</translation>
+    </message>
+    <message>
+        <source>Enter 0-64 characters</source>
+        <translation>Syötä 1-64 merkkiä</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <comment>user name of the logged-in profile - header</comment>
+        <translation>Käyttäjätunnus</translation>
     </message>
     <message>
         <source>Profile Pictures</source>
         <translation>Profiilikuvat</translation>
     </message>
     <message>
-        <source>Delete Picture</source>
-        <translation>Poista kuva</translation>
+        <source>Add Picture</source>
+        <translation>Lisää kuva</translation>
     </message>
     <message>
-        <source>Uploading...</source>
-        <translation>Lähetetään...</translation>
+        <source>Delete Picture</source>
+        <translation>Poista kuva</translation>
     </message>
     <message>
         <source>Deleting profile picture</source>
         <translation>Poistetaan profiilikuvaa</translation>
     </message>
     <message>
-        <source>Enable notification sounds</source>
-        <translation>Käytä äänimerkkejä</translation>
-    </message>
-    <message>
-        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
-        <translation>Kun äänet ovat käytössä, Fernschreiber käyttää Sailfish OS:n ilmoitusääniä keskusteluille, jotia voit muuttaa järjestelmäasetuksista.</translation>
-    </message>
-    <message>
-        <source>Delay before marking messages as read</source>
-        <translation>Viive viestien merkitsemisessä luetuksi</translation>
-    </message>
-    <message>
-        <source>Fernschreiber will wait a bit before messages are marked as read</source>
-        <translation>Fernschreiber odottaa hetken ennen kuin viestit merkitään luetuiksi</translation>
-    </message>
-    <message>
-        <source>Focus the text input area when entering a chat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Focus text input on chat open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show stickers as emojis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Only display emojis instead of the actual stickers</source>
-        <translation type="unfinished"></translation>
+        <source>Uploading...</source>
+        <translation>Lähetetään...</translation>
     </message>
 </context>
 <context>

translations/harbour-fernschreiber-hu.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="hu_HU">
 <context>
     <name>AboutPage</name>
     <message>
@@ -1474,11 +1474,34 @@
     </message>
 </context>
 <context>
-    <name>SettingsPage</name>
+    <name>SettingsAppearance</name>
     <message>
-        <source>Settings</source>
-        <translation>Beállítások</translation>
+        <source>Appearance</source>
+        <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show stickers as emojis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only display emojis instead of the actual stickers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show stickers as images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show background for stickers and align them centrally like images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Animate stickers</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsBehavior</name>
     <message>
         <source>Behavior</source>
         <translation>Működés</translation>
@@ -1492,21 +1515,45 @@
         <translation>Üzenet küldése az enter gomb lenyomásával</translation>
     </message>
     <message>
-        <source>Appearance</source>
+        <source>Focus text input on chat open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show stickers as images</source>
+        <source>Focus the text input area when entering a chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show background for stickers and align them centrally like images</source>
+        <source>Focus text input area after send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Focus the text input area after sending a message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay before marking messages as read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fernschreiber will wait a bit before messages are marked as read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open-with menu integration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notification feedback</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>All events</source>
         <translation type="unfinished"></translation>
@@ -1519,89 +1566,32 @@
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open-with menu integration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Animate stickers</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Notification turns on the display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Storage</source>
+        <source>Enable notification sounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable storage optimizer</source>
+        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SettingsPage</name>
     <message>
-        <source>Focus text input area after send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Focus the text input area after sending a message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable online-only mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
-        <translation></translation>
+        <source>Settings</source>
+        <translation>Beállítások</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPrivacy</name>
     <message>
         <source>Privacy</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Allow sending Location to inline bots</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Some inline bots request location data when using them</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <comment>first name of the logged-in profile - header</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter 1-64 characters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <comment>last name of the logged-in profile - header</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter 0-64 characters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <comment>user name of the logged-in profile - header</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Allow chat invites</source>
         <translation type="unfinished"></translation>
@@ -1663,7 +1653,60 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Picture</source>
+        <source>Allow sending Location to inline bots</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Some inline bots request location data when using them</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsStorage</name>
+    <message>
+        <source>Storage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable online-only mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable storage optimizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsUserProfile</name>
+    <message>
+        <source>User Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <comment>first name of the logged-in profile - header</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter 1-64 characters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <comment>last name of the logged-in profile - header</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter 0-64 characters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <comment>user name of the logged-in profile - header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1671,11 +1714,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Picture</source>
+        <source>Add Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Uploading...</source>
+        <source>Delete Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1683,35 +1726,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable notification sounds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay before marking messages as read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fernschreiber will wait a bit before messages are marked as read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Focus the text input area when entering a chat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Focus text input on chat open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show stickers as emojis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Only display emojis instead of the actual stickers</source>
+        <source>Uploading...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/harbour-fernschreiber-it.ts

@@ -1501,11 +1501,34 @@
     </message>
 </context>
 <context>
-    <name>SettingsPage</name>
+    <name>SettingsAppearance</name>
     <message>
-        <source>Settings</source>
-        <translation>Impostazioni</translation>
+        <source>Appearance</source>
+        <translation>Aspetto</translation>
     </message>
+    <message>
+        <source>Show stickers as emojis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only display emojis instead of the actual stickers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show stickers as images</source>
+        <translation>Mostra sticker come immagini</translation>
+    </message>
+    <message>
+        <source>Show background for stickers and align them centrally like images</source>
+        <translation>Mostra sfondo per gli sticker e centrali come le immagini</translation>
+    </message>
+    <message>
+        <source>Animate stickers</source>
+        <translation>Riproduci sticker animati</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsBehavior</name>
     <message>
         <source>Behavior</source>
         <translation>Comportamento</translation>
@@ -1519,21 +1542,45 @@
         <translation>Invia il tuo messaggio con il tasto invio</translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation>Aspetto</translation>
+        <source>Focus text input on chat open</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show stickers as images</source>
-        <translation>Mostra sticker come immagini</translation>
+        <source>Focus the text input area when entering a chat</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show background for stickers and align them centrally like images</source>
-        <translation>Mostra sfondo per gli sticker e centrali come le immagini</translation>
+        <source>Focus text input area after send</source>
+        <translation>Tastiera in primo piano dopo invio</translation>
+    </message>
+    <message>
+        <source>Focus the text input area after sending a message</source>
+        <translation>Mantieni la tastiera in primo piano dopo aver inviato un messaggio</translation>
+    </message>
+    <message>
+        <source>Delay before marking messages as read</source>
+        <translation>Attendi prima di segnare i messaggi come già letti</translation>
+    </message>
+    <message>
+        <source>Fernschreiber will wait a bit before messages are marked as read</source>
+        <translation>Fernschreiber attende un attimo prima di segnare i messaggi come già letti</translation>
+    </message>
+    <message>
+        <source>Open-with menu integration</source>
+        <translation>Integrazione menù Apri con</translation>
+    </message>
+    <message>
+        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
+        <translation>Aggiungi Fernschreiber al menù Apri con di Sailfish OS</translation>
     </message>
     <message>
         <source>Notification feedback</source>
         <translation>Feedback notifiche</translation>
     </message>
+    <message>
+        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
+        <translation>Usa feedback non visuale come suoni e/o vibrazione per le notifiche</translation>
+    </message>
     <message>
         <source>All events</source>
         <translation>Tutti gli eventi</translation>
@@ -1546,42 +1593,107 @@
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
-    <message>
-        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
-        <translation>Usa feedback non visuale come suoni e/o vibrazione per le notifiche</translation>
-    </message>
-    <message>
-        <source>Open-with menu integration</source>
-        <translation>Integrazione menù Apri con</translation>
-    </message>
-    <message>
-        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
-        <translation>Aggiungi Fernschreiber al menù Apri con di Sailfish OS</translation>
-    </message>
-    <message>
-        <source>Animate stickers</source>
-        <translation>Riproduci sticker animati</translation>
-    </message>
     <message>
         <source>Notification turns on the display</source>
         <translation>Notifiche attivano il display</translation>
     </message>
+    <message>
+        <source>Enable notification sounds</source>
+        <translation>Abilita suoni notifiche</translation>
+    </message>
+    <message>
+        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
+        <translation>Quando i suoni di notifica sono attivi, Fernschreiber utilizza l&apos;attuale suono di notifica per i messaggi scelto per Sailfish OS, il quale può essere modificato dalle impostazioni di sistema.</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsPage</name>
+    <message>
+        <source>Settings</source>
+        <translation>Impostazioni</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsPrivacy</name>
+    <message>
+        <source>Privacy</source>
+        <translation>Privacy</translation>
+    </message>
+    <message>
+        <source>Allow chat invites</source>
+        <translation>Consenti inviti chat</translation>
+    </message>
+    <message>
+        <source>Privacy setting for managing whether you can be invited to chats.</source>
+        <translation>Impostazione per consentire di essere invitato in una chat.</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Si</translation>
+    </message>
+    <message>
+        <source>Your contacts only</source>
+        <translation>Solo tuoi contatti</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>No</translation>
+    </message>
+    <message>
+        <source>Allow finding by phone number</source>
+        <translation>Consenti ricerca con il tuo numero di telefono</translation>
+    </message>
+    <message>
+        <source>Privacy setting for managing whether you can be found by your phone number.</source>
+        <translation>Impostazione per consentire di essere trovato con il tuo numero di telefono.</translation>
+    </message>
+    <message>
+        <source>Show link in forwarded messages</source>
+        <translation>Mostra link nei messaggi inoltrati</translation>
+    </message>
+    <message>
+        <source>Privacy setting for managing whether a link to your account is included in forwarded messages.</source>
+        <translation>Impostazione per consentire di inserire un link al tuo account quando vengono inoltrati i tuoi messaggi.</translation>
+    </message>
+    <message>
+        <source>Show phone number</source>
+        <translation>Mostra il tuo numero</translation>
+    </message>
+    <message>
+        <source>Privacy setting for managing whether your phone number is visible.</source>
+        <translation>Indica chi può vedere il tuo numero di telefono.</translation>
+    </message>
+    <message>
+        <source>Show profile photo</source>
+        <translation>Mostra foto del profilo</translation>
+    </message>
+    <message>
+        <source>Privacy setting for managing whether your profile photo is visible.</source>
+        <translation>Impostazioni per gestire chi può vedere la tua foto del profilo.</translation>
+    </message>
+    <message>
+        <source>Show status</source>
+        <translation>Mostra stato</translation>
+    </message>
+    <message>
+        <source>Privacy setting for managing whether your online status is visible.</source>
+        <translation>Impostazioni per rendere visibile il tuo ultimo accesso con precisione.</translation>
+    </message>
+    <message>
+        <source>Allow sending Location to inline bots</source>
+        <translation>Consenti di inviare la posizione a inline bot</translation>
+    </message>
+    <message>
+        <source>Some inline bots request location data when using them</source>
+        <translation>Alcuni inline bot richiedono la tua posizione mentre li usi</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsStorage</name>
     <message>
         <source>Storage</source>
         <translation>Memoria</translation>
     </message>
-    <message>
-        <source>Enable storage optimizer</source>
-        <translation>Abilita ottimizzazione memoria</translation>
-    </message>
-    <message>
-        <source>Focus text input area after send</source>
-        <translation>Tastiera in primo piano dopo invio</translation>
-    </message>
-    <message>
-        <source>Focus the text input area after sending a message</source>
-        <translation>Mantieni la tastiera in primo piano dopo aver inviato un messaggio</translation>
-    </message>
     <message>
         <source>Enable online-only mode</source>
         <translation>Abilita modalità solo online</translation>
@@ -1591,17 +1703,12 @@
         <translation>Disabilita offline caching. Alcune funzionalità potrebbero non essere presenti in questa modalità. Riavvia Fernschreiber per rendere attive le modifiche.</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Privacy</translation>
-    </message>
-    <message>
-        <source>Allow sending Location to inline bots</source>
-        <translation>Consenti di inviare la posizione a inline bot</translation>
-    </message>
-    <message>
-        <source>Some inline bots request location data when using them</source>
-        <translation>Alcuni inline bot richiedono la tua posizione mentre li usi</translation>
+        <source>Enable storage optimizer</source>
+        <translation>Abilita ottimizzazione memoria</translation>
     </message>
+</context>
+<context>
+    <name>SettingsUserProfile</name>
     <message>
         <source>User Profile</source>
         <translation>Profilo utente</translation>
@@ -1630,116 +1737,24 @@
         <translation>Nome utente</translation>
     </message>
     <message>
-        <source>Allow chat invites</source>
-        <translation>Consenti inviti chat</translation>
-    </message>
-    <message>
-        <source>Privacy setting for managing whether you can be invited to chats.</source>
-        <translation>Impostazione per consentire di essere invitato in una chat</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Si</translation>
-    </message>
-    <message>
-        <source>Your contacts only</source>
-        <translation>Solo tuoi contatti</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>No</translation>
-    </message>
-    <message>
-        <source>Allow finding by phone number</source>
-        <translation>Consenti ricerca con il tuo numero di telefono</translation>
-    </message>
-    <message>
-        <source>Privacy setting for managing whether you can be found by your phone number.</source>
-        <translation>Impostazione per consentire di essere trovato con il tuo numero di telefono</translation>
-    </message>
-    <message>
-        <source>Show link in forwarded messages</source>
-        <translation>Mostra link nei messaggi inoltrati</translation>
-    </message>
-    <message>
-        <source>Privacy setting for managing whether a link to your account is included in forwarded messages.</source>
-        <translation>Impostazione per consentire di inserire un link al tuo account quando vengono inoltrati i tuoi messaggi</translation>
-    </message>
-    <message>
-        <source>Show phone number</source>
-        <translation>Mostra il tuo numero</translation>
-    </message>
-    <message>
-        <source>Privacy setting for managing whether your phone number is visible.</source>
-        <translation>Indica chi può vedere il tuo numero di telefono</translation>
-    </message>
-    <message>
-        <source>Show profile photo</source>
-        <translation>Mostra foto del profilo</translation>
-    </message>
-    <message>
-        <source>Privacy setting for managing whether your profile photo is visible.</source>
-        <translation>Impostazioni per gestire chi può vedere la tua foto del profilo</translation>
-    </message>
-    <message>
-        <source>Show status</source>
-        <translation>Mostra stato</translation>
-    </message>
-    <message>
-        <source>Privacy setting for managing whether your online status is visible.</source>
-        <translation>Impostazioni per rendere visibile il tuo ultimo accesso con precisione</translation>
+        <source>Profile Pictures</source>
+        <translation>Foto del profilo</translation>
     </message>
     <message>
         <source>Add Picture</source>
         <translation>Aggiungi foto</translation>
     </message>
-    <message>
-        <source>Profile Pictures</source>
-        <translation>Foto del profilo</translation>
-    </message>
     <message>
         <source>Delete Picture</source>
         <translation>Elimina foto</translation>
     </message>
-    <message>
-        <source>Uploading...</source>
-        <translation>Carica...</translation>
-    </message>
     <message>
         <source>Deleting profile picture</source>
         <translation>Elimina foto del profilo</translation>
     </message>
     <message>
-        <source>Enable notification sounds</source>
-        <translation>Abilita suoni notifiche</translation>
-    </message>
-    <message>
-        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
-        <translation>Quando i suoni di notifica sono attivi, Fernschreiber utilizza l&apos;attuale suono di notifica per i messaggi scelto per Sailfish OS, il quale può essere modificato dalle impostazioni di sistema.</translation>
-    </message>
-    <message>
-        <source>Delay before marking messages as read</source>
-        <translation>Attendi prima di segnare i messaggi come già letti</translation>
-    </message>
-    <message>
-        <source>Fernschreiber will wait a bit before messages are marked as read</source>
-        <translation>Fernschreiber attende un attimo prima di segnare i messaggi come già letti</translation>
-    </message>
-    <message>
-        <source>Focus the text input area when entering a chat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Focus text input on chat open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show stickers as emojis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Only display emojis instead of the actual stickers</source>
-        <translation type="unfinished"></translation>
+        <source>Uploading...</source>
+        <translation>Carica...</translation>
     </message>
 </context>
 <context>

translations/harbour-fernschreiber-pl.ts

@@ -1528,11 +1528,34 @@
     </message>
 </context>
 <context>
-    <name>SettingsPage</name>
+    <name>SettingsAppearance</name>
     <message>
-        <source>Settings</source>
-        <translation>Ustawienia</translation>
+        <source>Appearance</source>
+        <translation>Wygląd</translation>
     </message>
+    <message>
+        <source>Show stickers as emojis</source>
+        <translation>Pokaż naklejki jako emoji</translation>
+    </message>
+    <message>
+        <source>Only display emojis instead of the actual stickers</source>
+        <translation>Pokaż tylko emoji zamiast najklejek</translation>
+    </message>
+    <message>
+        <source>Show stickers as images</source>
+        <translation>Pokaż naklejki jako obrazy</translation>
+    </message>
+    <message>
+        <source>Show background for stickers and align them centrally like images</source>
+        <translation>Pokaż tło naklejek i wyrównaj je centralnie, jak obrazy</translation>
+    </message>
+    <message>
+        <source>Animate stickers</source>
+        <translation>Animowane naklejki</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsBehavior</name>
     <message>
         <source>Behavior</source>
         <translation>Zachowanie</translation>
@@ -1546,21 +1569,45 @@
         <translation>Wyślij wiadomość przez naciśniecie przycisku enter</translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation>Wygląd</translation>
+        <source>Focus text input on chat open</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show stickers as images</source>
-        <translation>Pokaż naklejki jako obrazy</translation>
+        <source>Focus the text input area when entering a chat</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show background for stickers and align them centrally like images</source>
-        <translation>Pokaż tło naklejek i wyrównaj je centralnie, jak obrazy</translation>
+        <source>Focus text input area after send</source>
+        <translation>Po wysłaniu zaznacz pole wprowadzania tekstu</translation>
+    </message>
+    <message>
+        <source>Focus the text input area after sending a message</source>
+        <translation>Po wysłaniu wiadomości zaznacz pole wprowadzania tekstu</translation>
+    </message>
+    <message>
+        <source>Delay before marking messages as read</source>
+        <translation>Opóźnienie przed oznaczeniem wiadomości jako przeczytanych</translation>
+    </message>
+    <message>
+        <source>Fernschreiber will wait a bit before messages are marked as read</source>
+        <translation>Fernschreiber odczeka chwilę, zanim wiadomości zostaną oznaczone jako przeczytane</translation>
+    </message>
+    <message>
+        <source>Open-with menu integration</source>
+        <translation>Integracja z menu &quot;otwórz za pomocą&quot;</translation>
+    </message>
+    <message>
+        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
+        <translation>Zintegruj Fernschreiber z menu &quot;otwórz za pomocą&quot; w SailfishOS</translation>
     </message>
     <message>
         <source>Notification feedback</source>
         <translation>Rodzaj powiadomienia</translation>
     </message>
+    <message>
+        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
+        <translation>Użyj niewizualnych powiadomień (dźwięk, wibracja)</translation>
+    </message>
     <message>
         <source>All events</source>
         <translation>Wszystkie wydarzenia</translation>
@@ -1573,89 +1620,32 @@
         <source>None</source>
         <translation>Żadne</translation>
     </message>
-    <message>
-        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
-        <translation>Użyj niewizualnych powiadomień (dźwięk, wibracja)</translation>
-    </message>
-    <message>
-        <source>Open-with menu integration</source>
-        <translation>Integracja z menu &quot;otwórz za pomocą&quot;</translation>
-    </message>
-    <message>
-        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
-        <translation>Zintegruj Fernschreiber z menu &quot;otwórz za pomocą&quot; w SailfishOS</translation>
-    </message>
-    <message>
-        <source>Animate stickers</source>
-        <translation>Animowane naklejki</translation>
-    </message>
     <message>
         <source>Notification turns on the display</source>
         <translation>Powiadomienie włącza wyświetlacz</translation>
     </message>
     <message>
-        <source>Storage</source>
-        <translation>Pamięć</translation>
+        <source>Enable notification sounds</source>
+        <translation>Włącz dźwięk powiadomień</translation>
     </message>
     <message>
-        <source>Enable storage optimizer</source>
-        <translation>Włącz optymalizację pamięci</translation>
+        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
+        <translation>Gdy dźwięki są włączone, Fernschreiber użyje bieżącego dźwięku powiadomienia Sailfish OS do czatów, które można skonfigurować w ustawieniach systemu.</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPage</name>
     <message>
-        <source>Focus text input area after send</source>
-        <translation>Po wysłaniu zaznacz pole wprowadzania tekstu</translation>
-    </message>
-    <message>
-        <source>Focus the text input area after sending a message</source>
-        <translation>Po wysłaniu wiadomości zaznacz pole wprowadzania tekstu</translation>
-    </message>
-    <message>
-        <source>Enable online-only mode</source>
-        <translation>Włącz tryb tylko online </translation>
-    </message>
-    <message>
-        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
-        <translation>Wyłącza buforowanie offline. W tym trybie niektóre funkcje mogą być ograniczone lub może ich brakować. Zmiany wymagają ponownego uruchomienia Fernschreibera, aby odniosły skutek. </translation>
+        <source>Settings</source>
+        <translation>Ustawienia</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPrivacy</name>
     <message>
         <source>Privacy</source>
         <translation>Prywatność</translation>
     </message>
-    <message>
-        <source>Allow sending Location to inline bots</source>
-        <translation>Zezwalaj na wysyłanie lokalizacji do wbudowanych botów</translation>
-    </message>
-    <message>
-        <source>Some inline bots request location data when using them</source>
-        <translation>Niektóre roboty wbudowane żądają danych o lokalizacji podczas ich używania </translation>
-    </message>
-    <message>
-        <source>User Profile</source>
-        <translation>Profil użytkownika</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <comment>first name of the logged-in profile - header</comment>
-        <translation>Imię</translation>
-    </message>
-    <message>
-        <source>Enter 1-64 characters</source>
-        <translation>Wprowadź znaki 1-64</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <comment>last name of the logged-in profile - header</comment>
-        <translation>Nazwisko</translation>
-    </message>
-    <message>
-        <source>Enter 0-64 characters</source>
-        <translation>Wprowadź znaki 0-64</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <comment>user name of the logged-in profile - header</comment>
-        <translation>Nazwa użytkownika</translation>
-    </message>
     <message>
         <source>Allow chat invites</source>
         <translation>Zezwól na zaproszenia do czatu</translation>
@@ -1690,7 +1680,7 @@
     </message>
     <message>
         <source>Privacy setting for managing whether a link to your account is included in forwarded messages.</source>
-        <translation>Ustawienie prywatności umożliwiające okreslenie, czy odnośnik do twojego konta jest dodawany do przekazanych wiadomości</translation>
+        <translation>Ustawienie prywatności umożliwiające okreslenie, czy odnośnik do twojego konta jest dodawany do przekazanych wiadomości.</translation>
     </message>
     <message>
         <source>Show phone number</source>
@@ -1717,56 +1707,81 @@
         <translation>Ustawienie prywatności umożliwiające zarządzanie widocznością statusu online.</translation>
     </message>
     <message>
-        <source>Add Picture</source>
-        <translation>Dodaj zdjęcie</translation>
+        <source>Allow sending Location to inline bots</source>
+        <translation>Zezwalaj na wysyłanie lokalizacji do wbudowanych botów</translation>
+    </message>
+    <message>
+        <source>Some inline bots request location data when using them</source>
+        <translation>Niektóre roboty wbudowane żądają danych o lokalizacji podczas ich używania</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsStorage</name>
+    <message>
+        <source>Storage</source>
+        <translation>Pamięć</translation>
+    </message>
+    <message>
+        <source>Enable online-only mode</source>
+        <translation>Włącz tryb tylko online</translation>
+    </message>
+    <message>
+        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
+        <translation>Wyłącza buforowanie offline. W tym trybie niektóre funkcje mogą być ograniczone lub może ich brakować. Zmiany wymagają ponownego uruchomienia Fernschreibera, aby odniosły skutek.</translation>
+    </message>
+    <message>
+        <source>Enable storage optimizer</source>
+        <translation>Włącz optymalizację pamięci</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsUserProfile</name>
+    <message>
+        <source>User Profile</source>
+        <translation>Profil użytkownika</translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <comment>first name of the logged-in profile - header</comment>
+        <translation>Imię</translation>
+    </message>
+    <message>
+        <source>Enter 1-64 characters</source>
+        <translation>Wprowadź znaki 1-64</translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <comment>last name of the logged-in profile - header</comment>
+        <translation>Nazwisko</translation>
+    </message>
+    <message>
+        <source>Enter 0-64 characters</source>
+        <translation>Wprowadź znaki 0-64</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <comment>user name of the logged-in profile - header</comment>
+        <translation>Nazwa użytkownika</translation>
     </message>
     <message>
         <source>Profile Pictures</source>
         <translation>Zdjęcia profilowe</translation>
     </message>
     <message>
-        <source>Delete Picture</source>
-        <translation>usuń zdjęcie</translation>
+        <source>Add Picture</source>
+        <translation>Dodaj zdjęcie</translation>
     </message>
     <message>
-        <source>Uploading...</source>
-        <translation>Przesyłanie...</translation>
+        <source>Delete Picture</source>
+        <translation>usuń zdjęcie</translation>
     </message>
     <message>
         <source>Deleting profile picture</source>
         <translation>Usuwanie zjęcia profilowego</translation>
     </message>
     <message>
-        <source>Enable notification sounds</source>
-        <translation>Włącz dźwięk powiadomień</translation>
-    </message>
-    <message>
-        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
-        <translation>Gdy dźwięki są włączone, Fernschreiber użyje bieżącego dźwięku powiadomienia Sailfish OS do czatów, które można skonfigurować w ustawieniach systemu. </translation>
-    </message>
-    <message>
-        <source>Delay before marking messages as read</source>
-        <translation>Opóźnienie przed oznaczeniem wiadomości jako przeczytanych </translation>
-    </message>
-    <message>
-        <source>Fernschreiber will wait a bit before messages are marked as read</source>
-        <translation>Fernschreiber odczeka chwilę, zanim wiadomości zostaną oznaczone jako przeczytane </translation>
-    </message>
-    <message>
-        <source>Focus the text input area when entering a chat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Focus text input on chat open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show stickers as emojis</source>
-        <translation>Pokaż naklejki jako emoji</translation>
-    </message>
-    <message>
-        <source>Only display emojis instead of the actual stickers</source>
-        <translation>Pokaż tylko emoji zamiast najklejek</translation>
+        <source>Uploading...</source>
+        <translation>Przesyłanie...</translation>
     </message>
 </context>
 <context>

translations/harbour-fernschreiber-ru.ts

@@ -1531,11 +1531,34 @@
     </message>
 </context>
 <context>
-    <name>SettingsPage</name>
+    <name>SettingsAppearance</name>
     <message>
-        <source>Settings</source>
-        <translation>Настройки</translation>
+        <source>Appearance</source>
+        <translation>Внешний вид</translation>
     </message>
+    <message>
+        <source>Show stickers as emojis</source>
+        <translation>Эмодзи вместо стикеров</translation>
+    </message>
+    <message>
+        <source>Only display emojis instead of the actual stickers</source>
+        <translation>Показывать только эмодзи при отображении актуальных стикеров</translation>
+    </message>
+    <message>
+        <source>Show stickers as images</source>
+        <translation>Показывать стикеры как обычные изображения</translation>
+    </message>
+    <message>
+        <source>Show background for stickers and align them centrally like images</source>
+        <translation>То есть рисовать под ними фон и позиционировать по центру.</translation>
+    </message>
+    <message>
+        <source>Animate stickers</source>
+        <translation>Анимировать стикеры</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsBehavior</name>
     <message>
         <source>Behavior</source>
         <translation>Поведение</translation>
@@ -1549,21 +1572,45 @@
         <translation>Тогда клавиша ввода на клавиатуре будет отправлять сообщение, а не переносить строку.</translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation>Внешний вид</translation>
+        <source>Focus text input on chat open</source>
+        <translation>При открытии чата фокусироваться на поле ввода текста</translation>
     </message>
     <message>
-        <source>Show stickers as images</source>
-        <translation>Показывать стикеры как обычные изображения</translation>
+        <source>Focus the text input area when entering a chat</source>
+        <translation>Приоритет фокусировки при открытии чата</translation>
     </message>
     <message>
-        <source>Show background for stickers and align them centrally like images</source>
-        <translation>То есть рисовать под ними фон и позиционировать по центру.</translation>
+        <source>Focus text input area after send</source>
+        <translation>Приоритет фокусировки при разговоре в чате</translation>
+    </message>
+    <message>
+        <source>Focus the text input area after sending a message</source>
+        <translation>Сфокусироваться на поле ввода текста после отправки сообщения</translation>
+    </message>
+    <message>
+        <source>Delay before marking messages as read</source>
+        <translation>Задержка перед отметкой о прочтении</translation>
+    </message>
+    <message>
+        <source>Fernschreiber will wait a bit before messages are marked as read</source>
+        <translation>Fernschreiber может отмечать сообщения как прочитанные с некоторой задержкой, а не сразу как только они показываются на экране.</translation>
+    </message>
+    <message>
+        <source>Open-with menu integration</source>
+        <translation>Меню &quot;открыть с помощью&quot;</translation>
+    </message>
+    <message>
+        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
+        <translation>Встроить Fernschreiber в системное меню &quot;открыть с помощью&quot;</translation>
     </message>
     <message>
         <source>Notification feedback</source>
         <translation>Уведомления</translation>
     </message>
+    <message>
+        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
+        <translation>Сопровождать уведомления звуками и вибрацией.</translation>
+    </message>
     <message>
         <source>All events</source>
         <translation>На каждое событие</translation>
@@ -1576,89 +1623,32 @@
         <source>None</source>
         <translation>Никогда</translation>
     </message>
-    <message>
-        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
-        <translation>Сопровождать уведомления звуками и вибрацией.</translation>
-    </message>
-    <message>
-        <source>Open-with menu integration</source>
-        <translation>Меню &quot;открыть с помощью&quot;</translation>
-    </message>
-    <message>
-        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
-        <translation>Встроить Fernschreiber в системное меню &quot;открыть с помощью&quot;</translation>
-    </message>
-    <message>
-        <source>Animate stickers</source>
-        <translation>Анимировать стикеры</translation>
-    </message>
     <message>
         <source>Notification turns on the display</source>
         <translation>Уведомления включают дисплей</translation>
     </message>
     <message>
-        <source>Storage</source>
-        <translation>Хранилище</translation>
+        <source>Enable notification sounds</source>
+        <translation>Уведомления издают звук</translation>
     </message>
     <message>
-        <source>Enable storage optimizer</source>
-        <translation>Включить оптимизацию хранилища</translation>
+        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
+        <translation>Если звуки разрешены, Fernschreiber использует звук, выбранный для чатов в настройках Sailfish OS.</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPage</name>
     <message>
-        <source>Focus text input area after send</source>
-        <translation>Приоритет фокусировки при разговоре в чате</translation>
-    </message>
-    <message>
-        <source>Focus the text input area after sending a message</source>
-        <translation>Сфокусироваться на поле ввода текста после отправки сообщения</translation>
-    </message>
-    <message>
-        <source>Enable online-only mode</source>
-        <translation>Включить режим &quot;только онлайн&quot;</translation>
-    </message>
-    <message>
-        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
-        <translation>В этом режиме не будет использоваться кэширование и некоторые функции могут быть ограничены или отсутствовать. Изменения вступят в силу после перезапуска Fernschreiber.</translation>
+        <source>Settings</source>
+        <translation>Настройки</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPrivacy</name>
     <message>
         <source>Privacy</source>
         <translation>Приватность</translation>
     </message>
-    <message>
-        <source>Allow sending Location to inline bots</source>
-        <translation>Отправлять мои координаты инлайн-ботам</translation>
-    </message>
-    <message>
-        <source>Some inline bots request location data when using them</source>
-        <translation>Некоторые инлайн-боты просят отправить свои координаты при обращении к ним</translation>
-    </message>
-    <message>
-        <source>User Profile</source>
-        <translation>Профиль</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <comment>first name of the logged-in profile - header</comment>
-        <translation>Имя</translation>
-    </message>
-    <message>
-        <source>Enter 1-64 characters</source>
-        <translation>Введите 1-64 символа</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <comment>last name of the logged-in profile - header</comment>
-        <translation>Фамилия</translation>
-    </message>
-    <message>
-        <source>Enter 0-64 characters</source>
-        <translation>Введите 0-64 символа</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <comment>user name of the logged-in profile - header</comment>
-        <translation>Ник</translation>
-    </message>
     <message>
         <source>Allow chat invites</source>
         <translation>Разрешить приглашения в чаты</translation>
@@ -1720,56 +1710,81 @@
         <translation>Виден ли мой статус другим пользователям.</translation>
     </message>
     <message>
-        <source>Add Picture</source>
-        <translation>Добавить</translation>
+        <source>Allow sending Location to inline bots</source>
+        <translation>Отправлять мои координаты инлайн-ботам</translation>
+    </message>
+    <message>
+        <source>Some inline bots request location data when using them</source>
+        <translation>Некоторые инлайн-боты просят отправить свои координаты при обращении к ним</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsStorage</name>
+    <message>
+        <source>Storage</source>
+        <translation>Хранилище</translation>
+    </message>
+    <message>
+        <source>Enable online-only mode</source>
+        <translation>Включить режим &quot;только онлайн&quot;</translation>
+    </message>
+    <message>
+        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
+        <translation>В этом режиме не будет использоваться кэширование и некоторые функции могут быть ограничены или отсутствовать. Изменения вступят в силу после перезапуска Fernschreiber.</translation>
+    </message>
+    <message>
+        <source>Enable storage optimizer</source>
+        <translation>Включить оптимизацию хранилища</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsUserProfile</name>
+    <message>
+        <source>User Profile</source>
+        <translation>Профиль</translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <comment>first name of the logged-in profile - header</comment>
+        <translation>Имя</translation>
+    </message>
+    <message>
+        <source>Enter 1-64 characters</source>
+        <translation>Введите 1-64 символа</translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <comment>last name of the logged-in profile - header</comment>
+        <translation>Фамилия</translation>
+    </message>
+    <message>
+        <source>Enter 0-64 characters</source>
+        <translation>Введите 0-64 символа</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <comment>user name of the logged-in profile - header</comment>
+        <translation>Ник</translation>
     </message>
     <message>
         <source>Profile Pictures</source>
         <translation>Картинки профиля</translation>
     </message>
     <message>
-        <source>Delete Picture</source>
-        <translation>Удалить</translation>
+        <source>Add Picture</source>
+        <translation>Добавить</translation>
     </message>
     <message>
-        <source>Uploading...</source>
-        <translation>Отправка...</translation>
+        <source>Delete Picture</source>
+        <translation>Удалить</translation>
     </message>
     <message>
         <source>Deleting profile picture</source>
         <translation>Удаление картинки из профиля</translation>
     </message>
     <message>
-        <source>Enable notification sounds</source>
-        <translation>Уведомления издают звук</translation>
-    </message>
-    <message>
-        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
-        <translation>Если звуки разрешены, Fernschreiber использует звук, выбранный для чатов в настройках Sailfish OS.</translation>
-    </message>
-    <message>
-        <source>Delay before marking messages as read</source>
-        <translation>Задержка перед отметкой о прочтении</translation>
-    </message>
-    <message>
-        <source>Fernschreiber will wait a bit before messages are marked as read</source>
-        <translation>Fernschreiber может отмечать сообщения как прочитанные с некоторой задержкой, а не сразу как только они показываются на экране.</translation>
-    </message>
-    <message>
-        <source>Focus the text input area when entering a chat</source>
-        <translation>Приоритет фокусировки при открытии чата</translation>
-    </message>
-    <message>
-        <source>Focus text input on chat open</source>
-        <translation>При открытии чата фокусироваться на поле ввода текста</translation>
-    </message>
-    <message>
-        <source>Show stickers as emojis</source>
-        <translation>Эмодзи вместо стикеров</translation>
-    </message>
-    <message>
-        <source>Only display emojis instead of the actual stickers</source>
-        <translation>Показывать только эмодзи при отображении актуальных стикеров</translation>
+        <source>Uploading...</source>
+        <translation>Отправка...</translation>
     </message>
 </context>
 <context>

translations/harbour-fernschreiber-sk.ts

@@ -1528,11 +1528,34 @@
     </message>
 </context>
 <context>
-    <name>SettingsPage</name>
+    <name>SettingsAppearance</name>
     <message>
-        <source>Settings</source>
-        <translation>Nastavenia</translation>
+        <source>Appearance</source>
+        <translation>Vzhľad</translation>
     </message>
+    <message>
+        <source>Show stickers as emojis</source>
+        <translation>Nálepky zobraziť ako emotikony</translation>
+    </message>
+    <message>
+        <source>Only display emojis instead of the actual stickers</source>
+        <translation>Namiesto nálepiek zobrazovať emotikony</translation>
+    </message>
+    <message>
+        <source>Show stickers as images</source>
+        <translation>Zobraziť nálepky ako obrázky</translation>
+    </message>
+    <message>
+        <source>Show background for stickers and align them centrally like images</source>
+        <translation>Zobraziť pozadie pre nálepky a vycentrovať ich ako obrázky</translation>
+    </message>
+    <message>
+        <source>Animate stickers</source>
+        <translation>Animované nálepky</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsBehavior</name>
     <message>
         <source>Behavior</source>
         <translation>Správanie</translation>
@@ -1546,21 +1569,45 @@
         <translation>Správu odošlite stlačením klávesu Enter</translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation>Vzhľad</translation>
+        <source>Focus text input on chat open</source>
+        <translation>Pri otvorení četu aktivovať vstupné pole</translation>
     </message>
     <message>
-        <source>Show stickers as images</source>
-        <translation>Zobraziť nálepky ako obrázky</translation>
+        <source>Focus the text input area when entering a chat</source>
+        <translation>Pri vstupe do četu aktivovať vstupné pole</translation>
     </message>
     <message>
-        <source>Show background for stickers and align them centrally like images</source>
-        <translation>Zobraziť pozadie pre nálepky a vycentrovať ich ako obrázky</translation>
+        <source>Focus text input area after send</source>
+        <translation>Po odoslaní aktivovať vkladanie textu</translation>
+    </message>
+    <message>
+        <source>Focus the text input area after sending a message</source>
+        <translation>Po odoslaní správy aktivovať vkladanie textu</translation>
+    </message>
+    <message>
+        <source>Delay before marking messages as read</source>
+        <translation>Oneskorenie pred označením správ ako prečítaných</translation>
+    </message>
+    <message>
+        <source>Fernschreiber will wait a bit before messages are marked as read</source>
+        <translation>Fernschreiber chvíľu počká, kým budú správy označené ako prečítané</translation>
+    </message>
+    <message>
+        <source>Open-with menu integration</source>
+        <translation>Zaradiť do ponuky &quot;otvoriť pomocou&quot;</translation>
+    </message>
+    <message>
+        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
+        <translation>Fernschreiber zaradiť do ponuky Sailfish OS &quot;otvoriť pomocou&quot;</translation>
     </message>
     <message>
         <source>Notification feedback</source>
         <translation>Reakcia oznámenia</translation>
     </message>
+    <message>
+        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
+        <translation>Pre upozornenia použiť negrafickú reakciu (zvuk, vibrovanie)</translation>
+    </message>
     <message>
         <source>All events</source>
         <translation>Všetky udalosti</translation>
@@ -1573,109 +1620,32 @@
         <source>None</source>
         <translation>Žiadne</translation>
     </message>
-    <message>
-        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
-        <translation>Pre upozornenia použiť negrafickú reakciu (zvuk, vibrovanie)</translation>
-    </message>
-    <message>
-        <source>Open-with menu integration</source>
-        <translation>Zaradiť do ponuky &quot;otvoriť pomocou&quot;</translation>
-    </message>
-    <message>
-        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
-        <translation>Fernschreiber zaradiť do ponuky Sailfish OS &quot;otvoriť pomocou&quot;</translation>
-    </message>
-    <message>
-        <source>Animate stickers</source>
-        <translation>Animované nálepky</translation>
-    </message>
     <message>
         <source>Notification turns on the display</source>
         <translation>Oznámenie zapne displej</translation>
     </message>
     <message>
-        <source>Storage</source>
-        <translation>Pamäť</translation>
+        <source>Enable notification sounds</source>
+        <translation>Povoliť zvukové upozornenia</translation>
     </message>
     <message>
-        <source>Enable storage optimizer</source>
-        <translation>Povoliť optimalizátor pamäte</translation>
+        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
+        <translation>Keď sú povolené zvukové upozornenia, Fernschreiber použije aktuálne zvukové upozornenia Sailfish OS pre čety, ktoré môžu byť upravené v nastaveniach systému.</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPage</name>
     <message>
-        <source>Focus text input area after send</source>
-        <translation>Po odoslaní aktivovať vkladanie textu</translation>
-    </message>
-    <message>
-        <source>Focus the text input area after sending a message</source>
-        <translation>Po odoslaní správy aktivovať vkladanie textu</translation>
-    </message>
-    <message>
-        <source>Enable online-only mode</source>
-        <translation>Povoliť režim &quot;iba pripojený&quot;</translation>
-    </message>
-    <message>
-        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
-        <translation>Zakázať ukladanie do off-line vyrovnávacej pamäte. Niektoré funkcie môžu byť v tomto režime obmedzené alebo môžu chýbať. Zmeny sa prejavia až po reštartovaní Fernschreiber.</translation>
+        <source>Settings</source>
+        <translation>Nastavenia</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPrivacy</name>
     <message>
         <source>Privacy</source>
         <translation>Ochrana osobných údajov</translation>
     </message>
-    <message>
-        <source>Allow sending Location to inline bots</source>
-        <translation>Povoliť odosielanie polohy inline robotom</translation>
-    </message>
-    <message>
-        <source>Some inline bots request location data when using them</source>
-        <translation>Niektorí inline roboti požadujú údaje o polohe ak ich používajú</translation>
-    </message>
-    <message>
-        <source>User Profile</source>
-        <translation>Profil používateľa</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <comment>first name of the logged-in profile - header</comment>
-        <translation>Meno</translation>
-    </message>
-    <message>
-        <source>Enter 1-64 characters</source>
-        <translation>Zadať 1-64 znakov</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <comment>last name of the logged-in profile - header</comment>
-        <translation>Priezvisko</translation>
-    </message>
-    <message>
-        <source>Enter 0-64 characters</source>
-        <translation>Zadať 0-64 znakov</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <comment>user name of the logged-in profile - header</comment>
-        <translation>Prihlasovacie meno</translation>
-    </message>
-    <message>
-        <source>Profile Pictures</source>
-        <translation>Profilová fotografia</translation>
-    </message>
-    <message>
-        <source>Add Picture</source>
-        <translation>Pridať fotografiu</translation>
-    </message>
-    <message>
-        <source>Delete Picture</source>
-        <translation>Odstrániť fotografiu</translation>
-    </message>
-    <message>
-        <source>Deleting profile picture</source>
-        <translation>Odstraňovanie profilovej fotografie</translation>
-    </message>
-    <message>
-        <source>Uploading...</source>
-        <translation>Zapisovanie...</translation>
-    </message>
     <message>
         <source>Allow chat invites</source>
         <translation>Povoliť pozvánky do četu</translation>
@@ -1737,36 +1707,81 @@
         <translation>Nastavenie ochrany súkromia pre možnosť zobrazenia Vášho statusu pripojenia.</translation>
     </message>
     <message>
-        <source>Enable notification sounds</source>
-        <translation>Povoliť zvukové upozornenia</translation>
+        <source>Allow sending Location to inline bots</source>
+        <translation>Povoliť odosielanie polohy inline robotom</translation>
     </message>
     <message>
-        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
-        <translation>Keď sú povolené zvukové upozornenia, Fernschreiber použije aktuálne zvukové upozornenia Sailfish OS pre čety, ktoré môžu byť upravené v nastaveniach systému.</translation>
+        <source>Some inline bots request location data when using them</source>
+        <translation>Niektorí inline roboti požadujú údaje o polohe ak ich používajú</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsStorage</name>
+    <message>
+        <source>Storage</source>
+        <translation>Pamäť</translation>
     </message>
     <message>
-        <source>Delay before marking messages as read</source>
-        <translation>Oneskorenie pred označením správ ako prečítaných</translation>
+        <source>Enable online-only mode</source>
+        <translation>Povoliť režim &quot;iba pripojený&quot;</translation>
     </message>
     <message>
-        <source>Fernschreiber will wait a bit before messages are marked as read</source>
-        <translation>Fernschreiber chvíľu počká, kým budú správy označené ako prečítané</translation>
+        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
+        <translation>Zakázať ukladanie do off-line vyrovnávacej pamäte. Niektoré funkcie môžu byť v tomto režime obmedzené alebo môžu chýbať. Zmeny sa prejavia až po reštartovaní Fernschreiber.</translation>
     </message>
     <message>
-        <source>Focus the text input area when entering a chat</source>
-        <translation>Pri vstupe do četu aktivovať vstupné pole</translation>
+        <source>Enable storage optimizer</source>
+        <translation>Povoliť optimalizátor pamäte</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsUserProfile</name>
+    <message>
+        <source>User Profile</source>
+        <translation>Profil používateľa</translation>
     </message>
     <message>
-        <source>Focus text input on chat open</source>
-        <translation>Pri otvorení četu aktivovať vstupné pole</translation>
+        <source>First Name</source>
+        <comment>first name of the logged-in profile - header</comment>
+        <translation>Meno</translation>
     </message>
     <message>
-        <source>Show stickers as emojis</source>
-        <translation>Nálepky zobraziť ako emotikony</translation>
+        <source>Enter 1-64 characters</source>
+        <translation>Zadať 1-64 znakov</translation>
     </message>
     <message>
-        <source>Only display emojis instead of the actual stickers</source>
-        <translation>Namiesto nálepiek zobrazovať emotikony</translation>
+        <source>Last Name</source>
+        <comment>last name of the logged-in profile - header</comment>
+        <translation>Priezvisko</translation>
+    </message>
+    <message>
+        <source>Enter 0-64 characters</source>
+        <translation>Zadať 0-64 znakov</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <comment>user name of the logged-in profile - header</comment>
+        <translation>Prihlasovacie meno</translation>
+    </message>
+    <message>
+        <source>Profile Pictures</source>
+        <translation>Profilová fotografia</translation>
+    </message>
+    <message>
+        <source>Add Picture</source>
+        <translation>Pridať fotografiu</translation>
+    </message>
+    <message>
+        <source>Delete Picture</source>
+        <translation>Odstrániť fotografiu</translation>
+    </message>
+    <message>
+        <source>Deleting profile picture</source>
+        <translation>Odstraňovanie profilovej fotografie</translation>
+    </message>
+    <message>
+        <source>Uploading...</source>
+        <translation>Zapisovanie...</translation>
     </message>
 </context>
 <context>

translations/harbour-fernschreiber-sv.ts

@@ -1501,11 +1501,34 @@
     </message>
 </context>
 <context>
-    <name>SettingsPage</name>
+    <name>SettingsAppearance</name>
     <message>
-        <source>Settings</source>
-        <translation>Inställningar</translation>
+        <source>Appearance</source>
+        <translation>Utseende</translation>
     </message>
+    <message>
+        <source>Show stickers as emojis</source>
+        <translation>Visa dekaler som emoji</translation>
+    </message>
+    <message>
+        <source>Only display emojis instead of the actual stickers</source>
+        <translation>Visa bara emoji istället för de faktiska dekalerna</translation>
+    </message>
+    <message>
+        <source>Show stickers as images</source>
+        <translation>Visa dekaler som bilder</translation>
+    </message>
+    <message>
+        <source>Show background for stickers and align them centrally like images</source>
+        <translation>Visa bakgrund för dekaler och justera dem centralt som bilder</translation>
+    </message>
+    <message>
+        <source>Animate stickers</source>
+        <translation>Animera dekaler</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsBehavior</name>
     <message>
         <source>Behavior</source>
         <translation>Beteende</translation>
@@ -1519,21 +1542,45 @@
         <translation>Skicka meddelanden genom att trycka på returtangenten</translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation>Utseende</translation>
+        <source>Focus text input on chat open</source>
+        <translation>Fokusera textinmatningen vid chatt-öppning</translation>
     </message>
     <message>
-        <source>Show stickers as images</source>
-        <translation>Visa dekaler som bilder</translation>
+        <source>Focus the text input area when entering a chat</source>
+        <translation>Fokusera textinmatningsområdet vid anslutning till en chatt</translation>
     </message>
     <message>
-        <source>Show background for stickers and align them centrally like images</source>
-        <translation>Visa bakgrund för dekaler och justera dem centralt som bilder</translation>
+        <source>Focus text input area after send</source>
+        <translation>Fokusera textinmatningsfältet efter sändning</translation>
+    </message>
+    <message>
+        <source>Focus the text input area after sending a message</source>
+        <translation>Fokusera textinmatningsfältet efter att ett meddelande skickats</translation>
+    </message>
+    <message>
+        <source>Delay before marking messages as read</source>
+        <translation>Fördröjning innan meddelanden markeras som lästa</translation>
+    </message>
+    <message>
+        <source>Fernschreiber will wait a bit before messages are marked as read</source>
+        <translation>Fernschreiber väntar en stund innan meddelanden markeras som lästa</translation>
+    </message>
+    <message>
+        <source>Open-with menu integration</source>
+        <translation>Integrering av menyn &quot;Öppna med&quot;</translation>
+    </message>
+    <message>
+        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
+        <translation>Integrera Fernschreiber med menyn &quot;Öppna med&quot;, i Sailfish OS</translation>
     </message>
     <message>
         <source>Notification feedback</source>
         <translation>Aviseringsåterkoppling</translation>
     </message>
+    <message>
+        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
+        <translation>Använd icke-grafisk återkoppling (ljud, vibration) för avisering</translation>
+    </message>
     <message>
         <source>All events</source>
         <translation>Alla händelser</translation>
@@ -1546,89 +1593,32 @@
         <source>None</source>
         <translation>Inget</translation>
     </message>
-    <message>
-        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
-        <translation>Använd icke-grafisk återkoppling (ljud, vibration) för avisering</translation>
-    </message>
-    <message>
-        <source>Open-with menu integration</source>
-        <translation>Integrering av menyn &quot;Öppna med&quot;</translation>
-    </message>
-    <message>
-        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
-        <translation>Integrera Fernschreiber med menyn &quot;Öppna med&quot;, i Sailfish OS</translation>
-    </message>
-    <message>
-        <source>Animate stickers</source>
-        <translation>Animera dekaler</translation>
-    </message>
     <message>
         <source>Notification turns on the display</source>
         <translation>Avisering tänder skärmen</translation>
     </message>
     <message>
-        <source>Storage</source>
-        <translation>Lagring</translation>
+        <source>Enable notification sounds</source>
+        <translation>Aktivera aviseringsljud</translation>
     </message>
     <message>
-        <source>Enable storage optimizer</source>
-        <translation>Aktivera lagringsoptimering</translation>
+        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
+        <translation>När ljud är aktiverat, använder Fernschreiber aktuell Sailfish-signal för chatt-avisering, vilken kan ställas in i systemets ljudinställningar.</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPage</name>
     <message>
-        <source>Focus text input area after send</source>
-        <translation>Fokusera textinmatningsfältet efter sändning</translation>
-    </message>
-    <message>
-        <source>Focus the text input area after sending a message</source>
-        <translation>Fokusera textinmatningsfältet efter att ett meddelande skickats</translation>
-    </message>
-    <message>
-        <source>Enable online-only mode</source>
-        <translation>Aktivera endast-online-läge</translation>
-    </message>
-    <message>
-        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
-        <translation>Inaktiverar cachelagring offline. Vissa funktioner kan vara begränsade eller saknas helt i det här läget. Ändringar kräver omstart av Fernschreiber för att träda i kraft.</translation>
+        <source>Settings</source>
+        <translation>Inställningar</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPrivacy</name>
     <message>
         <source>Privacy</source>
         <translation>Sekretess</translation>
     </message>
-    <message>
-        <source>Allow sending Location to inline bots</source>
-        <translation>Tillåt att skicka plats till infogade robotar</translation>
-    </message>
-    <message>
-        <source>Some inline bots request location data when using them</source>
-        <translation>Vissa infogade robotar begär platsdata när de används</translation>
-    </message>
-    <message>
-        <source>User Profile</source>
-        <translation>Användarprofil</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <comment>first name of the logged-in profile - header</comment>
-        <translation>Förnamn</translation>
-    </message>
-    <message>
-        <source>Enter 1-64 characters</source>
-        <translation>Ange 1-64 tecken</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <comment>last name of the logged-in profile - header</comment>
-        <translation>Efternamn</translation>
-    </message>
-    <message>
-        <source>Enter 0-64 characters</source>
-        <translation>Ange 1-64 tecken</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <comment>user name of the logged-in profile - header</comment>
-        <translation>Användarnamn</translation>
-    </message>
     <message>
         <source>Allow chat invites</source>
         <translation>Tillåt chattinbjudningar</translation>
@@ -1690,56 +1680,81 @@
         <translation>Sekretessinställning för att hantera om din online-status är synlig.</translation>
     </message>
     <message>
-        <source>Add Picture</source>
-        <translation>Lägg till bild</translation>
+        <source>Allow sending Location to inline bots</source>
+        <translation>Tillåt att skicka plats till infogade robotar</translation>
+    </message>
+    <message>
+        <source>Some inline bots request location data when using them</source>
+        <translation>Vissa infogade robotar begär platsdata när de används</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsStorage</name>
+    <message>
+        <source>Storage</source>
+        <translation>Lagring</translation>
+    </message>
+    <message>
+        <source>Enable online-only mode</source>
+        <translation>Aktivera endast-online-läge</translation>
+    </message>
+    <message>
+        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
+        <translation>Inaktiverar cachelagring offline. Vissa funktioner kan vara begränsade eller saknas helt i det här läget. Ändringar kräver omstart av Fernschreiber för att träda i kraft.</translation>
+    </message>
+    <message>
+        <source>Enable storage optimizer</source>
+        <translation>Aktivera lagringsoptimering</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsUserProfile</name>
+    <message>
+        <source>User Profile</source>
+        <translation>Användarprofil</translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <comment>first name of the logged-in profile - header</comment>
+        <translation>Förnamn</translation>
+    </message>
+    <message>
+        <source>Enter 1-64 characters</source>
+        <translation>Ange 1-64 tecken</translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <comment>last name of the logged-in profile - header</comment>
+        <translation>Efternamn</translation>
+    </message>
+    <message>
+        <source>Enter 0-64 characters</source>
+        <translation>Ange 1-64 tecken</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <comment>user name of the logged-in profile - header</comment>
+        <translation>Användarnamn</translation>
     </message>
     <message>
         <source>Profile Pictures</source>
         <translation>Profilbilder</translation>
     </message>
     <message>
-        <source>Delete Picture</source>
-        <translation>Ta bort bild</translation>
+        <source>Add Picture</source>
+        <translation>Lägg till bild</translation>
     </message>
     <message>
-        <source>Uploading...</source>
-        <translation>Laddar upp...</translation>
+        <source>Delete Picture</source>
+        <translation>Ta bort bild</translation>
     </message>
     <message>
         <source>Deleting profile picture</source>
         <translation>Tar bort profilbild</translation>
     </message>
     <message>
-        <source>Enable notification sounds</source>
-        <translation>Aktivera aviseringsljud</translation>
-    </message>
-    <message>
-        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
-        <translation>När ljud är aktiverat, använder Fernschreiber aktuell Sailfish-signal för chatt-avisering, vilken kan ställas in i systemets ljudinställningar.</translation>
-    </message>
-    <message>
-        <source>Delay before marking messages as read</source>
-        <translation>Fördröjning innan meddelanden markeras som lästa</translation>
-    </message>
-    <message>
-        <source>Fernschreiber will wait a bit before messages are marked as read</source>
-        <translation>Fernschreiber väntar en stund innan meddelanden markeras som lästa</translation>
-    </message>
-    <message>
-        <source>Focus the text input area when entering a chat</source>
-        <translation>Fokusera textinmatningsområdet vid anslutning till en chatt</translation>
-    </message>
-    <message>
-        <source>Focus text input on chat open</source>
-        <translation>Fokusera textinmatningen vid chatt-öppning</translation>
-    </message>
-    <message>
-        <source>Show stickers as emojis</source>
-        <translation>Visa dekaler som emoji</translation>
-    </message>
-    <message>
-        <source>Only display emojis instead of the actual stickers</source>
-        <translation>Visa bara emoji istället för de faktiska dekalerna</translation>
+        <source>Uploading...</source>
+        <translation>Ladda upp...</translation>
     </message>
 </context>
 <context>

translations/harbour-fernschreiber-zh_CN.ts

@@ -97,11 +97,11 @@
     </message>
     <message>
         <source>This project uses OpenStreetMap Nominatim for reverse geocoding of location attachments. Thanks for making it available as web service!</source>
-        <translation type="unfinished"></translation>
+        <translation>该项目使用 OpenStreetMap Nominatim 对位置附件进行反向地理编码。感谢把它作为网络服务提供给我们！</translation>
     </message>
     <message>
         <source>Open OSM Nominatim Wiki</source>
-        <translation type="unfinished"></translation>
+        <translation>打开 OSM Nominatim Wiki</translation>
     </message>
 </context>
 <context>
@@ -506,11 +506,11 @@
     </message>
     <message>
         <source>Unknown address</source>
-        <translation type="unfinished"></translation>
+        <translation>未知位置</translation>
     </message>
     <message>
         <source>Accuracy: %1m</source>
-        <translation type="unfinished"></translation>
+        <translation>精度: %1m</translation>
     </message>
 </context>
 <context>
@@ -1475,11 +1475,34 @@
     </message>
 </context>
 <context>
-    <name>SettingsPage</name>
+    <name>SettingsAppearance</name>
     <message>
-        <source>Settings</source>
-        <translation>设置</translation>
+        <source>Appearance</source>
+        <translation>外观</translation>
     </message>
+    <message>
+        <source>Show stickers as emojis</source>
+        <translation>显示表情贴图为 emoji</translation>
+    </message>
+    <message>
+        <source>Only display emojis instead of the actual stickers</source>
+        <translation>仅显示 emoji 而非实际的表情贴图</translation>
+    </message>
+    <message>
+        <source>Show stickers as images</source>
+        <translation>以图片形式显示表情贴图</translation>
+    </message>
+    <message>
+        <source>Show background for stickers and align them centrally like images</source>
+        <translation>显示表情贴图背景并以图片形式自动居中</translation>
+    </message>
+    <message>
+        <source>Animate stickers</source>
+        <translation>动态表情贴图</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsBehavior</name>
     <message>
         <source>Behavior</source>
         <translation>状态</translation>
@@ -1493,21 +1516,45 @@
         <translation>通过按下回车键发送消息</translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation>外观</translation>
+        <source>Focus text input on chat open</source>
+        <translation>开启对话时聚焦文本输入区域</translation>
     </message>
     <message>
-        <source>Show stickers as images</source>
-        <translation>以图片形式显示表情贴图</translation>
+        <source>Focus the text input area when entering a chat</source>
+        <translation>进入对话时聚焦文本输入区域</translation>
     </message>
     <message>
-        <source>Show background for stickers and align them centrally like images</source>
-        <translation>显示表情贴图背景并以图片形式自动居中</translation>
+        <source>Focus text input area after send</source>
+        <translation>发送后聚焦文本输入区域</translation>
+    </message>
+    <message>
+        <source>Focus the text input area after sending a message</source>
+        <translation>发送消息后聚焦文本输入区域</translation>
+    </message>
+    <message>
+        <source>Delay before marking messages as read</source>
+        <translation>标记消息已读前延迟</translation>
+    </message>
+    <message>
+        <source>Fernschreiber will wait a bit before messages are marked as read</source>
+        <translation>Fernschreiber 将会在标记消息已读之前延迟一下</translation>
+    </message>
+    <message>
+        <source>Open-with menu integration</source>
+        <translation>整合打开方式菜单</translation>
+    </message>
+    <message>
+        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
+        <translation>整合 Fernschreiber 到旗鱼系统打开方式菜单</translation>
     </message>
     <message>
         <source>Notification feedback</source>
         <translation>通知反馈</translation>
     </message>
+    <message>
+        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
+        <translation>使用非图像反馈方式通知消息（例如声音及振动）</translation>
+    </message>
     <message>
         <source>All events</source>
         <translation>全部事件</translation>
@@ -1520,89 +1567,32 @@
         <source>None</source>
         <translation>无</translation>
     </message>
-    <message>
-        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
-        <translation>使用非图像反馈方式通知消息（例如声音及振动）</translation>
-    </message>
-    <message>
-        <source>Open-with menu integration</source>
-        <translation>整合打开方式菜单</translation>
-    </message>
-    <message>
-        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
-        <translation>整合 Fernschreiber 到旗鱼系统打开方式菜单</translation>
-    </message>
-    <message>
-        <source>Animate stickers</source>
-        <translation>动态表情贴图</translation>
-    </message>
     <message>
         <source>Notification turns on the display</source>
         <translation>收到通知时点亮屏幕</translation>
     </message>
     <message>
-        <source>Storage</source>
-        <translation>储存</translation>
+        <source>Enable notification sounds</source>
+        <translation>开启通知声音</translation>
     </message>
     <message>
-        <source>Enable storage optimizer</source>
-        <translation>开启储存加速器</translation>
+        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
+        <translation>如果开启声音，Fernschreiber 会采用当前旗鱼系统通知声音作为对话通知声音，你可以在系统设置进行配置。</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPage</name>
     <message>
-        <source>Focus text input area after send</source>
-        <translation>发送后聚焦文本输入区域</translation>
-    </message>
-    <message>
-        <source>Focus the text input area after sending a message</source>
-        <translation>发送消息后聚焦文本输入区域</translation>
-    </message>
-    <message>
-        <source>Enable online-only mode</source>
-        <translation>开启仅在线模式</translation>
-    </message>
-    <message>
-        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
-        <translation>禁用离线缓存。某些特定功能会在此模式中受限或消失。切换模式需要重启 fernschreiber 才能生效。</translation>
+        <source>Settings</source>
+        <translation>设置</translation>
     </message>
+</context>
+<context>
+    <name>SettingsPrivacy</name>
     <message>
         <source>Privacy</source>
         <translation>隐私</translation>
     </message>
-    <message>
-        <source>Allow sending Location to inline bots</source>
-        <translation>允许发送位置到内联机器人</translation>
-    </message>
-    <message>
-        <source>Some inline bots request location data when using them</source>
-        <translation>使用某些内联机器人时会请求位置数据</translation>
-    </message>
-    <message>
-        <source>User Profile</source>
-        <translation>用户简介</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <comment>first name of the logged-in profile - header</comment>
-        <translation>名字</translation>
-    </message>
-    <message>
-        <source>Enter 1-64 characters</source>
-        <translation>输入 1-64 个字符</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <comment>last name of the logged-in profile - header</comment>
-        <translation>姓氏</translation>
-    </message>
-    <message>
-        <source>Enter 0-64 characters</source>
-        <translation>输入 0-64 个字符</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <comment>user name of the logged-in profile - header</comment>
-        <translation>用户名</translation>
-    </message>
     <message>
         <source>Allow chat invites</source>
         <translation>允许对话邀请</translation>
@@ -1664,56 +1654,81 @@
         <translation>隐私设置，用于管理是否你的在线状态可见。</translation>
     </message>
     <message>
-        <source>Add Picture</source>
-        <translation>添加图片</translation>
+        <source>Allow sending Location to inline bots</source>
+        <translation>允许发送位置到内联机器人</translation>
+    </message>
+    <message>
+        <source>Some inline bots request location data when using them</source>
+        <translation>使用某些内联机器人时会请求位置数据</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsStorage</name>
+    <message>
+        <source>Storage</source>
+        <translation>储存</translation>
+    </message>
+    <message>
+        <source>Enable online-only mode</source>
+        <translation>开启仅在线模式</translation>
+    </message>
+    <message>
+        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
+        <translation>禁用离线缓存。某些特定功能会在此模式中受限或消失。切换模式需要重启 fernschreiber 才能生效。</translation>
+    </message>
+    <message>
+        <source>Enable storage optimizer</source>
+        <translation>开启储存加速器</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsUserProfile</name>
+    <message>
+        <source>User Profile</source>
+        <translation>用户简介</translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <comment>first name of the logged-in profile - header</comment>
+        <translation>名字</translation>
+    </message>
+    <message>
+        <source>Enter 1-64 characters</source>
+        <translation>输入 1-64 个字符</translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <comment>last name of the logged-in profile - header</comment>
+        <translation>姓氏</translation>
+    </message>
+    <message>
+        <source>Enter 0-64 characters</source>
+        <translation>输入 0-64 个字符</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <comment>user name of the logged-in profile - header</comment>
+        <translation>用户名</translation>
     </message>
     <message>
         <source>Profile Pictures</source>
         <translation>简介图片</translation>
     </message>
     <message>
-        <source>Delete Picture</source>
-        <translation>删除图片</translation>
+        <source>Add Picture</source>
+        <translation>添加图片</translation>
     </message>
     <message>
-        <source>Uploading...</source>
-        <translation>正在上传…</translation>
+        <source>Delete Picture</source>
+        <translation>删除图片</translation>
     </message>
     <message>
         <source>Deleting profile picture</source>
         <translation>删除简介图片</translation>
     </message>
     <message>
-        <source>Enable notification sounds</source>
-        <translation>开启通知声音</translation>
-    </message>
-    <message>
-        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
-        <translation>如果开启声音，Fernschreiber 会采用当前旗鱼系统通知声音作为对话通知声音，你可以在系统设置进行配置。</translation>
-    </message>
-    <message>
-        <source>Delay before marking messages as read</source>
-        <translation>标记消息已读前延迟</translation>
-    </message>
-    <message>
-        <source>Fernschreiber will wait a bit before messages are marked as read</source>
-        <translation>Fernschreiber 将会在标记消息已读之前延迟一下</translation>
-    </message>
-    <message>
-        <source>Focus the text input area when entering a chat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Focus text input on chat open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show stickers as emojis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Only display emojis instead of the actual stickers</source>
-        <translation type="unfinished"></translation>
+        <source>Uploading...</source>
+        <translation>正在上传…</translation>
     </message>
 </context>
 <context>

translations/harbour-fernschreiber.ts

@@ -1501,77 +1501,52 @@
     </message>
 </context>
 <context>
-    <name>SettingsPage</name>
-    <message>
-        <source>Settings</source>
-        <translation>Settings</translation>
-    </message>
-    <message>
-        <source>Behavior</source>
-        <translation>Behavior</translation>
-    </message>
-    <message>
-        <source>Send message by enter</source>
-        <translation>Send message by enter</translation>
-    </message>
-    <message>
-        <source>Send your message by pressing the enter key</source>
-        <translation>Send your message by pressing the enter key</translation>
-    </message>
+    <name>SettingsAppearance</name>
     <message>
         <source>Appearance</source>
-        <translation>Appearance</translation>
+        <translation type="unfinished">Appearance</translation>
+    </message>
+    <message>
+        <source>Show stickers as emojis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only display emojis instead of the actual stickers</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show stickers as images</source>
-        <translation>Show stickers as images</translation>
+        <translation type="unfinished">Show stickers as images</translation>
     </message>
     <message>
         <source>Show background for stickers and align them centrally like images</source>
-        <translation>Show background for stickers and align them centrally like images</translation>
-    </message>
-    <message>
-        <source>Notification feedback</source>
-        <translation>Notification feedback</translation>
-    </message>
-    <message>
-        <source>All events</source>
-        <translation>All events</translation>
-    </message>
-    <message>
-        <source>Only new events</source>
-        <translation>Only new events</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>None</translation>
-    </message>
-    <message>
-        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
-        <translation>Use non-graphical feedback (sound, vibration) for notifications</translation>
-    </message>
-    <message>
-        <source>Open-with menu integration</source>
-        <translation>Open-with menu integration</translation>
-    </message>
-    <message>
-        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
-        <translation>Integrate Fernschreiber into open-with menu of Sailfish OS</translation>
+        <translation type="unfinished">Show background for stickers and align them centrally like images</translation>
     </message>
     <message>
         <source>Animate stickers</source>
-        <translation>Animate stickers</translation>
+        <translation type="unfinished">Animate stickers</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsBehavior</name>
+    <message>
+        <source>Behavior</source>
+        <translation type="unfinished">Behavior</translation>
     </message>
     <message>
-        <source>Notification turns on the display</source>
+        <source>Send message by enter</source>
+        <translation type="unfinished">Send message by enter</translation>
+    </message>
+    <message>
+        <source>Send your message by pressing the enter key</source>
+        <translation type="unfinished">Send your message by pressing the enter key</translation>
+    </message>
+    <message>
+        <source>Focus text input on chat open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable storage optimizer</source>
+        <source>Focus the text input area when entering a chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1583,52 +1558,67 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable online-only mode</source>
+        <source>Delay before marking messages as read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
-        <translation></translation>
+        <source>Fernschreiber will wait a bit before messages are marked as read</source>
+        <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Open-with menu integration</source>
+        <translation type="unfinished">Open-with menu integration</translation>
+    </message>
+    <message>
+        <source>Integrate Fernschreiber into open-with menu of Sailfish OS</source>
+        <translation type="unfinished">Integrate Fernschreiber into open-with menu of Sailfish OS</translation>
+    </message>
+    <message>
+        <source>Notification feedback</source>
+        <translation type="unfinished">Notification feedback</translation>
+    </message>
+    <message>
+        <source>Use non-graphical feedback (sound, vibration) for notifications</source>
+        <translation type="unfinished">Use non-graphical feedback (sound, vibration) for notifications</translation>
+    </message>
+    <message>
+        <source>All events</source>
+        <translation type="unfinished">All events</translation>
+    </message>
+    <message>
+        <source>Only new events</source>
+        <translation type="unfinished">Only new events</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">None</translation>
+    </message>
+    <message>
+        <source>Notification turns on the display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable notification sounds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsPage</name>
+    <message>
+        <source>Settings</source>
+        <translation>Settings</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsPrivacy</name>
     <message>
         <source>Privacy</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Allow sending Location to inline bots</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Some inline bots request location data when using them</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <comment>first name of the logged-in profile - header</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter 1-64 characters</source>
-        <translation type="unfinished">Enter 1-128 characters {1-64 ?}</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <comment>last name of the logged-in profile - header</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter 0-64 characters</source>
-        <translation type="unfinished">Enter 1-128 characters {0-64 ?}</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <comment>user name of the logged-in profile - header</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Allow chat invites</source>
         <translation type="unfinished"></translation>
@@ -1690,7 +1680,60 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Picture</source>
+        <source>Allow sending Location to inline bots</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Some inline bots request location data when using them</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsStorage</name>
+    <message>
+        <source>Storage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable online-only mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disables offline caching. Certain features may be limited or missing in this mode. Changes require a restart of Fernschreiber to take effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable storage optimizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsUserProfile</name>
+    <message>
+        <source>User Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <comment>first name of the logged-in profile - header</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter 1-64 characters</source>
+        <translation type="unfinished">Enter 1-128 characters {1-64 ?}</translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <comment>last name of the logged-in profile - header</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter 0-64 characters</source>
+        <translation type="unfinished">Enter 1-128 characters {0-64 ?}</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <comment>user name of the logged-in profile - header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1698,48 +1741,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Picture</source>
+        <source>Add Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Uploading...</source>
-        <translation type="unfinished">Uploading...</translation>
+        <source>Delete Picture</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deleting profile picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable notification sounds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When sounds are enabled, Fernschreiber will use the current Sailfish OS notification sound for chats, which can be configured in the system settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay before marking messages as read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fernschreiber will wait a bit before messages are marked as read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Focus the text input area when entering a chat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Focus text input on chat open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show stickers as emojis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Only display emojis instead of the actual stickers</source>
-        <translation type="unfinished"></translation>
+        <source>Uploading...</source>
+        <translation type="unfinished">Uploading...</translation>
     </message>
 </context>
 <context>